Update to mplayer snapshot as of 20151219

7 files changed, 42 insertions, 33 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 3a4eb5529b65..3fd9ac560b71 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	8
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
@@ -151,7 +150,8 @@ post-patch:
 			-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
 			-e 's|[[:space:]]gcc| ${CC}|' \
 			-e 's|\$$\(CC\)|${CC}|' \
-			-e 's|/usr/X11R6|${LOCALBASE}|'
+			-e 's|/usr/X11R6|${LOCALBASE}|' \
+			-e 's|%%LOCALBASE%%|${LOCALBASE}|'
 	@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index ea45bd973f45..a5f173b88e1c 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -4,8 +4,8 @@
 #
 # $FreeBSD$
 
-MPLAYER_SNAPSHOT_DATE=	2015-08-22
-MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
+MPLAYER_SNAPSHOT_DATE=	2015-12-19
+MPLAYER_PORT_VERSION=	1.2.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
 FFMPEG_VERSION=	2.8.3
 MASTER_SITES=	LOCAL/riggs/mplayer:local \
 		http://ffmpeg.org/releases/:ffmpeg
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 7c21d22396b4..fcaed24b76a3 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,4 +1,4 @@
 SHA256 (ffmpeg-2.8.3.tar.bz2) = 1bcf993a71839bb4a37eaa0c51daf315932b6dad6089f672294545cc51a5caf6
 SIZE (ffmpeg-2.8.3.tar.bz2) = 8576798
-SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7
-SIZE (mplayer-1.1.20150822.tar.xz) = 5162400
+SHA256 (mplayer-1.2.20151219.tar.xz) = f11d1100a1c37ec9e3e19c7698baf77871ae305ae431ec4a3dc187ca9316e4a2
+SIZE (mplayer-1.2.20151219.tar.xz) = 5167716
diff --git a/multimedia/mplayer/files/patch-Makefile b/multimedia/mplayer/files/patch-Makefile
index cbb2a29c7565..93a051337316 100644
--- a/multimedia/mplayer/files/patch-Makefile
+++ b/multimedia/mplayer/files/patch-Makefile
@@ -1,5 +1,14 @@
 --- Makefile.orig	2015-06-03 11:58:05 UTC
 +++ Makefile
+@@ -752,7 +752,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+ codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
+ codec-cfg$(EXESUF) codecs2html$(EXESUF):  HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
+ codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
+-	$(HOST_CC) $(HOSTCFLAGS) -o $@ $<
++	$(HOST_CC) $(HOSTCFLAGS) -I%%LOCALBASE%%/include -o $@ $<
+ 
+ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
+ 	./$^ > $@
 @@ -855,20 +855,17 @@ $(VIDIX_OBJS): $(VIDIX_PCI_FILES)
  install: $(INSTALL_TARGETS-yes)
  
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index 3a81e72a17d6..c2819e4fdeb4 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2015-08-02 17:29:05 UTC
+--- configure.orig	2015-12-18 14:53:21 UTC
 +++ configure
 @@ -646,7 +646,7 @@ armthumb=auto
  _iwmmxt=auto
@@ -48,7 +48,7 @@
  
  if test -z "$_target" ; then
    cat > $TMPC << EOF
-@@ -3170,6 +3173,13 @@ if arm ; then
+@@ -3194,6 +3197,13 @@ if arm ; then
    fi
    echores "$setend"
  
@@ -62,7 +62,7 @@
    echocheck "softfloat ABI"
    softfloat=yes
    cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
-@@ -3920,7 +3930,7 @@ echocheck "pthread"
+@@ -3944,7 +3954,7 @@ echocheck "pthread"
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
@@ -71,7 +71,7 @@
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
-@@ -3930,7 +3940,7 @@ int main(void) { pthread_t tid; return p
+@@ -3954,7 +3964,7 @@ int main(void) { pthread_t tid; return p
  EOF
  _pthreads=no
  if ! hpux ; then
@@ -80,16 +80,16 @@
      # 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
-@@ -4082,7 +4092,7 @@ EOF
-   # NOTE: -L/usr/lib is a hack to avoid issues due to a
-   # broken libiconv that e.g. macports installs into /opt/local/lib
-   # which might get addded to the search path later by e.g. SDL
--  for ld_tmp in "" "-L/usr/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
+@@ -4103,7 +4113,7 @@ int main(void) {
+ }
+ EOF
+   _iconv=no
+-  for ld_tmp in "" "-liconv" "-liconv $ld_dl" ; do
 +  for ld_tmp in "" "-L$_prefix/lib -liconv" "-L%%LOCALBASE%%/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
      cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
        ld_iconv="$ld_tmp" && _iconv=yes && break
    done
-@@ -5484,15 +5494,6 @@ EOF
+@@ -5505,15 +5515,6 @@ EOF
        break
      fi
    done
@@ -105,7 +105,7 @@
    if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
      _gl=yes
      _gl_win32=yes
-@@ -6056,7 +6057,7 @@ elif darwin ; then
+@@ -6077,7 +6078,7 @@ elif darwin ; then
  elif dragonfly ; then
    default_cdrom_device="/dev/cd0"
  elif freebsd ; then
@@ -114,7 +114,7 @@
  elif openbsd ; then
    default_cdrom_device="/dev/rcd0c"
  elif sunos ; then
-@@ -6069,7 +6070,7 @@ else
+@@ -6090,7 +6091,7 @@ else
    default_cdrom_device="/dev/cdrom"
  fi
  
@@ -123,7 +123,7 @@
    default_dvd_device=$default_cdrom_device
  elif darwin ; then
    default_dvd_device="/dev/rdiskN"
-@@ -6586,7 +6587,7 @@ echores "$_speex"
+@@ -6607,7 +6608,7 @@ echores "$_speex"
  echocheck "libgsm"
  if test "$_libgsm" = auto ; then
    _libgsm=no
@@ -132,7 +132,7 @@
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -7071,6 +7072,16 @@ if test "$_librtmp" = yes && test "$netw
+@@ -7092,6 +7093,16 @@ if test "$_librtmp" = yes && test "$netw
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
@@ -149,7 +149,7 @@
  else
    nolibrtmp=yes
    _librtmp=no
-@@ -7471,7 +7482,7 @@ echores "$_mp3lame"
+@@ -7493,7 +7504,7 @@ echores "$_mp3lame"
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
@@ -158,7 +158,7 @@
  fi
  echores "$_mencoder"
  
-@@ -8072,7 +8083,7 @@ libs_mplayer=$ld_tmp
+@@ -8094,7 +8105,7 @@ libs_mplayer=$ld_tmp
  
  #############################################################################
  
@@ -167,7 +167,7 @@
  
  CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
  
-@@ -8353,7 +8364,7 @@ TIMER = $_timer
+@@ -8375,7 +8386,7 @@ TIMER = $_timer
  EXESUF      = $_exesuf
  EXESUFS_ALL = .exe
  
diff --git a/multimedia/mplayer/files/patch-gui_wm_ws.c b/multimedia/mplayer/files/patch-gui_wm_ws.c
deleted file mode 100644
index 50bdecf5972f..000000000000
--- a/multimedia/mplayer/files/patch-gui_wm_ws.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gui/wm/ws.c.orig	2015-08-01 07:44:07 UTC
-+++ gui/wm/ws.c
-@@ -1322,6 +1322,7 @@ void wsImageCreate(wsWindow *win, int w,
-         win->xImage->data     = win->Shminfo.shmaddr;
-         win->Shminfo.readOnly = False;
-         XShmAttach(wsDisplay, &win->Shminfo);
-+	XSync(wsDisplay, False);
-         shmctl(win->Shminfo.shmid, IPC_RMID, 0);
-     } else
- #endif
diff --git a/multimedia/mplayer/files/patch-stream_stream__vcd.c b/multimedia/mplayer/files/patch-stream_stream__vcd.c
new file mode 100644
index 000000000000..c6125445120b
--- /dev/null
+++ b/multimedia/mplayer/files/patch-stream_stream__vcd.c
@@ -0,0 +1,10 @@
+--- stream/stream_vcd.c.orig	2015-08-31 08:14:54 UTC
++++ stream/stream_vcd.c
+@@ -39,6 +39,7 @@
+ #include <errno.h>
+ 
+ #if CONFIG_LIBCDIO
++#include <sys/cdrio.h>
+ #include "vcd_read_libcdio.h"
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include "vcd_read_fbsd.h"