o Integration of pr 78670, including introduction of

  files/patch-libfaad2-common.h
o Remove explicitly disabling real codecs as they can be manually added
  after installation if root really wants to (reported by Scott Lipcon
  <scott@libcon.org>)
o Fix mplayer's x264 lib support is older than the version provided by
  the ports tree as of today. Including new patchfile
  files/patch-libmpcodecs-ve_x264.c
  (by Bruce M. Simpson <bms@spc.org>)

Submitted by:	Thomas E. Zander <riggs@rrr.de> (maintainer)

4 files changed, 61 insertions, 6 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index b2afdca8f3cf..dede39358b62 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -190,6 +190,9 @@
 # WITH_THEORA
 # default: autodetect
 #
+# WITH_X264
+# default: autodetect
+#
 # WITH_TREMOR
 # default: autodetect
 # By setting this option mplayer will use libtremor (integer only vorbis
@@ -257,6 +260,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.99.6
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -389,6 +393,10 @@ WITH_SVGALIB=	yes
 WITH_THEORA=	yes
 .endif
 
+.if exists(${LOCALBASE}/lib/libx264.so.0)
+WITH_X264=	yes
+.endif
+
 .if exists(${LOCALBASE}/lib/libaa.so.1)
 WITH_AALIB=	yes
 .endif
@@ -478,6 +486,8 @@ CONFIGURE_ARGS+=	--disable-libdv
 CONFIGURE_ARGS+=	--disable-mad
 #Theora
 CONFIGURE_ARGS+=	--disable-theora
+#x264
+CONFIGURE_ARGS+=	--disable-x264
 #Svgalib
 LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
 #Aalib
@@ -488,8 +498,6 @@ USE_SDL=	sdl
 CONFIGURE_ARGS+=	--disable-esd
 #Vorbis
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
-#Real
-CONFIGURE_ARGS+=	--disable-real
 #Live media
 CONFIGURE_ARGS+=	--disable-live
 #XviD
@@ -659,6 +667,12 @@ LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
 CONFIGURE_ARGS+=	--disable-theora
 .endif
 
+.if defined(WITH_X264)
+LIB_DEPENDS+=	x264.0:${PORTSDIR}/multimedia/x264
+.else
+CONFIGURE_ARGS+=	--disable-x264
+.endif
+
 #.if defined(WITH_TREMOR)
 #LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
 #CONFIGURE_ARGS+=	--enable-tremor
@@ -690,8 +704,6 @@ CONFIGURE_ARGS+=	--enable-real \
 			--with-reallibdir=${LOCALBASE}/lib/RealPlayer8/Codecs
 RUN_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 BUILD_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
-.else
-CONFIGURE_ARGS+=	--disable-real
 .endif
 
 .if defined(WITH_LIVEMEDIA)
@@ -897,4 +909,3 @@ install-user:
 	@${PERL} ${FILESDIR}/install-user
 
 .include <bsd.port.post.mk>
-
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index cacd0e3812d9..aa65e1cc5c4c 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,5 +1,5 @@
 --- configure.orig	Thu Dec 23 16:36:00 2004
-+++ configure	Tue Feb  8 23:24:26 2005
++++ configure	Mon Mar 14 21:58:48 2005
 @@ -359,7 +359,7 @@
  
  
@@ -146,6 +146,15 @@
  int main(void) { return RTC_IRQP_READ; }
  EOF
      _rtc=no
+@@ -5235,7 +5173,7 @@
+ if test "$_faad_internal" = auto ; then
+   # the faad check needs a config.h file
+   if not test -f "config.h" ; then
+-    > config.h
++    echo "$_def_lrintf" > config.h
+   fi
+   # internal faad: check if our dear gcc is able to compile it...
+   cp "`pwd`/libfaad2/cfft.c" $TMPC
 @@ -6314,7 +6252,7 @@
    fi
    _stripbinaries=no
diff --git a/multimedia/mplayer/files/patch-libfaad2-common.h b/multimedia/mplayer/files/patch-libfaad2-common.h
new file mode 100644
index 000000000000..94133b3318ea
--- /dev/null
+++ b/multimedia/mplayer/files/patch-libfaad2-common.h
@@ -0,0 +1,13 @@
+--- libfaad2/common.h.orig	Thu Mar 10 15:33:19 2005
++++ libfaad2/common.h	Thu Mar 10 15:34:38 2005
+@@ -328,7 +328,9 @@
+   }
+ 
+ 
+-  #if defined(_WIN32) && !defined(__MINGW32__)
++  #if defined(HAVE_LRINTF)
++    #define HAS_LRINTF
++  #elif defined(_WIN32) && !defined(__MINGW32__)
+     #define HAS_LRINTF
+     static INLINE int lrintf(float f)
+     {
diff --git a/multimedia/mplayer/files/patch-libmpcodecs-ve_x264.c b/multimedia/mplayer/files/patch-libmpcodecs-ve_x264.c
new file mode 100644
index 000000000000..f80da0fecb51
--- /dev/null
+++ b/multimedia/mplayer/files/patch-libmpcodecs-ve_x264.c
@@ -0,0 +1,22 @@
+--- libmpcodecs/ve_x264.c	Sun Mar 13 13:05:54 2005
++++ libmpcodecs/ve_x264.c.orig	Sun Mar 13 13:05:35 2005
+@@ -49,7 +49,7 @@
+ 
+ #include <x264.h>
+ 
+-#if X264_BUILD < 0x000c
++#if X264_BUILD < 0x000e
+ #error We do not support old versions of x264. Get the latest from SVN.
+ #endif
+ 
+@@ -138,8 +138,8 @@
+     
+     x264_param_default(&mod->param);
+     mod->param.i_frame_reference = frame_ref;
+-    mod->param.i_idrframe = idrframe;
+-    mod->param.i_iframe = iframe;
++    mod->param.i_keyint_max = idrframe;
++    mod->param.i_keyint_min = iframe;
+     mod->param.i_scenecut_threshold = scenecut_threshold;
+     mod->param.i_bframe = bframe;
+     mod->param.b_deblocking_filter = deblock;