From 3747881ec1a298b01ef4955cc3be7d1a7228cd7b Mon Sep 17 00:00:00 2001 From: tsutsui Date: Wed, 14 Dec 2022 13:54:19 +0000 Subject: mplayer*: make mplayer builds on NetBSD/m68k. --- multimedia/mplayer-share/distinfo | 4 +-- multimedia/mplayer-share/patches/patch-configure | 44 +++++++++++++++++------- 2 files changed, 33 insertions(+), 15 deletions(-) (limited to 'multimedia') diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 2038078695a..1f92f38134f 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.103 2022/07/25 00:45:05 tnn Exp $ +$NetBSD: distinfo,v 1.104 2022/12/14 13:54:19 tsutsui Exp $ BLAKE2s (mplayer/MPlayer-1.5.tar.xz) = 1a86b823bcc82e07cf43551151449dd1cbdd768d8281ebe32cea6ced91d029c5 SHA512 (mplayer/MPlayer-1.5.tar.xz) = 05fe1edf23cec53be676333b6299df4b3f1ee746e5ccd96dc0bed550e7a1602ba7ba182c1cc23fcac67aacde849a46628b1dcab8ee3d3d4117415c11b6a6ad74 @@ -7,7 +7,7 @@ SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217 SHA1 (patch-av__helpers.c) = c7821a3c4fb4cddc581ed1ee364c735c9680eb05 -SHA1 (patch-configure) = 70eee721bfb49e811d1b3c9376bdada5438f6b17 +SHA1 (patch-configure) = 4954fe76122f9412433b1cccb64bcc052d1c026f SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c SHA1 (patch-libao2_ao__alsa.c) = da568da8b9290f1ed49ecedec7dc9141408698b1 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5 diff --git a/multimedia/mplayer-share/patches/patch-configure b/multimedia/mplayer-share/patches/patch-configure index bef29bc4ff6..4c3387c7cf0 100644 --- a/multimedia/mplayer-share/patches/patch-configure +++ b/multimedia/mplayer-share/patches/patch-configure @@ -1,6 +1,6 @@ -$NetBSD: patch-configure,v 1.4 2022/04/24 15:00:42 nia Exp $ +$NetBSD: patch-configure,v 1.5 2022/12/14 13:54:19 tsutsui Exp $ -o Handle properly sh3, evbarm, and arm64 ports on NetBSD. +o Handle properly sh3, evbarm, arm64, and m68k ports on NetBSD. o Fix CPU family detection on NetBSD with /proc mounted with "-o linux" (please see also kern/25076). o Delete not needed -Iffmpeg from the CFLAGS. @@ -23,7 +23,7 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD case $cc_version in 2.96*) cc_fail=yes -@@ -1845,8 +1845,13 @@ if test -z "$_target" ; then +@@ -1845,13 +1845,19 @@ if test -z "$_target" ; then sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; aarch64*|ARM64) host_arch=aarch64 ;; @@ -39,7 +39,13 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD s390) host_arch=s390 ;; s390x) host_arch=s390x ;; *mips*) host_arch=mips ;; -@@ -2068,7 +2073,7 @@ if x86 ; then + nios2) host_arch=nios2 ;; + vax) host_arch=vax ;; ++ m68k) host_arch=m68k ;; + xtensa*) host_arch=xtensa ;; + *) host_arch=UNKNOWN ;; + esac +@@ -2068,7 +2074,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 +54,7 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD 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) -@@ -2585,7 +2590,12 @@ case "$host_arch" in +@@ -2585,7 +2591,12 @@ case "$host_arch" in test $_fast_clz = "auto" && _fast_clz=yes ;; @@ -62,7 +68,19 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD arch='sh4' iproc='sh4' ;; -@@ -2949,23 +2959,23 @@ else +@@ -2823,6 +2834,11 @@ EOF + iproc='vax' + ;; + ++ m68k) ++ arch='m68k' ++ iproc='m68k' ++ ;; ++ + xtensa) + arch='xtensa' + iproc='xtensa' +@@ -2949,23 +2965,23 @@ else fi if test -z "$CFLAGS" || test "$_profile" != "" || test "$_debug" != ""; then if test "$cc_vendor" = "intel" ; then @@ -92,7 +110,7 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD WARNFLAGS="-W -Wall $WARNFLAGS" _install_strip= fi -@@ -2973,8 +2983,8 @@ else +@@ -2973,8 +2989,8 @@ else warn_cflags=yes fi @@ -103,7 +121,7 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD # On glibc, add some more CPPFLAGS for enabling required functionality. cpp_condition_check features.h "defined __GLIBC__" && -@@ -3030,10 +3040,11 @@ if test $relocatable = "auto" ; then +@@ -3030,10 +3046,11 @@ if test $relocatable = "auto" ; then elif win32 && ! wine ; then relocatable=no res_comment="unnecessary and broken on win32" @@ -117,7 +135,7 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD elif x86_64 && cflag_check -fpie -pie ; then extra_ldflags="$extra_ldflags -fpie -pie" extra_cflags="$extra_cflags -fpie" -@@ -4951,7 +4962,11 @@ if test "$_x11" = auto && test "$_x11_he +@@ -4951,7 +4968,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 @@ -130,7 +148,7 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD else ld_tmp="$I -lXext -lX11 $ld_pthread" fi -@@ -5354,6 +5369,8 @@ if test "$_aa" = yes ; then +@@ -5354,6 +5375,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)" @@ -139,7 +157,7 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD fi vomodules="aa $vomodules" else -@@ -5441,7 +5458,6 @@ EOF +@@ -5441,7 +5464,6 @@ EOF extra_cflags="$extra_cflags $inc_tmp" && break done fi @@ -147,7 +165,7 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD if test "$_dvb" = yes ; then _dvbin=yes inputmodules="dvb $inputmodules" -@@ -5450,14 +5466,29 @@ if test "$_dvb" = yes ; then +@@ -5450,14 +5472,29 @@ if test "$_dvb" = yes ; then aomodules="mpegpes(dvb) $aomodules" vomodules="mpegpes(dvb) $vomodules" else @@ -183,7 +201,7 @@ o use /dev/audio instead of /dev/sound for OSS audio device for NetBSD if darwin; then -@@ -6117,7 +6148,7 @@ if test "$_ossaudio" = yes ; then +@@ -6117,7 +6154,7 @@ if test "$_ossaudio" = yes ; then if test "$_real_ossaudio" = yes; then def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"' elif netbsd ; then -- cgit v1.2.3