diff options
| -rw-r--r-- | media-libs/libsdl/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/libsdl/Manifest | 26 | ||||
| -rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.13-pulseaudio.patch | 40 | ||||
| -rw-r--r-- | media-libs/libsdl/libsdl-1.2.13.ebuild | 11 |
4 files changed, 69 insertions, 17 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index 09de92884751..4b2efef2cbd3 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libsdl -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.138 2007/12/31 15:52:00 vapier Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.139 2008/01/10 08:02:21 vapier Exp $ + + 10 Jan 2008; Mike Frysinger <vapier@gentoo.org> + +files/libsdl-1.2.13-pulseaudio.patch, libsdl-1.2.13.ebuild: + Add support for USE=pulseaudio and fixing it in the process #198147 by jon + R-B / Eugene Zagidullin. *libsdl-1.2.13 (31 Dec 2007) diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index 05cf8854e435..cc0c21b8a6b9 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -41,6 +41,10 @@ AUX libsdl-1.2.12-c90-comments.patch 600 RMD160 8d4f0d3327b81b49ae0d41bdf82c82fc MD5 79b342f8e9ad6031584d284377709ff8 files/libsdl-1.2.12-c90-comments.patch 600 RMD160 8d4f0d3327b81b49ae0d41bdf82c82fce2e2d3c6 files/libsdl-1.2.12-c90-comments.patch 600 SHA256 0efbe7aee129838981acddd5dae8c675b779f8889961c6deda5136148deb051b files/libsdl-1.2.12-c90-comments.patch 600 +AUX libsdl-1.2.13-pulseaudio.patch 1882 RMD160 85216ee5b297606d2cd7785294e8185270eda7c7 SHA1 0b0dbfc237d7ec071f3acb412d08b7e88254e37f SHA256 4a1233bfe237fc9cf1f77b2ad84fec2ac9871be115f0a035038b799c55ebc83f +MD5 128846ba1877b59a5242bdc6e5d8fcac files/libsdl-1.2.13-pulseaudio.patch 1882 +RMD160 85216ee5b297606d2cd7785294e8185270eda7c7 files/libsdl-1.2.13-pulseaudio.patch 1882 +SHA256 4a1233bfe237fc9cf1f77b2ad84fec2ac9871be115f0a035038b799c55ebc83f files/libsdl-1.2.13-pulseaudio.patch 1882 DIST SDL-1.2.11.tar.gz 2796407 RMD160 91dc8877224415a4ba59e1de57c31861e550d644 SHA1 2259134d714e35ab1469d513674a3cd02510d198 SHA256 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730 DIST SDL-1.2.12.tar.gz 2829456 RMD160 3871023c63ea056eba43ce4f55ee8d3a73ff3022 SHA1 2c37ff1683368369c0f555d4a742f0544153610d SHA256 df77eb883efdcc61220eaf7ade38324629c273c278ce8d700a5530369e9b6df9 DIST SDL-1.2.13.tar.gz 3373673 RMD160 ed8825fc98f4b3759cf9e5cf8357d71c50df9925 SHA1 51fcaa3e1d5c01fd813ea08688780f86b19cf539 SHA256 94f99df1d60f296b57f4740650a71b6425da654044ca30f8f0ce34934429e132 @@ -60,14 +64,14 @@ EBUILD libsdl-1.2.12.ebuild 4375 RMD160 c27bad457cb5c2e3086ed23f34069ad5b3e4458b MD5 2c361a0c42e1112674b15a2d30736486 libsdl-1.2.12.ebuild 4375 RMD160 c27bad457cb5c2e3086ed23f34069ad5b3e4458b libsdl-1.2.12.ebuild 4375 SHA256 96833e9cdb1c2366d636dac2674d1ebdbf4c020d5a6b0029da35d4e9f8d063c9 libsdl-1.2.12.ebuild 4375 -EBUILD libsdl-1.2.13.ebuild 4321 RMD160 0c01acc3048b647e96413d141d6aa78abc97177a SHA1 af09c5c6f160a1b3e5430f0284de6243d748239e SHA256 b24b5f301686fa31f03efdc7eabcfb147e240ecac1994abaa841a3054dcf2290 -MD5 fc394a193a57971a78d5f660b96391ec libsdl-1.2.13.ebuild 4321 -RMD160 0c01acc3048b647e96413d141d6aa78abc97177a libsdl-1.2.13.ebuild 4321 -SHA256 b24b5f301686fa31f03efdc7eabcfb147e240ecac1994abaa841a3054dcf2290 libsdl-1.2.13.ebuild 4321 -MISC ChangeLog 21627 RMD160 700f442fb5c0b2542b024268f8b0e776a3ef8879 SHA1 91d3647af8ddedf5322239e80d11ad473482b8bf SHA256 9ab0ffb950e1380772973910a9316477ee1cb4d616fa5f494759cf8ceac5e417 -MD5 87028276db21c299bd56189a24811fc6 ChangeLog 21627 -RMD160 700f442fb5c0b2542b024268f8b0e776a3ef8879 ChangeLog 21627 -SHA256 9ab0ffb950e1380772973910a9316477ee1cb4d616fa5f494759cf8ceac5e417 ChangeLog 21627 +EBUILD libsdl-1.2.13.ebuild 4453 RMD160 5fc891d3068f8d80d32ddfcceb4f9c3d1e7561e2 SHA1 fb7ccb6d1ab3faf8b8ad8102615eb1d4dc8aa830 SHA256 a5d185c62473a461637e86a77b8f3428f280c0def7470616108d223881cab5cd +MD5 c87b51d78fc18b6a8140ff0a431cce57 libsdl-1.2.13.ebuild 4453 +RMD160 5fc891d3068f8d80d32ddfcceb4f9c3d1e7561e2 libsdl-1.2.13.ebuild 4453 +SHA256 a5d185c62473a461637e86a77b8f3428f280c0def7470616108d223881cab5cd libsdl-1.2.13.ebuild 4453 +MISC ChangeLog 21845 RMD160 51c9026c94ed20af1006c620c78b8e624f72b0fa SHA1 91daa69999d5681e14e6a53490e6de18bdc3a086 SHA256 f4133d7a9552d3667fc4307b4dfa44ef4af60ec66534c13ced1c13963e19cbf6 +MD5 29aa845944b5ec4142eda709e01d192b ChangeLog 21845 +RMD160 51c9026c94ed20af1006c620c78b8e624f72b0fa ChangeLog 21845 +SHA256 f4133d7a9552d3667fc4307b4dfa44ef4af60ec66534c13ced1c13963e19cbf6 ChangeLog 21845 MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974 @@ -90,7 +94,7 @@ SHA256 f6ec12fd8d10146f9a97066062d3b395146bf6aef88ae7b1e7ab203615c76e36 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.8 (GNU/Linux) -iEYEARECAAYFAkd5ECYACgkQj9hvisErhMJ9mgCdGSXt+415/WgKOp3yJCT8Mhbw -TCMAn3zHlFYY+Gomm9WrMKzF7g4WjHnw -=ag8e +iEYEARECAAYFAkeF0RMACgkQj9hvisErhMKnawCgi3eVl7QAeEVGcUs1m91EOHqN +xHsAoOe/vLaa9kxs8V0C9QjbbRZiTtqY +=OGBe -----END PGP SIGNATURE----- diff --git a/media-libs/libsdl/files/libsdl-1.2.13-pulseaudio.patch b/media-libs/libsdl/files/libsdl-1.2.13-pulseaudio.patch new file mode 100644 index 000000000000..8bbf529431cc --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.13-pulseaudio.patch @@ -0,0 +1,40 @@ +fixup the pulse audio configure flags. this is already fixed upstream. + +http://bugs.gentoo.org/198147 + +--- SDL/configure.in ++++ SDL/configure.in +@@ -470,8 +470,8 @@ + { + AC_ARG_ENABLE(pulseaudio, + AC_HELP_STRING([--enable-pulseaudio], [use PulseAudio [[default=yes]]]), +- , enable_pulse=yes) +- if test x$enable_audio = xyes -a x$enable_pulse = xyes; then ++ , enable_pulseaudio=yes) ++ if test x$enable_audio = xyes -a x$enable_pulseaudio = xyes; then + audio_pulse=no + + PULSE_REQUIRED_VERSION=0.9 +@@ -490,7 +490,7 @@ + if test x$audio_pulse = xyes; then + AC_ARG_ENABLE(pulseaudio-shared, + AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]), +- , enable_pulse_shared=yes) ++ , enable_pulseaudio_shared=yes) + if test "x`echo $PULSE_LIBS | grep -- -L`" = "x"; then + if test "x`ls /lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then + PULSE_LIBS="-L/lib $PULSE_LIBS" +@@ -508,11 +508,11 @@ + SOURCES="$SOURCES $srcdir/src/audio/pulse/*.c" + EXTRA_CFLAGS="$EXTRA_CFLAGS $PULSE_CFLAGS" + if test x$have_loadso != xyes && \ +- test x$enable_pulse_shared = xyes; then ++ test x$enable_pulseaudio_shared = xyes; then + AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic PulseAudio loading]) + fi + if test x$have_loadso = xyes && \ +- test x$enable_pulse_shared = xyes && test x$pulse_lib != x; then ++ test x$enable_pulseaudio_shared = xyes && test x$pulse_lib != x; then + AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSE_DYNAMIC, "$pulse_lib") + else + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSE_LIBS" diff --git a/media-libs/libsdl/libsdl-1.2.13.ebuild b/media-libs/libsdl/libsdl-1.2.13.ebuild index 2c4c899114ea..e8b1dab927ad 100644 --- a/media-libs/libsdl/libsdl-1.2.13.ebuild +++ b/media-libs/libsdl/libsdl-1.2.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.13.ebuild,v 1.1 2007/12/31 15:52:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.13.ebuild,v 1.2 2008/01/10 08:02:21 vapier Exp $ inherit flag-o-matic toolchain-funcs eutils libtool @@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86- # if you have the noaudio, novideo, nojoystick, or custom-cflags use flags # in USE and something breaks, you pick up the pieces. Be prepared for # bug reports to be marked INVALID. -IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick custom-cflags" +IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick custom-cflags pulseaudio" RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 ) alsa? ( media-libs/alsa-lib ) @@ -38,7 +38,8 @@ RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 ) svga? ( >=media-libs/svgalib-1.4.2 ) aalib? ( media-libs/aalib ) libcaca? ( >=media-libs/libcaca-0.9-r1 ) - opengl? ( virtual/opengl virtual/glu )" + opengl? ( virtual/opengl virtual/glu ) + pulseaudio? ( media-sound/pulseaudio )" DEPEND="${RDEPEND} nas? ( x11-proto/xextproto @@ -75,6 +76,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-1.2.11-libcaca-new-api.patch #40224 epatch "${FILESDIR}"/${PN}-1.2.11-sdl-config.patch epatch "${FILESDIR}"/${PN}-1.2.11-xinerama-head-0.patch #145917 + epatch "${FILESDIR}"/${P}-pulseaudio.patch #198147 ./autogen.sh || die "autogen failed" elibtoolize @@ -120,6 +122,7 @@ src_compile() { $(use_enable oss) \ $(use_enable alsa) \ $(use_enable esd) \ + $(use_enable pulseaudio) \ $(use_enable arts) \ $(use_enable nas) \ $(use_enable X video-x11) \ |