From b5abca33b20d20b6b4309115d1897f64d2f52238 Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Fri, 22 Dec 2006 13:53:50 +0000 Subject: [PATCH] Make it respect user-defined CFLAGS. Package-Manager: portage-2.1.2_rc3-r9 --- media-libs/libquicktime/ChangeLog | 6 +- media-libs/libquicktime/Manifest | 26 ++-- .../files/libquicktime-0.9.10-cflags.patch | 134 ++++++++++++++++++ .../libquicktime/libquicktime-0.9.10.ebuild | 3 +- 4 files changed, 156 insertions(+), 13 deletions(-) create mode 100644 media-libs/libquicktime/files/libquicktime-0.9.10-cflags.patch diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog index 209227e7052d..ea29784b2ec4 100644 --- a/media-libs/libquicktime/ChangeLog +++ b/media-libs/libquicktime/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libquicktime # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.77 2006/12/22 09:13:29 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.78 2006/12/22 13:53:50 zzam Exp $ + + 22 Dec 2006; Matthias Schwarzott + +files/libquicktime-0.9.10-cflags.patch, libquicktime-0.9.10.ebuild: + Make it respect user-defined CFLAGS. 22 Dec 2006; Matthias Schwarzott libquicktime-0.9.10.ebuild: diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest index 727a91264217..c93ccc7572aa 100644 --- a/media-libs/libquicktime/Manifest +++ b/media-libs/libquicktime/Manifest @@ -5,6 +5,10 @@ AUX libquicktime-0.9.10-automagic-deps.patch 5207 RMD160 d6566e2c4f7d09269c9b5bb MD5 26ec6a0a898ea90948f439295668d98f files/libquicktime-0.9.10-automagic-deps.patch 5207 RMD160 d6566e2c4f7d09269c9b5bb0c3ff67e4b288b75b files/libquicktime-0.9.10-automagic-deps.patch 5207 SHA256 eefc3e687819acb10d93b96e50cdef686da867bc051efcb8db58ba20d3f3f83f files/libquicktime-0.9.10-automagic-deps.patch 5207 +AUX libquicktime-0.9.10-cflags.patch 2829 RMD160 ad854d10263c007f914b3b91af5dd4442965324c SHA1 d5f9fd93103626d4f80395ce0483de7ccc404dd6 SHA256 f529e2f343d21bced08a2f8e5cdba470053e0f272bc4e3731795182c651a3301 +MD5 ad66d56da780bf18ef429041cb1a8fa3 files/libquicktime-0.9.10-cflags.patch 2829 +RMD160 ad854d10263c007f914b3b91af5dd4442965324c files/libquicktime-0.9.10-cflags.patch 2829 +SHA256 f529e2f343d21bced08a2f8e5cdba470053e0f272bc4e3731795182c651a3301 files/libquicktime-0.9.10-cflags.patch 2829 AUX libquicktime-0.9.10-opengl-link.patch 1020 RMD160 ef1e9183c386a7bbd37d1f1acc549bbe95699415 SHA1 ac463c6863e9735bebbbd493e84c4915ec7db88c SHA256 a0361070de6160e1c037578ccb89cbef3938a311c0734d36647eed9e943e6aea MD5 789697dca838a333a64aa39b75947c65 files/libquicktime-0.9.10-opengl-link.patch 1020 RMD160 ef1e9183c386a7bbd37d1f1acc549bbe95699415 files/libquicktime-0.9.10-opengl-link.patch 1020 @@ -39,10 +43,10 @@ DIST libquicktime-0.9.4.tar.gz 782651 RMD160 93a8098770a860cba31d71f876b782c2a7b DIST libquicktime-0.9.7.tar.gz 765719 RMD160 a886cbc714306d94977616de7221a19298fa251d SHA1 93346b8a9a411a4bdf97283fbf3ac8ed52252c73 SHA256 43b3b1b3a4ca24c2017f1fa0470425e522b59346b74203b39f9991f6a7b6085e DIST libquicktime-0.9.9.tar.gz 926280 RMD160 c345f54d949f29a9f5be42ca5fbdc80be781a3d4 SHA1 6221879c61bda6a695ffbc46c85e39db1b3ded65 SHA256 b92f08e8e9a9e4be36dd5cdd4b1c5d31f0cc821569623b2f5f79b3e7ba8ed3da DIST libquicktime-m4-1.tar.bz2 3622 RMD160 443f8d30c2022a9a3bc897f0c3e69c5964cc08dd SHA1 1ca6cf448f497fc23c82cb5ece7b1acc839d35c7 SHA256 db15fd86bd78d5396b0e2c71e6f8e786e01526bb1fa4c09311c7997b15494137 -EBUILD libquicktime-0.9.10.ebuild 3176 RMD160 3cec5f0b4b454c09943829f7d446a4d9787a0f0c SHA1 1f8fe3106ae43b6d13f9161f6b0a6c959a16b923 SHA256 5baa6f7885174153bd53890576c87e31e50ddc546ee2ec3141ab4c4d6d64ca21 -MD5 15b4f7cbb15d035fee2e078fb5d02bac libquicktime-0.9.10.ebuild 3176 -RMD160 3cec5f0b4b454c09943829f7d446a4d9787a0f0c libquicktime-0.9.10.ebuild 3176 -SHA256 5baa6f7885174153bd53890576c87e31e50ddc546ee2ec3141ab4c4d6d64ca21 libquicktime-0.9.10.ebuild 3176 +EBUILD libquicktime-0.9.10.ebuild 3217 RMD160 e65e22aac90fb31fb4e1d2a9a81d815a8267905c SHA1 3c74b120ee6529bd43091491b2695eaf9657e300 SHA256 a9f169c5d3fce79b72354474fa0f62136229cb630c8a03f6db720d2d746e2d1a +MD5 9b432e60a97c15045efad8fdc890f598 libquicktime-0.9.10.ebuild 3217 +RMD160 e65e22aac90fb31fb4e1d2a9a81d815a8267905c libquicktime-0.9.10.ebuild 3217 +SHA256 a9f169c5d3fce79b72354474fa0f62136229cb630c8a03f6db720d2d746e2d1a libquicktime-0.9.10.ebuild 3217 EBUILD libquicktime-0.9.2.ebuild 1566 RMD160 1bce5fe7dfcec05aa53f213c7c4caf42daf06275 SHA1 46fd5023f254793e029f4dd8f1bbe844849407ac SHA256 89d34c1ccfe6f9aeed1ff7206b3fca953dc50e877adacac056f59ac0148e54ee MD5 9a1d33daffe2ec7e701e22c08d8f0820 libquicktime-0.9.2.ebuild 1566 RMD160 1bce5fe7dfcec05aa53f213c7c4caf42daf06275 libquicktime-0.9.2.ebuild 1566 @@ -63,10 +67,10 @@ EBUILD libquicktime-0.9.9.ebuild 2110 RMD160 27ef01ce6c2bad88ff93a4a3d1475b1fd2a MD5 3b460eb1e8ae72fb1e5f516fffe4d478 libquicktime-0.9.9.ebuild 2110 RMD160 27ef01ce6c2bad88ff93a4a3d1475b1fd2ad32da libquicktime-0.9.9.ebuild 2110 SHA256 293e07ef09deacee6aa9f6d7fc237ab879bf11ec0c65ad5fbf7d83f1831778fc libquicktime-0.9.9.ebuild 2110 -MISC ChangeLog 12301 RMD160 34a67ba31cf2e28bb9c08fafe68190ed13a6130b SHA1 d9eef60078cef1e379fb17e2c1cd78e5c128dfc4 SHA256 40c8f1cbb58a7b9e789ae2b676b8c4b5c604aeb120b66658c4c77b67b2735d66 -MD5 cb6611eb787f0582ef14aedc0c59857d ChangeLog 12301 -RMD160 34a67ba31cf2e28bb9c08fafe68190ed13a6130b ChangeLog 12301 -SHA256 40c8f1cbb58a7b9e789ae2b676b8c4b5c604aeb120b66658c4c77b67b2735d66 ChangeLog 12301 +MISC ChangeLog 12465 RMD160 083ca360912a3636bdfb85a49aceed48e7cde5b4 SHA1 231f35c3be2b2169c4e32724d61da7045e155d79 SHA256 75f01679c45f888966d61ebaf2446de7459eda6e4b3629317bb989ee56f0f774 +MD5 4d725797ec062d7d898d2e647bae96f2 ChangeLog 12465 +RMD160 083ca360912a3636bdfb85a49aceed48e7cde5b4 ChangeLog 12465 +SHA256 75f01679c45f888966d61ebaf2446de7459eda6e4b3629317bb989ee56f0f774 ChangeLog 12465 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251 @@ -92,7 +96,7 @@ SHA256 6091518a14516ef99b1505679439e1678f35c617d15df3dfc740210c4822f518 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFi6G/t2vP6XvVdOcRAjAWAKCSi7vKPIut+t6ODhsatASxutzY4ACePhXF -ku8Bmj1JAv3LDV5a1HxnaDU= -=RX3P +iD8DBQFFi+N8t2vP6XvVdOcRAuD2AJsE6GVyr+GvGa3tBUPhEkDOIrvE2ACfW5Vg +GJ0j0MsEChACFFvjlt4H0vg= +=6gTZ -----END PGP SIGNATURE----- diff --git a/media-libs/libquicktime/files/libquicktime-0.9.10-cflags.patch b/media-libs/libquicktime/files/libquicktime-0.9.10-cflags.patch new file mode 100644 index 000000000000..5592132ae78a --- /dev/null +++ b/media-libs/libquicktime/files/libquicktime-0.9.10-cflags.patch @@ -0,0 +1,134 @@ +--- libquicktime-0.9.10/configure.ac 2006-12-22 14:37:15.446268575 +0100 ++++ libquicktime-0.9.10-patched/configure.ac 2006-12-22 14:39:06.560191379 +0100 +@@ -174,16 +174,20 @@ + + if test "x$with_lame" != "xno"; then + +-OLD_CFLAGS=$CFLAGS +-OLD_LIBS=$LIBS ++ ++LAME_CFLAGS="" + + if test x$have_vorbis = xtrue; then +-LIBS="$LIBS -lmp3lame -lvorbis -lm" ++LAME_LIBS="-lmp3lame -lvorbis -lm" + else +-LIBS="$LIBS -lmp3lame -lm" ++LAME_LIBS="$LIBS -lmp3lame -lm" + fi + ++OLD_CFLAGS=$CFLAGS ++OLD_LIBS=$LIBS ++ + dnl CFLAGS="$CFLAGS" ++LIBS="$LIBS $LAME_LIBS" + + AC_MSG_CHECKING(for lame) + have_lame="false" +@@ -210,7 +214,6 @@ + # program could be run + have_lame="true" + AC_MSG_RESULT(yes) +- LAME_CFLAGS=$CFLAGS + LAME_LIBS=$LIBS + + ], +@@ -417,8 +420,11 @@ + OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS + +-LIBS="-lpng -lm -lz" +-CFLAGS="" ++PNG_LIBS="-lpng -lm -lz" ++PNG_CFLAGS="" ++ ++LIBS="${PNG_LIBS}" ++CFLAGS="${CFLAGS} ${PNG_CFLAGS}" + + AC_MSG_CHECKING(for libpng) + AC_TRY_LINK([#include ], +@@ -430,9 +436,7 @@ + + case $have_libpng in + true) AC_DEFINE(HAVE_LIBPNG) +- AC_MSG_RESULT(yes) +- PNG_LIBS=$LIBS ; +- PNG_CFLAGS=$CFLAGS ;; ++ AC_MSG_RESULT(yes) ;; + false) AC_MSG_RESULT(no); PNG_LIBS=""; PNG_CFLAGS="";; + esac + +@@ -463,8 +467,11 @@ + OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS + +-LIBS="$LIBS -lfaac -lm" +-CFLAGS="$CFLAGS" ++FAAC_LIBS="$LIBS -lfaac -lm" ++FAAC_CFLAGS="" ++ ++LIBS="${LIBS} ${FAAC_LIBS}" ++CFLAGS="$CFLAGS ${FAAC_CFLAGS}" + + AC_MSG_CHECKING(for faac) + AC_TRY_RUN([ +@@ -487,8 +494,6 @@ + # program could be run + have_faac="true" + AC_MSG_RESULT(yes) +- FAAC_CFLAGS=$CFLAGS +- FAAC_LIBS=$LIBS + + ], + # program could not be run +@@ -532,8 +537,11 @@ + OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS + +-CFLAGS="$CFLAGS" +-LIBS="$LIBS -lfaad -lm" ++FAAD2_LIBS="-lfaad -lm" ++FAAD2_CFLAGS="" ++ ++CFLAGS="$CFLAGS $FAAD2_CFLAGS" ++LIBS="$LIBS ${FAAD2_LIBS}" + + AC_TRY_RUN([ + #include "faad.h" +@@ -556,8 +564,6 @@ + # program could be run + have_faad2="true" + AC_MSG_RESULT(yes) +- FAAD2_CFLAGS=$CFLAGS +- FAAD2_LIBS=$LIBS + + ], + # program could not be run +@@ -622,9 +628,17 @@ + + COMMON_CFLAGS="-finline-functions -Wall -Winline" + +-dnl Optimizing flags ++if [[ ${CFLAGS} == "" ]]; then ++ ++ dnl Optimizing flags ++ ++ LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"]) ++ ++ CFLAGS="$OPT_CFLAGS" ++ ++fi + +-LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"]) ++CFLAGS="${CFLAGS} ${COMMON_CFLAGS}" + + AH_TEMPLATE([NDEBUG], + [Causes debug code to e removed]) +@@ -633,7 +647,6 @@ + AC_DEFINE(NDEBUG) + fi + +-CFLAGS="$OPT_CFLAGS $COMMON_CFLAGS" + + # -L is required so that linker can find libquicktime when DESTDIR is used. + # libtool bug, documented at: http://www.geocrawler.com/mail/thread.php3?subject=install+phase+fails&list=404 diff --git a/media-libs/libquicktime/libquicktime-0.9.10.ebuild b/media-libs/libquicktime/libquicktime-0.9.10.ebuild index a6278a1c2c0f..0e33dbacee25 100644 --- a/media-libs/libquicktime/libquicktime-0.9.10.ebuild +++ b/media-libs/libquicktime/libquicktime-0.9.10.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/libquicktime/libquicktime-0.9.10.ebuild,v 1.9 2006/12/22 09:13:29 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.10.ebuild,v 1.10 2006/12/22 13:53:50 zzam Exp $ WANT_AUTOMAKE="latest" WANT_AUTOCONF="latest" @@ -59,6 +59,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-x264.patch" epatch "${FILESDIR}/${P}-automagic-deps.patch" epatch "${FILESDIR}/${P}-opengl-link.patch" + epatch "${FILESDIR}/${P}-cflags.patch" cp ${WORKDIR}/m4/* m4/ AT_M4DIR="m4" eautoreconf -- 2.26.2