Date: Friday, June 5, 2020 @ 10:01:31 Author: alucryd Revision: 639131
upgpkg: libretro-beetle-psx 2313-2 Added: libretro-beetle-psx/trunk/libretro-beetle-psx-system-libs.patch Modified: libretro-beetle-psx/trunk/PKGBUILD ---------------------------------------+ PKGBUILD | 29 +++- libretro-beetle-psx-system-libs.patch | 205 ++++++++++++++++++++++++++++++++ 2 files changed, 229 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-05 09:18:12 UTC (rev 639130) +++ PKGBUILD 2020-06-05 10:01:31 UTC (rev 639131) @@ -6,7 +6,7 @@ libretro-beetle-psx-hw ) pkgver=2313 -pkgrel=1 +pkgrel=2 pkgdesc='Sony PlayStation core' arch=(x86_64) url=https://github.com/libretro/beetle-psx-libretro @@ -14,6 +14,7 @@ groups=(libretro) depends=( libretro-core-info + zlib ) makedepends=( git @@ -21,8 +22,12 @@ mesa vulkan-icd-loader ) -source=(libretro-beetle-psx::git+https://github.com/libretro/beetle-psx-libretro.git#commit=) -sha256sums=(SKIP) +source=( + libretro-beetle-psx::git+https://github.com/libretro/beetle-psx-libretro.git#commit=ecdf0c3cff78a7c306ec3f25d8e5e68c70a02be6 + libretro-beetle-psx-system-libs.patch +) +sha256sums=('SKIP' + 'c92257a9ec8a77be5c9f5a3a90e268f53555bacf44336d68b338cecae855d2c4') pkgver() { cd libretro-beetle-psx @@ -31,12 +36,26 @@ } prepare() { + cd libretro-beetle-psx + + patch -Np1 -i ../libretro-beetle-psx-system-libs.patch + + cd .. cp -r libretro-beetle-psx{,-hw} } build() { - make HAVE_LIGHTREC=1 -C libretro-beetle-psx - make HAVE_HW=1 HAVE_LIGHTREC=1 -C libretro-beetle-psx-hw + make \ + HAVE_LIGHTREC=1 \ + SYSTEM_LIBCHDR=0 \ + SYSTEM_ZLIB=1 \ + -C libretro-beetle-psx + make \ + HAVE_HW=1 \ + HAVE_LIGHTREC=1 \ + SYSTEM_LIBCHDR=0 \ + SYSTEM_ZLIB=1 \ + -C libretro-beetle-psx-hw } package_libretro-beetle-psx() { Added: libretro-beetle-psx-system-libs.patch =================================================================== --- libretro-beetle-psx-system-libs.patch (rev 0) +++ libretro-beetle-psx-system-libs.patch 2020-06-05 10:01:31 UTC (rev 639131) @@ -0,0 +1,205 @@ +From 0f7d66191b5807237986a49a6ab45508283dfeea Mon Sep 17 00:00:00 2001 +From: Maxime Gauduin <[email protected]> +Date: Fri, 5 Jun 2020 11:44:47 +0200 +Subject: [PATCH] allow using system libs + +--- + Makefile.common | 157 +++++++++++++++++++++++++++--------------------- + 1 file changed, 89 insertions(+), 68 deletions(-) + +diff --git a/Makefile.common b/Makefile.common +index c2814736..8a183d22 100644 +--- a/Makefile.common ++++ b/Makefile.common +@@ -9,6 +9,68 @@ CORE_EMU_DIR := $(MEDNAFEN_DIR)/psx + RSXGL_DIR := $(CORE_DIR)/rustation-libretro/src + CDROM_DIR := $(MEDNAFEN_DIR)/cdrom + ++LIBCHDR_INCFLAGS = -I$(DEPS_DIR)/crypto \ ++ -I$(DEPS_DIR)/flac-1.3.2/include \ ++ -I$(DEPS_DIR)/flac-1.3.2/src/libFLAC/include \ ++ -I$(DEPS_DIR)/lzma-16.04/C \ ++ -I$(DEPS_DIR)/libchdr ++LIBCHDR_SOURCES_C = $(DEPS_DIR)/crypto/md5.c \ ++ $(DEPS_DIR)/crypto/sha1.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/bitmath.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/bitreader.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/cpu.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/crc.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/float.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/format.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/md5.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/memory.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/metadata_iterators.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/metadata_object.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/stream_decoder.c \ ++ $(DEPS_DIR)/flac-1.3.2/src/libFLAC/window.c \ ++ $(DEPS_DIR)/lzma-16.04/C/Alloc.c \ ++ $(DEPS_DIR)/lzma-16.04/C/Bra86.c \ ++ $(DEPS_DIR)/lzma-16.04/C/Bra.c \ ++ $(DEPS_DIR)/lzma-16.04/C/BraIA64.c \ ++ $(DEPS_DIR)/lzma-16.04/C/CpuArch.c \ ++ $(DEPS_DIR)/lzma-16.04/C/Delta.c \ ++ $(DEPS_DIR)/lzma-16.04/C/LzFind.c \ ++ $(DEPS_DIR)/lzma-16.04/C/Lzma86Dec.c \ ++ $(DEPS_DIR)/lzma-16.04/C/Lzma86Enc.c \ ++ $(DEPS_DIR)/lzma-16.04/C/LzmaDec.c \ ++ $(DEPS_DIR)/lzma-16.04/C/LzmaEnc.c \ ++ $(DEPS_DIR)/lzma-16.04/C/LzmaLib.c \ ++ $(DEPS_DIR)/lzma-16.04/C/Sort.c \ ++ $(DEPS_DIR)/libchdr/bitstream.c \ ++ $(DEPS_DIR)/libchdr/cdrom.c \ ++ $(DEPS_DIR)/libchdr/chd.c \ ++ $(DEPS_DIR)/libchdr/flac.c \ ++ $(DEPS_DIR)/libchdr/huffman.c ++ ++ZLIB_INCFLAGS = -I$(DEPS_DIR)/zlib ++ZLIB_SOURCES_C = $(DEPS_DIR)/zlib/adler32.c \ ++ $(DEPS_DIR)/zlib/compress.c \ ++ $(DEPS_DIR)/zlib/crc32.c \ ++ $(DEPS_DIR)/zlib/deflate.c \ ++ $(DEPS_DIR)/zlib/gzclose.c \ ++ $(DEPS_DIR)/zlib/gzlib.c \ ++ $(DEPS_DIR)/zlib/gzread.c \ ++ $(DEPS_DIR)/zlib/gzwrite.c \ ++ $(DEPS_DIR)/zlib/inffast.c \ ++ $(DEPS_DIR)/zlib/inflate.c \ ++ $(DEPS_DIR)/zlib/inftrees.c \ ++ $(DEPS_DIR)/zlib/trees.c \ ++ $(DEPS_DIR)/zlib/uncompr.c \ ++ $(DEPS_DIR)/zlib/zutil.c ++ + ifeq ($(HAVE_OPENGL), 1) + ifeq ($(GLES), 1) + GLFLAGS := -DHAVE_OPENGLES -DHAVE_OPENGLES2 +@@ -37,30 +99,23 @@ INCFLAGS := -I$(CORE_DIR) \ + -I$(MEDNAFEN_DIR)/hw_cpu \ + -I$(MEDNAFEN_DIR)/hw_misc \ + -I$(LIBRETRO_DIR)/include \ +- -I$(DEPS_DIR)/zlib \ + -I$(DEPS_DIR)/ugui + + ifneq (,$(findstring msvc,$(platform))) +-INCFLAGS += -I$(CORE_DIR)/msvc ++ INCFLAGS += -I$(CORE_DIR)/msvc + endif + +-SOURCES_C += $(DEPS_DIR)/zlib/adler32.c \ +- $(DEPS_DIR)/zlib/compress.c \ +- $(DEPS_DIR)/zlib/crc32.c \ +- $(DEPS_DIR)/zlib/deflate.c \ +- $(DEPS_DIR)/zlib/gzclose.c \ +- $(DEPS_DIR)/zlib/gzlib.c \ +- $(DEPS_DIR)/zlib/gzread.c \ +- $(DEPS_DIR)/zlib/gzwrite.c \ +- $(DEPS_DIR)/zlib/inffast.c \ +- $(DEPS_DIR)/zlib/inflate.c \ +- $(DEPS_DIR)/zlib/inftrees.c \ +- $(DEPS_DIR)/zlib/trees.c \ +- $(DEPS_DIR)/zlib/uncompr.c \ +- $(DEPS_DIR)/zlib/zutil.c \ +- $(DEPS_DIR)/ugui/ugui.c \ ++SOURCES_C += $(DEPS_DIR)/ugui/ugui.c \ + $(CORE_DIR)/ugui_tools.c + ++ifeq ($(SYSTEM_ZLIB), 1) ++ CFLAGS += $(shell pkg-config --cflags zlib) ++ LIBS += $(shell pkg-config --libs zlib) ++else ++ INCFLAGS += $(ZLIB_INCFLAGS) ++ SOURCES_C += $(ZLIB_SOURCES_C) ++endif ++ + ifeq ($(HAVE_GRIFFIN),1) + SOURCES_CXX += beetle_psx_griffin.cpp \ + $(CORE_EMU_DIR)/dma.cpp \ +@@ -131,14 +186,18 @@ ifeq ($(HAVE_CHD), 1) + -DHAVE_STDLIB_H \ + -DHAVE_SYS_PARAM_H + +- INCFLAGS += -I$(DEPS_DIR)/crypto \ +- -I$(DEPS_DIR)/flac-1.3.2/include \ +- -I$(DEPS_DIR)/flac-1.3.2/src/libFLAC/include \ +- -I$(DEPS_DIR)/lzma-16.04/C \ +- -I$(DEPS_DIR)/libchdr +- +- ifeq ($(platform), win) +- FLAGS += -DHAVE_FSEEKO ++ ifeq ($(SYSTEM_LIBCHDR), 1) ++ INCFLAGS += $(shell pkg-config --cflags libchdr) ++ LIBS += $(shell pkg-config --libs libchdr) ++ else ++ INCFLAGS += -I$(DEPS_DIR)/crypto \ ++ -I$(DEPS_DIR)/flac-1.3.2/include \ ++ -I$(DEPS_DIR)/flac-1.3.2/src/libFLAC/include \ ++ -I$(DEPS_DIR)/lzma-16.04/C \ ++ -I$(DEPS_DIR)/libchdr ++ ifeq ($(platform), win) ++ FLAGS += -DHAVE_FSEEKO ++ endif + endif + endif + +@@ -317,49 +376,11 @@ SOURCES_C += $(CORE_DIR)/pgxp/pgxp_cpu.c \ + $(CORE_DIR)/pgxp/pgxp_value.c + + ifeq ($(HAVE_CHD), 1) +- SOURCES_C += $(DEPS_DIR)/crypto/md5.c \ +- $(DEPS_DIR)/crypto/sha1.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/bitmath.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/bitreader.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/cpu.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/crc.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/float.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/format.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/lpc_intrin_sse.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/md5.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/memory.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/metadata_iterators.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/metadata_object.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/stream_decoder.c \ +- $(DEPS_DIR)/flac-1.3.2/src/libFLAC/window.c \ +- $(DEPS_DIR)/lzma-16.04/C/Alloc.c \ +- $(DEPS_DIR)/lzma-16.04/C/Bra86.c \ +- $(DEPS_DIR)/lzma-16.04/C/Bra.c \ +- $(DEPS_DIR)/lzma-16.04/C/BraIA64.c \ +- $(DEPS_DIR)/lzma-16.04/C/CpuArch.c \ +- $(DEPS_DIR)/lzma-16.04/C/Delta.c \ +- $(DEPS_DIR)/lzma-16.04/C/LzFind.c \ +- $(DEPS_DIR)/lzma-16.04/C/Lzma86Dec.c \ +- $(DEPS_DIR)/lzma-16.04/C/Lzma86Enc.c \ +- $(DEPS_DIR)/lzma-16.04/C/LzmaDec.c \ +- $(DEPS_DIR)/lzma-16.04/C/LzmaEnc.c \ +- $(DEPS_DIR)/lzma-16.04/C/LzmaLib.c \ +- $(DEPS_DIR)/lzma-16.04/C/Sort.c \ +- $(DEPS_DIR)/libchdr/bitstream.c \ +- $(DEPS_DIR)/libchdr/cdrom.c \ +- $(DEPS_DIR)/libchdr/chd.c \ +- $(DEPS_DIR)/libchdr/flac.c \ +- $(DEPS_DIR)/libchdr/huffman.c +- +- ifneq (,$(findstring win,$(platform))) +- SOURCES_C += $(DEPS_DIR)/flac-1.3.2/src/libFLAC/windows_unicode_filenames.c ++ ifneq ($(SYSTEM_LIBCHDR), 1) ++ SOURCES_C += $(LIBCHDR_SOURCES_C) ++ ifneq (,$(findstring win,$(platform))) ++ SOURCES_C += $(DEPS_DIR)/flac-1.3.2/src/libFLAC/windows_unicode_filenames.c ++ endif + endif + + SOURCES_CXX += $(CDROM_DIR)/CDAccess_CHD.cpp
