CVS commit: pkgsrc/emulators/libretro-pcsx-rearmed

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jun  1 17:41:03 UTC 2020

Modified Files:
        pkgsrc/emulators/libretro-pcsx-rearmed: Makefile distinfo
Added Files:
        pkgsrc/emulators/libretro-pcsx-rearmed/patches: patch-Makefile

Log Message:
libretro-pcsx-rearmed: enable dynarec on non-arm, don't vendor libflac


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/libretro-pcsx-rearmed/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/libretro-pcsx-rearmed/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/libretro-pcsx-rearmed/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/emulators/libretro-pcsx-rearmed/Makefile
diff -u pkgsrc/emulators/libretro-pcsx-rearmed/Makefile:1.11 pkgsrc/emulators/libretro-pcsx-rearmed/Makefile:1.12
--- pkgsrc/emulators/libretro-pcsx-rearmed/Makefile:1.11        Sat May 30 14:49:00 2020
+++ pkgsrc/emulators/libretro-pcsx-rearmed/Makefile     Mon Jun  1 17:41:02 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2020/05/30 14:49:00 nia Exp $
+# $NetBSD: Makefile,v 1.12 2020/06/01 17:41:02 nia Exp $
 
 DISTNAME=      libretro-pcsx-rearmed-20200526
+PKGREVISION=   1
 CATEGORIES=    emulators
 GITHUB_PROJECT=        pcsx_rearmed
 GITHUB_TAG=    7973b25fe929f92e146a854ecaf4f3cea5b4ffb8
@@ -13,6 +14,8 @@ LICENSE=      gnu-gpl-v2
 USE_LANGUAGES= c c++
 MAKE_FILE=     Makefile.libretro
 
+LDFLAGS+=      -lFLAC
+
 MAKE_FLAGS+=   WANT_ZLIB=0 # disable vendored zlib
 
 .include "../../mk/bsd.prefs.mk"
@@ -27,11 +30,14 @@ MAKE_FLAGS+=        ARCH=arm
 MAKE_FLAGS+=   DYNAREC=ari64
 MAKE_FLAGS+=   HAVE_NEON=0
 MAKE_FLAGS+=   BUILTIN_GPU=peops
+.else
+MAKE_FLAGS+=   DYNAREC=lightrec
+MAKE_FLAGS+=   BUILTIN_GPU=peops
 .endif
 
 LIBRETRO_CORE= pcsx_rearmed
 
 .include "../../emulators/retroarch/core.mk"
-
+.include "../../audio/flac/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/libretro-pcsx-rearmed/distinfo
diff -u pkgsrc/emulators/libretro-pcsx-rearmed/distinfo:1.6 pkgsrc/emulators/libretro-pcsx-rearmed/distinfo:1.7
--- pkgsrc/emulators/libretro-pcsx-rearmed/distinfo:1.6 Sat May 30 14:49:00 2020
+++ pkgsrc/emulators/libretro-pcsx-rearmed/distinfo     Mon Jun  1 17:41:02 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2020/05/30 14:49:00 nia Exp $
+$NetBSD: distinfo,v 1.7 2020/06/01 17:41:02 nia Exp $
 
 SHA1 (libretro-pcsx-rearmed-20200526-7973b25fe929f92e146a854ecaf4f3cea5b4ffb8.tar.gz) = dd07cdb90a432d3626147ae8901fdfd8489f883a
 RMD160 (libretro-pcsx-rearmed-20200526-7973b25fe929f92e146a854ecaf4f3cea5b4ffb8.tar.gz) = dace80b932044463eb0cf6fc0c9eb5917f5c030b
 SHA512 (libretro-pcsx-rearmed-20200526-7973b25fe929f92e146a854ecaf4f3cea5b4ffb8.tar.gz) = 
bd8c2e5ca9d434005790767d3a4a2d7bc86deb1ca272ef73676c99a0cacb1dd92e843732d4f3455f77d0bce4666953befef7a108a616e8a4b2ff752deeef4e69
 Size (libretro-pcsx-rearmed-20200526-7973b25fe929f92e146a854ecaf4f3cea5b4ffb8.tar.gz) = 2278331 bytes
+SHA1 (patch-Makefile) = 2fa7c2c4127c3a688aaa2e62981a5c89436e29b4

Added files:

Index: pkgsrc/emulators/libretro-pcsx-rearmed/patches/patch-Makefile
diff -u /dev/null pkgsrc/emulators/libretro-pcsx-rearmed/patches/patch-Makefile:1.1
--- /dev/null   Mon Jun  1 17:41:03 2020
+++ pkgsrc/emulators/libretro-pcsx-rearmed/patches/patch-Makefile       Mon Jun  1 17:41:02 2020
@@ -0,0 +1,47 @@
+$NetBSD: patch-Makefile,v 1.1 2020/06/01 17:41:02 nia Exp $
+
+Don't use bundled deps.
+
+--- Makefile.orig      2020-05-26 15:40:04.000000000 +0000
++++ Makefile
+@@ -202,26 +202,6 @@ ifeq "$(HAVE_CHD)" "1"
+ CFLAGS += -Ideps/libchdr
+ OBJS += deps/crypto/md5.o
+ OBJS += deps/crypto/sha1.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/bitmath.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/bitreader.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/cpu.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/crc.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/fixed.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/float.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/format.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/lpc.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/md5.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/memory.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/metadata_iterators.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/metadata_object.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/stream_decoder.o
+-OBJS += deps/flac-1.3.2/src/libFLAC/window.o
+ OBJS += deps/lzma-16.04/C/Alloc.o
+ OBJS += deps/lzma-16.04/C/Bra86.o
+ OBJS += deps/lzma-16.04/C/Bra.o
+@@ -243,12 +223,11 @@ OBJS += deps/libchdr/huffman.o
+ 
+ ifneq (,$(findstring win,$(platform)))
+   CFLAGS += -DHAVE_FSEEKO
+-  OBJS += deps/flac-1.3.2/src/libFLAC/windows_unicode_filenames.o
+ else
+   CFLAGS += -DHAVE_SYS_PARAM_H
+ endif
+ 
+-CFLAGS += -Ideps/crypto -Ideps/flac-1.3.2/include -Ideps/flac-1.3.2/src/libFLAC/include -Ideps/flac-1.3.2/src/libFLAC/include -Ideps/lzma-16.04/C
++CFLAGS += -Ideps/crypto -Ideps/lzma-16.04/C
+ CFLAGS += -DHAVE_CHD -D'PACKAGE_VERSION="1.3.2"' -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DFLAC__NO_DLL -D_7ZIP_ST
+ LDFLAGS += -lm
+ endif