CVS commit: pkgsrc/multimedia

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 27 02:11:04 UTC 2024

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

Log Message:
multimedia/mplayer: Fix cross-build.

This removes our local patch to pass CFLAGS to compile the the
build-time tool codec-cfg.  These CFLAGS don't work for cross-builds,
but all we really need is to make libavutil/avutil.h.  So instead of
patching the makefile, just pass BUILDLINK_CPPFLAGS through into the
HOST_CC invocation that compiles it, in native builds.

And in cross builds, sleazily pass the include path under the
localbase in the destdir, so that we don't have to pull in ffmpeg5 as
a tool dependency -- libavutil/*.h seems to work here, and may
actually be correct because it pulls in libavutil/avconfig.h and
codec-cfg might want that to describe the target system rather than
the build system.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 pkgsrc/multimedia/gmplayer/distinfo
cvs rdiff -u -r1.112 -r1.113 pkgsrc/multimedia/mplayer/Makefile
cvs rdiff -u -r1.105 -r1.106 pkgsrc/multimedia/mplayer-share/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/multimedia/mplayer-share/patches/patch-Makefile

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/distinfo
diff -u pkgsrc/multimedia/gmplayer/distinfo:1.113 pkgsrc/multimedia/gmplayer/distinfo:1.114
--- pkgsrc/multimedia/gmplayer/distinfo:1.113   Wed Nov 22 16:31:22 2023
+++ pkgsrc/multimedia/gmplayer/distinfo Sat Jan 27 02:11:03 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.113 2023/11/22 16:31:22 tsutsui Exp $
+$NetBSD: distinfo,v 1.114 2024/01/27 02:11:03 riastradh Exp $
 
 BLAKE2s (mplayer/Abyss-1.7.tar.bz2) = 8f2e3b2454234f396d8eec5916617133627621aa1690e68a876beb4716bdb2da
 SHA512 (mplayer/Abyss-1.7.tar.bz2) = e60aae7a6a264023ebb49421696bc78ec46b463ce6d7f869cc5561e183a6d5abd3846b71a45656c8ad2a6f35bafd76d15235216dcba3b4936ff7b364b7a66407
@@ -225,7 +225,6 @@ Size (mplayer/xine-lcd-1.2.tar.bz2) = 17
 BLAKE2s (mplayer/xmmplayer-1.5.tar.bz2) = a6d48421913fca708930c097da2abcbaadee159f2a9404827a9431c279ce61b0
 SHA512 (mplayer/xmmplayer-1.5.tar.bz2) = 170a7aec3b0cd284d8f7fb79e72f2463efc84b05710aa70f3360b145e86e424138f2c11abaa2db6a2e937822ed91396d4833ea59685d7067bfc916578187e30f
 Size (mplayer/xmmplayer-1.5.tar.bz2) = 74184 bytes
-SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
 SHA1 (patch-av__helpers.c) = c7821a3c4fb4cddc581ed1ee364c735c9680eb05

Index: pkgsrc/multimedia/mplayer/Makefile
diff -u pkgsrc/multimedia/mplayer/Makefile:1.112 pkgsrc/multimedia/mplayer/Makefile:1.113
--- pkgsrc/multimedia/mplayer/Makefile:1.112    Mon Jan 22 13:17:04 2024
+++ pkgsrc/multimedia/mplayer/Makefile  Sat Jan 27 02:11:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2024/01/22 13:17:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.113 2024/01/27 02:11:04 riastradh Exp $
 
 PKGNAME=       mplayer-${MPLAYER_VERSION}
 PKGREVISION=   3
@@ -11,9 +11,24 @@ USE_TOOLS+=  pkg-config
 
 CONFIGURE_ARGS+=       --disable-mencoder
 CONFIGURE_ARGS+=       --confdir=${PREFIX}/share/mplayer
+CONFIGURE_ARGS+=       --enable-x11
 CONFIGURE_ARGS+=       --enable-xvmc
 CONFIGURE_ARGS+=       --with-xvmclib=XvMCW
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+CONFIGURE_ARGS+=       --target=${MACHINE_ARCH:Q}-${OPSYS:Q}
+# Reaching into the destdir with a -I flag to NATIVE_CC is kinda
+# sleazy, but this will probably work and it saves the trouble of
+# pulling in a gigantic tool dependency.
+CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}\ -I${_CROSS_DESTDIR:Q}${LOCALBASE:Q}/include/ffmpeg5
+#TOOL_DEPENDS+=                ffmpeg5>=0:../../multimedia/ffmpeg5
+#CONFIGURE_ARGS+=      --host-cc=${NATIVE_CC:Q}\ -I${TOOLBASE:Q}/include/ffmpeg5
+.else
+CONFIGURE_ARGS+=       --host-cc=${CC:Q}\ ${BUILDLINK_CPPFLAGS:Q}
+.endif
+
 INSTALLATION_DIRS+=    bin
 
 do-install:

Index: pkgsrc/multimedia/mplayer-share/distinfo
diff -u pkgsrc/multimedia/mplayer-share/distinfo:1.105 pkgsrc/multimedia/mplayer-share/distinfo:1.106
--- pkgsrc/multimedia/mplayer-share/distinfo:1.105      Wed Nov 22 16:18:20 2023
+++ pkgsrc/multimedia/mplayer-share/distinfo    Sat Jan 27 02:11:04 2024
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.105 2023/11/22 16:18:20 tsutsui Exp $
+$NetBSD: distinfo,v 1.106 2024/01/27 02:11:04 riastradh Exp $
 
 BLAKE2s (mplayer/MPlayer-1.5.tar.xz) = 1a86b823bcc82e07cf43551151449dd1cbdd768d8281ebe32cea6ced91d029c5
 SHA512 (mplayer/MPlayer-1.5.tar.xz) = 05fe1edf23cec53be676333b6299df4b3f1ee746e5ccd96dc0bed550e7a1602ba7ba182c1cc23fcac67aacde849a46628b1dcab8ee3d3d4117415c11b6a6ad74
 Size (mplayer/MPlayer-1.5.tar.xz) = 15379972 bytes
-SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
 SHA1 (patch-av__helpers.c) = c7821a3c4fb4cddc581ed1ee364c735c9680eb05