18 files changed, 159 insertions, 330 deletions

diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index 43a5c486e3db..94d9d36f53f7 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -6,23 +6,30 @@
 #
 
 PORTNAME=	mplayerxp
-PORTVERSION=	0.6.2
-PORTREVISION=	5
+PORTVERSION=	0.7.2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-threaded branch of the well known mplayer media player
 
-LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		vcdinfo.2:${PORTSDIR}/multimedia/vcdimager
 RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts
 
+OPTIONS=	DVDNAV       	"Enable libdvdnav support"   	off \
+		DVDPLAY      	"Enable libdvdplay support"    	off \
+		CDPARANOIA   	"Enable CDDA support"         	off \
+		OCFLAGS     	"Use optimized compiler flags"	off \
+		SDL          	"Enable SDL video output"     	off \
+		TERMCAP      	"Enable termcap key support"  	off \
+		WIN32        	"Enable win32 codec set"      	on
+
 ONLY_FOR_ARCHS=	i386
 
 USE_BZIP2=	yes
+USE_XORG=	xinerama xv xxf86dga xxf86vm
 USE_ICONV=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
@@ -35,127 +42,73 @@ WIN32_CODEC_PREFIX=	${LOCALBASE}/lib/win32
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 # add this after <bsd.port.pre.mk> so that we inherit /etc/make.conf
 CONFIGURE_ARGS+=	--with-extralibdir=${LOCALBASE}/lib \
 		--with-extraincdir=${LOCALBASE}/include \
-		--with-x11incdir=${LOCALBASE}/include \
-		--with-x11libdir=${LOCALBASE}/lib \
 		--cc=${CC} \
 		--prefix=${PREFIX} \
-		--confdir=${PREFIX}/etc/${PORTNAME} \
+		--confdir=${ETCDIR} \
 		--datadir=${LOCALBASE}/share/mplayer \
+		--libdir=${PREFIX}/lib \
 		--disable-fbdev \
 		--disable-lirc \
 		--disable-rtc \
-		--disable-vm \
 		--disable-tv-v4l
 CONFIGURE_ENV+=	LANG=C
 # insure CC,LD safeness
-MAKE_ARGS+=	CC="${CC}" LD="${LD}"
+MAKE_ARGS+=	CC="${CC}" LD="${LD}" INSTALL="${INSTALL}"
 
 CFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-fomit-frame-pointer
 
 ##
-## Feature detection
-##
-
-# xine libdvdnav
-.if exists(${LOCALBASE}/lib/libdvdnav.so)
-WITH_DVD=yes
-WITH_LIBDVDNAV=yes
-.endif
-.if exists(${LOCALBASE}/lib/libdvdplay.a)
-# ogle's libdvdplay
-WITH_DVD=yes
-WITH_DVDPLAY=yes
-.endif
-# cdparanoia (cdda support)
-.if exists(${LOCALBASE}/lib/libcdda_paranoia.so)
-WITH_CDPARANOIA=yes
-.endif
-# ogle's libdvdread (dvd support)
-.if exists(${LOCALBASE}/lib/libdvdread.a)
-WITH_DVD=yes
-.endif
-# sdl
-.if ${HAVE_SDL:Msdl}!=""
-WITH_SDL=yes
-.endif
-# sdl_image
-.if ${HAVE_SDL:Mimage}!=""
-WITH_SDL_IMAGE=yes
-.endif
-# xvid
-.if exists(${LOCALBASE}/lib/libxvidcore.so)
-WITH_XVID=yes
-.endif
-
-##
 ## Feature activation and Library Dependencies
 ##
 
-# libdvdnav does not currently work
-.undef WITH_LIBDVDNAV
-WITHOUT_LIBDVDNAV=yes
-
-# compilation optimizations
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+=	-O3 -ffast-math
-.endif
 # cdda support
 .if defined(WITH_CDPARANOIA)
 LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
+
+CONFIGURE_ARGS+=	--enable-cdparanoia
 .else
 CONFIGURE_ARGS+=	--disable-cdparanoia
 .endif
 # dvd support
-.if defined(WITH_DVD)
+.if defined(WITH_DVDNAV) || defined(WITH_DVDPLAY)
 LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
-CONFIGURE_ARGS+=	--with-csslibdir=${LOCALBASE}/lib
-PLIST_SUB+=	DVD=''
+CONFIGURE_ARGS+=	--enable-libdvdread
 .else
-PLIST_SUB+=	DVD='@comment '
+CONFIGURE_ARGS+=	--disable-libdvdread
 .endif
 # xine libdvdnav
-.if defined(WITH_LIBDVDNAV) && !defined(WITHOUT_LIBDVDNAV)
+.if defined(WITH_DVDNAV)
 LIB_DEPENDS+=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
 
-CONFIGURE_ARGS+=	--with-libdvdnav=${LOCALBASE}
+CONFIGURE_ARGS+=	--enable-libdvdnav
+.else
+CONFIGURE_ARGS+=	--disable-libdvdnav
 .endif
 # ogle's libdvdplay
-.if defined(WITH_LIBDVDPLAY) && !defined(WITHOUT_LIBDVDPLAY)
+.if defined(WITH_DVDPLAY)
 LIB_DEPENDS+=	dvdplay.0:${PORTSDIR}/multimedia/libdvdplay
 
-CONFIGURE_ARGS+=	--with-libdvdplay=${LOCALBASE}
-.endif
-# sdl
-.if defined(WITH_SDL)
-USE_SDL=	sdl
-CONFIGURE_ARGS+=	--enable-sdl
+CONFIGURE_ARGS+=	--enable-libdvdplay
 .else
-CONFIGURE_ARGS+=	--disable-sdl
+CONFIGURE_ARGS+=	--disable-libdvdplay
 .endif
-# sdl_image
-.if defined(WITH_SDL_IMAGE)
-USE_SDL+=	image
-CONFIGURE_ARGS+=	--enable-sdl-image
+# compilation optimizations
+.if defined(WITH_OCFLAGS)
+CFLAGS+=	-O3 -ffast-math
 .else
-CONFIGURE_ARGS+=	--disable-sdl-image
+MAKE_ARGS+=	OPTFLAGS="${CFLAGS}" SHCFLAGS="${CFLAGS} -PIC"
 .endif
-# xvid
-.if defined(WITH_XVID)
-LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
-
-CONFIGURE_ARGS+=	--enable-xvid \
-			--with-xvidcore=${LOCALBASE}
+# sdl
+.if defined(WITH_SDL)
+USE_SDL=	image sdl
+CONFIGURE_ARGS+=	--enable-sdl --enable-sdl-image
 .else
-CONFIGURE_ARGS+=	--disable-xvid
+CONFIGURE_ARGS+=	--disable-sdl --disable-sdl-image
 .endif
 # termcap key support
 # mplayerxp does not clean up after itself yet
@@ -172,76 +125,41 @@ CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .endif
 
-pre-everything::
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can enable additional compilation optimizations'
-	@${ECHO_MSG} '		by defining WITH_OPTIMIZED_CFLAGS.'
-.endif
-.if !defined(WITH_CDPARANOIA)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can enable cdda support by defining WITH_CDPARANOIA.'
-.endif
-.if !defined(WITH_DVD)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can enable DVD support by defining WITH_DVD.'
-.endif
-.if !defined(WITH_LIBDVDNAV)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can enable LIBDVDNAV support by defining WITH_LIBDVDNAV.'
-.endif
-.if !defined(WITH_LIBDVDNAV)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can enable LIBDVDPLAY support by defining WITH_LIBDVDPLAY.'
-.endif
-.if !defined(WITH_SDL)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can enable SDL support by defining WITH_SDL.'
-.endif
-.if !defined(WITH_SDL_IMAGE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can enable SDL_image support by defining WITH_SDL_IMAGE.'
-.endif
-.if !defined(WITH_TERMCAP)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can enable termcap key database support by defining WITH_TERMCAP.'
-.endif
-.if !defined(WITH_XVID)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can enable XVID support by defining WITH_XVID.'
-.endif
-.if !defined(WITHOUT_WIN32_CODECS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> You can disable support for Win32 codecs by defining WITHOUT_WIN32_CODECS'
-.endif
-	@${ECHO_MSG} '===>'
-
 post-patch:
 # win32 codec location
-	@${REINPLACE_CMD} -E -e \
-		's|WIN32_PATH|"${WIN32_CODEC_PREFIX}"|' \
-		${WRKSRC}/loader/win32.c
+	@${REINPLACE_CMD} -e \
+		's|WIN32_PATH|"${WIN32_CODEC_PREFIX}"|' ${WRKSRC}/loader/win32.c
 # FreeBSD's install utility does not support -D flag
-	@${FIND} ${WRKSRC} -name Makefile | \
-		${XARGS} -x -n 10 ${REINPLACE_CMD} -E -e \
-		's,(\$$\(INSTALL\)|install)(.*)-D,${INSTALL}\2,'
+	@${FIND} ${WRKSRC} -name "Makefile" -print0 | \
+		${XARGS} -0 ${REINPLACE_CMD} -e \
+		'/INSTALL/s| -D | |g ; \
+		 /install/s| -D | |g'
 # PTHREAD_{CFLAGS,LIBS}
-# stdint.h -> inttypes.h
-	@${REINPLACE_CMD} -E -e  \
-		's|-lpthread|${PTHREAD_LIBS}|; \
-		s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|; \
-		s|<stdint\.h>|<inttypes.h>|' \
-		${WRKSRC}/mplayerxp/configure
-# ffmpeg currently is not compatible with mplayerxp
-#.for file in ad_ffmp3.c vd_ffmpeg.c
-#	@${REINPLACE_CMD} -e 's|libavcodec.so|libNOTavcodec.so|' \
-#		${WRKSRC}/mplayerxp/libmpcodecs/${file}
-#.endfor
-# native libdivxdecore is not compatible with mplayerxp
-.for file in vd_divx4.c vd_xvid.c
-	@${REINPLACE_CMD} -e 's|libdivxdecore|libNOTdivxdecore|' \
-		${WRKSRC}/mplayerxp/libmpcodecs/${file}
-.endfor
+	@${REINPLACE_CMD} -e \
+		'/pthread/s|_ld_i in .* ;|_ld_i in "${PTHREAD_LIBS}" ;|g ; \
+		 s|pkg-config|true|g ; \
+		 s|^MAKE=|#MAKE=|g' ${WRKSRC}/codecs/configure
+	@${REINPLACE_CMD} -e \
+		'/pthread/s|_ld_i in .* ;|_ld_i in "${PTHREAD_LIBS}" ;|g ; \
+		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/mplayerxp/configure
+#
+	@${REINPLACE_CMD} -e \
+		's|-Wl,-rpath |-Wl,-rpath,|g' ${WRKSRC}/codecs/common.mak
+	@${REINPLACE_CMD} -e \
+		'/install -d/d' ${WRKSRC}/codecs/subdir.mak
+
+post-configure:
+	@cd ${WRKSRC}/codecs && ./configure --cc=${CC} \
+		--prefix=${PREFIX} \
+		--confdir=${ETCDIR} \
+		--datadir=${LOCALBASE}/share/mplayer \
+		--libdir=${PREFIX}/lib
+.if !defined(WITH_OCFLAGS)
+	@${FIND} ${WRKSRC} -name "config.h" -print0 | \
+		${XARGS} -0 ${REINPLACE_CMD} -e \
+		'/CAN_COMPILE_/s|^#define|// #undef|g ; \
+		 /_CLOBBERED/s|^#define|// #undef|g'
+.endif
 
 pre-install:
 # create dirs before installation since the port uses a install
@@ -250,4 +168,7 @@ pre-install:
 	@${MKDIR} ${PREFIX}/${dir}
 .endfor
 
+post-install:
+	@${STRIP_CMD} ${PREFIX}/bin/mplayerxp
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/mplayerxp/distinfo b/multimedia/mplayerxp/distinfo
index 9b5b07371224..dfe876adefc2 100644
--- a/multimedia/mplayerxp/distinfo
+++ b/multimedia/mplayerxp/distinfo
@@ -1,3 +1,3 @@
-MD5 (mplayerxp-0.6.2.tar.bz2) = 9c4c7d82c3f4bd83cfb5a600ca969974
-SHA256 (mplayerxp-0.6.2.tar.bz2) = a8c7b4bbca99d738ce4e32801d2919681b8643346c2c6db7e7d9dc40d28750cf
-SIZE (mplayerxp-0.6.2.tar.bz2) = 4020226
+MD5 (mplayerxp-0.7.2.tar.bz2) = ba68358f9fe2cc1fbbcb09432826aa09
+SHA256 (mplayerxp-0.7.2.tar.bz2) = 0b1c5886701f7c856cb16b4075cb7cca180c020b6db6b212d5749fc5e44afa88
+SIZE (mplayerxp-0.7.2.tar.bz2) = 4646121
diff --git a/multimedia/mplayerxp/files/patch-codecs__common.mak b/multimedia/mplayerxp/files/patch-codecs__common.mak
deleted file mode 100644
index 44390ea66002..000000000000
--- a/multimedia/mplayerxp/files/patch-codecs__common.mak
+++ /dev/null
@@ -1,24 +0,0 @@
---- codecs/common.mak.orig	Fri Dec  1 16:20:40 2006
-+++ codecs/common.mak	Mon Dec 25 00:55:17 2006
-@@ -22,7 +22,7 @@
- endif
- 
- ifneq ($(TARGET_OS),WIN32)
--LDFLAGS+=-Xlinker -rpath=$(BINDIR)
-+LDFLAGS+=-L${LOCALBASE}/lib -Xlinker -rpath=$(BINDIR)
- endif
- 
- ifeq ($(TARGET_ARCH_SPARC64),yes)
-@@ -42,9 +42,9 @@
- 	$(RANLIB) $@
- 
- $(SLIBNAME): $(SHARED_OBJS)
--ifneq ($(TARGET_OS),WIN32)
--	install -d  $(BINDIR)
--endif
-+#ifneq ($(TARGET_OS),WIN32)
-+#	install -d  $(BINDIR)
-+#endif
- 	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
- #ifeq ($(TARGET_OS),WIN32)
- #	-lib /machine:i386 /def:$(@:.dll=.def)
diff --git a/multimedia/mplayerxp/files/patch-codecs__configure b/multimedia/mplayerxp/files/patch-codecs__configure
deleted file mode 100644
index 2a8a0d9c97f3..000000000000
--- a/multimedia/mplayerxp/files/patch-codecs__configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- codecs/configure.orig	Sat Sep 30 16:20:13 2006
-+++ codecs/configure	Tue Oct  3 12:15:45 2006
-@@ -604,7 +604,7 @@
- BUILD_SHARED=yes
- SRC_PATH=$source_path
- 
--MAKE=make
-+#MAKE=make
- CC=$_cc
- AR=ar
diff --git a/multimedia/mplayerxp/files/patch-codecs__libavcodec__avcodec.h b/multimedia/mplayerxp/files/patch-codecs__libavcodec__avcodec.h
deleted file mode 100644
index e58772656067..000000000000
--- a/multimedia/mplayerxp/files/patch-codecs__libavcodec__avcodec.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- codecs/libavcodec/avcodec.h.orig	Tue Apr  3 15:53:38 2007
-+++ codecs/libavcodec/avcodec.h	Sun Apr 15 03:53:55 2007
-@@ -34,6 +34,12 @@
- #include "avutil.h"
- #include <sys/types.h> /* size_t */
- 
-+#ifndef INT64_C
-+#ifdef i386
-+#define INT64_C(c) (c ## LL)
-+#endif
-+#endif
-+
- #define AV_STRINGIFY(s)         AV_TOSTRING(s)
- #define AV_TOSTRING(s) #s
- 
diff --git a/multimedia/mplayerxp/files/patch-codecs__libavcodec__xvidff.c b/multimedia/mplayerxp/files/patch-codecs__libavcodec__xvidff.c
deleted file mode 100644
index 6054c611345f..000000000000
--- a/multimedia/mplayerxp/files/patch-codecs__libavcodec__xvidff.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- codecs/libavcodec/xvidff.c.orig	Wed Oct 18 02:39:04 2006
-+++ codecs/libavcodec/xvidff.c	Mon Dec 25 01:35:12 2006
-@@ -31,6 +31,10 @@
- #include "avcodec.h"
- #include "xvid_internal.h"
- 
-+#ifndef roundf
-+#define roundf(x) (floor((x)+(float )0.5f))
-+#endif
-+
- /**
-  * Buffer management macros.
-  */
diff --git a/multimedia/mplayerxp/files/patch-loader__dmo__Makefile b/multimedia/mplayerxp/files/patch-loader__dmo__Makefile
deleted file mode 100644
index a77a29f55103..000000000000
--- a/multimedia/mplayerxp/files/patch-loader__dmo__Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- loader/dmo/Makefile.orig	Fri Oct 20 00:57:44 2006
-+++ loader/dmo/Makefile	Mon Dec 25 00:17:23 2006
-@@ -29,9 +29,9 @@
- 	$(CC) -c $(CFLAGS) -o $@ $<
- 
- $(LIBNAME):	$(OBJS)
--ifneq ($(TARGET_OS),WIN32)
--	install -d  $(BINDIR)
--endif
-+#ifneq ($(TARGET_OS),WIN32)
-+#	install -d  $(BINDIR)
-+#endif
- 	$(LD) --shared $(LD_FLAGS) -o $@ $(OBJS) ../dshow/DS_Filter$(SLIBSUF) $(LD_LIBS)
- all:	$(LIBNAME)
- 
diff --git a/multimedia/mplayerxp/files/patch-loader__dshow__Makefile b/multimedia/mplayerxp/files/patch-loader__dshow__Makefile
deleted file mode 100644
index 4f233db5cb7b..000000000000
--- a/multimedia/mplayerxp/files/patch-loader__dshow__Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- loader/dshow/Makefile.orig	Fri Oct 20 00:57:44 2006
-+++ loader/dshow/Makefile	Mon Dec 25 00:16:16 2006
-@@ -34,9 +34,9 @@
- 	$(CC) -c $(CFLAGS) -o $@ $<
- 
- $(LIBNAME):	$(OBJS)
--ifneq ($(TARGET_OS),WIN32)
--	install -d  $(BINDIR)
--endif
-+#ifneq ($(TARGET_OS),WIN32)
-+#	install -d  $(BINDIR)
-+#endif
- 	$(LD) --shared $(LD_FLAGS) -o $(LIBNAME) $(OBJS) $(LD_LIBS)
- 
- test:   test.c $(LIBNAME)
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__configure b/multimedia/mplayerxp/files/patch-mplayerxp__configure
new file mode 100644
index 000000000000..ddee63563305
--- /dev/null
+++ b/multimedia/mplayerxp/files/patch-mplayerxp__configure
@@ -0,0 +1,34 @@
+--- mplayerxp/configure.orig	2009-01-25 17:00:03.000000000 +0900
++++ mplayerxp/configure	2009-02-03 00:18:15.000000000 +0900
+@@ -85,13 +85,11 @@
+   --enable-dga           build with DGA1 or DGA2 support [autodetect]
+   --enable-vesa          build with VESA support [autodetect]
+   --enable-sdl           build with SDL render support [autodetect]
+-  --enable-vm            build with XF86VidMode support for X11 [autodetect]
+   --enable-x11           build with X11 render support [autodetect]
+   --enable-xdpms         build with X11 DPMS support [autodetect]
+   --enable-xinerama      build with Xinerama support for X11 [autodetect]
+   --enable-xf86vm        build with Xf86vm support for X11 [autodetect]
+   --enable-xv            build with Xv render support for X 4.x [autodetect]
+-  --enable-xv            build with Xv render support for X 4.x [autodetect]
+   --enable-fbdev         build with FBDev render support [autodetect]
+   --enable-fbdev=nocopy  yuv12 converts directly into framebuffer
+   --enable-mlib          build with MLIB support (Solaris only) [autodetect]
+@@ -431,6 +429,8 @@
+   --disable-libdvdplay)	libdvdplay=no	;;
+   --enable-xinerama)	xinerama=yes	;;
+   --disable-xinerama)	xinerama=no	;;
++  --enable-xf86vm)	xf86vm=yes	;;
++  --disable-xf86vm)	xf86vm=no	;;
+   --enable-alsa)	alsa=yes	;;
+   --disable-alsa)	alsa=no		;;
+   --enable-tv)		tv=yes		;;
+@@ -806,7 +806,7 @@
+ print_config HAVE_ config.h config.mak xv
+ 
+ enabled xinerama	&& require2 xinerama "X11/Xlib.h X11/extensions/Xinerama.h" XineramaIsActive -lXinerama
+-print_config HAVE_ config.h config.mak xv
++print_config HAVE_ config.h config.mak xinerama
+ 
+ # Note: the -lXxf86vm library is the VideoMode extension and though it's not
+ # needed for DGA, AFAIK every distribution packages together with DGA stuffs
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_null.c b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_null.c
index 12c529f21104..db6938ed9e68 100644
--- a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_null.c
+++ b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_null.c
@@ -1,9 +1,8 @@
---- mplayerxp/libao2/ao_null.c.orig	Thu Nov 30 15:32:02 2006
-+++ mplayerxp/libao2/ao_null.c	Sun Dec 24 21:48:25 2006
-@@ -1,7 +1,7 @@
--#include <stdint.h>
- #include <stdio.h>
+--- mplayerxp/libao2/ao_null.c.orig	2007-12-02 18:19:44.000000000 +0900
++++ mplayerxp/libao2/ao_null.c	2009-01-07 18:28:00.000000000 +0900
+@@ -3,6 +3,7 @@
  #include <stdlib.h>
+ #include <string.h>
  #include <limits.h>
 +#include <sys/types.h>
  #include <sys/time.h>
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_oss.c b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_oss.c
index 6d9c459acbf9..9cc3e0d6d3ea 100644
--- a/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_oss.c
+++ b/multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_oss.c
@@ -1,18 +1,25 @@
---- mplayerxp/libao2/ao_oss.c.orig	Sat Jul  2 18:59:01 2005
-+++ mplayerxp/libao2/ao_oss.c	Sun Oct  1 22:06:55 2006
-@@ -171,6 +171,7 @@
-   }
-   show_fmts();
-   rval=0;
-+#ifndef __FreeBSD__
-   if (ioctl (audio_fd, SNDCTL_DSP_GETCAPS, &rval) != -1)
-   {
- 	MSG_INFO("AO-INFO: Capabilities: ");
-@@ -185,6 +186,7 @@
- 	if(rval & DSP_CAP_BIND) MSG_INFO("bind ");
- 	MSG_INFO("\n");	
-   }
+--- mplayerxp/libao2/ao_oss.c.orig	2005-07-02 18:59:01.000000000 +0900
++++ mplayerxp/libao2/ao_oss.c	2009-01-07 18:26:10.000000000 +0900
+@@ -18,6 +18,22 @@
+ #include "audio_out.h"
+ #include "audio_out_internal.h"
+ 
++#ifndef DSP_CAP_COPROC
++#define DSP_CAP_COPROC 0x00000800
 +#endif
-   close(audio_fd);
- }
- // open & setup audio device
++#ifndef DSP_CAP_TRIGGER
++#define DSP_CAP_TRIGGER 0x00001000
++#endif
++#ifndef DSP_CAP_MMAP
++#define DSP_CAP_MMAP 0x00002000
++#endif
++#ifndef DSP_CAP_MULTI
++#define DSP_CAP_MULTI 0x00004000
++#endif
++#ifndef DSP_CAP_BIND
++#define DSP_CAP_BIND  0x00008000
++#endif
++
+ static ao_info_t info = 
+ {
+ 	"OSS/ioctl audio output",
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__Makefile b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__Makefile
new file mode 100644
index 000000000000..30d893c7ec11
--- /dev/null
+++ b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__Makefile
@@ -0,0 +1,11 @@
+--- mplayerxp/libmpdemux/Makefile.orig	2008-12-25 01:04:59.000000000 +0900
++++ mplayerxp/libmpdemux/Makefile	2009-01-08 23:53:57.000000000 +0900
+@@ -30,7 +30,7 @@
+ 
+ OBJS	= $(SRCS:.c=.o)
+ INCLUDE = -I../loader -I../../codecs/ -I../../codecs/libavcodec -I../../codecs/libavutil
+-CFLAGS  = $(OPTFLAGS) $(INCLUDE) -W -Wall
++CFLAGS  = $(INCLUDE) $(OPTFLAGS) -W -Wall
+ 
+ .SUFFIXES: .c .o
+ 
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__demux_mov.c b/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__demux_mov.c
deleted file mode 100644
index ba691d73c189..000000000000
--- a/multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__demux_mov.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- mplayerxp/libmpdemux/demux_mov.c.orig	Wed Sep 13 16:11:59 2006
-+++ mplayerxp/libmpdemux/demux_mov.c	Sun Oct  1 21:57:58 2006
-@@ -51,6 +51,10 @@
- #define char2short(x,y)	BE_16(*((uint16_t *)&(((unsigned char *)(x))[(y)])))
- #define char2int(x,y) 	BE_32(*((uint32_t *)&(((unsigned char *)(x))[(y)])))
- 
-+#ifndef SIZE_MAX
-+#define SIZE_MAX ((size_t)-1)
-+#endif
-+
- typedef struct {
-     unsigned int pts; // duration
-     unsigned int size;
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libvo__vo_null.c b/multimedia/mplayerxp/files/patch-mplayerxp__libvo__vo_null.c
deleted file mode 100644
index e422601c0c42..000000000000
--- a/multimedia/mplayerxp/files/patch-mplayerxp__libvo__vo_null.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- mplayerxp/libvo/vo_null.c.orig	Thu Jan 19 17:17:41 2006
-+++ mplayerxp/libvo/vo_null.c	Sun Oct  1 22:39:27 2006
-@@ -35,7 +35,9 @@
- #include "video_out_internal.h"
- #include "dri_vo.h"
- #include "vo_msg.h"
-+#if 0
- #include <vidix/vidixlib.h>
-+#endif
- 
- LIBVO_EXTERN(null)
- 
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__nls__recode.c b/multimedia/mplayerxp/files/patch-mplayerxp__nls__recode.c
deleted file mode 100644
index f4557a37ccf7..000000000000
--- a/multimedia/mplayerxp/files/patch-mplayerxp__nls__recode.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- mplayerxp/nls/recode.c.orig	Sat Feb 11 03:39:53 2006
-+++ mplayerxp/nls/recode.c	Sun Oct  1 22:34:34 2006
-@@ -3,11 +3,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #ifdef USE_ICONV
--#ifdef __FreeBSD__
--#include <giconv.h>
--#else
- #include <iconv.h>
--#endif
- #endif
- #include "nls_msg.h"
- #include "./nls.h"
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__postproc__dsp.c b/multimedia/mplayerxp/files/patch-mplayerxp__postproc__dsp.c
deleted file mode 100644
index 5dcdb6edaa39..000000000000
--- a/multimedia/mplayerxp/files/patch-mplayerxp__postproc__dsp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mplayerxp/postproc/dsp.c.orig	Sat Jul  2 18:59:04 2005
-+++ mplayerxp/postproc/dsp.c	Sun Oct  1 22:10:31 2006
-@@ -11,7 +11,7 @@
- /* Design and implementation of different types of digital filters
- 
- */
--#include <stdint.h>
-+#include <inttypes.h>
- #include <string.h>
- #define __USE_ISOC99 1
- #include <math.h>
diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__subreader.c b/multimedia/mplayerxp/files/patch-mplayerxp__subreader.c
deleted file mode 100644
index 25de138a11c4..000000000000
--- a/multimedia/mplayerxp/files/patch-mplayerxp__subreader.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- mplayerxp/subreader.c.orig	Sat Feb 11 03:39:49 2006
-+++ mplayerxp/subreader.c	Sun Oct  1 21:15:14 2006
-@@ -19,11 +19,7 @@
- #define ERR ((void *) -1)
- 
- #ifdef USE_ICONV
--#ifdef __FreeBSD__
--#include <giconv.h>
--#else
- #include <iconv.h>
--#endif
- #endif
- char *sub_cp=NULL;
- 
diff --git a/multimedia/mplayerxp/pkg-plist b/multimedia/mplayerxp/pkg-plist
index ba39c87fc4c3..a7c21ac25b50 100644
--- a/multimedia/mplayerxp/pkg-plist
+++ b/multimedia/mplayerxp/pkg-plist
@@ -1,19 +1,32 @@
-%%DVD%%bin/fibmap_mplayerxp
 bin/mplayerxp
 etc/mplayerxp/codecs.conf
 etc/mplayerxp/eqbands
+etc/mplayerxp/menu.conf
 lib/mplayerxp/codecs/libMP3.so
 lib/mplayerxp/codecs/liba52.so
 lib/mplayerxp/codecs/libavcodec.so
+lib/mplayerxp/codecs/libavcodec.so.mpxp
+lib/mplayerxp/codecs/libavcodec.so.ver_mpxp
 lib/mplayerxp/codecs/libavformat.so
+lib/mplayerxp/codecs/libavformat.so.mpxp
+lib/mplayerxp/codecs/libavformat.so.ver_mpxp
 lib/mplayerxp/codecs/libavutil.so
+lib/mplayerxp/codecs/libavutil.so.mpxp
+lib/mplayerxp/codecs/libavutil.so.ver_mpxp
 lib/mplayerxp/codecs/libdca.so
 lib/mplayerxp/codecs/libfaad2.so
 lib/mplayerxp/codecs/libmpeg2.so
 lib/mplayerxp/codecs/libnuppelvideo.so
 lib/mplayerxp/codecs/libpostproc.so
+lib/mplayerxp/codecs/libpostproc.so.mpxp
+lib/mplayerxp/codecs/libpostproc.so.ver_mpxp
+lib/mplayerxp/codecs/libswscale.so
+lib/mplayerxp/codecs/libswscale.so.mpxp
+lib/mplayerxp/codecs/libswscale.so.ver_mpxp
 lib/mplayerxp/wine/DMO_Filter.so
 lib/mplayerxp/wine/DS_Filter.so
+lib/mplayerxp/wine/libDMO_Filter.so
+lib/mplayerxp/wine/libDS_Filter.so
 lib/mplayerxp/wine/libloader.so
 @dirrm lib/mplayerxp/wine
 @dirrm lib/mplayerxp/codecs