diff options
author | tsutsui <tsutsui@pkgsrc.org> | 2019-06-02 09:48:10 +0000 |
---|---|---|
committer | tsutsui <tsutsui@pkgsrc.org> | 2019-06-02 09:48:10 +0000 |
commit | 04f9bf2198f71a95a91605f6a1ad3bb0434c1410 (patch) | |
tree | 6102f271c27db405d04b6c0d8af8ceb9a84a8d9f | |
parent | 05cd5766fef96fa4094fb59b44d4441c4793752c (diff) | |
download | pkgsrc-04f9bf2198f71a95a91605f6a1ad3bb0434c1410.tar.gz |
mencoder, mplayer, gmplayer: use /dev/audio for OSS on NetBSD/OpenBSD.
- See PR/54229 about misuse of NetBSD's /dev/sound for OSS.
- OpenBSD's /dev/sound seems removed since 6.1:
https://man.openbsd.org/OpenBSD-6.1/audio.4
Bump PKGREVISIONs.
-rw-r--r-- | multimedia/gmplayer/Makefile | 4 | ||||
-rw-r--r-- | multimedia/gmplayer/distinfo | 4 | ||||
-rw-r--r-- | multimedia/mencoder/Makefile | 4 | ||||
-rw-r--r-- | multimedia/mplayer-share/Makefile | 4 | ||||
-rw-r--r-- | multimedia/mplayer-share/distinfo | 4 | ||||
-rw-r--r-- | multimedia/mplayer-share/patches/patch-configure | 13 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile | 4 |
7 files changed, 24 insertions, 13 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index 8415c8d53a8..e3b21eff5c6 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.144 2019/03/24 21:40:15 rhialto Exp $ +# $NetBSD: Makefile,v 1.145 2019/06/02 09:48:10 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= 12 +PKGREVISION= 13 SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \ http://www2.mplayerhq.hu/MPlayer/skins/ \ diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo index fb671657f16..770eac10e95 100644 --- a/multimedia/gmplayer/distinfo +++ b/multimedia/gmplayer/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.103 2019/03/24 21:05:20 rhialto Exp $ +$NetBSD: distinfo,v 1.104 2019/06/02 09:48:10 tsutsui Exp $ SHA1 (mplayer/Abyss-1.7.tar.bz2) = 46d122cb60496eecbc96f26a0cfe0bda883fd725 RMD160 (mplayer/Abyss-1.7.tar.bz2) = ca1e1c77177dc23300d011c1e00711c6bb81756a @@ -303,7 +303,7 @@ Size (mplayer/xmmplayer-1.5.tar.bz2) = 74184 bytes SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217 -SHA1 (patch-configure) = d3e2366e30d1919472e18ec7eded71e3d2b4b498 +SHA1 (patch-configure) = 1bba1d39be27c31f2345c8303f252404538c192f SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37 diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index afb88209a28..aba0a3749e2 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.70 2019/03/24 20:38:25 rhialto Exp $ +# $NetBSD: Makefile,v 1.71 2019/06/02 09:48:10 tsutsui Exp $ PKGNAME= mencoder-${MPLAYER_VERSION} -PKGREVISION= 3 +PKGREVISION= 4 COMMENT= Simple movie encoder for MPlayer-playable movies diff --git a/multimedia/mplayer-share/Makefile b/multimedia/mplayer-share/Makefile index ddb8d9c64c9..96b79a2c79a 100644 --- a/multimedia/mplayer-share/Makefile +++ b/multimedia/mplayer-share/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.62 2019/01/12 15:26:42 tsutsui Exp $ +# $NetBSD: Makefile,v 1.63 2019/06/02 09:48:11 tsutsui Exp $ -PKGREVISION= 14 +PKGREVISION= 15 .include "Makefile.common" PKGNAME= mplayer-share-${MPLAYER_VERSION} diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 00bfb00777a..7f9d17bb334 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.96 2019/01/12 15:26:42 tsutsui Exp $ +$NetBSD: distinfo,v 1.97 2019/06/02 09:48:11 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) = 13278984 bytes SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217 -SHA1 (patch-configure) = d3e2366e30d1919472e18ec7eded71e3d2b4b498 +SHA1 (patch-configure) = 1bba1d39be27c31f2345c8303f252404538c192f SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37 diff --git a/multimedia/mplayer-share/patches/patch-configure b/multimedia/mplayer-share/patches/patch-configure index ac692500e24..30beeb52c50 100644 --- a/multimedia/mplayer-share/patches/patch-configure +++ b/multimedia/mplayer-share/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.2 2019/01/12 15:26:42 tsutsui Exp $ +$NetBSD: patch-configure,v 1.3 2019/06/02 09:48:11 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" @@ -9,6 +9,8 @@ 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 +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 @@ -181,3 +183,12 @@ o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x if darwin; then +@@ -5786,7 +5817,7 @@ if test "$_ossaudio" = yes ; then + if test "$_real_ossaudio" = yes; then + def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' + elif netbsd || openbsd ; then +- def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"' ++ def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/audio"' + extra_ldflags="$extra_ldflags -lossaudio" + else + def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 0744060ab9d..2f0b956da1c 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.103 2019/03/24 20:38:25 rhialto Exp $ +# $NetBSD: Makefile,v 1.104 2019/06/02 09:48:10 tsutsui Exp $ PKGNAME= mplayer-${MPLAYER_VERSION} -PKGREVISION= 3 +PKGREVISION= 4 COMMENT= Fast, cross-platform movie player |