CVS commit: pkgsrc/multimedia

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May 24 09:50:46 UTC 2022

Modified Files:
        pkgsrc/multimedia/ffmpeg2: Makefile.common
        pkgsrc/multimedia/ffmpeg3: Makefile.common
        pkgsrc/multimedia/ffmpeg4: Makefile.common

Log Message:
ffmpeg: remove ancient NetBSD hacks that will bite us in the future


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/multimedia/ffmpeg2/Makefile.common
cvs rdiff -u -r1.39 -r1.40 pkgsrc/multimedia/ffmpeg3/Makefile.common
cvs rdiff -u -r1.28 -r1.29 pkgsrc/multimedia/ffmpeg4/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/ffmpeg2/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg2/Makefile.common:1.63 pkgsrc/multimedia/ffmpeg2/Makefile.common:1.64
--- pkgsrc/multimedia/ffmpeg2/Makefile.common:1.63      Mon May 23 13:48:53 2022
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common   Tue May 24 09:50:45 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.63 2022/05/23 13:48:53 adam Exp $
+# $NetBSD: Makefile.common,v 1.64 2022/05/24 09:50:45 nia Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
@@ -48,11 +48,6 @@ CONFIG_SHELL=        ${TOOLS_PATH.bash}
 
 CONFIGURE_ARGS+=       --enable-runtime-cpudetect
 
-# No posix_memalign() in NetBSD 4.0 and earlier
-.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*)
-CONFIGURE_ARGS+=       --enable-memalign-hack
-.endif
-
 # Let's not put garbage into /tmp
 CONFIGURE_ENV+=                TMPDIR=${WRKSRC}/tmp
 

Index: pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg3/Makefile.common:1.39 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.40
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.39      Mon May 23 13:50:19 2022
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Tue May 24 09:50:45 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2022/05/23 13:50:19 adam Exp $
+# $NetBSD: Makefile.common,v 1.40 2022/05/24 09:50:45 nia Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
@@ -48,11 +48,6 @@ CONFIG_SHELL=        ${TOOLS_PATH.bash}
 
 CONFIGURE_ARGS+=       --enable-runtime-cpudetect
 
-# No posix_memalign() in NetBSD 4.0 and earlier
-.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*)
-CONFIGURE_ARGS+=       --enable-memalign-hack
-.endif
-
 # Let's not put garbage into /tmp
 CONFIGURE_ENV+=                TMPDIR=${WRKSRC}/tmp
 

Index: pkgsrc/multimedia/ffmpeg4/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg4/Makefile.common:1.28 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.29
--- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.28      Mon May 23 00:35:02 2022
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common   Tue May 24 09:50:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2022/05/23 00:35:02 dholland Exp $
+# $NetBSD: Makefile.common,v 1.29 2022/05/24 09:50:46 nia Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
@@ -46,11 +46,6 @@ CONFIG_SHELL=        ${TOOLS_PATH.bash}
 
 CONFIGURE_ARGS+=       --enable-runtime-cpudetect
 
-# No posix_memalign() in NetBSD 4.0 and earlier
-.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*-*)
-CONFIGURE_ARGS+=       --enable-memalign-hack
-.endif
-
 # Let's not put garbage into /tmp
 CONFIGURE_ENV+=                TMPDIR=${WRKSRC}/tmp