Sat Jun 13 10:43:15 2020 UTC ()
libretro-ppsspp: Unbundle deps. Add theoretical aarch64 support.

Bump PKGREVISION.


(nia)
diff -r1.7 -r1.8 pkgsrc/emulators/libretro-ppsspp/Makefile
diff -r1.3 -r1.4 pkgsrc/emulators/libretro-ppsspp/distinfo
diff -r1.1 -r1.2 pkgsrc/emulators/libretro-ppsspp/patches/patch-libretro_Makefile
diff -r1.2 -r1.3 pkgsrc/emulators/libretro-ppsspp/patches/patch-libretro_Makefile.common
cvs diff -r1.7 -r1.8 pkgsrc/emulators/libretro-ppsspp/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-ppsspp/Makefile 2020/05/31 18:51:00 1.7
+++ pkgsrc/emulators/libretro-ppsspp/Makefile 2020/06/13 10:43:15 1.8
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2020/05/31 18:51:00 nia Exp $ 1# $NetBSD: Makefile,v 1.8 2020/06/13 10:43:15 nia Exp $
2 2
3PKGNAME= libretro-ppsspp-1.7.5 3PKGNAME= libretro-ppsspp-1.7.5
 4PKGREVISION= 1
4CATEGORIES= emulators 5CATEGORIES= emulators
5 6
6MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
7HOMEPAGE= https://docs.libretro.com/library/ppsspp/ 8HOMEPAGE= https://docs.libretro.com/library/ppsspp/
8COMMENT= Libretro core based on the PPSSPP PlayStation Portable emulator 9COMMENT= Libretro core based on the PPSSPP PlayStation Portable emulator
9LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
10 11
11DIST_SUBDIR= ppsspp-${PKGVERSION_NOREV} 12DIST_SUBDIR= ppsspp-${PKGVERSION_NOREV}
12DISTFILES+= ppsspp.tar.gz 13DISTFILES+= ppsspp.tar.gz
13DISTFILES+= ppsspp-armips.tar.gz 14DISTFILES+= ppsspp-armips.tar.gz
14DISTFILES+= ppsspp-glslang.tar.gz 15DISTFILES+= ppsspp-glslang.tar.gz
15DISTFILES+= ppsspp-spriv.tar.gz 16DISTFILES+= ppsspp-spriv.tar.gz
16 17
@@ -35,31 +36,37 @@ WRKSRC= ${WRKDIR}/ppsspp-${PKGVERSION_N @@ -35,31 +36,37 @@ WRKSRC= ${WRKDIR}/ppsspp-${PKGVERSION_N
35BUILD_DIRS= libretro 36BUILD_DIRS= libretro
36 37
37USE_LANGUAGES= c c++11 38USE_LANGUAGES= c c++11
38 39
39LIBRETRO_CORE= ppsspp 40LIBRETRO_CORE= ppsspp
40 41
41.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
42 43
43ONLY_FOR_PLATFORM= *-*-*arm* *-*-x86_64 *-*-i386 44ONLY_FOR_PLATFORM= *-*-*arm* *-*-x86_64 *-*-i386
44 45
45.if !empty(MACHINE_ARCH:M*arm*) 46.if !empty(MACHINE_ARCH:M*arm*)
46CFLAGS+= -marm 47CFLAGS+= -marm
47MAKE_FLAGS+= TARGET_ARCH=arm 48MAKE_FLAGS+= TARGET_ARCH=arm
 49.elif ${MACHINE_ARCH} == "aarch64"
 50MAKE_FLAGS+= TARGET_ARCH=arm64
48.elif ${MACHINE_ARCH} == "x86_64" 51.elif ${MACHINE_ARCH} == "x86_64"
49MAKE_FLAGS+= TARGET_ARCH=x86_64 52MAKE_FLAGS+= TARGET_ARCH=x86_64
50.elif ${MACHINE_ARCH} == "i386" 53.elif ${MACHINE_ARCH} == "i386"
51MAKE_FLAGS+= TARGET_ARCH=x86 54MAKE_FLAGS+= TARGET_ARCH=x86
52.endif 55.endif
53 56
 57LDFLAGS+= -lpng -lsnappy -lxxhash
54LDFLAGS+= ${BUILDLINK_LDADD.libexecinfo} 58LDFLAGS+= ${BUILDLINK_LDADD.libexecinfo}
55 59
56post-extract: 60post-extract:
57 ${MV} ${WRKDIR}/armips-${ARMIPS_TAG}/* ${WRKSRC}/ext/armips 61 ${MV} ${WRKDIR}/armips-${ARMIPS_TAG}/* ${WRKSRC}/ext/armips
58 ${MV} ${WRKDIR}/glslang-${GLSLANG_TAG}/* ${WRKSRC}/ext/glslang 62 ${MV} ${WRKDIR}/glslang-${GLSLANG_TAG}/* ${WRKSRC}/ext/glslang
59 ${MV} ${WRKDIR}/SPIRV-Cross-${SPRIV_TAG}/* ${WRKSRC}/ext/SPIRV-Cross 63 ${MV} ${WRKDIR}/SPIRV-Cross-${SPRIV_TAG}/* ${WRKSRC}/ext/SPIRV-Cross
60 64
61.include "options.mk" 65.include "options.mk"
62.include "../../emulators/retroarch/core.mk" 66.include "../../emulators/retroarch/core.mk"
63.include "../../devel/libexecinfo/buildlink3.mk" 67.include "../../devel/libexecinfo/buildlink3.mk"
 68.include "../../devel/snappy/buildlink3.mk"
 69.include "../../devel/xxhash/buildlink3.mk"
 70.include "../../graphics/png/buildlink3.mk"
64.include "../../multimedia/ffmpeg4/buildlink3.mk" 71.include "../../multimedia/ffmpeg4/buildlink3.mk"
65.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/emulators/libretro-ppsspp/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-ppsspp/distinfo 2020/05/14 19:34:44 1.3
+++ pkgsrc/emulators/libretro-ppsspp/distinfo 2020/06/13 10:43:15 1.4
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.3 2020/05/14 19:34:44 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2020/06/13 10:43:15 nia Exp $
2 2
3SHA1 (ppsspp-1.7.5/ppsspp-armips.tar.gz) = bcb620c901b139a9ab28fdce41436d1a88da351d 3SHA1 (ppsspp-1.7.5/ppsspp-armips.tar.gz) = bcb620c901b139a9ab28fdce41436d1a88da351d
4RMD160 (ppsspp-1.7.5/ppsspp-armips.tar.gz) = a3b2c9388f4253a069275679d83c8ae9c07fa98a 4RMD160 (ppsspp-1.7.5/ppsspp-armips.tar.gz) = a3b2c9388f4253a069275679d83c8ae9c07fa98a
5SHA512 (ppsspp-1.7.5/ppsspp-armips.tar.gz) = 8934406f95a3d3ba04f9fc1bcab816c644f11987cfbb63c881ea50a8eb8b7b3df1f4ffc41c85fe4a1dcf567d9392bcc48c6e8410672d4d71c15eec598d8e1584 5SHA512 (ppsspp-1.7.5/ppsspp-armips.tar.gz) = 8934406f95a3d3ba04f9fc1bcab816c644f11987cfbb63c881ea50a8eb8b7b3df1f4ffc41c85fe4a1dcf567d9392bcc48c6e8410672d4d71c15eec598d8e1584
6Size (ppsspp-1.7.5/ppsspp-armips.tar.gz) = 197127 bytes 6Size (ppsspp-1.7.5/ppsspp-armips.tar.gz) = 197127 bytes
7SHA1 (ppsspp-1.7.5/ppsspp-glslang.tar.gz) = c995f7501f32ea3b32cfe06f07262e910ef8e8f2 7SHA1 (ppsspp-1.7.5/ppsspp-glslang.tar.gz) = c995f7501f32ea3b32cfe06f07262e910ef8e8f2
8RMD160 (ppsspp-1.7.5/ppsspp-glslang.tar.gz) = 5911c872d16fe40a12d748f5d32db488e26b4003 8RMD160 (ppsspp-1.7.5/ppsspp-glslang.tar.gz) = 5911c872d16fe40a12d748f5d32db488e26b4003
9SHA512 (ppsspp-1.7.5/ppsspp-glslang.tar.gz) = d0d5c9faa13aba03f193b25e200ebaabce2345d6fd0dfebb1ea1ac77e3248ab3662553107e84ec16911c8a423bf9d1752f8dc9a553e05835b8e40fbcb7caac03 9SHA512 (ppsspp-1.7.5/ppsspp-glslang.tar.gz) = d0d5c9faa13aba03f193b25e200ebaabce2345d6fd0dfebb1ea1ac77e3248ab3662553107e84ec16911c8a423bf9d1752f8dc9a553e05835b8e40fbcb7caac03
10Size (ppsspp-1.7.5/ppsspp-glslang.tar.gz) = 2355082 bytes 10Size (ppsspp-1.7.5/ppsspp-glslang.tar.gz) = 2355082 bytes
11SHA1 (ppsspp-1.7.5/ppsspp-spriv.tar.gz) = 2ae884042a1a0eacccfddb4a87b960fdc4dc7929 11SHA1 (ppsspp-1.7.5/ppsspp-spriv.tar.gz) = 2ae884042a1a0eacccfddb4a87b960fdc4dc7929
12RMD160 (ppsspp-1.7.5/ppsspp-spriv.tar.gz) = 3580eb5f6594092b565d53f2f01f5faa2d12f9c2 12RMD160 (ppsspp-1.7.5/ppsspp-spriv.tar.gz) = 3580eb5f6594092b565d53f2f01f5faa2d12f9c2
13SHA512 (ppsspp-1.7.5/ppsspp-spriv.tar.gz) = 9eefacbb6eeb2a010344189ebb2e85e3a69956b3f5f9a5d909d11ffc72030729a532f3db70a5f32cac2a0a3df98d648207ddb052f36e1ab2b53586722ee998e8 13SHA512 (ppsspp-1.7.5/ppsspp-spriv.tar.gz) = 9eefacbb6eeb2a010344189ebb2e85e3a69956b3f5f9a5d909d11ffc72030729a532f3db70a5f32cac2a0a3df98d648207ddb052f36e1ab2b53586722ee998e8
14Size (ppsspp-1.7.5/ppsspp-spriv.tar.gz) = 537422 bytes 14Size (ppsspp-1.7.5/ppsspp-spriv.tar.gz) = 537422 bytes
15SHA1 (ppsspp-1.7.5/ppsspp.tar.gz) = 404e1db43cfe926078b30aefb0c79199cd9c0319 15SHA1 (ppsspp-1.7.5/ppsspp.tar.gz) = 404e1db43cfe926078b30aefb0c79199cd9c0319
16RMD160 (ppsspp-1.7.5/ppsspp.tar.gz) = 62c542117d39e2d182c2e424d5ec705447afabbb 16RMD160 (ppsspp-1.7.5/ppsspp.tar.gz) = 62c542117d39e2d182c2e424d5ec705447afabbb
17SHA512 (ppsspp-1.7.5/ppsspp.tar.gz) = 7e1f93754e8969fee671c2cd8424cdff84b6351b4493f65c71fab4e9b99fc2a7c21c3a41fd051915f5293cda18957625649ba5ea69b88ed3efba9f4128252298 17SHA512 (ppsspp-1.7.5/ppsspp.tar.gz) = 7e1f93754e8969fee671c2cd8424cdff84b6351b4493f65c71fab4e9b99fc2a7c21c3a41fd051915f5293cda18957625649ba5ea69b88ed3efba9f4128252298
18Size (ppsspp-1.7.5/ppsspp.tar.gz) = 19487276 bytes 18Size (ppsspp-1.7.5/ppsspp.tar.gz) = 19487276 bytes
19SHA1 (patch-ext_glslang_glslang_Include_PoolAlloc.h) = 2eb3ed7637c9e26011c6e29fda79c72e8aee78c5 19SHA1 (patch-ext_glslang_glslang_Include_PoolAlloc.h) = 2eb3ed7637c9e26011c6e29fda79c72e8aee78c5
20SHA1 (patch-libretro_Makefile) = ff14d98bb21d87b5a27f40b180d73beef7ab2f74 20SHA1 (patch-libretro_Makefile) = f892e451167139b15fc3cda98ddb15fb7a687ba4
21SHA1 (patch-libretro_Makefile.common) = eebde48b059d8a0a2ec5ae7805e7a2c083f44c1c 21SHA1 (patch-libretro_Makefile.common) = d76acea02468c0e96d45ce949b6a2ee26911d0a9
cvs diff -r1.1 -r1.2 pkgsrc/emulators/libretro-ppsspp/patches/patch-libretro_Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-ppsspp/patches/patch-libretro_Makefile 2018/08/14 12:55:41 1.1
+++ pkgsrc/emulators/libretro-ppsspp/patches/patch-libretro_Makefile 2020/06/13 10:43:15 1.2
@@ -1,25 +1,36 @@ @@ -1,25 +1,36 @@
1$NetBSD: patch-libretro_Makefile,v 1.1 2018/08/14 12:55:41 nia Exp $ 1$NetBSD: patch-libretro_Makefile,v 1.2 2020/06/13 10:43:15 nia Exp $
2 2
3Use ffmpeg from pkgsrc. 3Use ffmpeg from pkgsrc.
4 4
5--- libretro/Makefile.orig 2018-06-05 17:58:41.000000000 +0000 5Don't pass CFLAGS to as.
 6
 7--- libretro/Makefile.orig 2018-12-04 13:43:39.000000000 +0000
6+++ libretro/Makefile 8+++ libretro/Makefile
7@@ -40,7 +40,6 @@ endif 9@@ -40,7 +40,6 @@ endif
8  10
9 # Dirs 11 # Dirs
10 CORE_DIR = .. 12 CORE_DIR = ..
11-FFMPEGDIR = $(CORE_DIR)/ffmpeg 13-FFMPEGDIR = $(CORE_DIR)/ffmpeg
12 LIBRETRODIR = $(CORE_DIR)/libretro 14 LIBRETRODIR = $(CORE_DIR)/libretro
13 COREDIR = $(CORE_DIR)/Core 15 COREDIR = $(CORE_DIR)/Core
14 COMMONDIR = $(CORE_DIR)/Common 16 COMMONDIR = $(CORE_DIR)/Common
15@@ -60,9 +59,7 @@ ifneq (,$(findstring unix,$(platform))) 17@@ -60,9 +59,7 @@ ifneq (,$(findstring unix,$(platform)))
16 TARGET := $(TARGET_NAME)_libretro.so 18 TARGET := $(TARGET_NAME)_libretro.so
17 LDFLAGS += -shared -Wl,--version-script=link.T -Wl,--no-undefined 19 LDFLAGS += -shared -Wl,--version-script=link.T -Wl,--no-undefined
18  20
19- FFMPEGINCFLAGS += -I$(FFMPEGDIR)/linux/$(TARGET_ARCH)/include 21- FFMPEGINCFLAGS += -I$(FFMPEGDIR)/linux/$(TARGET_ARCH)/include
20- FFMPEGLIBDIR := $(FFMPEGDIR)/linux/$(TARGET_ARCH)/lib 22- FFMPEGLIBDIR := $(FFMPEGDIR)/linux/$(TARGET_ARCH)/lib
21- FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale 23- FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
22+ FFMPEGLDFLAGS += -lavformat -lavcodec -lavutil -lswresample -lswscale 24+ FFMPEGLDFLAGS += -lavformat -lavcodec -lavutil -lswresample -lswscale
23 fpic = -fPIC 25 fpic = -fPIC
24 ifneq (,$(findstring gles,$(platform))) 26 ifneq (,$(findstring gles,$(platform)))
25 GLES = 1 27 GLES = 1
 28@@ -429,7 +426,7 @@ endif
 29 all: $(TARGET)
 30
 31 %.o: %.S
 32- $(AS) $(CFLAGS) -c $(OBJOUT)$@ $<
 33+ $(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
 34
 35 %.o: %.c
 36 $(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
cvs diff -r1.2 -r1.3 pkgsrc/emulators/libretro-ppsspp/patches/patch-libretro_Makefile.common (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-ppsspp/patches/patch-libretro_Makefile.common 2019/01/02 19:52:51 1.2
+++ pkgsrc/emulators/libretro-ppsspp/patches/patch-libretro_Makefile.common 2020/06/13 10:43:15 1.3
@@ -1,32 +1,129 @@ @@ -1,32 +1,129 @@
1$NetBSD: patch-libretro_Makefile.common,v 1.2 2019/01/02 19:52:51 nia Exp $ 1$NetBSD: patch-libretro_Makefile.common,v 1.3 2020/06/13 10:43:15 nia Exp $
 2
 3Avoid using bundled copy of zlib, libpng, xxhash, snappy.
2 4
3Fix "Build error: undefined references". 5Fix "Build error: undefined references".
4 6
5https://github.com/libretro/ppsspp/commit/68634705b9d6b5bc8db2232bc92b6ae06f0b31d8 7https://github.com/libretro/ppsspp/commit/68634705b9d6b5bc8db2232bc92b6ae06f0b31d8
6 8
7--- libretro/Makefile.common.orig 2018-12-04 13:43:39.000000000 +0000 9--- libretro/Makefile.common.orig 2018-12-04 13:43:39.000000000 +0000
8+++ libretro/Makefile.common 10+++ libretro/Makefile.common
9@@ -229,6 +229,7 @@ SOURCES_CXX += \ 11@@ -12,8 +12,6 @@ INCFLAGS += \
 12 -I$(COMMONDIR) \
 13 -I$(CORE_DIR)/libretro \
 14 -I$(EXTDIR)/native \
 15- -I$(EXTDIR)/zlib \
 16- -I$(EXTDIR)/snappy \
 17 -I$(FFMPEGDIR) \
 18 $(FFMPEGINCFLAGS) \
 19 -I$(EXTDIR)/cityhash \
 20@@ -22,7 +20,6 @@ INCFLAGS += \
 21 -I$(NATIVEDIR) \
 22 -I$(EXTDIR)/libkirk \
 23 -I$(EXTDIR)/xbrz \
 24- -I$(EXTDIR)/xxhash \
 25 -I$(EXTDIR)/glew
 26
 27 ifeq ($(PLATFORM_EXT), android)
 28@@ -99,28 +96,7 @@ SOURCES_C += \
 29 $(EXTDIR)/libkirk/ec.c \
 30 $(EXTDIR)/libkirk/kirk_engine.c
 31
 32-SOURCES_C += \
 33- $(NATIVEDIR)/ext/libpng17/png.c \
 34- $(NATIVEDIR)/ext/libpng17/pngerror.c \
 35- $(NATIVEDIR)/ext/libpng17/pngget.c \
 36- $(NATIVEDIR)/ext/libpng17/pngmem.c \
 37- $(NATIVEDIR)/ext/libpng17/pngread.c \
 38- $(NATIVEDIR)/ext/libpng17/pngrio.c \
 39- $(NATIVEDIR)/ext/libpng17/pngrtran.c \
 40- $(NATIVEDIR)/ext/libpng17/pngrutil.c \
 41- $(NATIVEDIR)/ext/libpng17/pngset.c \
 42- $(NATIVEDIR)/ext/libpng17/pngtrans.c \
 43- $(NATIVEDIR)/ext/libpng17/pngwio.c \
 44- $(NATIVEDIR)/ext/libpng17/pngwrite.c \
 45- $(NATIVEDIR)/ext/libpng17/pngwtran.c \
 46- $(NATIVEDIR)/ext/libpng17/pngwutil.c
 47-
 48 SOURCES_C += $(EXTDIR)/sfmt19937/SFMT.c
 49-SOURCES_C += $(EXTDIR)/xxhash.c
 50-
 51-SOURCES_CXX += \
 52- $(EXTDIR)/snappy/snappy-c.cpp \
 53- $(EXTDIR)/snappy/snappy.cpp
 54
 55 SOURCES_CXX += $(EXTDIR)/xbrz/xbrz.cpp
 56
 57@@ -229,6 +205,7 @@ SOURCES_CXX += \
10 $(EXTDIR)/glslang/glslang/MachineIndependent/ShaderLang.cpp \ 58 $(EXTDIR)/glslang/glslang/MachineIndependent/ShaderLang.cpp \
11 $(EXTDIR)/glslang/glslang/MachineIndependent/SymbolTable.cpp \ 59 $(EXTDIR)/glslang/glslang/MachineIndependent/SymbolTable.cpp \
12 $(EXTDIR)/glslang/glslang/MachineIndependent/Versions.cpp \ 60 $(EXTDIR)/glslang/glslang/MachineIndependent/Versions.cpp \
13+ $(EXTDIR)/glslang/glslang/MachineIndependent/attribute.cpp \ 61+ $(EXTDIR)/glslang/glslang/MachineIndependent/attribute.cpp \
14 $(EXTDIR)/glslang/glslang/MachineIndependent/glslang_tab.cpp \ 62 $(EXTDIR)/glslang/glslang/MachineIndependent/glslang_tab.cpp \
15 $(EXTDIR)/glslang/glslang/MachineIndependent/intermOut.cpp \ 63 $(EXTDIR)/glslang/glslang/MachineIndependent/intermOut.cpp \
16 $(EXTDIR)/glslang/glslang/MachineIndependent/iomapper.cpp \ 64 $(EXTDIR)/glslang/glslang/MachineIndependent/iomapper.cpp \
17@@ -392,6 +393,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/datacon 65@@ -392,6 +369,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/datacon
18 $(COREDIR)/HLE/sceMpeg.cpp \ 66 $(COREDIR)/HLE/sceMpeg.cpp \
19 $(COREDIR)/HLE/sceNet.cpp \ 67 $(COREDIR)/HLE/sceNet.cpp \
20 $(COREDIR)/HLE/sceNetAdhoc.cpp \ 68 $(COREDIR)/HLE/sceNetAdhoc.cpp \
21+ $(COREDIR)/HLE/sceUsbAcc.cpp \ 69+ $(COREDIR)/HLE/sceUsbAcc.cpp \
22 $(COREDIR)/HLE/proAdhocServer.cpp \ 70 $(COREDIR)/HLE/proAdhocServer.cpp \
23 $(COREDIR)/HLE/proAdhoc.cpp \ 71 $(COREDIR)/HLE/proAdhoc.cpp \
24 $(COREDIR)/HLE/sceOpenPSID.cpp \ 72 $(COREDIR)/HLE/sceOpenPSID.cpp \
25@@ -454,6 +456,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/datacon 73@@ -454,6 +432,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/datacon
26 $(COREDIR)/MemMap.cpp \ 74 $(COREDIR)/MemMap.cpp \
27 $(COREDIR)/MemMapFunctions.cpp \ 75 $(COREDIR)/MemMapFunctions.cpp \
28 $(COREDIR)/PSPLoaders.cpp \ 76 $(COREDIR)/PSPLoaders.cpp \
29+ $(COREDIR)/Replay.cpp \ 77+ $(COREDIR)/Replay.cpp \
30 $(COREDIR)/Reporting.cpp \ 78 $(COREDIR)/Reporting.cpp \
31 $(COREDIR)/SaveState.cpp \ 79 $(COREDIR)/SaveState.cpp \
32 $(COREDIR)/Screenshot.cpp \ 80 $(COREDIR)/Screenshot.cpp \
 81@@ -494,10 +473,7 @@ ifeq ($(WITH_DYNAREC),1)
 82 $(COMMONDIR)/ColorConvNEON.cpp \
 83 $(GPUDIR)/Common/TextureDecoderNEON.cpp
 84
 85- SOURCES_C += $(NATIVEDIR)/ext/libpng17/arm/arm_init.c \
 86- $(NATIVEDIR)/ext/libpng17/arm/filter_neon_intrinsics.c
 87- ASMFILES += $(NATIVEDIR)/math/fast/fast_matrix_neon.S \
 88- $(NATIVEDIR)/ext/libpng17/arm/filter_neon.S
 89+ ASMFILES += $(NATIVEDIR)/math/fast/fast_matrix_neon.S
 90 endif
 91 else ifeq ($(TARGET_ARCH),arm64)
 92 DYNAFLAGS += -D_ARCH_64
 93@@ -523,10 +499,7 @@ ifeq ($(WITH_DYNAREC),1)
 94 $(COMMONDIR)/ColorConvNEON.cpp \
 95 $(GPUDIR)/Common/TextureDecoderNEON.cpp
 96
 97- SOURCES_C += $(NATIVEDIR)/ext/libpng17/arm/arm_init.c \
 98- $(NATIVEDIR)/ext/libpng17/arm/filter_neon_intrinsics.c
 99- ASMFILES += $(NATIVEDIR)/math/fast/fast_matrix_neon.S \
 100- $(NATIVEDIR)/ext/libpng17/arm/filter_neon.S
 101+ ASMFILES += $(NATIVEDIR)/math/fast/fast_matrix_neon.S
 102 endif
 103 else
 104 ifneq (,$(findstring msvc,$(platform)))
 105@@ -656,24 +629,6 @@ SOURCES_CXX += \
 106 $(LIBRETRODIR)/LibretroGraphicsContext.cpp \
 107 $(LIBRETRODIR)/LibretroGLContext.cpp
 108
 109-ifneq ($(STATIC_LINKING), 1)
 110-SOURCES_C += \
 111- $(EXTDIR)/zlib/adler32.c \
 112- $(EXTDIR)/zlib/compress.c \
 113- $(EXTDIR)/zlib/crc32.c \
 114- $(EXTDIR)/zlib/deflate.c \
 115- $(EXTDIR)/zlib/gzclose.c \
 116- $(EXTDIR)/zlib/gzlib.c \
 117- $(EXTDIR)/zlib/gzread.c \
 118- $(EXTDIR)/zlib/gzwrite.c \
 119- $(EXTDIR)/zlib/inffast.c \
 120- $(EXTDIR)/zlib/inflate.c \
 121- $(EXTDIR)/zlib/inftrees.c \
 122- $(EXTDIR)/zlib/trees.c \
 123- $(EXTDIR)/zlib/uncompr.c \
 124- $(EXTDIR)/zlib/zutil.c
 125-endif
 126-
 127 GIT_VERSION_SRC = $(CORE_DIR)/git-version.cpp
 128 GIT_VERSION := $(shell git describe --always || echo v1.4.2-git)
 129 GIT_VERSION_NO_UPDATE = $(findstring 1,$(shell grep -s PPSSPP_GIT_VERSION_NO_UPDATE $(GIT_VERSION_SRC)))