CVS commit: pkgsrc/multimedia

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sun May 27 15:27:14 UTC 2018

Modified Files:
        pkgsrc/multimedia/gmplayer: Makefile distinfo
        pkgsrc/multimedia/mencoder: Makefile
        pkgsrc/multimedia/mplayer: Makefile
        pkgsrc/multimedia/mplayer-share: Makefile.cflags Makefile.common
            Makefile.depends distinfo
        pkgsrc/multimedia/mplayer-share/patches: patch-aa

Log Message:
mencoder, mplayer, gmplayer: avoid text relocations on NetBSD/i386 8.0.

* specify --disable-sse4 to avoid non-PIE asm ops in libmpcodecs/vf_ass.c
  that cause text relocations on NetBSD/i386
* explicitly pull pkgsrc/multimedia/libass to avoid internal libass
  (which seems usually enabled by configure's autodetect)
* specify -fpic in configure for NetBSD/i386 to enable __PIC__ blocks
  in some sources
* while here, use -mtune rather than -mcpu for not only gcc4 but
  also 5.x and later

Bump PKGREVISIONs.  Ok'ed by wiz@ in PR pkg/53319.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 pkgsrc/multimedia/gmplayer/Makefile
cvs rdiff -u -r1.99 -r1.100 pkgsrc/multimedia/gmplayer/distinfo
cvs rdiff -u -r1.67 -r1.68 pkgsrc/multimedia/mencoder/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/multimedia/mplayer/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/mplayer-share/Makefile.cflags
cvs rdiff -u -r1.60 -r1.61 pkgsrc/multimedia/mplayer-share/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/multimedia/mplayer-share/Makefile.depends
cvs rdiff -u -r1.93 -r1.94 pkgsrc/multimedia/mplayer-share/distinfo
cvs rdiff -u -r1.34 -r1.35 pkgsrc/multimedia/mplayer-share/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gmplayer/Makefile
diff -u pkgsrc/multimedia/gmplayer/Makefile:1.137 pkgsrc/multimedia/gmplayer/Makefile:1.138
--- pkgsrc/multimedia/gmplayer/Makefile:1.137   Mon Apr 16 14:34:56 2018
+++ pkgsrc/multimedia/gmplayer/Makefile Sun May 27 15:27:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2018/04/16 14:34:56 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2018/05/27 15:27:13 tsutsui Exp $
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
 # that *both* distinfo files contain the correct, up-to-date files and
@@ -8,7 +8,7 @@
 #
 
 PKGNAME=       gmplayer-${MPLAYER_VERSION}
-PKGREVISION=   6
+PKGREVISION=   7
 
 SKIN_SITES=    http://www1.mplayerhq.hu/MPlayer/skins/         \
                http://www2.mplayerhq.hu/MPlayer/skins/         \

Index: pkgsrc/multimedia/gmplayer/distinfo
diff -u pkgsrc/multimedia/gmplayer/distinfo:1.99 pkgsrc/multimedia/gmplayer/distinfo:1.100
--- pkgsrc/multimedia/gmplayer/distinfo:1.99    Thu Apr 12 15:56:20 2018
+++ pkgsrc/multimedia/gmplayer/distinfo Sun May 27 15:27:13 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99 2018/04/12 15:56:20 triaxx Exp $
+$NetBSD: distinfo,v 1.100 2018/05/27 15:27:13 tsutsui Exp $
 
 SHA1 (mplayer/Abyss-1.7.tar.bz2) = 46d122cb60496eecbc96f26a0cfe0bda883fd725
 RMD160 (mplayer/Abyss-1.7.tar.bz2) = ca1e1c77177dc23300d011c1e00711c6bb81756a
@@ -285,7 +285,7 @@ RMD160 (mplayer/xmmplayer-1.5.tar.bz2) =
 SHA512 (mplayer/xmmplayer-1.5.tar.bz2) = 170a7aec3b0cd284d8f7fb79e72f2463efc84b05710aa70f3360b145e86e424138f2c11abaa2db6a2e937822ed91396d4833ea59685d7067bfc916578187e30f
 Size (mplayer/xmmplayer-1.5.tar.bz2) = 74184 bytes
 SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
-SHA1 (patch-aa) = b1492302b7d4e41f362453b6316b17df1300827c
+SHA1 (patch-aa) = bd9b8a10923a7aa8ace18cb848727044e72d937d
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c

Index: pkgsrc/multimedia/mencoder/Makefile
diff -u pkgsrc/multimedia/mencoder/Makefile:1.67 pkgsrc/multimedia/mencoder/Makefile:1.68
--- pkgsrc/multimedia/mencoder/Makefile:1.67    Thu Feb 25 15:49:44 2016
+++ pkgsrc/multimedia/mencoder/Makefile Sun May 27 15:27:13 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2016/02/25 15:49:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.68 2018/05/27 15:27:13 tsutsui Exp $
 
 PKGNAME=       mencoder-${MPLAYER_VERSION}
+PKGREVISION=   1
 
 COMMENT=       Simple movie encoder for MPlayer-playable movies
 

Index: pkgsrc/multimedia/mplayer/Makefile
diff -u pkgsrc/multimedia/mplayer/Makefile:1.100 pkgsrc/multimedia/mplayer/Makefile:1.101
--- pkgsrc/multimedia/mplayer/Makefile:1.100    Sun Feb  7 13:34:34 2016
+++ pkgsrc/multimedia/mplayer/Makefile  Sun May 27 15:27:13 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2016/02/07 13:34:34 leot Exp $
+# $NetBSD: Makefile,v 1.101 2018/05/27 15:27:13 tsutsui Exp $
 
 PKGNAME=       mplayer-${MPLAYER_VERSION}
+PKGREVISION=   1
 
 COMMENT=       Fast, cross-platform movie player
 

Index: pkgsrc/multimedia/mplayer-share/Makefile.cflags
diff -u pkgsrc/multimedia/mplayer-share/Makefile.cflags:1.8 pkgsrc/multimedia/mplayer-share/Makefile.cflags:1.9
--- pkgsrc/multimedia/mplayer-share/Makefile.cflags:1.8 Sun Feb  7 13:34:33 2016
+++ pkgsrc/multimedia/mplayer-share/Makefile.cflags     Sun May 27 15:27:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cflags,v 1.8 2016/02/07 13:34:33 leot Exp $
+# $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
@@ -13,7 +13,7 @@
 
 .    include "../../mk/compiler.mk"
 
-.    if !empty(CC_VERSION:Mgcc-4*)
+.    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

Index: pkgsrc/multimedia/mplayer-share/Makefile.common
diff -u pkgsrc/multimedia/mplayer-share/Makefile.common:1.60 pkgsrc/multimedia/mplayer-share/Makefile.common:1.61
--- pkgsrc/multimedia/mplayer-share/Makefile.common:1.60        Wed Apr  4 12:26:24 2018
+++ pkgsrc/multimedia/mplayer-share/Makefile.common     Sun May 27 15:27:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.60 2018/04/04 12:26:24 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.61 2018/05/27 15:27:13 tsutsui Exp $
 # used by multimedia/gmplayer/Makefile
 # used by multimedia/mencoder/Makefile
 # used by multimedia/mplayer/Makefile
@@ -50,6 +50,12 @@ CONFIGURE_ENV+=              TMPDIR=${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
+# avoid text relocations caused by asm ops in #if HAVE_SSE4_INTERNAL block
+# in libmpcodecs/vf_ass.c
+.if !empty(MACHINE_PLATFORM:MNetBSD-[89].*-i386)
+CONFIGURE_ARGS+=       --disable-sse4
+.endif
+
 # The configure script misdetects endianness on mipseb
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipseb"
 CONFIGURE_ARGS+=       --enable-big-endian

Index: pkgsrc/multimedia/mplayer-share/Makefile.depends
diff -u pkgsrc/multimedia/mplayer-share/Makefile.depends:1.21 pkgsrc/multimedia/mplayer-share/Makefile.depends:1.22
--- pkgsrc/multimedia/mplayer-share/Makefile.depends:1.21       Sat Mar  5 09:03:02 2016
+++ pkgsrc/multimedia/mplayer-share/Makefile.depends    Sun May 27 15:27:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.21 2016/03/05 09:03:02 ryoon Exp $
+# $NetBSD: Makefile.depends,v 1.22 2018/05/27 15:27:13 tsutsui Exp $
 #
 
 DEPENDS+=      mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share
@@ -7,4 +7,5 @@ DEPENDS+=       mplayer-share>=${MPLAYER_VERSI
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../multimedia/ffmpeg3/buildlink3.mk"
+.include "../../multimedia/libass/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"

Index: pkgsrc/multimedia/mplayer-share/distinfo
diff -u pkgsrc/multimedia/mplayer-share/distinfo:1.93 pkgsrc/multimedia/mplayer-share/distinfo:1.94
--- pkgsrc/multimedia/mplayer-share/distinfo:1.93       Wed Apr  4 11:02:07 2018
+++ pkgsrc/multimedia/mplayer-share/distinfo    Sun May 27 15:27:13 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.93 2018/04/04 11:02:07 triaxx Exp $
+$NetBSD: distinfo,v 1.94 2018/05/27 15:27:13 tsutsui Exp $
 
 SHA1 (mplayer/MPlayer-1.3.0.tar.xz) = 11db20434a4e1aabb9c52f7712241dae1b3730e3
 RMD160 (mplayer/MPlayer-1.3.0.tar.xz) = b6688b186f41267ca3cec59c67afe34396c51ade
 SHA512 (mplayer/MPlayer-1.3.0.tar.xz) = 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
 Size (mplayer/MPlayer-1.3.0.tar.xz) = 13278984 bytes
 SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
-SHA1 (patch-aa) = b1492302b7d4e41f362453b6316b17df1300827c
+SHA1 (patch-aa) = bd9b8a10923a7aa8ace18cb848727044e72d937d
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c

Index: pkgsrc/multimedia/mplayer-share/patches/patch-aa
diff -u pkgsrc/multimedia/mplayer-share/patches/patch-aa:1.34 pkgsrc/multimedia/mplayer-share/patches/patch-aa:1.35
--- pkgsrc/multimedia/mplayer-share/patches/patch-aa:1.34       Sun Feb  7 13:34:33 2016
+++ pkgsrc/multimedia/mplayer-share/patches/patch-aa    Sun May 27 15:27:14 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.34 2016/02/07 13:34:33 leot Exp $
+$NetBSD: patch-aa,v 1.35 2018/05/27 15:27:14 tsutsui Exp $
 
 o Handle properly sh3 and evbarm ports on NetBSD.
 o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
@@ -8,8 +8,9 @@ o Fix a bug which broke the detection of
 o Add necessary libs for aalib support even if the aa option is turned on with
   --enable-aa.
 o Add support for dvb capture on NetBSD.
+o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
 
---- configure.orig     2016-01-08 12:39:01.000000000 +0000
+--- configure.orig     2016-02-13 21:05:42.000000000 +0000
 +++ configure
 @@ -1640,7 +1640,7 @@ else
        cc_name=$cc_name_tmp
@@ -55,7 +56,7 @@ o Add support for dvb capture on NetBSD.
      arch='sh4'
      iproc='sh4'
      ;;
-@@ -2783,23 +2789,23 @@ fi # if darwin && test "$cc_vendor" = "g
+@@ -2806,23 +2812,23 @@ fi # if darwin && test "$cc_vendor" = "g
  _install_strip="-s"
  if test -z "$CFLAGS" || test "$_profile" != "" || test "$_debug" != ""; then
    if test "$cc_vendor" = "intel" ; then
@@ -85,7 +86,7 @@ o Add support for dvb capture on NetBSD.
      WARNFLAGS="-W -Wall $WARNFLAGS"
      _install_strip=
    fi
-@@ -2807,8 +2813,8 @@ else
+@@ -2830,8 +2836,8 @@ else
    warn_cflags=yes
  fi
  
@@ -96,7 +97,21 @@ o Add support for dvb capture on NetBSD.
  
  # On glibc, add some more CPPFLAGS for enabling required functionality.
  cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -4591,7 +4597,11 @@ if test "$_x11" = auto && test "$_x11_he
+@@ -2878,10 +2884,11 @@ if test $relocatable = "auto" ; then
+   elif win32 && ! wine ; then
+     relocatable=no
+     res_comment="unnecessary and broken on win32"
+-  elif x86_32 && cflag_check -pie ; then
++  elif x86_32 && cflag_check -fpic -fpie ; then
+     extra_ldflags="$extra_ldflags -pie"
++    extra_cflags="$extra_cflags -fpic -fpie"
+     relocatable=yes
+-    res_comment="non-PIC"
++    res_comment="fast PIC"
+   elif x86_64 && cflag_check -fpie -pie ; then
+     extra_ldflags="$extra_ldflags -fpie -pie"
+     extra_cflags="$extra_cflags -fpie"
+@@ -4615,7 +4622,11 @@ if test "$_x11" = auto && test "$_x11_he
             -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
             -L/usr/lib ; do
      if netbsd; then
@@ -109,7 +124,7 @@ o Add support for dvb capture on NetBSD.
      else
        ld_tmp="$I -lXext -lX11 $ld_pthread"
      fi
-@@ -4994,6 +5004,8 @@ if test "$_aa" = yes ; then
+@@ -5018,6 +5029,8 @@ if test "$_aa" = yes ; then
    def_aa='#define CONFIG_AA 1'
    if cygwin ; then
      libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
@@ -118,7 +133,7 @@ o Add support for dvb capture on NetBSD.
    fi
    vomodules="aa $vomodules"
  else
-@@ -5081,7 +5093,6 @@ EOF
+@@ -5105,7 +5118,6 @@ EOF
        extra_cflags="$extra_cflags $inc_tmp" && break
    done
  fi
@@ -126,7 +141,7 @@ o Add support for dvb capture on NetBSD.
  if test "$_dvb" = yes ; then
    _dvbin=yes
    inputmodules="dvb $inputmodules"
-@@ -5090,14 +5101,29 @@ if test "$_dvb" = yes ; then
+@@ -5114,14 +5126,29 @@ if test "$_dvb" = yes ; then
    aomodules="mpegpes(dvb) $aomodules"
    vomodules="mpegpes(dvb) $vomodules"
  else