Sun May 27 15:27:14 2018 UTC ()
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.


(tsutsui)
diff -r1.137 -r1.138 pkgsrc/multimedia/gmplayer/Makefile
diff -r1.99 -r1.100 pkgsrc/multimedia/gmplayer/distinfo
diff -r1.67 -r1.68 pkgsrc/multimedia/mencoder/Makefile
diff -r1.100 -r1.101 pkgsrc/multimedia/mplayer/Makefile
diff -r1.8 -r1.9 pkgsrc/multimedia/mplayer-share/Makefile.cflags
diff -r1.60 -r1.61 pkgsrc/multimedia/mplayer-share/Makefile.common
diff -r1.21 -r1.22 pkgsrc/multimedia/mplayer-share/Makefile.depends
diff -r1.93 -r1.94 pkgsrc/multimedia/mplayer-share/distinfo
diff -r1.34 -r1.35 pkgsrc/multimedia/mplayer-share/patches/patch-aa
cvs diff -r1.137 -r1.138 pkgsrc/multimedia/gmplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gmplayer/Makefile 2018/04/16 14:34:56 1.137
+++ pkgsrc/multimedia/gmplayer/Makefile 2018/05/27 15:27:13 1.138
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.137 2018/04/16 14:34:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.138 2018/05/27 15:27:13 tsutsui Exp $
2# 2#
3# NOTE: if you are updating both mplayer and gmplayer, you must ensure 3# NOTE: if you are updating both mplayer and gmplayer, you must ensure
4# that *both* distinfo files contain the correct, up-to-date files and 4# that *both* distinfo files contain the correct, up-to-date files and
5# checksums. 5# checksums.
6# 6#
7# NOTE: patches are shared between mplayer and gmplayer! 7# NOTE: patches are shared between mplayer and gmplayer!
8# 8#
9 9
10PKGNAME= gmplayer-${MPLAYER_VERSION} 10PKGNAME= gmplayer-${MPLAYER_VERSION}
11PKGREVISION= 6 11PKGREVISION= 7
12 12
13SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \ 13SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \
14 http://www2.mplayerhq.hu/MPlayer/skins/ \ 14 http://www2.mplayerhq.hu/MPlayer/skins/ \
15 ftp://ftp1.mplayerhq.hu/MPlayer/skins/ \ 15 ftp://ftp1.mplayerhq.hu/MPlayer/skins/ \
16 ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \ 16 ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \
17 http://ftp5.mplayerhq.hu/MPlayer/skins/ \ 17 http://ftp5.mplayerhq.hu/MPlayer/skins/ \
18 ftp://ftp5.mplayerhq.hu/MPlayer/skins/ 18 ftp://ftp5.mplayerhq.hu/MPlayer/skins/
19 19
20.include "../../multimedia/mplayer-share/Makefile.common" 20.include "../../multimedia/mplayer-share/Makefile.common"
21SKIN_EXTRACT_SUFX= .tar.bz2 21SKIN_EXTRACT_SUFX= .tar.bz2
22 22
23COMMENT= Fast, cross-platform movie player with GTK2+ interface 23COMMENT= Fast, cross-platform movie player with GTK2+ interface
24 24
cvs diff -r1.99 -r1.100 pkgsrc/multimedia/gmplayer/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/gmplayer/distinfo 2018/04/12 15:56:20 1.99
+++ pkgsrc/multimedia/gmplayer/distinfo 2018/05/27 15:27:13 1.100
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.99 2018/04/12 15:56:20 triaxx Exp $ 1$NetBSD: distinfo,v 1.100 2018/05/27 15:27:13 tsutsui Exp $
2 2
3SHA1 (mplayer/Abyss-1.7.tar.bz2) = 46d122cb60496eecbc96f26a0cfe0bda883fd725 3SHA1 (mplayer/Abyss-1.7.tar.bz2) = 46d122cb60496eecbc96f26a0cfe0bda883fd725
4RMD160 (mplayer/Abyss-1.7.tar.bz2) = ca1e1c77177dc23300d011c1e00711c6bb81756a 4RMD160 (mplayer/Abyss-1.7.tar.bz2) = ca1e1c77177dc23300d011c1e00711c6bb81756a
5SHA512 (mplayer/Abyss-1.7.tar.bz2) = e60aae7a6a264023ebb49421696bc78ec46b463ce6d7f869cc5561e183a6d5abd3846b71a45656c8ad2a6f35bafd76d15235216dcba3b4936ff7b364b7a66407 5SHA512 (mplayer/Abyss-1.7.tar.bz2) = e60aae7a6a264023ebb49421696bc78ec46b463ce6d7f869cc5561e183a6d5abd3846b71a45656c8ad2a6f35bafd76d15235216dcba3b4936ff7b364b7a66407
6Size (mplayer/Abyss-1.7.tar.bz2) = 292235 bytes 6Size (mplayer/Abyss-1.7.tar.bz2) = 292235 bytes
7SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc 7SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
8RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998 8RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
9SHA512 (mplayer/AlienMind-1.2.tar.bz2) = affae0989be95cdcb72b9d6d36d2c8362599b4cb3441ea15704f935bcb6e1ef2c2f9355ee26b8127177a6968f06b8b0f5b4c9b2919b8aeb257090b47eb7eca52 9SHA512 (mplayer/AlienMind-1.2.tar.bz2) = affae0989be95cdcb72b9d6d36d2c8362599b4cb3441ea15704f935bcb6e1ef2c2f9355ee26b8127177a6968f06b8b0f5b4c9b2919b8aeb257090b47eb7eca52
10Size (mplayer/AlienMind-1.2.tar.bz2) = 131295 bytes 10Size (mplayer/AlienMind-1.2.tar.bz2) = 131295 bytes
11SHA1 (mplayer/Blue-1.11.tar.bz2) = 7e112978e5cf16a023fbbfdb73d06f9709164aff 11SHA1 (mplayer/Blue-1.11.tar.bz2) = 7e112978e5cf16a023fbbfdb73d06f9709164aff
12RMD160 (mplayer/Blue-1.11.tar.bz2) = 41bd7b78ba4538b99cac31a5d777eeaba45c40bd 12RMD160 (mplayer/Blue-1.11.tar.bz2) = 41bd7b78ba4538b99cac31a5d777eeaba45c40bd
13SHA512 (mplayer/Blue-1.11.tar.bz2) = 88fbe7af71acaff50a6fab61c6d52095e155ab9842543bda3505c8c14ac95985748f67c2753e249e4aea35eb6deda568cf8b831a75bcfd1394dd029ff32a9267 13SHA512 (mplayer/Blue-1.11.tar.bz2) = 88fbe7af71acaff50a6fab61c6d52095e155ab9842543bda3505c8c14ac95985748f67c2753e249e4aea35eb6deda568cf8b831a75bcfd1394dd029ff32a9267
14Size (mplayer/Blue-1.11.tar.bz2) = 222529 bytes 14Size (mplayer/Blue-1.11.tar.bz2) = 222529 bytes
@@ -275,27 +275,27 @@ Size (mplayer/webby-1.3.tar.bz2) = 61369 @@ -275,27 +275,27 @@ Size (mplayer/webby-1.3.tar.bz2) = 61369
275SHA1 (mplayer/xanim-1.7.tar.bz2) = f215885fbb3d563a024d45e0f940d88315199907 275SHA1 (mplayer/xanim-1.7.tar.bz2) = f215885fbb3d563a024d45e0f940d88315199907
276RMD160 (mplayer/xanim-1.7.tar.bz2) = d3d3ea2577c153177156331e6495988d368dc502 276RMD160 (mplayer/xanim-1.7.tar.bz2) = d3d3ea2577c153177156331e6495988d368dc502
277SHA512 (mplayer/xanim-1.7.tar.bz2) = 2f16633ff1be5e0185c536d8a59adf89302bdd7461587648b6e5c3c071cc9a75e1b83b18425d3555d08411aa1d394ac91b8369bb18233c43888f79a7f349a088 277SHA512 (mplayer/xanim-1.7.tar.bz2) = 2f16633ff1be5e0185c536d8a59adf89302bdd7461587648b6e5c3c071cc9a75e1b83b18425d3555d08411aa1d394ac91b8369bb18233c43888f79a7f349a088
278Size (mplayer/xanim-1.7.tar.bz2) = 94526 bytes 278Size (mplayer/xanim-1.7.tar.bz2) = 94526 bytes
279SHA1 (mplayer/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18 279SHA1 (mplayer/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18
280RMD160 (mplayer/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5 280RMD160 (mplayer/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5
281SHA512 (mplayer/xine-lcd-1.2.tar.bz2) = 1deb579fba43fb74f344d8c1301511467cdd064ff89d8aedcc1addd5d3cb136bdc44a137caf853a18850179ec2580b9c1a02d3e24dc4b8b5121b09bd0333ddfa 281SHA512 (mplayer/xine-lcd-1.2.tar.bz2) = 1deb579fba43fb74f344d8c1301511467cdd064ff89d8aedcc1addd5d3cb136bdc44a137caf853a18850179ec2580b9c1a02d3e24dc4b8b5121b09bd0333ddfa
282Size (mplayer/xine-lcd-1.2.tar.bz2) = 172270 bytes 282Size (mplayer/xine-lcd-1.2.tar.bz2) = 172270 bytes
283SHA1 (mplayer/xmmplayer-1.5.tar.bz2) = 2d4cb1d30b0519a80c4cd49d042d5d4db5474e7c 283SHA1 (mplayer/xmmplayer-1.5.tar.bz2) = 2d4cb1d30b0519a80c4cd49d042d5d4db5474e7c
284RMD160 (mplayer/xmmplayer-1.5.tar.bz2) = 984ff462de6ea9bc903fda4e59232481bea79845 284RMD160 (mplayer/xmmplayer-1.5.tar.bz2) = 984ff462de6ea9bc903fda4e59232481bea79845
285SHA512 (mplayer/xmmplayer-1.5.tar.bz2) = 170a7aec3b0cd284d8f7fb79e72f2463efc84b05710aa70f3360b145e86e424138f2c11abaa2db6a2e937822ed91396d4833ea59685d7067bfc916578187e30f 285SHA512 (mplayer/xmmplayer-1.5.tar.bz2) = 170a7aec3b0cd284d8f7fb79e72f2463efc84b05710aa70f3360b145e86e424138f2c11abaa2db6a2e937822ed91396d4833ea59685d7067bfc916578187e30f
286Size (mplayer/xmmplayer-1.5.tar.bz2) = 74184 bytes 286Size (mplayer/xmmplayer-1.5.tar.bz2) = 74184 bytes
287SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83 287SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
288SHA1 (patch-aa) = b1492302b7d4e41f362453b6316b17df1300827c 288SHA1 (patch-aa) = bd9b8a10923a7aa8ace18cb848727044e72d937d
289SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 289SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
290SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217 290SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
291SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c 291SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
292SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 292SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
293SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37 293SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37
294SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec 294SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec
295SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825 295SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825
296SHA1 (patch-libvo_vo__vdpau.c) = df3de0e079f7047228065bf36390aa3ad01b7f97 296SHA1 (patch-libvo_vo__vdpau.c) = df3de0e079f7047228065bf36390aa3ad01b7f97
297SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03 297SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
298SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1 298SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
299SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8 299SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8
300SHA1 (patch-sub_osd.c) = 95f1bc1c20f181720a2a073acbb3abdde3921608 300SHA1 (patch-sub_osd.c) = 95f1bc1c20f181720a2a073acbb3abdde3921608
301SHA1 (patch-sub_subreader.c) = 3ec0d3824b6e9fe34cb33e9463d833868f0b03c1 301SHA1 (patch-sub_subreader.c) = 3ec0d3824b6e9fe34cb33e9463d833868f0b03c1
cvs diff -r1.67 -r1.68 pkgsrc/multimedia/mencoder/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mencoder/Makefile 2016/02/25 15:49:44 1.67
+++ pkgsrc/multimedia/mencoder/Makefile 2018/05/27 15:27:13 1.68
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.67 2016/02/25 15:49:44 jperkin Exp $ 1# $NetBSD: Makefile,v 1.68 2018/05/27 15:27:13 tsutsui Exp $
2 2
3PKGNAME= mencoder-${MPLAYER_VERSION} 3PKGNAME= mencoder-${MPLAYER_VERSION}
 4PKGREVISION= 1
4 5
5COMMENT= Simple movie encoder for MPlayer-playable movies 6COMMENT= Simple movie encoder for MPlayer-playable movies
6 7
7USE_TOOLS+= pkg-config 8USE_TOOLS+= pkg-config
8 9
9.include "../../multimedia/mplayer-share/Makefile.common" 10.include "../../multimedia/mplayer-share/Makefile.common"
10 11
11# Fix build under Mac OS X, please see here for details: 12# Fix build under Mac OS X, please see here for details:
12# http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2009-May/061515.html 13# http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2009-May/061515.html
13LDFLAGS.Darwin+= -framework Carbon 14LDFLAGS.Darwin+= -framework Carbon
14 15
15CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer 16CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
16 17
cvs diff -r1.100 -r1.101 pkgsrc/multimedia/mplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer/Makefile 2016/02/07 13:34:34 1.100
+++ pkgsrc/multimedia/mplayer/Makefile 2018/05/27 15:27:13 1.101
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.100 2016/02/07 13:34:34 leot Exp $ 1# $NetBSD: Makefile,v 1.101 2018/05/27 15:27:13 tsutsui Exp $
2 2
3PKGNAME= mplayer-${MPLAYER_VERSION} 3PKGNAME= mplayer-${MPLAYER_VERSION}
 4PKGREVISION= 1
4 5
5COMMENT= Fast, cross-platform movie player 6COMMENT= Fast, cross-platform movie player
6 7
7.include "../../multimedia/mplayer-share/Makefile.common" 8.include "../../multimedia/mplayer-share/Makefile.common"
8 9
9USE_TOOLS+= pkg-config 10USE_TOOLS+= pkg-config
10 11
11CONFIGURE_ARGS+= --disable-mencoder 12CONFIGURE_ARGS+= --disable-mencoder
12CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer 13CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
13CONFIGURE_ARGS+= --enable-xvmc 14CONFIGURE_ARGS+= --enable-xvmc
14CONFIGURE_ARGS+= --with-xvmclib=XvMCW 15CONFIGURE_ARGS+= --with-xvmclib=XvMCW
15 16
16# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not 17# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not
cvs diff -r1.8 -r1.9 pkgsrc/multimedia/mplayer-share/Attic/Makefile.cflags (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/Attic/Makefile.cflags 2016/02/07 13:34:33 1.8
+++ pkgsrc/multimedia/mplayer-share/Attic/Makefile.cflags 2018/05/27 15:27:13 1.9
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile.cflags,v 1.8 2016/02/07 13:34:33 leot Exp $ 1# $NetBSD: Makefile.cflags,v 1.9 2018/05/27 15:27:13 tsutsui Exp $
2 2
3# This must be included after everything else to truly clear ${CFLAGS} 3# This must be included after everything else to truly clear ${CFLAGS}
4# in the non-runtime-cpu-detection case. If ${CFLAGS} is non-empty, the 4# in the non-runtime-cpu-detection case. If ${CFLAGS} is non-empty, the
5# configure script refuses to add any optimizations at all. 5# configure script refuses to add any optimizations at all.
6 6
7.if !empty(PKG_OPTIONS:Mmplayer-default-cflags) 7.if !empty(PKG_OPTIONS:Mmplayer-default-cflags)
8. if ${MACHINE_ARCH} == "i386" && !empty(PKGSRC_COMPILER:Mgcc) 8. if ${MACHINE_ARCH} == "i386" && !empty(PKGSRC_COMPILER:Mgcc)
9# Schedule for the typical machine fast enough to run mplayer. This 9# Schedule for the typical machine fast enough to run mplayer. This
10# is nearly optimal for K6-2 as well. Anything slower will still run 10# is nearly optimal for K6-2 as well. Anything slower will still run
11# (but would probably benefit greatly from turning off the run-time 11# (but would probably benefit greatly from turning off the run-time
12# cpu detection). 12# cpu detection).
13 13
14. include "../../mk/compiler.mk" 14. include "../../mk/compiler.mk"
15 15
16. if !empty(CC_VERSION:Mgcc-4*) 16. if !empty(CC_VERSION:Mgcc-[4567]*)
17CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -mtune=pentiumpro 17CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -mtune=pentiumpro
18. else 18. else
19CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro 19CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro
20. endif 20. endif
21. else 21. else
22CFLAGS+= -O3 -ffast-math -fomit-frame-pointer 22CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
23. endif 23. endif
24.endif 24.endif
cvs diff -r1.60 -r1.61 pkgsrc/multimedia/mplayer-share/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/Makefile.common 2018/04/04 12:26:24 1.60
+++ pkgsrc/multimedia/mplayer-share/Makefile.common 2018/05/27 15:27:13 1.61
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.60 2018/04/04 12:26:24 triaxx Exp $ 1# $NetBSD: Makefile.common,v 1.61 2018/05/27 15:27:13 tsutsui Exp $
2# used by multimedia/gmplayer/Makefile 2# used by multimedia/gmplayer/Makefile
3# used by multimedia/mencoder/Makefile 3# used by multimedia/mencoder/Makefile
4# used by multimedia/mplayer/Makefile 4# used by multimedia/mplayer/Makefile
5 5
6MPLAYER_VERSION= 1.3.0 6MPLAYER_VERSION= 1.3.0
7 7
8DISTNAME= MPlayer-${MPLAYER_VERSION} 8DISTNAME= MPlayer-${MPLAYER_VERSION}
9 9
10CATEGORIES?= multimedia 10CATEGORIES?= multimedia
11 11
12MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/ 12MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/
13EXTRACT_SUFX= .tar.xz 13EXTRACT_SUFX= .tar.xz
14 14
@@ -40,26 +40,32 @@ PTHREAD_OPTS+= require @@ -40,26 +40,32 @@ PTHREAD_OPTS+= require
40 40
41CONFIGURE_ARGS+= --prefix=${PREFIX} 41CONFIGURE_ARGS+= --prefix=${PREFIX}
42CONFIGURE_ARGS+= --disable-smb 42CONFIGURE_ARGS+= --disable-smb
43CONFIGURE_ARGS+= --disable-ffmpeg_a 43CONFIGURE_ARGS+= --disable-ffmpeg_a
44CONFIGURE_ARGS+= --yasm="" 44CONFIGURE_ARGS+= --yasm=""
45 45
46# The configure script attempts to test-execute compiled programs in /tmp, 46# The configure script attempts to test-execute compiled programs in /tmp,
47# but that directory may be mounted as noexec; work this around by setting 47# but that directory may be mounted as noexec; work this around by setting
48# TMPDIR to ${WRKDIR} 48# TMPDIR to ${WRKDIR}
49CONFIGURE_ENV+= TMPDIR=${WRKDIR} 49CONFIGURE_ENV+= TMPDIR=${WRKDIR}
50 50
51.include "../../mk/bsd.prefs.mk" 51.include "../../mk/bsd.prefs.mk"
52 52
 53# avoid text relocations caused by asm ops in #if HAVE_SSE4_INTERNAL block
 54# in libmpcodecs/vf_ass.c
 55.if !empty(MACHINE_PLATFORM:MNetBSD-[89].*-i386)
 56CONFIGURE_ARGS+= --disable-sse4
 57.endif
 58
53# The configure script misdetects endianness on mipseb 59# The configure script misdetects endianness on mipseb
54.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipseb" 60.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipseb"
55CONFIGURE_ARGS+= --enable-big-endian 61CONFIGURE_ARGS+= --enable-big-endian
56.endif 62.endif
57 63
58.if !empty(MACHINE_PLATFORM:MNetBSD-*-arm*) || \ 64.if !empty(MACHINE_PLATFORM:MNetBSD-*-arm*) || \
59 !empty(MACHINE_PLATFORM:MNetBSD-*-earm*) 65 !empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
60 66
61# autodetect code enables these options on NetBSD/arm but it should not 67# autodetect code enables these options on NetBSD/arm but it should not
62CONFIGURE_ARGS+= --disable-armv5te --disable-armv6 --disable-armv6t2 68CONFIGURE_ARGS+= --disable-armv5te --disable-armv6 --disable-armv6t2
63.endif 69.endif
64 70
65.include "../../multimedia/mplayer-share/options.mk" 71.include "../../multimedia/mplayer-share/options.mk"
cvs diff -r1.21 -r1.22 pkgsrc/multimedia/mplayer-share/Attic/Makefile.depends (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/Attic/Makefile.depends 2016/03/05 09:03:02 1.21
+++ pkgsrc/multimedia/mplayer-share/Attic/Makefile.depends 2018/05/27 15:27:13 1.22
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1# $NetBSD: Makefile.depends,v 1.21 2016/03/05 09:03:02 ryoon Exp $ 1# $NetBSD: Makefile.depends,v 1.22 2018/05/27 15:27:13 tsutsui Exp $
2# 2#
3 3
4DEPENDS+= mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share 4DEPENDS+= mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share
5 5
6.include "../../converters/libiconv/buildlink3.mk" 6.include "../../converters/libiconv/buildlink3.mk"
7.include "../../fonts/fontconfig/buildlink3.mk" 7.include "../../fonts/fontconfig/buildlink3.mk"
8.include "../../graphics/freetype2/buildlink3.mk" 8.include "../../graphics/freetype2/buildlink3.mk"
9.include "../../multimedia/ffmpeg3/buildlink3.mk" 9.include "../../multimedia/ffmpeg3/buildlink3.mk"
 10.include "../../multimedia/libass/buildlink3.mk"
10.include "../../x11/libX11/buildlink3.mk" 11.include "../../x11/libX11/buildlink3.mk"
cvs diff -r1.93 -r1.94 pkgsrc/multimedia/mplayer-share/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/distinfo 2018/04/04 11:02:07 1.93
+++ pkgsrc/multimedia/mplayer-share/distinfo 2018/05/27 15:27:13 1.94
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.93 2018/04/04 11:02:07 triaxx Exp $ 1$NetBSD: distinfo,v 1.94 2018/05/27 15:27:13 tsutsui Exp $
2 2
3SHA1 (mplayer/MPlayer-1.3.0.tar.xz) = 11db20434a4e1aabb9c52f7712241dae1b3730e3 3SHA1 (mplayer/MPlayer-1.3.0.tar.xz) = 11db20434a4e1aabb9c52f7712241dae1b3730e3
4RMD160 (mplayer/MPlayer-1.3.0.tar.xz) = b6688b186f41267ca3cec59c67afe34396c51ade 4RMD160 (mplayer/MPlayer-1.3.0.tar.xz) = b6688b186f41267ca3cec59c67afe34396c51ade
5SHA512 (mplayer/MPlayer-1.3.0.tar.xz) = 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae 5SHA512 (mplayer/MPlayer-1.3.0.tar.xz) = 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
6Size (mplayer/MPlayer-1.3.0.tar.xz) = 13278984 bytes 6Size (mplayer/MPlayer-1.3.0.tar.xz) = 13278984 bytes
7SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83 7SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
8SHA1 (patch-aa) = b1492302b7d4e41f362453b6316b17df1300827c 8SHA1 (patch-aa) = bd9b8a10923a7aa8ace18cb848727044e72d937d
9SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 9SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
10SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217 10SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
11SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c 11SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
12SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 12SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
13SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37 13SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37
14SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec 14SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec
15SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825 15SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825
16SHA1 (patch-libvo_vo__vdpau.c) = df3de0e079f7047228065bf36390aa3ad01b7f97 16SHA1 (patch-libvo_vo__vdpau.c) = df3de0e079f7047228065bf36390aa3ad01b7f97
17SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03 17SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
18SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1 18SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
19SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8 19SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8
20SHA1 (patch-sub_osd.c) = 95f1bc1c20f181720a2a073acbb3abdde3921608 20SHA1 (patch-sub_osd.c) = 95f1bc1c20f181720a2a073acbb3abdde3921608
21SHA1 (patch-sub_subreader.c) = 3ec0d3824b6e9fe34cb33e9463d833868f0b03c1 21SHA1 (patch-sub_subreader.c) = 3ec0d3824b6e9fe34cb33e9463d833868f0b03c1
cvs diff -r1.34 -r1.35 pkgsrc/multimedia/mplayer-share/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/patches/Attic/patch-aa 2016/02/07 13:34:33 1.34
+++ pkgsrc/multimedia/mplayer-share/patches/Attic/patch-aa 2018/05/27 15:27:14 1.35
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1$NetBSD: patch-aa,v 1.34 2016/02/07 13:34:33 leot Exp $ 1$NetBSD: patch-aa,v 1.35 2018/05/27 15:27:14 tsutsui Exp $
2 2
3o Handle properly sh3 and evbarm ports on NetBSD. 3o Handle properly sh3 and evbarm ports on NetBSD.
4o Fix CPU family detection on NetBSD with /proc mounted with "-o linux" 4o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
5 (please see also kern/25076). 5 (please see also kern/25076).
6o Delete not needed -Iffmpeg from the CFLAGS. 6o Delete not needed -Iffmpeg from the CFLAGS.
7o Fix a bug which broke the detection of a lot of X11 libraries. 7o Fix a bug which broke the detection of a lot of X11 libraries.
8o Add necessary libs for aalib support even if the aa option is turned on with 8o Add necessary libs for aalib support even if the aa option is turned on with
9 --enable-aa. 9 --enable-aa.
10o Add support for dvb capture on NetBSD. 10o Add support for dvb capture on NetBSD.
 11o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
11 12
12--- configure.orig 2016-01-08 12:39:01.000000000 +0000 13--- configure.orig 2016-02-13 21:05:42.000000000 +0000
13+++ configure 14+++ configure
14@@ -1640,7 +1640,7 @@ else 15@@ -1640,7 +1640,7 @@ else
15 cc_name=$cc_name_tmp 16 cc_name=$cc_name_tmp
16 echocheck "$_cc version" 17 echocheck "$_cc version"
17 cc_vendor=gnu 18 cc_vendor=gnu
18- cc_version=$($_cc -dumpversion 2>&1) 19- cc_version=$($_cc -dumpversion 2>&1)
19+ cc_version=$( ( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1 ) 20+ cc_version=$( ( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1 )
20 case $cc_version in 21 case $cc_version in
21 2.96*) 22 2.96*)
22 cc_fail=yes 23 cc_fail=yes
23@@ -1717,8 +1717,9 @@ if test -z "$_target" ; then 24@@ -1717,8 +1717,9 @@ if test -z "$_target" ; then
24 sun4*|sparc*) host_arch=sparc ;; 25 sun4*|sparc*) host_arch=sparc ;;
25 parisc*|hppa*|9000*) host_arch=hppa ;; 26 parisc*|hppa*|9000*) host_arch=hppa ;;
@@ -45,27 +46,27 @@ o Add support for dvb capture on NetBSD. @@ -45,27 +46,27 @@ o Add support for dvb capture on NetBSD.
45 test $_fast_clz = "auto" && _fast_clz=yes 46 test $_fast_clz = "auto" && _fast_clz=yes
46 ;; 47 ;;
47  48
48- sh|sh4) 49- sh|sh4)
49+ sh) 50+ sh)
50+ arch='sh' 51+ arch='sh'
51+ iproc='sh' 52+ iproc='sh'
52+ ;; 53+ ;;
53+ 54+
54+ sh4) 55+ sh4)
55 arch='sh4' 56 arch='sh4'
56 iproc='sh4' 57 iproc='sh4'
57 ;; 58 ;;
58@@ -2783,23 +2789,23 @@ fi # if darwin && test "$cc_vendor" = "g 59@@ -2806,23 +2812,23 @@ fi # if darwin && test "$cc_vendor" = "g
59 _install_strip="-s" 60 _install_strip="-s"
60 if test -z "$CFLAGS" || test "$_profile" != "" || test "$_debug" != ""; then 61 if test -z "$CFLAGS" || test "$_profile" != "" || test "$_debug" != ""; then
61 if test "$cc_vendor" = "intel" ; then 62 if test "$cc_vendor" = "intel" ; then
62- CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer" 63- CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer"
63+ CFLAGS="$CFLAGS -fomit-frame-pointer" 64+ CFLAGS="$CFLAGS -fomit-frame-pointer"
64 WARNFLAGS="-wd167 -wd556 -wd144" 65 WARNFLAGS="-wd167 -wd556 -wd144"
65 elif test "$cc_vendor" = "sun" ; then 66 elif test "$cc_vendor" = "sun" ; then
66- CFLAGS="-O2 $_march $_mcpu $_pipe -xc99 -xregs=frameptr" 67- CFLAGS="-O2 $_march $_mcpu $_pipe -xc99 -xregs=frameptr"
67+ CFLAGS="$CFLAGS -xc99 -xregs=frameptr" 68+ CFLAGS="$CFLAGS -xc99 -xregs=frameptr"
68 elif test "$cc_vendor" = "clang"; then 69 elif test "$cc_vendor" = "clang"; then
69- CFLAGS="-O2 $_march $_pipe" 70- CFLAGS="-O2 $_march $_pipe"
70+ CFLAGS="$CFLAGS" 71+ CFLAGS="$CFLAGS"
71 elif test "$cc_vendor" != "gnu" ; then 72 elif test "$cc_vendor" != "gnu" ; then
@@ -75,68 +76,82 @@ o Add support for dvb capture on NetBSD. @@ -75,68 +76,82 @@ o Add support for dvb capture on NetBSD.
75- CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" 76- CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
76+ CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer" 77+ CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer"
77 WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls -Werror=format-security" 78 WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls -Werror=format-security"
78 WARN_CFLAGS="-Werror-implicit-function-declaration" 79 WARN_CFLAGS="-Werror-implicit-function-declaration"
79 extra_ldflags="$extra_ldflags -ffast-math" 80 extra_ldflags="$extra_ldflags -ffast-math"
80 fi 81 fi
81  82
82 if test "$_profile" != "" || test "$_debug" != ""; then 83 if test "$_profile" != "" || test "$_debug" != ""; then
83- CFLAGS="-O2 $_march $_mcpu $_pipe $_debug $_profile" 84- CFLAGS="-O2 $_march $_mcpu $_pipe $_debug $_profile"
84+ CFLAGS="$CFLAGS $_debug $_profile" 85+ CFLAGS="$CFLAGS $_debug $_profile"
85 WARNFLAGS="-W -Wall $WARNFLAGS" 86 WARNFLAGS="-W -Wall $WARNFLAGS"
86 _install_strip= 87 _install_strip=
87 fi 88 fi
88@@ -2807,8 +2813,8 @@ else 89@@ -2830,8 +2836,8 @@ else
89 warn_cflags=yes 90 warn_cflags=yes
90 fi 91 fi
91  92
92-CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS" 93-CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
93-HOSTCFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg -O3" 94-HOSTCFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg -O3"
94+CFLAGS="-D_ISOC99_SOURCE -I. $CFLAGS" 95+CFLAGS="-D_ISOC99_SOURCE -I. $CFLAGS"
95+HOSTCFLAGS="-D_ISOC99_SOURCE -I. -O3" 96+HOSTCFLAGS="-D_ISOC99_SOURCE -I. -O3"
96  97
97 # On glibc, add some more CPPFLAGS for enabling required functionality. 98 # On glibc, add some more CPPFLAGS for enabling required functionality.
98 cpp_condition_check features.h "defined __GLIBC__" && 99 cpp_condition_check features.h "defined __GLIBC__" &&
99@@ -4591,7 +4597,11 @@ if test "$_x11" = auto && test "$_x11_he 100@@ -2878,10 +2884,11 @@ if test $relocatable = "auto" ; then
 101 elif win32 && ! wine ; then
 102 relocatable=no
 103 res_comment="unnecessary and broken on win32"
 104- elif x86_32 && cflag_check -pie ; then
 105+ elif x86_32 && cflag_check -fpic -fpie ; then
 106 extra_ldflags="$extra_ldflags -pie"
 107+ extra_cflags="$extra_cflags -fpic -fpie"
 108 relocatable=yes
 109- res_comment="non-PIC"
 110+ res_comment="fast PIC"
 111 elif x86_64 && cflag_check -fpie -pie ; then
 112 extra_ldflags="$extra_ldflags -fpie -pie"
 113 extra_cflags="$extra_cflags -fpie"
 114@@ -4615,7 +4622,11 @@ if test "$_x11" = auto && test "$_x11_he
100 -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \ 115 -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
101 -L/usr/lib ; do 116 -L/usr/lib ; do
102 if netbsd; then 117 if netbsd; then
103- ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)" 118- ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
104+ if test -n "$I" ; then 119+ if test -n "$I" ; then
105+ ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)" 120+ ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
106+ else 121+ else
107+ ld_tmp="-lXext -lX11 $ld_pthread" 122+ ld_tmp="-lXext -lX11 $ld_pthread"
108+ fi 123+ fi
109 else 124 else
110 ld_tmp="$I -lXext -lX11 $ld_pthread" 125 ld_tmp="$I -lXext -lX11 $ld_pthread"
111 fi 126 fi
112@@ -4994,6 +5004,8 @@ if test "$_aa" = yes ; then 127@@ -5018,6 +5029,8 @@ if test "$_aa" = yes ; then
113 def_aa='#define CONFIG_AA 1' 128 def_aa='#define CONFIG_AA 1'
114 if cygwin ; then 129 if cygwin ; then
115 libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)" 130 libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
116+ else 131+ else
117+ libs_mplayer="$libs_mplayer $(aalib-config --libs)" 132+ libs_mplayer="$libs_mplayer $(aalib-config --libs)"
118 fi 133 fi
119 vomodules="aa $vomodules" 134 vomodules="aa $vomodules"
120 else 135 else
121@@ -5081,7 +5093,6 @@ EOF 136@@ -5105,7 +5118,6 @@ EOF
122 extra_cflags="$extra_cflags $inc_tmp" && break 137 extra_cflags="$extra_cflags $inc_tmp" && break
123 done 138 done
124 fi 139 fi
125-echores "$_dvb" 140-echores "$_dvb"
126 if test "$_dvb" = yes ; then 141 if test "$_dvb" = yes ; then
127 _dvbin=yes 142 _dvbin=yes
128 inputmodules="dvb $inputmodules" 143 inputmodules="dvb $inputmodules"
129@@ -5090,14 +5101,29 @@ if test "$_dvb" = yes ; then 144@@ -5114,14 +5126,29 @@ if test "$_dvb" = yes ; then
130 aomodules="mpegpes(dvb) $aomodules" 145 aomodules="mpegpes(dvb) $aomodules"
131 vomodules="mpegpes(dvb) $vomodules" 146 vomodules="mpegpes(dvb) $vomodules"
132 else 147 else
133- _dvbin=no 148- _dvbin=no
134- noinputmodules="dvb $noinputmodules" 149- noinputmodules="dvb $noinputmodules"
135- def_dvb='#undef CONFIG_DVB' 150- def_dvb='#undef CONFIG_DVB'
136- def_dvbin='#undef CONFIG_DVBIN ' 151- def_dvbin='#undef CONFIG_DVBIN '
137- aomodules="mpegpes(file) $aomodules" 152- aomodules="mpegpes(file) $aomodules"
138- vomodules="mpegpes(file) $vomodules" 153- vomodules="mpegpes(file) $vomodules"
139+ cat >$TMPC <<EOF 154+ cat >$TMPC <<EOF
140+#include <dev/dtv/dtvio.h> 155+#include <dev/dtv/dtvio.h>
141+int main(void) {return 0;} 156+int main(void) {return 0;}
142+EOF 157+EOF