pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libretro-ppsspp: Update to 20171126. This is a large update that includes more than a year of improvements to the emulator.



Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Wed Nov 29 15:16:58 2017 +0000
Changeset:	5356d9b337293a72be28cb87260c1c6ef38aa6af

Modified Files:
	libretro-ppsspp/MESSAGE
	libretro-ppsspp/Makefile
	libretro-ppsspp/distinfo
Added Files:
	libretro-ppsspp/patches/patch-libretro_Makefile
Removed Files:
	libretro-ppsspp/patches/patch-Makefile

Log Message:
libretro-ppsspp: Update to 20171126. This is a large update that
includes more than a year of improvements to the emulator.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5356d9b337293a72be28cb87260c1c6ef38aa6af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libretro-ppsspp/MESSAGE                         |  3 ++-
 libretro-ppsspp/Makefile                        | 29 +++++++++-------------
 libretro-ppsspp/distinfo                        | 22 +++++++----------
 libretro-ppsspp/patches/patch-Makefile          | 33 -------------------------
 libretro-ppsspp/patches/patch-libretro_Makefile | 33 +++++++++++++++++++++++++
 5 files changed, 56 insertions(+), 64 deletions(-)

diffs:
diff --git a/libretro-ppsspp/MESSAGE b/libretro-ppsspp/MESSAGE
index c3ead96416..a99c42f489 100644
--- a/libretro-ppsspp/MESSAGE
+++ b/libretro-ppsspp/MESSAGE
@@ -6,9 +6,10 @@ compiler.
 
 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:
+
 git clone https://github.com/orbea/libretro-ppsspp-assets PPSSPP
 
 They must be placed in the RetroArch system directory or content directory,
diff --git a/libretro-ppsspp/Makefile b/libretro-ppsspp/Makefile
index 58e20e9e71..ec9fe500c8 100644
--- a/libretro-ppsspp/Makefile
+++ b/libretro-ppsspp/Makefile
@@ -1,29 +1,25 @@
 # $NetBSD$
 
-PKGNAME=	libretro-ppsspp-20161215
+PKGNAME=	libretro-ppsspp-20171126
 CATEGORIES=	emulators
 
 HOMEPAGE=	https://wiki.libretro.com/index.php?title=PPSSPP
 COMMENT=	Libretro core based on the PPSSPP PlayStation Portable emulator
 LICENSE=	gnu-gpl-v2
 
-PPSSPP_TAG=	5f7bcf7bfc15f83d405bcecd7a163a55ad1e7573
-NATIVE_TAG=	9baedbcc2a07b3bccc6d8b8d170498111b990adc
-ARMIPS_TAG=	8bd93be9ba715d2f5723857edacf936ae904d07c
+PPSSPP_TAG=	abee4eb1c967467a4c1886a9174738eb37577496
+ARMIPS_TAG=	770365d44df35d6e675c58bb2a774ca412278ef5
 
 DISTFILES+=	${PPSSPP_TAG}.tar.gz
 SITES.${PPSSPP_TAG}.tar.gz= \
 		${MASTER_SITE_GITHUB:=libretro/libretro-ppsspp/archive/}
 
-DISTFILES+=	${NATIVE_TAG}.tar.gz
-SITES.${NATIVE_TAG}.tar.gz= \
-		${MASTER_SITE_GITHUB:=libretro/ppsspp-native/archive/}
-
 DISTFILES+=	${ARMIPS_TAG}.tar.gz
 SITES.${ARMIPS_TAG}.tar.gz= \
 		${MASTER_SITE_GITHUB:=Kingcom/armips/archive/}
 
-WRKSRC=		${WRKDIR}/libretro-ppsspp-${PPSSPP_TAG}/libretro
+WRKSRC=		${WRKDIR}/libretro-ppsspp-${PPSSPP_TAG}
+BUILD_DIRS=	libretro
 
 USE_TOOLS=	gmake pkg-config
 USE_LANGUAGES=	c c++
@@ -33,23 +29,22 @@ EXTRACT_USING=	bsdtar
 
 .if !empty(MACHINE_ARCH:M*arm*)
 CFLAGS+=		-marm
-BUILD_MAKE_FLAGS+=	ARCH=arm
-.elif !empty(MACHINE_ARCH:M*aarch64*)
-BUILD_MAKE_FLAGS+=	ARCH=arm64
+BUILD_MAKE_FLAGS+=	WITH_DYNAREC=arm
 .elif !empty(MACHINE_ARCH:M*x86_64*)
-BUILD_MAKE_FLAGS+=	ARCH=x86_64
+BUILD_MAKE_FLAGS+=	WITH_DYNAREC=x86_64
+.elif !empty(MACHINE_ARCH:M*i386*)
+BUILD_MAKE_FLAGS+=	WITH_DYNAREC=x86
 .endif
 
-BUILD_MAKE_FLAGS+=	FFMPEGLDFLAGS="`pkg-config --libs libavformat libavcodec libswresample libswscale`"
+BUILD_MAKE_FLAGS+=	FFMPEGLDFLAGS="`pkg-config --libs libavformat libavcodec libavutil libswresample libswscale`"
 
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
 
 post-extract:
-	${MV} ${WRKDIR}/ppsspp-native-${NATIVE_TAG}/* ${WRKSRC}/../native
-	${MV} ${WRKDIR}/armips-${ARMIPS_TAG}/* ${WRKSRC}/../ext/armips
+	${MV} ${WRKDIR}/armips-${ARMIPS_TAG}/* ${WRKSRC}/ext/armips
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/ppsspp_libretro.so \
+	${INSTALL_LIB} ${WRKSRC}/libretro/ppsspp_libretro.so \
 	    ${DESTDIR}${PREFIX}/lib/libretro/ppsspp_libretro.so
 
 .include "options.mk"
diff --git a/libretro-ppsspp/distinfo b/libretro-ppsspp/distinfo
index 5ef140bd41..180197e43a 100644
--- a/libretro-ppsspp/distinfo
+++ b/libretro-ppsspp/distinfo
@@ -1,15 +1,11 @@
 $NetBSD$
 
-SHA1 (5f7bcf7bfc15f83d405bcecd7a163a55ad1e7573.tar.gz) = 7d51bad84d9c498c9bf99d30b0afc460e4648b94
-RMD160 (5f7bcf7bfc15f83d405bcecd7a163a55ad1e7573.tar.gz) = a485b679cbe8d8e96a7a282ffd9df6b7ff66eea7
-SHA512 (5f7bcf7bfc15f83d405bcecd7a163a55ad1e7573.tar.gz) = 40af0f25592240bb2061e944254092d0ede470fcdb69b4009af2fb4e121d2301c18be91ddf7b07c25e7089da37924a230b1971204e5383066a418ad026c4cdbc
-Size (5f7bcf7bfc15f83d405bcecd7a163a55ad1e7573.tar.gz) = 30315109 bytes
-SHA1 (8bd93be9ba715d2f5723857edacf936ae904d07c.tar.gz) = 07e39f413f82d39b5e5715a875b3f4ced829b231
-RMD160 (8bd93be9ba715d2f5723857edacf936ae904d07c.tar.gz) = 4485aba4079ef15a9a07916e64cebac71a70ee15
-SHA512 (8bd93be9ba715d2f5723857edacf936ae904d07c.tar.gz) = 650ddd5b598edcbd140716f54b00ac336e6e2d22837a15d95bb5021c9fbebecde161c13b9590fee62f939a15e0e34d706d9a4c3096b7ae178cc32a0f740cf67a
-Size (8bd93be9ba715d2f5723857edacf936ae904d07c.tar.gz) = 135369 bytes
-SHA1 (9baedbcc2a07b3bccc6d8b8d170498111b990adc.tar.gz) = c38a45e0baadf091c94541bfd0c7813d69026cd1
-RMD160 (9baedbcc2a07b3bccc6d8b8d170498111b990adc.tar.gz) = 98be3f020b673e84feb3237719e98e61a3aebecb
-SHA512 (9baedbcc2a07b3bccc6d8b8d170498111b990adc.tar.gz) = d15810f560805aae68b0dfeb50aa4f3ecf9faca0ea176ba00001aadca3aea12f29d8080f0baecf9e3c1d0f366b684b3edddc11c9f9f2bac2cec45d1a77d946a5
-Size (9baedbcc2a07b3bccc6d8b8d170498111b990adc.tar.gz) = 1400414 bytes
-SHA1 (patch-Makefile) = b9595dd3f7b790af9c1e298dcd86d5f15041332b
+SHA1 (770365d44df35d6e675c58bb2a774ca412278ef5.tar.gz) = 48ab05a45058282a88d7a4dcd0305be6a6f0f885
+RMD160 (770365d44df35d6e675c58bb2a774ca412278ef5.tar.gz) = 97a4865c2647ffc9653b0295366e1e8db50301c9
+SHA512 (770365d44df35d6e675c58bb2a774ca412278ef5.tar.gz) = 9423bdbc1428700979c13276a427975733a07908fdf021dc6ab88cec0d37e9523aacd4a2a03eef23638070293dde3f1641647c47095ef2751982b9f9893c1baa
+Size (770365d44df35d6e675c58bb2a774ca412278ef5.tar.gz) = 163666 bytes
+SHA1 (abee4eb1c967467a4c1886a9174738eb37577496.tar.gz) = b0419c59d586350c89fe3c75541d6d5c43a8e03c
+RMD160 (abee4eb1c967467a4c1886a9174738eb37577496.tar.gz) = 826801119b4a7009bc6e5f07b4432fcccca5725a
+SHA512 (abee4eb1c967467a4c1886a9174738eb37577496.tar.gz) = 3963f127c6a5735297c2b97d2634be32c29fdce3ce9612b6562363854a04cb2c678aa5aeb44e50adfeaeda88d17680a3fce344d8ea4207ed14c1e74d1cf3bacd
+Size (abee4eb1c967467a4c1886a9174738eb37577496.tar.gz) = 19142497 bytes
+SHA1 (patch-libretro_Makefile) = 8e631cbbcd12b5e08df4143c4eb11caf985b6c16
diff --git a/libretro-ppsspp/patches/patch-Makefile b/libretro-ppsspp/patches/patch-Makefile
deleted file mode 100644
index 1bdf0fcd36..0000000000
--- a/libretro-ppsspp/patches/patch-Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-Allow using our own flags to link to pkgsrc ffmpeg.
-
---- Makefile.orig	2016-12-15 00:13:17.000000000 +0000
-+++ Makefile
-@@ -41,7 +41,6 @@ endif
- 
- # Dirs
- CORE_DIR			= ..
--FFMPEGDIR		= $(CORE_DIR)/ffmpeg
- LIBRETRODIR		= $(CORE_DIR)/libretro
- COREDIR			= $(CORE_DIR)/Core
- COMMONDIR		= $(CORE_DIR)/Common
-@@ -56,18 +55,12 @@ ifneq ($(GIT_VERSION)," unknown")
- 	CXXFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
- endif
- 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
--	FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
- 	fpic = -fPIC
- 	ifneq (,$(findstring gles,$(platform)))
- 		GLES = 1
diff --git a/libretro-ppsspp/patches/patch-libretro_Makefile b/libretro-ppsspp/patches/patch-libretro_Makefile
new file mode 100644
index 0000000000..bde45c81a4
--- /dev/null
+++ b/libretro-ppsspp/patches/patch-libretro_Makefile
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Allow using our own flags to link to pkgsrc ffmpeg.
+
+--- libretro/Makefile.orig	2017-11-26 20:20:47.000000000 +0000
++++ libretro/Makefile
+@@ -45,7 +45,6 @@ endif
+ 
+ # Dirs
+ CORE_DIR			= ..
+-FFMPEGDIR		= $(CORE_DIR)/ffmpeg
+ LIBRETRODIR		= $(CORE_DIR)/libretro
+ COREDIR			= $(CORE_DIR)/Core
+ COMMONDIR		= $(CORE_DIR)/Common
+@@ -60,18 +59,12 @@ ifneq ($(GIT_VERSION)," unknown")
+ 	CXXFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+ endif
+ 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
+-	FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
+ 	fpic = -fPIC
+ 	ifneq (,$(findstring gles,$(platform)))
+ 		GLES = 1


Home | Main Index | Thread Index | Old Index