On Fri, Mar 01, 2013 at 07:27:05PM -0500, Brad Smith wrote: > Here is an update to an FFmpeg 1.1 snapshot and the latest > MPlayer. A proper diff for MPlayer. --disable-mp3lib wasn't supposed to be in the Makefile and mp3lib has been removed.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/x11/mplayer/Makefile,v retrieving revision 1.214 diff -u -p -r1.214 Makefile --- Makefile 9 Feb 2013 14:49:54 -0000 1.214 +++ Makefile 2 Mar 2013 02:39:34 -0000 @@ -7,8 +7,8 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS} COMMENT = movie player supporting many formats -V = 20120725 -FFMPEG_V = 20121026 +V = 20130214 +FFMPEG_V = 20130214 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: /home/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 14 Feb 2013 23:40:15 -0000 @@ -1,2 +1,2 @@ -SHA256 (mplayer-20120725.tar.xz) = /BN/k8AOJDq33ZugwGcMz8Iz+G3FJUG1FUAdbEpHEOw= -SIZE (mplayer-20120725.tar.xz) = 5368616 +SHA256 (mplayer-20130214.tar.xz) = 1qcsmDzu9waXkTYh4KnvelDrsxQwbst99xUoZvXZz14= +SIZE (mplayer-20130214.tar.xz) = 5262364 Index: patches/patch-DOCS_man_en_mplayer_1 =================================================================== RCS file: /home/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 14 Feb 2013 20:11:53 -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: /home/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 14 Feb 2013 20:11:53 -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: /home/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 14 Feb 2013 20:11:53 -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 Thu Feb 14 14:46:19 2013 ++++ configure Thu Feb 14 14:52:41 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 +@@ -2611,7 +2618,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 +@@ -2659,7 +2666,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" +@@ -2962,8 +2969,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" +@@ -3590,7 +3600,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 +@@ -3617,7 +3626,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 +@@ -4838,6 +4848,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) { +@@ -5017,13 +5029,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 +@@ -5767,6 +5779,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 +@@ -5883,7 +5915,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" +@@ -6033,7 +6073,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" +@@ -7978,6 +8018,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 +@@ -8005,6 +8046,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 +@@ -8030,6 +8072,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 +@@ -8083,6 +8126,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 +@@ -8354,6 +8398,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 +@@ -8687,6 +8732,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 +@@ -8773,6 +8819,7 @@ $def_ossaudio_devmixer $def_pulse $def_sgiaudio $def_sunaudio Index: patches/patch-fmt-conversion_c =================================================================== RCS file: /home/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 14 Feb 2013 20:11:53 -0000 @@ -1,37 +1,36 @@ $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 { - {IMGFMT_RGB8, PIX_FMT_BGR8}, - {IMGFMT_RGB4, PIX_FMT_BGR4}, - {IMGFMT_BGR8, PIX_FMT_PAL8}, --// NB: This works only because PIX_FMT_0RGB32 is a CPP Macro. --// note that most other PIX_FMT values are enums --#ifdef PIX_FMT_0RGB32 - {IMGFMT_BGR32, PIX_FMT_0RGB32}, +--- fmt-conversion.c.orig Thu Feb 14 14:46:09 2013 ++++ fmt-conversion.c Thu Feb 14 14:57:48 2013 +@@ -57,17 +57,17 @@ static const struct { + { IMGFMT_RGB8, AV_PIX_FMT_BGR8 }, + { IMGFMT_RGB4, AV_PIX_FMT_BGR4 }, + { IMGFMT_BGR8, AV_PIX_FMT_PAL8 }, +-#if LIBAVUTIL_VERSION_MICRO >= 100 + { IMGFMT_BGR32, AV_PIX_FMT_0RGB32 }, +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 14, 100) - {IMGFMT_BGRA, PIX_FMT_BGR0}, - {IMGFMT_RGBA, PIX_FMT_RGB0}, - {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 --#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1) + { IMGFMT_BGRA, AV_PIX_FMT_BGR0 }, + { IMGFMT_RGBA, AV_PIX_FMT_RGB0 }, + { IMGFMT_RGB64LE, AV_PIX_FMT_RGBA64LE }, + { IMGFMT_RGB64BE, AV_PIX_FMT_RGBA64BE }, +-#endif /* LIBAVUTIL_VERSION_MICRO >= 100 */ ++#endif /* LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 14, 100) */ + { IMGFMT_422A, AV_PIX_FMT_YUVA422P }, + { IMGFMT_444A, AV_PIX_FMT_YUVA444P }, +#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 { - {IMGFMT_444P14_BE, PIX_FMT_YUV444P14BE}, - {IMGFMT_444P12_LE, PIX_FMT_YUV444P12LE}, - {IMGFMT_444P12_BE, PIX_FMT_YUV444P12BE}, -+#endif + { IMGFMT_GBR24P, AV_PIX_FMT_GBRP }, +-#if LIBAVUTIL_VERSION_MICRO >= 100 + { IMGFMT_GBR12PLE, AV_PIX_FMT_GBRP12LE }, + { IMGFMT_GBR12PBE, AV_PIX_FMT_GBRP12BE }, + { IMGFMT_GBR14PLE, AV_PIX_FMT_GBRP14LE }, +@@ -84,8 +84,10 @@ static const struct { + { IMGFMT_444P14_BE, AV_PIX_FMT_YUV444P14BE }, + { IMGFMT_444P12_LE, AV_PIX_FMT_YUV444P12LE }, + { IMGFMT_444P12_BE, AV_PIX_FMT_YUV444P12BE }, ++#endif /* LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 14, 100) */ +#if 0 - {IMGFMT_Y8A, PIX_FMT_GRAY8A}, - #endif - {IMGFMT_Y16_LE, PIX_FMT_GRAY16LE}, + { IMGFMT_Y8A, AV_PIX_FMT_GRAY8A }, +-#endif /* LIBAVUTIL_VERSION_MICRO >= 100 */ ++#endif + { IMGFMT_Y16_LE, AV_PIX_FMT_GRAY16LE }, + { IMGFMT_Y16_BE, AV_PIX_FMT_GRAY16BE }, + { IMGFMT_YUY2, AV_PIX_FMT_YUYV422 }, Index: patches/patch-libmpdemux_mp_taglists_c =================================================================== RCS file: /home/cvs/ports/x11/mplayer/patches/patch-libmpdemux_mp_taglists_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-libmpdemux_mp_taglists_c --- patches/patch-libmpdemux_mp_taglists_c 21 Jan 2013 16:23:05 -0000 1.2 +++ patches/patch-libmpdemux_mp_taglists_c 14 Feb 2013 23:45:34 -0000 @@ -1,50 +1,16 @@ $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')}, +--- libmpdemux/mp_taglists.c.orig Thu Feb 14 14:46:38 2013 ++++ libmpdemux/mp_taglists.c Thu Feb 14 18:45:13 2013 +@@ -51,10 +51,10 @@ static const struct AVCodecTag mp_wav_tags[] = { + { AV_CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k') }, + { AV_CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A') }, + { AV_CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3') }, -#if LIBAVUTIL_VERSION_MICRO >= 100 -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 100) - { CODEC_ID_VIMA, MKTAG('V', 'I', 'M', 'A')}, ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 90, 100) + { AV_CODEC_ID_EVRC, MKTAG('s', 'e', 'v', 'c') }, +- { AV_CODEC_ID_FFWAVESYNTH, MKTAG('F', 'F', 'W', 'S') }, #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')}, ++ { AV_CODEC_ID_FFWAVESYNTH, MKTAG('F', 'F', 'W', 'S') }, + { AV_CODEC_ID_G723_1, MKTAG('7', '2', '3', '1') }, + { AV_CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A') }, + { AV_CODEC_ID_ILBC, MKTAG('i', 'l', 'b', 'c') }, Index: patches/patch-libvo_x11_common_c =================================================================== RCS file: /home/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 14 Feb 2013 20:11:53 -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: /home/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 14 Feb 2013 20:11:53 -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; -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.