CVS commit: pkgsrc/multimedia

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Feb 17 22:49:23 UTC 2024

Modified Files:
        pkgsrc/multimedia/gmplayer: Makefile
        pkgsrc/multimedia/mencoder: Makefile
        pkgsrc/multimedia/mplayer: Makefile
        pkgsrc/multimedia/mplayer-share: Makefile.common

Log Message:
mplayer and friends: consolidate cross-build logic in Makefile.common


To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 pkgsrc/multimedia/gmplayer/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/multimedia/mencoder/Makefile
cvs rdiff -u -r1.113 -r1.114 pkgsrc/multimedia/mplayer/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/multimedia/mplayer-share/Makefile.common

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.164 pkgsrc/multimedia/gmplayer/Makefile:1.165
--- pkgsrc/multimedia/gmplayer/Makefile:1.164   Sat Feb 17 19:45:15 2024
+++ pkgsrc/multimedia/gmplayer/Makefile Sat Feb 17 22:49:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.164 2024/02/17 19:45:15 wiz Exp $
+# $NetBSD: Makefile,v 1.165 2024/02/17 22:49:22 wiz 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
@@ -108,18 +108,6 @@ CONFIGURE_ARGS+=   --enable-gui --disable-
                        --confdir=${PREFIX}/share/mplayer
 CONFIGURE_ARGS+=       --enable-xvmc
 
-.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}${PREFIX: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 share/mplayer/skins
 
 do-install:

Index: pkgsrc/multimedia/mencoder/Makefile
diff -u pkgsrc/multimedia/mencoder/Makefile:1.79 pkgsrc/multimedia/mencoder/Makefile:1.80
--- pkgsrc/multimedia/mencoder/Makefile:1.79    Sat Feb 17 19:40:01 2024
+++ pkgsrc/multimedia/mencoder/Makefile Sat Feb 17 22:49:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2024/02/17 19:40:01 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2024/02/17 22:49:22 wiz Exp $
 
 PKGNAME=       mencoder-${MPLAYER_VERSION}
 PKGREVISION=   3
@@ -9,20 +9,6 @@ USE_TOOLS+=    pkg-config
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
-.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}${PREFIX: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
-
 # Fix build under Mac OS X, please see here for details:
 # http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2009-May/061515.html
 LDFLAGS.Darwin+=       -framework Carbon

Index: pkgsrc/multimedia/mplayer/Makefile
diff -u pkgsrc/multimedia/mplayer/Makefile:1.113 pkgsrc/multimedia/mplayer/Makefile:1.114
--- pkgsrc/multimedia/mplayer/Makefile:1.113    Sat Jan 27 02:11:04 2024
+++ pkgsrc/multimedia/mplayer/Makefile  Sat Feb 17 22:49:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2024/01/27 02:11:04 riastradh Exp $
+# $NetBSD: Makefile,v 1.114 2024/02/17 22:49:22 wiz Exp $
 
 PKGNAME=       mplayer-${MPLAYER_VERSION}
 PKGREVISION=   3
@@ -15,20 +15,6 @@ 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/Makefile.common
diff -u pkgsrc/multimedia/mplayer-share/Makefile.common:1.68 pkgsrc/multimedia/mplayer-share/Makefile.common:1.69
--- pkgsrc/multimedia/mplayer-share/Makefile.common:1.68        Thu Nov 23 17:24:36 2023
+++ pkgsrc/multimedia/mplayer-share/Makefile.common     Sat Feb 17 22:49:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.68 2023/11/23 17:24:36 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.69 2024/02/17 22:49:22 wiz Exp $
 # used by multimedia/gmplayer/Makefile
 # used by multimedia/mencoder/Makefile
 # used by multimedia/mplayer/Makefile
@@ -49,6 +49,18 @@ CONFIGURE_ENV+=              TMPDIR=${WRKDIR}
 
 .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
+
 # avoid text relocations caused by asm ops in #if HAVE_SSE4_INTERNAL block
 # in libmpcodecs/vf_ass.c
 .if ${MACHINE_PLATFORM:MNetBSD-*-i386}