CVS commit: pkgsrc/emulators/mame

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Sep  5 12:15:57 UTC 2023

Modified Files:
        pkgsrc/emulators/mame: distinfo
Added Files:
        pkgsrc/emulators/mame/patches: patch-scripts_src_3rdparty.lua

Log Message:
mame: Couple of little fixes for NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 pkgsrc/emulators/mame/distinfo
cvs rdiff -u -r0 -r1.5 \
    pkgsrc/emulators/mame/patches/patch-scripts_src_3rdparty.lua

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

Modified files:

Index: pkgsrc/emulators/mame/distinfo
diff -u pkgsrc/emulators/mame/distinfo:1.134 pkgsrc/emulators/mame/distinfo:1.135
--- pkgsrc/emulators/mame/distinfo:1.134        Sat Jul 29 19:42:10 2023
+++ pkgsrc/emulators/mame/distinfo      Tue Sep  5 12:15:57 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.134 2023/07/29 19:42:10 wiz Exp $
+$NetBSD: distinfo,v 1.135 2023/09/05 12:15:57 nia Exp $
 
 BLAKE2s (mame-0.257.tar.gz) = eddc9c682c29bd3d02bf2a1092482eebcf93307bd8c34e70ebbcd1fd70cedecb
 SHA512 (mame-0.257.tar.gz) = c180a01b3938acda2148676c21b8845f29fadafb35b7d4c9fc1ec1c6259d820dcedf9c42a6483be0405c76accc379ef222a5771c4e45266a97683bc2a22718b5
@@ -6,4 +6,5 @@ Size (mame-0.257.tar.gz) = 204721575 byt
 SHA1 (patch-3rdparty_bx_src_thread.cpp) = 91d7aa74dbe5e8e73594580ce0c16846f4a0d7b1
 SHA1 (patch-3rdparty_genie_build_gmake.darwin_genie.make) = bb2e8c06d4b5f5869fb48e06390d5ca94a190056
 SHA1 (patch-makefile) = 343fac4d165438a26e2e8077216db1c6c46a5d1e
+SHA1 (patch-scripts_src_3rdparty.lua) = 1306dbb633315478468a273daa526341a96eca87
 SHA1 (patch-scripts_toolchain.lua) = df383dab4787f58348d62e1c5f25ddaa45eb8199

Added files:

Index: pkgsrc/emulators/mame/patches/patch-scripts_src_3rdparty.lua
diff -u /dev/null pkgsrc/emulators/mame/patches/patch-scripts_src_3rdparty.lua:1.5
--- /dev/null   Tue Sep  5 12:15:57 2023
+++ pkgsrc/emulators/mame/patches/patch-scripts_src_3rdparty.lua        Tue Sep  5 12:15:57 2023
@@ -0,0 +1,35 @@
+$NetBSD: patch-scripts_src_3rdparty.lua,v 1.5 2023/09/05 12:15:57 nia Exp $
+
+NetBSD has arc4random too.
+
+Disable SSE usage in bimg - it seems to assume availability of AVX2
+intrinsics?
+
+Compiling 3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_decompress_symbolic.cpp...
+In file included from /usr/pkg/gcc8/lib/gcc/x86_64--netbsd/8.5.0/include/immintrin.h:35,
+                 from ../../../../../3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_mathlib.h:85,
+                 from ../../../../../3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_internal.h:34,
+                 from ../../../../../3rdparty/bimg/3rdparty/astc-encoder/source/astcenc_decompress_symbolic.cpp:22:
+/usr/pkg/gcc8/lib/gcc/x86_64--netbsd/8.5.0/include/tmmintrin.h: In function 'vint4 vtable_8bt_32bi(vint4, vint4, vint4)':
+/usr/pkg/gcc8/lib/gcc/x86_64--netbsd/8.5.0/include/tmmintrin.h:136:1: error: inlining failed in call to always_inline '__m128i _mm_shuffle_epi8(__m128i, __m128i)': target specific option mismatch
+
+--- scripts/src/3rdparty.lua.orig      2023-07-27 16:00:24.000000000 +0000
++++ scripts/src/3rdparty.lua
+@@ -49,7 +49,7 @@ else
+               "BYTEORDER=1234",
+       }
+ end
+-if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="freebsd" then
++if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="netbsd" then
+       defines {
+               "HAVE_ARC4RANDOM",
+       }
+@@ -1280,7 +1280,7 @@ project "bimg"
+       configuration { "x64", "mingw*" }
+               defines {
+                       "ASTCENC_AVX=0",
+-                      "ASTCENC_SSE=20",
++                      "ASTCENC_SSE=0",
+               }
+       configuration { }
+