Wed Feb 20 12:04:56 2008 UTC ()
Do not add -lx264 to the installed pkg-config files, as there is not
shared library and will cause problems in some packages that use
them to link.


(xtraeme)
diff -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg-devel/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg-devel/Attic/Makefile 2008/02/20 10:15:30 1.5
+++ pkgsrc/multimedia/ffmpeg-devel/Attic/Makefile 2008/02/20 12:04:56 1.6
@@ -1,39 +1,43 @@ @@ -1,39 +1,43 @@
1# $NetBSD: Makefile,v 1.5 2008/02/20 10:15:30 xtraeme Exp $ 1# $NetBSD: Makefile,v 1.6 2008/02/20 12:04:56 xtraeme Exp $
2 2
3DISTNAME= ffmpeg-${DISTVERSION} 3DISTNAME= ffmpeg-${DISTVERSION}
4PKGNAME= ffmpeg-devel-${DISTVERSION:S/-//g} 4PKGNAME= ffmpeg-devel-${DISTVERSION:S/-//g}
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_FREEBSD} 6MASTER_SITES= ${MASTER_SITE_FREEBSD}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 10HOMEPAGE= http://ffmpeg.mplayerhq.hu/
11COMMENT= MPEG decoding, encoding and streaming software 11COMMENT= MPEG decoding, encoding and streaming software
12 12
13DISTVERSION= 2007-10-04 13DISTVERSION= 2007-10-04
14#PKG_DESTDIR_SUPPORT= user-destdir 14#PKG_DESTDIR_SUPPORT= user-destdir
15 15
16HAS_CONFIGURE= YES 16HAS_CONFIGURE= YES
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
18USE_TOOLS+= gmake texi2html pod2man 18USE_TOOLS+= gmake texi2html pod2man
19 19
20REPLACE_PERL+= doc/texi2pod.pl 20REPLACE_PERL+= doc/texi2pod.pl
21 21
22SUBST_CLASSES+= conf 22SUBST_CLASSES+= conf pc
23SUBST_STAGE.conf= post-patch 23SUBST_STAGE.conf= post-patch
24SUBST_FILES.conf= ffserver.c 24SUBST_FILES.conf= ffserver.c
25SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g' 25SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
26SUBST_MESSAGE.conf= Fixing configuration path. 26SUBST_MESSAGE.conf= Fixing configuration path.
 27SUBST_STAGE.pc= pre-install
 28SUBST_FILES.pc= *.pc
 29SUBST_SED.pc= -e 's|-lx264||g'
 30SUBST_MESSAGE.pc= Fixing hardcoded libs.
27 31
28PLIST_SRC+= ${PKGDIR}/PLIST 32PLIST_SRC+= ${PKGDIR}/PLIST
29 33
30CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ 34CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
31 ${PKG_SYSCONFDIR}/ffserver.conf 35 ${PKG_SYSCONFDIR}/ffserver.conf
32 36
33MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} \ 37MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} \
34 LOCALBASE=${LOCALBASE:Q} 38 LOCALBASE=${LOCALBASE:Q}
35 39
36CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \ 40CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \
37 --cc=${CC:Q} \ 41 --cc=${CC:Q} \
38 --prefix=${PREFIX:Q} \ 42 --prefix=${PREFIX:Q} \
39 --disable-vhook \ 43 --disable-vhook \