CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Dec 22 16:50:10 UTC 2024

Modified Files:
        pkgsrc/multimedia/svt-av1: hacks.mk
        pkgsrc/multimedia/x265: hacks.mk

Log Message:
I forgot about compiler.mk...


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/svt-av1/hacks.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/x265/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/svt-av1/hacks.mk
diff -u pkgsrc/multimedia/svt-av1/hacks.mk:1.1 pkgsrc/multimedia/svt-av1/hacks.mk:1.2
--- pkgsrc/multimedia/svt-av1/hacks.mk:1.1      Sun Dec 22 16:44:30 2024
+++ pkgsrc/multimedia/svt-av1/hacks.mk  Sun Dec 22 16:50:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2024/12/22 16:44:30 nia Exp $
+# $NetBSD: hacks.mk,v 1.2 2024/12/22 16:50:10 nia Exp $
 
 .if !defined(SVT_AV1_HACKS_MK)
 SVT_AV1_HACKS_MK=              # defined
@@ -6,7 +6,9 @@ SVT_AV1_HACKS_MK=               # defined
 ### [Mon Sun Dec 22 17:37:18 CET 2024 : nia]
 ### GCC 9 and earlier lack certain ARM NEON intrinsics such as vld1_s16_x2
 ###
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 100000
+.include "../../mk/compiler.mk"
+
+.if ${MACHINE_ARCH:Maarch64*} && ${CC_VERSION:Mgcc-[0-9]\.*}
 PKG_HACKS+=            neon-intrin
 CMAKE_CONFIGURE_ARGS+= -DENABLE_NEON=OFF
 CMAKE_CONFIGURE_ARGS+= -DENABLE_NEON_DOTPROD=OFF

Index: pkgsrc/multimedia/x265/hacks.mk
diff -u pkgsrc/multimedia/x265/hacks.mk:1.1 pkgsrc/multimedia/x265/hacks.mk:1.2
--- pkgsrc/multimedia/x265/hacks.mk:1.1 Sun Dec 22 16:44:30 2024
+++ pkgsrc/multimedia/x265/hacks.mk     Sun Dec 22 16:50:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2024/12/22 16:44:30 nia Exp $
+# $NetBSD: hacks.mk,v 1.2 2024/12/22 16:50:10 nia Exp $
 
 .if !defined(X265_HACKS_MK)
 X265_HACKS_MK=         # defined
@@ -6,7 +6,9 @@ X265_HACKS_MK=          # defined
 ### [Mon Sun Dec 22 17:37:18 CET 2024 : nia]
 ### GCC 9 and earlier lack certain ARM NEON intrinsics such as vld1_s16_x2
 ###
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 100000
+.include "../../mk/compiler.mk"
+
+.if ${MACHINE_ARCH:Maarch64*} && ${CC_VERSION:Mgcc-[0-9]\.*}
 PKG_HACKS+=            neon-intrin
 CMAKE_CONFIGURE_ARGS+= -DENABLE_NEON=OFF
 CMAKE_CONFIGURE_ARGS+= -DENABLE_NEON_DOTPROD=OFF