Update to 20100913, provided by Aleksey Cheusov via wip.

One year of changes.
Ok ahoka@

15 files changed, 132 insertions, 220 deletions

diff --git a/multimedia/mplayer-share/Makefile b/multimedia/mplayer-share/Makefile
index 3b42b86e92c..571e09b7ac4 100644
--- a/multimedia/mplayer-share/Makefile
+++ b/multimedia/mplayer-share/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/10/18 22:22:10 ahoka Exp $
-
-#PKGREVISION=		0
+# $NetBSD: Makefile,v 1.19 2010/09/16 18:56:11 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 595ea6b16f3..b35a8fb480b 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.common,v 1.46 2010/09/05 23:01:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.47 2010/09/16 18:56:11 wiz Exp $
 # used by multimedia/gmplayer/Makefile
 # used by multimedia/mencoder/Makefile
 # used by multimedia/mplayer/Makefile
 
-MPLAYER_SNAPSHOT_DATE=	2009-10-17
+MPLAYER_SNAPSHOT_DATE=	2010-09-13
 MPLAYER_VERSION=	1.0rc${MPLAYER_SNAPSHOT_DATE:S/-//g}
 
 DISTNAME=		mplayer-${MPLAYER_SNAPSHOT_DATE:S/-//g}
+
 CATEGORIES?=		multimedia
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=commondistfiles/}
-MASTER_SITES+=		http://mx1.nygren.pp.se/misc/
 
 EXTRACT_SUFX=		.tar.bz2
 DIST_SUBDIR=		mplayer
diff --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends
index f479a164497..3aaccc8f10b 100644
--- a/multimedia/mplayer-share/Makefile.depends
+++ b/multimedia/mplayer-share/Makefile.depends
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile.depends,v 1.18 2007/08/15 13:23:27 rillig Exp $
+# $NetBSD: Makefile.depends,v 1.19 2010/09/16 18:56:12 wiz Exp $
 #
 
-DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share
-
-GCC_REQD+=	2.95.3
+DEPENDS+=	mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST
index 87bd7563d46..f7afab1cc61 100644
--- a/multimedia/mplayer-share/PLIST
+++ b/multimedia/mplayer-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/10/18 22:22:10 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/09/16 18:56:12 wiz Exp $
 man/man1/mplayer.1
 share/mplayer/DOCS/README
 share/mplayer/DOCS/default.css
@@ -37,9 +37,6 @@ share/mplayer/DOCS/tech/mirrors/mirror_howto.txt
 share/mplayer/DOCS/tech/mirrors/update_mplayer_rsync
 share/mplayer/DOCS/tech/mpdsf.txt
 share/mplayer/DOCS/tech/mpsub.sub
-share/mplayer/DOCS/tech/new_policy_proposal.txt
-share/mplayer/DOCS/tech/nut.txt
-share/mplayer/DOCS/tech/oggless-xiph-codecs.txt
 share/mplayer/DOCS/tech/osd.txt
 share/mplayer/DOCS/tech/patches.txt
 share/mplayer/DOCS/tech/playtree
@@ -58,148 +55,115 @@ share/mplayer/DOCS/tech/translations.txt
 share/mplayer/DOCS/tech/vidix.txt
 share/mplayer/DOCS/tech/win32-codec-howto.txt
 share/mplayer/DOCS/tech/wishlist
-share/mplayer/DOCS/xml/Makefile
-share/mplayer/DOCS/xml/Makefile.inc
 share/mplayer/DOCS/xml/README
-share/mplayer/DOCS/xml/README.maintainers
+share/mplayer/DOCS/xml/Makefile
 share/mplayer/DOCS/xml/configure
-share/mplayer/DOCS/xml/cs/Makefile
 share/mplayer/DOCS/xml/cs/bugreports.xml
-share/mplayer/DOCS/xml/cs/cd-dvd.xml
 share/mplayer/DOCS/xml/cs/documentation.xml
 share/mplayer/DOCS/xml/cs/encoding-guide.xml
 share/mplayer/DOCS/xml/cs/faq.xml
 share/mplayer/DOCS/xml/cs/install.xml
 share/mplayer/DOCS/xml/cs/mencoder.xml
 share/mplayer/DOCS/xml/cs/ports.xml
-share/mplayer/DOCS/xml/cs/radio.xml
 share/mplayer/DOCS/xml/cs/skin.xml
-share/mplayer/DOCS/xml/cs/tvinput.xml
 share/mplayer/DOCS/xml/cs/usage.xml
 share/mplayer/DOCS/xml/cs/video.xml
-share/mplayer/DOCS/xml/de/Makefile
 share/mplayer/DOCS/xml/de/bugreports.xml
-share/mplayer/DOCS/xml/de/cd-dvd.xml
 share/mplayer/DOCS/xml/de/documentation.xml
 share/mplayer/DOCS/xml/de/encoding-guide.xml
 share/mplayer/DOCS/xml/de/faq.xml
 share/mplayer/DOCS/xml/de/install.xml
 share/mplayer/DOCS/xml/de/mencoder.xml
 share/mplayer/DOCS/xml/de/ports.xml
-share/mplayer/DOCS/xml/de/radio.xml
 share/mplayer/DOCS/xml/de/skin.xml
-share/mplayer/DOCS/xml/de/tvinput.xml
 share/mplayer/DOCS/xml/de/usage.xml
 share/mplayer/DOCS/xml/de/video.xml
 share/mplayer/DOCS/xml/default.css
-share/mplayer/DOCS/xml/en/Makefile
 share/mplayer/DOCS/xml/en/bugreports.xml
-share/mplayer/DOCS/xml/en/cd-dvd.xml
 share/mplayer/DOCS/xml/en/documentation.xml
 share/mplayer/DOCS/xml/en/encoding-guide.xml
 share/mplayer/DOCS/xml/en/faq.xml
 share/mplayer/DOCS/xml/en/install.xml
 share/mplayer/DOCS/xml/en/mencoder.xml
 share/mplayer/DOCS/xml/en/ports.xml
-share/mplayer/DOCS/xml/en/radio.xml
 share/mplayer/DOCS/xml/en/skin.xml
-share/mplayer/DOCS/xml/en/tvinput.xml
 share/mplayer/DOCS/xml/en/usage.xml
 share/mplayer/DOCS/xml/en/video.xml
-share/mplayer/DOCS/xml/es/Makefile
 share/mplayer/DOCS/xml/es/bugreports.xml
-share/mplayer/DOCS/xml/es/cd-dvd.xml
 share/mplayer/DOCS/xml/es/documentation.xml
+share/mplayer/DOCS/xml/es/encoding-guide.xml
 share/mplayer/DOCS/xml/es/faq.xml
 share/mplayer/DOCS/xml/es/install.xml
 share/mplayer/DOCS/xml/es/mencoder.xml
 share/mplayer/DOCS/xml/es/ports.xml
 share/mplayer/DOCS/xml/es/skin.xml
-share/mplayer/DOCS/xml/es/tvinput.xml
 share/mplayer/DOCS/xml/es/usage.xml
 share/mplayer/DOCS/xml/es/video.xml
-share/mplayer/DOCS/xml/fr/Makefile
 share/mplayer/DOCS/xml/fr/bugreports.xml
-share/mplayer/DOCS/xml/fr/cd-dvd.xml
 share/mplayer/DOCS/xml/fr/documentation.xml
 share/mplayer/DOCS/xml/fr/encoding-guide.xml
 share/mplayer/DOCS/xml/fr/faq.xml
 share/mplayer/DOCS/xml/fr/install.xml
 share/mplayer/DOCS/xml/fr/mencoder.xml
 share/mplayer/DOCS/xml/fr/ports.xml
-share/mplayer/DOCS/xml/fr/radio.xml
 share/mplayer/DOCS/xml/fr/skin.xml
-share/mplayer/DOCS/xml/fr/tvinput.xml
 share/mplayer/DOCS/xml/fr/usage.xml
 share/mplayer/DOCS/xml/fr/video.xml
 share/mplayer/DOCS/xml/html-common.xsl
-share/mplayer/DOCS/xml/hu/Makefile
 share/mplayer/DOCS/xml/hu/bugreports.xml
-share/mplayer/DOCS/xml/hu/cd-dvd.xml
 share/mplayer/DOCS/xml/hu/documentation.xml
 share/mplayer/DOCS/xml/hu/encoding-guide.xml
 share/mplayer/DOCS/xml/hu/faq.xml
 share/mplayer/DOCS/xml/hu/install.xml
 share/mplayer/DOCS/xml/hu/mencoder.xml
 share/mplayer/DOCS/xml/hu/ports.xml
-share/mplayer/DOCS/xml/hu/radio.xml
 share/mplayer/DOCS/xml/hu/skin.xml
-share/mplayer/DOCS/xml/hu/tvinput.xml
 share/mplayer/DOCS/xml/hu/usage.xml
 share/mplayer/DOCS/xml/hu/video.xml
-share/mplayer/DOCS/xml/it/Makefile
 share/mplayer/DOCS/xml/it/bugreports.xml
-share/mplayer/DOCS/xml/it/cd-dvd.xml
 share/mplayer/DOCS/xml/it/documentation.xml
 share/mplayer/DOCS/xml/it/encoding-guide.xml
 share/mplayer/DOCS/xml/it/faq.xml
 share/mplayer/DOCS/xml/it/install.xml
 share/mplayer/DOCS/xml/it/mencoder.xml
-share/mplayer/DOCS/xml/it/radio.xml
-share/mplayer/DOCS/xml/it/tvinput.xml
+share/mplayer/DOCS/xml/it/ports.xml
+share/mplayer/DOCS/xml/it/skin.xml
 share/mplayer/DOCS/xml/it/usage.xml
 share/mplayer/DOCS/xml/it/video.xml
 share/mplayer/DOCS/xml/ldp.dsl
-share/mplayer/DOCS/xml/pl/Makefile
 share/mplayer/DOCS/xml/pl/bugreports.xml
-share/mplayer/DOCS/xml/pl/cd-dvd.xml
 share/mplayer/DOCS/xml/pl/documentation.xml
 share/mplayer/DOCS/xml/pl/encoding-guide.xml
 share/mplayer/DOCS/xml/pl/faq.xml
-share/mplayer/DOCS/xml/pl/html-chunk.xsl
-share/mplayer/DOCS/xml/pl/html-common.xsl
-share/mplayer/DOCS/xml/pl/html-single.xsl
 share/mplayer/DOCS/xml/pl/install.xml
 share/mplayer/DOCS/xml/pl/mencoder.xml
 share/mplayer/DOCS/xml/pl/ports.xml
-share/mplayer/DOCS/xml/pl/radio.xml
 share/mplayer/DOCS/xml/pl/skin.xml
-share/mplayer/DOCS/xml/pl/tvinput.xml
 share/mplayer/DOCS/xml/pl/usage.xml
 share/mplayer/DOCS/xml/pl/video.xml
-share/mplayer/DOCS/xml/ru/Makefile
 share/mplayer/DOCS/xml/ru/bugreports.xml
-share/mplayer/DOCS/xml/ru/cd-dvd.xml
 share/mplayer/DOCS/xml/ru/documentation.xml
 share/mplayer/DOCS/xml/ru/encoding-guide.xml
 share/mplayer/DOCS/xml/ru/faq.xml
 share/mplayer/DOCS/xml/ru/install.xml
 share/mplayer/DOCS/xml/ru/mencoder.xml
 share/mplayer/DOCS/xml/ru/ports.xml
-share/mplayer/DOCS/xml/ru/radio.xml
 share/mplayer/DOCS/xml/ru/skin.xml
-share/mplayer/DOCS/xml/ru/tvinput.xml
 share/mplayer/DOCS/xml/ru/usage.xml
 share/mplayer/DOCS/xml/ru/video.xml
 share/mplayer/DOCS/xml/xsl/ldp-html-chunk.xsl
 share/mplayer/DOCS/xml/xsl/ldp-html-common.xsl
 share/mplayer/DOCS/xml/xsl/ldp-html.xsl
 share/mplayer/DOCS/xml/xsl/ldp-print.xsl
-share/mplayer/DOCS/xml/zh_CN/Makefile
+share/mplayer/DOCS/xml/zh_CN/encoding-guide.xml
 share/mplayer/DOCS/xml/zh_CN/bugreports.xml
-share/mplayer/DOCS/xml/zh_CN/cd-dvd.xml
 share/mplayer/DOCS/xml/zh_CN/documentation.xml
+share/mplayer/DOCS/xml/zh_CN/faq.xml
+share/mplayer/DOCS/xml/zh_CN/install.xml
 share/mplayer/DOCS/xml/zh_CN/mencoder.xml
-share/mplayer/DOCS/xml/zh_CN/radio.xml
+share/mplayer/DOCS/xml/zh_CN/ports.xml
+share/mplayer/DOCS/xml/zh_CN/skin.xml
+share/mplayer/DOCS/xml/zh_CN/usage.xml
+share/mplayer/DOCS/xml/zh_CN/video.xml
 share/mplayer/codecs.conf
 share/mplayer/input.conf
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 3672007caf6..8ba0f6056c6 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,18 +1,14 @@
-$NetBSD: distinfo,v 1.66 2010/09/05 23:00:55 wiz Exp $
+$NetBSD: distinfo,v 1.67 2010/09/16 18:56:12 wiz Exp $
 
-SHA1 (mplayer/mplayer-20091017.tar.bz2) = 8ee97842812b9867f192f521b96bb1b6e1742a23
-RMD160 (mplayer/mplayer-20091017.tar.bz2) = 015d3847b05f4d674d4740e55f117ce6085d5cc3
-Size (mplayer/mplayer-20091017.tar.bz2) = 8525942 bytes
-SHA1 (patch-aa) = 24007024e4b6bfa212817681e8d07cc079aee13b
-SHA1 (patch-ab) = 821711bc431a4ad6e73b9e4acc6a3311395e1894
-SHA1 (patch-ac) = 13ea17bcdde5ebc7e04eeb5eb833dca0cd623ba2
-SHA1 (patch-ad) = 0a43a47538f0f18f8b6aa230367821b8bb51e932
-SHA1 (patch-ae) = 5a1f1d9f6480fb67a2a12d9088990ed546e1b1e4
-SHA1 (patch-af) = c34a82b77721db7331b189cf3fe32799aea8e1e6
+SHA1 (mplayer/mplayer-20100913.tar.bz2) = 6fd3acb29fa8455636bcd86f9f333da4763daa6d
+RMD160 (mplayer/mplayer-20100913.tar.bz2) = 79085d4ebdb824fc34f7bc128070ef11e874897d
+Size (mplayer/mplayer-20100913.tar.bz2) = 9073690 bytes
+SHA1 (patch-aa) = 8ee4f3d12500bcff8d06b1a3300bb821e4ffd8ba
+SHA1 (patch-ac) = 3d037c96537233cdbda582afdb878dcf3f43e923
+SHA1 (patch-ae) = 7e1f05cd6e09f8755debfff7061dadf0a8ca3a3f
 SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2
-SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
+SHA1 (patch-ah) = 8cbd14c61e74023055770baf27201687aa34fede
 SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae
-SHA1 (patch-ao) = 8588d0215e973045b7f1abd7fbc9813409876b99
 SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a
-SHA1 (patch-vb) = d836d96c849de866cb4177b20eb1c6dec4b7a0ba
+SHA1 (patch-vb) = ce584c31e0e32865e87aa1f537a1f9e4817c7442
 SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index d68f4938a86..58be40b2d66 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.40 2010/09/01 20:55:56 wiz Exp $
+# $NetBSD: options.mk,v 1.41 2010/09/16 18:56:12 wiz Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -15,7 +15,8 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 
 # Options supported by both mplayer* or mencoder*.
 
-PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv dvdread png theora vorbis x264 debug
+PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv png theora vorbis x264 debug
+PKG_SUPPORTED_OPTIONS+= dvdread dvdnav
 .if ${OSS_TYPE} != "none"
 PKG_SUPPORTED_OPTIONS+=	oss
 .endif
@@ -78,7 +79,8 @@ PKG_SUPPORTED_OPTIONS+= xvid
 # Define PKG_SUGGESTED_OPTIONS.
 # -------------------------------------------------------------------------
 
-.for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
+.for _o_ in aalib arts cdparanoia dv esound gif jpeg \
+	    dvdread dvdnav \
 	    lame mad mplayer-menu mplayer-real \
 	    mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
 	    nas oss pulseaudio png sdl theora vorbis x264 xvid vdpau
@@ -116,6 +118,7 @@ CONFIGURE_ARGS+=	--disable-arts
 .if !empty(PKG_OPTIONS:Mcdparanoia)
 CONFIGURE_ARGS+=	--enable-cdparanoia
 .  include "../../audio/cdparanoia/buildlink3.mk"
+CFLAGS+=		-I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
 .else
 CONFIGURE_ARGS+=	--disable-cdparanoia
 .endif
@@ -141,13 +144,24 @@ CONFIGURE_ARGS+=	--enable-libdv
 CONFIGURE_ARGS+=	--disable-libdv
 .endif
 
+CONFIGURE_ARGS+=	--disable-dvdread-internal
 .if !empty(PKG_OPTIONS:Mdvdread)
 CONFIGURE_ARGS+=	--enable-dvdread
+CONFIGURE_ARGS+=	--with-dvdread-config=${BUILDLINK_PREFIX.libdvdread}/bin/dvdread-config
 .  include "../../multimedia/libdvdread/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-dvdread
 .endif
 
+.if !empty(PKG_OPTIONS:Mdvdnav)
+CONFIGURE_ARGS+=	--enable-dvdnav
+CONFIGURE_ARGS+=	--with-dvdnav-config=${BUILDLINK_PREFIX.libdvdnav}/bin/dvdnav-config
+.  include "../../multimedia/libdvdnav/buildlink3.mk"
+#CFLAGS+=		-I${BUILDLINK_PREFIX.libdvdnav}/include/dvdnav
+.else
+CONFIGURE_ARGS+=	--disable-dvdnav
+.endif
+
 .if !empty(PKG_OPTIONS:Mesound)
 CONFIGURE_ARGS+=	--enable-esd
 .  include "../../audio/esound/buildlink3.mk"
@@ -221,7 +235,7 @@ CONFIGURE_ARGS+=	--disable-menu
 EVAL_PREFIX+=		PREFIX.realplayer-codecs=realplayer-codecs
 PREFIX.realplayer-codecs_DEFAULT=	${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-real
-CONFIGURE_ARGS+=	--realcodecsdir="${PREFIX.realplayer-codecs}/lib/RealPlayer8-Codecs"
+#CONFIGURE_ARGS+=	--realcodecsdir="${PREFIX.realplayer-codecs}/lib/RealPlayer8-Codecs"
 DEPENDS+=		realplayer-codecs>=8nb2:../../multimedia/realplayer-codecs
 .else
 CONFIGURE_ARGS+=	--disable-real
@@ -237,7 +251,7 @@ CONFIGURE_ARGS+=	--disable-runtime-cpudetection
 EVAL_PREFIX+=		PREFIX.win32-codecs=win32-codecs
 PREFIX.win32-codecs_DEFAULT=	${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-win32dll
-CONFIGURE_ARGS+=	--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
+#CONFIGURE_ARGS+=	--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
 DEPENDS+=		win32-codecs>=011227:../../multimedia/win32-codecs
 .else
 CONFIGURE_ARGS+=	--disable-win32dll
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index a135b1642dc..27e6eb37aa5 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.24 2009/10/18 22:22:10 ahoka Exp $
+$NetBSD: patch-aa,v 1.25 2010/09/16 18:56:12 wiz Exp $
 
---- configure.orig	2009-10-06 08:43:00.000000000 +0200
+--- configure.orig	2010-09-04 09:39:21.000000000 +0000
 +++ configure
-@@ -1388,6 +1388,9 @@ if test -z "$_target" ; then
+@@ -1471,6 +1471,9 @@ if test -z "$_target" ; then
     powerpc) # Darwin returns 'powerpc'
       host_arch=ppc
       ;;
@@ -12,16 +12,16 @@ $NetBSD: patch-aa,v 1.24 2009/10/18 22:22:10 ahoka Exp $
     *) # uname -p on Linux returns 'unknown' for the processor type,
        # OpenBSD returns 'Intel Pentium/MMX ("Genuine Intel" 586-class)'
  
-@@ -1569,7 +1572,7 @@ else
-     cc_name=$cc_name_tmp
-     echocheck "$_cc version"
-     cc_vendor=gnu
--    cc_version=$($_cc -dumpversion 2>&1)
-+    cc_version=$( ( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1 )
-     case $cc_version in
-       2.96*)
-         cc_fail=yes
-@@ -1652,7 +1655,7 @@ if x86 ; then
+@@ -1645,7 +1648,7 @@ else
+       cc_name=$cc_name_tmp
+       echocheck "$_cc version"
+       cc_vendor=gnu
+-      cc_version=$($_cc -dumpversion 2>&1)
++      cc_version=$( ( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1 )
+       case $cc_version in
+         2.96*)
+           cc_fail=yes
+@@ -1763,7 +1766,7 @@ if x86 ; then
    # gather more CPU information
    pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1)
    pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -n 1)
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.24 2009/10/18 22:22:10 ahoka Exp $
    pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
    pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
  
-@@ -3433,7 +3436,6 @@ test "$_w32threads" = yes && def_threads
+@@ -3710,7 +3713,6 @@ test "$_w32threads" = yes && def_threads
  echores "$_w32threads"
  
  echocheck "rpath"
@@ -38,8 +38,16 @@ $NetBSD: patch-aa,v 1.24 2009/10/18 22:22:10 ahoka Exp $
  if test "$_rpath" = yes ; then
    for I in $(echo $extra_ldflags | sed 's/-L//g') ; do
      tmp="$tmp $(echo $I | sed 's/.*/ -L& -Wl,-R&/')"
-@@ -4205,7 +4207,11 @@ EOF
-            -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 \
+@@ -3975,7 +3977,6 @@ echores "$_vsscanf"
+ 
+ echocheck "swab()"
+ cat > $TMPC << EOF
+-#define _XOPEN_SOURCE 600
+ #include <unistd.h>
+ int main(void) { swab(0, 0, 0); return 0; }
+ EOF
+@@ -4456,7 +4457,11 @@ EOF
+            -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
             -L/usr/lib ; do
      if netbsd; then
 -      _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
@@ -51,40 +59,26 @@ $NetBSD: patch-aa,v 1.24 2009/10/18 22:22:10 ahoka Exp $
      else
        _ld_tmp="$I -lXext -lX11 $_ld_pthread"
      fi
-@@ -4656,7 +4662,7 @@ fi
- 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)"
-+    libs_mplayer="$libs_mplayer $(${AALIB_CONFIG} --libs | cut -d " " -f 2,5,6)"
-   fi
-   _vomodules="aa $_vomodules"
- else
-@@ -7221,9 +7227,6 @@ if test "$_x264" = auto ; then
+@@ -5591,8 +5596,13 @@ if test "$_ivtv" = auto ; then
    cat > $TMPC << EOF
- #include <inttypes.h>
- #include <x264.h>
--#if X264_BUILD < 76
--#error We do not support old versions of x264. Get the latest from git.
--#endif
- int main(void) { x264_encoder_open((void*)0); return 0; }
- EOF
-   _x264=no
-@@ -7593,11 +7596,16 @@ echores "$_tv_v4l1"
- echocheck "Video 4 Linux 2 TV interface"
- if test "$_tv_v4l2" = auto ; then
-   _tv_v4l2=no
--  if test "$_tv" = yes && linux ; then
-+  if test "$_tv" = yes && (linux || netbsd || openbsd) ; then
-     cat > $TMPC <<EOF
  #include <stdlib.h>
-+#ifdef __linux__
+ #include <inttypes.h>
+++#ifdef __linux__
  #include <linux/types.h>
  #include <linux/videodev2.h>
 +#elif defined(__NetBSD__) || defined(__OpenBSD__)
 +#include <sys/types.h>
 +#include <sys/videoio.h>
 +#endif
- int main(void) { return 0; }
- EOF
-     cc_check && _tv_v4l2=yes
+ #include <linux/ivtv.h>
+ #include <sys/ioctl.h>
+ int main(void) {
+@@ -8052,7 +8062,7 @@ echores "$_tv_v4l1"
+ echocheck "Video 4 Linux 2 TV interface"
+ if test "$_tv_v4l2" = auto ; then
+   _tv_v4l2=no
+-  if test "$_tv" = yes && linux ; then
++  if test "$_tv" = yes && (linux || netbsd || openbsd) ; then
+     header_check linux/videodev2.h && _tv_v4l2=yes
+   fi
+ fi
diff --git a/multimedia/mplayer-share/patches/patch-ab b/multimedia/mplayer-share/patches/patch-ab
deleted file mode 100644
index 3935364a4b5..00000000000
--- a/multimedia/mplayer-share/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2009/11/07 18:43:37 hasso Exp $
-
---- libdvdread4/bswap.h.orig
-+++ libdvdread4/bswap.h
-@@ -61,7 +61,7 @@
- #define B2N_32(x) x = swap32(x)
- #define B2N_64(x) x = swap64(x)
- 
--#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#elif (defined(__FreeBSD__) && __FreeBSD_version >= 470000) || defined(__DragonFly__)
- #include <sys/endian.h>
- #define B2N_16(x) x = be16toh(x)
- #define B2N_32(x) x = be32toh(x)
diff --git a/multimedia/mplayer-share/patches/patch-ac b/multimedia/mplayer-share/patches/patch-ac
index 8c9015e2b3b..c2378a22bbf 100644
--- a/multimedia/mplayer-share/patches/patch-ac
+++ b/multimedia/mplayer-share/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.6 2009/10/18 22:22:10 ahoka Exp $
+$NetBSD: patch-ac,v 1.7 2010/09/16 18:56:12 wiz Exp $
 
---- libfaad2/common.h.orig	2009-07-26 21:53:00.000000000 +0200
+--- libfaad2/common.h.orig	2009-07-26 19:53:00.000000000 +0000
 +++ libfaad2/common.h
 @@ -320,7 +320,7 @@ char *strchr(), *strrchr();
    #elif (defined(__i386__) && defined(__GNUC__)) && !HAVE_LRINTF
diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
deleted file mode 100644
index a61d25de1dc..00000000000
--- a/multimedia/mplayer-share/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2009/10/18 22:22:10 ahoka Exp $
-
---- stream/cdd.h.orig	2009-05-13 04:58:57.000000000 +0200
-+++ stream/cdd.h
-@@ -3,8 +3,8 @@
- 
- #include "config.h"
- #ifndef CONFIG_LIBCDIO
--#include <cdda_interface.h>
--#include <cdda_paranoia.h>
-+#include <cdparanoia/cdda_interface.h>
-+#include <cdparanoia/cdda_paranoia.h>
- #else
- #include <cdio/cdda.h>
- #include <cdio/paranoia.h>
diff --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae
index 8e72bc771f1..453d824d0f6 100644
--- a/multimedia/mplayer-share/patches/patch-ae
+++ b/multimedia/mplayer-share/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.10 2009/10/19 00:13:07 ahoka Exp $
+$NetBSD: patch-ae,v 1.11 2010/09/16 18:56:12 wiz Exp $
 
---- libvo/aclib.c.orig	2009-04-08 22:21:21.000000000 +0200
+--- libvo/aclib.c.orig	2010-01-03 09:20:01.000000000 +0000
 +++ libvo/aclib.c
-@@ -28,6 +28,11 @@
- #include "fastmemcpy.h"
+@@ -30,6 +30,11 @@
+ #include "libavutil/x86_cpu.h"
  #undef memcpy
  
 +#if ARCH_X86 && defined(__APPLE__)
diff --git a/multimedia/mplayer-share/patches/patch-af b/multimedia/mplayer-share/patches/patch-af
deleted file mode 100644
index f7f0503864f..00000000000
--- a/multimedia/mplayer-share/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.6 2010/09/05 23:00:55 wiz Exp $
-
-Fix build on Solaris, see http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1787
-
---- libswscale/mlib/yuv2rgb_mlib.c.orig	2009-08-16 21:11:28.000000000 +0000
-+++ libswscale/mlib/yuv2rgb_mlib.c
-@@ -29,6 +29,7 @@
- #include <assert.h>
- 
- #include "libswscale/swscale.h"
-+#include "libswscale/swscale_internal.h"
- 
- static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-                                int srcSliceH, uint8_t* dst[], int dstStride[])
diff --git a/multimedia/mplayer-share/patches/patch-ah b/multimedia/mplayer-share/patches/patch-ah
index 4799dca43da..42fadef939c 100644
--- a/multimedia/mplayer-share/patches/patch-ah
+++ b/multimedia/mplayer-share/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2006/10/31 22:33:28 wiz Exp $
+$NetBSD: patch-ah,v 1.4 2010/09/16 18:56:12 wiz Exp $
 
---- subreader.c.orig	2006-10-22 22:32:31.000000000 +0000
+--- subreader.c.orig	2010-08-29 11:27:00.000000000 +0000
 +++ subreader.c
-@@ -74,10 +74,10 @@ static int eol(char p) {
+@@ -94,10 +94,10 @@ static int eol(char p) {
  /* Remove leading and trailing space */
  static void trail_space(char *s) {
  	int i = 0;
@@ -15,16 +15,16 @@ $NetBSD: patch-ah,v 1.3 2006/10/31 22:33:28 wiz Exp $
  }
  
  static char *stristr(const char *haystack, const char *needle) {
-@@ -628,7 +628,7 @@ static subtitle *sub_read_line_pjs(strea
-     if (!stream_read_line (st, line, LINE_LEN))
+@@ -725,7 +725,7 @@ static subtitle *sub_read_line_pjs(strea
+     if (!stream_read_line (st, line, LINE_LEN, utf16))
  	return NULL;
      /* skip spaces */
 -    for (s=line; *s && isspace(*s); s++);
-+    for (s=line; *s && isspace(*(unsigned char*)s); s++);
++    for (s=line; *s && isspace((unsigned char)*s); s++);
      /* allow empty lines at the end of the file */
      if (*s==0)
  	return NULL;
-@@ -681,7 +681,7 @@ static subtitle *sub_read_line_mpsub(str
+@@ -778,7 +778,7 @@ static subtitle *sub_read_line_mpsub(str
  			else return current;
  		}
  		p=line;
@@ -33,3 +33,34 @@ $NetBSD: patch-ah,v 1.3 2006/10/31 22:33:28 wiz Exp $
  		if (eol(*p) && num > 0) return current;
  		if (eol(*p)) return NULL;
  
+@@ -1824,18 +1824,18 @@ char * strreplace( char * in,char * what
+ static void strcpy_trim(char *d, char *s)
+ {
+     // skip leading whitespace
+-    while (*s && isspace(*s)) {
++    while (*s && isspace((unsigned char)*s)) {
+ 	s++;
+     }
+     for (;;) {
+ 	// copy word
+-	while (*s && !isspace(*s)) {
++	while (*s && !isspace((unsigned char)*s)) {
+ 	    *d = tolower(*s);
+ 	    s++; d++;
+ 	}
+ 	if (*s == 0) break;
+ 	// trim excess whitespace
+-	while (*s && isspace(*s)) {
++	while (*s && isspace((unsigned char)*s)) {
+ 	    s++;
+ 	}
+ 	if (*s == 0) break;
+@@ -1874,7 +1874,7 @@ static void strcpy_get_ext(char *d, char
+ static int whiteonly(char *s)
+ {
+     while (*s) {
+-	if (!isspace(*s)) return 0;
++	if (!isspace((unsigned char)*s)) return 0;
+ 	s++;
+   }
+     return 1;
diff --git a/multimedia/mplayer-share/patches/patch-ao b/multimedia/mplayer-share/patches/patch-ao
deleted file mode 100644
index 51006414ff2..00000000000
--- a/multimedia/mplayer-share/patches/patch-ao
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2009/10/18 22:22:10 ahoka Exp $
-
-NOTE:	When updating this, make sure it harmonizes with
-	multimedia/ffmpeg/patches/patch-oldx264.
-
---- libavcodec/libx264.c.orig	2009-09-29 20:03:30.000000000 +0200
-+++ libavcodec/libx264.c
-@@ -179,7 +179,11 @@ static av_cold int X264_init(AVCodecCont
- 
-     x4->params.i_bframe          = avctx->max_b_frames;
-     x4->params.b_cabac           = avctx->coder_type == FF_CODER_TYPE_AC;
-+#if X264_BUILD > 62
-     x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
-+#else
-+    x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
-+#endif
-     x4->params.i_bframe_bias     = avctx->bframebias;
-     x4->params.b_bframe_pyramid  = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
-     avctx->has_b_frames          = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
-@@ -244,6 +248,10 @@ static av_cold int X264_init(AVCodecCont
-     x4->params.analyse.i_me_range         = avctx->me_range;
-     x4->params.analyse.i_subpel_refine    = avctx->me_subpel_quality;
- 
-+#if X264_BUILD < 65
-+    x4->params.analyse.b_bidir_me = (avctx->bidir_refine > 0);
-+    x4->params.analyse.b_bframe_rdo = (avctx->flags2 & CODEC_FLAG2_BRDO);
-+#endif
-     x4->params.analyse.b_mixed_references = avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
-     x4->params.analyse.b_chroma_me        = avctx->me_cmp & FF_CMP_CHROMA;
-     x4->params.analyse.b_transform_8x8    = avctx->flags2 & CODEC_FLAG2_8X8DCT;
-@@ -269,6 +277,10 @@ static av_cold int X264_init(AVCodecCont
-     x4->params.rc.f_pb_factor             = avctx->b_quant_factor;
-     x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
- 
-+#if X264_BUILD < 61
-+    x4->params.rc.psz_rc_eq = avctx->rc_eq;
-+#endif
-+
-     x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;
-     x4->params.i_log_level    = X264_LOG_DEBUG;
- 
diff --git a/multimedia/mplayer-share/patches/patch-vb b/multimedia/mplayer-share/patches/patch-vb
index a05e09a7ade..e3709594dfa 100644
--- a/multimedia/mplayer-share/patches/patch-vb
+++ b/multimedia/mplayer-share/patches/patch-vb
@@ -1,6 +1,6 @@
-$NetBSD: patch-vb,v 1.3 2009/10/18 22:22:10 ahoka Exp $
+$NetBSD: patch-vb,v 1.4 2010/09/16 18:56:12 wiz Exp $
 
---- stream/tvi_v4l2.c.orig	2009-05-13 04:58:57.000000000 +0200
+--- stream/tvi_v4l2.c.orig	2010-08-03 15:55:17.000000000 +0000
 +++ stream/tvi_v4l2.c
 @@ -49,8 +49,12 @@ known issues:
  #ifdef HAVE_SYS_SYSINFO_H
@@ -14,4 +14,4 @@ $NetBSD: patch-vb,v 1.3 2009/10/18 22:22:10 ahoka Exp $
 +#endif
  #include "mp_msg.h"
  #include "libmpcodecs/img_format.h"
- #include "libaf/af_format.h"
+ #include "libmpcodecs/dec_teletext.h"