CVS commit: pkgsrc/emulators/libretro-genesis-plus-gx

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jun  1 19:12:38 UTC 2020

Modified Files:
        pkgsrc/emulators/libretro-genesis-plus-gx: Makefile distinfo
Added Files:
        pkgsrc/emulators/libretro-genesis-plus-gx/patches:
            patch-Makefile.libretro patch-libretro_Makefile.common

Log Message:
libretro-genesis-plus-gx: don't use bundled zlib, flac

add missing patch for using the correct linker

bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/libretro-genesis-plus-gx/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/libretro-genesis-plus-gx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro \
    pkgsrc/emulators/libretro-genesis-plus-gx/patches/patch-libretro_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/emulators/libretro-genesis-plus-gx/Makefile
diff -u pkgsrc/emulators/libretro-genesis-plus-gx/Makefile:1.5 pkgsrc/emulators/libretro-genesis-plus-gx/Makefile:1.6
--- pkgsrc/emulators/libretro-genesis-plus-gx/Makefile:1.5      Sat May 30 15:04:10 2020
+++ pkgsrc/emulators/libretro-genesis-plus-gx/Makefile  Mon Jun  1 19:12:38 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2020/05/30 15:04:10 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/06/01 19:12:38 nia Exp $
 
 DISTNAME=      libretro-genesis-plus-gx-20200208
+PKGREVISION=   1
 CATEGORIES=    emulators
 GITHUB_PROJECT=        Genesis-Plus-GX
 GITHUB_TAG=    50551066f71f8a5ea782ea3747891fd6d24ebe67
@@ -10,6 +11,8 @@ HOMEPAGE=     https://docs.libretro.com/libr
 COMMENT=       Libretro core based on the Genesis Plus Sega 8/16 bit emulator
 LICENSE=       mame-license
 
+LDFLAGS+=      -lFLAC -lz
+
 LIBRETRO_CORE= genesis_plus_gx
 
 .include "../../emulators/retroarch/core.mk"
@@ -24,5 +27,7 @@ MAKE_FLAGS+=  ENDIANNESS_DEFINES="-DBYTE_
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=./libretro/link.T
 
+.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/libretro-genesis-plus-gx/distinfo
diff -u pkgsrc/emulators/libretro-genesis-plus-gx/distinfo:1.2 pkgsrc/emulators/libretro-genesis-plus-gx/distinfo:1.3
--- pkgsrc/emulators/libretro-genesis-plus-gx/distinfo:1.2      Sat May 30 15:04:10 2020
+++ pkgsrc/emulators/libretro-genesis-plus-gx/distinfo  Mon Jun  1 19:12:38 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2020/05/30 15:04:10 nia Exp $
+$NetBSD: distinfo,v 1.3 2020/06/01 19:12:38 nia Exp $
 
 SHA1 (libretro-genesis-plus-gx-20200208-50551066f71f8a5ea782ea3747891fd6d24ebe67.tar.gz) = f8832fbdf76104a89d1d648c37a64af6e54a5239
 RMD160 (libretro-genesis-plus-gx-20200208-50551066f71f8a5ea782ea3747891fd6d24ebe67.tar.gz) = 82a8d3aae86f1286578d489b2a8fd7e4686b7980
 SHA512 (libretro-genesis-plus-gx-20200208-50551066f71f8a5ea782ea3747891fd6d24ebe67.tar.gz) = 
bc5f0b0b4f6c5077fa90bb18e78f79baa08e6253eadce13b1ca0d884c54d2c2669b53e856feb05f2293a4b642707773df155a4393a8a64db766f805a2b71d63a
 Size (libretro-genesis-plus-gx-20200208-50551066f71f8a5ea782ea3747891fd6d24ebe67.tar.gz) = 6506880 bytes
 SHA1 (patch-Makefile.libretro) = d48bd0e6e752ecc44de1d78eb49cbcc7515b6999
+SHA1 (patch-libretro_Makefile.common) = c32fdd3a80a75c44ddeb2678b7d5579e8a045717

Added files:

Index: pkgsrc/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro
diff -u /dev/null pkgsrc/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro:1.1
--- /dev/null   Mon Jun  1 19:12:38 2020
+++ pkgsrc/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro   Mon Jun  1 19:12:38 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.libretro,v 1.1 2020/06/01 19:12:38 nia Exp $
+
+This is not C++.
+
+--- Makefile.libretro.orig     2020-02-08 21:59:22.000000000 +0000
++++ Makefile.libretro
+@@ -715,7 +715,7 @@ else
+       LD = link.exe
+ endif
+ else
+-      LD = $(CXX)
++      LD = $(CC)
+ endif
+ 
+ ifeq ($(platform), theos_ios)
Index: pkgsrc/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common
diff -u /dev/null pkgsrc/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common:1.1
--- /dev/null   Mon Jun  1 19:12:38 2020
+++ pkgsrc/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common    Mon Jun  1 19:12:38 2020
@@ -0,0 +1,50 @@
+$NetBSD: patch-libretro_Makefile.common,v 1.1 2020/06/01 19:12:38 nia Exp $
+
+Don't use bundled deps.
+
+--- libretro/Makefile.common.orig      2020-02-08 21:59:22.000000000 +0000
++++ libretro/Makefile.common
+@@ -18,30 +18,13 @@ endif
+ 
+ ifeq ($(HAVE_CHD), 1)
+    INCFLAGS += -I$(CHDLIBDIR)/src \
+-                                      -I$(CHDLIBDIR)/deps/libFLAC/include \
+-                                      -I$(CHDLIBDIR)/deps/lzma \
+-                                      -I$(CHDLIBDIR)/deps/zlib
++                                      -I$(CHDLIBDIR)/deps/lzma
+    SOURCES_C += \
+                                        $(CHDLIBDIR)/src/bitstream.c \
+                                        $(CHDLIBDIR)/src/cdrom.c \
+                                        $(CHDLIBDIR)/src/chd.c \
+                                        $(CHDLIBDIR)/src/flac.c \
+                                        $(CHDLIBDIR)/src/huffman.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/bitmath.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/bitreader.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/cpu.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/crc.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/fixed.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/float.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/format.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/lpc.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/lpc_intrin_avx2.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/lpc_intrin_sse.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/lpc_intrin_sse2.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/lpc_intrin_sse41.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/md5.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/memory.c \
+-                                       $(CHDLIBDIR)/deps/libFLAC/stream_decoder.c \
+                                        $(CHDLIBDIR)/deps/lzma/LzFind.c \
+                                        $(CHDLIBDIR)/deps/lzma/LzmaDec.c \
+                                        $(CHDLIBDIR)/deps/lzma/LzmaEnc.c
+@@ -82,11 +65,6 @@ SOURCES_C += \
+                                $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation_cdrom.c
+ endif
+ 
+-SOURCES_C += $(CHDLIBDIR)/deps/zlib/adler32.c \
+-                               $(CHDLIBDIR)/deps/zlib/inffast.c \
+-                               $(CHDLIBDIR)/deps/zlib/inflate.c \
+-                               $(CHDLIBDIR)/deps/zlib/inftrees.c \
+-                               $(CHDLIBDIR)/deps/zlib/zutil.c
+ endif
+ 
+ ifeq ($(SHARED_LIBVORBIS),)