[pkgsrc/trunk]: pkgsrc/emulators/libretro-mupen64plus libretro-mupen64plus: u...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/emulators/libretro-mupen64plus libretro-mupen64plus: u...
From: nia <nia%pkgsrc.org@localhost>
Date: Sat, 11 Aug 2018 14:51:03 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/55df72ea9bb6
branches:  trunk
changeset: 311452:55df72ea9bb6
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Aug 11 13:59:39 2018 +0000

description:
libretro-mupen64plus: update to 20180628.

No changelog, unfortunately.

diffstat:

 emulators/libretro-mupen64plus/DESCR                                                |   4 +-
 emulators/libretro-mupen64plus/Makefile                                             |  27 +-
 emulators/libretro-mupen64plus/distinfo                                             |  13 +-
 emulators/libretro-mupen64plus/patches/patch-glide2gl_src_Glide64_Util.h            |  15 -
 emulators/libretro-mupen64plus/patches/patch-libretro_libco_armeabi.c               |  30 ---
 emulators/libretro-mupen64plus/patches/patch-mupen64plus-video-angrylion_n64video.c |  95 ----------
 6 files changed, 21 insertions(+), 163 deletions(-)

diffs (236 lines):

diff -r ea71a121f4c2 -r 55df72ea9bb6 emulators/libretro-mupen64plus/DESCR
--- a/emulators/libretro-mupen64plus/DESCR      Sat Aug 11 13:57:27 2018 +0000
+++ b/emulators/libretro-mupen64plus/DESCR      Sat Aug 11 13:59:39 2018 +0000
@@ -4,4 +4,6 @@
 open to others so that they can run these pluggable emulator and game cores
 also in their own programs or devices.
 
-Mupen64Plus is a Nintendo 64 video game system emulator.
+Mupen64Plus is a Nintendo 64 video game system emulator. The original
+Mupen64Plus can use one of the several available graphic plugins (Rice, Glide64,
+etc), while libretro-mupen64plus focuses entirely on supporting GLideN64.
diff -r ea71a121f4c2 -r 55df72ea9bb6 emulators/libretro-mupen64plus/Makefile
--- a/emulators/libretro-mupen64plus/Makefile   Sat Aug 11 13:57:27 2018 +0000
+++ b/emulators/libretro-mupen64plus/Makefile   Sat Aug 11 13:59:39 2018 +0000
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2018/07/18 00:06:15 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2018/08/11 13:59:39 nia Exp $
 
-DISTNAME=      mupen64plus-libretro-20150204
-PKGNAME=       libretro-mupen64plus-20150204
-PKGREVISION=   1
+DISTNAME=      libretro-mupen64plus-20180628
 CATEGORIES=    emulators
-MASTER_SITES=  http://ftp.NetBSD.org/pub/NetBSD/misc/jmcneill/retroarch/
-EXTRACT_SUFX=  .zip
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=        mupen64plus-libretro
+GITHUB_TAG=    4ca2fa8633666e26e2f163dcd3c226b598cb2aa4
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/libretro/mupen64plus-libretro
-COMMENT=       Libretro core based on the Mupen64 Plus emulator
+HOMEPAGE=      https://docs.libretro.com/library/mupen64plus/
+COMMENT=       Libretro core based on the Mupen64Plus emulator
 LICENSE=       gnu-gpl-v3
 
-WRKSRC=                ${WRKDIR}/mupen64plus-libretro-master
+EXTRACT_USING= bsdtar
 USE_LANGUAGES= c c++03
 USE_TOOLS+=    gmake
 
@@ -22,14 +21,11 @@
 SUBST_FILES.vc=                Makefile
 SUBST_SED.vc+=         -e 's;/opt/vc;${PREFIX};g'
 
-SUBST_CLASSES+=                d2u
-SUBST_STAGE.d2u=       post-extract
-SUBST_FILES.d2u=       mupen64plus-video-angrylion/n64video.c
-SUBST_FILTER_CMD.d2u=  ${TR} -d '\r'
+MAKE_FLAGS+=           GIT_VERSION="-pkgsrc"
 
 INSTALLATION_DIRS+=    ${PREFIX}/lib/libretro
 
-CFLAGS.NetBSD+=        -DHAVE_POSIX_MEMALIGN=1
+CFLAGS.NetBSD+=                -DHAVE_POSIX_MEMALIGN=1
 
 .include "options.mk"
 
@@ -37,4 +33,7 @@
        ${INSTALL_LIB} ${WRKSRC}/mupen64plus_libretro.so \
            ${DESTDIR}${PREFIX}/lib/libretro/mupen64plus_libretro.so
 
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ea71a121f4c2 -r 55df72ea9bb6 emulators/libretro-mupen64plus/distinfo
--- a/emulators/libretro-mupen64plus/distinfo   Sat Aug 11 13:57:27 2018 +0000
+++ b/emulators/libretro-mupen64plus/distinfo   Sat Aug 11 13:59:39 2018 +0000
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.5 2017/06/17 19:42:03 joerg Exp $
+$NetBSD: distinfo,v 1.6 2018/08/11 13:59:39 nia Exp $
 
-SHA1 (mupen64plus-libretro-20150204.zip) = 85599e878094348163d68fdd704c5bc7edf78e44
-RMD160 (mupen64plus-libretro-20150204.zip) = 6c08b86834a8f6d548c85eaa34ca38e779b6a0d2
-SHA512 (mupen64plus-libretro-20150204.zip) = 9c016c1dcff40a9435bd5bb4ec07431c9169cd256f018cd1f8c2982d62f8ede871033f354b3519393f700a2a42eabc8c53f8a9cd475989494e45d68cd8abe761
-Size (mupen64plus-libretro-20150204.zip) = 3286777 bytes
-SHA1 (patch-glide2gl_src_Glide64_Util.h) = d3bceef0ba895af8309bfe9435d701d76ca31a27
-SHA1 (patch-libretro_libco_armeabi.c) = dbce5604b0a160dfbdae82506957e2c852d4ca9d
-SHA1 (patch-mupen64plus-video-angrylion_n64video.c) = 7781b2aaa5efb2d0c670438130ad9ef59aa711fc
+SHA1 (libretro-mupen64plus-20180628-4ca2fa8633666e26e2f163dcd3c226b598cb2aa4.tar.gz) = 061554fbae2958d01aba3634c7072c4ce114a717
+RMD160 (libretro-mupen64plus-20180628-4ca2fa8633666e26e2f163dcd3c226b598cb2aa4.tar.gz) = 4ed698218aaba15846e96163c874746c5e0e5a28
+SHA512 (libretro-mupen64plus-20180628-4ca2fa8633666e26e2f163dcd3c226b598cb2aa4.tar.gz) = 
6f945cd9d6a8a29e10efdc24adb4771e859b75bdffdd57228fa1de3a4ae3f0eb5bc5dc8c27de7c978aae667c5c22b6d26bda870d83fa2c68b1ecf1d8e4743a2b
+Size (libretro-mupen64plus-20180628-4ca2fa8633666e26e2f163dcd3c226b598cb2aa4.tar.gz) = 6193207 bytes
diff -r ea71a121f4c2 -r 55df72ea9bb6 emulators/libretro-mupen64plus/patches/patch-glide2gl_src_Glide64_Util.h
--- a/emulators/libretro-mupen64plus/patches/patch-glide2gl_src_Glide64_Util.h  Sat Aug 11 13:57:27 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-glide2gl_src_Glide64_Util.h,v 1.1 2015/02/05 17:42:06 wiz Exp $
-
-bswap32 is defined in the included headers on NetBSD.
-
---- glide2gl/src/Glide64/Util.h.orig   2015-02-04 18:18:28.000000000 +0000
-+++ glide2gl/src/Glide64/Util.h
-@@ -56,7 +56,7 @@ float ScaleZ(float z);
- #if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
- #include <stdlib.h>
- #define bswap32(x) _byteswap_ulong(x)
--#else
-+#elif !defined(__NetBSD__)
- static inline uint32_t bswap32(uint32_t val)
- {
-    return (((val & 0xff000000) >> 24) |
diff -r ea71a121f4c2 -r 55df72ea9bb6 emulators/libretro-mupen64plus/patches/patch-libretro_libco_armeabi.c
--- a/emulators/libretro-mupen64plus/patches/patch-libretro_libco_armeabi.c     Sat Aug 11 13:57:27 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-libretro_libco_armeabi.c,v 1.1 2015/03/31 15:24:14 joerg Exp $
-
---- libretro/libco/armeabi.c.orig      2015-03-30 10:10:39.000000000 +0000
-+++ libretro/libco/armeabi.c
-@@ -22,19 +22,15 @@ extern "C" {
- static thread_local uint32_t co_active_buffer[64];
- static thread_local cothread_t co_active_handle;
- 
--asm (
-+/* ASM */
-+__attribute__((naked))
-+void co_switch_arm(cothread_t handle, cothread_t current)  {
-+  asm volatile (
-       ".arm\n"
--      ".align 4\n"
--      ".globl co_switch_arm\n"
--      ".globl _co_switch_arm\n"
--      "co_switch_arm:\n"
--      "_co_switch_arm:\n"      
-       "  stmia r1!, {r4, r5, r6, r7, r8, r9, r10, r11, sp, lr}\n"
-       "  ldmia r0!, {r4, r5, r6, r7, r8, r9, r10, r11, sp, pc}\n"
--    );
--
--/* ASM */
--void co_switch_arm(cothread_t handle, cothread_t current);
-+  );
-+}
- 
- static void crash(void)
- {
diff -r ea71a121f4c2 -r 55df72ea9bb6 emulators/libretro-mupen64plus/patches/patch-mupen64plus-video-angrylion_n64video.c
--- a/emulators/libretro-mupen64plus/patches/patch-mupen64plus-video-angrylion_n64video.c       Sat Aug 11 13:57:27 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-$NetBSD: patch-mupen64plus-video-angrylion_n64video.c,v 1.1 2017/06/17 19:42:03 joerg Exp $
-
-C99's inline has different semantic.
-
---- mupen64plus-video-angrylion/n64video.c.orig        2017-06-16 12:04:46.824147448 +0000
-+++ mupen64plus-video-angrylion/n64video.c
-@@ -218,7 +218,7 @@ static void compute_cvg_flip(INT32 scanl
- STRICTINLINE UINT32 z_decompress(UINT32 rawz);
- STRICTINLINE UINT32 dz_decompress(UINT32 compresseddz);
- STRICTINLINE UINT32 dz_compress(UINT32 value);
--INLINE void z_build_com_table(void);
-+void z_build_com_table(void);
- static void precalc_cvmask_derivatives(void);
- STRICTINLINE UINT16 decompress_cvmask_frombyte(UINT8 byte);
- STRICTINLINE void lookup_cvmask_derivatives(UINT32 mask, UINT8* offx, UINT8* offy, UINT32* curpixel_cvg, UINT32* curpixel_cvbit);
-@@ -698,7 +698,7 @@ INLINE void SET_SUBA_RGB_INPUT(INT32 **i
-     }
- }
- 
--INLINE void SET_SUBB_RGB_INPUT(INT32 **input_r, INT32 **input_g, INT32 **input_b, int code)
-+void SET_SUBB_RGB_INPUT(INT32 **input_r, INT32 **input_g, INT32 **input_b, int code)
- {
-     switch (code & 0xf)
-     {
-@@ -717,7 +717,7 @@ INLINE void SET_SUBB_RGB_INPUT(INT32 **i
-     }
- }
- 
--INLINE void SET_MUL_RGB_INPUT(INT32 **input_r, INT32 **input_g, INT32 **input_b, int code)
-+void SET_MUL_RGB_INPUT(INT32 **input_r, INT32 **input_g, INT32 **input_b, int code)
- {
-     switch (code & 0x1f)
-     {
-@@ -745,7 +745,7 @@ INLINE void SET_MUL_RGB_INPUT(INT32 **in
-     }
- }
- 
--INLINE void SET_ADD_RGB_INPUT(INT32 **input_r, INT32 **input_g, INT32 **input_b, int code)
-+void SET_ADD_RGB_INPUT(INT32 **input_r, INT32 **input_g, INT32 **input_b, int code)
- {
-     switch (code & 0x7)
-     {
-@@ -760,7 +760,7 @@ INLINE void SET_ADD_RGB_INPUT(INT32 **in
-     }
- }
- 
--INLINE void SET_SUB_ALPHA_INPUT(INT32 **input, int code)
-+void SET_SUB_ALPHA_INPUT(INT32 **input, int code)
- {
-     switch (code & 0x7)
-     {
-@@ -775,7 +775,7 @@ INLINE void SET_SUB_ALPHA_INPUT(INT32 **
-     }
- }
- 
--INLINE void SET_MUL_ALPHA_INPUT(INT32 **input, int code)
-+void SET_MUL_ALPHA_INPUT(INT32 **input, int code)
- {
-     switch (code & 0x7)
-     {
-@@ -1129,7 +1129,7 @@ static void precalculate_everything(void
-     return;
- }
- 
--INLINE void SET_BLENDER_INPUT(int cycle, int which, INT32 **input_r, INT32 **input_g, INT32 **input_b, INT32 **input_a, int a, int b)
-+void SET_BLENDER_INPUT(int cycle, int which, INT32 **input_r, INT32 **input_g, INT32 **input_b, INT32 **input_a, int a, int b)
- {
- 
-     switch (a & 0x3)
-@@ -5837,7 +5837,7 @@ STRICTINLINE UINT32 z_decompress(UINT32 
-     return (z_complete_dec_table[zb >> 2]);
- }
- 
--INLINE void z_build_com_table(void)
-+void z_build_com_table(void)
- {
-     register int z;
-     UINT16 altmem = 0;
-@@ -6220,14 +6220,14 @@ STRICTINLINE INT32 CLIP(INT32 value,INT3
-         return value;
- }
- 
--INLINE void calculate_clamp_diffs(UINT32 i)
-+void calculate_clamp_diffs(UINT32 i)
- {
-     tile[i].f.clampdiffs = ((tile[i].sh >> 2) - (tile[i].sl >> 2)) & 0x3ff;
-     tile[i].f.clampdifft = ((tile[i].th >> 2) - (tile[i].tl >> 2)) & 0x3ff;
- }
- 
- 
--INLINE void calculate_tile_derivs(UINT32 i)
-+void calculate_tile_derivs(UINT32 i)
- {
-     tile[i].f.clampens = tile[i].cs || !tile[i].mask_s;
-     tile[i].f.clampent = tile[i].ct || !tile[i].mask_t;
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated emulators/libretro-mupen64plus to 201...
Next by Date: [pkgsrc/trunk]: pkgsrc Rename picodrive-license to old-mame-license, reflecti...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated emulators/libretro-mupen64plus to 201...
Next by Thread: [pkgsrc/trunk]: pkgsrc Rename picodrive-license to old-mame-license, reflecti...
Indexes:
Home | Main Index | Thread Index | Old Index