diff options
| author | nia <nia@pkgsrc.org> | 2022-09-17 11:53:42 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2022-09-17 11:53:42 +0000 |
| commit | 05da03d89f273be5810b0ff51d6916ca5e9501eb (patch) | |
| tree | f4b29bfa389534ab50e5c619108782ec88c93474 /emulators/libretro-genesis-plus-gx/patches | |
| parent | 50d681b62ea49d6dccc6654f2fcc4d756c3593c7 (diff) | |
| download | pkgsrc-05da03d89f273be5810b0ff51d6916ca5e9501eb.tar.gz | |
libretro-genesis-plus-gx: Update to latest snapshot.
Many many changes to the internal emulator code, but the important thing
is that this builds again.
Diffstat (limited to 'emulators/libretro-genesis-plus-gx/patches')
| -rw-r--r-- | emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro | 20 | ||||
| -rw-r--r-- | emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common | 61 |
2 files changed, 32 insertions, 49 deletions
diff --git a/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro b/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro index b362dbd82a9..245791c4347 100644 --- a/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro +++ b/emulators/libretro-genesis-plus-gx/patches/patch-Makefile.libretro @@ -1,15 +1,17 @@ -$NetBSD: patch-Makefile.libretro,v 1.1 2020/06/01 19:12:38 nia Exp $ +$NetBSD: patch-Makefile.libretro,v 1.2 2022/09/17 11:53:42 nia Exp $ -This is not C++. +Do not force -O2. ---- Makefile.libretro.orig 2020-02-08 21:59:22.000000000 +0000 +--- Makefile.libretro.orig 2022-09-01 18:13:56.000000000 +0000 +++ Makefile.libretro -@@ -715,7 +715,7 @@ else - LD = link.exe +@@ -772,8 +772,8 @@ ifneq (,$(findstring msvc,$(platform))) + CFLAGS += -MT + CXXFLAGS += -MT endif - else -- LD = $(CXX) -+ LD = $(CC) +- CFLAGS += -O2 -DNDEBUG +- CXXFLAGS += -O2 -DNDEBUG ++ CFLAGS += -DNDEBUG ++ CXXFLAGS += -DNDEBUG endif - ifeq ($(platform), theos_ios) + ifeq ($(SHARED_LIBVORBIS),) diff --git a/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common b/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common index 8591cf79223..4e8d6387270 100644 --- a/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common +++ b/emulators/libretro-genesis-plus-gx/patches/patch-libretro_Makefile.common @@ -1,50 +1,31 @@ -$NetBSD: patch-libretro_Makefile.common,v 1.1 2020/06/01 19:12:38 nia Exp $ +$NetBSD: patch-libretro_Makefile.common,v 1.2 2022/09/17 11:53:42 nia Exp $ -Don't use bundled deps. +Use external zlib. ---- libretro/Makefile.common.orig 2020-02-08 21:59:22.000000000 +0000 +--- libretro/Makefile.common.orig 2022-09-01 18:13:56.000000000 +0000 +++ libretro/Makefile.common -@@ -18,30 +18,13 @@ endif - +@@ -24,8 +24,7 @@ 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 + INCFLAGS += \ + -I$(LIBRETRO_DEPS_DIR)/libchdr/include \ +- -I$(LIBRETRO_DEPS_DIR)/lzma-19.00/include \ +- -I$(LIBRETRO_DEPS_DIR)/zlib-1.2.11 ++ -I$(LIBRETRO_DEPS_DIR)/lzma-19.00/include 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_DEPS_DIR)/lzma-19.00/src/Alloc.c \ + $(LIBRETRO_DEPS_DIR)/lzma-19.00/src/Bra86.c \ +@@ -74,14 +73,6 @@ SOURCES_C += \ + $(LIBRETRO_COMM_DIR)/cdrom/cdrom.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 +-SOURCES_C += \ +- $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/adler32.c \ +- $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/crc32.c \ +- $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/inffast.c \ +- $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/inflate.c \ +- $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/inftrees.c \ +- $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/zutil.c +- endif ifeq ($(SHARED_LIBVORBIS),) |