6 files changed, 28 insertions, 61 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 6e34f1d4fff6..ab635d4265ef 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	2
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
@@ -14,7 +13,7 @@ COMMENT=	High performance media player supporting many formats
 OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DEBUG DV DVDNAV \
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
 		LADSPA LIBMNG LIRC LZO NAS OPENAL OPENGL \
-		OPENJPEG OPUS PULSEAUDIO RTC RTMP \
+		OPENJPEG OPUS PULSEAUDIO RTMP \
 		SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \
 		X11 X11DGA X11VM XINERAMA XVIDEO XVMC
 
@@ -34,7 +33,6 @@ BLURAY_DESC?=	BluRay support
 DVDNAV_DESC?=	DVD navigation features support
 ENCA_DESC?=	Charset conversion via enca
 LZO_DESC?=	External liblzo support
-RTC_DESC?=	Add support for kernel real time clock
 RTCPU_DESC?=	Use runtime CPU detection
 SKINS_DESC?=	Install skins for GUI
 X11DGA_DESC?=	X11 DGA video driver support
@@ -85,9 +83,6 @@ pre-everything::
 
 post-patch: common-post-patch
 
-post-patch-RTC-on:
-	@${REINPLACE_CMD} -e 's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' ${WRKSRC}/mplayer.c
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 3005b62ddfa1..3f1b02e02d46 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -4,8 +4,8 @@
 #
 # $FreeBSD$
 
-MPLAYER_PORT_VERSION=	1.3.0
-MPLAYER_SNAPSHOT_DATE=	2019-03-29
+MPLAYER_PORT_VERSION=	1.4.0
+MPLAYER_SNAPSHOT_DATE=	2019-06-29
 MASTER_SITES=	LOCAL/riggs/mplayer
 DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
 WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
@@ -59,6 +59,9 @@ common-post-patch:
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} \
+		-e 's|_mm_load_si128|_mm_loadu_si128|' \
+		${WRKSRC}/sub/osd_template.c
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
 		${XARGS} -x -0 -n 10 \
diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index b8ccee0c9232..e9bad8d3255b 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -96,10 +96,6 @@ OPUS_CONFIGURE_OFF=	--disable-libopus
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
-RTC_BUILD_DEPENDS=	${LOCALBASE}/modules/rtc.ko:emulators/rtc
-RTC_RUN_DEPENDS=	${LOCALBASE}/modules/rtc.ko:emulators/rtc
-RTC_CONFIGURE_ENABLE=	rtc
-
 RTCPU_CONFIGURE_ON=	--enable-runtime-cpudetection
 
 RTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 71bcbfde6300..7738bc7613e5 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553938056
-SHA256 (mplayer-1.3.0.20190329.tar.xz) = cc77ed57d610c266e5dd9b9bccc089d6f7a86fe6397e051d11c2fda0ae843da3
-SIZE (mplayer-1.3.0.20190329.tar.xz) = 5185020
+TIMESTAMP = 1561810436
+SHA256 (mplayer-1.4.0.20190629.tar.xz) = 5cbc69dab01e8a697bb82709c942d4607ae230d317f8ac3759974377fe8db89c
+SIZE (mplayer-1.4.0.20190629.tar.xz) = 5186648
diff --git a/multimedia/mplayer/files/patch-aligned_alloc b/multimedia/mplayer/files/patch-aligned_alloc
deleted file mode 100644
index 8d50f1958505..000000000000
--- a/multimedia/mplayer/files/patch-aligned_alloc
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	2014-12-17 22:02:44.000000000 +0100
-+++ configure	2015-03-28 13:56:41.340987552 +0100
-@@ -3798,17 +3808,17 @@
- echores "$aligned_malloc"
- 
- 
--echocheck "memalign()"
-+echocheck "aligned_alloc()"
- # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ?
--def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0'
-+def_memalign='#define HAVE_MEMALIGN 0'
- _memalign=no
--statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes
-+statement_check stdlib.h 'aligned_alloc(32, 32*sizeof(char))' && _memalign=yes
- if test "$_memalign" = yes ; then
--  def_memalign='#define HAVE_MEMALIGN 1'
-+  def_map_memalign='#define memalign(a, b) aligned_alloc(a, b)'
-+  def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0'
- else
--  def_memalign='#define HAVE_MEMALIGN 0'
-   def_map_memalign='#define memalign(a, b) malloc(b)'
--  darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1'
-+  def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1'
- fi
- echores "$_memalign"
- 
-
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index 75dae6d61803..2f3f57066296 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-11-14 23:29:59 UTC
+--- configure.orig	2019-05-27 20:02:12 UTC
 +++ configure
-@@ -649,7 +649,7 @@ armthumb=auto
+@@ -654,7 +654,7 @@ armthumb=auto
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
@@ -9,7 +9,7 @@
  _ranlib=ranlib
  _windres=windres
  _cc=cc
-@@ -992,7 +992,7 @@ for ac_option do
+@@ -1000,7 +1000,7 @@ for ac_option do
      ld_static=''
      ;;
    --enable-profile)
@@ -18,7 +18,7 @@
      ;;
    --disable-profile)
      _profile=
-@@ -1464,7 +1464,6 @@ for ac_option do
+@@ -1466,7 +1466,6 @@ for ac_option do
  
    *)
      echo "Unknown parameter: $ac_option"
@@ -26,7 +26,7 @@
      ;;
  
    esac
-@@ -1502,40 +1501,6 @@ rm -f "$TMPLOG"
+@@ -1504,40 +1503,6 @@ rm -f "$TMPLOG"
  echo configuration: $configuration > "$TMPLOG"
  echo >> "$TMPLOG"
  
@@ -38,7 +38,7 @@
 -fi
 -
 -FFBRANCH=master
--test -e FFBRANCH && FFBRANCH=$(cat FFMPEG_BRANCH)
+-test -e FFBRANCH && FFBRANCH=$(cat FFBRANCH)
 -
 -if test -e ffmpeg/mp_auto_pull ; then
 -    echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
@@ -67,7 +67,7 @@
  list_subparts() {
    test ! -e ffmpeg/libav${3} && return 1
    pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1732,7 +1697,7 @@ if test -z "$_target" ; then
+@@ -1755,7 +1720,7 @@ if test -z "$_target" ; then
    case "$1" in
        x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
        ia64) host_arch=ia64 ;;
@@ -76,7 +76,7 @@
        alpha) host_arch=alpha ;;
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -1855,7 +1820,11 @@ echocheck "working compiler"
+@@ -1880,7 +1845,11 @@ echocheck "working compiler"
  cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
  echo "yes"
  
@@ -89,7 +89,7 @@
  
  if test -z "$_target" ; then
    cat > $TMPC << EOF
-@@ -3224,6 +3193,13 @@ if arm ; then
+@@ -3251,6 +3220,13 @@ if arm ; then
    fi
    echores "$setend"
  
@@ -103,7 +103,7 @@
    echocheck "softfloat ABI"
    softfloat=yes
    cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
-@@ -3993,7 +3969,7 @@ echocheck "pthread"
+@@ -4080,7 +4056,7 @@ echocheck "pthread"
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
@@ -112,7 +112,7 @@
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
-@@ -4003,7 +3979,7 @@ int main(void) { pthread_t tid; return p
+@@ -4090,7 +4066,7 @@ int main(void) { pthread_t tid; return pthread_create(
  EOF
  _pthreads=no
  if ! hpux ; then
@@ -121,7 +121,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
-@@ -4152,7 +4128,7 @@ int main(void) {
+@@ -4239,7 +4215,7 @@ int main(void) {
  }
  EOF
    _iconv=no
@@ -130,7 +130,7 @@
      cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
        ld_iconv="$ld_tmp" && _iconv=yes && break
    done
-@@ -5565,15 +5541,6 @@ EOF
+@@ -5685,15 +5661,6 @@ EOF
        break
      fi
    done
@@ -146,7 +146,7 @@
    if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
      _gl=yes
      _gl_win32=yes
-@@ -6137,7 +6104,7 @@ elif darwin ; then
+@@ -6257,7 +6224,7 @@ elif darwin ; then
  elif dragonfly ; then
    default_cdrom_device="/dev/cd0"
  elif freebsd ; then
@@ -155,7 +155,7 @@
  elif openbsd ; then
    default_cdrom_device="/dev/rcd0c"
  elif sunos ; then
-@@ -6150,7 +6117,7 @@ else
+@@ -6270,7 +6237,7 @@ else
    default_cdrom_device="/dev/cdrom"
  fi
  
@@ -164,7 +164,7 @@
    default_dvd_device=$default_cdrom_device
  elif darwin ; then
    default_dvd_device="/dev/rdiskN"
-@@ -6667,7 +6634,7 @@ echores "$_speex"
+@@ -6788,7 +6755,7 @@ echores "$_speex"
  echocheck "libgsm"
  if test "$_libgsm" = auto ; then
    _libgsm=no
@@ -173,7 +173,7 @@
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -7152,6 +7119,16 @@ if test "$_librtmp" = yes && test "$netw
+@@ -7264,6 +7231,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
@@ -190,7 +190,7 @@
  else
    nolibrtmp=yes
    _librtmp=no
-@@ -7553,7 +7530,7 @@ echores "$_mp3lame"
+@@ -7594,7 +7571,7 @@ echores "$_mp3lame"
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
@@ -199,7 +199,7 @@
  fi
  echores "$_mencoder"
  
-@@ -8159,7 +8136,7 @@ libs_mplayer=$ld_tmp
+@@ -8200,7 +8177,7 @@ libs_mplayer=$ld_tmp
  
  #############################################################################