Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/cinelerra/files: cinelerra-pkgconfig-x264.patch
Date: Wed, 09 Sep 2009 10:04:51
Message-Id: E1MlK2j-0003mT-5p@stork.gentoo.org
1 aballier 09/09/09 10:04:49
2
3 Added: cinelerra-pkgconfig-x264.patch
4 Log:
5 use pkgconfig to detect x264 too, fixes detection with latest x264 snapshot
6 (Portage version: 2.2_rc40/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-video/cinelerra/files/cinelerra-pkgconfig-x264.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/files/cinelerra-pkgconfig-x264.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/files/cinelerra-pkgconfig-x264.patch?rev=1.1&content-type=text/plain
13
14 Index: cinelerra-pkgconfig-x264.patch
15 ===================================================================
16 Index: cinelerra-20090210/configure.in
17 ===================================================================
18 --- cinelerra-20090210.orig/configure.in
19 +++ cinelerra-20090210/configure.in
20 @@ -269,12 +269,7 @@ AC_ARG_ENABLE(css,
21
22 ############## libx264
23 LIBX264_LIBS=""
24 -AC_CHECK_LIB(x264, x264_encoder_open,
25 - [libx264=yes LIBX264_LIBS=-lx264],,-lpthread -lm)
26 -if test "x$with_pic" = "xyes"; then
27 - AC_CHECK_LIB(x264_pic, x264_encoder_open,
28 - [libx264=yes LIBX264_LIBS=-lx264_pic],,-lpthread -lm)
29 -fi
30 +PKG_CHECK_MODULES([LIBX264], [x264], [libx264=yes], [libx264=no])
31 AC_CHECK_HEADER(x264.h, [libx264h=yes])
32 AC_SUBST(LIBX264_LIBS)
33 ##############