From 4899fe3c602cc9eb3f153f0f741760469417bc3c Mon Sep 17 00:00:00 2001 From: Diskmaster Date: Wed, 20 Aug 2008 01:28:08 -0500 Subject: [PATCH] alsa-utils update, attempted alsa-tools update (which failed, lol missing files / bad patch), fixed nvidia-drivers. --- media-sound/alsa-driver/Manifest | 1 + .../alsa-driver/files/git-update-082008.patch | 35 ++++++++++++++++++++++ media-sound/alsa-tools/Manifest | 2 +- media-sound/alsa-tools/alsa-tools-1.0.17.ebuild | 1 + media-sound/alsa-utils/Manifest | 7 ++--- ....0.17-r6.ebuild => alsa-utils-1.0.17-r7.ebuild} | 0 media-sound/alsa-utils/files/git-update.patch | 34 ++++++++++++++------- x11-drivers/nvidia-drivers/Manifest | 2 +- .../nvidia-drivers/nvidia-drivers-177.67.ebuild | 2 +- 9 files changed, 66 insertions(+), 18 deletions(-) create mode 100644 media-sound/alsa-driver/files/git-update-082008.patch rename media-sound/alsa-utils/{alsa-utils-1.0.17-r6.ebuild => alsa-utils-1.0.17-r7.ebuild} (100%) diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest index 29b11e6..21c4c99 100644 --- a/media-sound/alsa-driver/Manifest +++ b/media-sound/alsa-driver/Manifest @@ -1,4 +1,5 @@ AUX git-update-081808.patch 621 RMD160 fd76d0d4ed73b618cfc47ac329ff3bd2efcaac98 SHA1 b89b3652c6823a257e45444b47cca78ea098b416 SHA256 b0fc3decc5798e604e76c95b7c2156914011c0a8fb2c124920711cb60d692e2a +AUX git-update-082008.patch 905 RMD160 85e43c4d25a9aa29a7a613c8d15fbb1e8e1f74cd SHA1 a3a430262c8272c3d713fc63f412c5de34bd951b SHA256 035796a3de8660a63f41ee40a6dc63def9dab2bad4635dd196ede7fcff4f4a59 AUX git-update-r2.patch 79169 RMD160 fe663c20769c1cf6ef1a88418b6d79d3ad21b6b8 SHA1 ba50c61f3095e05eaef937e6cd33297f365e74bb SHA256 8ffbda22ba2f533d7a4a0bb879af000d72ffee8f6affefeb1c80cb842ad67b15 AUX git-update-r3.patch 80135 RMD160 cf26fbf4545367537ba6546d1c1f5329a2adcdab SHA1 80973ab075bdbfa5195af5f4be921ed2ef34bacb SHA256 c2842e77d49cb917d7e09c9d8566dbeab062029f91ec3a0da36a2a61017d183a DIST alsa-driver-1.0.17.tar.bz2 2725803 RMD160 e9e33ef8be8d808c66cc93e6bf124d16636c805c SHA1 82fc35333a43f834e5e4b16c425e3ee49d137ae8 SHA256 7695cc9c8c42b3d4fe4f918d24a751deb36b2fbb0ff2aaa2b1605c8ce11d4c9f diff --git a/media-sound/alsa-driver/files/git-update-082008.patch b/media-sound/alsa-driver/files/git-update-082008.patch new file mode 100644 index 0000000..871c4f1 --- /dev/null +++ b/media-sound/alsa-driver/files/git-update-082008.patch @@ -0,0 +1,35 @@ +diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh +index 3a48e81..8d1e944 100755 +--- a/utils/alsa-info.sh ++++ b/utils/alsa-info.sh +@@ -1,6 +1,6 @@ + #!/bin/bash + +-SCRIPT_VERSION=0.4.49 ++SCRIPT_VERSION=0.4.51 + CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog" + + ################################################################################# +@@ -104,6 +104,7 @@ withamixer() { + CARD_NAME=`grep "^ *$i " /tmp/alsainfo/alsacards.tmp|awk {'print $2'}` + echo "!!-------Mixer controls for card $i $CARD_NAME]" >> $FILE + echo "" >>$FILE ++ amixer -c$i info>> $FILE 2>&1 + amixer -c$i>> $FILE 2>&1 + echo "" >> $FILE + done +@@ -434,6 +435,14 @@ then + do + case "$1" in + --pastebin) ++ update ++ withdevices ++ withconfigs ++ withaplay ++ withamixer ++ withalsactl ++ withlsmod ++ pbcheck + ;; + --update) + update diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest index 69ec958..453ac2d 100644 --- a/media-sound/alsa-tools/Manifest +++ b/media-sound/alsa-tools/Manifest @@ -1,5 +1,5 @@ AUX alsa-tools-1.0.11-asneeded.patch 1845 RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 SHA1 63a368a5d0e435f085e8d84ff7968bb1ac6e78f3 SHA256 95d69d5b9400818243806b643450f8b75e9411efa2acb8ad02e5063fea0de33c AUX alsa-tools-1.0.14-asneeded.patch 256 RMD160 db252d8994605036e5ab200af2d7a9dc633650b5 SHA1 94cd80b03fd5d58ef564e26711c60b95ece3b4d6 SHA256 d309bee615d0d22da845f7448e4be48d9838a006a4b53b745149410123a34ca8 DIST alsa-tools-1.0.17.tar.bz2 1546105 RMD160 0ec3f6a27ba085beb183e416bbcfc4658f0710e7 SHA1 a127fcc1ee5d4757b259a50b289db252f2951d7a SHA256 464bfa1a25de822367f95e9050413753601da36cd79302e20eb566cbef834c40 -EBUILD alsa-tools-1.0.17.ebuild 3764 RMD160 9ebd9d1e27db94644ea5d563a3456338532d25b9 SHA1 35f1b5e2d528336ccc5a1366e990746c81a4f645 SHA256 9be7e481b72a5093e4dd9a78a5697584409db94f84f97a4a6980b41bda256b3b +EBUILD alsa-tools-1.0.17.ebuild 3882 RMD160 f3b742c4bb9e752fdda33325bfd24d3e15ef8030 SHA1 7eb9beb126d4c53d2ce377c6ccb2d87e3a88c244 SHA256 41c03d2a265dce68de48b32b55eca33e3713794dd1feb336eb775889f33d1d0f MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 diff --git a/media-sound/alsa-tools/alsa-tools-1.0.17.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.17.ebuild index 18a1191..5f4b7a3 100644 --- a/media-sound/alsa-tools/alsa-tools-1.0.17.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.0.17.ebuild @@ -87,6 +87,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-1.0.11-asneeded.patch" epatch "${FILESDIR}/${PN}-1.0.14-asneeded.patch" +# epatch "${FILESDIR}/git-update.patch" It's not working yet. Issues with a faulty tarball (missing files again, oy.) for dir in echomixer envy24control rmedigicontrol; do pushd "${dir}" &> /dev/null diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index 26fe272..cd480c9 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -7,9 +7,8 @@ AUX alsasound-1.0.10_rc2 7183 RMD160 7c1368905cc0fbe266e840f358a3502bbedb6d9c SH AUX alsasound-init-20070218 7657 RMD160 283ed673ec6f61c3aac77957393bd84ba05ff8d2 SHA1 16105ee86f8f208526eda4ce8ec6ff6b8206bedf SHA256 0330f7c58719e5669e39224be60bb6c2a1ba09b138801785655ffd245dc9d1e8 AUX alsasound.confd 1052 RMD160 b3a788626e239a844ac71119e887066074be3b30 SHA1 6386e6097629dcd405b61fd950370e610362a712 SHA256 073015ea00ffcbe536fd15258d30d17cdd8cacd6c334f330882d5ed9bdcf83ad AUX alsasound.initd 6557 RMD160 6e58e7b93619a505f87f8de7fecc6489daf5638f SHA1 fb1c5436e2ddfa191119fb19d439fe43e9f797f1 SHA256 09e54f5e4f75331a1de3af641623edcf4d687b49f23180f8bc14b42fc471acfe -AUX git-update.patch 177669 RMD160 95ce51e33561a853363405407ea690542205ae7b SHA1 f738b50a26fbd6e852b7079e88680009b4380069 SHA256 312219cf4338e9271c7eb47981ab9808cb1291ee7e0cf5e7788a686cca3c3ef9 +AUX git-update.patch 177960 RMD160 e523e23a71242459eb2002174792b0e6c832f644 SHA1 42ec13b63b1ac413ae4f4e638b4d6f3114fef299 SHA256 2f54403abc49c73331533099e682c7c455c14d3d1d68c0b47d70e791539bf4e5 DIST alsa-utils-1.0.17.tar.bz2 1016532 RMD160 6dbc55ffab43a6552bc5032099a071101be467ab SHA1 e71f752b79357fd8ad1c86e4e926cbce19de19d3 SHA256 6a06f457d66eca75ac1ab065e64539e4ccf22ed4e53703a70194cb85203b3125 -DIST alsa-utils-1.0.18rc2.tar.bz2 224129 RMD160 893ff0d018fc8a5ca8ed561f2b46d6f65fd72c23 SHA1 c1320e4c5d781836fcf3e01a186a73ebafe12dc0 SHA256 e0f8b46867c9956c84474b669427c2c330edfe154ee54980649127118d7b12ad -EBUILD alsa-utils-1.0.17-r6.ebuild 2834 RMD160 279303867975d6152e4a1ac7024e409bf6f051f7 SHA1 4ddbee2d425d7a162f698bfcc67b22a5f6d2a143 SHA256 a5b6f47dbcdd3294c89b98409c575add9dccf168c4951c82a3cdbdc01578346d -EBUILD alsa-utils-1.0.18_rc2.ebuild 2985 RMD160 193d29422f942d34bc2b4d3302b43ae1ca839329 SHA1 d5469330f6a6f94ce275297e42f488336739a805 SHA256 2012e6b38efc461990b76d7a1db6953a65ffa74aece6c672bd3f67b813aa27f1 +EBUILD alsa-utils-1.0.17-r7.ebuild 2834 RMD160 279303867975d6152e4a1ac7024e409bf6f051f7 SHA1 4ddbee2d425d7a162f698bfcc67b22a5f6d2a143 SHA256 a5b6f47dbcdd3294c89b98409c575add9dccf168c4951c82a3cdbdc01578346d +MISC alsa-utils-1.0.18_rc2.broken 2985 RMD160 193d29422f942d34bc2b4d3302b43ae1ca839329 SHA1 d5469330f6a6f94ce275297e42f488336739a805 SHA256 2012e6b38efc461990b76d7a1db6953a65ffa74aece6c672bd3f67b813aa27f1 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 diff --git a/media-sound/alsa-utils/alsa-utils-1.0.17-r6.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.17-r7.ebuild similarity index 100% rename from media-sound/alsa-utils/alsa-utils-1.0.17-r6.ebuild rename to media-sound/alsa-utils/alsa-utils-1.0.17-r7.ebuild diff --git a/media-sound/alsa-utils/files/git-update.patch b/media-sound/alsa-utils/files/git-update.patch index 3a82d06..25a4efa 100644 --- a/media-sound/alsa-utils/files/git-update.patch +++ b/media-sound/alsa-utils/files/git-update.patch @@ -18,7 +18,7 @@ index d21a496..3c5902b 100644 +%.7: %.xml + xmlto man $? diff --git a/alsactl/alsactl.1 b/alsactl/alsactl.1 -index 48924c2..f9bcaef 100644 +index 48924c2..d7f30f6 100644 --- a/alsactl/alsactl.1 +++ b/alsactl/alsactl.1 @@ -4,7 +4,7 @@ alsactl \- advanced controls for ALSA soundcard driver @@ -65,7 +65,7 @@ index 48924c2..f9bcaef 100644 .TP \fI\-F, \-\-force\fP -@@ -49,12 +56,22 @@ Used with restore command. Don't restore mismatching control elements. +@@ -49,12 +56,24 @@ Used with restore command. Don't restore mismatching control elements. This option was the old default behavior. .TP @@ -83,7 +83,9 @@ index 48924c2..f9bcaef 100644 + +.TP +\fI\-E, \-\-env\fP #=# -+Set environment variable (useful for init action). ++Set environment variable (useful for init action or you may override ++ALSA_CONFIG_PATH to read different or optimized configuration - may be ++useful for "boot" scripts). + +.TP +\fI\-i, \-\-initfile\fP #=# @@ -92,7 +94,7 @@ index 48924c2..f9bcaef 100644 .SH FILES \fI/etc/asound.state\fP (or whatever file you specify with the -@@ -70,13 +87,6 @@ necessary for some soundcard features (e.g. enabling/disabling +@@ -70,13 +89,6 @@ necessary for some soundcard features (e.g. enabling/disabling automatic mic gain, digital output, joystick/game ports, some future MIDI routing options, etc). @@ -107,7 +109,7 @@ index 48924c2..f9bcaef 100644 \fB amixer(1), diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c -index 78c6cb1..6c62ffc 100644 +index 78c6cb1..6728fbc 100644 --- a/alsactl/alsactl.c +++ b/alsactl/alsactl.c @@ -31,28 +31,37 @@ @@ -211,7 +213,7 @@ index 78c6cb1..6c62ffc 100644 case 'P': force_restore = 0; break; -@@ -111,16 +149,25 @@ int main(int argc, char *argv[]) +@@ -111,21 +149,31 @@ int main(int argc, char *argv[]) return 0; } @@ -246,6 +248,12 @@ index 78c6cb1..6c62ffc 100644 } else { fprintf(stderr, "alsactl: Unknown command '%s'...\n", argv[optind]); + res = -ENODEV; + } + ++ snd_config_update_free_global(); + return res < 0 ? res : 0; + } diff --git a/alsactl/alsactl.h b/alsactl/alsactl.h index f1e2b41..408b145 100644 --- a/alsactl/alsactl.h @@ -1508,10 +1516,10 @@ index 0000000..26db2a3 +PRINT="\nAll tests done..\n" diff --git a/alsactl/init_parse.c b/alsactl/init_parse.c new file mode 100644 -index 0000000..57f9a92 +index 0000000..ab6a6f9 --- /dev/null +++ b/alsactl/init_parse.c -@@ -0,0 +1,1734 @@ +@@ -0,0 +1,1738 @@ +/* + * Advanced Linux Sound Architecture Control Program - Parse initialization files + * Copyright (c) by Jaroslav Kysela , @@ -1638,13 +1646,16 @@ index 0000000..57f9a92 + space->ctl_card_info = NULL; + } + if (space->ctl_handle) { -+ free(space->ctl_handle); ++ snd_hctl_close(space->ctl_handle); + space->ctl_handle = NULL; + } + if (space->rootdir) + free(space->rootdir); + if (space->program_result) + free(space->program_result); ++ if (space->go_to) ++ free(space->go_to); ++ free(space); +} + +struct pair *value_find(struct space *space, const char *key) @@ -3194,6 +3205,7 @@ index 0000000..57f9a92 + linenum += linenum_adj; + } + ++ free(line); + space->filename = NULL; + space->linenum = -1; + file_unmap(buf, bufsize); @@ -5582,7 +5594,7 @@ index 61259f6..f93fa9e 100644 } break; diff --git a/configure.in b/configure.in -index 2484971..485551e 100644 +index 2484971..8d03a59 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. @@ -5590,7 +5602,7 @@ index 2484971..485551e 100644 AC_INIT(alsamixer/alsamixer.c) AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(alsa-utils, 1.0.17) -+AM_INIT_AUTOMAKE(alsa-utils, 1.0.18rc1) ++AM_INIT_AUTOMAKE(alsa-utils, 1.0.18rc2) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.15]) diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 0757534..383482a 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -23,6 +23,6 @@ DIST NVIDIA-Linux-x86_64-177.13-pkg2.run 18711739 RMD160 066a4349c79183eb3bdfdc1 DIST NVIDIA-Linux-x86_64-177.67-pkg2.run 19000110 RMD160 df6a36e46b6d55998d7a3e21cc61ad512927f8d2 SHA1 38c944bedb8fb9665036ec5232dd7e3a96b12fc0 SHA256 0345543dc2105707248cd47c7a864492e5bdc3f6d91729d4d2e628d66c4cd1c3 EBUILD nvidia-drivers-173.14.12-r2.ebuild 15192 RMD160 f71fefc8c0757f4b3691902b574f1efecfe5c8ce SHA1 675657863cbf2b279c9d9bcd008c24d7911f4fe7 SHA256 2b2492f93b64945cf31470170a5aaea90e7e8b7df9699c8985e02b2c82f9bb4f EBUILD nvidia-drivers-177.13-r2.ebuild 15126 RMD160 8e384e8a8ae253909eb2d3b462e32a21b16fde25 SHA1 5de7e1355f98895b248f4c8b9bec374b6bbcdc25 SHA256 d8f4fe42a4a6774457239bf39b0d7d00bf8449ff323410eba1ac41a1fddea111 -EBUILD nvidia-drivers-177.67.ebuild 15127 RMD160 84e117cb7ff3fb212701a8e50b0e63bf39cbfaa2 SHA1 95b9b740d9d190315426655febdec2487024b473 SHA256 91a65acd0b590967a7c4a05756b6e1c9c2998a8e12ea2aa1efeea7195547fc8b +EBUILD nvidia-drivers-177.67.ebuild 15127 RMD160 6939aa765bd60ada3f651520c338ad3fdaaff314 SHA1 292ac1edcc2fba6aabd5fe644e8c197ad0f2d095 SHA256 47825e61d4a6005bab3cced51f9cf22ce2972cf54bb05813cd16d7602677f348 MISC nvidia-drivers-71.86.06-r1.broken 14155 RMD160 f207839e179320ed6856ebedba226f96dfb60b97 SHA1 20afc2d05be6961e3fa543c641e639aaddaf9ac5 SHA256 c6ae256df48c4d98406d7b0ea6a477844f32259e9d9b34888304d459352934ca MISC nvidia-drivers-96.43.07-r1.broken 14492 RMD160 6562d2a1c80231aeda3f2697f8163cc7468cb7ef SHA1 f6735a288296394ab339d26059ad022aa4c8e735 SHA256 0282550955420e78ed9e54315635e64870dd2e1b3e2384a517f3e4609fd92db7 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-177.67.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-177.67.ebuild index 00ab72d..13d4d5b 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-177.67.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-177.67.ebuild @@ -87,7 +87,7 @@ QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib64/opengl/nvidia/extensions/libglx.so" if use x86; then - PKG_V="-pkg0" + PKG_V="-pkg1" NV_PACKAGE="${X86_NV_PACKAGE}" elif use amd64; then PKG_V="-pkg2" -- 2.11.4.GIT