MPlayer: bump to release (#3781)

media-video/mplayer/additional-files/mplayer.rdef.in

@@ -1,5 +1,5 @@
 
-resource app_flags B_ARGV_ONLY;
+resource app_flags B_MULTIPLE_LAUNCH | B_ARGV_ONLY;
 
 resource app_version {
 	major  = @MAJOR@,

media-video/mplayer/mplayer-1.4.0.recipe

@@ -20,14 +20,12 @@ fonts are supported along with 12 subtitle formats (MicroDVD, SubRip, OGM, \
 SubViewer, Sami, VPlayer, RT, SSA, AQTitle, JACOsub, PJS and our own: MPsub). \
 DVD subtitles (SPU streams, VOBsub and Closed Captions) are supported as well."
 HOMEPAGE="http://www.mplayerhq.hu/"
-COPYRIGHT="2001-2016 The MPlayer Team"
+COPYRIGHT="2001-2019 The MPlayer Team"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-srcGitRev="c4eb74cb8d8d7b8ccd9936cb18742d086492fb9f"
+SOURCE_URI="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.4.tar.xz"
-SOURCE_URI="https://github.com/extrowerk/mplayer/archive/$srcGitRev.zip"
+CHECKSUM_SHA256="82596ed558478d28248c7bc3828eb09e6948c099bbd76bb7ee745a0e3275b548"
-CHECKSUM_SHA256="ae9508e6504da751b3dc91b85aae141d6164c1da65fc270b666c0509518e45ee"
+SOURCE_DIR="MPlayer-1.4"
-SOURCE_DIR="mplayer-$srcGitRev"
-SOURCE_FILENAME="mplayer-$srcGitRev.zip"
 PATCHES="mplayer_x86-$portVersion.patchset"
 ADDITIONAL_FILES="mplayer.rdef.in"
 
@@ -56,7 +54,7 @@ REQUIRES="
 	lib:liba52$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libcaca$secondaryArchSuffix
-#	lib:libcdio$secondaryArchSuffix
+	lib:libcdio$secondaryArchSuffix
 	lib:libdca$secondaryArchSuffix
 	lib:libdv$secondaryArchSuffix
 	lib:libdvdcss$secondaryArchSuffix
@@ -113,7 +111,7 @@ BUILD_REQUIRES="
 	devel:libbz2$secondaryArchSuffix
 	devel:libcaca$secondaryArchSuffix
 	devel:libcddb$secondaryArchSuffix
-#	devel:libcdio$secondaryArchSuffix
+	devel:libcdio$secondaryArchSuffix
 	devel:libdca$secondaryArchSuffix
 	devel:libdv$secondaryArchSuffix
 	devel:libdvdcss$secondaryArchSuffix

media-video/mplayer/patches/mplayer_x86-1.4.0.patchset

@@ -1,22 +1,23 @@
-From 683eb6964591da827fe9f7c7827507d999a12696 Mon Sep 17 00:00:00 2001
+From fa11c15302e76a470d9ae76c6983e74cceafb61f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
-Date: Mon, 26 Dec 2016 17:18:13 +0100
+Date: Mon, 22 Apr 2019 11:38:50 +0200
-Subject: [PATCH] Haiku supporting code from Sergei Reznikov
+Subject: [PATCH] Haiku
 
 ---
  Makefile               |   3 +
- configure              |  42 ++++++-
+ configure              |  42 +++++-
- libao2/ao_haiku.cpp    | 195 +++++++++++++++++++++++++++++++
+ libao2/ao_haiku.cpp    | 195 ++++++++++++++++++++++++++
- libao2/audio_out.c     |   7 ++
+ libao2/audio_out.c     |   7 +
- libvo/haiku_common.cpp | 304 +++++++++++++++++++++++++++++++++++++++++++++++++
+ libvo/haiku_common.cpp | 304 +++++++++++++++++++++++++++++++++++++++++
- libvo/haiku_common.h   |  69 +++++++++++
+ libvo/haiku_common.h   |  69 ++++++++++
- libvo/haiku_view.cpp   | 171 ++++++++++++++++++++++++++++
+ libvo/haiku_view.cpp   | 171 +++++++++++++++++++++++
- libvo/haiku_view.h     |  36 ++++++
+ libvo/haiku_view.h     |  36 +++++
- libvo/haiku_window.cpp | 125 ++++++++++++++++++++
+ libvo/haiku_window.cpp | 125 +++++++++++++++++
  libvo/haiku_window.h   |  31 +++++
  libvo/video_out.c      |   4 +
- libvo/vo_haiku.cpp     | 201 ++++++++++++++++++++++++++++++++
+ libvo/vo_haiku.cpp     | 201 +++++++++++++++++++++++++++
- 12 files changed, 1185 insertions(+), 3 deletions(-)
+ path.c                 |  18 +++
+ 13 files changed, 1203 insertions(+), 3 deletions(-)
  create mode 100644 libao2/ao_haiku.cpp
  create mode 100644 libvo/haiku_common.cpp
  create mode 100644 libvo/haiku_common.h
@@ -27,7 +28,7 @@ Subject: [PATCH] Haiku supporting code from Sergei Reznikov
  create mode 100644 libvo/vo_haiku.cpp
 
 diff --git a/Makefile b/Makefile
-index f59f635..3d422c3 100644
+index efa871d..aec5a2f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -544,6 +544,9 @@ SRCS_MPLAYER-$(S3FB)          += libvo/vo_s3fb.c
@@ -41,7 +42,7 @@ index f59f635..3d422c3 100644
  SRCS_MPLAYER-$(SNDIO)         += libao2/ao_sndio.c
  SRCS_MPLAYER-$(SUNAUDIO)      += libao2/ao_sun.c
 diff --git a/configure b/configure
-index d18543d..02f2004 100755
+index d1aa8cd..52aa9b5 100755
 --- a/configure
 +++ b/configure
 @@ -228,6 +228,7 @@ qnx()       { issystem "QNX"; }
@@ -60,7 +61,7 @@ index d18543d..02f2004 100755
    --enable-kva             enable KVA video output [autodetect]
    --enable-aa              enable AAlib video output [autodetect]
    --enable-caca            enable CACA  video output [autodetect]
-@@ -678,6 +680,7 @@ _xvmc=no  #auto when complete
+@@ -682,6 +684,7 @@ _xvmc=no  #auto when complete
  _vda=auto
  _vdpau=auto
  _sdl=auto
@@ -68,7 +69,7 @@ index d18543d..02f2004 100755
  _kva=auto
  _direct3d=auto
  _directx=auto
-@@ -1028,6 +1031,8 @@ for ac_option do
+@@ -1033,6 +1036,8 @@ for ac_option do
    --disable-vdpau)      _vdpau=no       ;;
    --enable-sdl)         _sdl=yes        ;;
    --disable-sdl)        _sdl=no         ;;
@@ -77,7 +78,7 @@ index d18543d..02f2004 100755
    --enable-kva)         _kva=yes        ;;
    --disable-kva)        _kva=no         ;;
    --enable-direct3d)    _direct3d=yes   ;;
-@@ -1640,7 +1645,7 @@ else
+@@ -1676,7 +1681,7 @@ else
        cc_name=$cc_name_tmp
        echocheck "$_cc version"
        cc_vendor=gnu
@@ -86,7 +87,7 @@ index d18543d..02f2004 100755
        case $cc_version in
          2.96*)
            cc_fail=yes
-@@ -1710,7 +1715,7 @@ if test -z "$_target" ; then
+@@ -1746,7 +1751,7 @@ if test -z "$_target" ; then
    # host's CPU/instruction set
    set_host_arch() {
    case "$1" in
@@ -95,7 +96,7 @@ index d18543d..02f2004 100755
        ia64) host_arch=ia64 ;;
        macppc|ppc*|Power*) host_arch=ppc ;;
        alpha) host_arch=alpha ;;
-@@ -1749,6 +1754,7 @@ else # if test -z "$_target"
+@@ -1785,6 +1790,7 @@ else # if test -z "$_target"
        amigaos) system_name=AmigaOS ;;
        mingw32*) system_name=MINGW32 ;;
        wine) system_name=Wine ;;
@@ -103,7 +104,7 @@ index d18543d..02f2004 100755
      esac
    done
    # We need to convert underscores so that values like k6-2 and pentium-mmx can be passed
-@@ -1825,6 +1831,11 @@ if wine ; then
+@@ -1863,6 +1869,11 @@ if wine ; then
    extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK $extra_cflags"
  fi
 
@@ -115,7 +116,7 @@ index d18543d..02f2004 100755
  if darwin && test "$cc_vendor" != "clang" ; then
    extra_cflags="-falign-loops=16 -shared-libgcc $extra_cflags"
  fi
-@@ -5766,6 +5777,29 @@ fi
+@@ -5894,6 +5905,29 @@ fi
  echores "$_v4l2"
 
 
@@ -145,7 +146,7 @@ index d18543d..02f2004 100755
 
  #########
  # AUDIO #
-@@ -8005,7 +8039,7 @@ fi
+@@ -8059,7 +8093,7 @@ fi
  # (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly)
  ld_dl_dynamic=''
  freebsd || netbsd || openbsd || dragonfly || bsdos && ld_dl_dynamic='-rdynamic'
@@ -154,7 +155,7 @@ index d18543d..02f2004 100755
    ld_dl_dynamic='-rdynamic'
  fi
 
-@@ -8498,6 +8532,7 @@ RADIO_CAPTURE=$_radio_capture
+@@ -8552,6 +8586,7 @@ RADIO_CAPTURE=$_radio_capture
  REAL_CODECS = $_real
  S3FB = $_s3fb
  SDL = $_sdl
@@ -162,7 +163,7 @@ index d18543d..02f2004 100755
  SDL_IMAGE = $sdl_image
  SPEEX = $_speex
  STREAM_CACHE = $_stream_cache
-@@ -9080,6 +9115,7 @@ $def_quartz
+@@ -9153,6 +9188,7 @@ $def_quartz
  $def_s3fb
  $def_sdl
  $def_sdl_sdl_h
@@ -172,7 +173,7 @@ index d18543d..02f2004 100755
  $def_tdfxvid
 diff --git a/libao2/ao_haiku.cpp b/libao2/ao_haiku.cpp
 new file mode 100644
-index 0000000..e201f17
+index 0000000..e50f1dc
 --- /dev/null
 +++ b/libao2/ao_haiku.cpp
 @@ -0,0 +1,195 @@
@@ -1397,17 +1398,8 @@ index 0000000..614c8ff
 +}
 +
 +
--- 
-2.10.2
-
-From 38ddddaa2dd35b98fdbdaf063163cf28e288dea6 Mon Sep 17 00:00:00 2001
-From: Damillora <duniapengetahuan.12345@gmail.com>
-Date: Sun, 24 Dec 2017 13:13:40 +0700
-Subject: Put settings to user settings folder
-
-
 diff --git a/path.c b/path.c
-index b8d9335..a98f43b 100644
+index e6287d2..e5c4cd9 100644
 --- a/path.c
 +++ b/path.c
 @@ -42,6 +42,11 @@
@@ -1450,5 +1442,5 @@ index b8d9335..a98f43b 100644
  	if (filename == NULL) {
  		if ((buff = malloc(len)) == NULL)
 --
-2.14.2
+2.21.0