Here is an update to an FFmpeg 20120422 snapshot taken from the 0.7
branch. This doesn't buy us anything for features but it does fix a
whole lot of security related issues and bugs. Builds with everything
in the tree. Tested on amd64 with VLC/Xine-lib/MPlayer.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile 8 Apr 2012 16:56:51 -0000 1.85
+++ Makefile 22 Apr 2012 04:52:33 -0000
@@ -2,21 +2,20 @@
COMMENT= audio/video converter and streamer
-V= 20111126
+V= 20120422
DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
-REVISION= 0
CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= avcodec 16.2 \
- avdevice 4.1 \
- avfilter 2.2 \
- avformat 14.2 \
- avutil 8.2 \
+SHARED_LIBS= avcodec 17.0 \
+ avdevice 5.0 \
+ avfilter 3.0 \
+ avformat 15.0 \
+ avutil 9.0 \
postproc 14.0 \
- swscale 3.2
+ swscale 4.0
HOMEPAGE= http://ffmpeg.org/
@@ -67,11 +66,6 @@ FFMPEG_ARCH= generic
FFMPEG_ARCH= ${MACHINE_ARCH}
.endif
-OPTFLAGS= ${CFLAGS}
-
-# until the system headers are fixed properly.
-OPTFLAGS+= -Wno-redundant-decls
-
USE_GMAKE= Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
@@ -103,8 +97,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-x11grab \
--extra-cflags="-I${LOCALBASE}/include -I${X11BASE}/include" \
--extra-libs="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- --mandir=${PREFIX}/man \
- --optflags="${OPTFLAGS}"
+ --mandir=${PREFIX}/man
CONFIGURE_ENV+= LIBavcodec_EXTRALIBS="${LIBavcodec_EXTRALIBS}" \
LIBavdevice_EXTRALIBS="${LIBavdevice_EXTRALIBS}" \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 30 Dec 2011 17:34:39 -0000 1.20
+++ distinfo 22 Apr 2012 04:25:59 -0000
@@ -1,5 +1,5 @@
-MD5 (ffmpeg-git-20111126.tar.bz2) = 8wE3eHPiBIVeKeC28Jfgpg==
-RMD160 (ffmpeg-git-20111126.tar.bz2) = 82Jpr5wP9s3edVjXrKPNB/+Yfo8=
-SHA1 (ffmpeg-git-20111126.tar.bz2) = nodItiAZOLJ9N3HOPH7nPoxYSEM=
-SHA256 (ffmpeg-git-20111126.tar.bz2) =
LVfk+XnuoYk0wNqCebPHgCUC1ioprRQcpcO6Dfl9wlE=
-SIZE (ffmpeg-git-20111126.tar.bz2) = 4500115
+MD5 (ffmpeg-git-20120422.tar.bz2) = FIvZR59fVAYWfyYA3SibHQ==
+RMD160 (ffmpeg-git-20120422.tar.bz2) = EFkAKIN6d6XvX/rVL4A+cDSeGNc=
+SHA1 (ffmpeg-git-20120422.tar.bz2) = 3ivLDfdrywb5n9fu4DyVyeCwIlg=
+SHA256 (ffmpeg-git-20120422.tar.bz2) =
zbO5f21FhD+X1HgeIsdFbCPNgOswuIqHhx2iZXgAVyc=
+SIZE (ffmpeg-git-20120422.tar.bz2) = 4488962
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v
retrieving revision 1.28
diff -u -p -r1.28 patch-configure
--- patches/patch-configure 30 Dec 2011 17:34:39 -0000 1.28
+++ patches/patch-configure 22 Apr 2012 04:51:02 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.28 2011/12/30 17:34:39 edd Exp $
---- configure.orig Thu Sep 22 14:48:24 2011
-+++ configure Thu Sep 22 23:08:31 2011
-@@ -1093,7 +1093,6 @@ HAVE_LIST="
+--- configure.orig Sat Apr 21 23:53:38 2012
++++ configure Sun Apr 22 00:50:49 2012
+@@ -1092,7 +1092,6 @@ HAVE_LIST="
lzo1x_999_compress
machine_ioctl_bt848_h
machine_ioctl_meteor_h
@@ -9,16 +9,15 @@ $OpenBSD: patch-configure,v 1.28 2011/12
MapViewOfFile
memalign
mkstemp
-@@ -2413,6 +2412,8 @@ case $target_os in
+@@ -2425,6 +2424,7 @@ case $target_os in
enable pic
disable symver
SHFLAGS='-shared'
+ SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBVERSION)'
-+ SLIB_INSTALL_LINKS=
oss_indev_extralibs="-lossaudio"
oss_outdev_extralibs="-lossaudio"
;;
-@@ -2591,7 +2592,7 @@ die_license_disabled version3 libvo_amrwbenc
+@@ -2601,7 +2601,7 @@ die_license_disabled version3 libvo_amrwbenc
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
@@ -27,7 +26,7 @@ $OpenBSD: patch-configure,v 1.28 2011/12
enable_pic() {
enable pic
-@@ -2772,8 +2773,6 @@ if enabled asm; then
+@@ -2797,8 +2797,6 @@ if enabled asm; then
$nogas "GNU assembler not found, install gas-preprocessor"
fi
@@ -36,7 +35,7 @@ $OpenBSD: patch-configure,v 1.28 2011/12
if check_func dlopen; then
ldl=
elif check_func dlopen -ldl; then
-@@ -2906,7 +2905,7 @@ enabled libdirac && require_pkg_config dirac
+@@ -2931,7 +2929,7 @@ enabled libdirac && require_pkg_config dirac
"dirac_decoder_init dirac_encoder_init"
enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion
-lfaac
enabled libfreetype && require_pkg_config freetype2 "ft2build.h
freetype/freetype.h" FT_Init_FreeType
@@ -45,15 +44,26 @@ $OpenBSD: patch-configure,v 1.28 2011/12
enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h
lame_set_VBR_quality -lmp3lame
enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
enabled libopencore_amrnb && require libopencore_amrnb
opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
-@@ -3038,7 +3037,6 @@ enabled extra_warnings && check_cflags -Winline
+@@ -3057,7 +3055,6 @@ enabled extra_warnings && check_cflags -Winline
# add some linker flags
check_ldflags -Wl,--warn-common
--check_ldflags
-Wl,-rpath-link=libpostproc:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil
+-check_ldflags -Wl,-rpath-link,libpostproc -Wl,-rpath-link,libswscale
-Wl,-rpath-link,libavfilter -Wl,-rpath-link,libavdevice
-Wl,-rpath-link,libavformat -Wl,-rpath-link,libavcodec -Wl,-rpath-link,libavutil
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
echo "X{};" > $TMPV
-@@ -3465,8 +3463,7 @@ Version: $version
+@@ -3075,10 +3072,6 @@ fi
+
+ if enabled small; then
+ add_cflags $size_cflags
+-elif enabled optimizations; then
+- add_cflags $speed_cflags
+-else
+- add_cflags $noopt_cflags
+ fi
+ check_cflags -fno-math-errno
+ check_cflags -fno-signed-zeros
+@@ -3519,8 +3512,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts:
@@ -63,7 +73,7 @@ $OpenBSD: patch-configure,v 1.28 2011/12
Cflags: -I\${includedir}
EOF
cat <<EOF > $name/$name-uninstalled.pc
-@@ -3485,10 +3482,10 @@ Cflags: -I\${includedir}
+@@ -3539,10 +3531,10 @@ Cflags: -I\${includedir}
EOF
}
@@ -72,7 +82,7 @@ $OpenBSD: patch-configure,v 1.28 2011/12
-pkgconfig_generate libavformat "FFmpeg container format library"
"$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
-pkgconfig_generate libavdevice "FFmpeg device handling library"
"$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"
-pkgconfig_generate libavfilter "FFmpeg video filtering library"
"$LIBAVFILTER_VERSION" "$extralibs"
--pkgconfig_generate libpostproc "FFmpeg postprocessing library"
"$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
+-pkgconfig_generate libpostproc "FFmpeg post processing library"
"$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
-pkgconfig_generate libswscale "FFmpeg image rescaling library"
"$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
+pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"
"$LIBavutil_EXTRALIBS"
+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION"
"$LIBavcodec_EXTRALIBS" "libavutil"
Index: patches/patch-ffplay_c
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-ffplay_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-ffplay_c
--- patches/patch-ffplay_c 30 Dec 2011 17:34:39 -0000 1.5
+++ patches/patch-ffplay_c 22 Apr 2012 04:50:54 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-ffplay_c,v 1.5 2011/12/30 17:34:39 edd Exp $
---- ffplay.c.orig Tue Aug 30 19:59:43 2011
-+++ ffplay.c Tue Aug 30 20:25:16 2011
-@@ -2110,7 +2110,7 @@ static int stream_component_open(VideoState *is, int s
+--- ffplay.c.orig Sat Apr 21 23:53:38 2012
++++ ffplay.c Sun Apr 22 00:45:39 2012
+@@ -2114,7 +2114,7 @@ static int stream_component_open(VideoState *is, int s
AVFormatContext *ic = is->ic;
AVCodecContext *avctx;
AVCodec *codec;
- SDL_AudioSpec wanted_spec, spec;
+ SDL_AudioSpec wanted_spec;
- AVDictionary *opts;
- AVDictionaryEntry *t = NULL;
-@@ -2169,11 +2169,11 @@ static int stream_component_open(VideoState *is, int s
+ if (stream_index < 0 || stream_index >= ic->nb_streams)
+ return -1;
+@@ -2171,11 +2171,11 @@ static int stream_component_open(VideoState *is, int s
wanted_spec.samples = SDL_AUDIO_BUFFER_SIZE;
wanted_spec.callback = sdl_audio_callback;
wanted_spec.userdata = is;
Index: patches/patch-subdir_mak
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-subdir_mak,v
retrieving revision 1.4
diff -u -p -r1.4 patch-subdir_mak
--- patches/patch-subdir_mak 30 Dec 2011 17:34:39 -0000 1.4
+++ patches/patch-subdir_mak 22 Apr 2012 04:50:54 -0000
@@ -1,20 +1,24 @@
$OpenBSD: patch-subdir_mak,v 1.4 2011/12/30 17:34:39 edd Exp $
---- subdir.mak.orig Tue Aug 30 19:57:43 2011
-+++ subdir.mak Tue Aug 30 20:51:57 2011
-@@ -42,7 +42,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
+--- subdir.mak.orig Sat Apr 21 23:53:40 2012
++++ subdir.mak Sun Apr 22 00:47:52 2012
+@@ -41,7 +41,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
$(SLIB_CREATE_DEF_CMD)
-- $$(LD) $(SHFLAGS) $(LDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS)
$(EXTRAOBJS)
-+ $$(LD) $(SHFLAGS) $(LDFLAGS) -o $$@ $$(filter %.o,$$^)
$(LIB$(NAME)_EXTRALIBS) $(EXTRAOBJS)
+- $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS)
$(EXTRAOBJS)
++ $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^)
$(LIB$(NAME)_EXTRALIBS) $(EXTRAOBJS)
$(SLIB_EXTRA_CMD)
ifdef SUBDIR
-@@ -61,7 +61,6 @@ distclean:: clean
+@@ -60,11 +60,6 @@ distclean:: clean
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
$(Q)mkdir -p "$(SHLIBDIR)"
- $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
-- $$(STRIP) "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
- $(Q)$(foreach F,$(SLIB_INSTALL_LINKS),cd "$(SHLIBDIR)" && $(LN_S)
$(SLIB_INSTALL_NAME) $(F);)
- $(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644
$(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)")
- $(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)")
+ $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+- $$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+- $(Q)cd "$(SHLIBDIR)" && \
+- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
+- $(Q)cd "$(SHLIBDIR)" && \
+- $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
+ $(SLIB_INSTALL_EXTRA_CMD)
+
+ install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -r1.21 PLIST
--- pkg/PLIST 30 Dec 2011 17:34:39 -0000 1.21
+++ pkg/PLIST 22 Apr 2012 05:22:19 -0000
@@ -104,6 +104,7 @@ share/ffmpeg/libvpx-1080p50_60.ffpreset
share/ffmpeg/libvpx-360p.ffpreset
share/ffmpeg/libvpx-720p.ffpreset
share/ffmpeg/libvpx-720p50_60.ffpreset
+share/ffmpeg/libx264-baseline.ffpreset
share/ffmpeg/libx264-ipod320.ffpreset
share/ffmpeg/libx264-ipod640.ffpreset
share/ffmpeg/libx264-lossless_fast.ffpreset
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.202
diff -u -p -r1.202 Makefile
--- Makefile 30 Mar 2012 13:23:03 -0000 1.202
+++ Makefile 22 Apr 2012 05:48:29 -0000
@@ -6,14 +6,14 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS}
COMMENT = movie player supporting many formats
V = 20110309
-FFMPEG_V = 20111126
+FFMPEG_V = 20120422
SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N = mplayer
DISTNAME = mplayer-${V}
-REVISION = 14
+REVISION = 15
CATEGORIES = x11 multimedia
@@ -31,7 +31,7 @@ WANTLIB = GL X11 Xext Xinerama Xss Xv Xx
m mng mp3lame ncurses ogg>=5 orc-0.4 png postproc \
pthread SDL schroedinger-1.0>=2.0 sndio speex stdc++ \
swscale theoradec theoraenc ungif util vpx x264>=5 \
- z
+ xvidcore z
# we use a snapshot
MASTER_SITES = http://theunixzoo.co.uk/distfiles/
@@ -43,7 +43,7 @@ MODULES += converters/libiconv
LIB_DEPENDS = graphics/png \
graphics/jpeg \
graphics/libungif \
- graphics/ffmpeg>=20111126 \
+ graphics/ffmpeg>=20120422 \
audio/cdparanoia>=3.a9.8 \
audio/speex \
audio/libogg \
@@ -139,8 +139,6 @@ CONFIGURE_ARGS += --disable-smb \
--disable-faac-lavc \
--disable-faad \
--disable-theora \
- --disable-xvid \
- --disable-xvid-lavc \
--disable-pulse
# internal tremor, external tremor, external libvorbis all conflict
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
