- Update mplayer and memcoder to 2012-03-22 shapshot

- Supersedes ports/164943

PR:		ports/166946
Submitted by:	Thomas Zander <thomas.e.zander@googlemail.com> (maintainer)

12 files changed, 44 insertions, 48 deletions

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index ddca86985f37..2995d6231a38 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	1
+
 COMMENT=	Convenient video file and movie encoder
 RESTRICTED=	Port has restricted dependencies
 
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index dce9191bc78c..5f80b1e5bccd 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mplayer-1.0rc20111218.tar.xz) = 9e70b0f5d3f0840024583cfedc186b4342d3385ed88b2085efc080e5c006c03f
-SIZE (mplayer-1.0rc20111218.tar.xz) = 9132500
+SHA256 (mplayer-1.0rc20120322.tar.xz) = 602a5a1c4e25ae054fdc2df49c19672b189978df12617748feb5307ff16b33cd
+SIZE (mplayer-1.0rc20120322.tar.xz) = 10033056
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 0f72f21d3d4f..2d3efefa45f5 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	4
+
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
@@ -283,7 +283,7 @@ post-install:
 .endfor
 .if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
 	@${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer
-	${INSTALL_DATA} ${WRKSRC}/gui/ui/pixmaps/mplayer.xpm ${LOCALBASE}/share/pixmaps
+	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${LOCALBASE}/share/pixmaps/mplayer.png
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index bc577d707814..d99bf218fbaf 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -44,12 +44,10 @@ CONFIGURE_ARGS+=--language=${WITH_LANG}
 DEBUG_FLAGS=	-g -O -fomit-frame-pointer
 .endif
 .else
-#Historically, we manually set OCFLAGS to -O3 -ffast-math -fomit-frame-pointer
-#Nowadays, let mplayer determine its own optimised flags
 .if defined(WITHOUT_OCFLAGS)
 CFLAGS+=	-O -fomit-frame-pointer
 .else
-CONFIGURE_ENV+=		CFLAGS=
+CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math
 .endif
 .endif #WITH_DEBUG
 
diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared
index 5d9887ddfdb8..191ca85ee332 100644
--- a/multimedia/mplayer/Makefile.shared
+++ b/multimedia/mplayer/Makefile.shared
@@ -4,7 +4,7 @@
 #
 # $FreeBSD$
 
-MPLAYER_SNAPSHOT_DATE=	2011-12-18
+MPLAYER_SNAPSHOT_DATE=	2012-03-22
 MPLAYER_PORT_VERSION=	1.0.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index dce9191bc78c..5f80b1e5bccd 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mplayer-1.0rc20111218.tar.xz) = 9e70b0f5d3f0840024583cfedc186b4342d3385ed88b2085efc080e5c006c03f
-SIZE (mplayer-1.0rc20111218.tar.xz) = 9132500
+SHA256 (mplayer-1.0rc20120322.tar.xz) = 602a5a1c4e25ae054fdc2df49c19672b189978df12617748feb5307ff16b33cd
+SIZE (mplayer-1.0rc20120322.tar.xz) = 10033056
diff --git a/multimedia/mplayer/files/patch-Makefile b/multimedia/mplayer/files/patch-Makefile
index 14fd45289cac..57a9879fe52c 100644
--- a/multimedia/mplayer/files/patch-Makefile
+++ b/multimedia/mplayer/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2011-03-28 12:50:56.000000000 -0300
-+++ Makefile	2011-07-18 23:23:16.000000000 -0300
-@@ -899,20 +899,17 @@
+--- Makefile.orig	2012-03-03 17:45:15.000000000 +0100
++++ Makefile	2012-03-22 15:26:08.719328325 +0100
+@@ -904,20 +904,17 @@
  install: $(INSTALL_TARGETS-yes)
  
  install-dirs:
@@ -10,14 +10,14 @@
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
 +install-mplayer: mplayer$(EXESUF) install-dirs
 +	@${BSD_INSTALL_PROGRAM} mplayer$(EXESUF) $(BINDIR)
-+
  
- install-gui: install-mplayer
+-install-gui: install-mplayer install-gui-icons
 -	-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
--	$(INSTALL) -d $(DATADIR)/skins $(prefix)/share/pixmaps $(prefix)/share/applications
--	$(INSTALL) -m 644 etc/mplayer.png $(prefix)/share/pixmaps/
+-	$(INSTALL) -d $(DATADIR)/skins $(prefix)/share/applications
 -	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
++install-gui: install-mplayer
  
+ install-gui-icons:    $(foreach size,$(GUI_ICONSIZES),install-gui-icon-$(size))
  install-gui-man:      $(foreach lang,$(MAN_LANGS),install-gui-man-$(lang))
  install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
 -install-mplayer-man:  $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index cd92fadd22ea..4ceff63c7241 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2011-12-15 15:01:05.000000000 +0100
-+++ configure	2011-12-29 02:08:51.963305635 +0100
-@@ -635,7 +635,7 @@
+--- configure.orig	2012-03-15 16:20:02.000000000 +0100
++++ configure	2012-03-22 15:36:16.583006073 +0100
+@@ -637,7 +637,7 @@
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
@@ -9,7 +9,7 @@
  _ranlib=ranlib
  _windres=windres
  _cc=cc
-@@ -1447,7 +1447,6 @@
+@@ -1455,7 +1455,6 @@
  
    *)
      echo "Unknown parameter: $ac_option"
@@ -17,7 +17,7 @@
      ;;
  
    esac
-@@ -3565,7 +3564,7 @@
+@@ -3576,7 +3575,7 @@
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
@@ -26,7 +26,7 @@
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
-@@ -3575,7 +3574,7 @@
+@@ -3586,7 +3585,7 @@
  EOF
  _pthreads=no
  if ! hpux ; then
@@ -35,7 +35,7 @@
      # for crosscompilation, we cannot execute the program, be happy if we can link statically
      cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
    done
-@@ -6216,7 +6215,7 @@
+@@ -6245,7 +6244,7 @@
  echocheck "libgsm"
  if test "$_libgsm" = auto ; then
    _libgsm=no
@@ -44,7 +44,7 @@
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -6716,6 +6715,16 @@
+@@ -6705,6 +6704,16 @@
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
@@ -61,16 +61,16 @@
  else
    nolibrtmp=yes
    _librtmp=no
-@@ -7085,7 +7094,7 @@
+@@ -7097,7 +7106,7 @@
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
 -  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
 +  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
-   # needed for codec id -> tag conversion
-   libavmuxers="AVI_MUXER"
  fi
-@@ -7425,8 +7434,11 @@
+ echores "$_mencoder"
+ 
+@@ -7435,8 +7444,11 @@
  if test "$_gui" = yes ; then
  
    # Required libraries
@@ -84,7 +84,7 @@
      die "The GUI requires libavcodec with PNG support (needs zlib)."
    fi
    test "$_freetype" = no && test "$_bitmap_font" = no &&
-@@ -7991,7 +8003,7 @@
+@@ -8001,7 +8013,7 @@
  EXESUF      = $_exesuf
  EXESUFS_ALL = .exe
  
diff --git a/multimedia/mplayer/files/patch-libavcodec-Makefile b/multimedia/mplayer/files/patch-libavcodec-Makefile
index 2c3322efb679..5d12820abc3a 100644
--- a/multimedia/mplayer/files/patch-libavcodec-Makefile
+++ b/multimedia/mplayer/files/patch-libavcodec-Makefile
@@ -1,12 +1,11 @@
---- ffmpeg/libavcodec/Makefile.orig	2011-11-18 19:20:08.000000000 +0100
-+++ ffmpeg/libavcodec/Makefile	2011-11-26 19:47:40.015896744 +0100
-@@ -699,14 +699,14 @@
+--- ffmpeg/libavcodec/Makefile.orig	2012-03-21 19:20:05.000000000 +0100
++++ ffmpeg/libavcodec/Makefile	2012-03-22 16:12:43.333951792 +0100
+@@ -735,12 +735,14 @@
  # well.
  OBJS-$(!CONFIG_SMALL)                  += inverse.o
  
---include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile
 +-include $(SRC_PATH)/$(SUBDIR)$(MPLAYER_ARCH)/Makefile
- 
++
  SKIPHEADERS                            += %_tablegen.h                  \
                                            %_tables.h                    \
                                            aac_tablegen_decl.h           \
diff --git a/multimedia/mplayer/files/patch-libavcodec-libgsm.c b/multimedia/mplayer/files/patch-libavcodec-libgsm.c
index 36ea202adb32..a508405994cc 100644
--- a/multimedia/mplayer/files/patch-libavcodec-libgsm.c
+++ b/multimedia/mplayer/files/patch-libavcodec-libgsm.c
@@ -1,11 +1,11 @@
---- ffmpeg/libavcodec/libgsm.c.orig	2011-03-12 15:13:38.000000000 +0100
-+++ ffmpeg/libavcodec/libgsm.c	2011-03-18 17:17:26.901267039 +0100
-@@ -28,7 +28,7 @@
+--- ffmpeg/libavcodec/libgsm.c.orig	2012-01-29 19:20:05.000000000 +0100
++++ ffmpeg/libavcodec/libgsm.c	2012-03-22 18:07:58.682722034 +0100
+@@ -27,7 +27,7 @@
+ 
  // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
  
- #include "avcodec.h"
 -#include <gsm/gsm.h>
 +#include <gsm.h>
  
- // gsm.h misses some essential constants
- #define GSM_BLOCK_SIZE 33
+ #include "avcodec.h"
+ #include "gsm.h"
diff --git a/multimedia/mplayer/files/patch-libavfilter-Makefile b/multimedia/mplayer/files/patch-libavfilter-Makefile
index fec0f7f6b0ea..a825ed3e0eee 100644
--- a/multimedia/mplayer/files/patch-libavfilter-Makefile
+++ b/multimedia/mplayer/files/patch-libavfilter-Makefile
@@ -1,10 +1,9 @@
---- ffmpeg/libavfilter/Makefile.orig	2011-11-26 19:50:38.592463304 +0100
-+++ ffmpeg/libavfilter/Makefile	2011-11-26 19:50:38.570462855 +0100
-@@ -153,7 +153,7 @@
+--- ffmpeg/libavfilter/Makefile.orig	2012-03-21 19:20:05.000000000 +0100
++++ ffmpeg/libavfilter/Makefile	2012-03-22 16:09:31.826872990 +0100
+@@ -167,6 +167,7 @@
+ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o
  OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
  
- 
---include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile
 +-include $(SRC_PATH)/$(SUBDIR)$(MPLAYER_ARCH)/Makefile
  
  DIRS = x86 libmpcodecs
diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist
index 199230b279b2..9b6051720e0e 100644
--- a/multimedia/mplayer/pkg-plist
+++ b/multimedia/mplayer/pkg-plist
@@ -1,6 +1,6 @@
 bin/mplayer
 %%GMPLAYER%%bin/gmplayer
-%%GMPLAYER%%share/pixmaps/mplayer.xpm
+%%GMPLAYER%%share/pixmaps/mplayer.png
 %%DATADIR%%/examples/etc/example.conf
 %%DATADIR%%/examples/etc/input.conf
 %%DATADIR%%/examples/etc/menu.conf