From 2d87342285382e167bb1b557c127c6c492f3c9db Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sat, 16 Dec 2006 08:57:26 +0000 Subject: [PATCH] Removing forced linking to ogg since that's not needed, bug #158212 Package-Manager: portage-2.1.2_rc3-r5 --- media-libs/libsndfile/ChangeLog | 6 +++- media-libs/libsndfile/Manifest | 28 +++++++++++-------- .../files/libsndfile-1.0.17-ogg.patch | 11 ++++++++ .../libsndfile/libsndfile-1.0.17.ebuild | 3 +- 4 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 media-libs/libsndfile/files/libsndfile-1.0.17-ogg.patch diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog index 6f2ef1245c04..4d4dee9b4f02 100644 --- a/media-libs/libsndfile/ChangeLog +++ b/media-libs/libsndfile/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libsndfile # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.59 2006/11/17 23:05:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.60 2006/12/16 08:57:26 aballier Exp $ + + 16 Dec 2006; Alexis Ballier + +files/libsndfile-1.0.17-ogg.patch, libsndfile-1.0.17.ebuild: + Removing forced linking to ogg since that's not needed, bug #158212 17 Nov 2006; Alexis Ballier libsndfile-1.0.17.ebuild: diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest index f16becf2912f..c385efc152cc 100644 --- a/media-libs/libsndfile/Manifest +++ b/media-libs/libsndfile/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX libsndfile-1.0.17-ogg.patch 385 RMD160 7f2bee213423b77b7a03f209b75ababcbe21f215 SHA1 d06d5db4aa6b7aa0964c2bdd5730068c88a7ce91 SHA256 1237b34a26b2b29998235495762aadd316761ee4cdeb148c74872b9669b4c866 +MD5 8376605bd965a5efcb713ff172285997 files/libsndfile-1.0.17-ogg.patch 385 +RMD160 7f2bee213423b77b7a03f209b75ababcbe21f215 files/libsndfile-1.0.17-ogg.patch 385 +SHA256 1237b34a26b2b29998235495762aadd316761ee4cdeb148c74872b9669b4c866 files/libsndfile-1.0.17-ogg.patch 385 DIST libsndfile-1.0.11.tar.gz 816107 RMD160 3829d1fa9f5caf16f4b589d03877d229cb8f5603 SHA1 16372a7814530178a2642bd22f203641e0392ebb SHA256 fd107e7923dd09f48a2ede31ba11e9965478d9c3e094d19cb81124a971ff9ecf DIST libsndfile-1.0.17+flac-1.1.3.patch.bz2 3127 RMD160 fc6e6f03069c1ad8ee43f600f6ac2aa6e97bb1f5 SHA1 10e0d19dfc8cf2a6bf499e0fa0d1ab17dca4c519 SHA256 2c8b6df283309061e8e9aaedd0bc20c7ebf75fa8ad4ed8b01f7bf04162206df1 DIST libsndfile-1.0.17.tar.gz 819456 RMD160 ae93822a4c587dcdd7c70d043d2a38ed2fe3a188 SHA1 2f66798d596a15491fbd1191ded8125ed71ef411 SHA256 1792e4e60386b450ef8ec07c756e8f3ecfe96ebda7d0b09148da5f436d065ef2 @@ -8,14 +12,14 @@ EBUILD libsndfile-1.0.11.ebuild 1065 RMD160 1772e653e45671ec1748255fd00c9c7b7011 MD5 1ba2b26087ac68ababe4e25d94a5850c libsndfile-1.0.11.ebuild 1065 RMD160 1772e653e45671ec1748255fd00c9c7b701196b3 libsndfile-1.0.11.ebuild 1065 SHA256 92b08714819b8783ce1b92600fc3983a186ac88b04c9c27532c077c26b40707e libsndfile-1.0.11.ebuild 1065 -EBUILD libsndfile-1.0.17.ebuild 1314 RMD160 47c494176073dc1250d9566984920842eea88a5f SHA1 1fa213af1182eccd4b45032ec0503ab02db8a067 SHA256 db2f6d1fa44f8682a1fe8ae89251a5f46dc1ac1c5f10ded4684452282e8dd957 -MD5 e2591d08a659682f3dbbaf97ace7c4bf libsndfile-1.0.17.ebuild 1314 -RMD160 47c494176073dc1250d9566984920842eea88a5f libsndfile-1.0.17.ebuild 1314 -SHA256 db2f6d1fa44f8682a1fe8ae89251a5f46dc1ac1c5f10ded4684452282e8dd957 libsndfile-1.0.17.ebuild 1314 -MISC ChangeLog 8801 RMD160 2e1a2f59a7d30ebca10864cceb67198e18a03a7a SHA1 e20f7852e717a5671e9e88d56aa5f2199dff536c SHA256 e9a4df309a89ffe95a8ccdf68136aed55875e412e7148bc2d73c9162df4aacba -MD5 810ca28a6cd4ca87dea08658c7e50f22 ChangeLog 8801 -RMD160 2e1a2f59a7d30ebca10864cceb67198e18a03a7a ChangeLog 8801 -SHA256 e9a4df309a89ffe95a8ccdf68136aed55875e412e7148bc2d73c9162df4aacba ChangeLog 8801 +EBUILD libsndfile-1.0.17.ebuild 1351 RMD160 7534b181ef403fb945669c185d3d96155d18412d SHA1 3fa161a942e20e91a53494263fd0fd8f016a7b16 SHA256 4d9f5020554657981e68372c29418751ed1e96a35e293ca524120f484fd85c44 +MD5 5498ef741ecb1226b95ef5b682fc25dd libsndfile-1.0.17.ebuild 1351 +RMD160 7534b181ef403fb945669c185d3d96155d18412d libsndfile-1.0.17.ebuild 1351 +SHA256 4d9f5020554657981e68372c29418751ed1e96a35e293ca524120f484fd85c44 libsndfile-1.0.17.ebuild 1351 +MISC ChangeLog 8988 RMD160 f3632b81389d0f9274afbdda76b95c5f64d40ab6 SHA1 1e5638424bf08fb3d5f259805c04c4187d8441aa SHA256 2909daa54fb955379562ade52b2dfe324b42e434a1e3740f86a653822a6ee509 +MD5 51de0a0b75f08bd0c79b6372c1864f85 ChangeLog 8988 +RMD160 f3632b81389d0f9274afbdda76b95c5f64d40ab6 ChangeLog 8988 +SHA256 2909daa54fb955379562ade52b2dfe324b42e434a1e3740f86a653822a6ee509 ChangeLog 8988 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 @@ -27,9 +31,9 @@ MD5 67beb9269bb978b47656f0631b663c41 files/digest-libsndfile-1.0.17 542 RMD160 93bd725af5a0483ba690f30147515b13cb0e7151 files/digest-libsndfile-1.0.17 542 SHA256 597f7792ec7f2a23a7dff42dcef2df934fde455c3c602db799d22ac4fc220fbd files/digest-libsndfile-1.0.17 542 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFXj/6vFcC4BYPU0oRApNiAJ9V3HF7SaZY73KK+juoIGhhskxajwCeKFjh -Cz0iZ3Aw+kGZW0czkF97j6s= -=7C4B +iD8DBQFFg7T7vFcC4BYPU0oRAtGiAKCsNqfO+NTKLkmUAoKLdrYxU9g2BQCgnYZG +YI9+K79OKQiGWtLFQw20p4A= +=m/cN -----END PGP SIGNATURE----- diff --git a/media-libs/libsndfile/files/libsndfile-1.0.17-ogg.patch b/media-libs/libsndfile/files/libsndfile-1.0.17-ogg.patch new file mode 100644 index 000000000000..d61a5b79562a --- /dev/null +++ b/media-libs/libsndfile/files/libsndfile-1.0.17-ogg.patch @@ -0,0 +1,11 @@ +--- libsndfile-1.0.17/configure.old 2006-12-16 09:08:04.000000000 +0100 ++++ libsndfile-1.0.17/configure.ac 2006-12-16 09:08:22.000000000 +0100 +@@ -340,7 +340,7 @@ + AC_DEFINE(HAVE_FLAC_1_1_1, [1], [Define to 1 if you have libflac 1.1.1]) + fi + # in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we need -logg +- FLAC_LIBS="-lFLAC -logg" ++ FLAC_LIBS="-lFLAC" + fi + fi + diff --git a/media-libs/libsndfile/libsndfile-1.0.17.ebuild b/media-libs/libsndfile/libsndfile-1.0.17.ebuild index fda02a0cf73e..eff7b5a925d2 100644 --- a/media-libs/libsndfile/libsndfile-1.0.17.ebuild +++ b/media-libs/libsndfile/libsndfile-1.0.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.17.ebuild,v 1.4 2006/11/17 23:05:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.17.ebuild,v 1.5 2006/12/16 08:57:26 aballier Exp $ WANT_AUTOCONF=2.5 WANT_AUTOMAKE=1.9 @@ -27,6 +27,7 @@ src_unpack() { cd "${S}" epatch "${WORKDIR}/${P}+flac-1.1.3.patch" + epatch "${FILESDIR}/${P}-ogg.patch" eautoreconf epunt_cxx } -- 2.26.2