Revision: 5394 Author: pebender Date: Tue Sep 1 11:20:30 2009 Log: - Updated packages kernel-2.6.30/alsa-driver, kernel-2.6.31/alsa-driver, lib/alsa-lib and utils/alsa-utils.
http://code.google.com/p/minimyth/source/detail?r=5394 Added: /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/files/alsa-driver-1.0.21-quirk.patch /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/files/alsa-driver-1.0.21-quirk.patch /trunk/gar-minimyth/script/utils/alsa-utils/files/alsa-utils-1.0.21.patch.gar Deleted: /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/files/alsa-driver-1.0.20-nvidia_hdmi_8channel.patch /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/files/alsa-driver-1.0.20-quirk.patch /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/files/alsa-driver-1.0.20-nvidia_hdmi_8channel.patch /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/files/alsa-driver-1.0.20-quirk.patch /trunk/gar-minimyth/script/utils/alsa-utils/files/alsa-utils-1.0.20.patch.gar Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/html/minimyth/index.html /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/Makefile /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/checksums /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/Makefile /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/checksums /trunk/gar-minimyth/script/kernel-2.6.31/kernel/Makefile /trunk/gar-minimyth/script/lib/alsa-lib/Makefile /trunk/gar-minimyth/script/lib/alsa-lib/checksums /trunk/gar-minimyth/script/utils/alsa-utils/Makefile /trunk/gar-minimyth/script/utils/alsa-utils/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/files/alsa-driver-1.0.21-quirk.patch Tue Sep 1 11:20:30 2009 @@ -0,0 +1,25 @@ +diff -Naur alsa-driver-1.0.21-old/alsa-kernel/pci/hda/patch_analog.c alsa-driver-1.0.21-new/alsa-kernel/pci/hda/patch_analog.c +--- alsa-driver-1.0.21-old/alsa-kernel/pci/hda/patch_analog.c 2009-08-28 04:41:39.000000000 -0700 ++++ alsa-driver-1.0.21-new/alsa-kernel/pci/hda/patch_analog.c 2009-09-01 06:45:32.000000000 -0700 +@@ -2961,7 +2961,10 @@ + SND_PCI_QUIRK(0x1043, 0x81ec, "Asus P5B-DLX", AD1988_6STACK_DIG), + SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG), + SND_PCI_QUIRK(0x1043, 0x8277, "Asus P5K-E/WIFI-AP", AD1988_6STACK_DIG), ++ SND_PCI_QUIRK(0x1043, 0x829f, "Asus M3N78-VM", AD1988_6STACK_DIG), ++ SND_PCI_QUIRK(0x1043, 0x82fe, "Asus M3N78-EM / P5N7A-VM", AD1988_6STACK_DIG), + SND_PCI_QUIRK(0x1043, 0x8311, "Asus P5Q-Premium/Pro", AD1988_6STACK_DIG), ++ SND_PCI_QUIRK(0x1043, 0x8345, "Asus M3N78-VM", AD1988_6STACK_DIG), + {} + }; + +diff -Naur alsa-driver-1.0.21-old/alsa-kernel/pci/hda/patch_realtek.c alsa-driver-1.0.21-new/alsa-kernel/pci/hda/patch_realtek.c +--- alsa-driver-1.0.21-old/alsa-kernel/pci/hda/patch_realtek.c 2009-08-28 04:41:39.000000000 -0700 ++++ alsa-driver-1.0.21-new/alsa-kernel/pci/hda/patch_realtek.c 2009-09-01 06:45:32.000000000 -0700 +@@ -8724,6 +8724,7 @@ + SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG), + SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG), + SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), ++ SND_PCI_QUIRK(0x1043, 0x8290, "Asus M2N-VM DVI", ALC883_3ST_6ch_DIG), + SND_PCI_QUIRK(0x1043, 0x8284, "Asus Z37E", ALC883_6ST_DIG), + SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q), + SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601), ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/files/alsa-driver-1.0.21-quirk.patch Tue Sep 1 11:20:30 2009 @@ -0,0 +1,25 @@ +diff -Naur alsa-driver-1.0.21-old/alsa-kernel/pci/hda/patch_analog.c alsa-driver-1.0.21-new/alsa-kernel/pci/hda/patch_analog.c +--- alsa-driver-1.0.21-old/alsa-kernel/pci/hda/patch_analog.c 2009-08-28 04:41:39.000000000 -0700 ++++ alsa-driver-1.0.21-new/alsa-kernel/pci/hda/patch_analog.c 2009-09-01 06:45:32.000000000 -0700 +@@ -2961,7 +2961,10 @@ + SND_PCI_QUIRK(0x1043, 0x81ec, "Asus P5B-DLX", AD1988_6STACK_DIG), + SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG), + SND_PCI_QUIRK(0x1043, 0x8277, "Asus P5K-E/WIFI-AP", AD1988_6STACK_DIG), ++ SND_PCI_QUIRK(0x1043, 0x829f, "Asus M3N78-VM", AD1988_6STACK_DIG), ++ SND_PCI_QUIRK(0x1043, 0x82fe, "Asus M3N78-EM / P5N7A-VM", AD1988_6STACK_DIG), + SND_PCI_QUIRK(0x1043, 0x8311, "Asus P5Q-Premium/Pro", AD1988_6STACK_DIG), ++ SND_PCI_QUIRK(0x1043, 0x8345, "Asus M3N78-VM", AD1988_6STACK_DIG), + {} + }; + +diff -Naur alsa-driver-1.0.21-old/alsa-kernel/pci/hda/patch_realtek.c alsa-driver-1.0.21-new/alsa-kernel/pci/hda/patch_realtek.c +--- alsa-driver-1.0.21-old/alsa-kernel/pci/hda/patch_realtek.c 2009-08-28 04:41:39.000000000 -0700 ++++ alsa-driver-1.0.21-new/alsa-kernel/pci/hda/patch_realtek.c 2009-09-01 06:45:32.000000000 -0700 +@@ -8724,6 +8724,7 @@ + SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG), + SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG), + SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), ++ SND_PCI_QUIRK(0x1043, 0x8290, "Asus M2N-VM DVI", ALC883_3ST_6ch_DIG), + SND_PCI_QUIRK(0x1043, 0x8284, "Asus Z37E", ALC883_6ST_DIG), + SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q), + SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601), ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/utils/alsa-utils/files/alsa-utils-1.0.21.patch.gar Tue Sep 1 11:20:30 2009 @@ -0,0 +1,88 @@ +diff -Naur alsa-utils-1.0.21-old/configure alsa-utils-1.0.21-new/configure +--- alsa-utils-1.0.21-old/configure 2009-08-31 08:14:25.000000000 -0700 ++++ alsa-utils-1.0.21-new/configure 2009-09-01 10:56:55.000000000 -0700 +@@ -7924,8 +7924,8 @@ + NCURSESLIBSUFFIX="" + CURSES_NLS="no" + if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then +- # Extract the first word of "ncursesw5-config", so it can be a program name with args. +-set dummy ncursesw5-config; ac_word=$2 ++ # Extract the first word of "@GAR_DESTDIR@@GAR_bindir@/ncursesw5-config", so it can be a program name with args. ++set dummy @GAR_DESTDIR@@GAR_bindir@/ncursesw5-config; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ncursesw5_config+set}" = set; then +@@ -7963,9 +7963,9 @@ + + if test "$ncursesw5_config" = "yes"; then + CURSESINC="<ncurses.h>" +- CURSESLIB=`ncursesw5-config --libs` +- CURSESLIBDIR=`ncursesw5-config --libdir` +- CURSES_CFLAGS=`ncursesw5-config --cflags` ++ cursesli...@gar_destdir@@GAR_bindir@/ncursesw5-config --libs` ++ curseslibdi...@gar_destdir@@GAR_bindir@/ncursesw5-config --libdir` ++ curses_cflag...@gar_destdir@@GAR_bindir@/ncursesw5-config --cflags` + curseslib="ncursesw" + else + { echo "$as_me:$LINENO: checking for initscr in -lncursesw" >&5 +@@ -8056,8 +8056,8 @@ + fi + fi + if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then +- # Extract the first word of "ncurses5-config", so it can be a program name with args. +-set dummy ncurses5-config; ac_word=$2 ++ # Extract the first word of "@GAR_DESTDIR@@GAR_bindir@/ncurses5-config", so it can be a program name with args. ++set dummy @GAR_DESTDIR@@GAR_bindir@/ncurses5-config; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ncurses5_config+set}" = set; then +@@ -8095,9 +8095,9 @@ + + if test "$ncurses5_config" = "yes"; then + CURSESINC="<ncurses.h>" +- CURSESLIB=`ncurses5-config --libs` +- CURSESLIBDIR=`ncurses5-config --libdir` +- CURSES_CFLAGS=`ncurses5-config --cflags` ++ cursesli...@gar_destdir@@GAR_bindir@/ncurses5-config --libs` ++ curseslibdi...@gar_destdir@@GAR_bindir@/ncurses5-config --libdir` ++ curses_cflag...@gar_destdir@@GAR_bindir@/ncurses5-config --cflags` + curseslib="ncurses" + else + { echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5 +diff -Naur alsa-utils-1.0.21-old/configure.in alsa-utils-1.0.21-new/configure.in +--- alsa-utils-1.0.21-old/configure.in 2009-08-31 08:14:20.000000000 -0700 ++++ alsa-utils-1.0.21-new/configure.in 2009-09-01 10:55:27.000000000 -0700 +@@ -109,12 +109,12 @@ + NCURSESLIBSUFFIX="" + CURSES_NLS="no" + if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then +- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) ++ AC_CHECK_PROG([ncursesw5_config], [...@gar_destdir@@GAR_bindir@/ncursesw5-config], [yes]) + if test "$ncursesw5_config" = "yes"; then + CURSESINC="<ncurses.h>" +- CURSESLIB=`ncursesw5-config --libs` +- CURSESLIBDIR=`ncursesw5-config --libdir` +- CURSES_CFLAGS=`ncursesw5-config --cflags` ++ cursesli...@gar_destdir@@GAR_bindir@/ncursesw5-config --libs` ++ curseslibdi...@gar_destdir@@GAR_bindir@/ncursesw5-config --libdir` ++ curses_cflag...@gar_destdir@@GAR_bindir@/ncursesw5-config --cflags` + curseslib="ncursesw" + else + AC_CHECK_LIB(ncursesw, initscr, +@@ -126,12 +126,12 @@ + fi + fi + if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then +- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) ++ AC_CHECK_PROG([ncurses5_config], [...@gar_destdir@@GAR_bindir@/ncurses5-config], [yes]) + if test "$ncurses5_config" = "yes"; then + CURSESINC="<ncurses.h>" +- CURSESLIB=`ncurses5-config --libs` +- CURSESLIBDIR=`ncurses5-config --libdir` +- CURSES_CFLAGS=`ncurses5-config --cflags` ++ cursesli...@gar_destdir@@GAR_bindir@/ncurses5-config --libs` ++ curseslibdi...@gar_destdir@@GAR_bindir@/ncurses5-config --libdir` ++ curses_cflag...@gar_destdir@@GAR_bindir@/ncurses5-config --cflags` + curseslib="ncurses" + else + AC_CHECK_LIB(ncurses, initscr, ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/files/alsa-driver-1.0.20-nvidia_hdmi_8channel.patch Tue Jun 16 21:25:11 2009 +++ /dev/null @@ -1,359 +0,0 @@ -diff -Naur alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_nvhdmi.c alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_nvhdmi.c ---- alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_nvhdmi.c 2009-05-06 00:06:04.000000000 -0700 -+++ alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_nvhdmi.c 2009-06-16 12:13:37.000000000 -0700 -@@ -35,9 +35,28 @@ - struct hda_pcm pcm_rec; - }; - -+#define Nv_VERB_SET_Channel_Allocation 0xF79 -+#define Nv_VERB_SET_Info_Frame_Checksum 0xF7A -+#define Nv_VERB_SET_Audio_Protection_On 0xF98 -+#define Nv_VERB_SET_Audio_Protection_Off 0xF99 -+ -+#define Nv_Master_Convert_nid 0x04 -+#define Nv_Master_Pin_nid 0x05 -+ -+static hda_nid_t nvhdmi_convert_nids[4] = { -+ /*front, rear, clfe, rear_surr */ -+ 0x6, 0x8, 0xa, 0xc, -+}; -+ - static struct hda_verb nvhdmi_basic_init[] = { -+ /* set audio protect on */ -+ { 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1}, - /* enable digital output on pin widget */ -- { 0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, -+ { 0x5, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, -+ { 0x7, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, -+ { 0x9, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, -+ { 0xb, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, -+ { 0xd, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, - {} /* terminator */ - }; - -@@ -66,48 +85,221 @@ - * Digital out - */ - static int nvhdmi_dig_playback_pcm_open(struct hda_pcm_stream *hinfo, -- struct hda_codec *codec, -- struct snd_pcm_substream *substream) -+ struct hda_codec *codec, -+ struct snd_pcm_substream *substream) - { - struct nvhdmi_spec *spec = codec->spec; - return snd_hda_multi_out_dig_open(codec, &spec->multiout); - } - --static int nvhdmi_dig_playback_pcm_close(struct hda_pcm_stream *hinfo, -- struct hda_codec *codec, -- struct snd_pcm_substream *substream) -+static int nvhdmi_dig_playback_pcm_close_8ch(struct hda_pcm_stream *hinfo, -+ struct hda_codec *codec, -+ struct snd_pcm_substream *substream) -+{ -+ struct nvhdmi_spec *spec = codec->spec; -+ int i; -+ -+ snd_hda_codec_write(codec, Nv_Master_Convert_nid, -+ 0, AC_VERB_SET_CHANNEL_STREAMID, 0); -+ for (i = 0; i < 4; i++) { -+ /* set the stream id */ -+ snd_hda_codec_write(codec, nvhdmi_convert_nids[i], 0, -+ AC_VERB_SET_CHANNEL_STREAMID, 0); -+ /* set the stream format */ -+ snd_hda_codec_write(codec, nvhdmi_convert_nids[i], 0, -+ AC_VERB_SET_STREAM_FORMAT, 0); -+ } -+ -+ return snd_hda_multi_out_dig_close(codec, &spec->multiout); -+} -+ -+static int nvhdmi_dig_playback_pcm_close_2ch(struct hda_pcm_stream *hinfo, -+ struct hda_codec *codec, -+ struct snd_pcm_substream *substream) - { - struct nvhdmi_spec *spec = codec->spec; - return snd_hda_multi_out_dig_close(codec, &spec->multiout); - } - --static int nvhdmi_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo, -- struct hda_codec *codec, -- unsigned int stream_tag, -- unsigned int format, -- struct snd_pcm_substream *substream) -+static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo, -+ struct hda_codec *codec, -+ unsigned int stream_tag, -+ unsigned int format, -+ struct snd_pcm_substream *substream) -+{ -+ int chs; -+ unsigned int dataDCC1, dataDCC2, chan, chanmask, channel_id; -+ int i; -+ -+ mutex_lock(&codec->spdif_mutex); -+ -+ chs = substream->runtime->channels; -+ chan = chs ? (chs - 1) : 1; -+ -+ switch (chs) { -+ default: -+ case 0: -+ case 2: -+ chanmask = 0x00; -+ break; -+ case 4: -+ chanmask = 0x08; -+ break; -+ case 6: -+ chanmask = 0x0b; -+ break; -+ case 8: -+ chanmask = 0x13; -+ break; -+ } -+ dataDCC1 = AC_DIG1_ENABLE | AC_DIG1_COPYRIGHT; -+ dataDCC2 = 0x2; -+ -+ /* set the Audio InforFrame Channel Allocation */ -+ snd_hda_codec_write(codec, 0x1, 0, -+ Nv_VERB_SET_Channel_Allocation, chanmask); -+ -+ /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */ -+ if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) -+ snd_hda_codec_write(codec, -+ Nv_Master_Convert_nid, -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_1, -+ codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff); -+ -+ /* set the stream id */ -+ snd_hda_codec_write(codec, Nv_Master_Convert_nid, 0, -+ AC_VERB_SET_CHANNEL_STREAMID, (stream_tag << 4) | 0x0); -+ -+ /* set the stream format */ -+ snd_hda_codec_write(codec, Nv_Master_Convert_nid, 0, -+ AC_VERB_SET_STREAM_FORMAT, format); -+ -+ /* turn on again (if needed) */ -+ /* enable and set the channel status audio/data flag */ -+ if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) { -+ snd_hda_codec_write(codec, -+ Nv_Master_Convert_nid, -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_1, -+ codec->spdif_ctls & 0xff); -+ snd_hda_codec_write(codec, -+ Nv_Master_Convert_nid, -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_2, dataDCC2); -+ } -+ -+ for (i = 0; i < 4; i++) { -+ if (chs == 2) -+ channel_id = 0; -+ else -+ channel_id = i * 2; -+ -+ /* turn off SPDIF once; -+ *otherwise the IEC958 bits won't be updated -+ */ -+ if (codec->spdif_status_reset && -+ (codec->spdif_ctls & AC_DIG1_ENABLE)) -+ snd_hda_codec_write(codec, -+ nvhdmi_convert_nids[i], -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_1, -+ codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff); -+ /* set the stream id */ -+ snd_hda_codec_write(codec, -+ nvhdmi_convert_nids[i], -+ 0, -+ AC_VERB_SET_CHANNEL_STREAMID, -+ (stream_tag << 4) | channel_id); -+ /* set the stream format */ -+ snd_hda_codec_write(codec, -+ nvhdmi_convert_nids[i], -+ 0, -+ AC_VERB_SET_STREAM_FORMAT, -+ format); -+ /* turn on again (if needed) */ -+ /* enable and set the channel status audio/data flag */ -+ if (codec->spdif_status_reset && -+ (codec->spdif_ctls & AC_DIG1_ENABLE)) { -+ snd_hda_codec_write(codec, -+ nvhdmi_convert_nids[i], -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_1, -+ codec->spdif_ctls & 0xff); -+ snd_hda_codec_write(codec, -+ nvhdmi_convert_nids[i], -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_2, dataDCC2); -+ } -+ } -+ -+ /* set the Audio Info Frame Checksum */ -+ snd_hda_codec_write(codec, 0x1, 0, -+ Nv_VERB_SET_Info_Frame_Checksum, -+ (0x71 - chan - chanmask)); -+ -+ mutex_unlock(&codec->spdif_mutex); -+ return 0; -+} -+ -+static int nvhdmi_dig_playback_pcm_prepare_2ch(struct hda_pcm_stream *hinfo, -+ struct hda_codec *codec, -+ unsigned int stream_tag, -+ unsigned int format, -+ struct snd_pcm_substream *substream) - { - struct nvhdmi_spec *spec = codec->spec; - return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag, -- format, substream); -+ format, substream); - } - --static struct hda_pcm_stream nvhdmi_pcm_digital_playback = { -+static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch = { -+ .substreams = 1, -+ .channels_min = 2, -+ .channels_max = 8, -+ .nid = Nv_Master_Convert_nid, -+ .rates = SNDRV_PCM_RATE_48000, -+ .maxbps = 16, -+ .formats = SNDRV_PCM_FMTBIT_S16_LE, -+ .ops = { -+ .open = nvhdmi_dig_playback_pcm_open, -+ .close = nvhdmi_dig_playback_pcm_close_8ch, -+ .prepare = nvhdmi_dig_playback_pcm_prepare_8ch -+ }, -+}; -+ -+static struct hda_pcm_stream nvhdmi_pcm_digital_playback_2ch = { - .substreams = 1, - .channels_min = 2, - .channels_max = 2, -- .nid = 0x4, /* NID to query formats and rates and setup streams */ -+ .nid = Nv_Master_Convert_nid, - .rates = SNDRV_PCM_RATE_48000, - .maxbps = 16, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .ops = { - .open = nvhdmi_dig_playback_pcm_open, -- .close = nvhdmi_dig_playback_pcm_close, -- .prepare = nvhdmi_dig_playback_pcm_prepare -+ .close = nvhdmi_dig_playback_pcm_close_2ch, -+ .prepare = nvhdmi_dig_playback_pcm_prepare_2ch - }, - }; - --static int nvhdmi_build_pcms(struct hda_codec *codec) -+static int nvhdmi_build_pcms_8ch(struct hda_codec *codec) -+{ -+ struct nvhdmi_spec *spec = codec->spec; -+ struct hda_pcm *info = &spec->pcm_rec; -+ -+ codec->num_pcms = 1; -+ codec->pcm_info = info; -+ -+ info->name = "NVIDIA HDMI"; -+ info->pcm_type = HDA_PCM_TYPE_HDMI; -+ info->stream[SNDRV_PCM_STREAM_PLAYBACK] -+ = nvhdmi_pcm_digital_playback_8ch; -+ -+ return 0; -+} -+ -+static int nvhdmi_build_pcms_2ch(struct hda_codec *codec) - { - struct nvhdmi_spec *spec = codec->spec; - struct hda_pcm *info = &spec->pcm_rec; -@@ -117,7 +309,8 @@ - - info->name = "NVIDIA HDMI"; - info->pcm_type = HDA_PCM_TYPE_HDMI; -- info->stream[SNDRV_PCM_STREAM_PLAYBACK] = nvhdmi_pcm_digital_playback; -+ info->stream[SNDRV_PCM_STREAM_PLAYBACK] -+ = nvhdmi_pcm_digital_playback_2ch; - - return 0; - } -@@ -127,14 +320,40 @@ - kfree(codec->spec); - } - --static struct hda_codec_ops nvhdmi_patch_ops = { -+static struct hda_codec_ops nvhdmi_patch_ops_8ch = { -+ .build_controls = nvhdmi_build_controls, -+ .build_pcms = nvhdmi_build_pcms_8ch, -+ .init = nvhdmi_init, -+ .free = nvhdmi_free, -+}; -+ -+static struct hda_codec_ops nvhdmi_patch_ops_2ch = { - .build_controls = nvhdmi_build_controls, -- .build_pcms = nvhdmi_build_pcms, -+ .build_pcms = nvhdmi_build_pcms_2ch, - .init = nvhdmi_init, - .free = nvhdmi_free, - }; - --static int patch_nvhdmi(struct hda_codec *codec) -+static int patch_nvhdmi_8ch(struct hda_codec *codec) -+{ -+ struct nvhdmi_spec *spec; -+ -+ spec = kzalloc(sizeof(*spec), GFP_KERNEL); -+ if (spec == NULL) -+ return -ENOMEM; -+ -+ codec->spec = spec; -+ -+ spec->multiout.num_dacs = 0; /* no analog */ -+ spec->multiout.max_channels = 8; -+ spec->multiout.dig_out_nid = Nv_Master_Convert_nid; -+ -+ codec->patch_ops = nvhdmi_patch_ops_8ch; -+ -+ return 0; -+} -+ -+static int patch_nvhdmi_2ch(struct hda_codec *codec) - { - struct nvhdmi_spec *spec; - -@@ -144,13 +363,11 @@ - - codec->spec = spec; - -- spec->multiout.num_dacs = 0; /* no analog */ -+ spec->multiout.num_dacs = 0; /* no analog */ - spec->multiout.max_channels = 2; -- spec->multiout.dig_out_nid = 0x4; /* NID for copying analog to digital, -- * seems to be unused in pure-digital -- * case. */ -+ spec->multiout.dig_out_nid = Nv_Master_Convert_nid; - -- codec->patch_ops = nvhdmi_patch_ops; -+ codec->patch_ops = nvhdmi_patch_ops_2ch; - - return 0; - } -@@ -159,11 +376,11 @@ - * patch entries - */ - static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { -- { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi }, -- { .id = 0x10de0006, .name = "MCP78 HDMI", .patch = patch_nvhdmi }, -- { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi }, -- { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi }, -- { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi }, -+ { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch }, -+ { .id = 0x10de0006, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch }, -+ { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi_8ch }, -+ { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, -+ { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, - {} /* terminator */ - }; - ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/files/alsa-driver-1.0.20-quirk.patch Tue Jun 16 21:25:11 2009 +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_analog.c alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_analog.c ---- alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_analog.c 2009-06-16 12:13:26.000000000 -0700 -+++ alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_analog.c 2009-06-16 12:15:26.000000000 -0700 -@@ -2949,7 +2949,10 @@ - SND_PCI_QUIRK(0x1043, 0x81ec, "Asus P5B-DLX", AD1988_6STACK_DIG), - SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG), - SND_PCI_QUIRK(0x1043, 0x8277, "Asus P5K-E/WIFI-AP", AD1988_6STACK_DIG), -+ SND_PCI_QUIRK(0x1043, 0x829F, "Asus M3N78-VM", AD1988_6STACK_DIG), -+ SND_PCI_QUIRK(0x1043, 0x82fe, "Asus M3N78-EM / P5N7A-VM", AD1988_6STACK_DIG), - SND_PCI_QUIRK(0x1043, 0x8311, "Asus P5Q-Premium/Pro", AD1988_6STACK_DIG), -+ SND_PCI_QUIRK(0x1043, 0x8345, "Asus M3N78-VM", AD1988_6STACK_DIG), - {} - }; - -diff -Naur alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_realtek.c alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_realtek.c ---- alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_realtek.c 2009-06-16 12:13:26.000000000 -0700 -+++ alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_realtek.c 2009-06-16 12:15:26.000000000 -0700 -@@ -8704,6 +8704,7 @@ - SND_PCI_QUIRK(0x103c, 0x2a72, "HP Educ.ar", ALC888_3ST_HP), - SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V), - SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), -+ SND_PCI_QUIRK(0x1043, 0x8290, "Asus M2N-VM DVI", ALC883_3ST_6ch_DIG), - SND_PCI_QUIRK(0x1043, 0x8284, "Asus Z37E", ALC883_6ST_DIG), - SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q), - SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601), ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/files/alsa-driver-1.0.20-nvidia_hdmi_8channel.patch Thu Jul 23 13:41:26 2009 +++ /dev/null @@ -1,359 +0,0 @@ -diff -Naur alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_nvhdmi.c alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_nvhdmi.c ---- alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_nvhdmi.c 2009-05-06 00:06:04.000000000 -0700 -+++ alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_nvhdmi.c 2009-06-16 12:13:37.000000000 -0700 -@@ -35,9 +35,28 @@ - struct hda_pcm pcm_rec; - }; - -+#define Nv_VERB_SET_Channel_Allocation 0xF79 -+#define Nv_VERB_SET_Info_Frame_Checksum 0xF7A -+#define Nv_VERB_SET_Audio_Protection_On 0xF98 -+#define Nv_VERB_SET_Audio_Protection_Off 0xF99 -+ -+#define Nv_Master_Convert_nid 0x04 -+#define Nv_Master_Pin_nid 0x05 -+ -+static hda_nid_t nvhdmi_convert_nids[4] = { -+ /*front, rear, clfe, rear_surr */ -+ 0x6, 0x8, 0xa, 0xc, -+}; -+ - static struct hda_verb nvhdmi_basic_init[] = { -+ /* set audio protect on */ -+ { 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1}, - /* enable digital output on pin widget */ -- { 0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, -+ { 0x5, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, -+ { 0x7, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, -+ { 0x9, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, -+ { 0xb, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, -+ { 0xd, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 }, - {} /* terminator */ - }; - -@@ -66,48 +85,221 @@ - * Digital out - */ - static int nvhdmi_dig_playback_pcm_open(struct hda_pcm_stream *hinfo, -- struct hda_codec *codec, -- struct snd_pcm_substream *substream) -+ struct hda_codec *codec, -+ struct snd_pcm_substream *substream) - { - struct nvhdmi_spec *spec = codec->spec; - return snd_hda_multi_out_dig_open(codec, &spec->multiout); - } - --static int nvhdmi_dig_playback_pcm_close(struct hda_pcm_stream *hinfo, -- struct hda_codec *codec, -- struct snd_pcm_substream *substream) -+static int nvhdmi_dig_playback_pcm_close_8ch(struct hda_pcm_stream *hinfo, -+ struct hda_codec *codec, -+ struct snd_pcm_substream *substream) -+{ -+ struct nvhdmi_spec *spec = codec->spec; -+ int i; -+ -+ snd_hda_codec_write(codec, Nv_Master_Convert_nid, -+ 0, AC_VERB_SET_CHANNEL_STREAMID, 0); -+ for (i = 0; i < 4; i++) { -+ /* set the stream id */ -+ snd_hda_codec_write(codec, nvhdmi_convert_nids[i], 0, -+ AC_VERB_SET_CHANNEL_STREAMID, 0); -+ /* set the stream format */ -+ snd_hda_codec_write(codec, nvhdmi_convert_nids[i], 0, -+ AC_VERB_SET_STREAM_FORMAT, 0); -+ } -+ -+ return snd_hda_multi_out_dig_close(codec, &spec->multiout); -+} -+ -+static int nvhdmi_dig_playback_pcm_close_2ch(struct hda_pcm_stream *hinfo, -+ struct hda_codec *codec, -+ struct snd_pcm_substream *substream) - { - struct nvhdmi_spec *spec = codec->spec; - return snd_hda_multi_out_dig_close(codec, &spec->multiout); - } - --static int nvhdmi_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo, -- struct hda_codec *codec, -- unsigned int stream_tag, -- unsigned int format, -- struct snd_pcm_substream *substream) -+static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo, -+ struct hda_codec *codec, -+ unsigned int stream_tag, -+ unsigned int format, -+ struct snd_pcm_substream *substream) -+{ -+ int chs; -+ unsigned int dataDCC1, dataDCC2, chan, chanmask, channel_id; -+ int i; -+ -+ mutex_lock(&codec->spdif_mutex); -+ -+ chs = substream->runtime->channels; -+ chan = chs ? (chs - 1) : 1; -+ -+ switch (chs) { -+ default: -+ case 0: -+ case 2: -+ chanmask = 0x00; -+ break; -+ case 4: -+ chanmask = 0x08; -+ break; -+ case 6: -+ chanmask = 0x0b; -+ break; -+ case 8: -+ chanmask = 0x13; -+ break; -+ } -+ dataDCC1 = AC_DIG1_ENABLE | AC_DIG1_COPYRIGHT; -+ dataDCC2 = 0x2; -+ -+ /* set the Audio InforFrame Channel Allocation */ -+ snd_hda_codec_write(codec, 0x1, 0, -+ Nv_VERB_SET_Channel_Allocation, chanmask); -+ -+ /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */ -+ if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) -+ snd_hda_codec_write(codec, -+ Nv_Master_Convert_nid, -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_1, -+ codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff); -+ -+ /* set the stream id */ -+ snd_hda_codec_write(codec, Nv_Master_Convert_nid, 0, -+ AC_VERB_SET_CHANNEL_STREAMID, (stream_tag << 4) | 0x0); -+ -+ /* set the stream format */ -+ snd_hda_codec_write(codec, Nv_Master_Convert_nid, 0, -+ AC_VERB_SET_STREAM_FORMAT, format); -+ -+ /* turn on again (if needed) */ -+ /* enable and set the channel status audio/data flag */ -+ if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) { -+ snd_hda_codec_write(codec, -+ Nv_Master_Convert_nid, -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_1, -+ codec->spdif_ctls & 0xff); -+ snd_hda_codec_write(codec, -+ Nv_Master_Convert_nid, -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_2, dataDCC2); -+ } -+ -+ for (i = 0; i < 4; i++) { -+ if (chs == 2) -+ channel_id = 0; -+ else -+ channel_id = i * 2; -+ -+ /* turn off SPDIF once; -+ *otherwise the IEC958 bits won't be updated -+ */ -+ if (codec->spdif_status_reset && -+ (codec->spdif_ctls & AC_DIG1_ENABLE)) -+ snd_hda_codec_write(codec, -+ nvhdmi_convert_nids[i], -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_1, -+ codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff); -+ /* set the stream id */ -+ snd_hda_codec_write(codec, -+ nvhdmi_convert_nids[i], -+ 0, -+ AC_VERB_SET_CHANNEL_STREAMID, -+ (stream_tag << 4) | channel_id); -+ /* set the stream format */ -+ snd_hda_codec_write(codec, -+ nvhdmi_convert_nids[i], -+ 0, -+ AC_VERB_SET_STREAM_FORMAT, -+ format); -+ /* turn on again (if needed) */ -+ /* enable and set the channel status audio/data flag */ -+ if (codec->spdif_status_reset && -+ (codec->spdif_ctls & AC_DIG1_ENABLE)) { -+ snd_hda_codec_write(codec, -+ nvhdmi_convert_nids[i], -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_1, -+ codec->spdif_ctls & 0xff); -+ snd_hda_codec_write(codec, -+ nvhdmi_convert_nids[i], -+ 0, -+ AC_VERB_SET_DIGI_CONVERT_2, dataDCC2); -+ } -+ } -+ -+ /* set the Audio Info Frame Checksum */ -+ snd_hda_codec_write(codec, 0x1, 0, -+ Nv_VERB_SET_Info_Frame_Checksum, -+ (0x71 - chan - chanmask)); -+ -+ mutex_unlock(&codec->spdif_mutex); -+ return 0; -+} -+ -+static int nvhdmi_dig_playback_pcm_prepare_2ch(struct hda_pcm_stream *hinfo, -+ struct hda_codec *codec, -+ unsigned int stream_tag, -+ unsigned int format, -+ struct snd_pcm_substream *substream) - { - struct nvhdmi_spec *spec = codec->spec; - return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag, -- format, substream); -+ format, substream); - } - --static struct hda_pcm_stream nvhdmi_pcm_digital_playback = { -+static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch = { -+ .substreams = 1, -+ .channels_min = 2, -+ .channels_max = 8, -+ .nid = Nv_Master_Convert_nid, -+ .rates = SNDRV_PCM_RATE_48000, -+ .maxbps = 16, -+ .formats = SNDRV_PCM_FMTBIT_S16_LE, -+ .ops = { -+ .open = nvhdmi_dig_playback_pcm_open, -+ .close = nvhdmi_dig_playback_pcm_close_8ch, -+ .prepare = nvhdmi_dig_playback_pcm_prepare_8ch -+ }, -+}; -+ -+static struct hda_pcm_stream nvhdmi_pcm_digital_playback_2ch = { - .substreams = 1, - .channels_min = 2, - .channels_max = 2, -- .nid = 0x4, /* NID to query formats and rates and setup streams */ -+ .nid = Nv_Master_Convert_nid, - .rates = SNDRV_PCM_RATE_48000, - .maxbps = 16, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .ops = { - .open = nvhdmi_dig_playback_pcm_open, -- .close = nvhdmi_dig_playback_pcm_close, -- .prepare = nvhdmi_dig_playback_pcm_prepare -+ .close = nvhdmi_dig_playback_pcm_close_2ch, -+ .prepare = nvhdmi_dig_playback_pcm_prepare_2ch - }, - }; - --static int nvhdmi_build_pcms(struct hda_codec *codec) -+static int nvhdmi_build_pcms_8ch(struct hda_codec *codec) -+{ -+ struct nvhdmi_spec *spec = codec->spec; -+ struct hda_pcm *info = &spec->pcm_rec; -+ -+ codec->num_pcms = 1; -+ codec->pcm_info = info; -+ -+ info->name = "NVIDIA HDMI"; -+ info->pcm_type = HDA_PCM_TYPE_HDMI; -+ info->stream[SNDRV_PCM_STREAM_PLAYBACK] -+ = nvhdmi_pcm_digital_playback_8ch; -+ -+ return 0; -+} -+ -+static int nvhdmi_build_pcms_2ch(struct hda_codec *codec) - { - struct nvhdmi_spec *spec = codec->spec; - struct hda_pcm *info = &spec->pcm_rec; -@@ -117,7 +309,8 @@ - - info->name = "NVIDIA HDMI"; - info->pcm_type = HDA_PCM_TYPE_HDMI; -- info->stream[SNDRV_PCM_STREAM_PLAYBACK] = nvhdmi_pcm_digital_playback; -+ info->stream[SNDRV_PCM_STREAM_PLAYBACK] -+ = nvhdmi_pcm_digital_playback_2ch; - - return 0; - } -@@ -127,14 +320,40 @@ - kfree(codec->spec); - } - --static struct hda_codec_ops nvhdmi_patch_ops = { -+static struct hda_codec_ops nvhdmi_patch_ops_8ch = { -+ .build_controls = nvhdmi_build_controls, -+ .build_pcms = nvhdmi_build_pcms_8ch, -+ .init = nvhdmi_init, -+ .free = nvhdmi_free, -+}; -+ -+static struct hda_codec_ops nvhdmi_patch_ops_2ch = { - .build_controls = nvhdmi_build_controls, -- .build_pcms = nvhdmi_build_pcms, -+ .build_pcms = nvhdmi_build_pcms_2ch, - .init = nvhdmi_init, - .free = nvhdmi_free, - }; - --static int patch_nvhdmi(struct hda_codec *codec) -+static int patch_nvhdmi_8ch(struct hda_codec *codec) -+{ -+ struct nvhdmi_spec *spec; -+ -+ spec = kzalloc(sizeof(*spec), GFP_KERNEL); -+ if (spec == NULL) -+ return -ENOMEM; -+ -+ codec->spec = spec; -+ -+ spec->multiout.num_dacs = 0; /* no analog */ -+ spec->multiout.max_channels = 8; -+ spec->multiout.dig_out_nid = Nv_Master_Convert_nid; -+ -+ codec->patch_ops = nvhdmi_patch_ops_8ch; -+ -+ return 0; -+} -+ -+static int patch_nvhdmi_2ch(struct hda_codec *codec) - { - struct nvhdmi_spec *spec; - -@@ -144,13 +363,11 @@ - - codec->spec = spec; - -- spec->multiout.num_dacs = 0; /* no analog */ -+ spec->multiout.num_dacs = 0; /* no analog */ - spec->multiout.max_channels = 2; -- spec->multiout.dig_out_nid = 0x4; /* NID for copying analog to digital, -- * seems to be unused in pure-digital -- * case. */ -+ spec->multiout.dig_out_nid = Nv_Master_Convert_nid; - -- codec->patch_ops = nvhdmi_patch_ops; -+ codec->patch_ops = nvhdmi_patch_ops_2ch; - - return 0; - } -@@ -159,11 +376,11 @@ - * patch entries - */ - static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { -- { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi }, -- { .id = 0x10de0006, .name = "MCP78 HDMI", .patch = patch_nvhdmi }, -- { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi }, -- { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi }, -- { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi }, -+ { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch }, -+ { .id = 0x10de0006, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch }, -+ { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi_8ch }, -+ { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, -+ { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, - {} /* terminator */ - }; - ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/files/alsa-driver-1.0.20-quirk.patch Thu Jul 23 13:41:26 2009 +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_analog.c alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_analog.c ---- alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_analog.c 2009-06-16 12:13:26.000000000 -0700 -+++ alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_analog.c 2009-06-16 12:15:26.000000000 -0700 -@@ -2949,7 +2949,10 @@ - SND_PCI_QUIRK(0x1043, 0x81ec, "Asus P5B-DLX", AD1988_6STACK_DIG), - SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG), - SND_PCI_QUIRK(0x1043, 0x8277, "Asus P5K-E/WIFI-AP", AD1988_6STACK_DIG), -+ SND_PCI_QUIRK(0x1043, 0x829F, "Asus M3N78-VM", AD1988_6STACK_DIG), -+ SND_PCI_QUIRK(0x1043, 0x82fe, "Asus M3N78-EM / P5N7A-VM", AD1988_6STACK_DIG), - SND_PCI_QUIRK(0x1043, 0x8311, "Asus P5Q-Premium/Pro", AD1988_6STACK_DIG), -+ SND_PCI_QUIRK(0x1043, 0x8345, "Asus M3N78-VM", AD1988_6STACK_DIG), - {} - }; - -diff -Naur alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_realtek.c alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_realtek.c ---- alsa-driver-1.0.20-old/alsa-kernel/pci/hda/patch_realtek.c 2009-06-16 12:13:26.000000000 -0700 -+++ alsa-driver-1.0.20-new/alsa-kernel/pci/hda/patch_realtek.c 2009-06-16 12:15:26.000000000 -0700 -@@ -8704,6 +8704,7 @@ - SND_PCI_QUIRK(0x103c, 0x2a72, "HP Educ.ar", ALC888_3ST_HP), - SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V), - SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), -+ SND_PCI_QUIRK(0x1043, 0x8290, "Asus M2N-VM DVI", ALC883_3ST_6ch_DIG), - SND_PCI_QUIRK(0x1043, 0x8284, "Asus Z37E", ALC883_6ST_DIG), - SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q), - SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601), ======================================= --- /trunk/gar-minimyth/script/utils/alsa-utils/files/alsa-utils-1.0.20.patch.gar Wed May 6 21:20:26 2009 +++ /dev/null @@ -1,80 +0,0 @@ -diff -Naur alsa-utils-1.0.20-old/configure alsa-utils-1.0.20-new/configure ---- alsa-utils-1.0.20-old/configure 2009-05-06 00:17:17.000000000 -0700 -+++ alsa-utils-1.0.20-new/configure 2009-05-06 21:11:30.000000000 -0700 -@@ -7885,8 +7885,8 @@ - fi - - if test "$curseslib" = "ncursesw"; then -- # Extract the first word of "ncursesw5-config", so it can be a program name with args. --set dummy ncursesw5-config; ac_word=$2 -+ # Extract the first word of "@GAR_DESTDIR@@GAR_bindir@/ncursesw5-config", so it can be a program name with args. -+set dummy @GAR_DESTDIR@@GAR_bindir@/ncursesw5-config; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ncursesw5_config+set}" = set; then -@@ -7924,8 +7924,8 @@ - - if test "$ncursesw5_config" = "yes"; then - CURSESINC="<ncurses.h>" -- CURSESLIB=`ncursesw5-config --libs` -- CURSES_CFLAGS=`ncursesw5-config --cflags` -+ cursesli...@gar_destdir@@GAR_bindir@/ncursesw5-config --libs` -+ curses_cflag...@gar_destdir@@GAR_bindir@/ncursesw5-config --cflags` - curseslib="ncursesw" - else - { echo "$as_me:$LINENO: checking for initscr in -lncursesw" >&5 -@@ -8012,8 +8012,8 @@ - fi - fi - if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then -- # Extract the first word of "ncurses5-config", so it can be a program name with args. --set dummy ncurses5-config; ac_word=$2 -+ # Extract the first word of "@GAR_DESTDIR@@GAR_bindir@/ncurses5-config", so it can be a program name with args. -+set dummy @GAR_DESTDIR@@GAR_bindir@/ncurses5-config; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ncurses5_config+set}" = set; then -@@ -8051,8 +8051,8 @@ - - if test "$ncurses5_config" = "yes"; then - CURSESINC="<ncurses.h>" -- CURSESLIB=`ncurses5-config --libs` -- CURSES_CFLAGS=`ncurses5-config --cflags` -+ cursesli...@gar_destdir@@GAR_bindir@/ncurses5-config --libs` -+ curses_cflag...@gar_destdir@@GAR_bindir@/ncurses5-config --cflags` - curseslib="ncurses" - else - { echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5 -diff -Naur alsa-utils-1.0.20-old/configure.in alsa-utils-1.0.20-new/configure.in ---- alsa-utils-1.0.20-old/configure.in 2009-05-06 00:17:13.000000000 -0700 -+++ alsa-utils-1.0.20-new/configure.in 2009-05-06 21:11:30.000000000 -0700 -@@ -106,11 +106,11 @@ - curseslib="$withval", - curseslib="auto") - if test "$curseslib" = "ncursesw"; then -- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) -+ AC_CHECK_PROG([ncursesw5_config], [...@gar_destdir@@GAR_bindir@/ncursesw5-config], [yes]) - if test "$ncursesw5_config" = "yes"; then - CURSESINC="<ncurses.h>" -- CURSESLIB=`ncursesw5-config --libs` -- CURSES_CFLAGS=`ncursesw5-config --cflags` -+ cursesli...@gar_destdir@@GAR_bindir@/ncursesw5-config --libs` -+ curses_cflag...@gar_destdir@@GAR_bindir@/ncursesw5-config --cflags` - curseslib="ncursesw" - else - AC_CHECK_LIB(ncursesw, initscr, -@@ -118,11 +118,11 @@ - fi - fi - if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then -- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) -+ AC_CHECK_PROG([ncurses5_config], [...@gar_destdir@@GAR_bindir@/ncurses5-config], [yes]) - if test "$ncurses5_config" = "yes"; then - CURSESINC="<ncurses.h>" -- CURSESLIB=`ncurses5-config --libs` -- CURSES_CFLAGS=`ncurses5-config --cflags` -+ cursesli...@gar_destdir@@GAR_bindir@/ncurses5-config --libs` -+ curses_cflag...@gar_destdir@@GAR_bindir@/ncurses5-config --cflags` - curseslib="ncurses" - else - AC_CHECK_LIB(ncurses, initscr, ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Sep 1 10:28:46 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Sep 1 11:20:30 2009 @@ -60,10 +60,13 @@ Updated disk/hdparm. Updated gtk/glib. Updated gtk/gtk+. + Updated kernel-2.6.30/alsa-driver. Updated kernel-2.6.30/linux. + Updated kernel-2.6.31/alsa-driver. Updated kernel-2.6.31/linux. Updated kernel-headers/linux-headers-2.6.30. Updated kernel-headers/linux-headers-2.6.31. + Updated lib/alsa-lib. Updated lib/bluez. Updated lib/boost. Updated lib/ffmpeg. @@ -78,6 +81,7 @@ Updated system/lirc. Updated system/udev. Updated system/zoneinfo. + Updated utils/alsa-utils. Updated utils/coreutils. Updated utils/pciutils. Updated utils/transcode. ======================================= --- /trunk/gar-minimyth/html/minimyth/index.html Sun Aug 30 19:45:01 2009 +++ /trunk/gar-minimyth/html/minimyth/index.html Tue Sep 1 11:20:30 2009 @@ -109,7 +109,7 @@ <li> <a href="http://www.kernel.org/";>Linux</a> <strong>2.6.30.5</strong> with patches to add <ul> - <li><a href="http://www.alsa-project.org/";>ALSA</a> <strong>1.0.20</strong></li> + <li><a href="http://www.alsa-project.org/";>ALSA</a> <strong>1.0.21</strong></li> <li><a href="http://www.filesystems.org/project-unionfs.html";>Unionfs</a> <strong>2.5.2</strong></li> </ul> </li> @@ -196,7 +196,7 @@ alt="Valid CSS!" height="31" width="88" /></a> </div> <div class="version"> - Last Updated on 2009-08-30 + Last Updated on 2009-09-01 <br /> < mailto : webmaster at minimyth dot org > </div> ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/Makefile Tue Jun 16 21:25:11 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/Makefile Tue Sep 1 11:20:30 2009 @@ -1,10 +1,10 @@ GARNAME = alsa-driver -GARVERSION = 1.0.20 +GARVERSION = 1.0.21 CATEGORIES = kernel-2.6.30 MASTER_SITES = ftp://ftp.alsa-project.org/pub/driver/ MASTER_SITES += ftp://ftp.alsa-project.org/pub/testing/ DISTFILES = $(DISTNAME).tar.bz2 -PATCHFILES = $(DISTNAME)-nvidia_hdmi_8channel.patch $(DISTNAME)-quirk.patch +PATCHFILES = $(DISTNAME)-quirk.patch LICENSE = LGPL2_1 DESCRIPTION = ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/checksums Tue Jun 16 21:25:11 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.30/alsa-driver/checksums Tue Sep 1 11:20:30 2009 @@ -1,3 +1,2 @@ -19764c0b0b9bae43eba4395a4a0b4b14 download/alsa-driver-1.0.20.tar.bz2 -671b72ce93bc2b371b27963862d90a75 download/alsa-driver-1.0.20-nvidia_hdmi_8channel.patch -c256988f28f70b1880b0aa4271ddc258 download/alsa-driver-1.0.20-quirk.patch +3ee5ec5357f237dc78847feb85d8560d download/alsa-driver-1.0.21.tar.bz2 +cb75820e9d0a0ca55ae85fe75be25550 download/alsa-driver-1.0.21-quirk.patch ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/Makefile Thu Jul 23 13:41:26 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/Makefile Tue Sep 1 11:20:30 2009 @@ -1,10 +1,10 @@ GARNAME = alsa-driver -GARVERSION = 1.0.20 +GARVERSION = 1.0.21 CATEGORIES = kernel-2.6.31 MASTER_SITES = ftp://ftp.alsa-project.org/pub/driver/ MASTER_SITES += ftp://ftp.alsa-project.org/pub/testing/ DISTFILES = $(DISTNAME).tar.bz2 -PATCHFILES = $(DISTNAME)-nvidia_hdmi_8channel.patch $(DISTNAME)-quirk.patch +PATCHFILES = $(DISTNAME)-quirk.patch LICENSE = LGPL2_1 DESCRIPTION = ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/checksums Thu Jul 23 13:41:26 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.31/alsa-driver/checksums Tue Sep 1 11:20:30 2009 @@ -1,3 +1,2 @@ -19764c0b0b9bae43eba4395a4a0b4b14 download/alsa-driver-1.0.20.tar.bz2 -671b72ce93bc2b371b27963862d90a75 download/alsa-driver-1.0.20-nvidia_hdmi_8channel.patch -c256988f28f70b1880b0aa4271ddc258 download/alsa-driver-1.0.20-quirk.patch +3ee5ec5357f237dc78847feb85d8560d download/alsa-driver-1.0.21.tar.bz2 +cb75820e9d0a0ca55ae85fe75be25550 download/alsa-driver-1.0.21-quirk.patch ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.31/kernel/Makefile Thu Jul 23 13:41:26 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.31/kernel/Makefile Tue Sep 1 11:20:30 2009 @@ -8,7 +8,7 @@ endef DEPENDS = \ - $(filter-out %/Makefile %/kernel %/alsa-driver,$(subst ../../,,$(wildcard ../../kernel-2.6.31/*))) + $(filter-out %/Makefile %/kernel,$(subst ../../,,$(wildcard ../../kernel-2.6.31/*))) GAR_EXTRA_CONF += kernel-2.6.31/linux/package-api.mk include ../../gar.mk ======================================= --- /trunk/gar-minimyth/script/lib/alsa-lib/Makefile Wed May 6 21:20:26 2009 +++ /trunk/gar-minimyth/script/lib/alsa-lib/Makefile Tue Sep 1 11:20:30 2009 @@ -1,5 +1,5 @@ GARNAME = alsa-lib -GARVERSION = 1.0.20 +GARVERSION = 1.0.21 CATEGORIES = lib MASTER_SITES = ftp://ftp.alsa-project.org/pub/lib/ DISTFILES = $(DISTNAME).tar.bz2 ======================================= --- /trunk/gar-minimyth/script/lib/alsa-lib/checksums Wed May 6 21:20:26 2009 +++ /trunk/gar-minimyth/script/lib/alsa-lib/checksums Tue Sep 1 11:20:30 2009 @@ -1,1 +1,1 @@ -6e9080ba1faa5d3739d14dd76c62d8dc download/alsa-lib-1.0.20.tar.bz2 +d8a556041a4cbeeae0c32eadeffb3c74 download/alsa-lib-1.0.21.tar.bz2 ======================================= --- /trunk/gar-minimyth/script/utils/alsa-utils/Makefile Wed May 6 21:20:26 2009 +++ /trunk/gar-minimyth/script/utils/alsa-utils/Makefile Tue Sep 1 11:20:30 2009 @@ -1,5 +1,5 @@ GARNAME = alsa-utils -GARVERSION = 1.0.20 +GARVERSION = 1.0.21 CATEGORIES = utils MASTER_SITES = ftp://ftp.alsa-project.org/pub/utils/ DISTFILES = $(DISTNAME).tar.bz2 ======================================= --- /trunk/gar-minimyth/script/utils/alsa-utils/checksums Wed May 6 21:20:26 2009 +++ /trunk/gar-minimyth/script/utils/alsa-utils/checksums Tue Sep 1 11:20:30 2009 @@ -1,2 +1,2 @@ -6837e673ef19da96d8bd2f9e18cd9574 download/alsa-utils-1.0.20.tar.bz2 -30b66128226d5f8057fee80cefe0e45e download/alsa-utils-1.0.20.patch.gar +3672287c2608040d111ce45495ba7602 download/alsa-utils-1.0.21.tar.bz2 +975e4e71c8ad79b00f96b7dba6fb32cb download/alsa-utils-1.0.21.patch.gar --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
