Attached are updates of FFmpeg to a 1.1 snapshot and
up to date MPlayer.
Tested with all the FFmpeg using ports in the tree
on amd64.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile
--- Makefile 25 Jan 2013 09:46:22 -0000 1.95
+++ Makefile 25 Jan 2013 09:49:45 -0000
@@ -2,21 +2,20 @@
COMMENT= audio/video converter and streamer
-V= 20121026
+V= 20130115
DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
-REVISION= 2
CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS= avcodec 18.0 \
- avdevice 6.0 \
- avfilter 4.0 \
- avformat 16.0 \
- avutil 10.0 \
- postproc 15.0 \
- swresample 0.0 \
+SHARED_LIBS= avcodec 19.0 \
+ avdevice 7.0 \
+ avfilter 5.0 \
+ avformat 17.0 \
+ avutil 11.0 \
+ postproc 15.1 \
+ swresample 0.1 \
swscale 5.0
HOMEPAGE= http://ffmpeg.org/
@@ -29,9 +28,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= SDL X11 Xext Xfixes bz2 c crypto gsm m mp3lame pthread \
- schroedinger-1.0>=2 sndio speex ssl theoradec theoraenc \
- vorbis vorbisenc vpx x264>=8 xvidcore z
+WANTLIB= SDL X11 Xext Xfixes bz2 c crypto gsm m mp3lame opus \
+ pthread schroedinger-1.0>=2 sndio speex ssl theoradec \
+ theoraenc vorbis vorbisenc vpx x264>=8 xvidcore z
BUILD_DEPENDS= textproc/texi2html
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
@@ -40,6 +39,7 @@ BUILD_DEPENDS+= devel/yasm
LIB_DEPENDS= archivers/bzip2 \
audio/lame \
audio/libvorbis \
+ audio/opus \
audio/speex \
audio/gsm \
devel/sdl \
@@ -50,7 +50,7 @@ LIB_DEPENDS= archivers/bzip2 \
multimedia/xvidcore
# inter-library dependencies for the current configuration
-LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -lschroedinger-1.0
-lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx -lx264 -lxvidcore
-lz -pthread
+LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -lopus
-lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx
-lx264 -lxvidcore -lz -pthread
LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lsndio
LIBavfilter_EXTRALIBS=
LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lssl -lcrypto -pthread
@@ -83,17 +83,20 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-armv5te \
--disable-armv6 \
--disable-armv6t2 \
- --disable-armvfp \
--disable-debug \
--disable-indev=jack \
--disable-indev=oss \
- --disable-iwmmxt \
+ --disable-mips32r2 \
+ --disable-mipsdspr1 \
+ --disable-mipsdspr2 \
--disable-neon \
--disable-outdev=oss \
--disable-outdev=sdl \
+ --disable-vfp \
--enable-gpl \
--enable-libgsm \
--enable-libmp3lame \
+ --enable-libopus \
--enable-libschroedinger \
--enable-libspeex \
--enable-libtheora \
@@ -103,7 +106,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-libxvid \
--enable-nonfree \
--enable-openssl \
- --enable-runtime-cpudetect \
--enable-x11grab \
--extra-cflags="-I${LOCALBASE}/include -I${X11BASE}/include" \
--extra-libs="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
@@ -126,9 +128,9 @@ CONFIGURE_ENV+= LIBavcodec_EXTRALIBS="${
LIBpostproc_LINKFLAGS="" \
LIBswresample_LINKFLAGS="" \
LIBswscale_LINKFLAGS="" \
- LIBavcodec_REQUIRES="libavutil schroedinger-1.0 speex theoraenc
vpx x264" \
- LIBavdevice_REQUIRES="libavformat libavcodec libavfilter
libavutil" \
- LIBavfilter_REQUIRES="libavformat libavcodec libavutil
libswresample libswscale" \
+ LIBavcodec_REQUIRES="libavutil opus schroedinger-1.0 speex
theoraenc vpx x264" \
+ LIBavdevice_REQUIRES="libavcodec libavfilter libavformat
libavutil" \
+ LIBavfilter_REQUIRES="libavcodec libavformat libavutil
libpostproc libswresample libswscale" \
LIBavformat_REQUIRES="libavcodec libavutil" \
LIBavutil_REQUIRES="" \
LIBpostproc_REQUIRES="libavutil" \
@@ -149,8 +151,8 @@ MAKE_ENV= V=1
MAKE_FLAGS= ${VERSION_FLAGS} \
LIBavcodec_EXTRALIBS="-lavutil ${LIBavcodec_EXTRALIBS}" \
- LIBavdevice_EXTRALIBS="-lavformat -lavcodec -lavfilter -lavutil
${LIBavdevice_EXTRALIBS}" \
- LIBavfilter_EXTRALIBS="-lavformat -lavcodec -lavutil
-lswresample -lswscale ${LIBavfilter_EXTRALIBS}" \
+ LIBavdevice_EXTRALIBS="-lavcodec -lavfilter -lavformat -lavutil
${LIBavdevice_EXTRALIBS}" \
+ LIBavfilter_EXTRALIBS="-lavcodec -lavformat -lavutil -lpostproc
-lswresample -lswscale ${LIBavfilter_EXTRALIBS}" \
LIBavformat_EXTRALIBS="-lavcodec -lavutil
${LIBavformat_EXTRALIBS}" \
LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \
LIBpostproc_EXTRALIBS="-lavutil ${LIBpostproc_EXTRALIBS}" \
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo 14 Jan 2013 02:14:41 -0000 1.25
+++ distinfo 25 Jan 2013 09:49:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-git-20121026.tar.xz) =
Zc9RhptNJ5f9p8Phj/H4arg9D3qeYiy64Ogg0HPNrFI=
-SIZE (ffmpeg-git-20121026.tar.xz) = 4726816
+SHA256 (ffmpeg-git-20130115.tar.xz) =
6lrHMrujWXER5vJ6e3zHJcNiB5sJuc17LFhUVw9VJ98=
+SIZE (ffmpeg-git-20130115.tar.xz) = 4804152
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-configure,v
retrieving revision 1.34
diff -u -p -r1.34 patch-configure
--- patches/patch-configure 25 Jan 2013 09:46:22 -0000 1.34
+++ patches/patch-configure 25 Jan 2013 09:49:45 -0000
@@ -1,15 +1,15 @@
-$OpenBSD: patch-configure,v 1.34 2013/01/25 09:46:22 brad Exp $
---- configure.orig Tue Sep 18 22:44:40 2012
-+++ configure Thu Jan 24 16:11:00 2013
-@@ -1185,6 +1185,7 @@ HAVE_LIST="
- GetProcessTimes
- getrusage
+$OpenBSD: patch-configure,v 1.33 2013/01/14 02:14:41 brad Exp $
+--- configure.orig Sun Jan 13 21:30:12 2013
++++ configure Fri Jan 25 04:49:12 2013
+@@ -1379,6 +1379,7 @@ HAVE_LIST="
+ gettimeofday
+ glob
gnu_as
+ gsm_h
ibm_asm
inet_aton
- inline_asm
-@@ -1205,7 +1206,6 @@ HAVE_LIST="
+ io_h
+@@ -1396,7 +1397,6 @@ HAVE_LIST="
machine_ioctl_bt848_h
machine_ioctl_meteor_h
makeinfo
@@ -17,15 +17,7 @@ $OpenBSD: patch-configure,v 1.34 2013/01
MapViewOfFile
memalign
mkstemp
-@@ -2618,6 +2618,7 @@ case $target_os in
- enable pic
- disable symver
- SHFLAGS='-shared'
-+ SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBVERSION)'
- oss_indev_extralibs="-lossaudio"
- oss_outdev_extralibs="-lossaudio"
- ;;
-@@ -2800,7 +2801,7 @@ die_license_disabled version3 libvo_amrwbenc
+@@ -3433,7 +3433,7 @@ die_license_disabled version3 libvo_amrwbenc
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
@@ -34,34 +26,34 @@ $OpenBSD: patch-configure,v 1.34 2013/01
enable_pic() {
enable pic
-@@ -3138,7 +3139,9 @@ enabled libdirac && require_pkg_config dirac
- "dirac_decoder_init dirac_encoder_init"
- enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion
-lfaac
+@@ -3827,7 +3827,9 @@ enabled libfdk_aac && require libfdk_aac fdk-aac/aace
+ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal
-lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish
-lflite_cmulex -lflite"
+ enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs
enabled libfreetype && require_pkg_config freetype2 "ft2build.h
freetype/freetype.h" FT_Init_FreeType
-enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
+enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+ check_lib "${gsm_hdr}" gsm_create -lgsm && break;
+ done || die "ERROR: libgsm not found"; }
+ enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load
-lmodplug
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
-@@ -3291,7 +3294,6 @@ enabled extra_warnings && check_cflags -Winline
+@@ -3997,7 +3999,6 @@ enabled extra_warnings && check_cflags -Winline
# add some linker flags
check_ldflags -Wl,--warn-common
- check_ldflags
-Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil
+ check_ldflags
-Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
-test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
- echo "X{};" > $TMPV
- if test_ldflags -Wl,--version-script,$TMPV; then
-@@ -3714,6 +3716,7 @@ comment=$2
- version=$3
- libs=$4
- requires=$5
-+linkflags=$6
- enabled ${name#lib} || return 0
- mkdir -p $name
- cat <<EOF > $name/$name.pc
-@@ -3728,7 +3731,7 @@ Version: $version
+ enabled xmm_clobber_test &&
+ check_ldflags -Wl,--wrap,avcodec_open2 \
+@@ -4503,6 +4504,7 @@ pkgconfig_generate(){
+ version=$3
+ libs=$4
+ requires=$5
++ linkflags=$6
+ enabled ${name#lib} || return 0
+ mkdir -p $name
+ cat <<EOF > $name/$name.pc
+@@ -4517,7 +4519,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts:
@@ -70,23 +62,27 @@ $OpenBSD: patch-configure,v 1.34 2013/01
Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir}
EOF
-@@ -3748,11 +3751,11 @@ Cflags: -I\${includedir}
- EOF
- }
+@@ -4553,15 +4555,15 @@ libavfilter_pc_deps=${libavfilter_pc_deps%, }
+ libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION"
+ enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter =
$LIBAVFILTER_VERSION,"
-pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"
"$LIBM"
-pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION"
"$extralibs" "libavutil = $LIBAVUTIL_VERSION"
-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 libavdevice "FFmpeg device handling library"
"$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps"
+-pkgconfig_generate libavfilter "FFmpeg video filtering library"
"$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps"
-pkgconfig_generate libpostproc "FFmpeg postprocessing library"
"$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
--pkgconfig_generate libswscale "FFmpeg image rescaling library"
"$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
--pkgconfig_generate libswresample "FFmpeg audio rescaling library"
"$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
+pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"
"$LIBavutil_EXTRALIBS" "$LIBavutil_REQUIRES" "$LIBavutil_LINKFLAGS"
+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION"
"$LIBavcodec_EXTRALIBS" "$LIBavcodec_REQUIRES" "$LIBavcodec_LINKFLAGS"
+pkgconfig_generate libavformat "FFmpeg container format library"
"$LIBAVFORMAT_VERSION" "$LIBavformat_EXTRALIBS" "$LIBavformat_REQUIRES"
"$LIBavformat_LINKFLAGS"
+pkgconfig_generate libavdevice "FFmpeg device handling library"
"$LIBAVDEVICE_VERSION" "$LIBavdevice_EXTRALIBS" "$LIBavdevice_REQUIRES"
"$LIBavdevice_LINKFLAGS"
+pkgconfig_generate libavfilter "FFmpeg video filtering library"
"$LIBAVFILTER_VERSION" "$LIBavfilter_EXTRALIBS" "$LIBavfilter_REQUIRES"
"$LIBavfilter_LINKFLAGS"
+pkgconfig_generate libpostproc "FFmpeg post processing library"
"$LIBPOSTPROC_VERSION" "$LIBpostproc_EXTRALIBS" "$LIBpostproc_REQUIRES"
"$LIBpostproc_LINKFLAGS"
+ pkgconfig_generate libavresample "Libav audio resampling library"
"$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
+-pkgconfig_generate libswscale "FFmpeg image rescaling library"
"$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
+-pkgconfig_generate libswresample "FFmpeg audio resampling library"
"$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
+pkgconfig_generate libswscale "FFmpeg image rescaling library"
"$LIBSWSCALE_VERSION" "$LIBswscale_EXTRALIBS" "$LIBswscale_REQUIRES"
"$LIBswscale_LINKFLAGS"
+pkgconfig_generate libswresample "FFmpeg audio rescaling library"
"$LIBSWRESAMPLE_VERSION" "$LIBswresample_EXTRALIBS" "$LIBswresample_REQUIRES"
"$LIBswresample_LINKFLAGS"
+
+ fix_ffmpeg_remote(){
+ git_remote_from=$1
Index: patches/patch-libavcodec_libgsm_c
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavcodec_libgsm_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-libavcodec_libgsm_c
--- patches/patch-libavcodec_libgsm_c 25 Jan 2013 09:46:22 -0000 1.3
+++ patches/patch-libavcodec_libgsm_c 25 Jan 2013 09:49:45 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-libavcodec_libgsm_c,v 1.3 2013/01/25 09:46:22 brad Exp $
---- libavcodec/libgsm.c.orig Tue Sep 18 22:44:41 2012
-+++ libavcodec/libgsm.c Thu Jan 24 16:11:40 2013
+--- libavcodec/libgsm.c.orig Sun Jan 13 21:30:13 2013
++++ libavcodec/libgsm.c Fri Jan 25 04:48:40 2013
@@ -27,7 +27,12 @@
// The idiosyncrasies of GSM-in-WAV are explained at
http://kbs.cs.tu-berlin.de/~jutta/toast.html
@@ -12,5 +12,5 @@ $OpenBSD: patch-libavcodec_libgsm_c,v 1.
#include <gsm/gsm.h>
+#endif
- #include "avcodec.h"
- #include "gsm.h"
+ #include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
Index: patches/patch-library_mak
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-library_mak,v
retrieving revision 1.1
diff -u -p -r1.1 patch-library_mak
--- patches/patch-library_mak 14 Jan 2013 02:14:41 -0000 1.1
+++ patches/patch-library_mak 25 Jan 2013 09:49:45 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-library_mak,v 1.1 2013/01/14 02:14:41 brad Exp $
---- library.mak.orig Thu Sep 13 23:19:10 2012
-+++ library.mak Thu Sep 13 23:23:29 2012
-@@ -42,7 +42,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
+--- library.mak.orig Sun Jan 13 21:30:15 2013
++++ library.mak Tue Jan 15 02:04:32 2013
+@@ -53,7 +53,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) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
++ $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^)
$(LIB$(NAME)_EXTRALIBS)
$(SLIB_EXTRA_CMD)
ifdef SUBDIR
-@@ -61,8 +61,6 @@ distclean:: clean
+@@ -70,8 +70,6 @@ distclean:: clean
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
$(Q)mkdir -p "$(SHLIBDIR)"
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/pkg/PLIST,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST
--- pkg/PLIST 14 Jan 2013 02:14:41 -0000 1.23
+++ pkg/PLIST 25 Jan 2013 09:49:45 -0000
@@ -9,7 +9,7 @@ include/libavcodec/
include/libavcodec/avcodec.h
include/libavcodec/avfft.h
include/libavcodec/dxva2.h
-include/libavcodec/opt.h
+include/libavcodec/old_codec_ids.h
include/libavcodec/vaapi.h
include/libavcodec/vda.h
include/libavcodec/vdpau.h
@@ -17,13 +17,15 @@ include/libavcodec/version.h
include/libavcodec/xvmc.h
include/libavdevice/
include/libavdevice/avdevice.h
+include/libavdevice/version.h
include/libavfilter/
+include/libavfilter/asrc_abuffer.h
include/libavfilter/avcodec.h
include/libavfilter/avfilter.h
include/libavfilter/avfiltergraph.h
include/libavfilter/buffersink.h
+include/libavfilter/buffersrc.h
include/libavfilter/version.h
-include/libavfilter/vsrc_buffer.h
include/libavformat/
include/libavformat/avformat.h
include/libavformat/avio.h
@@ -32,13 +34,17 @@ include/libavutil/
include/libavutil/adler32.h
include/libavutil/aes.h
include/libavutil/attributes.h
+include/libavutil/audio_fifo.h
include/libavutil/audioconvert.h
include/libavutil/avassert.h
include/libavutil/avconfig.h
include/libavutil/avstring.h
include/libavutil/avutil.h
include/libavutil/base64.h
+include/libavutil/blowfish.h
+include/libavutil/bprint.h
include/libavutil/bswap.h
+include/libavutil/channel_layout.h
include/libavutil/common.h
include/libavutil/cpu.h
include/libavutil/crc.h
@@ -57,6 +63,7 @@ include/libavutil/lzo.h
include/libavutil/mathematics.h
include/libavutil/md5.h
include/libavutil/mem.h
+include/libavutil/old_pix_fmts.h
include/libavutil/opt.h
include/libavutil/parseutils.h
include/libavutil/pixdesc.h
@@ -65,12 +72,20 @@ include/libavutil/random_seed.h
include/libavutil/rational.h
include/libavutil/samplefmt.h
include/libavutil/sha.h
+include/libavutil/time.h
+include/libavutil/timecode.h
+include/libavutil/timestamp.h
+include/libavutil/version.h
+include/libavutil/xtea.h
include/libpostproc/
include/libpostproc/postprocess.h
+include/libpostproc/version.h
include/libswresample/
include/libswresample/swresample.h
+include/libswresample/version.h
include/libswscale/
include/libswscale/swscale.h
+include/libswscale/version.h
lib/libavcodec.a
lib/libavdevice.a
lib/libavfilter.a
@@ -88,10 +103,26 @@ lib/pkgconfig/libavutil.pc
lib/pkgconfig/libpostproc.pc
lib/pkgconfig/libswresample.pc
lib/pkgconfig/libswscale.pc
+@man man/man1/ffmpeg-bitstream-filters.1
+@man man/man1/ffmpeg-codecs.1
+@man man/man1/ffmpeg-devices.1
+@man man/man1/ffmpeg-filters.1
+@man man/man1/ffmpeg-formats.1
+@man man/man1/ffmpeg-protocols.1
+@man man/man1/ffmpeg-resampler.1
+@man man/man1/ffmpeg-scaler.1
+@man man/man1/ffmpeg-utils.1
@man man/man1/ffmpeg.1
@man man/man1/ffplay.1
@man man/man1/ffprobe.1
@man man/man1/ffserver.1
+man/man1/libavcodec.3
+man/man1/libavdevice.3
+man/man1/libavfilter.3
+man/man1/libavformat.3
+man/man1/libavutil.3
+man/man1/libswresample.3
+man/man1/libswscale.3
share/doc/ffmpeg/
share/doc/ffmpeg/developer.html
share/doc/ffmpeg/faq.html
@@ -105,6 +136,17 @@ share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/ffmpeg/
share/examples/ffmpeg/ffserver.conf
share/ffmpeg/
+share/ffmpeg/examples/
+share/ffmpeg/examples/Makefile
+share/ffmpeg/examples/README
+share/ffmpeg/examples/decoding_encoding.c
+share/ffmpeg/examples/demuxing.c
+share/ffmpeg/examples/filtering_audio.c
+share/ffmpeg/examples/filtering_video.c
+share/ffmpeg/examples/metadata.c
+share/ffmpeg/examples/muxing.c
+share/ffmpeg/examples/resampling_audio.c
+share/ffmpeg/examples/scaling_video.c
share/ffmpeg/ffprobe.xsd
share/ffmpeg/libvpx-1080p.ffpreset
share/ffmpeg/libvpx-1080p50_60.ffpreset
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.213
diff -u -p -r1.213 Makefile
--- Makefile 21 Jan 2013 16:23:05 -0000 1.213
+++ Makefile 21 Jan 2013 18:21:59 -0000
@@ -7,8 +7,8 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V = 20120725
-FFMPEG_V = 20121026
+V = 20130113
+FFMPEG_V = 20130115
SUBST_VARS += PREFIX CONFDIR
@@ -119,6 +119,7 @@ CONFIGURE_ARGS += --disable-smb \
--disable-openal \
--disable-libdca \
--disable-liba52 \
+ --disable-libilbc \
--disable-libmpeg2 \
--disable-toolame \
--disable-twolame \
@@ -144,7 +145,6 @@ CONFIGURE_ARGS += --disable-libvorbis
.else
LIB_DEPENDS += audio/libvorbis
WANTLIB += vorbisenc vorbis
-CONFIGURE_ARGS += --disable-tremor-internal
.endif
CONFIGURE_ENV += LOCALBASE="${LOCALBASE}" TMPDIR="${WRKBUILD}"
@@ -153,6 +153,7 @@ CONFIGURE_ENV += LOCALBASE="${LOCALBASE}
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
CONFIGURE_ARGS += --enable-runtime-cpudetection
CONFIGURE_ARGS += --disable-ssse3
+CONFIGURE_ARGS += --disable-sse4
.endif
# again binutils 2.15 limits what we can do here too
@@ -163,8 +164,7 @@ CONFIGURE_ARGS += --enable-runtime-cpude
.if ${MACHINE_ARCH:Marm}
# disable common floating point decoders that have integer alternatives
-CONFIGURE_ARGS += --disable-mp3lib \
- --disable-decoder=mp3on4float \
+CONFIGURE_ARGS += --disable-decoder=mp3on4float \
--disable-decoder=mp3adufloat \
--disable-decoder=mp3float \
--disable-decoder=mp2float \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo 21 Jan 2013 16:23:05 -0000 1.36
+++ distinfo 21 Jan 2013 18:21:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20120725.tar.xz) = /BN/k8AOJDq33ZugwGcMz8Iz+G3FJUG1FUAdbEpHEOw=
-SIZE (mplayer-20120725.tar.xz) = 5368616
+SHA256 (mplayer-20130113.tar.xz) = ye8GF2PS9xyB9lLZLeeq21KHWrW6nS1Z7A1qtXcJLTs=
+SIZE (mplayer-20130113.tar.xz) = 5262768
Index: patches/patch-DOCS_man_en_mplayer_1
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.6
diff -u -p -r1.6 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 21 Jan 2013 16:23:05 -0000 1.6
+++ patches/patch-DOCS_man_en_mplayer_1 21 Jan 2013 18:21:59 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.6 2013/01/21 16:23:05 brad Exp $
---- DOCS/man/en/mplayer.1.orig Sat Jan 19 01:18:52 2013
-+++ DOCS/man/en/mplayer.1 Sat Jan 19 01:24:15 2013
+--- DOCS/man/en/mplayer.1.orig Sun Jan 13 23:54:05 2013
++++ DOCS/man/en/mplayer.1 Mon Jan 21 11:45:15 2013
@@ -1505,7 +1505,7 @@ May be negative.
.
.TP
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v
.
.TP
.B \-channels <number> (also see \-af channels)
-@@ -12224,11 +12224,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12240,11 +12240,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 patch-Makefile
--- patches/patch-Makefile 21 Jan 2013 16:23:05 -0000 1.24
+++ patches/patch-Makefile 21 Jan 2013 18:21:59 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.24 2013/01/21 16:23:05 brad Exp $
---- Makefile.orig Sat Jan 19 01:18:43 2013
-+++ Makefile Sat Jan 19 01:24:15 2013
+--- Makefile.orig Sun Jan 13 23:53:54 2013
++++ Makefile Mon Jan 21 11:45:15 2013
@@ -35,6 +35,7 @@ OS_FEATURE-$(VSSCANF) += osdep/vsscanf.
# conditional source declarations
SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa.c
@@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.24 2013/01/
SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c
SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \
-@@ -593,6 +594,7 @@ SRCS_MPLAYER-$(S3FB) += libvo/vo_s3fb.c
+@@ -565,6 +566,7 @@ SRCS_MPLAYER-$(S3FB) += libvo/vo_s3fb.c
SRCS_MPLAYER-$(SDL) += libao2/ao_sdl.c libvo/vo_sdl.c
libvo/sdl_common.c
SRCS_MPLAYER-$(SGIAUDIO) += libao2/ao_sgi.c
SRCS_MPLAYER-$(SUNAUDIO) += libao2/ao_sun.c
@@ -17,7 +17,7 @@ $OpenBSD: patch-Makefile,v 1.24 2013/01/
SRCS_MPLAYER-$(SVGA) += libvo/vo_svga.c
SRCS_MPLAYER-$(TDFXFB) += libvo/vo_tdfxfb.c
SRCS_MPLAYER-$(TDFXVID) += libvo/vo_tdfx_vid.c
-@@ -656,7 +658,8 @@ SRCS_MPLAYER = command.c \
+@@ -628,7 +630,8 @@ SRCS_MPLAYER = command.c \
libvo/vo_mpegpes.c \
libvo/vo_null.c \
sub/spuenc.c \
@@ -27,7 +27,7 @@ $OpenBSD: patch-Makefile,v 1.24 2013/01/
SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c
-@@ -794,7 +797,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+@@ -767,7 +770,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
@@ -36,7 +36,7 @@ $OpenBSD: patch-Makefile,v 1.24 2013/01/
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./$^ > $@
-@@ -882,7 +885,16 @@ loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_N
+@@ -855,7 +858,16 @@ loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_N
#loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN)
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.66
diff -u -p -r1.66 patch-configure
--- patches/patch-configure 21 Jan 2013 16:23:05 -0000 1.66
+++ patches/patch-configure 21 Jan 2013 18:21:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.66 2013/01/21 16:23:05 brad Exp $
---- configure.orig Sat Jan 19 01:18:49 2013
-+++ configure Sat Jan 19 23:35:10 2013
-@@ -35,29 +35,32 @@
+--- configure.orig Sun Jan 13 23:53:59 2013
++++ configure Mon Jan 21 11:47:38 2013
+@@ -35,34 +35,37 @@
#
#############################################################################
@@ -18,6 +18,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
+#fi
+#
+#if test -e ffmpeg/mp_auto_pull ; then
++# (cd ffmpeg && git checkout master)
+# if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
+# echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable
pulling"
+# exit 1
@@ -27,15 +28,20 @@ $OpenBSD: patch-configure,v 1.66 2013/01
+#if ! test -e ffmpeg ; then
+# echo "No FFmpeg checkout, press enter to download one with git or CTRL+C
to abort"
+# read tmp
-+# if ! git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg ; then
++# if ! git clone --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
+# rm -rf ffmpeg
+# echo "Failed to get a FFmpeg checkout"
++# echo "Please try again or put FFmpeg source code copy into ffmpeg/
manually."
++# echo "Nightly snapshot:
http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2";
++# echo "To use a github mirror via http (e.g. because a firewall
blocks git):"
++# echo "git clone --depth 1 https://github.com/FFmpeg/FFmpeg ffmpeg;
touch ffmpeg/mp_auto_pull"
+# exit 1
+# fi
+# touch ffmpeg/mp_auto_pull
+#fi
-if test -e ffmpeg/mp_auto_pull ; then
+- (cd ffmpeg && git checkout master)
- if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
- echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable
pulling"
- exit 1
@@ -45,9 +51,13 @@ $OpenBSD: patch-configure,v 1.66 2013/01
-if ! test -e ffmpeg ; then
- echo "No FFmpeg checkout, press enter to download one with git or CTRL+C
to abort"
- read tmp
-- if ! git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg ; then
+- if ! git clone --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
- rm -rf ffmpeg
- echo "Failed to get a FFmpeg checkout"
+- echo "Please try again or put FFmpeg source code copy into ffmpeg/
manually."
+- echo "Nightly snapshot:
http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2";
+- echo "To use a github mirror via http (e.g. because a firewall blocks
git):"
+- echo "git clone --depth 1 https://github.com/FFmpeg/FFmpeg ffmpeg;
touch ffmpeg/mp_auto_pull"
- exit 1
- fi
- touch ffmpeg/mp_auto_pull
@@ -56,7 +66,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
# Prevent locale nonsense from breaking basic text processing utilities
export LC_ALL=C
-@@ -538,6 +541,7 @@ Audio output:
+@@ -542,6 +545,7 @@ Audio output:
--disable-nas disable NAS audio output [autodetect]
--disable-sgiaudio disable SGI audio output [autodetect]
--disable-sunaudio disable Sun audio output [autodetect]
@@ -64,7 +74,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
--disable-kai disable KAI audio output [autodetect]
--disable-dart disable DART audio output [autodetect]
--disable-win32waveout disable Windows waveout audio output [autodetect]
-@@ -783,6 +787,7 @@ _xf86keysym=auto
+@@ -795,6 +799,7 @@ _xf86keysym=auto
_mlib=no #broken, thus disabled
_sgiaudio=auto
_sunaudio=auto
@@ -72,7 +82,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
_alsa=auto
_fastmemcpy=yes
hardcoded_tables=no
-@@ -1211,6 +1216,8 @@ for ac_option do
+@@ -1222,6 +1227,8 @@ for ac_option do
--disable-mlib) _mlib=no ;;
--enable-sunaudio) _sunaudio=yes ;;
--disable-sunaudio) _sunaudio=no ;;
@@ -81,7 +91,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
--enable-sgiaudio) _sgiaudio=yes ;;
--disable-sgiaudio) _sgiaudio=no ;;
--enable-alsa) _alsa=yes ;;
-@@ -1527,7 +1534,7 @@ if test -z "$_target" ; then
+@@ -1635,7 +1642,7 @@ if test -z "$_target" ; then
sh3|sh4|sh4a) host_arch=sh ;;
s390) host_arch=s390 ;;
s390x) host_arch=s390x ;;
@@ -90,7 +100,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
vax) host_arch=vax ;;
xtensa*) host_arch=xtensa ;;
*) host_arch=UNKNOWN ;;
-@@ -2242,7 +2249,7 @@ case "$host_arch" in
+@@ -2288,7 +2295,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@@ -99,7 +109,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2561,7 +2568,7 @@ cat > $TMPC << EOF
+@@ -2613,7 +2620,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@@ -108,7 +118,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2609,7 +2616,7 @@ elif test -z "$CFLAGS" ; then
+@@ -2661,7 +2668,7 @@ elif test -z "$CFLAGS" ; then
elif test "$cc_vendor" != "gnu" ; then
CFLAGS="-O2 $_march $_mcpu $_pipe"
else
@@ -117,7 +127,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith
-Wredundant-decls"
WARN_CFLAGS="-Werror-implicit-function-declaration"
extra_ldflags="$extra_ldflags -ffast-math"
-@@ -2879,8 +2886,11 @@ echores "$ibm_asm"
+@@ -2964,8 +2971,11 @@ echores "$ibm_asm"
def_gnu_as='#define HAVE_GNU_AS 0'
gnu_as=no
echocheck "GNU assembler"
@@ -131,7 +141,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
echores "$gnu_as"
fi
-@@ -3488,7 +3498,6 @@ echores "$_fast_inttypes"
+@@ -3592,7 +3602,6 @@ echores "$_fast_inttypes"
echocheck "malloc.h"
_malloc=no
@@ -139,7 +149,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
if test "$_malloc" = yes ; then
def_malloc_h='#define HAVE_MALLOC_H 1'
else
-@@ -3507,7 +3516,8 @@ if test "$_memalign" = yes ; then
+@@ -3611,7 +3620,8 @@ if test "$_memalign" = yes ; then
else
def_memalign='#define HAVE_MEMALIGN 0'
def_map_memalign='#define memalign(a, b) malloc(b)'
@@ -149,7 +159,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
fi
echores "$_memalign"
-@@ -4673,6 +4683,8 @@ if test "$_aa" = yes ; then
+@@ -4811,6 +4821,8 @@ if test "$_aa" = yes ; then
def_aa='#define CONFIG_AA 1'
if cygwin ; then
libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
@@ -158,7 +168,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
fi
vomodules="aa $vomodules"
else
-@@ -4852,13 +4864,13 @@ int main(void) {
+@@ -4990,13 +5002,13 @@ int main(void) {
return strcmp(PNG_LIBPNG_VER_STRING, png_libpng_ver);
}
EOF
@@ -174,7 +184,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
else
def_png='#undef CONFIG_PNG'
fi
-@@ -5602,6 +5614,26 @@ fi
+@@ -5751,6 +5763,26 @@ fi
echores "$_sunaudio"
@@ -201,7 +211,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
def_mlib='#define CONFIG_MLIB 0'
if sunos; then
echocheck "Sun mediaLib"
-@@ -5718,7 +5750,15 @@ else
+@@ -5867,7 +5899,15 @@ else
default_dvd_device="/dev/dvd"
fi
@@ -217,7 +227,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
echocheck "VCD support"
if test "$_vcd" = auto; then
_vcd=no
-@@ -5868,7 +5908,7 @@ echocheck "cdparanoia"
+@@ -6017,7 +6057,7 @@ echocheck "cdparanoia"
if test "$_cdparanoia" = auto ; then
_cdparanoia=no
for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
@@ -226,7 +236,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
-@@ -7806,6 +7846,7 @@ echores "$_dvdnav"
+@@ -7966,6 +8006,7 @@ extra_ldflags="$extra_ldflags -lm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@@ -234,7 +244,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -7833,6 +7874,7 @@ fi
+@@ -7993,6 +8034,7 @@ fi
echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@@ -242,7 +252,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
/usr/share/xml/docbook/*/html/chunk.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
-@@ -7858,6 +7900,7 @@ fi
+@@ -8018,6 +8060,7 @@ fi
echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \
@@ -250,7 +260,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
/usr/share/xml/docbook/*/html/docbook.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
-@@ -7911,6 +7954,7 @@ EOF
+@@ -8071,6 +8114,7 @@ EOF
echocheck "XML DTD"
#FIXME: This should prefer higher version numbers, not the other way around ..
for try_dtd in \
@@ -258,7 +268,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
/usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
/usr/share/xml/docbook/*/docbookx.dtd \
/usr/share/sgml/docbook/*/docbookx.dtd \
-@@ -8179,6 +8223,7 @@ SPEEX = $_speex
+@@ -8342,6 +8386,7 @@ SPEEX = $_speex
STREAM_CACHE = $_stream_cache
SGIAUDIO = $_sgiaudio
SUNAUDIO = $_sunaudio
@@ -266,7 +276,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
SVGA = $_svga
TDFXFB = $_tdfxfb
TDFXVID = $_tdfxvid
-@@ -8489,6 +8534,7 @@ $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE
+@@ -8676,6 +8721,7 @@ $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE
/* Blu-ray/DVD/VCD/CD */
#define DEFAULT_CDROM_DEVICE "$default_cdrom_device"
#define DEFAULT_DVD_DEVICE "$default_dvd_device"
@@ -274,7 +284,7 @@ $OpenBSD: patch-configure,v 1.66 2013/01
$def_bluray
$def_bsdi_dvd
$def_cddb
-@@ -8575,6 +8621,7 @@ $def_ossaudio_devmixer
+@@ -8762,6 +8808,7 @@ $def_ossaudio_devmixer
$def_pulse
$def_sgiaudio
$def_sunaudio
Index: patches/patch-fmt-conversion_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-fmt-conversion_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-fmt-conversion_c
--- patches/patch-fmt-conversion_c 21 Jan 2013 16:23:05 -0000 1.1
+++ patches/patch-fmt-conversion_c 21 Jan 2013 18:21:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-fmt-conversion_c,v 1.1 2013/01/21 16:23:05 brad Exp $
---- fmt-conversion.c.orig Sat Jan 19 01:18:41 2013
-+++ fmt-conversion.c Sat Jan 19 03:48:23 2013
-@@ -57,18 +57,20 @@ static const struct {
+--- fmt-conversion.c.orig Sun Jan 13 23:53:53 2013
++++ fmt-conversion.c Mon Jan 21 13:06:53 2013
+@@ -57,18 +57,16 @@ static const struct {
{IMGFMT_RGB8, PIX_FMT_BGR8},
{IMGFMT_RGB4, PIX_FMT_BGR4},
{IMGFMT_BGR8, PIX_FMT_PAL8},
@@ -15,18 +15,15 @@ $OpenBSD: patch-fmt-conversion_c,v 1.1 2
{IMGFMT_RGB64LE, PIX_FMT_RGBA64LE},
{IMGFMT_RGB64BE, PIX_FMT_RGBA64BE},
+#endif
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 50, 100)
{IMGFMT_422A, PIX_FMT_YUVA422P},
-+#endif
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 35, 101)
{IMGFMT_444A, PIX_FMT_YUVA444P},
- #endif
+-#endif
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 14, 100)
{IMGFMT_GBR24P, PIX_FMT_GBRP},
{IMGFMT_GBR12PLE, PIX_FMT_GBRP12LE},
{IMGFMT_GBR12PBE, PIX_FMT_GBRP12BE},
-@@ -86,6 +88,8 @@ static const struct {
+@@ -86,6 +84,8 @@ static const struct {
{IMGFMT_444P14_BE, PIX_FMT_YUV444P14BE},
{IMGFMT_444P12_LE, PIX_FMT_YUV444P12LE},
{IMGFMT_444P12_BE, PIX_FMT_YUV444P12BE},
Index: patches/patch-libmpdemux_mp_taglists_c
===================================================================
RCS file: patches/patch-libmpdemux_mp_taglists_c
diff -N patches/patch-libmpdemux_mp_taglists_c
--- patches/patch-libmpdemux_mp_taglists_c 21 Jan 2013 16:23:05 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-$OpenBSD: patch-libmpdemux_mp_taglists_c,v 1.2 2013/01/21 16:23:05 brad Exp $
---- libmpdemux/mp_taglists.c.orig Sat Jan 19 01:19:06 2013
-+++ libmpdemux/mp_taglists.c Sat Jan 19 04:04:54 2013
-@@ -59,7 +59,9 @@ static const struct AVCodecTag mp_wav_tags[] = {
- { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')},
- { CODEC_ID_MUSEPACK8, MKTAG('M', 'P', 'C', '8')},
- { CODEC_ID_NELLYMOSER, MKTAG('n', 'm', 'o', 's')},
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 29, 0)
- { CODEC_ID_OPUS, MKTAG('o', 'p', 'u', 's')},
-+#endif
- { CODEC_ID_PCM_LXF, MKTAG('P', 'L', 'X', 'F')},
- { CODEC_ID_PCM_S16LE_PLANAR, MKTAG('1', '6', 'P', 'L')},
- { CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'p')},
-@@ -71,7 +73,7 @@ static const struct AVCodecTag mp_wav_tags[] = {
- { CODEC_ID_SPEEX, MKTAG('s', 'p', 'x', ' ')},
- { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')},
- { CODEC_ID_TWINVQ, MKTAG('T', 'W', 'I', '2')},
--#if LIBAVUTIL_VERSION_MICRO >= 100
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 100)
- { CODEC_ID_VIMA, MKTAG('V', 'I', 'M', 'A')},
- #endif
- { CODEC_ID_VMDAUDIO, MKTAG('V', 'M', 'D', 'A')},
-@@ -102,7 +104,7 @@ static const struct AVCodecTag mp_codecid_override_tag
- { CODEC_ID_H264, MKTAG('H', '2', '6', '4')},
- { CODEC_ID_MP3, 0x55},
- { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'V')},
--#if LIBAVUTIL_VERSION_MICRO >= 100
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 33, 0)
- { CODEC_ID_PAF_AUDIO, MKTAG('P', 'A', 'F', 'A')},
- { CODEC_ID_PAF_VIDEO, MKTAG('P', 'A', 'F', 'V')},
- #endif
-@@ -134,7 +136,9 @@ static const struct AVCodecTag mp_bmp_tags[] = {
- { CODEC_ID_BMV_VIDEO, MKTAG('B', 'M', 'V', 'V')},
- { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')},
- { CODEC_ID_CDGRAPHICS, MKTAG('C', 'D', 'G', 'R')},
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 1, 0)
- { CODEC_ID_CDXL, MKTAG('C', 'D', 'X', 'L')},
-+#endif
- { CODEC_ID_CMV, MKTAG('M', 'V', 'I', 'f')},
- { CODEC_ID_DFA, MKTAG('C', 'D', 'F', 'A')},
- { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n')},
-@@ -156,7 +160,7 @@ static const struct AVCodecTag mp_bmp_tags[] = {
- { CODEC_ID_RV20, MKTAG('R', 'V', '2', '0')},
- { CODEC_ID_RV30, MKTAG('R', 'V', '3', '0')},
- { CODEC_ID_RV40, MKTAG('R', 'V', '4', '0')},
--#if LIBAVUTIL_VERSION_MICRO >= 100
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 35, 100)
- { CODEC_ID_SANM, MKTAG('S', 'A', 'N', 'M')},
- #endif
- { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3')},
Index: patches/patch-libvo_x11_common_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libvo_x11_common_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-libvo_x11_common_c
--- patches/patch-libvo_x11_common_c 21 Jan 2013 16:23:05 -0000 1.5
+++ patches/patch-libvo_x11_common_c 21 Jan 2013 18:21:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libvo_x11_common_c,v 1.5 2013/01/21 16:23:05 brad Exp $
---- libvo/x11_common.c.orig Sat May 5 01:10:01 2012
-+++ libvo/x11_common.c Sat May 5 01:30:37 2012
-@@ -732,7 +732,7 @@ void vo_x11_decoration(Display * vo_Display, Window w,
+--- libvo/x11_common.c.orig Sun Jan 13 23:53:59 2013
++++ libvo/x11_common.c Mon Jan 21 11:45:15 2013
+@@ -733,7 +733,7 @@ void vo_x11_decoration(Display * vo_Display, Window w,
void vo_x11_classhint(Display * display, Window window, const char *name)
{
XClassHint wmClass;
Index: patches/patch-stream_stream_bluray_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-stream_stream_bluray_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-stream_stream_bluray_c
--- patches/patch-stream_stream_bluray_c 21 Jan 2013 16:23:05 -0000
1.2
+++ patches/patch-stream_stream_bluray_c 21 Jan 2013 18:21:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-stream_stream_bluray_c,v 1.2 2013/01/21 16:23:05 brad Exp $
---- stream/stream_bluray.c.orig Sat May 5 01:09:57 2012
-+++ stream/stream_bluray.c Sat May 5 01:30:00 2012
-@@ -252,6 +252,8 @@ static int bluray_stream_open(stream_t *s, int mode,
+--- stream/stream_bluray.c.orig Sun Jan 13 23:53:53 2013
++++ stream/stream_bluray.c Mon Jan 21 11:45:15 2013
+@@ -257,6 +257,8 @@ static int bluray_stream_open(stream_t *s, int mode,
device = p->device;
else if (bluray_device)
device = bluray_device;
