[pkgsrc/trunk]: pkgsrc mplayer, related packages: update to 1.5

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e483c9600cf
branches:  trunk
changeset: 377678:0e483c9600cf
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Apr 24 15:00:42 2022 +0000

description:
mplayer, related packages: update to 1.5

some changes to attempt to make mplayer in pkgsrc less
"absurdly complicated"

  1.5: "Hope" February 27, 2022

    Decoders, demuxers, streams:
    * ffmpeg12vpdau is no longer supported by FFmpeg,
      provide separate ffmpeg1vpdau and ffmpeg2vdpau instead
    * live555 deprecated and disabled by default, will be removed
      in future

    GUI:
    * Fix wrongly sized video window after leaving fullscreen mode
    * Clear screen when switching to fullscreen mode using the x11
      video output driver
    * Command line option -fs is now recognized in addition to the
      GUI option load_fullscreen
    * Use correct visual in OpenGL video output driver for X11
    * Provide a built-in skin so that the GUI can be used even
      without an installed skin
    * Native Language Support, i.e. the GUI language can be changed
      as specified in LC_MESSAGES or LANG
    * Minor bug fixes

    Other:
    * Building on Arm now compiles for the ISA and extensions of the
      host CPU by default. This should avoid issues like builds on
      e.g. Raspbian not using NEON by default.
      Can use --enable-runtime-cpudetection to restore the previous
      behaviour, though full runtime CPU detection is not supported.
    * New configure option --enable-nls for Native Language Support at
      runtime (for the moment only for the GUI and enabled by default
      for it)
    * macOS: Fixes for retina display, sluggish input processing

diffstat:

 multimedia/mplayer-share/Makefile                              |   3 +-
 multimedia/mplayer-share/Makefile.cflags                       |  24 ----
 multimedia/mplayer-share/Makefile.common                       |   4 +-
 multimedia/mplayer-share/depends.mk                            |  12 ++
 multimedia/mplayer-share/distinfo                              |  14 +-
 multimedia/mplayer-share/options.mk                            |  59 ++++++---
 multimedia/mplayer-share/patches/patch-configure               |  46 +++---
 multimedia/mplayer-share/patches/patch-libmpcodecs_ad__spdif.c |  24 ----
 multimedia/mplayer-share/patches/patch-libvo_vo__gif89a.c      |  41 ------
 multimedia/mplayer-share/patches/patch-libvo_vo__vdpau.c       |  15 --
 multimedia/mplayer-share/patches/patch-sub_osd.c               |  18 ---
 multimedia/mplayer/Makefile                                    |  18 +--
 sysutils/mencvcd/Makefile                                      |   4 +-
 sysutils/mencvcd/distinfo                                      |   8 +-
 14 files changed, 90 insertions(+), 200 deletions(-)

diffs (truncated from 571 to 300 lines):

diff -r 8513f75e06a7 -r 0e483c9600cf multimedia/mplayer-share/Makefile
--- a/multimedia/mplayer-share/Makefile Sun Apr 24 15:00:24 2022 +0000
+++ b/multimedia/mplayer-share/Makefile Sun Apr 24 15:00:42 2022 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2022/03/28 10:45:25 tnn Exp $
+# $NetBSD: Makefile,v 1.81 2022/04/24 15:00:42 nia Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       mplayer-share-${MPLAYER_VERSION}
-PKGREVISION=   15
 COMMENT=       Documentation used by mplayer and gmplayer
 
 DEPENDS+=      mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts
diff -r 8513f75e06a7 -r 0e483c9600cf multimedia/mplayer-share/Makefile.cflags
--- a/multimedia/mplayer-share/Makefile.cflags  Sun Apr 24 15:00:24 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile.cflags,v 1.9 2018/05/27 15:27:13 tsutsui Exp $
-
-# This must be included after everything else to truly clear ${CFLAGS}
-# in the non-runtime-cpu-detection case. If ${CFLAGS} is non-empty, the
-# configure script refuses to add any optimizations at all.
-
-.if !empty(PKG_OPTIONS:Mmplayer-default-cflags)
-.  if ${MACHINE_ARCH} == "i386" && !empty(PKGSRC_COMPILER:Mgcc)
-# Schedule for the typical machine fast enough to run mplayer. This
-# is nearly optimal for K6-2 as well. Anything slower will still run
-# (but would probably benefit greatly from turning off the run-time
-# cpu detection).
-
-.    include "../../mk/compiler.mk"
-
-.    if !empty(CC_VERSION:Mgcc-[4567]*)
-CFLAGS+=       -O3 -ffast-math -fomit-frame-pointer -mtune=pentiumpro
-.    else
-CFLAGS+=       -O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro
-.    endif
-.  else
-CFLAGS+=       -O3 -ffast-math -fomit-frame-pointer
-.  endif
-.endif
diff -r 8513f75e06a7 -r 0e483c9600cf multimedia/mplayer-share/Makefile.common
--- a/multimedia/mplayer-share/Makefile.common  Sun Apr 24 15:00:24 2022 +0000
+++ b/multimedia/mplayer-share/Makefile.common  Sun Apr 24 15:00:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.65 2020/06/05 12:17:10 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.66 2022/04/24 15:00:42 nia Exp $
 # used by multimedia/gmplayer/Makefile
 # used by multimedia/mencoder/Makefile
 # used by multimedia/mplayer/Makefile
@@ -6,7 +6,7 @@
 # sysutils/mencvcd uses one file from the tarball, please update
 # it when updating this package.
 
-MPLAYER_VERSION=       1.4
+MPLAYER_VERSION=       1.5
 
 DISTNAME=              MPlayer-${MPLAYER_VERSION}
 
diff -r 8513f75e06a7 -r 0e483c9600cf multimedia/mplayer-share/depends.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/depends.mk       Sun Apr 24 15:00:42 2022 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: depends.mk,v 1.1 2022/04/24 15:00:42 nia Exp $
+#
+
+DEPENDS+=      mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../multimedia/ffmpeg5/buildlink3.mk"
+.include "../../multimedia/libass/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
diff -r 8513f75e06a7 -r 0e483c9600cf multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Sun Apr 24 15:00:24 2022 +0000
+++ b/multimedia/mplayer-share/distinfo Sun Apr 24 15:00:42 2022 +0000
@@ -1,23 +1,19 @@
-$NetBSD: distinfo,v 1.101 2021/10/26 11:01:13 nia Exp $
+$NetBSD: distinfo,v 1.102 2022/04/24 15:00:42 nia Exp $
 
-BLAKE2s (mplayer/MPlayer-1.4.tar.xz) = 6a705d082c5742bb4e0e1da296e910c6696cc768bb56325d15c203d77dd7c831
-SHA512 (mplayer/MPlayer-1.4.tar.xz) = 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34
-Size (mplayer/MPlayer-1.4.tar.xz) = 15054920 bytes
+BLAKE2s (mplayer/MPlayer-1.5.tar.xz) = 1a86b823bcc82e07cf43551151449dd1cbdd768d8281ebe32cea6ced91d029c5
+SHA512 (mplayer/MPlayer-1.5.tar.xz) = 05fe1edf23cec53be676333b6299df4b3f1ee746e5ccd96dc0bed550e7a1602ba7ba182c1cc23fcac67aacde849a46628b1dcab8ee3d3d4117415c11b6a6ad74
+Size (mplayer/MPlayer-1.5.tar.xz) = 15379972 bytes
 SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
-SHA1 (patch-configure) = 1bba1d39be27c31f2345c8303f252404538c192f
+SHA1 (patch-configure) = 70eee721bfb49e811d1b3c9376bdada5438f6b17
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
 SHA1 (patch-libao2_ao__alsa.c) = da568da8b9290f1ed49ecedec7dc9141408698b1
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
-SHA1 (patch-libmpcodecs_ad__spdif.c) = e44131414a599efc5bc0b96ed19b5ad46cb0d381
 SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec
-SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825
-SHA1 (patch-libvo_vo__vdpau.c) = df3de0e079f7047228065bf36390aa3ad01b7f97
 SHA1 (patch-mplayer.c) = 8cfdca9d062d4a10320a0471c91dd7c264aa963c
 SHA1 (patch-stream_ai__alsa.c) = 1ed116931f4fde910c9bbe23680463a71631185c
 SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
 SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
 SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8
-SHA1 (patch-sub_osd.c) = 95f1bc1c20f181720a2a073acbb3abdde3921608
 SHA1 (patch-sub_subreader.c) = 3ec0d3824b6e9fe34cb33e9463d833868f0b03c1
diff -r 8513f75e06a7 -r 0e483c9600cf multimedia/mplayer-share/options.mk
--- a/multimedia/mplayer-share/options.mk       Sun Apr 24 15:00:24 2022 +0000
+++ b/multimedia/mplayer-share/options.mk       Sun Apr 24 15:00:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.68 2021/06/22 12:35:45 nia Exp $
+# $NetBSD: options.mk,v 1.69 2022/04/24 15:00:42 nia Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -6,8 +6,6 @@
 # not defined yet, so we cannot use it here.
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 
-.include "../../mk/oss.buildlink3.mk"
-
 .include "../../multimedia/libvdpau/available.mk"
 .include "../../comms/lirc/available.mk"
 
@@ -23,17 +21,15 @@
 
 # Options supported by both mplayer* or mencoder*.
 
-PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv png theora vorbis x264 debug
+PKG_SUPPORTED_OPTIONS= gif gnutls jpeg mad dts dv png theora vorbis x264 debug
 PKG_SUPPORTED_OPTIONS+=        dvdread dvdnav libmpg123 opus
-.  if ${OSS_TYPE} != "none"
-PKG_SUPPORTED_OPTIONS+=        oss
-.  endif
 
 PKG_SUPPORTED_OPTIONS+=                faad
 
 # Set options based on the specific package being built.
 .  if !empty(PKGNAME:M*mplayer*)
-PKG_SUPPORTED_OPTIONS+=        aalib alsa caca ggi mplayer-menu nas pulseaudio sdl
+PKG_SUPPORTED_OPTIONS+=        aalib alsa caca ggi gnutls jack ladspa mplayer-menu nas
+PKG_SUPPORTED_OPTIONS+=        openal pulseaudio sdl
 
 .    if ${VDPAU_AVAILABLE} == "yes"
 PKG_SUPPORTED_OPTIONS+=        vdpau
@@ -54,8 +50,7 @@
 PKG_SUPPORTED_OPTIONS.SunOS+=  mlib
 PKG_SUPPORTED_OPTIONS.Linux+=  vidix
 
-# TODO: v4l2 option probably could be supported on Linux and OpenBSD too
-.  if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
+.  if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
 PKG_SUPPORTED_OPTIONS+=        v4l2
 PKG_SUGGESTED_OPTIONS+=        v4l2
 .  endif
@@ -66,7 +61,7 @@
 PKG_SUPPORTED_OPTIONS+=        mplayer-runtime-cpudetection
 .  endif
 .  if ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS+=        mplayer-default-cflags mplayer-win32
+PKG_SUPPORTED_OPTIONS+=        mplayer-win32
 .  endif
 .  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 PKG_SUPPORTED_OPTIONS+=        mplayer-ssse3
@@ -80,10 +75,10 @@
 # Define PKG_SUGGESTED_OPTIONS.
 # -------------------------------------------------------------------------
 
-.  for o in   dvdread dvdnav gif jpeg \
-           mplayer-menu \
-           mplayer-default-cflags mplayer-runtime-cpudetection \
-           oss png sdl vdpau lirc
+.  for o in   dvdread dvdnav gif gnutls jpeg \
+           ladspa mplayer-menu \
+           mplayer-runtime-cpudetection \
+           png sdl vdpau lirc
 .    if !empty(PKG_SUPPORTED_OPTIONS:M${o})
 PKG_SUGGESTED_OPTIONS+=                ${o}
 .    endif
@@ -265,12 +260,6 @@
 CONFIGURE_ARGS+=       --disable-nas
 .  endif
 
-.  if ${OSS_TYPE} != "none" && !empty(PKG_OPTIONS:Moss)
-CONFIGURE_ARGS+=       --enable-ossaudio
-.  else
-CONFIGURE_ARGS+=       --disable-ossaudio
-.  endif
-
 .  if !empty(PKG_OPTIONS:Mpng)
 CONFIGURE_ARGS+=       --enable-png
 .    include "../../graphics/png/buildlink3.mk"
@@ -349,6 +338,34 @@
 CONFIGURE_ARGS+=       --disable-lirc
 .  endif
 
+.  if !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+=       --enable-gnutls
+.    include "../../security/gnutls/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=       --disable-gnutls
+.  endif
+
+.  if !empty(PKG_OPTIONS:Mjack)
+CONFIGURE_ARGS+=       --enable-jack
+.    include "../../audio/jack/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=       --disable-jack
+.  endif
+
+.  if !empty(PKG_OPTIONS:Mopenal)
+CONFIGURE_ARGS+=       --enable-openal
+.    include "../../audio/openal-soft/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=       --disable-openal
+.  endif
+
+.  if !empty(PKG_OPTIONS:Mladspa)
+CONFIGURE_ARGS+=       --enable-ladspa
+.    include "../../audio/ladspa/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=       --disable-ladspa
+.  endif
+
 # -------------------------------------------------------------------------
 # Handle extra libraries (part 1)
 # -------------------------------------------------------------------------
diff -r 8513f75e06a7 -r 0e483c9600cf multimedia/mplayer-share/patches/patch-configure
--- a/multimedia/mplayer-share/patches/patch-configure  Sun Apr 24 15:00:24 2022 +0000
+++ b/multimedia/mplayer-share/patches/patch-configure  Sun Apr 24 15:00:42 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2019/06/02 09:48:11 tsutsui Exp $
+$NetBSD: patch-configure,v 1.4 2022/04/24 15:00:42 nia Exp $
 
 o Handle properly sh3, evbarm, and arm64 ports on NetBSD.
 o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
@@ -12,9 +12,9 @@
 o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD
   (see PR/54229) and OpenBSD (no /dev/sound since 6.1)
 
---- configure.orig     2016-02-13 21:05:42.000000000 +0000
+--- configure.orig     2022-02-27 09:09:00.000000000 +0000
 +++ configure
-@@ -1640,7 +1640,7 @@ else
+@@ -1768,7 +1768,7 @@ else
        cc_name=$cc_name_tmp
        echocheck "$_cc version"
        cc_vendor=gnu
@@ -23,10 +23,10 @@
        case $cc_version in
          2.96*)
            cc_fail=yes
-@@ -1717,8 +1717,13 @@ if test -z "$_target" ; then
+@@ -1845,8 +1845,13 @@ if test -z "$_target" ; then
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
-       aarch64*) host_arch=aarch64 ;;
+       aarch64*|ARM64) host_arch=aarch64 ;;
 -      arm*|zaurus|cats) host_arch=arm ;;
 -      sh3|sh4|sh4a) host_arch=sh ;;
 +      arm*|zaurus|cats|evbarm)
@@ -39,7 +39,7 @@
        s390) host_arch=s390 ;;
        s390x) host_arch=s390x ;;
        *mips*) host_arch=mips ;;
-@@ -1930,7 +1935,7 @@ if x86 ; then
+@@ -2068,7 +2073,7 @@ if x86 ; then
    # gather more CPU information
    pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1)
    pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -n 1)
@@ -48,7 +48,7 @@
    pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
    pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
  
-@@ -2446,7 +2451,12 @@ case "$host_arch" in
+@@ -2585,7 +2590,12 @@ case "$host_arch" in
      test $_fast_clz = "auto" && _fast_clz=yes
      ;;
  
@@ -62,25 +62,25 @@
      arch='sh4'
      iproc='sh4'
      ;;
-@@ -2806,23 +2816,23 @@ fi # if darwin && test "$cc_vendor" = "g
- _install_strip="-s"
+@@ -2949,23 +2959,23 @@ else
+ fi
  if test -z "$CFLAGS" || test "$_profile" != "" || test "$_debug" != ""; then
    if test "$cc_vendor" = "intel" ; then
 -    CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer"
-+    CFLAGS="$CFLAGS -fomit-frame-pointer"
++    CFLAGS="$CFLAGS $_march $_mcpu $_pipe -fomit-frame-pointer"
      WARNFLAGS="-wd167 -wd556 -wd144"
    elif test "$cc_vendor" = "sun" ; then
 -    CFLAGS="-O2 $_march $_mcpu $_pipe -xc99 -xregs=frameptr"
-+    CFLAGS="$CFLAGS -xc99 -xregs=frameptr"
++    CFLAGS="$CFLAGS $_march $_mcpu $_pipe -xc99 -xregs=frameptr"
    elif test "$cc_vendor" = "clang"; then