aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/aqualung/Makefile2
-rw-r--r--audio/xmms2/Makefile2
-rw-r--r--graphics/blender-devel/Makefile2
-rw-r--r--graphics/php4-ffmpeg/Makefile15
-rw-r--r--multimedia/dvbcut/Makefile2
-rw-r--r--multimedia/handbrake/Makefile9
-rw-r--r--multimedia/kino/Makefile2
-rw-r--r--multimedia/libquicktime/Makefile12
-rw-r--r--multimedia/libquicktime/pkg-plist4
-rw-r--r--multimedia/lives/Makefile2
-rw-r--r--multimedia/vlc-devel/Makefile2
-rw-r--r--multimedia/vlc-devel/Makefile.inc13
-rw-r--r--multimedia/vlc/Makefile2
-rw-r--r--multimedia/vlc/Makefile.inc13
14 files changed, 20 insertions, 62 deletions
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index b0aa85e78a97..7a531d925030 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack \
lrdf.2:${PORTSDIR}/textproc/liblrdf \
cdio.7:${PORTSDIR}/sysutils/libcdio \
mp3lame.0:${PORTSDIR}/audio/lame \
- avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel \
+ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
strfunc.9:${PORTSDIR}/devel/libstrfunc \
cddb.4:${PORTSDIR}/audio/libcddb
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index f238ad4b680f..552af278c6a3 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -120,7 +120,7 @@ PLIST_SUB+= FAAD="@comment "
.endif
.if defined(WITH_WMA)
-LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel
+LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+= WMA=""
.else
EXCLUDE+= wma
diff --git a/graphics/blender-devel/Makefile b/graphics/blender-devel/Makefile
index 16850161b6fc..08880d29d2a8 100644
--- a/graphics/blender-devel/Makefile
+++ b/graphics/blender-devel/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
Half.4:${PORTSDIR}/graphics/OpenEXR \
openal.0:${PORTSDIR}/audio/openal \
alut.1:${PORTSDIR}/audio/freealut \
- avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel
+ avutil.1:${PORTSDIR}/multimedia/ffmpeg
PLIST_FILES= bin/blender
USE_X_PREFIX= yes
diff --git a/graphics/php4-ffmpeg/Makefile b/graphics/php4-ffmpeg/Makefile
index d91830a66b63..f21ef098d4ce 100644
--- a/graphics/php4-ffmpeg/Makefile
+++ b/graphics/php4-ffmpeg/Makefile
@@ -18,7 +18,8 @@ EXTRACT_SUFX= .tbz2
MAINTAINER= acm@FreeBSD.org
COMMENT= The ffmpeg shared extension for php
-LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
+LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
+ avutil.1:${PORTSDIR}/multimedia/ffmpeg
USE_BZIP2= yes
USE_PHP= yes
@@ -28,14 +29,4 @@ IGNORE_WITH_PHP?=5
DEFAULT_PHP_VER?=4
CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
-OPTIONS= FFMPEG_DEVEL "Use ffmpeg development version" off
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITH_FFMPEG_DEVEL)
-LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-.else
-LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index ac158ee3ebea..1f33453c3f82 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -19,7 +19,7 @@ COMMENT= Qt application for cutting of MPEG PS and MPEG TS streams (DVB)
BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons \
mplayer:${PORTSDIR}/multimedia/mplayer
RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
-LIB_DEPENDS= avutil.1:${PORTSDIR}/multimedia/ffmpeg-devel \
+LIB_DEPENDS= avutil.1:${PORTSDIR}/multimedia/ffmpeg \
ao.3:${PORTSDIR}/audio/libao
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index e8d31604719e..277e451f79b4 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -29,7 +29,8 @@ LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \
samplerate.1:${PORTSDIR}/audio/libsamplerate \
vorbis.3:${PORTSDIR}/audio/libvorbis \
xvidcore.4:${PORTSDIR}/multimedia/xvid \
- x264.50:${PORTSDIR}/multimedia/x264
+ x264.50:${PORTSDIR}/multimedia/x264 \
+ avcodec.1:${PORTSDIR}/multimedia/ffmpeg
WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION}
HAS_CONFIGURE= yes
@@ -46,12 +47,6 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude beos \
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libavformat.a) && !exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc)
-BROKEN= ffmpeg exists, handbrake needs ffmpeg-devel so uninstall ffmpeg if you still want handbrake
-.else
-LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
-.endif
-
.if ${OSVERSION} < 500000
USE_GETOPT_LONG= yes
MAKE_ENV= EXTRA_LIBS="-lcipher -lgnugetopt"
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 1433ed026f92..2c849b9c649c 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -55,7 +55,7 @@ PLIST_SUB+= FFMPEG_KINO=""
.else
CONFIGURE_ARGS+= --disable-local-ffmpeg
PLIST_SUB+= FFMPEG_KINO="@comment "
-LIB_DEPENDS+= avcodec.1:$(PORTSDIR)/multimedia/ffmpeg-devel
+LIB_DEPENDS+= avcodec.1:$(PORTSDIR)/multimedia/ffmpeg
.endif
.include <bsd.port.post.mk>
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index d25afbcf1af7..4d10a1534ca0 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libquicktime
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +18,8 @@ COMMENT= A library for reading and writing quicktime files
LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
- dv.4:${PORTSDIR}/multimedia/libdv
+ dv.4:${PORTSDIR}/multimedia/libdv \
+ avcodec.1:${PORTSDIR}/multimedia/ffmpeg
USE_LDCONFIG= yes
USE_GETTEXT= yes
@@ -48,14 +50,6 @@ PORTDOCS= api_usage.html codecs.html qt4l_building.html \
CONFIGURE_ARGS+=--without-cpuflags
.endif
-.if exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) || !exists(${LOCALBASE}/lib/libavformat.a)
-LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
-PLIST_SUB+= FFMPEG=""
-.else
-NO_FFMPEG= ${TRUE}
-PLIST_SUB+= FFMPEG="@comment "
-.endif
-
.if ${HAVE_GNOME:Mgtk20}!="" || defined(WITH_GTK2)
USE_GNOME+= gtk20
PLIST_SUB+= GTK=""
diff --git a/multimedia/libquicktime/pkg-plist b/multimedia/libquicktime/pkg-plist
index 7848a99d5d78..7f9264ad7082 100644
--- a/multimedia/libquicktime/pkg-plist
+++ b/multimedia/libquicktime/pkg-plist
@@ -26,8 +26,8 @@ lib/libquicktime/lqt_dv.la
lib/libquicktime/lqt_dv.so
%%LAME%%lib/libquicktime/lqt_lame.so
%%LAME%%lib/libquicktime/lqt_lame.la
-%%FFMPEG%%lib/libquicktime/lqt_ffmpeg.la
-%%FFMPEG%%lib/libquicktime/lqt_ffmpeg.so
+lib/libquicktime/lqt_ffmpeg.la
+lib/libquicktime/lqt_ffmpeg.so
lib/libquicktime/lqt_mjpeg.la
lib/libquicktime/lqt_mjpeg.so
lib/libquicktime/lqt_png.la
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index ef0a3155c3f8..198f8344ceb0 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= Magick.10:${PORTSDIR}/graphics/ImageMagick \
jack.0:${PORTSDIR}/audio/jack \
visual-0.4.0:${PORTSDIR}/graphics/libvisual04 \
theora.2:${PORTSDIR}/multimedia/libtheora \
- avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel \
+ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
dv.4:${PORTSDIR}/multimedia/libdv \
matroska.0:${PORTSDIR}/multimedia/libmatroska \
oil-0.3.1:${PORTSDIR}/devel/liboil \
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 6ed6bd06506f..115dc3d6139c 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -25,7 +25,7 @@ MAINTAINER= multimedia@FreeBSD.org
COMMENT= Multimedia streaming server and player for various audio/video formats
LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \
- avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
+ avcodec.1:${PORTSDIR}/multimedia/ffmpeg
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
OPTIONS+= A52 "a52 audio support, many DVDs use this" On
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index facc694f95cf..492607a31346 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -41,7 +41,7 @@
#
# WITH_FAAC=yes
# Faac audio encoder (mp4/aac) Support
-# ** Only enable this if you compiled multimedia/ffmpeg-devel with WITH_FAAC knob **
+# ** Only enable this if you compiled multimedia/ffmpeg with WITH_FAAC knob **
#
# WITH_FAAD=yes
# Faad audio decoder (mp4/aac) Support
@@ -258,17 +258,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/lib/win32|${LOCALBASE}/lib/win32|' \
${WRKSRC}/libs/loader/module.c
-pre-configure:
-.if !exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) && exists(${LOCALBASE}/lib/libavformat.a)
- @${ECHO_CMD} ""
- @${ECHO_CMD} "ERROR: ${PKGNAME} requires a newer version of FFMpeg"
- @${ECHO_CMD} "please deinstall multimedia/ffmpeg before continuing"
- @${ECHO_CMD} "the build."
- @${ECHO_CMD} ""
- @${FALSE}
-.endif
-
-
pre-build:
@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
${WRKSRC}/vlc-config
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index a58a2fad117f..5a6b2e99d30a 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -22,7 +22,7 @@ MAINTAINER= multimedia@FreeBSD.org
COMMENT= Multimedia streaming server and player for various audio/video formats
LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \
- avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
+ avcodec.1:${PORTSDIR}/multimedia/ffmpeg
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index fef71f2a4bbb..620569d116c5 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -41,7 +41,7 @@
#
# WITH_FAAC=yes
# Faac audio encoder (mp4/aac) Support
-# ** Only enable this if you compiled multimedia/ffmpeg-devel with WITH_FAAC knob **
+# ** Only enable this if you compiled multimedia/ffmpeg with WITH_FAAC knob **
#
# WITH_FAAD=yes
# Faad audio decoder (mp4/aac) Support
@@ -262,17 +262,6 @@ post-patch:
.endif
@${REINPLACE_CMD} -e 's|dts_free|dca_free|g' ${WRKSRC}/configure
-pre-configure:
-.if !exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) && exists(${LOCALBASE}/lib/libavformat.a)
- @${ECHO_CMD} ""
- @${ECHO_CMD} "ERROR: ${PKGNAME} requires a newer version of FFMpeg"
- @${ECHO_CMD} "please deinstall multimedia/ffmpeg before continuing"
- @${ECHO_CMD} "the build."
- @${ECHO_CMD} ""
- @${FALSE}
-.endif
-
-
pre-build:
@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
${WRKSRC}/vlc-config