Tue May 24 09:50:46 2022 UTC ()
ffmpeg: remove ancient NetBSD hacks that will bite us in the future


(nia)
diff -r1.63 -r1.64 pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -r1.39 -r1.40 pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -r1.28 -r1.29 pkgsrc/multimedia/ffmpeg4/Makefile.common
cvs diff -r1.63 -r1.64 pkgsrc/multimedia/ffmpeg2/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile.common 2022/05/23 13:48:53 1.63
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common 2022/05/24 09:50:45 1.64
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.63 2022/05/23 13:48:53 adam Exp $ 1# $NetBSD: Makefile.common,v 1.64 2022/05/24 09:50:45 nia Exp $
2# used by multimedia/ffmpeg2/Makefile 2# used by multimedia/ffmpeg2/Makefile
3# used by multimedia/ffplay2/Makefile 3# used by multimedia/ffplay2/Makefile
4 4
5DISTNAME= ffmpeg-2.8.20 5DISTNAME= ffmpeg-2.8.20
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
11 11
12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches 12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches
13 13
14USE_LANGUAGES= c99 14USE_LANGUAGES= c99
@@ -38,31 +38,26 @@ PLIST_VARS+= opencl @@ -38,31 +38,26 @@ PLIST_VARS+= opencl
38 38
39.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) 39.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*)
40CONFIGURE_ARGS+= --enable-opencl 40CONFIGURE_ARGS+= --enable-opencl
41PLIST.opencl= yes 41PLIST.opencl= yes
42.endif 42.endif
43 43
44.if ${OPSYS} == "SunOS" 44.if ${OPSYS} == "SunOS"
45USE_TOOLS+= bash:build 45USE_TOOLS+= bash:build
46CONFIG_SHELL= ${TOOLS_PATH.bash} 46CONFIG_SHELL= ${TOOLS_PATH.bash}
47.endif 47.endif
48 48
49CONFIGURE_ARGS+= --enable-runtime-cpudetect 49CONFIGURE_ARGS+= --enable-runtime-cpudetect
50 50
51# No posix_memalign() in NetBSD 4.0 and earlier 
52.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*) 
53CONFIGURE_ARGS+= --enable-memalign-hack 
54.endif 
55 
56# Let's not put garbage into /tmp 51# Let's not put garbage into /tmp
57CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp 52CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp
58 53
59.include "../../mk/compiler.mk" 54.include "../../mk/compiler.mk"
60 55
61.if !empty(PKGSRC_COMPILER:Msunpro) 56.if !empty(PKGSRC_COMPILER:Msunpro)
62SUBST_CLASSES+= sunwspro 57SUBST_CLASSES+= sunwspro
63SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. 58SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler.
64SUBST_STAGE.sunwspro= post-configure 59SUBST_STAGE.sunwspro= post-configure
65SUBST_FILES.sunwspro= config.mak 60SUBST_FILES.sunwspro= config.mak
66SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" 61SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /"
67SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" 62SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g"
68SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" 63SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/"
cvs diff -r1.39 -r1.40 pkgsrc/multimedia/ffmpeg3/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/Makefile.common 2022/05/23 13:50:19 1.39
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common 2022/05/24 09:50:45 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.39 2022/05/23 13:50:19 adam Exp $ 1# $NetBSD: Makefile.common,v 1.40 2022/05/24 09:50:45 nia Exp $
2# used by multimedia/ffmpeg3/Makefile 2# used by multimedia/ffmpeg3/Makefile
3# used by multimedia/ffplay3/Makefile 3# used by multimedia/ffplay3/Makefile
4 4
5DISTNAME= ffmpeg-3.4.11 5DISTNAME= ffmpeg-3.4.11
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
11 11
12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg3/patches 12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg3/patches
13 13
14USE_LANGUAGES= c99 14USE_LANGUAGES= c99
@@ -38,31 +38,26 @@ PLIST_VARS+= opencl @@ -38,31 +38,26 @@ PLIST_VARS+= opencl
38 38
39.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) 39.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*)
40CONFIGURE_ARGS+= --enable-opencl 40CONFIGURE_ARGS+= --enable-opencl
41PLIST.opencl= yes 41PLIST.opencl= yes
42.endif 42.endif
43 43
44.if ${OPSYS} == "SunOS" 44.if ${OPSYS} == "SunOS"
45USE_TOOLS+= bash:build 45USE_TOOLS+= bash:build
46CONFIG_SHELL= ${TOOLS_PATH.bash} 46CONFIG_SHELL= ${TOOLS_PATH.bash}
47.endif 47.endif
48 48
49CONFIGURE_ARGS+= --enable-runtime-cpudetect 49CONFIGURE_ARGS+= --enable-runtime-cpudetect
50 50
51# No posix_memalign() in NetBSD 4.0 and earlier 
52.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*) 
53CONFIGURE_ARGS+= --enable-memalign-hack 
54.endif 
55 
56# Let's not put garbage into /tmp 51# Let's not put garbage into /tmp
57CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp 52CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp
58 53
59.include "../../mk/compiler.mk" 54.include "../../mk/compiler.mk"
60 55
61.if !empty(PKGSRC_COMPILER:Msunpro) 56.if !empty(PKGSRC_COMPILER:Msunpro)
62SUBST_CLASSES+= sunwspro 57SUBST_CLASSES+= sunwspro
63SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. 58SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler.
64SUBST_STAGE.sunwspro= post-configure 59SUBST_STAGE.sunwspro= post-configure
65SUBST_FILES.sunwspro= config.mak 60SUBST_FILES.sunwspro= config.mak
66SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" 61SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /"
67SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" 62SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g"
68SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" 63SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/"
cvs diff -r1.28 -r1.29 pkgsrc/multimedia/ffmpeg4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/Makefile.common 2022/05/23 00:35:02 1.28
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common 2022/05/24 09:50:46 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.28 2022/05/23 00:35:02 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.29 2022/05/24 09:50:46 nia Exp $
2# used by multimedia/ffmpeg4/Makefile 2# used by multimedia/ffmpeg4/Makefile
3# used by multimedia/ffplay4/Makefile 3# used by multimedia/ffplay4/Makefile
4 4
5DISTNAME= ffmpeg-4.4.2 5DISTNAME= ffmpeg-4.4.2
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 ${ADDITIONAL_LICENSE} 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 ${ADDITIONAL_LICENSE}
11 11
12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg4/patches 12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg4/patches
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -36,31 +36,26 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFI @@ -36,31 +36,26 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFI
36LDFLAGS.SunOS+= -lrt 36LDFLAGS.SunOS+= -lrt
37 37
38.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*) 38.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)
39CONFIGURE_ARGS+= --enable-opencl 39CONFIGURE_ARGS+= --enable-opencl
40.endif 40.endif
41 41
42.if ${OPSYS} == "SunOS" 42.if ${OPSYS} == "SunOS"
43USE_TOOLS+= bash:build 43USE_TOOLS+= bash:build
44CONFIG_SHELL= ${TOOLS_PATH.bash} 44CONFIG_SHELL= ${TOOLS_PATH.bash}
45.endif 45.endif
46 46
47CONFIGURE_ARGS+= --enable-runtime-cpudetect 47CONFIGURE_ARGS+= --enable-runtime-cpudetect
48 48
49# No posix_memalign() in NetBSD 4.0 and earlier 
50.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*) 
51CONFIGURE_ARGS+= --enable-memalign-hack 
52.endif 
53 
54# Let's not put garbage into /tmp 49# Let's not put garbage into /tmp
55CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp 50CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp
56 51
57.include "../../mk/compiler.mk" 52.include "../../mk/compiler.mk"
58 53
59.if !empty(PKGSRC_COMPILER:Msunpro) 54.if !empty(PKGSRC_COMPILER:Msunpro)
60SUBST_CLASSES+= sunwspro 55SUBST_CLASSES+= sunwspro
61SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. 56SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler.
62SUBST_STAGE.sunwspro= post-configure 57SUBST_STAGE.sunwspro= post-configure
63SUBST_FILES.sunwspro= config.mak 58SUBST_FILES.sunwspro= config.mak
64SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" 59SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /"
65SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" 60SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g"
66SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" 61SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/"