diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2008-07-27 23:53:24 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2008-07-27 23:53:24 +0000 |
| commit | c4d723766088dd6f2ea9713c2fbf08daaa745996 (patch) | |
| tree | 0d7aab1c0f1261dd5d81684cfdb11226ebcdbb9b /multimedia | |
| parent | 1fdd6a008f45b6e5719a721af0173e29d4b7b7a2 (diff) | |
Update for new ffmpeg
Notes
Notes:
svn path=/head/; revision=217720
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc-devel/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/vlc/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-modules_stream_out_switcher.c | 11 |
3 files changed, 4 insertions, 14 deletions
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index 92e8008abd4b..d03316a3e556 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -10,6 +10,7 @@ PORTNAME= vlc DISTVERSION= 0.9.0-test1 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/testing/${PORTNAME}-${DISTVERSION}/ @@ -78,7 +79,7 @@ PLIST= ${WRKDIR}/plist USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \ +CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc" \ LIBS="-lc" diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 3d895997067c..04409ecc9f42 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -10,7 +10,7 @@ PORTNAME= vlc DISTVERSION= 0.8.6h -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \ @@ -77,7 +77,7 @@ PLIST= ${WRKDIR}/plist USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \ +CONFIGURE_ENV= CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc" \ LIBS="-lc" diff --git a/multimedia/vlc/files/patch-modules_stream_out_switcher.c b/multimedia/vlc/files/patch-modules_stream_out_switcher.c deleted file mode 100644 index 3952ddff1848..000000000000 --- a/multimedia/vlc/files/patch-modules_stream_out_switcher.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/stream_out/switcher.c.orig Wed Mar 23 03:57:15 2005 -+++ modules/stream_out/switcher.c Wed Mar 23 03:57:50 2005 -@@ -44,7 +44,7 @@ - #ifdef HAVE_POSTPROC_POSTPROCESS_H - # include <postproc/postprocess.h> - #else --# include <libpostproc/postprocess.h> -+# include <ffmpeg/postproc/postprocess.h> - #endif - - #define SOUT_CFG_PREFIX "sout-switcher-" |