From: Alexis Ballier Date: Thu, 15 Mar 2007 23:26:33 +0000 (+0000) Subject: Make ogg optional X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=82ce0eea086cbd4c6fc4a3f809b160a8ddb85582;p=gentoo.git Make ogg optional Package-Manager: portage-2.1.2.2 --- diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog index 4dcf97712f1a..c4b8a5075b23 100644 --- a/media-sound/sox/ChangeLog +++ b/media-sound/sox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/sox # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.63 2007/03/15 19:02:38 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.64 2007/03/15 23:26:33 aballier Exp $ + + 15 Mar 2007; Alexis Ballier + +files/sox-13.0.0-oggautomagic.patch, sox-13.0.0.ebuild: + Make ogg optional *sox-13.0.0 (15 Mar 2007) diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest index 18c08f06101a..32c332d7c1cc 100644 --- a/media-sound/sox/Manifest +++ b/media-sound/sox/Manifest @@ -17,6 +17,10 @@ AUX sox-13.0.0-flac113.patch 19319 RMD160 952b00a3f12c01b9f36f703eeebad3852bc7f3 MD5 9563d79cd1aa4392dbe3fe4c49d5b144 files/sox-13.0.0-flac113.patch 19319 RMD160 952b00a3f12c01b9f36f703eeebad3852bc7f34e files/sox-13.0.0-flac113.patch 19319 SHA256 71898675ddf57d04638cf28336b929636f09eef019d3e57593934efc5a942053 files/sox-13.0.0-flac113.patch 19319 +AUX sox-13.0.0-oggautomagic.patch 820 RMD160 b4cc247ad85c6c46378fdc44dc22de1f18cb8907 SHA1 1edb55e8b8163435bdcec0a699c09c3d608aba56 SHA256 fd65d7d75ec4b0418451486b02bef5fea90da087f4f11285d6f533da1c91951b +MD5 0f64e68e81853002ceeecdcb4f70cf5a files/sox-13.0.0-oggautomagic.patch 820 +RMD160 b4cc247ad85c6c46378fdc44dc22de1f18cb8907 files/sox-13.0.0-oggautomagic.patch 820 +SHA256 fd65d7d75ec4b0418451486b02bef5fea90da087f4f11285d6f533da1c91951b files/sox-13.0.0-oggautomagic.patch 820 DIST sox-12.17.9.tar.gz 468174 RMD160 1ba76bf5329daafe75158757b7074f8385788353 SHA1 1c20f73a38cc5dfe15102df0565c7f2cea7e0bd8 SHA256 1f0a5495634b3156673111e0ac93084985f5dbac9bd1974630d07c97ac4ddccf DIST sox-12.18.2.tar.gz 486814 RMD160 cf85ec4058a66687ad0a39bb85ff062d7c48e7bf SHA1 3f5742cbed98deafbcf80251c29224c9a9ef5c89 SHA256 832bf98c95580af879fe51311c861ba7c57f07a5791628108ef29a027f0271ff DIST sox-13.0.0.tar.gz 725259 RMD160 84e7c8dea4f3a9145f9b42f7f03ac2329f3b83f2 SHA1 db0e6a7356b8fcbc72cf0dca1d81782fc3fa48f4 SHA256 c66c52cfa42fe126592563c3d8974007a9858bd35d2c1136389a721eeebb9f8e @@ -28,14 +32,14 @@ EBUILD sox-12.18.2.ebuild 1357 RMD160 caa25293c962dbb59557de8d0e3758e09d1bded4 S MD5 7f09cb5ce40a323da5f90929e7e5ab40 sox-12.18.2.ebuild 1357 RMD160 caa25293c962dbb59557de8d0e3758e09d1bded4 sox-12.18.2.ebuild 1357 SHA256 42f3f2b797e84d631dbf8f89066d627823974d2bd6687a317d09fd32d779fcb8 sox-12.18.2.ebuild 1357 -EBUILD sox-13.0.0.ebuild 1546 RMD160 1d67e887dc2cfaaf9bbd76e4362e45b1a4cd5d40 SHA1 cf32ce6623c38df8d7be561e9b9f28a711b4c377 SHA256 756bb2f70ca2b02bad55b0093a3f8cc9c208e8867c3a9fbf9cafcc1acd45f0c7 -MD5 46c84a4c61a5de2bc69959a1d132d718 sox-13.0.0.ebuild 1546 -RMD160 1d67e887dc2cfaaf9bbd76e4362e45b1a4cd5d40 sox-13.0.0.ebuild 1546 -SHA256 756bb2f70ca2b02bad55b0093a3f8cc9c208e8867c3a9fbf9cafcc1acd45f0c7 sox-13.0.0.ebuild 1546 -MISC ChangeLog 8675 RMD160 e828e71127d2271baa58fd192fd83eef3e7d4685 SHA1 38c2edd92f0d89bc78f6bc03f05c385ed827c653 SHA256 0374c07aae60167d87f5976acecd32f3b4282572e57e462819cd190050ab5a39 -MD5 1634a5e10f138ac217506b593297a049 ChangeLog 8675 -RMD160 e828e71127d2271baa58fd192fd83eef3e7d4685 ChangeLog 8675 -SHA256 0374c07aae60167d87f5976acecd32f3b4282572e57e462819cd190050ab5a39 ChangeLog 8675 +EBUILD sox-13.0.0.ebuild 1634 RMD160 557c72a16eadc4b9f14139ccd51821cbce3ed2f8 SHA1 3085199ef73f69e603f9d9802d3561ba530d23b9 SHA256 4e1584cdb9b9051b0424e5708030ad505c323fc6b3edc50396bf75ee408e8c0e +MD5 f6b208dbd0330fee30633123125206f1 sox-13.0.0.ebuild 1634 +RMD160 557c72a16eadc4b9f14139ccd51821cbce3ed2f8 sox-13.0.0.ebuild 1634 +SHA256 4e1584cdb9b9051b0424e5708030ad505c323fc6b3edc50396bf75ee408e8c0e sox-13.0.0.ebuild 1634 +MISC ChangeLog 8807 RMD160 885c365905012bfa03114a782c44059e6d7f9773 SHA1 d7b6ac88acae3a4760adba5f4c378aed2b00bdf0 SHA256 64084276e8ec5be515cfec890b2ffd984054c4276177b2454f40e5426019c4ac +MD5 40a56d0538029019a2c2c0523a2f0401 ChangeLog 8807 +RMD160 885c365905012bfa03114a782c44059e6d7f9773 ChangeLog 8807 +SHA256 64084276e8ec5be515cfec890b2ffd984054c4276177b2454f40e5426019c4ac ChangeLog 8807 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 @@ -52,7 +56,7 @@ SHA256 a7ff72f151e4a8367ebc6e623d0581a211a31536d45446c6b4d24925247604f7 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF+ZghvFcC4BYPU0oRAixeAKC9IP6HnnbJgO383uw5daHCbLLeXgCeOjlO -WZfSb7lgSrb9X2+yZe7HBuM= -=W4RX +iD8DBQFF+dX4vFcC4BYPU0oRAiP8AKCn09DPgC7hik5TTucnOjgOlvVMuwCgrzTT +QjdJQBiyGQiTCGjo8/BoRqg= +=EAkT -----END PGP SIGNATURE----- diff --git a/media-sound/sox/files/sox-13.0.0-oggautomagic.patch b/media-sound/sox/files/sox-13.0.0-oggautomagic.patch new file mode 100644 index 000000000000..2288538849b9 --- /dev/null +++ b/media-sound/sox/files/sox-13.0.0-oggautomagic.patch @@ -0,0 +1,24 @@ +Index: sox-13.0.0/configure.ac +=================================================================== +--- sox-13.0.0.orig/configure.ac ++++ sox-13.0.0/configure.ac +@@ -120,12 +120,19 @@ AC_SUBST(SNDFILE_CFLAGS) + AC_SUBST(SNDFILE_LIBS) + + dnl Check for Ogg Vorbis libraries ++AC_ARG_WITH(oggvorbis, AC_HELP_STRING([--with-oggvorbis], ++ [Use oggvorbis if present (default is yes)]), ++ [with_ogg_vorbis=$withval], ++ [with_ogg_vorbis=yes]) ++ ++if test "$with_ogg_vorbis" = yes; then + AC_CHECK_HEADER(vorbis/codec.h, + [with_ogg_vorbis=yes + AC_CHECK_LIB(ogg, ogg_packet_clear,, with_ogg_vorbis=no) + AC_CHECK_LIB(vorbisfile, ov_clear,, with_ogg_vorbis=no) + AC_CHECK_LIB(vorbisenc, vorbis_encode_init_vbr,, with_ogg_vorbis=no)], + with_ogg_vorbis=no) ++fi + + dnl Check for FLAC libraries + AC_ARG_WITH(flac, diff --git a/media-sound/sox/sox-13.0.0.ebuild b/media-sound/sox/sox-13.0.0.ebuild index d49481177ba7..4aebb285988f 100644 --- a/media-sound/sox/sox-13.0.0.ebuild +++ b/media-sound/sox/sox-13.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-13.0.0.ebuild,v 1.1 2007/03/15 19:02:38 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-13.0.0.ebuild,v 1.2 2007/03/15 23:26:33 aballier Exp $ inherit flag-o-matic eutils autotools @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="alsa debug flac encode mad ogg libsamplerate sndfile" +IUSE="alsa debug flac encode mad ogg libsamplerate ogg sndfile" DEPEND="virtual/libc alsa? ( media-libs/alsa-lib ) @@ -20,14 +20,14 @@ DEPEND="virtual/libc mad? ( media-libs/libmad ) sndfile? ( media-libs/libsndfile ) libsamplerate? ( media-libs/libsamplerate ) - media-libs/libvorbis - media-libs/libogg" + ogg? ( media-libs/libvorbis media-libs/libogg )" src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-flac113.patch" + epatch "${FILESDIR}/${P}-oggautomagic.patch" AT_M4DIR="m4" eautoreconf } @@ -41,6 +41,7 @@ src_compile () { $(use_enable debug) \ $(use_with sndfile) \ $(use_with flac) \ + $(use_with ogg oggvorbis) \ $(use_with libsamplerate samplerate) \ --enable-oss-dsp \ --enable-fast-ulaw \