Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/frei0r-plugins/files: frei0r-plugins-1.1.22-no-automagic-deps.patch
Date: Sun, 05 Jul 2009 13:59:21
Message-Id: E1MNSFT-0005gb-Q4@stork.gentoo.org
1 yngwin 09/07/05 13:59:19
2
3 Added: frei0r-plugins-1.1.22-no-automagic-deps.patch
4 Log:
5 Initial commit, based on ebuild by Roberto Castagnola in bug 255319. Added patch to keep opencv and gavl optional but not automagic deps.
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-no-automagic-deps.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-no-automagic-deps.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-no-automagic-deps.patch?rev=1.1&content-type=text/plain
13
14 Index: frei0r-plugins-1.1.22-no-automagic-deps.patch
15 ===================================================================
16 --- orig/configure.ac 2008-10-28 11:57:18.000000000 +0100
17 +++ patched/configure.ac 2009-07-05 15:19:37.000000000 +0200
18 @@ -11,12 +11,18 @@
19 AC_PROG_CC
20 AC_PROG_LIBTOOL
21
22 +
23 +AC_ARG_ENABLE([facedetect], [ --enable-facedetect enable facedetect plugin (needs opencv)],
24 + [facedetect=${enableval}], [facedetect=no])
25 +
26 HAVE_OPENCV=false
27 -PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true])
28 -if test x$HAVE_OPENCV = xfalse; then
29 - AC_MSG_WARN([*** opencv >= 1.0.0 not found - this program enables optional plugin with the Open Source Computer Vision library >= 1.0.0 http://opencvlibrary.sourceforge.net/ ***])
30 -else
31 - OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`"
32 +if test "x${facedetect}" = xyes; then
33 + PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true])
34 + if test x$HAVE_OPENCV = xfalse; then
35 + AC_MSG_WARN([*** opencv >= 1.0.0 not found - this program enables optional plugin with the Open Source Computer Vision library >= 1.0.0 http://opencvlibrary.sourceforge.net/ ***])
36 + else
37 + OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`"
38 + fi
39 fi
40 AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue])
41
42 @@ -35,11 +41,16 @@
43 AC_FUNC_MALLOC
44 AC_CHECK_FUNCS([floor memset pow sqrt])
45
46 +
47 +AC_ARG_ENABLE([scale0tilt], [ --enable-scale0tilt enable scale0tilt plugin (needs gavl)],
48 + [scale0tilt=${enableval}], [scale0tilt=no])
49 +
50 HAVE_GAVL=false
51 -PKG_CHECK_MODULES(GAVL, gavl >= 0.2.3, [HAVE_GAVL=true], [true])
52 -if test x$HAVE_GAVL = xfalse; then
53 - AC_MSG_WARN([*** gavl >= 0.2.3 not found - this program enables optional plugin with the gmerlin audio
54 - video library >= 0.2.3 http://gmerlin.sourceforge.net/ ***])
55 +if test "x${scale0tilt}" = xyes; then
56 + PKG_CHECK_MODULES(GAVL, gavl >= 0.2.3, [HAVE_GAVL=true], [true])
57 + if test x$HAVE_GAVL = xfalse; then
58 + AC_MSG_WARN([*** gavl >= 0.2.3 not found - this program enables optional plugin with the gmerlin audio video library >= 0.2.3 http://gmerlin.sourceforge.net/ ***])
59 + fi
60 fi
61 AM_CONDITIONAL([HAVE_GAVL], [test x$HAVE_GAVL = xtrue])