Module Name: pkgsrc-wip
Committed By: Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By: nee
Date: Tue Jun 5 19:56:51 2018 +0100
Changeset: 4b17224c2f66d24545f160acdc66a232fe689d5c
Modified Files:
libretro-ppsspp/MESSAGE
libretro-ppsspp/Makefile
libretro-ppsspp/distinfo
libretro-ppsspp/patches/patch-libretro_Makefile
Added Files:
libretro-ppsspp/patches/patch-libretro_Makefile.common
Removed Files:
libretro-ppsspp/TODO
Log Message:
libretro-ppsspp: Update to 1.6.3
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4b17224c2f66d24545f160acdc66a232fe689d5c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libretro-ppsspp/MESSAGE | 11 ++++++-----
libretro-ppsspp/Makefile | 20 ++++++++++----------
libretro-ppsspp/TODO | 4 ----
libretro-ppsspp/distinfo | 11 ++++++-----
libretro-ppsspp/patches/patch-libretro_Makefile | 14 +++++++-------
.../patches/patch-libretro_Makefile.common | 16 ++++++++++++++++
6 files changed, 45 insertions(+), 31 deletions(-)
diffs:
diff --git a/libretro-ppsspp/MESSAGE b/libretro-ppsspp/MESSAGE
index a99c42f489..32fdc29669 100644
--- a/libretro-ppsspp/MESSAGE
+++ b/libretro-ppsspp/MESSAGE
@@ -8,11 +8,12 @@ MPROTECT must be disabled for RetroArch for this core to be usable.
-----
-All of the required asset files can be downloaded or cloned with git:
+Prior to using libretro-ppsspp:
-git clone https://github.com/orbea/libretro-ppsspp-assets PPSSPP
-
-They must be placed in the RetroArch system directory or content directory,
-in a subdirectory named "PPSSPP".
+1. `cd` to RetroArch's System (where your BIOS files are) or RetroArch's
+Content directory (where your PSP ROMs are).
+2. `mkdir PPSSPP`
+2. `git clone https://github.com/hrydgard/ppsspp ppsspp-master`
+3. `cp -R ppsspp-master/assets/* PPSSPP/`
===========================================================================
diff --git a/libretro-ppsspp/Makefile b/libretro-ppsspp/Makefile
index eb057ed1df..757c74b097 100644
--- a/libretro-ppsspp/Makefile
+++ b/libretro-ppsspp/Makefile
@@ -1,24 +1,24 @@
# $NetBSD$
-PKGNAME= libretro-ppsspp-20180222
+V= 1.6.3
+DISTNAME= libretro-ppsspp-${V}
CATEGORIES= emulators
HOMEPAGE= https://docs.libretro.com/library/ppsspp/
COMMENT= Libretro core based on the PPSSPP PlayStation Portable emulator
LICENSE= gnu-gpl-v2
-PPSSPP_TAG= 7f30ab152e33e8273ed9fb737c3f4da1916dd743
ARMIPS_TAG= 8b4cadaf62d7de42d374056fc6aafc555f2bc7dc
GLSLANG_TAG= 2edde6665d9a56ead5ea0e55b4e64d9a803e6164
SPRIV_TAG= 90966d50f57608587bafd95b4e345b02b814754a
-DISTFILES+= ${PPSSPP_TAG}.tar.gz
+DISTFILES+= ppsspp-${V}.tar.gz
DISTFILES+= ${ARMIPS_TAG}.tar.gz
DISTFILES+= ${GLSLANG_TAG}.tar.gz
DISTFILES+= ${SPRIV_TAG}.tar.gz
-SITES.${PPSSPP_TAG}.tar.gz= \
- ${MASTER_SITE_GITHUB:=libretro/libretro-ppsspp/archive/}
+SITES.ppsspp-${V}.tar.gz= \
+ -${MASTER_SITE_GITHUB:=hrydgard/ppsspp/archive/}v${V}.tar.gz
SITES.${ARMIPS_TAG}.tar.gz= \
${MASTER_SITE_GITHUB:=Kingcom/armips/archive/}
@@ -29,7 +29,7 @@ SITES.${GLSLANG_TAG}.tar.gz= \
SITES.${SPRIV_TAG}.tar.gz= \
${MASTER_SITE_GITHUB:=KhronosGroup/SPIRV-Cross/archive/}
-WRKSRC= ${WRKDIR}/libretro-ppsspp-${PPSSPP_TAG}
+WRKSRC= ${WRKDIR}/ppsspp-${PKGVERSION_NOREV}
BUILD_DIRS= libretro
USE_TOOLS+= gmake pkg-config
@@ -40,11 +40,11 @@ EXTRACT_USING= bsdtar
.if !empty(MACHINE_ARCH:M*arm*)
CFLAGS+= -marm
-BUILD_MAKE_FLAGS+= WITH_DYNAREC=arm
+BUILD_MAKE_FLAGS+= TARGET_ARCH=arm
.elif !empty(MACHINE_ARCH:M*x86_64*)
-BUILD_MAKE_FLAGS+= WITH_DYNAREC=x86_64
+BUILD_MAKE_FLAGS+= TARGET_ARCH=x86_64
.elif !empty(MACHINE_ARCH:M*i386*)
-BUILD_MAKE_FLAGS+= WITH_DYNAREC=x86
+BUILD_MAKE_FLAGS+= TARGET_ARCH=x86
.endif
BUILD_MAKE_FLAGS+= FFMPEGLDFLAGS="`pkg-config --libs libavformat libavcodec libavutil libswresample libswscale`"
@@ -66,5 +66,5 @@ do-install:
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
.include "../../mk/pthread.buildlink3.mk"
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/libretro-ppsspp/TODO b/libretro-ppsspp/TODO
deleted file mode 100644
index 7a72785cea..0000000000
--- a/libretro-ppsspp/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix ffmpeg-related segfaults. Seems to be a conflict with retroarch as it works
-when ffmpeg is disabled in RetroArch. I tried a small hack to get it to build
-against ffmpeg3 by using some CFLAGS to redefine renamed symbols and that still
-didn't help.
diff --git a/libretro-ppsspp/distinfo b/libretro-ppsspp/distinfo
index 3eae44964a..a56c5b35c8 100644
--- a/libretro-ppsspp/distinfo
+++ b/libretro-ppsspp/distinfo
@@ -4,10 +4,6 @@ SHA1 (2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz) = bc70bf9850f187ecff189ad
RMD160 (2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz) = d1c248f9f01f10b2f3d3bbbf6a5e6a431413702a
SHA512 (2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz) = 333a93707e067ac1d98c69533c2d206675d75aa54195326accf33e8401ac2fb412d2e2525b0ee1313f141872aa6ea430ae5424e8712483c59f77dc3adbcb4f59
Size (2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz) = 1944927 bytes
-SHA1 (7f30ab152e33e8273ed9fb737c3f4da1916dd743.tar.gz) = 4309642dab4859fd4d2f88f83d4d571d6fdd2b06
-RMD160 (7f30ab152e33e8273ed9fb737c3f4da1916dd743.tar.gz) = d6dd17e765c407da1d823946c68853555091c10b
-SHA512 (7f30ab152e33e8273ed9fb737c3f4da1916dd743.tar.gz) = b3a8ce94b5b0046a07f14a7c2e59641da93caf5b8a51e2a745080fa38b9c9b1dcd77535e2a4d74d228aae78b51b06d5bb1e6998e2ba4876a68b3259a5674cabb
-Size (7f30ab152e33e8273ed9fb737c3f4da1916dd743.tar.gz) = 19412722 bytes
SHA1 (8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz) = 51e8fcf70e64e64c9c3d04aa3c795dfe6f7f5f26
RMD160 (8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz) = d8c321256c9e58fbfcbf1529f61930274ecc6d15
SHA512 (8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz) = 9ab376b928fadcbff7256ff10d6581e4960e00e48a93f47f7e90b1998022a8d03cadef20880aa020fe6b62e4fa43cf28fc68dc5b10e93b1212fd6788ae493dba
@@ -16,4 +12,9 @@ SHA1 (90966d50f57608587bafd95b4e345b02b814754a.tar.gz) = 729bff5fa8a51af90519fb5
RMD160 (90966d50f57608587bafd95b4e345b02b814754a.tar.gz) = 32346af6c24f9f30ae435381f7c30e6f427c0e39
SHA512 (90966d50f57608587bafd95b4e345b02b814754a.tar.gz) = 5fe2f772b571da0627fb9d9c424bea2b4ea1c0563e36ff455ddaf1b92ea3d5ee636e039a0619e0971478ce10e163b45258e9b03d2610c573f74d1cfd08549bb8
Size (90966d50f57608587bafd95b4e345b02b814754a.tar.gz) = 228943 bytes
-SHA1 (patch-libretro_Makefile) = aa579c86123163a9cdcb66a9105b042282080bc7
+SHA1 (ppsspp-1.6.3.tar.gz) = 5a4ec3f99dcb50840d26a2c738ff1ce4a37e7433
+RMD160 (ppsspp-1.6.3.tar.gz) = 0b0ea6c86aad60a7d9d176332ea62a88d23411fa
+SHA512 (ppsspp-1.6.3.tar.gz) = fe592c81a3b22ba0fff3dbd403ad2f6b9639c39d036db31132147a91a25793acb8698174a1c139b7dced01a9101777b5c53a1e5db6b5da0b7727f480ef597b8e
+Size (ppsspp-1.6.3.tar.gz) = 19477643 bytes
+SHA1 (patch-libretro_Makefile) = 3ae57acd3dfe2fbc696ee58126006fe4c813f6e1
+SHA1 (patch-libretro_Makefile.common) = 27b8a25a2ab882a90f09fd24f656eb6ac6b9d79e
diff --git a/libretro-ppsspp/patches/patch-libretro_Makefile b/libretro-ppsspp/patches/patch-libretro_Makefile
index 66a9144233..60361d045c 100644
--- a/libretro-ppsspp/patches/patch-libretro_Makefile
+++ b/libretro-ppsspp/patches/patch-libretro_Makefile
@@ -2,9 +2,9 @@ $NetBSD$
Allow using our own flags to link to pkgsrc ffmpeg.
---- libretro/Makefile.orig 2018-02-22 08:32:12.000000000 +0000
+--- libretro/Makefile.orig 2018-04-21 20:53:30.000000000 +0000
+++ libretro/Makefile
-@@ -45,7 +45,6 @@ endif
+@@ -40,7 +40,6 @@ endif
# Dirs
CORE_DIR = ..
@@ -12,21 +12,21 @@ Allow using our own flags to link to pkgsrc ffmpeg.
LIBRETRODIR = $(CORE_DIR)/libretro
COREDIR = $(CORE_DIR)/Core
COMMONDIR = $(CORE_DIR)/Common
-@@ -57,18 +56,12 @@ EXTDIR = $(CORE_DIR)/ext
+@@ -51,18 +50,11 @@ EXTDIR = $(CORE_DIR)/ext
+
TARGET_NAME := ppsspp
- CC_AS ?= $(CC)
-FFMPEGINCFLAGS :=
-FFMPEGLIBDIR :=
-FFMPEGLIBS :=
-
+-
# Unix
ifneq (,$(findstring unix,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so
LDFLAGS += -shared -Wl,--version-script=link.T -Wl,--no-undefined
-- FFMPEGINCFLAGS += -I$(FFMPEGDIR)/linux/$(FFMPEG_ARCH)/include
-- FFMPEGLIBDIR := $(FFMPEGDIR)/linux/$(FFMPEG_ARCH)/lib
+- FFMPEGINCFLAGS += -I$(FFMPEGDIR)/linux/$(TARGET_ARCH)/include
+- FFMPEGLIBDIR := $(FFMPEGDIR)/linux/$(TARGET_ARCH)/lib
- FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
fpic = -fPIC
ifneq (,$(findstring gles,$(platform)))
diff --git a/libretro-ppsspp/patches/patch-libretro_Makefile.common b/libretro-ppsspp/patches/patch-libretro_Makefile.common
new file mode 100644
index 0000000000..1eb030d9a7
--- /dev/null
+++ b/libretro-ppsspp/patches/patch-libretro_Makefile.common
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix "Build error: undefined references"
+
+https://github.com/libretro/ppsspp/commit/68634705b9d6b5bc8db2232bc92b6ae06f0b31d8
+
+--- libretro/Makefile.common.orig 2018-05-30 17:47:20.000000000 +0000
++++ libretro/Makefile.common
+@@ -452,6 +452,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/datacon
+ $(COREDIR)/MemMap.cpp \
+ $(COREDIR)/MemMapFunctions.cpp \
+ $(COREDIR)/PSPLoaders.cpp \
++ $(COREDIR)/Replay.cpp \
+ $(COREDIR)/Reporting.cpp \
+ $(COREDIR)/SaveState.cpp \
+ $(COREDIR)/Screenshot.cpp \