CVS commit: pkgsrc/multimedia

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia
From: "Izumi Tsutsui" <tsutsui%netbsd.org@localhost>
Date: Sat, 12 Jan 2019 15:26:42 +0000

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Jan 12 15:26:42 UTC 2019

Modified Files:
        pkgsrc/multimedia/gmplayer: Makefile distinfo
        pkgsrc/multimedia/mencoder: Makefile
        pkgsrc/multimedia/mplayer: Makefile
        pkgsrc/multimedia/mplayer-share: Makefile distinfo
        pkgsrc/multimedia/mplayer-share/patches: patch-configure

Log Message:
mencoder, mplayer, gmplayer: restore text relocation fix for NetBSD/i386.

It seems lost in the previous patch-aa -> patch-configure rename.
Bump PKGREVISION to rebuild binaries.


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 pkgsrc/multimedia/gmplayer/Makefile
cvs rdiff -u -r1.101 -r1.102 pkgsrc/multimedia/gmplayer/distinfo
cvs rdiff -u -r1.68 -r1.69 pkgsrc/multimedia/mencoder/Makefile
cvs rdiff -u -r1.101 -r1.102 pkgsrc/multimedia/mplayer/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/multimedia/mplayer-share/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/multimedia/mplayer-share/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/mplayer-share/patches/patch-configure

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.140 pkgsrc/multimedia/gmplayer/Makefile:1.141
--- pkgsrc/multimedia/gmplayer/Makefile:1.140   Wed Nov 14 22:22:05 2018
+++ pkgsrc/multimedia/gmplayer/Makefile Sat Jan 12 15:26:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2018/11/14 22:22:05 kleink Exp $
+# $NetBSD: Makefile,v 1.141 2019/01/12 15:26:42 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=   9
+PKGREVISION=   10
 
 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.101 pkgsrc/multimedia/gmplayer/distinfo:1.102
--- pkgsrc/multimedia/gmplayer/distinfo:1.101   Thu Nov 15 08:46:35 2018
+++ pkgsrc/multimedia/gmplayer/distinfo Sat Jan 12 15:26:42 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.101 2018/11/15 08:46:35 wiz Exp $
+$NetBSD: distinfo,v 1.102 2019/01/12 15:26:42 tsutsui Exp $
 
 SHA1 (mplayer/Abyss-1.7.tar.bz2) = 46d122cb60496eecbc96f26a0cfe0bda883fd725
 RMD160 (mplayer/Abyss-1.7.tar.bz2) = ca1e1c77177dc23300d011c1e00711c6bb81756a
@@ -287,7 +287,7 @@ Size (mplayer/xmmplayer-1.5.tar.bz2) = 7
 SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
-SHA1 (patch-configure) = afbc92006fc9594ef54e89ad56fe0937f0577e26
+SHA1 (patch-configure) = d3e2366e30d1919472e18ec7eded71e3d2b4b498
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37

Index: pkgsrc/multimedia/mencoder/Makefile
diff -u pkgsrc/multimedia/mencoder/Makefile:1.68 pkgsrc/multimedia/mencoder/Makefile:1.69
--- pkgsrc/multimedia/mencoder/Makefile:1.68    Sun May 27 15:27:13 2018
+++ pkgsrc/multimedia/mencoder/Makefile Sat Jan 12 15:26:42 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2018/05/27 15:27:13 tsutsui Exp $
+# $NetBSD: Makefile,v 1.69 2019/01/12 15:26:42 tsutsui Exp $
 
 PKGNAME=       mencoder-${MPLAYER_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=       Simple movie encoder for MPlayer-playable movies
 

Index: pkgsrc/multimedia/mplayer/Makefile
diff -u pkgsrc/multimedia/mplayer/Makefile:1.101 pkgsrc/multimedia/mplayer/Makefile:1.102
--- pkgsrc/multimedia/mplayer/Makefile:1.101    Sun May 27 15:27:13 2018
+++ pkgsrc/multimedia/mplayer/Makefile  Sat Jan 12 15:26:42 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2018/05/27 15:27:13 tsutsui Exp $
+# $NetBSD: Makefile,v 1.102 2019/01/12 15:26:42 tsutsui Exp $
 
 PKGNAME=       mplayer-${MPLAYER_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=       Fast, cross-platform movie player
 

Index: pkgsrc/multimedia/mplayer-share/Makefile
diff -u pkgsrc/multimedia/mplayer-share/Makefile:1.61 pkgsrc/multimedia/mplayer-share/Makefile:1.62
--- pkgsrc/multimedia/mplayer-share/Makefile:1.61       Fri Nov 23 08:06:32 2018
+++ pkgsrc/multimedia/mplayer-share/Makefile    Sat Jan 12 15:26:42 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2018/11/23 08:06:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2019/01/12 15:26:42 tsutsui Exp $
 
-PKGREVISION=   13
+PKGREVISION=   14
 .include "Makefile.common"
 
 PKGNAME=       mplayer-share-${MPLAYER_VERSION}

Index: pkgsrc/multimedia/mplayer-share/distinfo
diff -u pkgsrc/multimedia/mplayer-share/distinfo:1.95 pkgsrc/multimedia/mplayer-share/distinfo:1.96
--- pkgsrc/multimedia/mplayer-share/distinfo:1.95       Sat Nov 10 03:48:51 2018
+++ pkgsrc/multimedia/mplayer-share/distinfo    Sat Jan 12 15:26:42 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.95 2018/11/10 03:48:51 mrg Exp $
+$NetBSD: distinfo,v 1.96 2019/01/12 15:26:42 tsutsui Exp $
 
 SHA1 (mplayer/MPlayer-1.3.0.tar.xz) = 11db20434a4e1aabb9c52f7712241dae1b3730e3
 RMD160 (mplayer/MPlayer-1.3.0.tar.xz) = b6688b186f41267ca3cec59c67afe34396c51ade
@@ -7,7 +7,7 @@ Size (mplayer/MPlayer-1.3.0.tar.xz) = 13
 SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
-SHA1 (patch-configure) = afbc92006fc9594ef54e89ad56fe0937f0577e26
+SHA1 (patch-configure) = d3e2366e30d1919472e18ec7eded71e3d2b4b498
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37

Index: pkgsrc/multimedia/mplayer-share/patches/patch-configure
diff -u pkgsrc/multimedia/mplayer-share/patches/patch-configure:1.1 pkgsrc/multimedia/mplayer-share/patches/patch-configure:1.2
--- pkgsrc/multimedia/mplayer-share/patches/patch-configure:1.1 Sat Nov 10 03:48:51 2018
+++ pkgsrc/multimedia/mplayer-share/patches/patch-configure     Sat Jan 12 15:26:42 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2018/11/10 03:48:51 mrg Exp $
+$NetBSD: patch-configure,v 1.2 2019/01/12 15:26:42 tsutsui Exp $
 
 o Handle properly sh3, evbarm, and arm64 ports on NetBSD.
 o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
@@ -10,9 +10,9 @@ o Add necessary libs for aalib support e
 o Add support for dvb capture on NetBSD.
 o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
 
---- configure.orig     2016-02-13 13:05:42.000000000 -0800
-+++ configure  2018-11-09 19:30:35.590280805 -0800
-@@ -1640,7 +1640,7 @@
+--- configure.orig     2016-02-13 21:05:42.000000000 +0000
++++ configure
+@@ -1640,7 +1640,7 @@ else
        cc_name=$cc_name_tmp
        echocheck "$_cc version"
        cc_vendor=gnu
@@ -21,7 +21,7 @@ o Explicitly enable PIE to avoid text re
        case $cc_version in
          2.96*)
            cc_fail=yes
-@@ -1717,8 +1717,13 @@
+@@ -1717,8 +1717,13 @@ if test -z "$_target" ; then
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
        aarch64*) host_arch=aarch64 ;;
@@ -37,7 +37,7 @@ o Explicitly enable PIE to avoid text re
        s390) host_arch=s390 ;;
        s390x) host_arch=s390x ;;
        *mips*) host_arch=mips ;;
-@@ -1930,7 +1935,7 @@
+@@ -1930,7 +1935,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)
@@ -46,7 +46,7 @@ o Explicitly enable PIE to avoid text re
    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 @@
+@@ -2446,7 +2451,12 @@ case "$host_arch" in
      test $_fast_clz = "auto" && _fast_clz=yes
      ;;
  
@@ -60,7 +60,7 @@ o Explicitly enable PIE to avoid text re
      arch='sh4'
      iproc='sh4'
      ;;
-@@ -2806,23 +2816,23 @@
+@@ -2806,23 +2816,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
@@ -90,7 +90,7 @@ o Explicitly enable PIE to avoid text re
      WARNFLAGS="-W -Wall $WARNFLAGS"
      _install_strip=
    fi
-@@ -2830,8 +2840,8 @@
+@@ -2830,8 +2840,8 @@ else
    warn_cflags=yes
  fi
  
@@ -101,7 +101,21 @@ o Explicitly enable PIE to avoid text re
  
  # On glibc, add some more CPPFLAGS for enabling required functionality.
  cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -4615,7 +4625,11 @@
+@@ -2878,10 +2888,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 -fpie -pie ; 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 +4626,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
@@ -114,7 +128,7 @@ o Explicitly enable PIE to avoid text re
      else
        ld_tmp="$I -lXext -lX11 $ld_pthread"
      fi
-@@ -5018,6 +5032,8 @@
+@@ -5018,6 +5033,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)"
@@ -123,7 +137,7 @@ o Explicitly enable PIE to avoid text re
    fi
    vomodules="aa $vomodules"
  else
-@@ -5105,7 +5121,6 @@
+@@ -5105,7 +5122,6 @@ EOF
        extra_cflags="$extra_cflags $inc_tmp" && break
    done
  fi
@@ -131,7 +145,7 @@ o Explicitly enable PIE to avoid text re
  if test "$_dvb" = yes ; then
    _dvbin=yes
    inputmodules="dvb $inputmodules"
-@@ -5114,14 +5129,29 @@
+@@ -5114,14 +5130,29 @@ if test "$_dvb" = yes ; then
    aomodules="mpegpes(dvb) $aomodules"
    vomodules="mpegpes(dvb) $vomodules"
  else

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/print
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/print
Indexes:

Home | Main Index | Thread Index | Old Index