diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-08-09 16:44:14 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-08-09 16:44:14 +0000 |
commit | fb84d02a445a1e69b8fd842fb658d9229917e6f3 (patch) | |
tree | 5fb128da83be2cdac0bf218716ab9fc974db8750 /media-libs/openal | |
parent | Removing the older CVS snapshot ebuilds in favor of the released 0.0.8 version. (diff) | |
download | gentoo-2-fb84d02a445a1e69b8fd842fb658d9229917e6f3.tar.gz gentoo-2-fb84d02a445a1e69b8fd842fb658d9229917e6f3.tar.bz2 gentoo-2-fb84d02a445a1e69b8fd842fb658d9229917e6f3.zip |
Removing the older CVS snapshot ebuilds in favor of the released 0.0.8 version.
(Portage version: 2.1.1_pre4-r4)
(Signed Manifest commit)
Diffstat (limited to 'media-libs/openal')
-rw-r--r-- | media-libs/openal/Manifest | 69 | ||||
-rw-r--r-- | media-libs/openal/files/digest-openal-20050504-r1 | 3 | ||||
-rw-r--r-- | media-libs/openal/files/digest-openal-20050504-r2 | 3 | ||||
-rw-r--r-- | media-libs/openal/files/digest-openal-20051024 | 3 | ||||
-rw-r--r-- | media-libs/openal/files/openal-20040817-alsa_capture.diff | 414 | ||||
-rw-r--r-- | media-libs/openal/files/openal-20040817-destdir.patch | 14 | ||||
-rw-r--r-- | media-libs/openal/files/openal-20050504-alsa_capture.patch | 375 | ||||
-rw-r--r-- | media-libs/openal/files/openal-20050504-alsa_dmix.patch | 41 | ||||
-rw-r--r-- | media-libs/openal/files/openal-20050504-destdir.patch | 17 | ||||
-rw-r--r-- | media-libs/openal/files/openal-20051024-alsa_dmix.patch | 41 | ||||
-rw-r--r-- | media-libs/openal/files/openal-20051024-amd64-configure.patch | 22 | ||||
-rw-r--r-- | media-libs/openal/openal-20050504-r1.ebuild | 82 | ||||
-rw-r--r-- | media-libs/openal/openal-20050504-r2.ebuild | 83 | ||||
-rw-r--r-- | media-libs/openal/openal-20051024.ebuild | 79 |
14 files changed, 14 insertions, 1232 deletions
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest index 5290ac1c2e88..3103db4b61b4 100644 --- a/media-libs/openal/Manifest +++ b/media-libs/openal/Manifest @@ -1,58 +1,19 @@ -AUX openal-20040817-alsa_capture.diff 12172 RMD160 fb4976d88f71ab69c0b98c6fd58d487b5a96e310 SHA1 9339148581569171f562c4022816ba4b2f6e5deb SHA256 09f73c8b142f40ab601b62d0734867d2f444b6f98ab0840cc6d4da11a420747f -MD5 526498c24d3601f624e025aaa7c46de2 files/openal-20040817-alsa_capture.diff 12172 -RMD160 fb4976d88f71ab69c0b98c6fd58d487b5a96e310 files/openal-20040817-alsa_capture.diff 12172 -SHA256 09f73c8b142f40ab601b62d0734867d2f444b6f98ab0840cc6d4da11a420747f files/openal-20040817-alsa_capture.diff 12172 -AUX openal-20040817-destdir.patch 498 RMD160 6a79896f9666e7ae8e933ae019ab0995581543c7 SHA1 1fea6df19863c8e745bdf08ead3dda4da028e4b9 SHA256 2561bd68fb9a76afbccca87f35caca26cc1efdaafc9293a1393a7f2c87b91227 -MD5 7d1289ab83aa79eaa7e09d5e4ccacc45 files/openal-20040817-destdir.patch 498 -RMD160 6a79896f9666e7ae8e933ae019ab0995581543c7 files/openal-20040817-destdir.patch 498 -SHA256 2561bd68fb9a76afbccca87f35caca26cc1efdaafc9293a1393a7f2c87b91227 files/openal-20040817-destdir.patch 498 -AUX openal-20050504-alsa_capture.patch 11190 RMD160 5a1c4e462e84378eb5edb2d905d1952ff85360dc SHA1 92fe082db77f6e78738e385bdd60103b10835e09 SHA256 c0ec6d7634029dbc3b0932089fa95cb79026800683d7cf9828386b9ad6cd0308 -MD5 68ac7979713ff68db71dc5c4c84562d0 files/openal-20050504-alsa_capture.patch 11190 -RMD160 5a1c4e462e84378eb5edb2d905d1952ff85360dc files/openal-20050504-alsa_capture.patch 11190 -SHA256 c0ec6d7634029dbc3b0932089fa95cb79026800683d7cf9828386b9ad6cd0308 files/openal-20050504-alsa_capture.patch 11190 -AUX openal-20050504-alsa_dmix.patch 2136 RMD160 1b5809a2394971189f248716c3e37c8265703cb0 SHA1 02c3f17e08ee0f9beaaf1edbc0fb6efb2966d033 SHA256 7d99e684cd8dd024cf0f67e512a1b48173cafdf60279ad06429906c8f03cf5b3 -MD5 91872ec26d41d4a593d31b96f3a379c4 files/openal-20050504-alsa_dmix.patch 2136 -RMD160 1b5809a2394971189f248716c3e37c8265703cb0 files/openal-20050504-alsa_dmix.patch 2136 -SHA256 7d99e684cd8dd024cf0f67e512a1b48173cafdf60279ad06429906c8f03cf5b3 files/openal-20050504-alsa_dmix.patch 2136 -AUX openal-20050504-destdir.patch 539 RMD160 fa3db547a950a19d8ee59dbac58d5048d8508824 SHA1 c8c211246cc97063a41820ec984b9c35fcf4650d SHA256 57840a377445c8273b0f9ecdfa1d5b7259d78133f2ff3631689fc92966f3c284 -MD5 fb8620e95bf8f669b19915d079769a6c files/openal-20050504-destdir.patch 539 -RMD160 fa3db547a950a19d8ee59dbac58d5048d8508824 files/openal-20050504-destdir.patch 539 -SHA256 57840a377445c8273b0f9ecdfa1d5b7259d78133f2ff3631689fc92966f3c284 files/openal-20050504-destdir.patch 539 -AUX openal-20051024-alsa_dmix.patch 2136 RMD160 9d57e592b09e1d05b745b9ebfd1d266db3b605f7 SHA1 4aabbd3b506e216b2cffd63dab2e929fcdc91e63 SHA256 2dd88fa66056938b93c208459bb2dcd5944162c14699202f4fb42e54593b9174 -MD5 8f54e2a7d59c6bd9f0fb71e2534f0908 files/openal-20051024-alsa_dmix.patch 2136 -RMD160 9d57e592b09e1d05b745b9ebfd1d266db3b605f7 files/openal-20051024-alsa_dmix.patch 2136 -SHA256 2dd88fa66056938b93c208459bb2dcd5944162c14699202f4fb42e54593b9174 files/openal-20051024-alsa_dmix.patch 2136 -AUX openal-20051024-amd64-configure.patch 841 RMD160 69aaa4d997f4dbfeab156ccc01ea96fd8d2d0123 SHA1 85ad16c8478b23ac2920d613000232dca1e4a279 SHA256 948ab5487bb43a18cb7ac0d24e384f4cf4c9d89d40aabac2cf6111a24479464c -MD5 01e4c30898e39d8727af8c01bca7dd53 files/openal-20051024-amd64-configure.patch 841 -RMD160 69aaa4d997f4dbfeab156ccc01ea96fd8d2d0123 files/openal-20051024-amd64-configure.patch 841 -SHA256 948ab5487bb43a18cb7ac0d24e384f4cf4c9d89d40aabac2cf6111a24479464c files/openal-20051024-amd64-configure.patch 841 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX openalrc 221 RMD160 9afe92b1f944edba63bef98aff1a06174b7ddb5c SHA1 3a99c21694ff8de541217712f309bafda10ffc69 SHA256 64d99c4ac168e76d2af347230ec137baea7d72f1d73f5c34c06ef859cf74ecb6 MD5 8072d11c3e5e44c43407bed8c67b4031 files/openalrc 221 RMD160 9afe92b1f944edba63bef98aff1a06174b7ddb5c files/openalrc 221 SHA256 64d99c4ac168e76d2af347230ec137baea7d72f1d73f5c34c06ef859cf74ecb6 files/openalrc 221 DIST openal-0.0.8.tar.gz 870671 RMD160 29368dbceea7cfd8b5c520b9e0f0cfdc7324e265 SHA1 31aaedc18bd26759bd51f4fa495bc4ccb08acb3e SHA256 723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe -DIST openal-20050504.tar.bz2 6284126 RMD160 8fd4e7f00705d2bf936f8573bd2113684defcdbd SHA1 0f7f508bb057735aef0587e2a27c4aef148d1b30 SHA256 d05d41cb95bbc066e7b8d4b55d30866a5b023fc851b1d977fec4026d10b43c98 -DIST openal-20051024.tar.bz2 4983129 RMD160 396e7c7bd58f85224add8827101ff426ebfc8a6a SHA256 820507e91095941a9be05576c5da04241d997e37b6881653fa260a44c7aa6503 EBUILD openal-0.0.8.ebuild 1367 RMD160 d804e8491766366849ea0fc25a5dd49583853ec4 SHA1 4421fa234ea8c520c0f38ccd4b89c0d24ff69da0 SHA256 8454b2e6cd2ef8a364ff281661d7526c4ca25e1dc87720fab5f0582c2d0165f2 MD5 ea29eb419b22b7bda0cf7efba82c05ec openal-0.0.8.ebuild 1367 RMD160 d804e8491766366849ea0fc25a5dd49583853ec4 openal-0.0.8.ebuild 1367 SHA256 8454b2e6cd2ef8a364ff281661d7526c4ca25e1dc87720fab5f0582c2d0165f2 openal-0.0.8.ebuild 1367 -EBUILD openal-20050504-r1.ebuild 1970 RMD160 b1984baa4a7889188a0f12386a37a5e9d1c169f6 SHA1 d6473ee0759cb124cc5dcb53d856acaed6f74094 SHA256 e0bf30db8913b235597655b4888fa6681a4fab1dacb69449f18d5dca96073112 -MD5 07dcb88002545d950bacb0dc1c26be8f openal-20050504-r1.ebuild 1970 -RMD160 b1984baa4a7889188a0f12386a37a5e9d1c169f6 openal-20050504-r1.ebuild 1970 -SHA256 e0bf30db8913b235597655b4888fa6681a4fab1dacb69449f18d5dca96073112 openal-20050504-r1.ebuild 1970 -EBUILD openal-20050504-r2.ebuild 2047 RMD160 978f8be799cd1749fdc3f9b1a4cf88391377585c SHA1 1ad0b01b95be2ab4da2c78020da54849a564818f SHA256 552ffc13b1e8bb11a249f248f1c4bdb91ae33db8b6e73c3ee5b86fe38a3955cb -MD5 2a72b9e875a6405c330639bb7e332aaa openal-20050504-r2.ebuild 2047 -RMD160 978f8be799cd1749fdc3f9b1a4cf88391377585c openal-20050504-r2.ebuild 2047 -SHA256 552ffc13b1e8bb11a249f248f1c4bdb91ae33db8b6e73c3ee5b86fe38a3955cb openal-20050504-r2.ebuild 2047 -EBUILD openal-20051024.ebuild 1946 RMD160 5a102833d3eb7d565bb50ffb78965153a8d54aef SHA1 4f84208c2ab3576d2498b847997c02c398e89ef5 SHA256 dd3edbe31fe003d344a44acede2260f26f7630b49504024870a737f97f56f095 -MD5 7d7c61aeadb452dfa62a4d6d0299e6a6 openal-20051024.ebuild 1946 -RMD160 5a102833d3eb7d565bb50ffb78965153a8d54aef openal-20051024.ebuild 1946 -SHA256 dd3edbe31fe003d344a44acede2260f26f7630b49504024870a737f97f56f095 openal-20051024.ebuild 1946 -MISC ChangeLog 8761 RMD160 07a018fcfb8788bc588872559880f682cf0c20c2 SHA1 457025ea5975e835e7be0581eae14a3f7cdf3d34 SHA256 5fb2feb7eb8722ce16aef45f00121cc19c83f1adcac5ccbb067185ed99d6c866 -MD5 13e51d1bc550b4c32d1dcee7cdd3427e ChangeLog 8761 -RMD160 07a018fcfb8788bc588872559880f682cf0c20c2 ChangeLog 8761 -SHA256 5fb2feb7eb8722ce16aef45f00121cc19c83f1adcac5ccbb067185ed99d6c866 ChangeLog 8761 +MISC ChangeLog 9285 RMD160 d083f980bdfda33818c231bb492bf12d4141cf3a SHA1 d4bd1d15d72883eaf1988c6999980ff3ccd4846f SHA256 c0d44b9b735aeb8fd45f89ea2671cdb3ac7f979ed4a51b5d1af766b50525c614 +MD5 7a65ec577ef7f3fa6da3596c8953db81 ChangeLog 9285 +RMD160 d083f980bdfda33818c231bb492bf12d4141cf3a ChangeLog 9285 +SHA256 c0d44b9b735aeb8fd45f89ea2671cdb3ac7f979ed4a51b5d1af766b50525c614 ChangeLog 9285 MISC metadata.xml 254 RMD160 644af66426d6eb797cd765c1c2e535b5d087ea57 SHA1 a95604d0e8bc9b8b04265487ab3b8c81fb2359e7 SHA256 696bf530d6cfd1ba1081ac29536d76e7fc8fd002e6f17d4a77463eeba34e4ba4 MD5 ec6dcddda50a0138e1f50eb0d1299798 metadata.xml 254 RMD160 644af66426d6eb797cd765c1c2e535b5d087ea57 metadata.xml 254 @@ -60,12 +21,10 @@ SHA256 696bf530d6cfd1ba1081ac29536d76e7fc8fd002e6f17d4a77463eeba34e4ba4 metadata MD5 f689a64f0322e2726a79314b4f98c0d3 files/digest-openal-0.0.8 238 RMD160 81fc753e9ba8a3bb20947ab60dffdc81ef4dfab1 files/digest-openal-0.0.8 238 SHA256 464c3f71037e0d7692230557ba1321a83fc2236fa2bb799621ef8459a24d495d files/digest-openal-0.0.8 238 -MD5 cd6b1cc7280b863d11f3a976e67b64cf files/digest-openal-20050504-r1 253 -RMD160 1313cf50dd965eada7490fb359f2625204992d76 files/digest-openal-20050504-r1 253 -SHA256 5ff7e5a5aeabdd92e99e2317c1de87eb124b20b7be1035bc0ad720351c13b56a files/digest-openal-20050504-r1 253 -MD5 cd6b1cc7280b863d11f3a976e67b64cf files/digest-openal-20050504-r2 253 -RMD160 1313cf50dd965eada7490fb359f2625204992d76 files/digest-openal-20050504-r2 253 -SHA256 5ff7e5a5aeabdd92e99e2317c1de87eb124b20b7be1035bc0ad720351c13b56a files/digest-openal-20050504-r2 253 -MD5 2faedc07621d8cbeba019c666ff78e41 files/digest-openal-20051024 253 -RMD160 3000f04b7588d13da53b18ad7a55ce403e9afe07 files/digest-openal-20051024 253 -SHA256 45fb80758304d4b0ca73f9ee9ecc40bcf81e09c4f265856408e6ef8821de08e1 files/digest-openal-20051024 253 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFE2hDckT4lNIS36YERAsfPAJ9DNoLSPnhAaZpjrbdtaM14GJUHGQCgpzcT +Uw6wRhJ21GMO6YK43GF/DGw= +=tteM +-----END PGP SIGNATURE----- diff --git a/media-libs/openal/files/digest-openal-20050504-r1 b/media-libs/openal/files/digest-openal-20050504-r1 deleted file mode 100644 index 709bcabbde47..000000000000 --- a/media-libs/openal/files/digest-openal-20050504-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c2b74df0028d36d24745b4db9867de97 openal-20050504.tar.bz2 6284126 -RMD160 8fd4e7f00705d2bf936f8573bd2113684defcdbd openal-20050504.tar.bz2 6284126 -SHA256 d05d41cb95bbc066e7b8d4b55d30866a5b023fc851b1d977fec4026d10b43c98 openal-20050504.tar.bz2 6284126 diff --git a/media-libs/openal/files/digest-openal-20050504-r2 b/media-libs/openal/files/digest-openal-20050504-r2 deleted file mode 100644 index 709bcabbde47..000000000000 --- a/media-libs/openal/files/digest-openal-20050504-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c2b74df0028d36d24745b4db9867de97 openal-20050504.tar.bz2 6284126 -RMD160 8fd4e7f00705d2bf936f8573bd2113684defcdbd openal-20050504.tar.bz2 6284126 -SHA256 d05d41cb95bbc066e7b8d4b55d30866a5b023fc851b1d977fec4026d10b43c98 openal-20050504.tar.bz2 6284126 diff --git a/media-libs/openal/files/digest-openal-20051024 b/media-libs/openal/files/digest-openal-20051024 deleted file mode 100644 index 6f257d498062..000000000000 --- a/media-libs/openal/files/digest-openal-20051024 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c375bd9751f044e8a77882ad4ab3c9f8 openal-20051024.tar.bz2 4983129 -RMD160 396e7c7bd58f85224add8827101ff426ebfc8a6a openal-20051024.tar.bz2 4983129 -SHA256 820507e91095941a9be05576c5da04241d997e37b6881653fa260a44c7aa6503 openal-20051024.tar.bz2 4983129 diff --git a/media-libs/openal/files/openal-20040817-alsa_capture.diff b/media-libs/openal/files/openal-20040817-alsa_capture.diff deleted file mode 100644 index 916131e1e5bb..000000000000 --- a/media-libs/openal/files/openal-20040817-alsa_capture.diff +++ /dev/null @@ -1,414 +0,0 @@ -Index: linux/src/al_ext.c -=================================================================== -RCS file: /usr/local/cvs-repository/openal/linux/src/al_ext.c,v -retrieving revision 1.6 -diff -u -r1.6 al_ext.c ---- linux/src/al_ext.c 20 Jun 2003 19:23:05 -0000 1.6 -+++ linux/src/al_ext.c 2 Mar 2004 10:30:49 -0000 -@@ -993,5 +993,9 @@ - return ALC_TRUE; - } - -+ if(ustrcmp("ALC_CAPTURE_SAMPLES", ename) == 0) { -+ return 0x312; -+ } -+ - return 0; - } -Index: linux/src/al_main.c -=================================================================== -RCS file: /usr/local/cvs-repository/openal/linux/src/al_main.c,v -retrieving revision 1.9 -diff -u -r1.9 al_main.c ---- linux/src/al_main.c 10 Aug 2003 07:58:31 -0000 1.9 -+++ linux/src/al_main.c 2 Mar 2004 10:30:49 -0000 -@@ -133,6 +133,7 @@ - - #ifdef CAPTURE_SUPPORT - _alRegisterExtensionGroup( (const ALubyte*) "AL_EXT_capture" ); -+ _alRegisterExtensionGroup( (const ALubyte*) "ALC_EXT_capture" ); - #endif /* CAPTURE_SUPPORT */ - - #endif /* BUILTIN_EXT_LOKI */ -Index: linux/src/alc/alc_context.c -=================================================================== -RCS file: /usr/local/cvs-repository/openal/linux/src/alc/alc_context.c,v -retrieving revision 1.10 -diff -u -r1.10 alc_context.c ---- linux/src/alc/alc_context.c 20 Jun 2003 19:23:06 -0000 1.10 -+++ linux/src/alc/alc_context.c 2 Mar 2004 10:30:49 -0000 -@@ -1525,6 +1525,9 @@ - return deviceHandle->cc; - } - -+ -+ALint __alcGetAvailableSamples(ALvoid); -+ - void alcGetIntegerv( ALCdevice *deviceHandle, ALCenum token, - ALsizei size , ALint *dest ) - { -@@ -1546,6 +1549,9 @@ - time. - Check size - */ -+ case 0x312: /*ALC_CAPTURE_SAMPLES:*/ -+ *dest = __alcGetAvailableSamples(); -+ break; - case ALC_MAJOR_VERSION: - *dest = 1; - break; -Index: linux/src/extensions/al_ext_capture.c -=================================================================== -RCS file: /usr/local/cvs-repository/openal/linux/src/extensions/al_ext_capture.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 al_ext_capture.c ---- linux/src/extensions/al_ext_capture.c 18 Mar 2002 14:41:44 -0000 1.1.1.1 -+++ linux/src/extensions/al_ext_capture.c 2 Mar 2004 10:30:50 -0000 -@@ -45,6 +45,11 @@ - AL_EXT_PAIR(alCaptureStop_EXT), - AL_EXT_PAIR(alCaptureGetData_EXT), - AL_EXT_PAIR(alCaptureDestroy_EXT), -+ AL_EXT_PAIR(alcCaptureOpenDevice), -+ AL_EXT_PAIR(alcCaptureCloseDevice), -+ AL_EXT_PAIR(alcCaptureStart), -+ AL_EXT_PAIR(alcCaptureStop), -+ AL_EXT_PAIR(alcCaptureSamples), - { NULL, NULL } - }; - -@@ -72,8 +77,8 @@ - return; - } - --ALboolean alCaptureInit_EXT( UNUSED(ALenum format), -- UNUSED(ALuint rate), -+ALboolean alCaptureInit_EXT( ALenum format, -+ ALuint rate, - UNUSED(ALsizei bufferSize) ) - { - ALuint cid; -@@ -89,9 +94,26 @@ - capture_device = cc->read_device; - if ( capture_device == NULL ) { - char spec[1024]; -- char *fmt="'( (direction \"read\") (sampling-rate %d))"; -+ int speakers; -+ char *fmt="'( (direction \"read\") (sampling-rate %d) (speaker-num %d) )"; - -- sprintf(spec, fmt, rate); -+ switch (format) { -+ case AL_FORMAT_MONO8: -+ case AL_FORMAT_MONO16: -+ default: -+ speakers = 1; -+ break; -+ case AL_FORMAT_STEREO8: -+ case AL_FORMAT_STEREO16: -+ speakers = 2; -+ break; -+ case AL_FORMAT_QUAD8_LOKI: -+ case AL_FORMAT_QUAD16_LOKI: -+ speakers = 4; -+ break; -+ } -+ -+ sprintf(spec, fmt, rate, speakers); - capture_device = alcOpenDevice((ALubyte *)spec); - if ( capture_device ) { - _alcSetContext(NULL, cid, capture_device); -@@ -171,14 +193,16 @@ - format, dev->format, samples); - size *= (_al_formatbits(dev->format) / 8); - -- if ( n > (ALsizei)size ) -+ if ( n > (ALsizei)size ) - temp = malloc( n ); - else - temp = malloc( size ); - - if ( size > 0 ) { - size = _alcDeviceRead(cid, temp, size); -+ } - -+ if ( size > 0 ) { - temp = _alBufferCanonizeData(dev->format, - temp, - size, -@@ -189,8 +213,8 @@ - AL_TRUE); - } else { - /* Hmm, zero size in record.. */ -- memset(temp, 0, n); -- size = n; -+ /*memset(temp, 0, n);*/ -+ size = 0; - } - if(temp == NULL) { - fprintf(stderr, "could not canonize data\n"); -@@ -203,3 +227,228 @@ - } - return size; - } -+ -+ -+/* Hacked in ALC_EXT_capture support. --ryan. */ -+/* This doesn't support multiple devices, device enumeration, or capture */ -+/* devices seperate from an existing context. How painful. */ -+ -+/* ring buffer functionality... */ -+ -+typedef struct -+{ -+ ALubyte *buffer; -+ ALsizei size; -+ ALsizei write; -+ ALsizei read; -+ ALsizei used; -+} __ALRingBuffer; -+ -+static ALboolean __alRingBufferInit(__ALRingBuffer *ring, ALsizei size); -+static ALvoid __alRingBufferShutdown(__ALRingBuffer *ring); -+static ALsizei __alRingBufferSize(__ALRingBuffer *ring); -+static ALvoid __alRingBufferPut(__ALRingBuffer *ring, ALubyte *data, ALsizei size); -+static ALsizei __alRingBufferGet(__ALRingBuffer *ring, ALubyte *data, ALsizei size); -+ -+static __ALRingBuffer captureRing; -+ -+static ALboolean __alRingBufferInit(__ALRingBuffer *ring, ALsizei size) -+{ -+ ALubyte *ptr = (ALubyte *) realloc(ring->buffer, size); -+ if (ptr == NULL) -+ return(AL_FALSE); -+ -+ ring->buffer = ptr; -+ ring->size = size; -+ ring->write = 0; -+ ring->read = 0; -+ ring->used = 0; -+ return(AL_TRUE); -+} /* __alRingBufferInit */ -+ -+static ALvoid __alRingBufferShutdown(__ALRingBuffer *ring) -+{ -+ free(ring->buffer); -+ ring->buffer = NULL; -+} /* __alRingBufferShutdown */ -+ -+static ALsizei __alRingBufferSize(__ALRingBuffer *ring) -+{ -+ return(ring->used); -+} /* __alRingBufferSize */ -+ -+static ALvoid __alRingBufferPut(__ALRingBuffer *ring, ALubyte *data, ALsizei _size) -+{ -+ register ALsizei size = _size; -+ register ALsizei cpy; -+ register ALsizei avail; -+ -+ if (!size) /* just in case... */ -+ return; -+ -+ /* Putting more data than ring buffer holds in total? Replace it all. */ -+ if (size > ring->size) -+ { -+ ring->write = 0; -+ ring->read = 0; -+ ring->used = ring->size; -+ memcpy(ring->buffer, data + (size - ring->size), ring->size); -+ return; -+ } /* if */ -+ -+ /* Buffer overflow? Push read pointer to oldest sample not overwritten. */ -+ avail = ring->size - ring->used; -+ if (size > avail) -+ { -+ ring->read += size - avail; -+ if (ring->read > ring->size) -+ ring->read -= ring->size; -+ } /* if */ -+ -+ /* Clip to end of buffer and copy first block... */ -+ cpy = ring->size - ring->write; -+ if (size < cpy) -+ cpy = size; -+ if (cpy) memcpy(ring->buffer + ring->write, data, cpy); -+ -+ /* Wrap around to front of ring buffer and copy remaining data... */ -+ avail = size - cpy; -+ if (avail) memcpy(ring->buffer, data + cpy, avail); -+ -+ /* Update write pointer... */ -+ ring->write += size; -+ if (ring->write > ring->size) -+ ring->write -= ring->size; -+ -+ ring->used += size; -+ if (ring->used > ring->size) -+ ring->used = ring->size; -+} /* __alRingBufferPut */ -+ -+static ALsizei __alRingBufferGet(__ALRingBuffer *ring, ALubyte *data, ALsizei _size) -+{ -+ register ALsizei cpy; -+ register ALsizei size = _size; -+ register ALsizei avail = ring->used; -+ -+ /* Clamp amount to read to available data... */ -+ if (size > avail) -+ size = avail; -+ -+ /* Clip to end of buffer and copy first block... */ -+ cpy = ring->size - ring->read; -+ if (cpy > size) cpy = size; -+ if (cpy) memcpy(data, ring->buffer + ring->read, cpy); -+ -+ /* Wrap around to front of ring buffer and copy remaining data... */ -+ avail = size - cpy; -+ if (avail) memcpy(data + cpy, ring->buffer, avail); -+ -+ /* Update read pointer... */ -+ ring->read += size; -+ if (ring->read > ring->size) -+ ring->read -= ring->size; -+ -+ ring->used -= size; -+ -+ return(size); /* may have been clamped if there wasn't enough data... */ -+} /* __alRingBufferGet */ -+ -+ -+static ALenum captureFmt = AL_NONE; -+static ALuint captureFreq = 0; -+static ALint captureFmtSize = 0; -+ -+ALCdevice *alcCaptureOpenDevice(const ALubyte *deviceName, -+ ALuint freq, ALenum fmt, -+ ALsizei bufsize) -+{ -+ ALCdevice *retval; -+ AL_context *cc; -+ ALuint cid; -+ -+ if (deviceName != NULL) /* !!! FIXME */ -+ return NULL; -+ -+ switch (fmt) /* try to keep this sane for now... */ -+ { -+ case AL_FORMAT_MONO8: -+ case AL_FORMAT_MONO16: -+ case AL_FORMAT_STEREO8: -+ case AL_FORMAT_STEREO16: -+ break; /* okay format. */ -+ -+ default: -+ return(NULL); -+ } -+ -+ captureFmt = fmt; -+ captureFreq = freq; -+ captureFmtSize = (_al_formatbits(fmt) / 8); -+ if ((fmt == AL_FORMAT_STEREO8) || (fmt == AL_FORMAT_STEREO16)) -+ captureFmtSize *= 2; -+ -+ bufsize *= captureFmtSize; -+ -+ if (!__alRingBufferInit(&captureRing, bufsize)) -+ return NULL; -+ -+ if (!alCaptureInit_EXT(fmt, freq, bufsize)) -+ return NULL; -+ -+ cid = _alcCCId; -+ _alcLockContext( cid ); -+ cc = _alcGetContext(cid); -+ retval = cc->read_device; -+ retval->cc = cc; -+ _alcUnlockContext( cid ); -+ -+ fprintf(stderr, "WARNING: ALC_EXT_capture is subject to change!\n"); -+ -+ return(retval); -+} -+ -+ALvoid alcCaptureCloseDevice(ALCdevice *dev) -+{ -+ if (dev == NULL) -+ return; -+ -+ alCaptureDestroy_EXT(); -+ __alRingBufferShutdown(&captureRing); -+} -+ -+ALvoid alcCaptureStart(void) -+{ -+ alCaptureStart_EXT(); -+} -+ -+ALvoid alcCaptureStop(void) -+{ -+ alCaptureStop_EXT(); -+} -+ -+/* !!! FIXME: Not ideal; reads samples in ALC_CAPTURE_SAMPLES query */ -+/* !!! FIXME: should query hardware here and do read in alcCaptureSamples() */ -+ALint __alcGetAvailableSamples(ALvoid) -+{ -+ static ALubyte buf[2048]; -+ ALsizei got; -+ -+ while ((got = alCaptureGetData_EXT(buf, sizeof (buf), -+ captureFmt, captureFreq)) > 0) -+ __alRingBufferPut(&captureRing, buf, got); -+ -+ /*printf("got %d have %d\n", (int) got, (int) (__alRingBufferSize(&captureRing) / captureFmtSize));*/ -+ -+ return(__alRingBufferSize(&captureRing) / captureFmtSize); -+} -+ -+ -+ALvoid alcCaptureSamples(UNUSED(ALCdevice *device), ALvoid *buf, ALsizei samps) -+{ -+ if ((__alRingBufferSize(&captureRing) / captureFmtSize) < samps) -+ return; /* !!! FIXME: This is an error condition! */ -+ -+ __alRingBufferGet(&captureRing, buf, samps * captureFmtSize); -+} -+ -Index: linux/src/extensions/al_ext_capture.h -=================================================================== -RCS file: /usr/local/cvs-repository/openal/linux/src/extensions/al_ext_capture.h,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 al_ext_capture.h ---- linux/src/extensions/al_ext_capture.h 18 Mar 2002 14:41:44 -0000 1.1.1.1 -+++ linux/src/extensions/al_ext_capture.h 2 Mar 2004 10:30:50 -0000 -@@ -13,6 +13,16 @@ - - #include <AL/alext.h> - -+ALCdevice *alcCaptureOpenDevice(const ALubyte *deviceName, -+ ALuint freq, ALenum fmt, -+ ALsizei bufsize); -+ALvoid alcCaptureCloseDevice(ALCdevice *dev); -+ALvoid alcCaptureStart(void); -+ALvoid alcCaptureStop(void); -+ALint __alcGetAvailableSamples(ALvoid); -+ALvoid alcCaptureSamples(ALCdevice *device, ALvoid *buf, ALsizei samps); -+ -+ - /* - * alInitCapture( void ) - * -@@ -38,7 +48,12 @@ - AL_EXT_PAIR(alCaptureStart_EXT), \ - AL_EXT_PAIR(alCaptureStop_EXT), \ - AL_EXT_PAIR(alCaptureGetData_EXT), \ -- AL_EXT_PAIR(alCaptureDestroy_EXT) \ -+ AL_EXT_PAIR(alCaptureDestroy_EXT), \ -+ AL_EXT_PAIR(alcCaptureOpenDevice), \ -+ AL_EXT_PAIR(alcCaptureCloseDevice), \ -+ AL_EXT_PAIR(alcCaptureStart), \ -+ AL_EXT_PAIR(alcCaptureStop), \ -+ AL_EXT_PAIR(alcCaptureSamples) \ - - /* initialization and destruction functions */ - diff --git a/media-libs/openal/files/openal-20040817-destdir.patch b/media-libs/openal/files/openal-20040817-destdir.patch deleted file mode 100644 index 172b7f209aee..000000000000 --- a/media-libs/openal/files/openal-20040817-destdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur openal-20040817.orig/linux/Makefile.in openal-20040817/linux/Makefile.in ---- openal-20040817.orig/linux/Makefile.in 2002-09-05 15:54:36.000000000 -0700 -+++ openal-20040817/linux/Makefile.in 2004-10-06 19:02:21.785622393 -0700 -@@ -1,8 +1,7 @@ - INSTALL=@INSTALL@ - LN_S=@LN_S@ --DESTDIR=@prefix@/ --DESTINC=$(DESTDIR)include --DESTLIB=$(DESTDIR)lib -+DESTINC=$(DESTDIR)@prefix@/@includedir@ -+DESTLIB=$(DESTDIR)@libdir@ - MAKE=@MAKE@ - MAJOR_VERSION=@MAJOR_VERSION@ - MINOR_VERSION=@MINOR_VERSION@ diff --git a/media-libs/openal/files/openal-20050504-alsa_capture.patch b/media-libs/openal/files/openal-20050504-alsa_capture.patch deleted file mode 100644 index ce7421b89a97..000000000000 --- a/media-libs/openal/files/openal-20050504-alsa_capture.patch +++ /dev/null @@ -1,375 +0,0 @@ -diff -Naurp openal-20050504/linux/src/alc/alc_context.c openal-20050504.alsa/linux/src/alc/alc_context.c ---- openal-20050504/linux/src/alc/alc_context.c 2005-04-16 09:59:00.000000000 -0700 -+++ openal-20050504.alsa/linux/src/alc/alc_context.c 2005-05-04 16:08:59.545667426 -0700 -@@ -1516,6 +1516,8 @@ AL_context *_alcGetDevicesContext(ALCdev - return deviceHandle->cc; - } - -+ALint __alcGetAvailableSamples(ALvoid); -+ - void alcGetIntegerv( ALCdevice *deviceHandle, ALCenum token, - ALCsizei size , ALCint *dest ) - { -@@ -1537,6 +1539,9 @@ void alcGetIntegerv( ALCdevice *deviceHa - time. - Check size - */ -+ case 0x312: /*ALC_CAPTURE_SAMPLES:*/ -+ *dest = __alcGetAvailableSamples(); -+ break; - case ALC_MAJOR_VERSION: - *dest = 1; - break; -diff -Naurp openal-20050504/linux/src/al_ext.c openal-20050504.alsa/linux/src/al_ext.c ---- openal-20050504/linux/src/al_ext.c 2005-04-11 06:51:11.000000000 -0700 -+++ openal-20050504.alsa/linux/src/al_ext.c 2005-05-04 16:12:25.886325706 -0700 -@@ -998,5 +998,10 @@ ALenum alGetEnumValue( const ALubyte *en - return AL_ILLEGAL_COMMAND; - } - #endif -+ -+ if (ustrcmp("ALC_CAPTURE_SAMPLES", ename) == 0) { -+ return 0x312; -+ } -+ - return 0; - } -diff -Naurp openal-20050504/linux/src/al_main.c openal-20050504.alsa/linux/src/al_main.c ---- openal-20050504/linux/src/al_main.c 2005-03-25 02:48:23.000000000 -0800 -+++ openal-20050504.alsa/linux/src/al_main.c 2005-05-04 16:08:59.544667603 -0700 -@@ -137,6 +137,7 @@ ALboolean _alInit( void ) { - - #ifdef CAPTURE_SUPPORT - _alRegisterExtensionGroup( (const ALubyte*) "AL_EXT_capture" ); -+ _alRegisterExtensionGroup( (const ALubyte*) "ALC_EXT_capture" ); - #endif /* CAPTURE_SUPPORT */ - - #endif /* BUILTIN_EXT_LOKI */ -diff -Naurp openal-20050504/linux/src/extensions/al_ext_capture.c openal-20050504.alsa/linux/src/extensions/al_ext_capture.c ---- openal-20050504/linux/src/extensions/al_ext_capture.c 2005-03-31 03:22:11.000000000 -0800 -+++ openal-20050504.alsa/linux/src/extensions/al_ext_capture.c 2005-05-04 16:40:33.787670845 -0700 -@@ -45,6 +45,11 @@ struct { ALubyte *name; void *addr; } al - AL_EXT_PAIR(alCaptureStop_EXT), - AL_EXT_PAIR(alCaptureGetData_EXT), - AL_EXT_PAIR(alCaptureDestroy_EXT), -+ AL_EXT_PAIR(alcCaptureOpenDevice), -+ AL_EXT_PAIR(alcCaptureCloseDevice), -+ AL_EXT_PAIR(alcCaptureStart), -+ AL_EXT_PAIR(alcCaptureStop), -+ AL_EXT_PAIR(alcCaptureSamples), - { NULL, NULL } - }; - -@@ -72,8 +77,8 @@ void alFiniCapture(void) { - return; - } - --ALboolean alCaptureInit_EXT( UNUSED(ALenum format), -- UNUSED(ALuint rate), -+ALboolean alCaptureInit_EXT( ALenum format, -+ ALuint rate, - UNUSED(ALsizei bufferSize) ) - { - ALuint cid; -@@ -89,9 +94,27 @@ ALboolean alCaptureInit_EXT( UNUSED(ALen - capture_device = cc->read_device; - if ( capture_device == NULL ) { - char spec[1024]; -- char *fmt="'( (direction \"read\") (sampling-rate %d))"; -+ int speakers; -+ char *fmt="'( (direction \"read\") (sampling-rate %d) (speaker-num %d) )"; -+ -+ switch (format) { -+ case AL_FORMAT_MONO8: -+ case AL_FORMAT_MONO16: -+ default: -+ speakers = 1; -+ break; -+ case AL_FORMAT_STEREO8: -+ case AL_FORMAT_STEREO16: -+ speakers = 2; -+ break; -+ case AL_FORMAT_QUAD8_LOKI: -+ case AL_FORMAT_QUAD16_LOKI: -+ speakers = 4; -+ break; -+ } -+ -+ snprintf(spec, sizeof(spec), fmt, rate, speakers); - -- snprintf(spec, sizeof(spec), fmt, rate); - capture_device = alcOpenDevice((ALubyte *)spec); - if ( capture_device ) { - _alcSetContext(NULL, cid, capture_device); -@@ -189,8 +212,8 @@ ALsizei alCaptureGetData_EXT( UNUSED(ALv - AL_TRUE); - } else { - /* Hmm, zero size in record.. */ -- memset(temp, 0, n); -- size = n; -+ /*memset(temp, 0, n); */ -+ size = 0; - } - if(temp == NULL) { - fprintf(stderr, "could not canonize data\n"); -@@ -203,3 +226,226 @@ ALsizei alCaptureGetData_EXT( UNUSED(ALv - } - return size; - } -+ -+ -+/* Hacked in ALC_EXT_capture support. --ryan. */ -+/* This doesn't support multiple devices, device enumeration, or capture */ -+/* devices seperate from an existing context. How painful. */ -+ -+/* ring buffer functionality... */ -+ -+typedef struct -+{ -+ ALubyte *buffer; -+ ALsizei size; -+ ALsizei write; -+ ALsizei read; -+ ALsizei used; -+} __ALRingBuffer; -+ -+static ALboolean __alRingBufferInit(__ALRingBuffer *ring, ALsizei size); -+static ALvoid __alRingBufferShutdown(__ALRingBuffer *ring); -+static ALsizei __alRingBufferSize(__ALRingBuffer *ring); -+static ALvoid __alRingBufferPut(__ALRingBuffer *ring, ALubyte *data, ALsizei size); -+static ALsizei __alRingBufferGet(__ALRingBuffer *ring, ALubyte *data, ALsizei size); -+ -+static __ALRingBuffer captureRing; -+ -+static ALboolean __alRingBufferInit(__ALRingBuffer *ring, ALsizei size) -+{ -+ ALubyte *ptr = (ALubyte *) realloc(ring->buffer, size); -+ if (ptr == NULL) -+ return(AL_FALSE); -+ -+ ring->buffer = ptr; -+ ring->size = size; -+ ring->write = 0; -+ ring->read = 0; -+ ring->used = 0; -+ return(AL_TRUE); -+} /* __alRingBufferInit */ -+ -+static ALvoid __alRingBufferShutdown(__ALRingBuffer *ring) -+{ -+ free(ring->buffer); -+ ring->buffer = NULL; -+} /* __alRingBufferShutdown */ -+ -+static ALsizei __alRingBufferSize(__ALRingBuffer *ring) -+{ -+ return(ring->used); -+} /* __alRingBufferSize */ -+ -+static ALvoid __alRingBufferPut(__ALRingBuffer *ring, ALubyte *data, ALsizei _size) -+{ -+ register ALsizei size = _size; -+ register ALsizei cpy; -+ register ALsizei avail; -+ -+ if (!size) /* just in case... */ -+ return; -+ -+ /* Putting more data than ring buffer holds in total? Replace it all. */ -+ if (size > ring->size) -+ { -+ ring->write = 0; -+ ring->read = 0; -+ ring->used = ring->size; -+ memcpy(ring->buffer, data + (size - ring->size), ring->size); -+ return; -+ } /* if */ -+ -+ /* Buffer overflow? Push read pointer to oldest sample not overwritten. */ -+ avail = ring->size - ring->used; -+ if (size > avail) -+ { -+ ring->read += size - avail; -+ if (ring->read > ring->size) -+ ring->read -= ring->size; -+ } /* if */ -+ -+ /* Clip to end of buffer and copy first block... */ -+ cpy = ring->size - ring->write; -+ if (size < cpy) -+ cpy = size; -+ if (cpy) memcpy(ring->buffer + ring->write, data, cpy); -+ -+ /* Wrap around to front of ring buffer and copy remaining data... */ -+ avail = size - cpy; -+ if (avail) memcpy(ring->buffer, data + cpy, avail); -+ -+ /* Update write pointer... */ -+ ring->write += size; -+ if (ring->write > ring->size) -+ ring->write -= ring->size; -+ -+ ring->used += size; -+ if (ring->used > ring->size) -+ ring->used = ring->size; -+} /* __alRingBufferPut */ -+ -+static ALsizei __alRingBufferGet(__ALRingBuffer *ring, ALubyte *data, ALsizei _size) -+{ -+ register ALsizei cpy; -+ register ALsizei size = _size; -+ register ALsizei avail = ring->used; -+ -+ /* Clamp amount to read to available data... */ -+ if (size > avail) -+ size = avail; -+ -+ /* Clip to end of buffer and copy first block... */ -+ cpy = ring->size - ring->read; -+ if (cpy > size) cpy = size; -+ if (cpy) memcpy(data, ring->buffer + ring->read, cpy); -+ -+ /* Wrap around to front of ring buffer and copy remaining data... */ -+ avail = size - cpy; -+ if (avail) memcpy(data + cpy, ring->buffer, avail); -+ -+ /* Update read pointer... */ -+ ring->read += size; -+ if (ring->read > ring->size) -+ ring->read -= ring->size; -+ -+ ring->used -= size; -+ -+ return(size); /* may have been clamped if there wasn't enough data... */ -+} /* __alRingBufferGet */ -+ -+static ALenum captureFmt = AL_NONE; -+static ALuint captureFreq = 0; -+static ALint captureFmtSize = 0; -+ -+ALCdevice *alcCaptureOpenDevice(const ALubyte *deviceName, -+ ALuint freq, ALenum fmt, -+ ALsizei bufsize) -+{ -+ ALCdevice *retval; -+ AL_context *cc; -+ ALuint cid; -+ -+ if (deviceName != NULL) /* !!! FIXME */ -+ return NULL; -+ -+ switch (fmt) /* try to keep this sane for now... */ -+ { -+ case AL_FORMAT_MONO8: -+ case AL_FORMAT_MONO16: -+ case AL_FORMAT_STEREO8: -+ case AL_FORMAT_STEREO16: -+ break; /* okay format. */ -+ -+ default: -+ return(NULL); -+ } -+ -+ captureFmt = fmt; -+ captureFreq = freq; -+ captureFmtSize = (_al_formatbits(fmt) / 8); -+ if ((fmt == AL_FORMAT_STEREO8) || (fmt == AL_FORMAT_STEREO16)) -+ captureFmtSize *= 2; -+ -+ bufsize *= captureFmtSize; -+ -+ if (!__alRingBufferInit(&captureRing, bufsize)) -+ return NULL; -+ -+ if (!alCaptureInit_EXT(fmt, freq, bufsize)) -+ return NULL; -+ -+ cid = _alcCCId; -+ _alcLockContext( cid ); -+ cc = _alcGetContext(cid); -+ retval = cc->read_device; -+ retval->cc = cc; -+ _alcUnlockContext( cid ); -+ -+ fprintf(stderr, "WARNING: ALC_EXT_capture is subject to change!\n"); -+ -+ return(retval); -+} -+ -+ALvoid alcCaptureCloseDevice(ALCdevice *dev) -+{ -+ if (dev == NULL) -+ return; -+ -+ alCaptureDestroy_EXT(); -+ __alRingBufferShutdown(&captureRing); -+} -+ -+ALvoid alcCaptureStart(void) -+{ -+ alCaptureStart_EXT(); -+} -+ -+ALvoid alcCaptureStop(void) -+{ -+ alCaptureStop_EXT(); -+} -+ -+/* !!! FIXME: Not ideal; reads samples in ALC_CAPTURE_SAMPLES query */ -+/* !!! FIXME: should query hardware here and do read in alcCaptureSamples() */ -+ALint __alcGetAvailableSamples(ALvoid) -+{ -+ static ALubyte buf[2048]; -+ ALsizei got; -+ -+ while ((got = alCaptureGetData_EXT(buf, sizeof (buf), -+ captureFmt, captureFreq)) > 0) -+ __alRingBufferPut(&captureRing, buf, got); -+ /*printf("got %d have %d\n", (int) got, (int) (__alRingBufferSize(&captureRing) / captureFmtSize));*/ -+ -+ return(__alRingBufferSize(&captureRing) / captureFmtSize); -+} -+ -+ -+ALvoid alcCaptureSamples(UNUSED(ALCdevice *device), ALvoid *buf, ALsizei samps) -+{ -+ if ((__alRingBufferSize(&captureRing) / captureFmtSize) < samps) -+ return; /* !!! FIXME: This is an error condition! */ -+ -+ __alRingBufferGet(&captureRing, buf, samps * captureFmtSize); -+} -+ -diff -Naurp openal-20050504/linux/src/extensions/al_ext_capture.h openal-20050504.alsa/linux/src/extensions/al_ext_capture.h ---- openal-20050504/linux/src/extensions/al_ext_capture.h 2002-03-18 06:41:44.000000000 -0800 -+++ openal-20050504.alsa/linux/src/extensions/al_ext_capture.h 2005-05-04 16:08:59.548666897 -0700 -@@ -13,6 +13,16 @@ - - #include <AL/alext.h> - -+ALCdevice *alcCaptureOpenDevice(const ALubyte *deviceName, -+ ALuint freq, ALenum fmt, -+ ALsizei bufsize); -+ALvoid alcCaptureCloseDevice(ALCdevice *dev); -+ALvoid alcCaptureStart(void); -+ALvoid alcCaptureStop(void); -+ALint __alcGetAvailableSamples(ALvoid); -+ALvoid alcCaptureSamples(ALCdevice *device, ALvoid *buf, ALsizei samps); -+ -+ - /* - * alInitCapture( void ) - * -@@ -38,7 +48,12 @@ void alFiniCapture( void ); - AL_EXT_PAIR(alCaptureStart_EXT), \ - AL_EXT_PAIR(alCaptureStop_EXT), \ - AL_EXT_PAIR(alCaptureGetData_EXT), \ -- AL_EXT_PAIR(alCaptureDestroy_EXT) \ -+ AL_EXT_PAIR(alCaptureDestroy_EXT), \ -+ AL_EXT_PAIR(alcCaptureOpenDevice), \ -+ AL_EXT_PAIR(alcCaptureCloseDevice), \ -+ AL_EXT_PAIR(alcCaptureStart), \ -+ AL_EXT_PAIR(alcCaptureStop), \ -+ AL_EXT_PAIR(alcCaptureSamples) \ - - /* initialization and destruction functions */ - diff --git a/media-libs/openal/files/openal-20050504-alsa_dmix.patch b/media-libs/openal/files/openal-20050504-alsa_dmix.patch deleted file mode 100644 index 2cd6f569d74d..000000000000 --- a/media-libs/openal/files/openal-20050504-alsa_dmix.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./openal-20050504/linux/src/arch/alsa/alsa.c 2005-03-25 11:48:23.000000000 +0100 -+++ ./openal-modified/linux/src/arch/alsa/alsa.c 2005-09-01 16:31:45.000000000 +0200 -@@ -58,6 +58,7 @@ - static int (*psnd_pcm_hw_params_set_channels)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val) = NULL; - static int (*psnd_pcm_hw_params_set_format)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val) = NULL; - static int (*psnd_pcm_hw_params_set_periods)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir) = NULL; -+static int (*psnd_pcm_hw_params_set_periods_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) = NULL; - static int (*psnd_pcm_hw_params_set_rate)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir) = NULL; - static int (*psnd_pcm_hw_params_set_rate_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) = NULL; - static size_t (*psnd_pcm_hw_params_sizeof)(void) = NULL; -@@ -143,6 +144,7 @@ - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_format); - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_period_size); - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_periods); -+ OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_periods_near); - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_rate); - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_rate_near); - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_sizeof); -@@ -450,7 +452,7 @@ - return AL_FALSE; - } - -- err = psnd_pcm_hw_params_set_periods(phandle, setup, ai->periods, 0); -+ err = psnd_pcm_hw_params_set_periods_near(phandle, setup, &ai->periods, 0); - if (err < 0) { - _alDebug(ALD_MAXIMUS, __FILE__, __LINE__, - "set_read_alsa: %s\n", psnd_strerror(err)); -@@ -622,7 +624,7 @@ - - - /* Set number of periods. Periods used to be called fragments. */ -- err = psnd_pcm_hw_params_set_periods(phandle, setup, ai->periods, 0); -+ err = psnd_pcm_hw_params_set_periods_near(phandle, setup, &ai->periods, 0); - if (err < 0) { - _alDebug(ALD_MAXIMUS, __FILE__, __LINE__, - "set_write_alsa: %s\n", psnd_strerror(err)); -@@ -812,4 +814,3 @@ - - return(retval*chans); - } -- diff --git a/media-libs/openal/files/openal-20050504-destdir.patch b/media-libs/openal/files/openal-20050504-destdir.patch deleted file mode 100644 index f910c7f241e7..000000000000 --- a/media-libs/openal/files/openal-20050504-destdir.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- openal-20050504/linux/Makefile.in 2005-03-23 08:45:24.000000000 -0800 -+++ openal-20050504.alsa/linux/Makefile.in 2005-05-04 16:44:04.054373792 -0700 -@@ -1,9 +1,10 @@ - INSTALL=@INSTALL@ - LN_S=@LN_S@ --DESTDIR=@prefix@/ --DESTINC=$(DESTDIR)include --DESTLIB=$(DESTDIR)lib --DESTBIN=$(DESTDIR)bin -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+DESTINC=$(DESTDIR)@includedir@ -+DESTLIB=$(DESTDIR)@libdir@ -+DESTBIN=$(DESTDIR)@bindir@ - DESTPKG=$(DESTLIB)/pkgconfig/ - PACKAGE_VERSION_MAJOR=@PACKAGE_VERSION_MAJOR@ - PACKAGE_VERSION=@PACKAGE_VERSION@ diff --git a/media-libs/openal/files/openal-20051024-alsa_dmix.patch b/media-libs/openal/files/openal-20051024-alsa_dmix.patch deleted file mode 100644 index 3e35ebbaaf6a..000000000000 --- a/media-libs/openal/files/openal-20051024-alsa_dmix.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./openal-20051024/linux/src/arch/alsa/alsa.c 2005-03-25 11:48:23.000000000 +0100 -+++ ./openal-modified/linux/src/arch/alsa/alsa.c 2005-09-01 16:31:45.000000000 +0200 -@@ -58,6 +58,7 @@ - static int (*psnd_pcm_hw_params_set_channels)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val) = NULL; - static int (*psnd_pcm_hw_params_set_format)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val) = NULL; - static int (*psnd_pcm_hw_params_set_periods)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir) = NULL; -+static int (*psnd_pcm_hw_params_set_periods_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) = NULL; - static int (*psnd_pcm_hw_params_set_rate)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir) = NULL; - static int (*psnd_pcm_hw_params_set_rate_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) = NULL; - static size_t (*psnd_pcm_hw_params_sizeof)(void) = NULL; -@@ -143,6 +144,7 @@ - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_format); - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_period_size); - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_periods); -+ OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_periods_near); - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_rate); - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_set_rate_near); - OPENAL_LOAD_ALSA_SYMBOL(snd_pcm_hw_params_sizeof); -@@ -450,7 +452,7 @@ - return AL_FALSE; - } - -- err = psnd_pcm_hw_params_set_periods(phandle, setup, ai->periods, 0); -+ err = psnd_pcm_hw_params_set_periods_near(phandle, setup, &ai->periods, 0); - if (err < 0) { - _alDebug(ALD_MAXIMUS, __FILE__, __LINE__, - "set_read_alsa: %s\n", psnd_strerror(err)); -@@ -622,7 +624,7 @@ - - - /* Set number of periods. Periods used to be called fragments. */ -- err = psnd_pcm_hw_params_set_periods(phandle, setup, ai->periods, 0); -+ err = psnd_pcm_hw_params_set_periods_near(phandle, setup, &ai->periods, 0); - if (err < 0) { - _alDebug(ALD_MAXIMUS, __FILE__, __LINE__, - "set_write_alsa: %s\n", psnd_strerror(err)); -@@ -812,4 +814,3 @@ - - return(retval*chans); - } -- diff --git a/media-libs/openal/files/openal-20051024-amd64-configure.patch b/media-libs/openal/files/openal-20051024-amd64-configure.patch deleted file mode 100644 index 62ba4f34bf8d..000000000000 --- a/media-libs/openal/files/openal-20051024-amd64-configure.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN openal-20051024.orig/linux/ChangeLog openal-20051024/linux/ChangeLog ---- openal-20051024.orig/linux/ChangeLog 2005-10-24 09:48:39.000000000 -0400 -+++ openal-20051024/linux/ChangeLog 2005-10-26 09:46:44.000000000 -0400 -@@ -1,3 +1,6 @@ -+2005-10-25 Prakash Punnoor <prakash@punnoor.de> -+ * linux/configure.ac: x86_64 related fix -+ - 2005-10-24 Prakash Punnoor <prakash@punnoor.de> - * linux/Makefile.in: (gentoo patch) install at correct dirs - -diff -urN openal-20051024.orig/linux/configure.ac openal-20051024/linux/configure.ac ---- openal-20051024.orig/linux/configure.ac 2005-10-24 09:48:39.000000000 -0400 -+++ openal-20051024/linux/configure.ac 2005-10-26 09:46:43.000000000 -0400 -@@ -239,6 +239,8 @@ - esac - fi - ;; -+ *x86_64*) -+ ;; - *) - ARCH_OBJS="\$(PORTABLE_OBJS)" - ;; diff --git a/media-libs/openal/openal-20050504-r1.ebuild b/media-libs/openal/openal-20050504-r1.ebuild deleted file mode 100644 index 439a640260da..000000000000 --- a/media-libs/openal/openal-20050504-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20050504-r1.ebuild,v 1.8 2006/05/11 20:50:19 wolf31o2 Exp $ - -inherit eutils gnuconfig - -IUSE="alsa arts esd sdl debug vorbis mpeg" -DESCRIPTION="OpenAL, the Open Audio Library, is an open, vendor-neutral, cross-platform API for interactive, primarily spatialized audio" -SRC_URI="http://dev.gentoo.org/~eradicator/openal/${P}.tar.bz2" -HOMEPAGE="http://www.openal.org" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" - -RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.2 ) - arts? ( kde-base/arts ) - esd? ( media-sound/esound ) - sdl? ( media-libs/libsdl ) - vorbis? ( media-libs/libvorbis ) - mpeg? ( media-libs/smpeg ) - !media-libs/freealut" - -DEPEND="${RDEPEND} - x86? ( dev-lang/nasm ) - sys-devel/autoconf - sys-devel/automake - sys-devel/libtool" - -S="${S}/linux" - -src_unpack() { - unpack ${A} - cd ${S} - - use alsa && epatch ${FILESDIR}/${P}-alsa_capture.patch - epatch ${FILESDIR}/${P}-destdir.patch - - gnuconfig_update - - export WANT_AUTOCONF=2.5 - autoheader || die - autoconf || die -} - -src_compile() { - econf \ - --enable-paranoid-locks \ - --libdir=/usr/$(get_libdir) \ - --enable-capture \ - --enable-optimize \ - $(use_enable esd) \ - $(use_enable sdl) \ - $(use_enable alsa) \ - $(use_enable arts) \ - $(use_enable mpeg smpeg) \ - $(use_enable vorbis) \ - $(use_enable debug debug-maximus) || die - emake all || die -} - -src_install() { - cd ${S}/linux - - make install DESTDIR="${D}" || die - - dodoc CREDITS ChangeLog INSTALL NOTES PLATFORM TODO - dodoc ${FILESDIR}/openalrc - makeinfo doc/openal.texi - doinfo doc/openal.info - - cd ${S} - dodoc CHANGES COPYING CREDITS - dohtml docs/*.html -} - -pkg_postinst() { - einfo "There is a sample openalrc file in /usr/share/doc/${P} which" - einfo "sets up 4 speaker surround sound with ALSA. Simply copy it to your:" - einfo " ~/.openalrc" - einfo "to use it." -} diff --git a/media-libs/openal/openal-20050504-r2.ebuild b/media-libs/openal/openal-20050504-r2.ebuild deleted file mode 100644 index c58f3ef980c9..000000000000 --- a/media-libs/openal/openal-20050504-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20050504-r2.ebuild,v 1.7 2006/05/25 03:07:34 flameeyes Exp $ - -inherit eutils gnuconfig - -IUSE="alsa arts esd sdl debug vorbis mpeg" -DESCRIPTION="OpenAL, the Open Audio Library, is an open, vendor-neutral, cross-platform API for interactive, primarily spatialized audio" -SRC_URI="http://dev.gentoo.org/~eradicator/openal/${P}.tar.bz2" -HOMEPAGE="http://www.openal.org" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.2 ) - arts? ( kde-base/arts ) - esd? ( media-sound/esound ) - sdl? ( media-libs/libsdl ) - vorbis? ( media-libs/libogg media-libs/libvorbis ) - mpeg? ( media-libs/smpeg ) - !media-libs/freealut" - -DEPEND="${RDEPEND} - x86? ( dev-lang/nasm ) - sys-devel/autoconf - sys-devel/automake - sys-devel/libtool" - -S="${S}/linux" - -src_unpack() { - unpack ${A} - cd ${S} - - use alsa && epatch ${FILESDIR}/${P}-alsa_capture.patch && \ - epatch ${FILESDIR}/${P}-alsa_dmix.patch - epatch ${FILESDIR}/${P}-destdir.patch - - gnuconfig_update - - export WANT_AUTOCONF=2.5 - autoheader || die - autoconf || die -} - -src_compile() { - econf \ - --enable-paranoid-locks \ - --libdir=/usr/$(get_libdir) \ - --enable-capture \ - --enable-optimize \ - $(use_enable esd) \ - $(use_enable sdl) \ - $(use_enable alsa) \ - $(use_enable arts) \ - $(use_enable mpeg smpeg) \ - $(use_enable vorbis) \ - $(use_enable debug debug-maximus) || die - emake all || die -} - -src_install() { - cd ${S}/linux - - make install DESTDIR="${D}" || die - - dodoc CREDITS ChangeLog INSTALL NOTES PLATFORM TODO - dodoc ${FILESDIR}/openalrc - makeinfo doc/openal.texi - doinfo doc/openal.info - - cd ${S} - dodoc CHANGES COPYING CREDITS - dohtml docs/*.html -} - -pkg_postinst() { - einfo "There is a sample openalrc file in /usr/share/doc/${P} which" - einfo "sets up 4 speaker surround sound with ALSA. Simply copy it to your:" - einfo " ~/.openalrc" - einfo "to use it." -} diff --git a/media-libs/openal/openal-20051024.ebuild b/media-libs/openal/openal-20051024.ebuild deleted file mode 100644 index fd0788f12bb0..000000000000 --- a/media-libs/openal/openal-20051024.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20051024.ebuild,v 1.8 2006/06/08 17:32:01 vapier Exp $ - -inherit eutils - -DESCRIPTION="the Open Audio Library is an open, vendor-neutral, cross-platform API for interactive, primarily spatialized audio" -HOMEPAGE="http://www.openal.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~wolf31o2/sources/openal/${P}.tar.bz2" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa arts esd sdl debug vorbis mpeg" -RESTRICT="test" - -RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.2 ) - arts? ( kde-base/arts ) - esd? ( media-sound/esound ) - sdl? ( media-libs/libsdl ) - vorbis? ( media-libs/libvorbis ) - mpeg? ( media-libs/smpeg )" -DEPEND="${RDEPEND} - x86? ( dev-lang/nasm ) - sys-devel/autoconf - sys-devel/automake - sys-devel/libtool" - -S=${S}/linux - -src_unpack() { - unpack "${A}" - cd "${S}" - - use alsa && epatch "${FILESDIR}"/${P}-alsa_dmix.patch - epatch "${FILESDIR}"/${P}-amd64-configure.patch - - export WANT_AUTOCONF=2.5 - autoheader || die - autoconf || die -} - -src_compile() { - econf \ - --enable-paranoid-locks \ - --libdir=/usr/$(get_libdir) \ - --enable-capture \ - --enable-optimization \ - $(use_enable esd) \ - $(use_enable sdl) \ - $(use_enable alsa) \ - $(use_enable arts) \ - $(use_enable mpeg smpeg) \ - $(use_enable vorbis) \ - $(use_enable debug debug-maximus) || die - emake all || die -} - -src_install() { - cd "${S}"/linux - - make install DESTDIR="${D}" || die - - dodoc ChangeLog INSTALL NOTES PLATFORM TODO - dodoc "${FILESDIR}"/openalrc - makeinfo doc/openal.texi - doinfo doc/openal.info - - cd "${S}" - dohtml docs/*.html -} - -pkg_postinst() { - einfo "There is a sample openalrc file in /usr/share/doc/${P} which" - einfo "sets up 4 speaker surround sound with ALSA. Simply copy it to your:" - einfo " ~/.openalrc" - einfo "to use it." -} |