Thu Aug 15 18:49:11 2013 UTC ()
Fix rpath issue


(adam)
diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg2/Makefile
diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg2/Makefile.common
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg2/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile 2013/08/15 10:21:30 1.2
+++ pkgsrc/multimedia/ffmpeg2/Makefile 2013/08/15 18:49:10 1.3
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.2 2013/08/15 10:21:30 adam Exp $ 1# $NetBSD: Makefile,v 1.3 2013/08/15 18:49:10 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/}
4MAINTAINER= pkgsrc-users@NetBSD.org 4MAINTAINER= pkgsrc-users@NetBSD.org
5HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 5HOMEPAGE= http://ffmpeg.mplayerhq.hu/
6COMMENT= Decoding, encoding and streaming software 6COMMENT= Decoding, encoding and streaming software
7 7
8CONFIGURE_ARGS+= --enable-avfilter 8CONFIGURE_ARGS+= --enable-avfilter
9#CONFIGURE_ARGS+= --enable-avfilter-lavf 9#CONFIGURE_ARGS+= --enable-avfilter-lavf
10CONFIGURE_ARGS+= --enable-postproc 10CONFIGURE_ARGS+= --enable-postproc
11 11
12INSTALLATION_DIRS= lib share/doc/ffmpeg2 share/examples/ffmpeg2 12INSTALLATION_DIRS= lib/ffmpeg2 share/doc/ffmpeg2 share/examples/ffmpeg2
13 13
14CONF_FILES+= ${PREFIX}/share/examples/ffmpeg2/ffserver.conf \ 14CONF_FILES+= ${PREFIX}/share/examples/ffmpeg2/ffserver.conf \
15 ${PKG_SYSCONFDIR}/ffserver.conf 15 ${PKG_SYSCONFDIR}/ffserver.conf
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18
19.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 19.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
20CONFIGURE_ARGS+= --enable-cross-compile 20CONFIGURE_ARGS+= --enable-cross-compile
21CONFIGURE_ARGS+= --arch=${MACHINE_ARCH} 21CONFIGURE_ARGS+= --arch=${MACHINE_ARCH}
22CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q} 22CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q}
23CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q} 23CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q}
24CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS} 24CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS}
25.endif 25.endif
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg2/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile.common 2013/08/11 17:56:05 1.2
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common 2013/08/15 18:49:10 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.2 2013/08/11 17:56:05 adam Exp $ 1# $NetBSD: Makefile.common,v 1.3 2013/08/15 18:49:10 adam Exp $
2# used by multimedia/ffmpeg2/Makefile 2# used by multimedia/ffmpeg2/Makefile
3# used by multimedia/ffplay2/Makefile 3# used by multimedia/ffplay2/Makefile
4 4
5DISTNAME= ffmpeg-2.0.1 5DISTNAME= ffmpeg-2.0.1
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
11 11
12PREV_PKGPATH= multimedia/ffmpeg-devel 12PREV_PKGPATH= multimedia/ffmpeg-devel
13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches 13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches
14 14
@@ -21,26 +21,27 @@ CONFIGURE_ARGS+= --disable-debug @@ -21,26 +21,27 @@ CONFIGURE_ARGS+= --disable-debug
21CONFIGURE_ARGS+= --disable-optimizations 21CONFIGURE_ARGS+= --disable-optimizations
22CONFIGURE_ARGS+= --disable-stripping 22CONFIGURE_ARGS+= --disable-stripping
23CONFIGURE_ARGS+= --enable-shared 23CONFIGURE_ARGS+= --enable-shared
24CONFIGURE_ARGS+= --enable-pthreads 24CONFIGURE_ARGS+= --enable-pthreads
25CONFIGURE_ARGS+= --enable-gpl 25CONFIGURE_ARGS+= --enable-gpl
26CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 26CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
27CONFIGURE_ARGS+= --prefix=${PREFIX} 27CONFIGURE_ARGS+= --prefix=${PREFIX}
28 28
29CONFIGURE_ARGS+= --progs-suffix=2 29CONFIGURE_ARGS+= --progs-suffix=2
30CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2 30CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2
31CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2 31CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2
32CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2 32CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2
33CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2 33CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2
 34LDFLAGS+= -Wl,-R${PREFIX}/lib/ffmpeg2
34 35
35PLIST_VARS+= opencl 36PLIST_VARS+= opencl
36 37
37.if ${OPSYS} == "Darwin" 38.if ${OPSYS} == "Darwin"
38CONFIGURE_ARGS+= --enable-opencl 39CONFIGURE_ARGS+= --enable-opencl
39PLIST.opencl= yes 40PLIST.opencl= yes
40.endif 41.endif
41 42
42.if ${OPSYS} == "SunOS" 43.if ${OPSYS} == "SunOS"
43CONFIGURE_ARGS+= --disable-amd3dnow 44CONFIGURE_ARGS+= --disable-amd3dnow
44CONFIGURE_ARGS+= --disable-amd3dnowext 45CONFIGURE_ARGS+= --disable-amd3dnowext
45CONFIGURE_ARGS+= --disable-mmx 46CONFIGURE_ARGS+= --disable-mmx
46CONFIGURE_ARGS+= --disable-sse 47CONFIGURE_ARGS+= --disable-sse
@@ -74,23 +75,22 @@ BUILD_DEPENDS+= yasm>=0.7.2:../../devel/ @@ -74,23 +75,22 @@ BUILD_DEPENDS+= yasm>=0.7.2:../../devel/
74 75
75REPLACE_PERL+= doc/texi2pod.pl 76REPLACE_PERL+= doc/texi2pod.pl
76REPLACE_SH+= configure version.sh 77REPLACE_SH+= configure version.sh
77 78
78SUBST_CLASSES+= conf 79SUBST_CLASSES+= conf
79SUBST_STAGE.conf= post-patch 80SUBST_STAGE.conf= post-patch
80SUBST_FILES.conf= ffserver.c 81SUBST_FILES.conf= ffserver.c
81SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g' 82SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
82SUBST_MESSAGE.conf= Fixing configuration path. 83SUBST_MESSAGE.conf= Fixing configuration path.
83 84
84PLIST_SRC+= ${PKGDIR}/PLIST 85PLIST_SRC+= ${PKGDIR}/PLIST
85 86
86MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} 87MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q}
87# LOCALBASE=${LOCALBASE:Q} 
88 88
89pre-configure: 89pre-configure:
90 mkdir ${WRKSRC}/tmp 90 mkdir ${WRKSRC}/tmp
91 91
92.include "../../mk/pthread.buildlink3.mk" 
93.include "../../archivers/bzip2/buildlink3.mk" 92.include "../../archivers/bzip2/buildlink3.mk"
94.include "../../devel/libgetopt/buildlink3.mk" 93.include "../../devel/libgetopt/buildlink3.mk"
95.include "../../devel/zlib/buildlink3.mk" 94.include "../../devel/zlib/buildlink3.mk"
 95.include "../../mk/pthread.buildlink3.mk"
96.include "../../mk/bsd.pkg.mk" 96.include "../../mk/bsd.pkg.mk"