aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/avidemux2/Makefile.common3
-rw-r--r--multimedia/ffmpeg-devel/Makefile7
-rw-r--r--multimedia/ffmpeg/Makefile4
-rw-r--r--multimedia/gstreamer-plugins-x264/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common2
-rw-r--r--multimedia/libquicktime/Makefile4
-rw-r--r--multimedia/lives/Makefile2
-rw-r--r--multimedia/mencoder/Makefile4
-rw-r--r--multimedia/mpeg4ip/Makefile4
-rw-r--r--multimedia/transcode/Makefile4
-rw-r--r--multimedia/vlc/Makefile3
-rw-r--r--multimedia/x264/Makefile14
-rw-r--r--multimedia/x264/distinfo4
-rw-r--r--multimedia/x264/files/patch-configure25
14 files changed, 28 insertions, 54 deletions
diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common
index 694882cc162d..09217837291a 100644
--- a/multimedia/avidemux2/Makefile.common
+++ b/multimedia/avidemux2/Makefile.common
@@ -2,6 +2,7 @@
#
AVIDEMUX2_VERSION= 2.5.5
+PORTREVISION= 1
MASTER_SITES= BERLIOS \
SF/avidemux/avidemux/${PORTVERSION}
DISTNAME= avidemux_${PORTVERSION}
@@ -168,7 +169,7 @@ PLIST_SUB+= FAAD=""
CMAKE_ARGS+= -DX264:BOOL=OFF
PLIST_SUB+= X264="@comment "
.else
-LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+= x264.115:${PORTSDIR}/multimedia/x264
PLIST_SUB+= X264=""
.endif
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index f907039e4619..babc3f2d4763 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ffmpeg
DISTVERSION= 2011-05-03
+PORTREVISION= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mm
@@ -339,11 +340,7 @@ CONFIGURE_ARGS+= --disable-libvpx
# x264
.ifdef(WITH_X264)
-. if exists(${LOCALBASE}/lib/libx264.so.114)
-LIB_DEPENDS+= x264.114:${PORTSDIR}/multimedia/x264-devel
-. else
-LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264
-. endif
+LIB_DEPENDS+= x264.115:${PORTSDIR}/multimedia/x264
CONFIGURE_ARGS+= --enable-libx264
.else
CONFIGURE_ARGS+= --disable-libx264
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 8d79e9065ce2..6881d7e6b5f4 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ffmpeg
PORTVERSION= 0.6.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -321,7 +321,7 @@ CONFIGURE_ARGS+= --disable-libvpx
# x264
.ifndef(WITHOUT_X264)
-LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+= x264.115:${PORTSDIR}/multimedia/x264
CONFIGURE_ARGS+= --enable-libx264
.else
CONFIGURE_ARGS+= --disable-libx264
diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile
index 9c355de0326d..9ff5576ca6e0 100644
--- a/multimedia/gstreamer-plugins-x264/Makefile
+++ b/multimedia/gstreamer-plugins-x264/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer x264 plugin
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 43d5880e6386..ed234dff499c 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -581,7 +581,7 @@ gst_vp8_PLIST_FILES= ${GST_LIB_DIR}/libgstvp8.la \
gst_vp8_DIST= bad
# x264
-gst_x264_LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264
+gst_x264_LIB_DEPENDS+= x264.115:${PORTSDIR}/multimedia/x264
gst_x264_PLIST_FILES= ${GST_LIB_DIR}/libgstx264.la \
${GST_LIB_DIR}/libgstx264.so \
share/gstreamer-${VERSION}/presets/GstX264Enc.prs
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 2a17b04b011b..bb3c39033d1a 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libquicktime
PORTVERSION= 1.2.2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+= --without-faad2
.endif
.if !defined(WITHOUT_X264)
-LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+= x264.115:${PORTSDIR}/multimedia/x264
PLIST_SUB+= X264=""
CONFIGURE_ARGS+= --with-x264
.else
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index ad5de221b0fd..81d95875cde1 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lives
PORTVERSION= 1.0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://www.xs4all.nl/~salsaman/lives/current/
DISTNAME= LiVES-${PORTVERSION}
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 8b059a40d5b0..cfce4e7de66e 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -6,7 +6,7 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 0
+PORTREVISION= 1
COMMENT= Convenient video file and movie encoder
RESTRICTED= Port has restricted dependencies
@@ -109,7 +109,7 @@ CONFIGURE_ARGS+= --disable-faac
.endif
.if !defined(WITHOUT_X264)
-LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+= x264.115:${PORTSDIR}/multimedia/x264
.else
CONFIGURE_ARGS+= --disable-x264
.endif
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 1140aa3d5e48..8310b6d2764c 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mpeg4ip
PORTVERSION= 1.6.1
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= LOCAL/ahze
# http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
@@ -27,7 +27,7 @@ LIB_DEPENDS= faac.0:${PORTSDIR}/audio/faac \
a52.0:${PORTSDIR}/audio/liba52 \
mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
- x264.110:${PORTSDIR}/multimedia/x264
+ x264.115:${PORTSDIR}/multimedia/x264
RUN_DEPENDS= mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2
USE_GNOME= gtk20
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 3ec8da3b7a1d..5978a3787ebc 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= transcode
PORTVERSION= 1.1.5
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_BERLIOS} \
http://fromani.exit1.org/
@@ -116,7 +116,7 @@ CONFIGURE_ARGS+= --disable-xvid
.endif
.if defined(WITH_X264)
-LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+= x264.115:${PORTSDIR}/multimedia/x264
CONFIGURE_ARGS+= --with-x264-prefix=${LOCALBASE} --enable-x264
.else
CONFIGURE_ARGS+= --disable-x264
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index c5ea07763f09..a071b2ce4758 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vlc
DISTVERSION= 1.1.10
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -677,7 +678,7 @@ CONFIGURE_ARGS+=--with-x
.if defined(WITH_X264)
CONFIGURE_ARGS+=--enable-x264
-LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+= x264.115:${PORTSDIR}/multimedia/x264
.else
CONFIGURE_ARGS+=--disable-x264
.endif
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 105708a5ff9f..38d8340060de 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -9,10 +9,10 @@ PORTVERSION= 0.${X264_BUILD}.${X264_REV}
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
-DISTNAME= ${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245
-DISTFILES= ${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245${EXTRACT_SUFX}
+DISTNAME= ${PORTNAME}-snapshot-${X264_SNAP}-2245-stable
+DISTFILES= ${PORTNAME}-snapshot-${X264_SNAP}-2245-stable${EXTRACT_SUFX}
DIST_SUBDIR= x264
-EXTRACT_ONLY= ${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245${EXTRACT_SUFX}
+EXTRACT_ONLY= ${PORTNAME}-snapshot-${X264_SNAP}-2245-stable${EXTRACT_SUFX}
MAINTAINER= mm@FreeBSD.org
COMMENT?= Library and tool for encoding H.264/AVC video streams
@@ -22,9 +22,9 @@ BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-X264_BUILD= 110
-X264_REV= 1820
-X264_SNAPSHOT= 20101211
+X264_BUILD= 115
+X264_REV= 2000
+X264_SNAP= 20110622
USE_BZIP2= yes
EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude .svn
@@ -43,7 +43,7 @@ OPTIONS= ASM "Assembly optimizations (devel/binutils)" On \
CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \
--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib" \
- --enable-shared
+ --enable-static --enable-shared
PLIST_SUB+= X264_BUILD=${X264_BUILD}
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index d3ff5a17b77d..08863bc0f58a 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,4 +1,4 @@
-SHA256 (x264/x264-snapshot-20101211-2245.tar.bz2) = 29b65bd39bde86464c5370682e4beb53d03288fe34304ea14bb345b554ccd120
-SIZE (x264/x264-snapshot-20101211-2245.tar.bz2) = 473355
+SHA256 (x264/x264-snapshot-20110622-2245-stable.tar.bz2) = e46e63e53dbad17eafae6b3ee22c0037790e574478188828db2eaafddb5c7361
+SIZE (x264/x264-snapshot-20110622-2245-stable.tar.bz2) = 504067
SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
SIZE (x264/example.y4m.bz2) = 4910029
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure
deleted file mode 100644
index 944aaf295a2e..000000000000
--- a/multimedia/x264/files/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.orig 2010-11-28 22:45:04.000000000 +0100
-+++ configure 2010-11-29 22:51:09.651506774 +0100
-@@ -350,12 +350,16 @@
- ARCH="X86"
- AS="yasm"
- ASFLAGS="$ASFLAGS -O2"
-- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
-- CFLAGS="$CFLAGS -march=i686"
-- fi
-- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
-- CFLAGS="$CFLAGS -mfpmath=sse -msse"
-- fi
-+ if [ "$asm" = yes ]; then
-+ case "$CFLAGS" in
-+ *-march*) ;;
-+ *) CFLAGS="$CFLAGS -march=i686" ;;
-+ esac
-+ case "$CFLAGS" in
-+ *-mfpmath*) ;;
-+ *) CFLAGS="$CFLAGS -mfpmath=sse -msse" ;;
-+ esac
-+ fi
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho -DPREFIX"
- elif [ "$SYS" = MINGW ]; then
generated by cgit (git 2.34.1) at 2024-12-15 21:18:10 +0800