8 files changed, 56 insertions, 58 deletions

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index f7f00de14dcb..f9656045dd51 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -6,9 +6,8 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	3
 COMMENT=	Convenient video file and movie encoder
-NO_PACKAGE=	Port has restricted dependencies
+RESTRICTED=	Port has restricted dependencies
 
 .include "${.CURDIR}/../mplayer/Makefile.shared"
 
@@ -22,6 +21,7 @@ OPTIONS+=	OPENAL "Enable OpenAL sound support" off
 OPTIONS+=	PULSE "Enable PulseAudio" off
 OPTIONS+=	LIBUNGIF "Enable gif support" on
 OPTIONS+=	OPENJPEG "Enable JPEG2000 support" off
+OPTIONS+=	MNG "Enable MNG input support" off
 OPTIONS+=	LIBDV "Enable libdv support" off
 OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
 OPTIONS+=	AMR "Enable opencore AMR audio codec support" off
@@ -112,7 +112,7 @@ CONFIGURE_ARGS+=	--disable-xvid
 .ifdef(WITH_DIRAC)
 LIB_DEPENDS+=		dirac_encoder.1:${PORTSDIR}/multimedia/dirac
 .else
-CONFIGURE_ARGS+=	--disable-libdirac
+CONFIGURE_ARGS+=	--disable-libdirac-lavc
 .endif
 
 
@@ -147,6 +147,7 @@ post-patch:
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
+	@cd ${WRKSRC}/libavcodec && ${LN} -s x86 i386 && ${LN} -s x86 amd64
 
 post-configure:
 	@${REINPLACE_CMD} -e 's#-pthread#${PTHREAD_LIBS}#g' \
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index 5adf03a1abf8..87b92e58582d 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,3 +1,3 @@
-MD5 (mplayer-1.0rc20100117.tar.bz2) = ba9eecc0613c1e592b970383616a679b
-SHA256 (mplayer-1.0rc20100117.tar.bz2) = b9c181671112acb6807d6cdd143941b262854b85616716fe9d1b736fff9c158d
-SIZE (mplayer-1.0rc20100117.tar.bz2) = 8663385
+MD5 (mplayer-1.0rc20100717.tar.bz2) = 3e650938b3729292d1fbee7d72524670
+SHA256 (mplayer-1.0rc20100717.tar.bz2) = 829f149fa74655f84824b4511d69fd93c575e24bc11c429e66ee742642881f0b
+SIZE (mplayer-1.0rc20100717.tar.bz2) = 8988030
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 804d600a717f..4439d2e45db2 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
 
 COMMENT=	High performance media player supporting many formats
 
@@ -37,6 +36,7 @@ OPTIONS+=	OPENAL "Enable OpenAL sound support" off
 OPTIONS+=	PULSE "Enable PulseAudio" off
 OPTIONS+=	LIBUNGIF "Enable gif support" on
 OPTIONS+=	OPENJPEG "Enable JPEG2000 support" off
+OPTIONS+=	MNG "Enable MNG input support" off
 OPTIONS+=	AALIB "Enable aalib support" off
 OPTIONS+=	LIBCACA "Enable libcaca support" off
 OPTIONS+=	SVGALIB "Enable svgalib support" off
@@ -82,6 +82,7 @@ CONFIGURE_ARGS+=	--disable-ssse3 \
 			--disable-twolame \
 			--disable-x264 \
 			--disable-xvid \
+			--disable-libdirac-lavc \
 			--disable-mencoder
 
 .include "${.CURDIR}/Makefile.options"
@@ -251,19 +252,12 @@ post-patch:
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
+	@cd ${WRKSRC}/libavcodec && ${LN} -s x86 i386 && ${LN} -s x86 amd64
 .if defined(WITH_RTC)
 	@${REINPLACE_CMD} -e \
 		's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
 		${WRKSRC}/mplayer.c
 .endif
-#.if defined(WITH_VDPAU)
-#	@if [ ! -e ${LOCALBASE}/share/doc/NVIDIA_GLX-1.0/vdpau.h ]; then \
-#		${ECHO_CMD} "For VDPAU support you need a recent version of x11/nvidia-driver installed"; \
-#		${FALSE}; \
-#	fi
-#	@${MKDIR} ${WRKSRC}/vdpau
-#	@${CP} ${LOCALBASE}/share/doc/NVIDIA_GLX-1.0/vdpau*.h ${WRKSRC}/vdpau
-#.endif
 
 post-configure:
 	@${REINPLACE_CMD} -e 's#-pthread#${PTHREAD_LIBS}#g' \
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index 43565c2c7563..666b96017b06 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -196,16 +196,11 @@ CONFIGURE_ARGS+=	--disable-win32dll \
 .endif # ARCH == i386/amd64
 
 .if defined(WITH_REALPLAYER)
-CONFIGURE_ARGS+=	--realcodecsdir=${LOCALBASE}/lib/RealPlayer/codecs
 RUN_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 BUILD_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 .else
-.if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+=	--realcodecsdir=${LOCALBASE}/lib/win32
-.else
 CONFIGURE_ARGS+=	--disable-real
 .endif
-.endif
 
 .if defined(WITH_AMR)
 LIB_DEPENDS+=		opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr
@@ -225,6 +220,12 @@ CONFIGURE_ARGS+=	--disable-tv-v4l1 \
 			--disable-tv-v4l2
 .endif
 
+.if defined(WITH_MNG)
+LIB_DEPENDS+=		mng.1:${PORTSDIR}/graphics/libmng
+.else
+CONFIGURE_ARGS+=	--disable-mng
+.endif
+
 .if defined(EXTRA_LIBS)
 CONFIGURE_ARGS+=	--extra-libs="${EXTRA_LIBS}"
 .endif
diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared
index 933b3aa72b83..2b318b2d30b0 100644
--- a/multimedia/mplayer/Makefile.shared
+++ b/multimedia/mplayer/Makefile.shared
@@ -2,7 +2,7 @@
 # mplayer and mencoder....the variables that we need to set
 # before we include bsd.port.pre.mk
 
-MPLAYER_SNAPSHOT_DATE=	2010-01-17
+MPLAYER_SNAPSHOT_DATE=	2010-07-17
 MPLAYER_PORT_VERSION=	1.0.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
@@ -12,6 +12,8 @@ WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
 
 MAINTAINER?=	riggs@rrr.de
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
 
@@ -24,8 +26,6 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS= --disable-bitmap-font
 
-CONFIGURE_LOG=	configure.log
-
 WANT_GNOME=	yes
 WANT_SDL=	yes
 
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 5adf03a1abf8..87b92e58582d 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-MD5 (mplayer-1.0rc20100117.tar.bz2) = ba9eecc0613c1e592b970383616a679b
-SHA256 (mplayer-1.0rc20100117.tar.bz2) = b9c181671112acb6807d6cdd143941b262854b85616716fe9d1b736fff9c158d
-SIZE (mplayer-1.0rc20100117.tar.bz2) = 8663385
+MD5 (mplayer-1.0rc20100717.tar.bz2) = 3e650938b3729292d1fbee7d72524670
+SHA256 (mplayer-1.0rc20100717.tar.bz2) = 829f149fa74655f84824b4511d69fd93c575e24bc11c429e66ee742642881f0b
+SIZE (mplayer-1.0rc20100717.tar.bz2) = 8988030
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index cd638f30fb6c..ff5a23391cc1 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2010-01-17 00:22:43.000000000 +0100
-+++ configure	2010-01-17 14:29:54.248533341 +0100
-@@ -527,7 +527,7 @@
+--- configure.orig	2010-07-14 15:49:08.000000000 +0200
++++ configure	2010-07-17 12:50:00.937109688 +0200
+@@ -555,7 +555,7 @@
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
@@ -9,7 +9,7 @@
  _ranlib=ranlib
  _windres=windres
  _cc=cc
-@@ -1353,7 +1353,6 @@
+@@ -1385,7 +1385,6 @@
  
    *)
      echo "Unknown parameter: $ac_option"
@@ -17,7 +17,7 @@
      ;;
  
    esac
-@@ -1462,8 +1461,8 @@
+@@ -1494,8 +1493,8 @@
  _timer=timer-linux.c
  _getch=getch2.c
  if freebsd ; then
@@ -28,7 +28,7 @@
  fi
  
  if netbsd || dragonfly ; then
-@@ -3516,22 +3515,10 @@
+@@ -3618,22 +3617,10 @@
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
@@ -52,34 +52,47 @@
 +_pthreads=yes
 +_ld_pthread="${PTHREAD_LIBS}"
  if test "$_pthreads" = yes ; then
-   test $_ld_pthread && _res_comment="using $_ld_pthread"
+   test $_ld_pthread && res_comment="using $_ld_pthread"
    def_pthreads='#define HAVE_PTHREADS 1'
-@@ -7637,8 +7624,8 @@
- if test "$_mencoder" = yes ; then
-   def_muxers='#define CONFIG_MUXERS 1'
+@@ -3746,8 +3733,13 @@
+ 
+ 
+ echocheck "sys/dvdio.h"
++cat > $TMPC << EOF
++#include <unistd.h>
++#include <sys/dvdio.h>
++int main(void) { return 0; }
++EOF
+ _dvdio=no
+-header_check sys/dvdio.h && _dvdio=yes
++cc_check && _dvdio=yes
+ if test "$_dvdio" = yes ; then
+   def_dvdio='#define DVD_STRUCT_IN_SYS_DVDIO_H 1'
+ else
+@@ -7800,7 +7792,7 @@
  else
--  # mpeg1video for vf_lavc, snow for vf_uspp and vf_mcdeint, png for vf_screenshot
--  _libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER"
-+  # mpeg1video for vf_lavc, snow/h263 for vf_uspp and vf_mcdeint, png for vf_screenshot
-+  _libavencoders="MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
-   test "$_zlib" = yes && _libavencoders="$_libavencoders PNG_ENCODER"
-   _libavmuxers=""
-   def_muxers='#define CONFIG_MUXERS 0'
-@@ -8023,8 +8010,11 @@
+   # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
+   # png for vf_screenshot, mjpeg for zr
+-  libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER"
++  libavencoders="MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
+   test "$_zlib" = yes && libavencoders="$libavencoders PNG_ENCODER"
+   test "$_zr" = yes && libavencoders="$libavencoders MJPEG_ENCODER"
+   libavmuxers=""
+@@ -8161,8 +8153,11 @@
  if test "$_gui" = yes ; then
  
    # Required libraries
 -  if test "$_libavcodec" != yes ||
--      ! echo $_libavdecoders | grep -q PNG_DECODER ; then
+-      ! echo $libavdecoders | grep -q PNG_DECODER ; then
 +  # Work around a sh bug in FreeBSD < 8
 +  if test "$_libavcodec" != yes ; then
 +    die "The GUI requires libavcodec with PNG support (needs zlib)."
 +  fi
-+  if ! echo $_libavdecoders | grep -q PNG_DECODER ; then
++  if ! echo $libavdecoders | grep -q PNG_DECODER ; then
      die "The GUI requires libavcodec with PNG support (needs zlib)."
    fi
    test "$_freetype" = no && test "$_bitmap_font" = no && \
-@@ -8217,7 +8207,7 @@
+@@ -8352,7 +8347,7 @@
  echocheck "joystick"
  def_joystick='#undef CONFIG_JOYSTICK'
  if test "$_joystick" = yes ; then
diff --git a/multimedia/mplayer/files/patch-vidix-pci.c b/multimedia/mplayer/files/patch-vidix-pci.c
deleted file mode 100644
index d9d310801ca7..000000000000
--- a/multimedia/mplayer/files/patch-vidix-pci.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- vidix/pci.c.orig	2009-05-12 21:58:57.000000000 -0500
-+++ vidix/pci.c	2009-07-23 20:42:47.861327948 -0500
-@@ -481,8 +481,6 @@
- #include "sysdep/pci_arm32.c"
- #elif defined(__powerpc__)
- #include "sysdep/pci_powerpc.c"
--#elif defined(__x86_64__) || defined(__sh__)
--/* Nothing here right now */
- #else
- #include "sysdep/pci_x86.c"
- #endif