use pkgconfig to detect x264 too, fixes detection with latest x264 snapshot

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 32 insertions, 7 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 543edf008b15..a78db422ac0a 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.35 2009/04/15 05:14:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.36 2009/09/09 10:04:48 aballier Exp $
+
+  09 Sep 2009; Alexis Ballier <aballier@gentoo.org>
+  +files/cinelerra-pkgconfig-x264.patch, cinelerra-20090210.ebuild:
+  use pkgconfig to detect x264 too, fixes detection with latest x264
+  snapshot
 
   15 Apr 2009; Alexis Ballier <aballier@gentoo.org>
   +files/cinelerra-libavutil50.patch, cinelerra-20090210.ebuild:
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 8c9832dd91c4..19c88bade4e0 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 AUX cinelerra-ffmpeg.patch 1813 RMD160 c384407c69f049b1c451fdc8a90307d8c434675a SHA1 097eeb594b7f1cb61fac13aface70b9d2cae9c64 SHA256 cb9a4672f998bba4a960ff200b5750c4586d32878e06cd17a16f8cc9eaa71426
 AUX cinelerra-libavutil50.patch 2140 RMD160 95720943d2bee3a7f5c5a864aef5631655a65120 SHA1 6fa5d1024adde249fe026837061ceace11b06532 SHA256 f29284a0e8b629c1ff22090c03c9fe3947adbd024dd2c05d925775c8f96f8eda
+AUX cinelerra-pkgconfig-x264.patch 649 RMD160 29d4e37c6ffb11128281a6f49e614e32b7af6510 SHA1 62817baa7a633ec568b79dd5f02bd918eb14ff55 SHA256 eaf8f936b41dd998b6a793ffad37e98c840ea3225adf61419ff7e0610f61e92e
 DIST cinelerra-20080717.tar.lzma 21734783 RMD160 2d55e56da3ec963542301e59e9dbadd527a7c88b SHA1 cd51ca3cace68a33d3b6682890b3205352e9616e SHA256 537b154f9045016c17636ce9f200a9fc309920989f163af68a7fb0c2fe81e981
 DIST cinelerra-20090210.tar.lzma 21049396 RMD160 346353eec1a796698cb95b3066058344b244416c SHA1 68e40b1de7d17da70d1087af339146be3d00fd0f SHA256 35daee11a42dec974ac45de54773022463b3daeb61da4590a9e9d57fce3298ea
 EBUILD cinelerra-20080717.ebuild 2576 RMD160 c4d08cf26afc694239f3879ab7791b6d16234d75 SHA1 f37d6472cf6463faa485045b0354a38b5ebf62ae SHA256 937f21e4f21ecf094256459c5dea00a87c594b614ba558e03a2889e6f915c22f
-EBUILD cinelerra-20090210.ebuild 2498 RMD160 70862c761c011ed53c53d85da5588cf39de12434 SHA1 0cf175574429e520007d4a5956c442cbee382794 SHA256 2bb273cac8386ab69899264f7ba7642ee706f851143449d633ad2080b15e0a58
-MISC ChangeLog 9155 RMD160 df5b9633a16f49da642b9697f206dfb92317cdc1 SHA1 28ad13940f2fc21bb9af69bcf5324447b94f581d SHA256 fd413fe82de1d64f941d569c796a3c0c1ec9e2bf1d52ad0c59441735a3620f2e
+EBUILD cinelerra-20090210.ebuild 2547 RMD160 3d355b9b37d61bf12160fdab7e1842027c2db878 SHA1 8241cfb96ba3ea03eab8bd4be16dcf515f867446 SHA256 b1edb716743618937a7af30b7acba2a1e95f26be99def7e2bd74bbaeac47d9b7
+MISC ChangeLog 9356 RMD160 1c5288af1d54a37190f278559a34ba5d98cb19d1 SHA1 8f94a2261190cefe0ac0cbb7adcea56a6772b250 SHA256 ea96de232946594166c734a7cdfbb9cee965b87e971f48cf9a9298796a92939b
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknlbUAACgkQvFcC4BYPU0qTeACgkjfgJYFpAah8ISIZZ78W7OV0
-0fYAoLLzjIOuE/4ZRorpWyDMIWyB4bEP
-=UkmL
+iEYEARECAAYFAkqnfcYACgkQvFcC4BYPU0qTCACeKrP8TSIMQnHYtINE7Q9ZzbdB
+EusAnAsaykesZGTD2y4gqzkrlHiR/Drs
+=awJ2
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra/cinelerra-20090210.ebuild b/media-video/cinelerra/cinelerra-20090210.ebuild
index 5d3296c57598..76b9e56c176f 100644
--- a/media-video/cinelerra/cinelerra-20090210.ebuild
+++ b/media-video/cinelerra/cinelerra-20090210.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20090210.ebuild,v 1.2 2009/04/15 05:14:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20090210.ebuild,v 1.3 2009/09/09 10:04:48 aballier Exp $
 
 inherit autotools multilib eutils
 
@@ -58,6 +58,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-libavutil50.patch"
+	epatch "${FILESDIR}/${PN}-pkgconfig-x264.patch"
 	AT_M4DIR="m4" eautoreconf
 }
 
diff --git a/media-video/cinelerra/files/cinelerra-pkgconfig-x264.patch b/media-video/cinelerra/files/cinelerra-pkgconfig-x264.patch
new file mode 100644
index 000000000000..50b53dea1b78
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-pkgconfig-x264.patch
@@ -0,0 +1,18 @@
+Index: cinelerra-20090210/configure.in
+===================================================================
+--- cinelerra-20090210.orig/configure.in
++++ cinelerra-20090210/configure.in
+@@ -269,12 +269,7 @@ AC_ARG_ENABLE(css, 
+ 
+ ############## libx264
+ LIBX264_LIBS=""
+-AC_CHECK_LIB(x264, x264_encoder_open,
+-	[libx264=yes LIBX264_LIBS=-lx264],,-lpthread -lm)
+-if test "x$with_pic" = "xyes"; then
+-	AC_CHECK_LIB(x264_pic, x264_encoder_open,
+-		[libx264=yes LIBX264_LIBS=-lx264_pic],,-lpthread -lm)
+-fi
++PKG_CHECK_MODULES([LIBX264], [x264], [libx264=yes], [libx264=no])
+ AC_CHECK_HEADER(x264.h, [libx264h=yes])
+ AC_SUBST(LIBX264_LIBS)
+ ##############