UPDATE: MPlayer

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: MPlayer

Brad Smith-14
Here is an update to a newer MPlayer snapshot.

Lightly tested on amd64.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.211
diff -u -p -r1.211 Makefile
--- Makefile 14 Jan 2013 02:17:15 -0000 1.211
+++ Makefile 14 Jan 2013 05:53:34 -0000
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS}
 
 COMMENT = movie player supporting many formats
 
-V = 20110309
+V = 20120505
 FFMPEG_V = 20121026
 
 SUBST_VARS += PREFIX CONFDIR
@@ -15,7 +15,7 @@ SUBST_VARS += PREFIX CONFDIR
 # Distfiles must be hand-rolled, see README
 N = mplayer
 DISTNAME = mplayer-${V}
-REVISION = 22
+EXTRACT_SUFX = .tar.xz
 
 CATEGORIES = x11 multimedia
 
@@ -30,13 +30,12 @@ PERMIT_DISTFILES_FTP = Yes
 WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
  avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
  crypto dv dvdnavmini dvdread enca fontconfig freetype \
- fribidi gsm jpeg lcms 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 \
+ fribidi jpeg m mng mp3lame ncurses ogg>=5 png postproc \
+ pthread SDL sndio speex stdc++ swscale ungif util x264>=5 \
  xvidcore z
 
 # we use a snapshot
-MASTER_SITES = http://theunixzoo.co.uk/distfiles/
+MASTER_SITES = http://comstyle.com/source/
 
 MAINTAINER = Edd Barrett <[hidden email]>
 
@@ -55,7 +54,6 @@ LIB_DEPENDS = graphics/png \
  devel/fribidi \
  graphics/libmng \
  archivers/bzip2 \
- multimedia/schroedinger>=1.0.10 \
  multimedia/x264>=20101023 \
  devel/sdl>=1.2.5 \
  multimedia/libass \
@@ -66,8 +64,8 @@ BUILD_DEPENDS = net/livemedia \
  audio/rtunes>=0.8 \
  textproc/docbook-xsl \
  audio/ladspa
-# mplayer uses non-public interfaces to ffmpeg, so we still need
-# the ffmpeg source in the mplayer tree at build time.
+# MPlayer uses non-public interfaces to FFmpeg, so we still need
+# the FFmpeg source in the MPlayer tree at build time.
 BUILD_DEPENDS +=graphics/ffmpeg:patch
 
 .if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
@@ -78,7 +76,7 @@ CONFDIR = ${SYSCONFDIR}/mplayer
 
 USE_GMAKE = Yes
 USE_GROFF = Yes
-MAKE_ENV = V=1 # turn on verbose ffmpeg build
+MAKE_ENV = V=1 # turn on verbose FFmpeg build
 CONFIGURE_STYLE = simple
 
 # CONFIGURE_ARGS for misc stuff
@@ -102,7 +100,7 @@ CONFIGURE_ARGS += --disable-alsa \
  --disable-dvdread-internal \
  --disable-libdvdcss-internal \
  --disable-gui \
- --disable-ffmpeg_a # link ffmpeg .so (graphics/ffmpeg)
+ --disable-ffmpeg_a # link FFmpeg .so (graphics/ffmpeg)
 
 # CONFIGURE_ARGS that enable internal stuff
 CONFIGURE_ARGS += --enable-menu
@@ -148,7 +146,7 @@ WANTLIB += vorbisenc vorbis
 CONFIGURE_ARGS += --disable-tremor-internal
 .endif
 
-CONFIGURE_ENV += TMPDIR="${WRKBUILD}"
+CONFIGURE_ENV += LOCALBASE="${LOCALBASE}" TMPDIR="${WRKBUILD}"
 
 # binutils 2.15 does not do sse3 for i386/amd64
 .if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
@@ -198,24 +196,20 @@ CONFIGURE_ARGS += --disable-jack
 
 NO_REGRESS = Yes
 
+DOCDIR = ${PREFIX}/share/doc/mplayer
+EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
+
 # copy in rtunes and sndio backends
 post-extract:
  @cp ${FILESDIR}/ao_rtunes.c ${FILESDIR}/ao_sndio.c ${WRKSRC}/libao2
  @cp ${FILESDIR}/ai_sndio.c ${WRKSRC}/stream
 
-# subst PREFIX in a patch, careful with update-patches!
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-post-build:
- @cd ${WRKSRC}/DOCS/xml && ${MAKE_PROGRAM}
-
-DOCDIR = ${PREFIX}/share/doc/mplayer
-EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
-
-# link ffmpeg sources to where build expects
+# link FFmpeg sources to where build expects
 pre-patch:
  ln -s ${WRKDIR}/graphics/ffmpeg/ffmpeg-git-${FFMPEG_V} ${WRKSRC}/ffmpeg
+
+post-build:
+ @cd ${WRKSRC} && ${MAKE_PROGRAM} doc
 
 # install docs
 post-install:
Index: README
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/README,v
retrieving revision 1.4
diff -u -p -r1.4 README
--- README 17 Aug 2011 15:12:15 -0000 1.4
+++ README 14 Jan 2013 05:03:33 -0000
@@ -46,7 +46,7 @@ cd mplayer-YYYYMMDD
 ./version.sh (this should create a version.h)
 find . -name '.svn' | xargs rm -Rf
 cd ..
-tar zcvf mplayer-YYYYMMDD.tar.gz mplayer-YYYYMMDD
+tar cvf - mplayer-YYYYMMDD | xz -c -8e > mplayer-YYYYMMDD.tar.xz
 
 Testing Mencoder
 ----------------
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo 29 Mar 2011 20:04:41 -0000 1.35
+++ distinfo 14 Jan 2013 06:00:39 -0000
@@ -1,5 +1,2 @@
-MD5 (mplayer-20110309.tar.gz) = EU2sXltwhr4VhUplf8qsXw==
-RMD160 (mplayer-20110309.tar.gz) = QlDlgZxUyawqSdBWC871ys/QoRA=
-SHA1 (mplayer-20110309.tar.gz) = AMaoe0ip6hI2EyYdtOf6uHgcgio=
-SHA256 (mplayer-20110309.tar.gz) = yeswxU3WOlLg5FnCJQJL5hLLopvSp543ovqjPN4FGSI=
-SIZE (mplayer-20110309.tar.gz) = 6874760
+SHA256 (mplayer-20120505.tar.xz) = yxNsTDn75qrw17yRjqYCOAspZnxYFgowzZ5bbAGczb4=
+SIZE (mplayer-20120505.tar.xz) = 5362624
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.5
diff -u -p -r1.5 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 29 Mar 2011 20:04:41 -0000 1.5
+++ patches/patch-DOCS_man_en_mplayer_1 14 Jan 2013 04:29:30 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.5 2011/03/29 20:04:41 edd Exp $
---- DOCS/man/en/mplayer.1.orig Wed Mar  9 00:32:59 2011
-+++ DOCS/man/en/mplayer.1 Wed Mar  9 00:45:10 2011
-@@ -1366,7 +1366,7 @@ May be negative.
+--- DOCS/man/en/mplayer.1.orig Sat May  5 01:10:04 2012
++++ DOCS/man/en/mplayer.1 Sat May  5 01:30:00 2012
+@@ -1505,7 +1505,7 @@ May be negative.
  .
  .TP
  .B \-cdrom\-device <path to device>
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v
  .
  .TP
  .B \-channels <number> (also see \-af channels)
-@@ -11877,11 +11877,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12219,11 +12219,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
  .PP
  .B Play DTS-CD with passthrough:
  .nf
Index: patches/patch-DOCS_xml_configure
===================================================================
RCS file: patches/patch-DOCS_xml_configure
diff -N patches/patch-DOCS_xml_configure
--- patches/patch-DOCS_xml_configure 8 Nov 2010 21:25:44 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-$OpenBSD: patch-DOCS_xml_configure,v 1.3 2010/11/08 21:25:44 edd Exp $
---- DOCS/xml/configure.orig Wed Jul 28 11:00:56 2010
-+++ DOCS/xml/configure Thu Oct 28 01:08:35 2010
-@@ -16,7 +16,8 @@ for try_catalog in \
-   /usr/lib/sgml/catalog \
-   /usr/local/lib/sgml/catalog \
-   /usr/share/docbook-xml42/catalog.xml \
--  /usr/share/sgml/docbook/xmlcatalog
-+  /usr/share/sgml/docbook/xmlcatalog \
-+  ${LOCALBASE}/share/sgml/catalog
- do
-   if test -f "$try_catalog"; then
-     catalog=$try_catalog
-@@ -45,6 +46,7 @@ for try_chunk_xsl in \
-   /usr/share/sgml/docbook/xsl-stylesheets*/html/chunk.xsl \
-   /usr/share/xml/docbook/stylesheet/nwalsh/current/html/chunk.xsl \
-   /opt/local/share/xsl/docbook-xsl/html/chunk.xsl \
-+  ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl
-
- do
-   if test -f "$try_chunk_xsl"; then
-@@ -72,6 +74,7 @@ for try_docbook_xsl in \
-   /usr/share/sgml/docbook/xsl-stylesheets*/html/docbook.xsl \
-   /usr/share/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl \
-   /opt/local/share/xsl/docbook-xsl/html/docbook.xsl \
-+  ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl
-
- do
-   if test -f "$try_docbook_xsl"; then
-@@ -126,7 +129,8 @@ for try_dtd in \
-   /usr/share/sgml/docbook/dtd/xml/*/docbookx.dtd \
-   /usr/share/docbook-xml*/docbookx.dtd \
-   /opt/local/share/xml/docbook*/*/docbookx.dtd \
--  /usr/share/apps/ksgmltools2/docbook/*/docbookx.dtd
-+  /usr/share/apps/ksgmltools2/docbook/*/docbookx.dtd \
-+  ${LOCALBASE}/share/xml/docbook/*/docbookx.dtd
- do
-   if test -f "$try_dtd"; then
-     dtd=$try_dtd
-@@ -169,7 +173,7 @@ echo "Looking for a valid XSLT processor..."
- if xsltproc --version > /dev/null 2>&1; then
-   if test -z "$fake_chunk_xsl"; then
-     echo "Found xsltproc. If it works, it's probably the best choice."
--    xsltcommand="xsltproc $catalog_opts -o \$\$1 \$\$2 \$\$3"
-+    xsltcommand="xsltproc $catalog_opts -o \$$1 \$$2 \$$3"
-   else
-     echo "Found xsltproc but no stylesheets on your system."
-     echo "xsltproc is unusable without stylesheets."
Index: patches/patch-Makefile
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 patch-Makefile
--- patches/patch-Makefile 25 Jun 2011 14:15:43 -0000 1.23
+++ patches/patch-Makefile 14 Jan 2013 04:29:30 -0000
@@ -1,15 +1,15 @@
 $OpenBSD: patch-Makefile,v 1.23 2011/06/25 14:15:43 edd Exp $
---- Makefile.orig Wed Mar  9 00:33:03 2011
-+++ Makefile Fri Jun 24 12:19:26 2011
-@@ -26,6 +26,7 @@ include config.mak
- SRCS_AUDIO_INPUT-$(ALSA1X)           += stream/ai_alsa1x.c
- SRCS_AUDIO_INPUT-$(ALSA9)            += stream/ai_alsa.c
+--- Makefile.orig Sat May  5 01:09:58 2012
++++ Makefile Sat May  5 01:30:00 2012
+@@ -35,6 +35,7 @@ OS_FEATURE-$(VSSCANF)                += osdep/vsscanf.
+ # conditional source declarations
+ SRCS_AUDIO_INPUT-$(ALSA)             += stream/ai_alsa.c
  SRCS_AUDIO_INPUT-$(OSS)              += stream/ai_oss.c
 +SRCS_AUDIO_INPUT-$(SNDIO)            += stream/ai_sndio.c
  SRCS_COMMON-$(AUDIO_INPUT)           += $(SRCS_AUDIO_INPUT-yes)
  SRCS_COMMON-$(BITMAP_FONT)           += sub/font_load.c
  SRCS_COMMON-$(CDDA)                  += stream/stream_cdda.c \
-@@ -585,6 +586,7 @@ SRCS_MPLAYER-$(S3FB)          += libvo/vo_s3fb.c
+@@ -593,6 +594,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.23 2011/06/
  SRCS_MPLAYER-$(SVGA)          += libvo/vo_svga.c
  SRCS_MPLAYER-$(TDFXFB)        += libvo/vo_tdfxfb.c
  SRCS_MPLAYER-$(TDFXVID)       += libvo/vo_tdfx_vid.c
-@@ -648,7 +650,8 @@ SRCS_MPLAYER = command.c \
+@@ -656,7 +658,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.23 2011/06/
 
 
  SRCS_MENCODER-$(FAAC)             += libmpcodecs/ae_faac.c
-@@ -814,7 +817,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+@@ -794,7 +797,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.23 2011/06/
 
  codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
  ./$^ > $@
-@@ -864,7 +867,16 @@ loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_N
+@@ -879,7 +882,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.65
diff -u -p -r1.65 patch-configure
--- patches/patch-configure 14 Jan 2013 02:17:15 -0000 1.65
+++ patches/patch-configure 14 Jan 2013 05:25:12 -0000
@@ -1,62 +1,62 @@
-$OpenBSD: patch-configure,v 1.65 2013/01/14 02:17:15 brad Exp $
---- configure.orig Tue Mar  8 19:33:03 2011
-+++ configure Fri Aug 31 16:24:28 2012
-@@ -35,29 +35,33 @@
+$OpenBSD: patch-configure,v 1.62 2012/05/03 06:51:24 ajacoutot Exp $
+--- configure.orig Sat May  5 01:10:02 2012
++++ configure Mon Jan 14 00:25:00 2013
+@@ -35,29 +35,32 @@
  #
  #############################################################################
 
 -if test -e ffmpeg/.svn ; then
--  echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
--  exit 1
--fi
-
--if test -e ffmpeg/mp_auto_pull ; then
--  if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
--    echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
+-    echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
 -    exit 1
--  fi
 -fi
 +# OpenBSD
-+# Don't do anything funky with git or svn, we will provide mplayer with ffmpeg
++# Don't do anything funky with Git or SVN, we will provide mplayer with FFmpeg
 +#
 +#if test -e ffmpeg/.svn ; then
-+#  echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
-+#  exit 1
++#    echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
++#    exit 1
 +#fi
 +#
 +#if test -e ffmpeg/mp_auto_pull ; then
-+#  if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
-+#    echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
-+#    exit 1
-+#  fi
++#    if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
++#        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
++#        exit 1
++#    fi
 +#fi
 +#
 +#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
-+#    rm -rf ffmpeg
-+#    echo "Failed to get a FFmpeg checkout"
-+#    exit 1
-+#  fi
-+#  touch ffmpeg/mp_auto_pull
++#    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
++#        rm -rf ffmpeg
++#        echo "Failed to get a FFmpeg checkout"
++#        exit 1
++#    fi
++#    touch ffmpeg/mp_auto_pull
 +#fi
 
+-if test -e ffmpeg/mp_auto_pull ; then
+-    if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
+-        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
+-        exit 1
+-    fi
+-fi
+-
 -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
--    rm -rf ffmpeg
--    echo "Failed to get a FFmpeg checkout"
--    exit 1
--  fi
--  touch ffmpeg/mp_auto_pull
+-    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
+-        rm -rf ffmpeg
+-        echo "Failed to get a FFmpeg checkout"
+-        exit 1
+-    fi
+-    touch ffmpeg/mp_auto_pull
 -fi
 -
- # Prevent locale nonsense from breaking basic text processing utils
+ # Prevent locale nonsense from breaking basic text processing utilities
  export LC_ALL=C
 
-@@ -510,6 +514,7 @@ Audio output:
+@@ -529,6 +532,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 +64,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
    --disable-kai          disable KAI audio output [autodetect]
    --disable-dart         disable DART audio output [autodetect]
    --disable-win32waveout disable Windows waveout audio output [autodetect]
-@@ -745,6 +750,7 @@ _xf86keysym=auto
+@@ -773,6 +777,7 @@ _xf86keysym=auto
  _mlib=no #broken, thus disabled
  _sgiaudio=auto
  _sunaudio=auto
@@ -72,7 +72,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  _alsa=auto
  _fastmemcpy=yes
  hardcoded_tables=no
-@@ -1169,6 +1175,8 @@ for ac_option do
+@@ -1198,6 +1203,8 @@ for ac_option do
    --disable-mlib)       _mlib=no        ;;
    --enable-sunaudio)    _sunaudio=yes   ;;
    --disable-sunaudio)   _sunaudio=no    ;;
@@ -81,12 +81,8 @@ $OpenBSD: patch-configure,v 1.65 2013/01
    --enable-sgiaudio)    _sgiaudio=yes   ;;
    --disable-sgiaudio)   _sgiaudio=no    ;;
    --enable-alsa)        _alsa=yes       ;;
-@@ -1486,10 +1494,10 @@ if test -z "$_target" ; then
-       sparc64) host_arch=sparc64 ;;
-       parisc*|hppa*|9000*) host_arch=hppa ;;
-       arm*|zaurus|cats) host_arch=arm ;;
--      sh3|sh4|sh4a) host_arch=sh ;;
-+      sh3|sh4|sh4a|landisk) host_arch=sh ;;
+@@ -1512,7 +1519,7 @@ if test -z "$_target" ; then
+       sh3|sh4|sh4a) host_arch=sh ;;
        s390) host_arch=s390 ;;
        s390x) host_arch=s390x ;;
 -      *mips*) host_arch=mips ;;
@@ -94,7 +90,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
        vax) host_arch=vax ;;
        xtensa*) host_arch=xtensa ;;
        *) host_arch=UNKNOWN ;;
-@@ -2200,7 +2208,7 @@ case "$host_arch" in
+@@ -2224,7 +2231,7 @@ case "$host_arch" in
      arch='sparc'
      iproc='sparc'
      if test "$host_arch" = "sparc64" ; then
@@ -103,7 +99,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
        proc='ultrasparc'
        def_fast_64bit='#define HAVE_FAST_64BIT 1'
      elif sunos ; then
-@@ -2519,7 +2527,7 @@ cat > $TMPC << EOF
+@@ -2543,7 +2550,7 @@ cat > $TMPC << EOF
  int ff_extern;
  EOF
  cc_check -c || die "Symbol mangling check failed."
@@ -112,16 +108,27 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  extern_prefix=${sym%%ff_extern*}
  def_extern_asm="#define EXTERN_ASM $extern_prefix"
  def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2578,7 +2586,7 @@ elif test -z "$CFLAGS" ; then
+@@ -2591,7 +2598,7 @@ elif test -z "$CFLAGS" ; then
    elif test "$cc_vendor" != "gnu" ; then
      CFLAGS="-O2 $_march $_mcpu $_pipe"
    else
 -    CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
 +    CFLAGS="$_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
      WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls"
+     WARN_CFLAGS="-Werror-implicit-function-declaration"
      extra_ldflags="$extra_ldflags -ffast-math"
-   fi
-@@ -2860,8 +2868,11 @@ echores "$ibm_asm"
+@@ -2694,10 +2701,6 @@ def_bswap='#define HAVE_BSWAP 0'
+ def_ebx_available='#define HAVE_EBX_AVAILABLE 0'
+ def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'
+
+-if x86_64 ; then
+-inline_asm_check '"mov (%eax), %eax"' || die "Your binutils version is too old to compile for 64-bit"
+-fi
+-
+ if x86 ; then
+
+ echocheck ".align is a power of two"
+@@ -2861,8 +2864,11 @@ echores "$ibm_asm"
  def_gnu_as='#define HAVE_GNU_AS 0'
  gnu_as=no
  echocheck "GNU assembler"
@@ -135,16 +142,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  echores "$gnu_as"
 
  fi
-@@ -3118,7 +3129,7 @@ if test "$_posix4" = yes ; then
- fi
- echores "$_posix4"
-
--for func in exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf truncf; do
-+for func in exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf trunc truncf; do
- echocheck $func
- eval _$func=no
- statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE $_ld_lm && eval _$func=yes
-@@ -3461,7 +3472,6 @@ echores "$_fast_inttypes"
+@@ -3459,7 +3465,6 @@ echores "$_fast_inttypes"
 
  echocheck "malloc.h"
  _malloc=no
@@ -152,7 +150,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  if test "$_malloc" = yes ; then
    def_malloc_h='#define HAVE_MALLOC_H 1'
  else
-@@ -3480,7 +3490,8 @@ if test "$_memalign" = yes ; then
+@@ -3478,7 +3483,8 @@ if test "$_memalign" = yes ; then
  else
    def_memalign='#define HAVE_MEMALIGN 0'
    def_map_memalign='#define memalign(a, b) malloc(b)'
@@ -162,7 +160,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  fi
  echores "$_memalign"
 
-@@ -4661,6 +4672,8 @@ if test "$_aa" = yes ; then
+@@ -4644,6 +4650,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)"
@@ -171,7 +169,14 @@ $OpenBSD: patch-configure,v 1.65 2013/01
    fi
    vomodules="aa $vomodules"
  else
-@@ -4846,7 +4859,7 @@ fi
+@@ -4823,13 +4831,13 @@ int main(void) {
+   return strcmp(PNG_LIBPNG_VER_STRING, png_libpng_ver);
+ }
+ EOF
+-    cc_check -lpng -lz && _png=yes
++    cc_check -lpng -lz -lm && _png=yes
+   fi
+ fi
  echores "$_png"
  if test "$_png" = yes ; then
    def_png='#define CONFIG_PNG 1'
@@ -180,7 +185,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  else
    def_png='#undef CONFIG_PNG'
  fi
-@@ -5663,6 +5676,26 @@ fi
+@@ -5572,6 +5580,26 @@ fi
  echores "$_sunaudio"
 
 
@@ -207,7 +212,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  def_mlib='#define CONFIG_MLIB 0'
  if sunos; then
  echocheck "Sun mediaLib"
-@@ -5780,7 +5813,15 @@ else
+@@ -5688,7 +5716,15 @@ else
    default_dvd_device="/dev/dvd"
  fi
 
@@ -223,25 +228,48 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  echocheck "VCD support"
  if test "$_vcd" = auto; then
    _vcd=no
-@@ -5805,7 +5846,7 @@ echores "$_vcd"
- echocheck "Blu-ray support"
- if test "$_bluray" = auto ; then
-   _bluray=no
--  statement_check libbluray/bluray.h 'bd_get_title_info(0, 0)' -lbluray && _bluray=yes
-+  statement_check libbluray/bluray.h 'bd_get_title_info(0, 0, 0)' -lbluray && _bluray=yes
- fi
- if test "$_bluray" = yes ; then
-   def_bluray='#define CONFIG_LIBBLURAY 1'
-@@ -7360,6 +7401,8 @@ if test "$_tv_v4l2" = auto ; then
-   _tv_v4l2=no
-   if test "$_tv" = yes && linux ; then
-     header_check_broken sys/time.h linux/videodev2.h && _tv_v4l2=yes
-+  elif test "$_tv" = yes && openbsd ; then
-+    header_check sys/videoio.h && _tv_v4l2=yes
-   fi
+@@ -5838,7 +5874,7 @@ echocheck "cdparanoia"
+ if test "$_cdparanoia" = auto ; then
+     _cdparanoia=no
+     for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
+-      statement_check_broken cdda_interface.h cdda_paranoia.h 'paranoia_cachemodel_size(NULL, 0)' $inc_tmp -lcdda_interface -lcdda_paranoia &&
++      statement_check_broken cdda_interface.h cdda_paranoia.h 'paranoia_free(NULL)' $inc_tmp -lcdda_interface -lcdda_paranoia &&
+         _cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
+     done
  fi
- if test "$_tv_v4l2" = yes ; then
-@@ -8069,6 +8112,7 @@ SPEEX = $_speex
+@@ -7753,6 +7789,7 @@ echores "$_dvdnav"
+ # XML documentation tests
+ echocheck "XML catalogs"
+ for try_catalog in \
++  ${LOCALBASE}/share/sgml/catalog \
+   /etc/sgml/catalog \
+   /usr/share/xml/docbook/*/catalog.xml \
+   /opt/local/share/xml/docbook-xml/*/catalog.xml \
+@@ -7780,6 +7817,7 @@ fi
+
+ echocheck "XML chunked stylesheet"
+ for try_chunk_xsl in \
++  ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl \
+   /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 \
+@@ -7805,6 +7843,7 @@ fi
+
+ echocheck "XML monolithic stylesheet"
+ for try_docbook_xsl in \
++  ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl \
+   /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 \
+@@ -7858,6 +7897,7 @@ EOF
+ echocheck "XML DTD"
+ #FIXME: This should prefer higher version numbers, not the other way around ..
+ for try_dtd in \
++  ${LOCALBASE}/share/xml/docbook/*/docbookx.dtd \
+   /usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
+   /usr/share/xml/docbook/*/docbookx.dtd \
+   /usr/share/sgml/docbook/*/docbookx.dtd \
+@@ -8126,6 +8166,7 @@ SPEEX = $_speex
  STREAM_CACHE = $_stream_cache
  SGIAUDIO = $_sgiaudio
  SUNAUDIO = $_sunaudio
@@ -249,7 +277,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  SVGA = $_svga
  TDFXFB = $_tdfxfb
  TDFXVID = $_tdfxvid
-@@ -8357,6 +8401,7 @@ $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE
+@@ -8435,6 +8476,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"
@@ -257,7 +285,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  $def_bluray
  $def_bsdi_dvd
  $def_cddb
-@@ -8445,6 +8490,7 @@ $def_ossaudio_devmixer
+@@ -8520,6 +8562,7 @@ $def_ossaudio_devmixer
  $def_pulse
  $def_sgiaudio
  $def_sunaudio
@@ -265,11 +293,3 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  $def_win32waveout
 
  $def_ladspa
-@@ -8622,6 +8668,7 @@ $def_round
- $def_roundf
- $def_ten_operands
- $def_threads
-+$def_trunc
- $def_truncf
- $def_xform_asm
- $def_xmm_clobbers
Index: patches/patch-libao2_audio_out_c
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-libao2_audio_out_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libao2_audio_out_c
--- patches/patch-libao2_audio_out_c 26 May 2010 21:29:56 -0000 1.4
+++ patches/patch-libao2_audio_out_c 14 Jan 2013 04:29:30 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-libao2_audio_out_c,v 1.4 2010/05/26 21:29:56 jakemsr Exp $
---- libao2/audio_out.c.orig Sat Feb 20 21:02:49 2010
-+++ libao2/audio_out.c Mon Mar  8 14:28:42 2010
-@@ -43,6 +43,7 @@ extern const ao_functions_t audio_out_alsa5;
+--- libao2/audio_out.c.orig Sat May  5 01:09:58 2012
++++ libao2/audio_out.c Sat May  5 01:30:00 2012
+@@ -42,6 +42,7 @@ extern const ao_functions_t audio_out_null;
  extern const ao_functions_t audio_out_alsa;
  extern const ao_functions_t audio_out_nas;
  extern const ao_functions_t audio_out_sdl;
@@ -9,7 +9,7 @@ $OpenBSD: patch-libao2_audio_out_c,v 1.4
  extern const ao_functions_t audio_out_sun;
  extern const ao_functions_t audio_out_sgi;
  extern const ao_functions_t audio_out_win32;
-@@ -55,6 +56,7 @@ extern const ao_functions_t audio_out_v4l2;
+@@ -54,6 +55,7 @@ extern const ao_functions_t audio_out_v4l2;
  extern const ao_functions_t audio_out_mpegpes;
  extern const ao_functions_t audio_out_pcm;
  extern const ao_functions_t audio_out_pss;
@@ -17,7 +17,7 @@ $OpenBSD: patch-libao2_audio_out_c,v 1.4
 
  const ao_functions_t* const audio_out_drivers[] =
  {
-@@ -86,6 +88,9 @@ const ao_functions_t* const audio_out_drivers[] =
+@@ -82,6 +84,9 @@ const ao_functions_t* const audio_out_drivers[] =
  #ifdef CONFIG_SGI_AUDIO
          &audio_out_sgi,
  #endif
@@ -27,7 +27,7 @@ $OpenBSD: patch-libao2_audio_out_c,v 1.4
  #ifdef CONFIG_SUN_AUDIO
          &audio_out_sun,
  #endif
-@@ -124,6 +129,7 @@ const ao_functions_t* const audio_out_drivers[] =
+@@ -120,6 +125,7 @@ const ao_functions_t* const audio_out_drivers[] =
          &audio_out_null,
  // should not be auto-selected:
          &audio_out_pcm,
Index: patches/patch-libmpcodecs_ae_lavc_c
===================================================================
RCS file: patches/patch-libmpcodecs_ae_lavc_c
diff -N patches/patch-libmpcodecs_ae_lavc_c
--- patches/patch-libmpcodecs_ae_lavc_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libmpcodecs_ae_lavc_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpcodecs/ae_lavc.c.orig Thu May  3 01:52:35 2012
-+++ libmpcodecs/ae_lavc.c Thu May  3 01:54:54 2012
-@@ -169,7 +169,7 @@ int mpae_init_lavc(audio_encoder_t *encoder)
- }
- if(lavc_param_atag == 0)
- {
-- lavc_param_atag = av_codec_get_tag(mp_wav_taglists, lavc_acodec->id);
-+ lavc_param_atag = mp_codec_id2tag(lavc_acodec->id, 0, 1);
- if(!lavc_param_atag)
- {
- mp_msg(MSGT_MENCODER, MSGL_FATAL, "Couldn't find wav tag for specified codec, exit\n");
Index: patches/patch-libmpcodecs_vd_ffmpeg_c
===================================================================
RCS file: patches/patch-libmpcodecs_vd_ffmpeg_c
diff -N patches/patch-libmpcodecs_vd_ffmpeg_c
--- patches/patch-libmpcodecs_vd_ffmpeg_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,54 +0,0 @@
-$OpenBSD: patch-libmpcodecs_vd_ffmpeg_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpcodecs/vd_ffmpeg.c.orig Sun Apr 29 01:38:02 2012
-+++ libmpcodecs/vd_ffmpeg.c Sun Apr 29 01:50:45 2012
-@@ -103,6 +103,8 @@ static char *lavc_param_skip_frame_str = NULL;
- static int lavc_param_threads=1;
- static int lavc_param_bitexact=0;
- static char *lavc_avopt = NULL;
-+static enum AVDiscard skip_idct;
-+static enum AVDiscard skip_frame;
-
- static const mp_image_t mpi_no_picture =
- {
-@@ -352,6 +354,9 @@ static int init(sh_video_t *sh){
-         }
-     }
-
-+    skip_idct = avctx->skip_idct;
-+    skip_frame = avctx->skip_frame;
-+
-     mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "libavcodec.size: %d x %d\n", avctx->width, avctx->height);
-     switch (sh->format) {
-     case mmioFOURCC('S','V','Q','3'):
-@@ -603,13 +608,13 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *
-             type = MP_IMGTYPE_STATIC;
-             flags |= MP_IMGFLAG_PRESERVE;
-         }
--        flags|=(!avctx->hurry_up && ctx->do_slices) ?
-+        flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
-                  MP_IMGFLAG_DRAW_CALLBACK:0;
-         mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_STATIC ? "using STATIC\n" : "using TEMP\n");
-     } else {
-         if(!pic->reference){
-             ctx->b_count++;
--            flags|=(!avctx->hurry_up && ctx->do_slices) ?
-+            flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
-                      MP_IMGFLAG_DRAW_CALLBACK:0;
-         }else{
-             ctx->ip_count++;
-@@ -826,7 +831,14 @@ static mp_image_t *decode(sh_video_t *sh, void *data,
-         }
-     }
-
--    avctx->hurry_up=(flags&3)?((flags&2)?2:1):0;
-+    avctx->skip_idct = skip_idct;
-+    avctx->skip_frame = skip_frame;
-+
-+    if (flags&3) {
-+        avctx->skip_frame = AVDISCARD_NONREF;
-+        if (flags&2)
-+            avctx->skip_idct = AVDISCARD_ALL;
-+    }
-
-     mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "vd_ffmpeg data: %04x, %04x, %04x, %04x\n",
-            ((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]);
Index: patches/patch-libmpcodecs_ve_lavc_c
===================================================================
RCS file: patches/patch-libmpcodecs_ve_lavc_c
diff -N patches/patch-libmpcodecs_ve_lavc_c
--- patches/patch-libmpcodecs_ve_lavc_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libmpcodecs_ve_lavc_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpcodecs/ve_lavc.c.orig Thu May  3 01:35:44 2012
-+++ libmpcodecs/ve_lavc.c Thu May  3 01:38:01 2012
-@@ -64,8 +64,6 @@ static int lavc_param_vme = 4;
- static float lavc_param_vqscale = -1;
- static int lavc_param_vqmin = 2;
- static int lavc_param_vqmax = 31;
--static int lavc_param_mb_qmin = 2;
--static int lavc_param_mb_qmax = 31;
- static float lavc_param_lmin = 2;
- static float lavc_param_lmax = 31;
- static float lavc_param_mb_lmin = 2;
-@@ -199,8 +197,6 @@ const m_option_t lavcopts_conf[]={
- {"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL},
- {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
- {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
-- {"mbqmin", &lavc_param_mb_qmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
-- {"mbqmax", &lavc_param_mb_qmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
- {"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
- {"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
- {"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
-@@ -377,8 +373,6 @@ static int config(struct vf_instance *vf,
-     lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate};
-     lavc_venc_context->qmin= lavc_param_vqmin;
-     lavc_venc_context->qmax= lavc_param_vqmax;
--    lavc_venc_context->mb_qmin= lavc_param_mb_qmin;
--    lavc_venc_context->mb_qmax= lavc_param_mb_qmax;
-     lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
-     lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
-     lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5);
Index: patches/patch-libmpcodecs_vf_pp_c
===================================================================
RCS file: patches/patch-libmpcodecs_vf_pp_c
diff -N patches/patch-libmpcodecs_vf_pp_c
--- patches/patch-libmpcodecs_vf_pp_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libmpcodecs_vf_pp_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpcodecs/vf_pp.c.orig Sun Apr 29 01:52:24 2012
-+++ libmpcodecs/vf_pp.c Sun Apr 29 01:52:41 2012
-@@ -46,7 +46,7 @@
-
- struct vf_priv_s {
-     int pp;
--    pp_mode_t *ppMode[PP_QUALITY_MAX+1];
-+    pp_mode *ppMode[PP_QUALITY_MAX+1];
-     void *context;
-     unsigned int outfmt;
- };
Index: patches/patch-libmpdemux_demux_lavf_c
===================================================================
RCS file: patches/patch-libmpdemux_demux_lavf_c
diff -N patches/patch-libmpdemux_demux_lavf_c
--- patches/patch-libmpdemux_demux_lavf_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-libmpdemux_demux_lavf_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpdemux/demux_lavf.c.orig Thu May  3 00:56:32 2012
-+++ libmpdemux/demux_lavf.c Thu May  3 01:31:16 2012
-@@ -279,11 +279,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormat
-             stream_type = "audio";
-             priv->astreams[priv->audio_streams] = i;
-             wf= calloc(sizeof(*wf) + codec->extradata_size, 1);
--            // mp4a tag is used for all mp4 files no matter what they actually contain
--            if(codec->codec_tag == MKTAG('m', 'p', '4', 'a'))
--                codec->codec_tag= 0;
--            if(!codec->codec_tag)
--                codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id);
-+            codec->codec_tag = mp_codec_id2tag(codec->codec_id, codec->codec_tag, 1);
-             wf->wFormatTag= codec->codec_tag;
-             wf->nChannels= codec->channels;
-             wf->nSamplesPerSec= codec->sample_rate;
-@@ -361,8 +357,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormat
-                         codec->codec_tag= MKTAG(24, 'R', 'G', 'B');
-                 }
-             }
--            if(!codec->codec_tag)
--                codec->codec_tag= av_codec_get_tag(mp_bmp_taglists, codec->codec_id);
-+            codec->codec_tag = mp_codec_id2tag(codec->codec_id, codec->codec_tag, 0);
-             bih->biSize= sizeof(*bih) + codec->extradata_size;
-             bih->biWidth= codec->width;
-             bih->biHeight= codec->height;
-@@ -456,10 +451,12 @@ static void handle_stream(demuxer_t *demuxer, AVFormat
-             break;
-         }
-         case AVMEDIA_TYPE_ATTACHMENT:{
--            if (st->codec->codec_id == CODEC_ID_TTF)
--                demuxer_add_attachment(demuxer, st->filename,
-+            if (st->codec->codec_id == CODEC_ID_TTF) {
-+                AVDictionaryEntry *fnametag = av_dict_get(st->metadata, "filename", NULL, 0);
-+                demuxer_add_attachment(demuxer, fnametag ? fnametag->value : NULL,
-                                        "application/x-truetype-font",
-                                        codec->extradata, codec->extradata_size);
-+            }
-             break;
-         }
-         default:
Index: patches/patch-libmpdemux_mp_taglists_c
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-libmpdemux_mp_taglists_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libmpdemux_mp_taglists_c
--- patches/patch-libmpdemux_mp_taglists_c 14 Jan 2013 02:20:41 -0000 1.1
+++ patches/patch-libmpdemux_mp_taglists_c 14 Jan 2013 04:30:16 -0000
@@ -1,60 +1,13 @@
 $OpenBSD: patch-libmpdemux_mp_taglists_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpdemux/mp_taglists.c.orig Thu May  3 01:23:16 2012
-+++ libmpdemux/mp_taglists.c Thu May  3 01:35:04 2012
-@@ -20,7 +20,8 @@
-
- #include "mp_taglists.h"
- #include "libavformat/avformat.h"
--#include "libavformat/riff.h"
-+// for AVCodecTag
-+#include "libavformat/internal.h"
-
- static const AVCodecTag mp_wav_tags[] = {
-     { CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A')},
-@@ -59,8 +60,6 @@ static const AVCodecTag mp_wav_tags[] = {
-     { 0, 0 },
- };
-
--const struct AVCodecTag * const mp_wav_taglists[] = {ff_codec_wav_tags, mp_wav_tags, 0};
--
- static const AVCodecTag mp_codecid_override_tags[] = {
-     { CODEC_ID_AAC,               MKTAG('M', 'P', '4', 'A')},
-     { CODEC_ID_AAC_LATM,          MKTAG('M', 'P', '4', 'L')},
-@@ -122,4 +121,36 @@ static const AVCodecTag mp_bmp_tags[] = {
-     { 0, 0 },
- };
-
--const struct AVCodecTag * const mp_bmp_taglists[] = {ff_codec_bmp_tags, mp_bmp_tags, 0};
-+static void get_taglists(const struct AVCodecTag *dst[3], int audio)
-+{
-+    dst[0] = audio ? mp_wav_tags : mp_bmp_tags;
-+    dst[1] = audio ? avformat_get_riff_audio_tags() : avformat_get_riff_video_tags();
-+    dst[2] = NULL;
-+}
-+
-+enum CodecID mp_tag2codec_id(uint32_t tag, int audio)
-+{
-+    const struct AVCodecTag *taglists[3];
-+    get_taglists(taglists, audio);
-+    return av_codec_get_id(taglists, tag);
-+}
-+
-+uint32_t mp_codec_id2tag(enum CodecID codec_id, uint32_t old_tag, int audio)
-+{
-+    const struct AVCodecTag *taglists[3];
-+    // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag
-+    uint32_t tag = av_codec_get_tag(mp_codecid_override_taglists, codec_id);
-+    if (tag)
-+        return tag;
-+
-+    // mp4a tag is used for all mp4 files no matter what they actually contain
-+    // mp4v is sometimes also used for files containing e.g. mjpeg
-+    if (audio  && old_tag != MKTAG('m', 'p', '4', 'a') ||
-+        !audio && old_tag != MKTAG('m', 'p', '4', 'v'))
-+        tag = old_tag;
-+    if (tag)
-+        return tag;
-+
-+    get_taglists(taglists, audio);
-+    return av_codec_get_tag(taglists, codec_id);
-+}
+--- libmpdemux/mp_taglists.c.orig Sun Jan 13 23:17:13 2013
++++ libmpdemux/mp_taglists.c Sun Jan 13 23:21:23 2013
+@@ -125,7 +125,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')},
Index: patches/patch-libmpdemux_muxer_lavf_c
===================================================================
RCS file: patches/patch-libmpdemux_muxer_lavf_c
diff -N patches/patch-libmpdemux_muxer_lavf_c
--- patches/patch-libmpdemux_muxer_lavf_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-$OpenBSD: patch-libmpdemux_muxer_lavf_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpdemux/muxer_lavf.c.orig Thu May  3 01:38:59 2012
-+++ libmpdemux/muxer_lavf.c Thu May  3 01:51:57 2012
-@@ -189,7 +189,7 @@ static void fix_parameters(muxer_stream_t *stream)
-
- if(stream->type == MUXER_TYPE_AUDIO)
- {
-- ctx->codec_id = av_codec_get_id(mp_wav_taglists, stream->wf->wFormatTag);
-+ ctx->codec_id = mp_tag2codec_id(stream->wf->wFormatTag, 1);
- #if 0 //breaks aac in mov at least
- ctx->codec_tag = codec_get_wav_tag(ctx->codec_id);
- #endif
-@@ -218,7 +218,7 @@ static void fix_parameters(muxer_stream_t *stream)
- }
- else if(stream->type == MUXER_TYPE_VIDEO)
- {
-- ctx->codec_id = av_codec_get_id(mp_bmp_taglists, stream->bih->biCompression);
-+ ctx->codec_id = mp_tag2codec_id(stream->bih->biCompression, 0);
-                 if(ctx->codec_id <= 0 || force_fourcc)
-                     ctx->codec_tag= stream->bih->biCompression;
- mp_msg(MSGT_MUXER, MSGL_INFO, "VIDEO CODEC ID: %d\n", ctx->codec_id);
-@@ -308,7 +308,7 @@ static void write_trailer(muxer_t *muxer)
- static void list_formats(void) {
- AVOutputFormat *fmt;
- mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf output formats:\n");
-- for (fmt = first_oformat; fmt; fmt = fmt->next)
-+ for (fmt = av_oformat_next(NULL); fmt; fmt = av_oformat_next(fmt))
- mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name);
- }
-
-@@ -364,15 +364,15 @@ int muxer_init_muxer_lavf(muxer_t *muxer)
-         priv->oc->preload= (int)(mux_preload*AV_TIME_BASE);
-         priv->oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE);
-         if (info_name)
--            av_strlcpy(priv->oc->title    , info_name,      sizeof(priv->oc->title    ));
-+            av_dict_set(&priv->oc->metadata, "title",     info_name,      0);
-         if (info_artist)
--            av_strlcpy(priv->oc->author   , info_artist,    sizeof(priv->oc->author   ));
-+            av_dict_set(&priv->oc->metadata, "author",    info_artist,    0);
-         if (info_genre)
--            av_strlcpy(priv->oc->genre    , info_genre,     sizeof(priv->oc->genre    ));
-+            av_dict_set(&priv->oc->metadata, "genre",     info_genre,     0);
-         if (info_copyright)
--            av_strlcpy(priv->oc->copyright, info_copyright, sizeof(priv->oc->copyright));
-+            av_dict_set(&priv->oc->metadata, "copyright", info_copyright, 0);
-         if (info_comment)
--            av_strlcpy(priv->oc->comment  , info_comment,   sizeof(priv->oc->comment  ));
-+            av_dict_set(&priv->oc->metadata, "comment",   info_comment,   0);
-
-         if(mux_avopt){
-             if(parse_avopts(priv->oc, mux_avopt) < 0){
Index: patches/patch-libvo_x11_common_c
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-libvo_x11_common_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libvo_x11_common_c
--- patches/patch-libvo_x11_common_c 8 Nov 2010 21:25:44 -0000 1.4
+++ patches/patch-libvo_x11_common_c 14 Jan 2013 04:29:30 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-libvo_x11_common_c,v 1.4 2010/11/08 21:25:44 edd Exp $
---- libvo/x11_common.c.orig Sat Nov  6 05:50:16 2010
-+++ libvo/x11_common.c Sat Nov  6 05:50:59 2010
-@@ -735,7 +735,7 @@ void vo_x11_decoration(Display * vo_Display, Window w,
+--- 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,
  void vo_x11_classhint(Display * display, Window window, const char *name)
  {
      XClassHint wmClass;
 -    pid_t pid = getpid();
 +    long pid = getpid();
+     long prop = pid & 0x7FFFFFFF;
 
      wmClass.res_name = vo_winname ? vo_winname : name;
-     wmClass.res_class = "MPlayer";
Index: patches/patch-stream_stream_bluray_c
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-stream_stream_bluray_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-stream_stream_bluray_c
--- patches/patch-stream_stream_bluray_c 30 Mar 2012 13:23:03 -0000 1.1
+++ patches/patch-stream_stream_bluray_c 14 Jan 2013 04:29:30 -0000
@@ -1,46 +1,7 @@
 $OpenBSD: patch-stream_stream_bluray_c,v 1.1 2012/03/30 13:23:03 phessler Exp $
-
-Update to new libbluray API
-
---- stream/stream_bluray.c.orig Wed Mar  9 01:32:47 2011
-+++ stream/stream_bluray.c Sun Nov 13 23:59:03 2011
-@@ -116,7 +116,7 @@ static int bluray_stream_control(stream_t *s, int cmd,
-     case STREAM_CTRL_GET_NUM_CHAPTERS: {
-         BLURAY_TITLE_INFO *ti;
-
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, 0);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
-
-@@ -137,7 +137,7 @@ static int bluray_stream_control(stream_t *s, int cmd,
-         int64_t pos;
-         int r;
-
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, 0);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
-
-@@ -156,7 +156,7 @@ static int bluray_stream_control(stream_t *s, int cmd,
-     case STREAM_CTRL_GET_NUM_ANGLES: {
-         BLURAY_TITLE_INFO *ti;
-
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, 0);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
-
-@@ -175,7 +175,7 @@ static int bluray_stream_control(stream_t *s, int cmd,
-         BLURAY_TITLE_INFO *ti;
-         int angle = *((int *) arg);
-
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, 0);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
-
-@@ -222,6 +222,8 @@ static int bluray_stream_open(stream_t *s, int mode,
+--- 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,
          device = p->device;
      else if (bluray_device)
          device = bluray_device;
@@ -49,30 +10,3 @@ Update to new libbluray API
 
      if (!device) {
          mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_BlurayNoDevice);
-@@ -236,7 +238,7 @@ static int bluray_stream_open(stream_t *s, int mode,
-     }
-
-     /* check for available titles on disc */
--    title_count = bd_get_titles(bd, TITLES_RELEVANT);
-+    title_count = bd_get_titles(bd, TITLES_RELEVANT, 0);
-     mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BLURAY_TITLES=%d\n", title_count);
-     if (!title_count) {
-         mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_BlurayNoTitles);
-@@ -250,7 +252,7 @@ static int bluray_stream_open(stream_t *s, int mode,
-         BLURAY_TITLE_INFO *ti;
-         int sec, msec;
-
--        ti = bd_get_title_info(bd, i);
-+        ti = bd_get_title_info(bd, i, 0);
-         if (!ti)
-             continue;
-
-@@ -284,7 +286,7 @@ static int bluray_stream_open(stream_t *s, int mode,
-            "ID_BLURAY_CURRENT_TITLE=%d\n", title + 1);
-
-     /* Get current title information */
--    info = bd_get_title_info(bd, title);
-+    info = bd_get_title_info(bd, title, 0);
-     if (!info)
-         goto err_no_info;
-
Index: patches/patch-stream_tvi_v4l2_c
===================================================================
RCS file: patches/patch-stream_tvi_v4l2_c
diff -N patches/patch-stream_tvi_v4l2_c
--- patches/patch-stream_tvi_v4l2_c 26 May 2010 21:29:56 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-stream_tvi_v4l2_c,v 1.3 2010/05/26 21:29:56 jakemsr Exp $
---- stream/tvi_v4l2.c.orig Fri Dec 11 21:33:57 2009
-+++ stream/tvi_v4l2.c Mon Mar  8 14:28:42 2010
-@@ -49,8 +49,12 @@ known issues:
- #ifdef HAVE_SYS_SYSINFO_H
- #include <sys/sysinfo.h>
- #endif
-+#ifdef __OpenBSD__
-+#include <sys/videoio.h>
-+#else
- #include <linux/types.h>
- #include <linux/videodev2.h>
-+#endif
- #include "mp_msg.h"
- #include "libmpcodecs/img_format.h"
- #include "libmpcodecs/dec_teletext.h"

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: MPlayer

Brad Smith-14
On Mon, Jan 14, 2013 at 01:04:25AM -0500, Brad Smith wrote:
> Here is an update to a newer MPlayer snapshot.
>
> Lightly tested on amd64.
 
An updated diff after the last commit to the Makefile..
 

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.212
diff -u -p -r1.212 Makefile
--- Makefile 14 Jan 2013 17:02:15 -0000 1.212
+++ Makefile 14 Jan 2013 23:31:36 -0000
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS}
 
 COMMENT = movie player supporting many formats
 
-V = 20110309
+V = 20120505
 FFMPEG_V = 20121026
 
 SUBST_VARS += PREFIX CONFDIR
@@ -15,7 +15,7 @@ SUBST_VARS += PREFIX CONFDIR
 # Distfiles must be hand-rolled, see README
 N = mplayer
 DISTNAME = mplayer-${V}
-REVISION = 22
+EXTRACT_SUFX = .tar.xz
 
 CATEGORIES = x11 multimedia
 
@@ -30,13 +30,12 @@ PERMIT_DISTFILES_FTP = Yes
 WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
  avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
  crypto dv dvdnavmini dvdread enca fontconfig freetype \
- fribidi gsm jpeg lcms 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 \
+ fribidi jpeg m mng mp3lame ncurses ogg>=5 png postproc \
+ pthread SDL sndio speex stdc++ swscale ungif util x264>=5 \
  xvidcore z
 
 # we use a snapshot
-MASTER_SITES = http://theunixzoo.co.uk/distfiles/
+MASTER_SITES = http://comstyle.com/source/
 
 MAINTAINER = Edd Barrett <[hidden email]>
 
@@ -55,7 +54,6 @@ LIB_DEPENDS = graphics/png \
  devel/fribidi \
  graphics/libmng \
  archivers/bzip2 \
- multimedia/schroedinger>=1.0.10 \
  multimedia/x264>=20101023 \
  devel/sdl>=1.2.5 \
  multimedia/libass \
@@ -148,7 +146,7 @@ WANTLIB += vorbisenc vorbis
 CONFIGURE_ARGS += --disable-tremor-internal
 .endif
 
-CONFIGURE_ENV += TMPDIR="${WRKBUILD}"
+CONFIGURE_ENV += LOCALBASE="${LOCALBASE}" TMPDIR="${WRKBUILD}"
 
 # binutils 2.15 does not do sse3 for i386/amd64
 .if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
@@ -198,24 +196,20 @@ CONFIGURE_ARGS += --disable-jack
 
 NO_REGRESS = Yes
 
+DOCDIR = ${PREFIX}/share/doc/mplayer
+EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
+
 # copy in rtunes and sndio backends
 post-extract:
  @cp ${FILESDIR}/ao_rtunes.c ${FILESDIR}/ao_sndio.c ${WRKSRC}/libao2
  @cp ${FILESDIR}/ai_sndio.c ${WRKSRC}/stream
 
-# subst PREFIX in a patch, careful with update-patches!
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
-
-post-build:
- @cd ${WRKSRC}/DOCS/xml && ${MAKE_PROGRAM}
-
-DOCDIR = ${PREFIX}/share/doc/mplayer
-EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
-
 # link FFmpeg sources to where build expects
 pre-patch:
  ln -s ${WRKDIR}/graphics/ffmpeg/ffmpeg-git-${FFMPEG_V} ${WRKSRC}/ffmpeg
+
+post-build:
+ @cd ${WRKSRC} && ${MAKE_PROGRAM} doc
 
 # install docs
 post-install:
Index: README
===================================================================
RCS file: /cvs/ports/x11/mplayer/README,v
retrieving revision 1.4
diff -u -p -r1.4 README
--- README 17 Aug 2011 15:12:15 -0000 1.4
+++ README 14 Jan 2013 23:31:36 -0000
@@ -46,7 +46,7 @@ cd mplayer-YYYYMMDD
 ./version.sh (this should create a version.h)
 find . -name '.svn' | xargs rm -Rf
 cd ..
-tar zcvf mplayer-YYYYMMDD.tar.gz mplayer-YYYYMMDD
+tar cvf - mplayer-YYYYMMDD | xz -c -8e > mplayer-YYYYMMDD.tar.xz
 
 Testing Mencoder
 ----------------
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo 29 Mar 2011 20:04:41 -0000 1.35
+++ distinfo 14 Jan 2013 23:31:36 -0000
@@ -1,5 +1,2 @@
-MD5 (mplayer-20110309.tar.gz) = EU2sXltwhr4VhUplf8qsXw==
-RMD160 (mplayer-20110309.tar.gz) = QlDlgZxUyawqSdBWC871ys/QoRA=
-SHA1 (mplayer-20110309.tar.gz) = AMaoe0ip6hI2EyYdtOf6uHgcgio=
-SHA256 (mplayer-20110309.tar.gz) = yeswxU3WOlLg5FnCJQJL5hLLopvSp543ovqjPN4FGSI=
-SIZE (mplayer-20110309.tar.gz) = 6874760
+SHA256 (mplayer-20120505.tar.xz) = yxNsTDn75qrw17yRjqYCOAspZnxYFgowzZ5bbAGczb4=
+SIZE (mplayer-20120505.tar.xz) = 5362624
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.5
diff -u -p -r1.5 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 29 Mar 2011 20:04:41 -0000 1.5
+++ patches/patch-DOCS_man_en_mplayer_1 14 Jan 2013 23:31:36 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.5 2011/03/29 20:04:41 edd Exp $
---- DOCS/man/en/mplayer.1.orig Wed Mar  9 00:32:59 2011
-+++ DOCS/man/en/mplayer.1 Wed Mar  9 00:45:10 2011
-@@ -1366,7 +1366,7 @@ May be negative.
+--- DOCS/man/en/mplayer.1.orig Sat May  5 01:10:04 2012
++++ DOCS/man/en/mplayer.1 Sat May  5 01:30:00 2012
+@@ -1505,7 +1505,7 @@ May be negative.
  .
  .TP
  .B \-cdrom\-device <path to device>
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v
  .
  .TP
  .B \-channels <number> (also see \-af channels)
-@@ -11877,11 +11877,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12219,11 +12219,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
  .PP
  .B Play DTS-CD with passthrough:
  .nf
Index: patches/patch-DOCS_xml_configure
===================================================================
RCS file: patches/patch-DOCS_xml_configure
diff -N patches/patch-DOCS_xml_configure
--- patches/patch-DOCS_xml_configure 8 Nov 2010 21:25:44 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-$OpenBSD: patch-DOCS_xml_configure,v 1.3 2010/11/08 21:25:44 edd Exp $
---- DOCS/xml/configure.orig Wed Jul 28 11:00:56 2010
-+++ DOCS/xml/configure Thu Oct 28 01:08:35 2010
-@@ -16,7 +16,8 @@ for try_catalog in \
-   /usr/lib/sgml/catalog \
-   /usr/local/lib/sgml/catalog \
-   /usr/share/docbook-xml42/catalog.xml \
--  /usr/share/sgml/docbook/xmlcatalog
-+  /usr/share/sgml/docbook/xmlcatalog \
-+  ${LOCALBASE}/share/sgml/catalog
- do
-   if test -f "$try_catalog"; then
-     catalog=$try_catalog
-@@ -45,6 +46,7 @@ for try_chunk_xsl in \
-   /usr/share/sgml/docbook/xsl-stylesheets*/html/chunk.xsl \
-   /usr/share/xml/docbook/stylesheet/nwalsh/current/html/chunk.xsl \
-   /opt/local/share/xsl/docbook-xsl/html/chunk.xsl \
-+  ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl
-
- do
-   if test -f "$try_chunk_xsl"; then
-@@ -72,6 +74,7 @@ for try_docbook_xsl in \
-   /usr/share/sgml/docbook/xsl-stylesheets*/html/docbook.xsl \
-   /usr/share/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl \
-   /opt/local/share/xsl/docbook-xsl/html/docbook.xsl \
-+  ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl
-
- do
-   if test -f "$try_docbook_xsl"; then
-@@ -126,7 +129,8 @@ for try_dtd in \
-   /usr/share/sgml/docbook/dtd/xml/*/docbookx.dtd \
-   /usr/share/docbook-xml*/docbookx.dtd \
-   /opt/local/share/xml/docbook*/*/docbookx.dtd \
--  /usr/share/apps/ksgmltools2/docbook/*/docbookx.dtd
-+  /usr/share/apps/ksgmltools2/docbook/*/docbookx.dtd \
-+  ${LOCALBASE}/share/xml/docbook/*/docbookx.dtd
- do
-   if test -f "$try_dtd"; then
-     dtd=$try_dtd
-@@ -169,7 +173,7 @@ echo "Looking for a valid XSLT processor..."
- if xsltproc --version > /dev/null 2>&1; then
-   if test -z "$fake_chunk_xsl"; then
-     echo "Found xsltproc. If it works, it's probably the best choice."
--    xsltcommand="xsltproc $catalog_opts -o \$\$1 \$\$2 \$\$3"
-+    xsltcommand="xsltproc $catalog_opts -o \$$1 \$$2 \$$3"
-   else
-     echo "Found xsltproc but no stylesheets on your system."
-     echo "xsltproc is unusable without stylesheets."
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 patch-Makefile
--- patches/patch-Makefile 25 Jun 2011 14:15:43 -0000 1.23
+++ patches/patch-Makefile 14 Jan 2013 23:31:36 -0000
@@ -1,15 +1,15 @@
 $OpenBSD: patch-Makefile,v 1.23 2011/06/25 14:15:43 edd Exp $
---- Makefile.orig Wed Mar  9 00:33:03 2011
-+++ Makefile Fri Jun 24 12:19:26 2011
-@@ -26,6 +26,7 @@ include config.mak
- SRCS_AUDIO_INPUT-$(ALSA1X)           += stream/ai_alsa1x.c
- SRCS_AUDIO_INPUT-$(ALSA9)            += stream/ai_alsa.c
+--- Makefile.orig Sat May  5 01:09:58 2012
++++ Makefile Sat May  5 01:30:00 2012
+@@ -35,6 +35,7 @@ OS_FEATURE-$(VSSCANF)                += osdep/vsscanf.
+ # conditional source declarations
+ SRCS_AUDIO_INPUT-$(ALSA)             += stream/ai_alsa.c
  SRCS_AUDIO_INPUT-$(OSS)              += stream/ai_oss.c
 +SRCS_AUDIO_INPUT-$(SNDIO)            += stream/ai_sndio.c
  SRCS_COMMON-$(AUDIO_INPUT)           += $(SRCS_AUDIO_INPUT-yes)
  SRCS_COMMON-$(BITMAP_FONT)           += sub/font_load.c
  SRCS_COMMON-$(CDDA)                  += stream/stream_cdda.c \
-@@ -585,6 +586,7 @@ SRCS_MPLAYER-$(S3FB)          += libvo/vo_s3fb.c
+@@ -593,6 +594,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.23 2011/06/
  SRCS_MPLAYER-$(SVGA)          += libvo/vo_svga.c
  SRCS_MPLAYER-$(TDFXFB)        += libvo/vo_tdfxfb.c
  SRCS_MPLAYER-$(TDFXVID)       += libvo/vo_tdfx_vid.c
-@@ -648,7 +650,8 @@ SRCS_MPLAYER = command.c \
+@@ -656,7 +658,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.23 2011/06/
 
 
  SRCS_MENCODER-$(FAAC)             += libmpcodecs/ae_faac.c
-@@ -814,7 +817,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+@@ -794,7 +797,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.23 2011/06/
 
  codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
  ./$^ > $@
-@@ -864,7 +867,16 @@ loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_N
+@@ -879,7 +882,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.65
diff -u -p -r1.65 patch-configure
--- patches/patch-configure 14 Jan 2013 02:17:15 -0000 1.65
+++ patches/patch-configure 14 Jan 2013 23:31:37 -0000
@@ -1,62 +1,62 @@
-$OpenBSD: patch-configure,v 1.65 2013/01/14 02:17:15 brad Exp $
---- configure.orig Tue Mar  8 19:33:03 2011
-+++ configure Fri Aug 31 16:24:28 2012
-@@ -35,29 +35,33 @@
+$OpenBSD: patch-configure,v 1.62 2012/05/03 06:51:24 ajacoutot Exp $
+--- configure.orig Sat May  5 01:10:02 2012
++++ configure Mon Jan 14 00:25:00 2013
+@@ -35,29 +35,32 @@
  #
  #############################################################################
 
 -if test -e ffmpeg/.svn ; then
--  echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
--  exit 1
--fi
-
--if test -e ffmpeg/mp_auto_pull ; then
--  if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
--    echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
+-    echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
 -    exit 1
--  fi
 -fi
 +# OpenBSD
-+# Don't do anything funky with git or svn, we will provide mplayer with ffmpeg
++# Don't do anything funky with Git or SVN, we will provide mplayer with FFmpeg
 +#
 +#if test -e ffmpeg/.svn ; then
-+#  echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
-+#  exit 1
++#    echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
++#    exit 1
 +#fi
 +#
 +#if test -e ffmpeg/mp_auto_pull ; then
-+#  if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
-+#    echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
-+#    exit 1
-+#  fi
++#    if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
++#        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
++#        exit 1
++#    fi
 +#fi
 +#
 +#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
-+#    rm -rf ffmpeg
-+#    echo "Failed to get a FFmpeg checkout"
-+#    exit 1
-+#  fi
-+#  touch ffmpeg/mp_auto_pull
++#    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
++#        rm -rf ffmpeg
++#        echo "Failed to get a FFmpeg checkout"
++#        exit 1
++#    fi
++#    touch ffmpeg/mp_auto_pull
 +#fi
 
+-if test -e ffmpeg/mp_auto_pull ; then
+-    if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
+-        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
+-        exit 1
+-    fi
+-fi
+-
 -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
--    rm -rf ffmpeg
--    echo "Failed to get a FFmpeg checkout"
--    exit 1
--  fi
--  touch ffmpeg/mp_auto_pull
+-    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
+-        rm -rf ffmpeg
+-        echo "Failed to get a FFmpeg checkout"
+-        exit 1
+-    fi
+-    touch ffmpeg/mp_auto_pull
 -fi
 -
- # Prevent locale nonsense from breaking basic text processing utils
+ # Prevent locale nonsense from breaking basic text processing utilities
  export LC_ALL=C
 
-@@ -510,6 +514,7 @@ Audio output:
+@@ -529,6 +532,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 +64,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
    --disable-kai          disable KAI audio output [autodetect]
    --disable-dart         disable DART audio output [autodetect]
    --disable-win32waveout disable Windows waveout audio output [autodetect]
-@@ -745,6 +750,7 @@ _xf86keysym=auto
+@@ -773,6 +777,7 @@ _xf86keysym=auto
  _mlib=no #broken, thus disabled
  _sgiaudio=auto
  _sunaudio=auto
@@ -72,7 +72,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  _alsa=auto
  _fastmemcpy=yes
  hardcoded_tables=no
-@@ -1169,6 +1175,8 @@ for ac_option do
+@@ -1198,6 +1203,8 @@ for ac_option do
    --disable-mlib)       _mlib=no        ;;
    --enable-sunaudio)    _sunaudio=yes   ;;
    --disable-sunaudio)   _sunaudio=no    ;;
@@ -81,12 +81,8 @@ $OpenBSD: patch-configure,v 1.65 2013/01
    --enable-sgiaudio)    _sgiaudio=yes   ;;
    --disable-sgiaudio)   _sgiaudio=no    ;;
    --enable-alsa)        _alsa=yes       ;;
-@@ -1486,10 +1494,10 @@ if test -z "$_target" ; then
-       sparc64) host_arch=sparc64 ;;
-       parisc*|hppa*|9000*) host_arch=hppa ;;
-       arm*|zaurus|cats) host_arch=arm ;;
--      sh3|sh4|sh4a) host_arch=sh ;;
-+      sh3|sh4|sh4a|landisk) host_arch=sh ;;
+@@ -1512,7 +1519,7 @@ if test -z "$_target" ; then
+       sh3|sh4|sh4a) host_arch=sh ;;
        s390) host_arch=s390 ;;
        s390x) host_arch=s390x ;;
 -      *mips*) host_arch=mips ;;
@@ -94,7 +90,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
        vax) host_arch=vax ;;
        xtensa*) host_arch=xtensa ;;
        *) host_arch=UNKNOWN ;;
-@@ -2200,7 +2208,7 @@ case "$host_arch" in
+@@ -2224,7 +2231,7 @@ case "$host_arch" in
      arch='sparc'
      iproc='sparc'
      if test "$host_arch" = "sparc64" ; then
@@ -103,7 +99,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
        proc='ultrasparc'
        def_fast_64bit='#define HAVE_FAST_64BIT 1'
      elif sunos ; then
-@@ -2519,7 +2527,7 @@ cat > $TMPC << EOF
+@@ -2543,7 +2550,7 @@ cat > $TMPC << EOF
  int ff_extern;
  EOF
  cc_check -c || die "Symbol mangling check failed."
@@ -112,16 +108,27 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  extern_prefix=${sym%%ff_extern*}
  def_extern_asm="#define EXTERN_ASM $extern_prefix"
  def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2578,7 +2586,7 @@ elif test -z "$CFLAGS" ; then
+@@ -2591,7 +2598,7 @@ elif test -z "$CFLAGS" ; then
    elif test "$cc_vendor" != "gnu" ; then
      CFLAGS="-O2 $_march $_mcpu $_pipe"
    else
 -    CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
 +    CFLAGS="$_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
      WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls"
+     WARN_CFLAGS="-Werror-implicit-function-declaration"
      extra_ldflags="$extra_ldflags -ffast-math"
-   fi
-@@ -2860,8 +2868,11 @@ echores "$ibm_asm"
+@@ -2694,10 +2701,6 @@ def_bswap='#define HAVE_BSWAP 0'
+ def_ebx_available='#define HAVE_EBX_AVAILABLE 0'
+ def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'
+
+-if x86_64 ; then
+-inline_asm_check '"mov (%eax), %eax"' || die "Your binutils version is too old to compile for 64-bit"
+-fi
+-
+ if x86 ; then
+
+ echocheck ".align is a power of two"
+@@ -2861,8 +2864,11 @@ echores "$ibm_asm"
  def_gnu_as='#define HAVE_GNU_AS 0'
  gnu_as=no
  echocheck "GNU assembler"
@@ -135,16 +142,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  echores "$gnu_as"
 
  fi
-@@ -3118,7 +3129,7 @@ if test "$_posix4" = yes ; then
- fi
- echores "$_posix4"
-
--for func in exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf truncf; do
-+for func in exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf trunc truncf; do
- echocheck $func
- eval _$func=no
- statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE $_ld_lm && eval _$func=yes
-@@ -3461,7 +3472,6 @@ echores "$_fast_inttypes"
+@@ -3459,7 +3465,6 @@ echores "$_fast_inttypes"
 
  echocheck "malloc.h"
  _malloc=no
@@ -152,7 +150,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  if test "$_malloc" = yes ; then
    def_malloc_h='#define HAVE_MALLOC_H 1'
  else
-@@ -3480,7 +3490,8 @@ if test "$_memalign" = yes ; then
+@@ -3478,7 +3483,8 @@ if test "$_memalign" = yes ; then
  else
    def_memalign='#define HAVE_MEMALIGN 0'
    def_map_memalign='#define memalign(a, b) malloc(b)'
@@ -162,7 +160,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  fi
  echores "$_memalign"
 
-@@ -4661,6 +4672,8 @@ if test "$_aa" = yes ; then
+@@ -4644,6 +4650,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)"
@@ -171,7 +169,14 @@ $OpenBSD: patch-configure,v 1.65 2013/01
    fi
    vomodules="aa $vomodules"
  else
-@@ -4846,7 +4859,7 @@ fi
+@@ -4823,13 +4831,13 @@ int main(void) {
+   return strcmp(PNG_LIBPNG_VER_STRING, png_libpng_ver);
+ }
+ EOF
+-    cc_check -lpng -lz && _png=yes
++    cc_check -lpng -lz -lm && _png=yes
+   fi
+ fi
  echores "$_png"
  if test "$_png" = yes ; then
    def_png='#define CONFIG_PNG 1'
@@ -180,7 +185,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  else
    def_png='#undef CONFIG_PNG'
  fi
-@@ -5663,6 +5676,26 @@ fi
+@@ -5572,6 +5580,26 @@ fi
  echores "$_sunaudio"
 
 
@@ -207,7 +212,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  def_mlib='#define CONFIG_MLIB 0'
  if sunos; then
  echocheck "Sun mediaLib"
-@@ -5780,7 +5813,15 @@ else
+@@ -5688,7 +5716,15 @@ else
    default_dvd_device="/dev/dvd"
  fi
 
@@ -223,25 +228,48 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  echocheck "VCD support"
  if test "$_vcd" = auto; then
    _vcd=no
-@@ -5805,7 +5846,7 @@ echores "$_vcd"
- echocheck "Blu-ray support"
- if test "$_bluray" = auto ; then
-   _bluray=no
--  statement_check libbluray/bluray.h 'bd_get_title_info(0, 0)' -lbluray && _bluray=yes
-+  statement_check libbluray/bluray.h 'bd_get_title_info(0, 0, 0)' -lbluray && _bluray=yes
- fi
- if test "$_bluray" = yes ; then
-   def_bluray='#define CONFIG_LIBBLURAY 1'
-@@ -7360,6 +7401,8 @@ if test "$_tv_v4l2" = auto ; then
-   _tv_v4l2=no
-   if test "$_tv" = yes && linux ; then
-     header_check_broken sys/time.h linux/videodev2.h && _tv_v4l2=yes
-+  elif test "$_tv" = yes && openbsd ; then
-+    header_check sys/videoio.h && _tv_v4l2=yes
-   fi
+@@ -5838,7 +5874,7 @@ echocheck "cdparanoia"
+ if test "$_cdparanoia" = auto ; then
+     _cdparanoia=no
+     for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
+-      statement_check_broken cdda_interface.h cdda_paranoia.h 'paranoia_cachemodel_size(NULL, 0)' $inc_tmp -lcdda_interface -lcdda_paranoia &&
++      statement_check_broken cdda_interface.h cdda_paranoia.h 'paranoia_free(NULL)' $inc_tmp -lcdda_interface -lcdda_paranoia &&
+         _cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
+     done
  fi
- if test "$_tv_v4l2" = yes ; then
-@@ -8069,6 +8112,7 @@ SPEEX = $_speex
+@@ -7753,6 +7789,7 @@ echores "$_dvdnav"
+ # XML documentation tests
+ echocheck "XML catalogs"
+ for try_catalog in \
++  ${LOCALBASE}/share/sgml/catalog \
+   /etc/sgml/catalog \
+   /usr/share/xml/docbook/*/catalog.xml \
+   /opt/local/share/xml/docbook-xml/*/catalog.xml \
+@@ -7780,6 +7817,7 @@ fi
+
+ echocheck "XML chunked stylesheet"
+ for try_chunk_xsl in \
++  ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl \
+   /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 \
+@@ -7805,6 +7843,7 @@ fi
+
+ echocheck "XML monolithic stylesheet"
+ for try_docbook_xsl in \
++  ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl \
+   /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 \
+@@ -7858,6 +7897,7 @@ EOF
+ echocheck "XML DTD"
+ #FIXME: This should prefer higher version numbers, not the other way around ..
+ for try_dtd in \
++  ${LOCALBASE}/share/xml/docbook/*/docbookx.dtd \
+   /usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
+   /usr/share/xml/docbook/*/docbookx.dtd \
+   /usr/share/sgml/docbook/*/docbookx.dtd \
+@@ -8126,6 +8166,7 @@ SPEEX = $_speex
  STREAM_CACHE = $_stream_cache
  SGIAUDIO = $_sgiaudio
  SUNAUDIO = $_sunaudio
@@ -249,7 +277,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  SVGA = $_svga
  TDFXFB = $_tdfxfb
  TDFXVID = $_tdfxvid
-@@ -8357,6 +8401,7 @@ $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE
+@@ -8435,6 +8476,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"
@@ -257,7 +285,7 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  $def_bluray
  $def_bsdi_dvd
  $def_cddb
-@@ -8445,6 +8490,7 @@ $def_ossaudio_devmixer
+@@ -8520,6 +8562,7 @@ $def_ossaudio_devmixer
  $def_pulse
  $def_sgiaudio
  $def_sunaudio
@@ -265,11 +293,3 @@ $OpenBSD: patch-configure,v 1.65 2013/01
  $def_win32waveout
 
  $def_ladspa
-@@ -8622,6 +8668,7 @@ $def_round
- $def_roundf
- $def_ten_operands
- $def_threads
-+$def_trunc
- $def_truncf
- $def_xform_asm
- $def_xmm_clobbers
Index: patches/patch-fmt-conversion_c
===================================================================
RCS file: patches/patch-fmt-conversion_c
diff -N patches/patch-fmt-conversion_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-fmt-conversion_c 14 Jan 2013 23:31:37 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- fmt-conversion.c.orig Sat May  5 01:50:57 2012
++++ fmt-conversion.c Sat May  5 01:58:10 2012
+@@ -65,6 +65,8 @@ static const struct {
+     {IMGFMT_RGBA,    PIX_FMT_RGB0},
+     {IMGFMT_RGB64LE, PIX_FMT_RGBA64LE},
+     {IMGFMT_RGB64BE, PIX_FMT_RGBA64BE},
++#endif
++#ifdef PIX_FMT_YUVA444P
+     {IMGFMT_444A,    PIX_FMT_YUVA444P},
+ #endif
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
Index: patches/patch-libao2_audio_out_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libao2_audio_out_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libao2_audio_out_c
--- patches/patch-libao2_audio_out_c 26 May 2010 21:29:56 -0000 1.4
+++ patches/patch-libao2_audio_out_c 14 Jan 2013 23:31:37 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-libao2_audio_out_c,v 1.4 2010/05/26 21:29:56 jakemsr Exp $
---- libao2/audio_out.c.orig Sat Feb 20 21:02:49 2010
-+++ libao2/audio_out.c Mon Mar  8 14:28:42 2010
-@@ -43,6 +43,7 @@ extern const ao_functions_t audio_out_alsa5;
+--- libao2/audio_out.c.orig Sat May  5 01:09:58 2012
++++ libao2/audio_out.c Sat May  5 01:30:00 2012
+@@ -42,6 +42,7 @@ extern const ao_functions_t audio_out_null;
  extern const ao_functions_t audio_out_alsa;
  extern const ao_functions_t audio_out_nas;
  extern const ao_functions_t audio_out_sdl;
@@ -9,7 +9,7 @@ $OpenBSD: patch-libao2_audio_out_c,v 1.4
  extern const ao_functions_t audio_out_sun;
  extern const ao_functions_t audio_out_sgi;
  extern const ao_functions_t audio_out_win32;
-@@ -55,6 +56,7 @@ extern const ao_functions_t audio_out_v4l2;
+@@ -54,6 +55,7 @@ extern const ao_functions_t audio_out_v4l2;
  extern const ao_functions_t audio_out_mpegpes;
  extern const ao_functions_t audio_out_pcm;
  extern const ao_functions_t audio_out_pss;
@@ -17,7 +17,7 @@ $OpenBSD: patch-libao2_audio_out_c,v 1.4
 
  const ao_functions_t* const audio_out_drivers[] =
  {
-@@ -86,6 +88,9 @@ const ao_functions_t* const audio_out_drivers[] =
+@@ -82,6 +84,9 @@ const ao_functions_t* const audio_out_drivers[] =
  #ifdef CONFIG_SGI_AUDIO
          &audio_out_sgi,
  #endif
@@ -27,7 +27,7 @@ $OpenBSD: patch-libao2_audio_out_c,v 1.4
  #ifdef CONFIG_SUN_AUDIO
          &audio_out_sun,
  #endif
-@@ -124,6 +129,7 @@ const ao_functions_t* const audio_out_drivers[] =
+@@ -120,6 +125,7 @@ const ao_functions_t* const audio_out_drivers[] =
          &audio_out_null,
  // should not be auto-selected:
          &audio_out_pcm,
Index: patches/patch-libmpcodecs_ae_lavc_c
===================================================================
RCS file: patches/patch-libmpcodecs_ae_lavc_c
diff -N patches/patch-libmpcodecs_ae_lavc_c
--- patches/patch-libmpcodecs_ae_lavc_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libmpcodecs_ae_lavc_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpcodecs/ae_lavc.c.orig Thu May  3 01:52:35 2012
-+++ libmpcodecs/ae_lavc.c Thu May  3 01:54:54 2012
-@@ -169,7 +169,7 @@ int mpae_init_lavc(audio_encoder_t *encoder)
- }
- if(lavc_param_atag == 0)
- {
-- lavc_param_atag = av_codec_get_tag(mp_wav_taglists, lavc_acodec->id);
-+ lavc_param_atag = mp_codec_id2tag(lavc_acodec->id, 0, 1);
- if(!lavc_param_atag)
- {
- mp_msg(MSGT_MENCODER, MSGL_FATAL, "Couldn't find wav tag for specified codec, exit\n");
Index: patches/patch-libmpcodecs_vd_ffmpeg_c
===================================================================
RCS file: patches/patch-libmpcodecs_vd_ffmpeg_c
diff -N patches/patch-libmpcodecs_vd_ffmpeg_c
--- patches/patch-libmpcodecs_vd_ffmpeg_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,54 +0,0 @@
-$OpenBSD: patch-libmpcodecs_vd_ffmpeg_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpcodecs/vd_ffmpeg.c.orig Sun Apr 29 01:38:02 2012
-+++ libmpcodecs/vd_ffmpeg.c Sun Apr 29 01:50:45 2012
-@@ -103,6 +103,8 @@ static char *lavc_param_skip_frame_str = NULL;
- static int lavc_param_threads=1;
- static int lavc_param_bitexact=0;
- static char *lavc_avopt = NULL;
-+static enum AVDiscard skip_idct;
-+static enum AVDiscard skip_frame;
-
- static const mp_image_t mpi_no_picture =
- {
-@@ -352,6 +354,9 @@ static int init(sh_video_t *sh){
-         }
-     }
-
-+    skip_idct = avctx->skip_idct;
-+    skip_frame = avctx->skip_frame;
-+
-     mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "libavcodec.size: %d x %d\n", avctx->width, avctx->height);
-     switch (sh->format) {
-     case mmioFOURCC('S','V','Q','3'):
-@@ -603,13 +608,13 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *
-             type = MP_IMGTYPE_STATIC;
-             flags |= MP_IMGFLAG_PRESERVE;
-         }
--        flags|=(!avctx->hurry_up && ctx->do_slices) ?
-+        flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
-                  MP_IMGFLAG_DRAW_CALLBACK:0;
-         mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_STATIC ? "using STATIC\n" : "using TEMP\n");
-     } else {
-         if(!pic->reference){
-             ctx->b_count++;
--            flags|=(!avctx->hurry_up && ctx->do_slices) ?
-+            flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ?
-                      MP_IMGFLAG_DRAW_CALLBACK:0;
-         }else{
-             ctx->ip_count++;
-@@ -826,7 +831,14 @@ static mp_image_t *decode(sh_video_t *sh, void *data,
-         }
-     }
-
--    avctx->hurry_up=(flags&3)?((flags&2)?2:1):0;
-+    avctx->skip_idct = skip_idct;
-+    avctx->skip_frame = skip_frame;
-+
-+    if (flags&3) {
-+        avctx->skip_frame = AVDISCARD_NONREF;
-+        if (flags&2)
-+            avctx->skip_idct = AVDISCARD_ALL;
-+    }
-
-     mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "vd_ffmpeg data: %04x, %04x, %04x, %04x\n",
-            ((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]);
Index: patches/patch-libmpcodecs_ve_lavc_c
===================================================================
RCS file: patches/patch-libmpcodecs_ve_lavc_c
diff -N patches/patch-libmpcodecs_ve_lavc_c
--- patches/patch-libmpcodecs_ve_lavc_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libmpcodecs_ve_lavc_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpcodecs/ve_lavc.c.orig Thu May  3 01:35:44 2012
-+++ libmpcodecs/ve_lavc.c Thu May  3 01:38:01 2012
-@@ -64,8 +64,6 @@ static int lavc_param_vme = 4;
- static float lavc_param_vqscale = -1;
- static int lavc_param_vqmin = 2;
- static int lavc_param_vqmax = 31;
--static int lavc_param_mb_qmin = 2;
--static int lavc_param_mb_qmax = 31;
- static float lavc_param_lmin = 2;
- static float lavc_param_lmax = 31;
- static float lavc_param_mb_lmin = 2;
-@@ -199,8 +197,6 @@ const m_option_t lavcopts_conf[]={
- {"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL},
- {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
- {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
-- {"mbqmin", &lavc_param_mb_qmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
-- {"mbqmax", &lavc_param_mb_qmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
- {"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
- {"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
- {"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
-@@ -377,8 +373,6 @@ static int config(struct vf_instance *vf,
-     lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate};
-     lavc_venc_context->qmin= lavc_param_vqmin;
-     lavc_venc_context->qmax= lavc_param_vqmax;
--    lavc_venc_context->mb_qmin= lavc_param_mb_qmin;
--    lavc_venc_context->mb_qmax= lavc_param_mb_qmax;
-     lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
-     lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
-     lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5);
Index: patches/patch-libmpcodecs_vf_pp_c
===================================================================
RCS file: patches/patch-libmpcodecs_vf_pp_c
diff -N patches/patch-libmpcodecs_vf_pp_c
--- patches/patch-libmpcodecs_vf_pp_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libmpcodecs_vf_pp_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpcodecs/vf_pp.c.orig Sun Apr 29 01:52:24 2012
-+++ libmpcodecs/vf_pp.c Sun Apr 29 01:52:41 2012
-@@ -46,7 +46,7 @@
-
- struct vf_priv_s {
-     int pp;
--    pp_mode_t *ppMode[PP_QUALITY_MAX+1];
-+    pp_mode *ppMode[PP_QUALITY_MAX+1];
-     void *context;
-     unsigned int outfmt;
- };
Index: patches/patch-libmpdemux_demux_lavf_c
===================================================================
RCS file: patches/patch-libmpdemux_demux_lavf_c
diff -N patches/patch-libmpdemux_demux_lavf_c
--- patches/patch-libmpdemux_demux_lavf_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-libmpdemux_demux_lavf_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpdemux/demux_lavf.c.orig Thu May  3 00:56:32 2012
-+++ libmpdemux/demux_lavf.c Thu May  3 01:31:16 2012
-@@ -279,11 +279,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormat
-             stream_type = "audio";
-             priv->astreams[priv->audio_streams] = i;
-             wf= calloc(sizeof(*wf) + codec->extradata_size, 1);
--            // mp4a tag is used for all mp4 files no matter what they actually contain
--            if(codec->codec_tag == MKTAG('m', 'p', '4', 'a'))
--                codec->codec_tag= 0;
--            if(!codec->codec_tag)
--                codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id);
-+            codec->codec_tag = mp_codec_id2tag(codec->codec_id, codec->codec_tag, 1);
-             wf->wFormatTag= codec->codec_tag;
-             wf->nChannels= codec->channels;
-             wf->nSamplesPerSec= codec->sample_rate;
-@@ -361,8 +357,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormat
-                         codec->codec_tag= MKTAG(24, 'R', 'G', 'B');
-                 }
-             }
--            if(!codec->codec_tag)
--                codec->codec_tag= av_codec_get_tag(mp_bmp_taglists, codec->codec_id);
-+            codec->codec_tag = mp_codec_id2tag(codec->codec_id, codec->codec_tag, 0);
-             bih->biSize= sizeof(*bih) + codec->extradata_size;
-             bih->biWidth= codec->width;
-             bih->biHeight= codec->height;
-@@ -456,10 +451,12 @@ static void handle_stream(demuxer_t *demuxer, AVFormat
-             break;
-         }
-         case AVMEDIA_TYPE_ATTACHMENT:{
--            if (st->codec->codec_id == CODEC_ID_TTF)
--                demuxer_add_attachment(demuxer, st->filename,
-+            if (st->codec->codec_id == CODEC_ID_TTF) {
-+                AVDictionaryEntry *fnametag = av_dict_get(st->metadata, "filename", NULL, 0);
-+                demuxer_add_attachment(demuxer, fnametag ? fnametag->value : NULL,
-                                        "application/x-truetype-font",
-                                        codec->extradata, codec->extradata_size);
-+            }
-             break;
-         }
-         default:
Index: patches/patch-libmpdemux_mp_taglists_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libmpdemux_mp_taglists_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libmpdemux_mp_taglists_c
--- patches/patch-libmpdemux_mp_taglists_c 14 Jan 2013 02:20:41 -0000 1.1
+++ patches/patch-libmpdemux_mp_taglists_c 14 Jan 2013 23:31:37 -0000
@@ -1,60 +1,13 @@
 $OpenBSD: patch-libmpdemux_mp_taglists_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpdemux/mp_taglists.c.orig Thu May  3 01:23:16 2012
-+++ libmpdemux/mp_taglists.c Thu May  3 01:35:04 2012
-@@ -20,7 +20,8 @@
-
- #include "mp_taglists.h"
- #include "libavformat/avformat.h"
--#include "libavformat/riff.h"
-+// for AVCodecTag
-+#include "libavformat/internal.h"
-
- static const AVCodecTag mp_wav_tags[] = {
-     { CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A')},
-@@ -59,8 +60,6 @@ static const AVCodecTag mp_wav_tags[] = {
-     { 0, 0 },
- };
-
--const struct AVCodecTag * const mp_wav_taglists[] = {ff_codec_wav_tags, mp_wav_tags, 0};
--
- static const AVCodecTag mp_codecid_override_tags[] = {
-     { CODEC_ID_AAC,               MKTAG('M', 'P', '4', 'A')},
-     { CODEC_ID_AAC_LATM,          MKTAG('M', 'P', '4', 'L')},
-@@ -122,4 +121,36 @@ static const AVCodecTag mp_bmp_tags[] = {
-     { 0, 0 },
- };
-
--const struct AVCodecTag * const mp_bmp_taglists[] = {ff_codec_bmp_tags, mp_bmp_tags, 0};
-+static void get_taglists(const struct AVCodecTag *dst[3], int audio)
-+{
-+    dst[0] = audio ? mp_wav_tags : mp_bmp_tags;
-+    dst[1] = audio ? avformat_get_riff_audio_tags() : avformat_get_riff_video_tags();
-+    dst[2] = NULL;
-+}
-+
-+enum CodecID mp_tag2codec_id(uint32_t tag, int audio)
-+{
-+    const struct AVCodecTag *taglists[3];
-+    get_taglists(taglists, audio);
-+    return av_codec_get_id(taglists, tag);
-+}
-+
-+uint32_t mp_codec_id2tag(enum CodecID codec_id, uint32_t old_tag, int audio)
-+{
-+    const struct AVCodecTag *taglists[3];
-+    // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag
-+    uint32_t tag = av_codec_get_tag(mp_codecid_override_taglists, codec_id);
-+    if (tag)
-+        return tag;
-+
-+    // mp4a tag is used for all mp4 files no matter what they actually contain
-+    // mp4v is sometimes also used for files containing e.g. mjpeg
-+    if (audio  && old_tag != MKTAG('m', 'p', '4', 'a') ||
-+        !audio && old_tag != MKTAG('m', 'p', '4', 'v'))
-+        tag = old_tag;
-+    if (tag)
-+        return tag;
-+
-+    get_taglists(taglists, audio);
-+    return av_codec_get_tag(taglists, codec_id);
-+}
+--- libmpdemux/mp_taglists.c.orig Sun Jan 13 23:17:13 2013
++++ libmpdemux/mp_taglists.c Sun Jan 13 23:21:23 2013
+@@ -125,7 +125,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')},
Index: patches/patch-libmpdemux_muxer_lavf_c
===================================================================
RCS file: patches/patch-libmpdemux_muxer_lavf_c
diff -N patches/patch-libmpdemux_muxer_lavf_c
--- patches/patch-libmpdemux_muxer_lavf_c 14 Jan 2013 02:20:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-$OpenBSD: patch-libmpdemux_muxer_lavf_c,v 1.1 2013/01/14 02:20:41 brad Exp $
---- libmpdemux/muxer_lavf.c.orig Thu May  3 01:38:59 2012
-+++ libmpdemux/muxer_lavf.c Thu May  3 01:51:57 2012
-@@ -189,7 +189,7 @@ static void fix_parameters(muxer_stream_t *stream)
-
- if(stream->type == MUXER_TYPE_AUDIO)
- {
-- ctx->codec_id = av_codec_get_id(mp_wav_taglists, stream->wf->wFormatTag);
-+ ctx->codec_id = mp_tag2codec_id(stream->wf->wFormatTag, 1);
- #if 0 //breaks aac in mov at least
- ctx->codec_tag = codec_get_wav_tag(ctx->codec_id);
- #endif
-@@ -218,7 +218,7 @@ static void fix_parameters(muxer_stream_t *stream)
- }
- else if(stream->type == MUXER_TYPE_VIDEO)
- {
-- ctx->codec_id = av_codec_get_id(mp_bmp_taglists, stream->bih->biCompression);
-+ ctx->codec_id = mp_tag2codec_id(stream->bih->biCompression, 0);
-                 if(ctx->codec_id <= 0 || force_fourcc)
-                     ctx->codec_tag= stream->bih->biCompression;
- mp_msg(MSGT_MUXER, MSGL_INFO, "VIDEO CODEC ID: %d\n", ctx->codec_id);
-@@ -308,7 +308,7 @@ static void write_trailer(muxer_t *muxer)
- static void list_formats(void) {
- AVOutputFormat *fmt;
- mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf output formats:\n");
-- for (fmt = first_oformat; fmt; fmt = fmt->next)
-+ for (fmt = av_oformat_next(NULL); fmt; fmt = av_oformat_next(fmt))
- mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name);
- }
-
-@@ -364,15 +364,15 @@ int muxer_init_muxer_lavf(muxer_t *muxer)
-         priv->oc->preload= (int)(mux_preload*AV_TIME_BASE);
-         priv->oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE);
-         if (info_name)
--            av_strlcpy(priv->oc->title    , info_name,      sizeof(priv->oc->title    ));
-+            av_dict_set(&priv->oc->metadata, "title",     info_name,      0);
-         if (info_artist)
--            av_strlcpy(priv->oc->author   , info_artist,    sizeof(priv->oc->author   ));
-+            av_dict_set(&priv->oc->metadata, "author",    info_artist,    0);
-         if (info_genre)
--            av_strlcpy(priv->oc->genre    , info_genre,     sizeof(priv->oc->genre    ));
-+            av_dict_set(&priv->oc->metadata, "genre",     info_genre,     0);
-         if (info_copyright)
--            av_strlcpy(priv->oc->copyright, info_copyright, sizeof(priv->oc->copyright));
-+            av_dict_set(&priv->oc->metadata, "copyright", info_copyright, 0);
-         if (info_comment)
--            av_strlcpy(priv->oc->comment  , info_comment,   sizeof(priv->oc->comment  ));
-+            av_dict_set(&priv->oc->metadata, "comment",   info_comment,   0);
-
-         if(mux_avopt){
-             if(parse_avopts(priv->oc, mux_avopt) < 0){
Index: patches/patch-libvo_x11_common_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libvo_x11_common_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libvo_x11_common_c
--- patches/patch-libvo_x11_common_c 8 Nov 2010 21:25:44 -0000 1.4
+++ patches/patch-libvo_x11_common_c 14 Jan 2013 23:31:37 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-libvo_x11_common_c,v 1.4 2010/11/08 21:25:44 edd Exp $
---- libvo/x11_common.c.orig Sat Nov  6 05:50:16 2010
-+++ libvo/x11_common.c Sat Nov  6 05:50:59 2010
-@@ -735,7 +735,7 @@ void vo_x11_decoration(Display * vo_Display, Window w,
+--- 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,
  void vo_x11_classhint(Display * display, Window window, const char *name)
  {
      XClassHint wmClass;
 -    pid_t pid = getpid();
 +    long pid = getpid();
+     long prop = pid & 0x7FFFFFFF;
 
      wmClass.res_name = vo_winname ? vo_winname : name;
-     wmClass.res_class = "MPlayer";
Index: patches/patch-stream_stream_bluray_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-stream_stream_bluray_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-stream_stream_bluray_c
--- patches/patch-stream_stream_bluray_c 30 Mar 2012 13:23:03 -0000 1.1
+++ patches/patch-stream_stream_bluray_c 14 Jan 2013 23:31:37 -0000
@@ -1,46 +1,7 @@
 $OpenBSD: patch-stream_stream_bluray_c,v 1.1 2012/03/30 13:23:03 phessler Exp $
-
-Update to new libbluray API
-
---- stream/stream_bluray.c.orig Wed Mar  9 01:32:47 2011
-+++ stream/stream_bluray.c Sun Nov 13 23:59:03 2011
-@@ -116,7 +116,7 @@ static int bluray_stream_control(stream_t *s, int cmd,
-     case STREAM_CTRL_GET_NUM_CHAPTERS: {
-         BLURAY_TITLE_INFO *ti;
-
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, 0);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
-
-@@ -137,7 +137,7 @@ static int bluray_stream_control(stream_t *s, int cmd,
-         int64_t pos;
-         int r;
-
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, 0);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
-
-@@ -156,7 +156,7 @@ static int bluray_stream_control(stream_t *s, int cmd,
-     case STREAM_CTRL_GET_NUM_ANGLES: {
-         BLURAY_TITLE_INFO *ti;
-
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, 0);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
-
-@@ -175,7 +175,7 @@ static int bluray_stream_control(stream_t *s, int cmd,
-         BLURAY_TITLE_INFO *ti;
-         int angle = *((int *) arg);
-
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, 0);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
-
-@@ -222,6 +222,8 @@ static int bluray_stream_open(stream_t *s, int mode,
+--- 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,
          device = p->device;
      else if (bluray_device)
          device = bluray_device;
@@ -49,30 +10,3 @@ Update to new libbluray API
 
      if (!device) {
          mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_BlurayNoDevice);
-@@ -236,7 +238,7 @@ static int bluray_stream_open(stream_t *s, int mode,
-     }
-
-     /* check for available titles on disc */
--    title_count = bd_get_titles(bd, TITLES_RELEVANT);
-+    title_count = bd_get_titles(bd, TITLES_RELEVANT, 0);
-     mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BLURAY_TITLES=%d\n", title_count);
-     if (!title_count) {
-         mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_BlurayNoTitles);
-@@ -250,7 +252,7 @@ static int bluray_stream_open(stream_t *s, int mode,
-         BLURAY_TITLE_INFO *ti;
-         int sec, msec;
-
--        ti = bd_get_title_info(bd, i);
-+        ti = bd_get_title_info(bd, i, 0);
-         if (!ti)
-             continue;
-
-@@ -284,7 +286,7 @@ static int bluray_stream_open(stream_t *s, int mode,
-            "ID_BLURAY_CURRENT_TITLE=%d\n", title + 1);
-
-     /* Get current title information */
--    info = bd_get_title_info(bd, title);
-+    info = bd_get_title_info(bd, title, 0);
-     if (!info)
-         goto err_no_info;
-
Index: patches/patch-stream_stream_cdda_c
===================================================================
RCS file: patches/patch-stream_stream_cdda_c
diff -N patches/patch-stream_stream_cdda_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-stream_stream_cdda_c 14 Jan 2013 23:31:37 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- stream/stream_cdda.c.orig Sat May  5 02:18:19 2012
++++ stream/stream_cdda.c Sat May  5 02:18:45 2012
+@@ -439,9 +439,11 @@ static int open_cdda(stream_t *st,int m, void* opts, i
+   else if(p->search_overlap == 0)
+     mode &= ~PARANOIA_MODE_OVERLAP;
+ #ifndef CONFIG_LIBCDIO
++#if 0
+   // HACK against libcdparanoia's stupid caching model that
+   // queues up a huge number of requests leading to stuttering
+   paranoia_cachemodel_size(priv->cdp, 24);
++#endif
+   // For some incomprehensible reason cdparanoia breaks the
+   // track->sector lookup of calling paranoia_modeset with
+   // PARANOIA_MODE_DISABLE
Index: patches/patch-stream_tvi_v4l2_c
===================================================================
RCS file: patches/patch-stream_tvi_v4l2_c
diff -N patches/patch-stream_tvi_v4l2_c
--- patches/patch-stream_tvi_v4l2_c 26 May 2010 21:29:56 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-stream_tvi_v4l2_c,v 1.3 2010/05/26 21:29:56 jakemsr Exp $
---- stream/tvi_v4l2.c.orig Fri Dec 11 21:33:57 2009
-+++ stream/tvi_v4l2.c Mon Mar  8 14:28:42 2010
-@@ -49,8 +49,12 @@ known issues:
- #ifdef HAVE_SYS_SYSINFO_H
- #include <sys/sysinfo.h>
- #endif
-+#ifdef __OpenBSD__
-+#include <sys/videoio.h>
-+#else
- #include <linux/types.h>
- #include <linux/videodev2.h>
-+#endif
- #include "mp_msg.h"
- #include "libmpcodecs/img_format.h"
- #include "libmpcodecs/dec_teletext.h"

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: MPlayer

Brett Mahar-2
On 01/15/13 10:32, Brad Smith wrote:> On Mon, Jan 14, 2013 at 01:04:25AM
-0500, Brad Smith wrote:
 >> Here is an update to a newer MPlayer snapshot.
 >>
 >> Lightly tested on amd64.
 >
 > An updated diff after the last commit to the Makefile..
 >
 >
 > Index: Makefile
 > ===================================================================
 > RCS file: /cvs/ports/x11/mplayer/Makefile,v
 > retrieving revision 1.212
 > diff -u -p -r1.212 Makefile
 > --- Makefile 14 Jan 2013 17:02:15 -0000 1.212
 > +++ Makefile 14 Jan 2013 23:31:36 -0000

Hi Brad,

With the command line options "-fs -vo sdl" this updated version exits
before playing anything with:

MPlayer interrupted by signal 11 in module: decode video
- MPlayer crashed by bad usage of CPU/FPU/RAM.
   Recompile MPlayer with --enable-debug and make a 'gdb' backtrace and
   disassembly. Details in
DOCS/HTML/en/bugreports_what.html#bugreports_crash.
- MPlayer crashed. This shouldn't happen.
   It can be a bug in the MPlayer code _or_ in your drivers _or_ in your
   gcc version. If you think it's MPlayer's fault, please read
   DOCS/HTML/en/bugreports.html and follow the instructions there. We
can't and
   won't help unless you provide this information when reporting a
possible bug.
$  Parent process disappeared, exiting cache process.


Maybe "-fs" is a depricated option (even though its still in the man
page), cause it goes into fullscreen mode now, without specifying that
option (from memory it didn't do that before).

Apart from that, everything is working well with this update on
amd64-current built yesterday. I tested it with avi, mp4, mkv and flv
video files, and flac and mp3 audio files.

Brett.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: MPlayer

Brad Smith-14
On Wed, Jan 16, 2013 at 07:20:42PM +1100, Brett Mahar wrote:
> Maybe "-fs" is a depricated option (even though its still in the man
> page), cause it goes into fullscreen mode now, without specifying
> that option (from memory it didn't do that before).
>
> Apart from that, everything is working well with this update on
> amd64-current built yesterday. I tested it with avi, mp4, mkv and
> flv video files, and flac and mp3 audio files.
>
> Brett.

For me MPlayer prints..

[VO_SDL] Info - please use -vm or -zoom to switch to the best resolution.

The man page says that not all video output drivers support -fs.
If I use the SDL output or the XVid output I don't get full screen
by default.

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: MPlayer

Brett Mahar-2
On 01/16/13 19:36, Brad Smith wrote:

> On Wed, Jan 16, 2013 at 07:20:42PM +1100, Brett Mahar wrote:
>> Maybe "-fs" is a depricated option (even though its still in the man
>> page), cause it goes into fullscreen mode now, without specifying
>> that option (from memory it didn't do that before).
>>
>> Apart from that, everything is working well with this update on
>> amd64-current built yesterday. I tested it with avi, mp4, mkv and
>> flv video files, and flac and mp3 audio files.
>>
>> Brett.
>
> For me MPlayer prints..
>
> [VO_SDL] Info - please use -vm or -zoom to switch to the best resolution.
>
> The man page says that not all video output drivers support -fs.
> If I use the SDL output or the XVid output I don't get full screen
> by default.
>

Not that its a big deal, but I was just reporting that it used to take
this argument before no problem, now it won't run with this argument
supplied.

Maybe it depends on the video card used or something, but it does go to
fullscreen automatically for me now (with a Radeon HD5450), whereas my
(slightly unreliable) memory tells me it didn't before.

Anyway that is the only difference I noticed from the old ports version.

It has always said "[VO_SDL] Info - please use -vm or -zoom to switch to
the best resolution" but when tried in the past neither vm or zoom did
anything noticable to the picture or changed the output resolution for me.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: MPlayer

Brad Smith-14
On Wed, Jan 16, 2013 at 11:10:06PM +1100, Brett Mahar wrote:

> On 01/16/13 19:36, Brad Smith wrote:
> >On Wed, Jan 16, 2013 at 07:20:42PM +1100, Brett Mahar wrote:
> >>Maybe "-fs" is a depricated option (even though its still in the man
> >>page), cause it goes into fullscreen mode now, without specifying
> >>that option (from memory it didn't do that before).
> >>
> >>Apart from that, everything is working well with this update on
> >>amd64-current built yesterday. I tested it with avi, mp4, mkv and
> >>flv video files, and flac and mp3 audio files.
> >>
> >>Brett.
> >
> >For me MPlayer prints..
> >
> >[VO_SDL] Info - please use -vm or -zoom to switch to the best resolution.
> >
> >The man page says that not all video output drivers support -fs.
> >If I use the SDL output or the XVid output I don't get full screen
> >by default.
> >
>
> Not that its a big deal, but I was just reporting that it used to
> take this argument before no problem, now it won't run with this
> argument supplied.

OK, looking at the output it looks like this is a bug. I personally
don't use MPlayer as it is notoriously buggy.

> Maybe it depends on the video card used or something, but it does go
> to fullscreen automatically for me now (with a Radeon HD5450),
> whereas my (slightly unreliable) memory tells me it didn't before.

Strange. I have never seen that before with MPlayer.

> Anyway that is the only difference I noticed from the old ports version.
>
> It has always said "[VO_SDL] Info - please use -vm or -zoom to
> switch to the best resolution" but when tried in the past neither vm
> or zoom did anything noticable to the picture or changed the output
> resolution for me.

Oh, ok. I usually don't use the SDL output as I have no requirement
for it.

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: MPlayer

Brad Smith-14
In reply to this post by Brett Mahar-2
On Wed, Jan 16, 2013 at 11:10:06PM +1100, Brett Mahar wrote:

> On 01/16/13 19:36, Brad Smith wrote:
> >On Wed, Jan 16, 2013 at 07:20:42PM +1100, Brett Mahar wrote:
> >>Maybe "-fs" is a depricated option (even though its still in the man
> >>page), cause it goes into fullscreen mode now, without specifying
> >>that option (from memory it didn't do that before).
> >>
> >>Apart from that, everything is working well with this update on
> >>amd64-current built yesterday. I tested it with avi, mp4, mkv and
> >>flv video files, and flac and mp3 audio files.
> >>
> >>Brett.
> >
> >For me MPlayer prints..
> >
> >[VO_SDL] Info - please use -vm or -zoom to switch to the best resolution.
> >
> >The man page says that not all video output drivers support -fs.
> >If I use the SDL output or the XVid output I don't get full screen
> >by default.
> >
>
> Not that its a big deal, but I was just reporting that it used to
> take this argument before no problem, now it won't run with this
> argument supplied.

Looking at their SVN repo this has been fixed since the snapshot
I have when I started with this update.

Anyway, I have decided to focus on trying to get a bug that has
affected building FFmpeg/Libav/MPlayer on amd64 fixed in base first
and then I'm going to come back to MPlayer and probably roll it
to a much newer snapshot.

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: MPlayer

Brett Mahar-2
In reply to this post by Brad Smith-14

>
> OK, looking at the output it looks like this is a bug. I personally
> don't use MPlayer as it is notoriously buggy.
>

What do you use/suggest instead - vlc?

>
> Oh, ok. I usually don't use the SDL output as I have no requirement
> for it.
>

For me, -vo sdl is the only output that gives decent performance. The
Radeon HD5450 doesn't support xv on openbsd, and x11 plays at about 5
frames per second. sdl is smooth but suffers from some screen tearing
when there is lots of movement on the screen.