libretro-citra: Update to 20180519

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libretro-citra: Update to 20180519
From: Nia Alarie <nia.alarie%gmail.com@localhost>
Date: Tue, 05 Jun 2018 13:19:07 +0000
Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Tue Jun 5 14:19:07 2018 +0100
Changeset:	8d053d989be5b3bedf6fa167acff04e21c706715

Modified Files:
	libretro-citra/Makefile
	libretro-citra/distinfo
Added Files:
	libretro-citra/patches/patch-externals_cryptopp_cryptopp_config.h

Log Message:
libretro-citra: Update to 20180519

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

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

diffstat:
 libretro-citra/Makefile                            | 27 +++++++++---------
 libretro-citra/distinfo                            | 33 +++++++++++-----------
 .../patch-externals_cryptopp_cryptopp_config.h     | 20 +++++++++++++
 3 files changed, 51 insertions(+), 29 deletions(-)

diffs:
diff --git a/libretro-citra/Makefile b/libretro-citra/Makefile
index 7baaf997d2..b6cd5526d4 100644
--- a/libretro-citra/Makefile
+++ b/libretro-citra/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGNAME=	libretro-citra-20180227
+PKGNAME=	libretro-citra-20180519
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
 
@@ -8,15 +8,15 @@ HOMEPAGE=	https://docs.libretro.com/library/citra/
 COMMENT=	Libretro core based on the Citra Nintendo 3DS emulator
 LICENSE=	gnu-gpl-v2
 
-CITRA_TAG=	9b6f6a96fa8e6203e912f52b757155420cb00cbd
+CITRA_TAG=	85e47f1ea7013eb9a0f27ec4b946d71e04f970c1
 BOOST_TAG=	7310c95e2320ed262b0600315fa2f762c4b6cc54
 CATCH_TAG=	62dae592c330ab74cea30c897255ee9518639c3f
-CPR_TAG=	b5758fbc88021437f968fe5174f121b8b92f5d5c
-CRYPTOPP_TAG=	b6c6684451f925ab2e0b99acbaf66fd487ebfbd5
+CRYPTOPP_TAG=	5be140bcea453a00f7f2fec09fb9e37849d65d98
 DYNARMIC_TAG=	d1d4705364031512cb89333aebc00b8d75a2f732
 ENET_TAG=	39a72ab1990014eb399cee9d538fd529df99c6a0
-FMT_TAG=	ac5484c4e7365b59d8c7e14db6778de26635e428
+FMT_TAG=	5859e58ba17073cf1c16536205450528f3530df0
 INIH_TAG=	56edbbbef9ba432521442ee47ba7d1c8de37e63d
+LIBRESSL_TAG=	cbb1dcab9a566d0aa0036339f21f2e37012b2507
 NIHSTRO_TAG=	fd69de1a1b960ec296cc67d32257b0f9e2d89ac6
 SOUNDTOUCH_TAG=	019d2089bbadf70d73ba85aa8ea51490b071262c
 XBYAK_TAG=	c5da3778e7f84013fe8c26fcf18a67881bd1e825
@@ -24,12 +24,12 @@ XBYAK_TAG=	c5da3778e7f84013fe8c26fcf18a67881bd1e825
 DISTFILES+=	${CITRA_TAG}.tar.gz
 DISTFILES+=	${BOOST_TAG}.tar.gz
 DISTFILES+=	${CATCH_TAG}.tar.gz
-DISTFILES+=	${CPR_TAG}.tar.gz
 DISTFILES+=	${CRYPTOPP_TAG}.tar.gz
 DISTFILES+=	${DYNARMIC_TAG}.tar.gz
 DISTFILES+=	${ENET_TAG}.tar.gz
 DISTFILES+=	${FMT_TAG}.tar.gz
 DISTFILES+=	${INIH_TAG}.tar.gz
+DISTFILES+=	${LIBRESSL_TAG}.tar.gz
 DISTFILES+=	${NIHSTRO_TAG}.tar.gz
 DISTFILES+=	${SOUNDTOUCH_TAG}.tar.gz
 DISTFILES+=	${XBYAK_TAG}.tar.gz
@@ -43,9 +43,6 @@ SITES.${BOOST_TAG}.tar.gz= \
 SITES.${CATCH_TAG}.tar.gz= \
     ${MASTER_SITE_GITHUB:=catchorg/Catch2/archive/}
 
-SITES.${CPR_TAG}.tar.gz= \
-    ${MASTER_SITE_GITHUB:=whoshuu/cpr/archive/}
-
 SITES.${CRYPTOPP_TAG}.tar.gz= \
     ${MASTER_SITE_GITHUB:=weidai11/cryptopp/archive/}
 
@@ -61,6 +58,9 @@ SITES.${FMT_TAG}.tar.gz= \
 SITES.${INIH_TAG}.tar.gz= \
     ${MASTER_SITE_GITHUB:=benhoyt/inih/archive/}
 
+SITES.${LIBRESSL_TAG}.tar.gz= \
+    ${MASTER_SITE_GITHUB:=citra-emu/ext-libressl-portable/archive/}
+
 SITES.${NIHSTRO_TAG}.tar.gz= \
     ${MASTER_SITE_GITHUB:=neobrain/nihstro/archive/}
 
@@ -83,6 +83,9 @@ CMAKE_ARGS+=	-DENABLE_WEB_SERVICE=OFF
 # error: unrecognized command line option '-msha'
 CMAKE_ARGS+=	-DCRYPTOPP_DISABLE_ASM=ON
 
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE="Release"
+CMAKE_ARGS+=	--target citra_libretro
+
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
 
 post-extract:
@@ -92,8 +95,6 @@ post-extract:
 	${TOUCH} ${WRKSRC}/externals/catch/.git
 	${MV} ${WRKDIR}/cryptopp-${CRYPTOPP_TAG}/* ${WRKSRC}/externals/cryptopp/cryptopp/
 	${TOUCH} ${WRKSRC}/externals/cryptopp/cryptopp/.git
-	${MV} ${WRKDIR}/cpr-${CPR_TAG}/* ${WRKSRC}/externals/cpr/
-	${TOUCH} ${WRKSRC}/externals/cpr/.git
 	${MV} ${WRKDIR}/dynarmic-${DYNARMIC_TAG}/* ${WRKSRC}/externals/dynarmic/
 	${TOUCH} ${WRKSRC}/externals/dynarmic/.git
 	${MV} ${WRKDIR}/enet-${ENET_TAG}/* ${WRKSRC}/externals/enet/
@@ -107,6 +108,8 @@ post-extract:
 	${MV} ${WRKDIR}/inih-${INIH_TAG}/* ${WRKSRC}/externals/inih/inih/
 	${TOUCH} ${WRKSRC}/externals/inih/inih/.git
 	${MV} ${WRKDIR}/nihstro-${NIHSTRO_TAG}/* ${WRKSRC}/externals/nihstro/
+	${TOUCH} ${WRKSRC}/externals/libressl/.git
+	${MV} ${WRKDIR}/ext-libressl-portable-${LIBRESSL_TAG}/* ${WRKSRC}/externals/libressl/
 	${TOUCH} ${WRKSRC}/externals/nihstro/.git
 	${MV} ${WRKDIR}/xbyak-${XBYAK_TAG}/* ${WRKSRC}/externals/xbyak/
 	${TOUCH} ${WRKSRC}/externals/xbyak/.git
@@ -115,8 +118,6 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/src/citra_libretro/citra_libretro.so \
 	    ${DESTDIR}${PREFIX}/lib/libretro/citra_libretro.so
 
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libretro-citra/distinfo b/libretro-citra/distinfo
index 9fed3ad71f..c15b4d0508 100644
--- a/libretro-citra/distinfo
+++ b/libretro-citra/distinfo
@@ -12,6 +12,14 @@ SHA1 (56edbbbef9ba432521442ee47ba7d1c8de37e63d.tar.gz) = edd67221998b7617c830f3a
 RMD160 (56edbbbef9ba432521442ee47ba7d1c8de37e63d.tar.gz) = 22e2a74f9bd39c9ac76120995d1670247f9d8bbe
 SHA512 (56edbbbef9ba432521442ee47ba7d1c8de37e63d.tar.gz) = b6687ff9c56ec1f17f216764ae6134d89b44782fec1067ccc1e32b18bd270287744fd546f6744a1fd761f7e729333ebe262b5a5b27f8778be81c73ca8d8b9145
 Size (56edbbbef9ba432521442ee47ba7d1c8de37e63d.tar.gz) = 11438 bytes
+SHA1 (5859e58ba17073cf1c16536205450528f3530df0.tar.gz) = b1dc62a75a2c8b51e42a2637535d859d4fe520dc
+RMD160 (5859e58ba17073cf1c16536205450528f3530df0.tar.gz) = 7ecd73c48490df4cce6db946a5c484147c9b1ccf
+SHA512 (5859e58ba17073cf1c16536205450528f3530df0.tar.gz) = 18c290885ae5cde694470008fca02eb7b5aceb99e7ddd44362492ea22e22cfe1b74b80789335e0a4d57329dd9aacc94f49a819ce895300347a4008bf416e9114
+Size (5859e58ba17073cf1c16536205450528f3530df0.tar.gz) = 623485 bytes
+SHA1 (5be140bcea453a00f7f2fec09fb9e37849d65d98.tar.gz) = afec3154e5fb3e854d4bd7001df2aef057d619d1
+RMD160 (5be140bcea453a00f7f2fec09fb9e37849d65d98.tar.gz) = e5398da092efcfc5e6903542f8e68e40d014c1ac
+SHA512 (5be140bcea453a00f7f2fec09fb9e37849d65d98.tar.gz) = dc3f5b0c97f412a302f6851f2485283dd1342be7f741a93811ddfe72f992aa102f8cae84bd92b34f37e1decf5a77bbdc65d6cd373f38c5f29ca8df75da95503a
+Size (5be140bcea453a00f7f2fec09fb9e37849d65d98.tar.gz) = 7195837 bytes
 SHA1 (62dae592c330ab74cea30c897255ee9518639c3f.tar.gz) = 4e7fcfc32802fcfec80e5b3b11e4b92e71707701
 RMD160 (62dae592c330ab74cea30c897255ee9518639c3f.tar.gz) = 5aecef8ce7da426f0c24f0d58f8988fa560a3b52
 SHA512 (62dae592c330ab74cea30c897255ee9518639c3f.tar.gz) = c2ec71eecc1bf7cc687fce95513043450465b7c41acbda581e5bc421f9e7741cb9657b9baabaf66af3351d78702b7fbb2afc0b2389efa6f70c174e980099f9a3
@@ -20,26 +28,18 @@ SHA1 (7310c95e2320ed262b0600315fa2f762c4b6cc54.tar.gz) = 45d443c68e70885836f68d1
 RMD160 (7310c95e2320ed262b0600315fa2f762c4b6cc54.tar.gz) = ce19ad02ede124c2b0cfbd2ac5225115b12ff8ea
 SHA512 (7310c95e2320ed262b0600315fa2f762c4b6cc54.tar.gz) = 9ef36c21cc37793462b3fb0d479e3b523beb83a0cd7bbbf882b53e2c732c31db239cda81bb4ef6da6ca7df6738e68a1d17d915d2dbe09402f948caf70cda415c
 Size (7310c95e2320ed262b0600315fa2f762c4b6cc54.tar.gz) = 1152595 bytes
-SHA1 (9b6f6a96fa8e6203e912f52b757155420cb00cbd.tar.gz) = 98fdd51d8dddee6719c53cc750c1532fef7b7f73
-RMD160 (9b6f6a96fa8e6203e912f52b757155420cb00cbd.tar.gz) = 290e932488d7f3bdae97a40a2293a61094363533
-SHA512 (9b6f6a96fa8e6203e912f52b757155420cb00cbd.tar.gz) = e95d7bc11920b952750d88c0fc02f5ebe83bc7353df7d37db8e9256c98c1b125f39d59900fad71a2d50da58249b20af75e4a4bd0698491ef922319d4607fa0f3
-Size (9b6f6a96fa8e6203e912f52b757155420cb00cbd.tar.gz) = 1715119 bytes
-SHA1 (ac5484c4e7365b59d8c7e14db6778de26635e428.tar.gz) = 3de642dcd5928295e9a5f9ec2c54d9ca61d7ae0e
-RMD160 (ac5484c4e7365b59d8c7e14db6778de26635e428.tar.gz) = d7ffad8bb12c872054e0262bf698611dedf609ef
-SHA512 (ac5484c4e7365b59d8c7e14db6778de26635e428.tar.gz) = 594c240780563aede0629cab80627f649448a42e203dd487e58d5b2ef19f07eab17111ca844e966754aa85239790b7fc4ea944ee1b02d27e121aa73edf2c8fdf
-Size (ac5484c4e7365b59d8c7e14db6778de26635e428.tar.gz) = 615830 bytes
-SHA1 (b5758fbc88021437f968fe5174f121b8b92f5d5c.tar.gz) = bd258457cf9eda387b53d5ba86ac61fd272ad4c4
-RMD160 (b5758fbc88021437f968fe5174f121b8b92f5d5c.tar.gz) = aae3985b616297ec09ec4f820a3851ae3cae6dc1
-SHA512 (b5758fbc88021437f968fe5174f121b8b92f5d5c.tar.gz) = 0f2984b379dd2e333d7f298f350b765a202c8e7e5ef29b0dcb398230dd0ad7da2df0f4c48fe76ea7b9239788877eb846c2265d6b76196a440c7047baf5dc0730
-Size (b5758fbc88021437f968fe5174f121b8b92f5d5c.tar.gz) = 34089 bytes
-SHA1 (b6c6684451f925ab2e0b99acbaf66fd487ebfbd5.tar.gz) = 28c4f7c4f85a01f7ffc5ca3e8985626d509eae5e
-RMD160 (b6c6684451f925ab2e0b99acbaf66fd487ebfbd5.tar.gz) = 42d8343565d65d01cdb61d1b13b0ae6d499ea84d
-SHA512 (b6c6684451f925ab2e0b99acbaf66fd487ebfbd5.tar.gz) = bcfa9f99e27971733f8b479b2852c33ad34a371fb23c536c14a9b28cff22eda902a3e28830fbed9716618bbfec4ff71d0f13ef99c4674a5b781d5fd616883f7b
-Size (b6c6684451f925ab2e0b99acbaf66fd487ebfbd5.tar.gz) = 7158249 bytes
+SHA1 (85e47f1ea7013eb9a0f27ec4b946d71e04f970c1.tar.gz) = d19b903a158076049381bab07551d8b37efc6778
+RMD160 (85e47f1ea7013eb9a0f27ec4b946d71e04f970c1.tar.gz) = ce3d2c9b799debdb3b34024aca3f1b6acbaa1ccc
+SHA512 (85e47f1ea7013eb9a0f27ec4b946d71e04f970c1.tar.gz) = 3fbf571880b83bf6f2d2eb4084a397bfff274f5ff1c4beda2194060fb15c1c4b9677c48d37e0e87ae01845b9b15cc4ab185b84d68bff354daf4565c7cab5c3dc
+Size (85e47f1ea7013eb9a0f27ec4b946d71e04f970c1.tar.gz) = 2225810 bytes
 SHA1 (c5da3778e7f84013fe8c26fcf18a67881bd1e825.tar.gz) = b90a5a5f45f700d339be616a4747a31332157602
 RMD160 (c5da3778e7f84013fe8c26fcf18a67881bd1e825.tar.gz) = b9bbecf2a1089052114c1e660bfa00d77552d793
 SHA512 (c5da3778e7f84013fe8c26fcf18a67881bd1e825.tar.gz) = b2a30c495ed6f729610258518586e6db59516cdc9ea88849365caf6ccd50c8040488b69282d5f69cccd2dfe676d18ae9498bc46cfbdf22d0c4d3b12b12eff841
 Size (c5da3778e7f84013fe8c26fcf18a67881bd1e825.tar.gz) = 206988 bytes
+SHA1 (cbb1dcab9a566d0aa0036339f21f2e37012b2507.tar.gz) = dc134754f2c1f7b8680c409294ed94a108e7e4d4
+RMD160 (cbb1dcab9a566d0aa0036339f21f2e37012b2507.tar.gz) = 0dfcc08c7495812f4dba0dec877f55d352b87b62
+SHA512 (cbb1dcab9a566d0aa0036339f21f2e37012b2507.tar.gz) = 0d1f6591b94271fda8e938024463d9f9df19c9f06f74d61c793da0adf5b385fbf207a0c0f14781ed71bf88adbf6af88ad2855f195a0ccc4bcae8a0316c0e35bc
+Size (cbb1dcab9a566d0aa0036339f21f2e37012b2507.tar.gz) = 1762985 bytes
 SHA1 (d1d4705364031512cb89333aebc00b8d75a2f732.tar.gz) = 58f9890bb696ec7e2f44b33b0e836853a3c2cd64
 RMD160 (d1d4705364031512cb89333aebc00b8d75a2f732.tar.gz) = 2ad78589db730c930f80217faf7ade1b6fa47d92
 SHA512 (d1d4705364031512cb89333aebc00b8d75a2f732.tar.gz) = 1fa34dc3f5e72a8ea4fa254a213047d19175181eac7eb0d95d96ebf638e184ea3733af749688f8f79dde061d1e9c9a1b3dd257c27675385fdc912bdb7e0fbbd6
@@ -48,4 +48,5 @@ SHA1 (fd69de1a1b960ec296cc67d32257b0f9e2d89ac6.tar.gz) = dbbdc48f92fc5ac57dda531
 RMD160 (fd69de1a1b960ec296cc67d32257b0f9e2d89ac6.tar.gz) = 838221b759a27053745dc353b3a39aad64c4da87
 SHA512 (fd69de1a1b960ec296cc67d32257b0f9e2d89ac6.tar.gz) = 2bfe22a83054871ac5409fcb543eaa8199f874e04fccb5afdd5d45748a9b372415da034fd511df47144075cde29c06b0fbea80a6a78b4a5b76ea330a0a1330b5
 Size (fd69de1a1b960ec296cc67d32257b0f9e2d89ac6.tar.gz) = 110454 bytes
+SHA1 (patch-externals_cryptopp_cryptopp_config.h) = d11cc8324caeb5c13e40715b1bb970307c40f80b
 SHA1 (patch-externals_dynarmic_CMakeLists.txt) = 6e1fe92e7a8793e45e6d4fcd009164be16c39a9c
diff --git a/libretro-citra/patches/patch-externals_cryptopp_cryptopp_config.h b/libretro-citra/patches/patch-externals_cryptopp_cryptopp_config.h
new file mode 100644
index 0000000000..fe7d5a5d41
--- /dev/null
+++ b/libretro-citra/patches/patch-externals_cryptopp_cryptopp_config.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+uds_beacon.cpp:(.text+0xac9): undefined reference to `CryptoPP::AlignedDeallocate(void*)'
+
+--- externals/cryptopp/cryptopp/config.h.orig	2018-02-22 14:26:16.000000000 +0000
++++ externals/cryptopp/cryptopp/config.h
+@@ -688,12 +688,7 @@ NAMESPACE_END
+ 
+ // ***************** Miscellaneous ********************
+ 
+-// Nearly all Intel's and AMD's have SSE. Enable it independent of SSE ASM and intrinscs
+-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64) && !defined(CRYPTOPP_DISABLE_ASM)
+-	#define CRYPTOPP_BOOL_ALIGN16 1
+-#else
+-	#define CRYPTOPP_BOOL_ALIGN16 0
+-#endif
++#define CRYPTOPP_BOOL_ALIGN16 0
+ 
+ // How to allocate 16-byte aligned memory (for SSE2)
+ // posix_memalign see https://forum.kde.org/viewtopic.php?p=66274
Prev by Date: libretro-fceumm: Update to 20180418
Next by Date: libretro-beetle-saturn: Update to 20180504
Previous by Thread: libretro-fceumm: Update to 20180418
Next by Thread: libretro-beetle-saturn: Update to 20180504
Indexes:
Home | Main Index | Thread Index | Old Index