CVS commit: pkgsrc/emulators/libretro-fuse

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May 30 15:56:22 UTC 2020

Modified Files:
        pkgsrc/emulators/libretro-fuse: Makefile distinfo
Added Files:
        pkgsrc/emulators/libretro-fuse/patches: patch-build_Makefile.common
Removed Files:
        pkgsrc/emulators/libretro-fuse/patches: patch-fuse_configure

Log Message:
libretro-fuse: Update to 20200506

Changes:
        * Fixed a crash on startup


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/libretro-fuse/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/libretro-fuse/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/libretro-fuse/patches/patch-build_Makefile.common
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/libretro-fuse/patches/patch-fuse_configure

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

Modified files:

Index: pkgsrc/emulators/libretro-fuse/Makefile
diff -u pkgsrc/emulators/libretro-fuse/Makefile:1.3 pkgsrc/emulators/libretro-fuse/Makefile:1.4
--- pkgsrc/emulators/libretro-fuse/Makefile:1.3 Tue May 26 09:45:14 2020
+++ pkgsrc/emulators/libretro-fuse/Makefile     Sat May 30 15:56:22 2020
@@ -1,37 +1,25 @@
-# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:14 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/30 15:56:22 nia Exp $
 
-DISTNAME=      libretro-fuse-20180419
+DISTNAME=      libretro-fuse-20200506
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/}
 GITHUB_PROJECT=        fuse-libretro
-GITHUB_TAG=    fa6ecc43754be89ec5a156877f04adb8f9cc7a09
+GITHUB_TAG=    c2f03e6f08f3e2a03d7888fe756e0beb7979f983
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://docs.libretro.com/library/fuse/
 COMMENT=       Libretro core based on the FUSE ZX Spectrum emulator
 LICENSE=       gnu-gpl-v3
 
-USE_TOOLS+=    gmake
-MAKE_FILE=     Makefile.libretro
+LIBRETRO_CORE= fuse
 
-OPSYSVARS+=    SOEXT
-SOEXT.Darwin=  dylib
-SOEXT.*=       so
-PLIST_SUBST+=  SOEXT=${SOEXT}
-
-.include "../../mk/endian.mk"
-
-.if ${MACHINE_ENDIAN} == "big"
-CFLAGS+=       -DWORDS_BIGENDIAN -DMSB_FIRST
-.endif
+LDFLAGS+=      -lz
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,-version-script=build/link.T
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,-no-undefined
 
-INSTALLATION_DIRS+=    ${PREFIX}/lib/libretro
-
-do-install:
-       ${INSTALL_LIB} ${WRKSRC}/fuse_libretro.so \
-           ${DESTDIR}${PREFIX}/lib/libretro/fuse_libretro.so
+# Not used by the libretro build system
+CHECK_PORTABILITY_SKIP+=       fuse/configure
 
+.include "../../emulators/retroarch/core.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/libretro-fuse/distinfo
diff -u pkgsrc/emulators/libretro-fuse/distinfo:1.1 pkgsrc/emulators/libretro-fuse/distinfo:1.2
--- pkgsrc/emulators/libretro-fuse/distinfo:1.1 Sat Aug 11 15:42:09 2018
+++ pkgsrc/emulators/libretro-fuse/distinfo     Sat May 30 15:56:22 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2018/08/11 15:42:09 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/05/30 15:56:22 nia Exp $
 
-SHA1 (libretro-fuse-20180419-fa6ecc43754be89ec5a156877f04adb8f9cc7a09.tar.gz) = 15793fd2a22b0d5a119ff443a46e7def073eb96a
-RMD160 (libretro-fuse-20180419-fa6ecc43754be89ec5a156877f04adb8f9cc7a09.tar.gz) = 97f43f166bc9da6a7de57bc463098352e0353ddc
-SHA512 (libretro-fuse-20180419-fa6ecc43754be89ec5a156877f04adb8f9cc7a09.tar.gz) = 
096bb8fe1fd8e9cfbc23dc9b0939fc5d7aee060ac9c52b5a3d3c6a75bf1f4d006ede1dbafd97e481e061bd2ec6d158edef66250f6a20fffec8535dcb9d8e11ed
-Size (libretro-fuse-20180419-fa6ecc43754be89ec5a156877f04adb8f9cc7a09.tar.gz) = 4320074 bytes
+SHA1 (libretro-fuse-20200506-c2f03e6f08f3e2a03d7888fe756e0beb7979f983.tar.gz) = 106a37f95db50ea16407abab5903abab9bd86edf
+RMD160 (libretro-fuse-20200506-c2f03e6f08f3e2a03d7888fe756e0beb7979f983.tar.gz) = ac392a6bef7c32cd467c77dc6331c95845f108ed
+SHA512 (libretro-fuse-20200506-c2f03e6f08f3e2a03d7888fe756e0beb7979f983.tar.gz) = 
60645bd0ac6e85f833cbce2fe4932379f334aa915227bf3126feba227206b94bcb300b647a502844880b5cf91e6176535004b846c806c4a937112150c1ea4a04
+Size (libretro-fuse-20200506-c2f03e6f08f3e2a03d7888fe756e0beb7979f983.tar.gz) = 4319376 bytes
 SHA1 (patch-Makefile.libretro) = 5fa69278a3caccd2228d33287262e53f8a6472d3
-SHA1 (patch-fuse_configure) = dd010a208542746ddba2365e5fb3c26dd4be5c99
+SHA1 (patch-build_Makefile.common) = 23ce82ac005ba8a125f24f7d3b99ee56b4143893

Added files:

Index: pkgsrc/emulators/libretro-fuse/patches/patch-build_Makefile.common
diff -u /dev/null pkgsrc/emulators/libretro-fuse/patches/patch-build_Makefile.common:1.1
--- /dev/null   Sat May 30 15:56:22 2020
+++ pkgsrc/emulators/libretro-fuse/patches/patch-build_Makefile.common  Sat May 30 15:56:22 2020
@@ -0,0 +1,48 @@
+$NetBSD: patch-build_Makefile.common,v 1.1 2020/05/30 15:56:22 nia Exp $
+
+Don't vendor zlib/bzip2
+
+--- build/Makefile.common.orig 2020-05-06 00:19:02.000000000 +0000
++++ build/Makefile.common
+@@ -3,9 +3,7 @@ INCLUDES += -I$(CORE_DIR) \
+             -I$(CORE_DIR)/src/compat \
+             -I$(CORE_DIR)/fuse \
+             -I$(CORE_DIR)/fuse/compat \
+-            -I$(CORE_DIR)/libspectrum \
+-            -I$(CORE_DIR)/zlib \
+-            -I$(CORE_DIR)/bzip2
++            -I$(CORE_DIR)/libspectrum
+ 
+ SOURCES_C += $(CORE_DIR)/src/libretro.c
+ SOURCES_C += $(CORE_DIR)/src/coreopt.c
+@@ -190,30 +188,6 @@ SOURCES_C += $(CORE_DIR)/libspectrum/z80
+ SOURCES_C += $(CORE_DIR)/libspectrum/zlib.c
+ SOURCES_C += $(CORE_DIR)/libspectrum/zxs.c
+ 
+-SOURCES_C += $(CORE_DIR)/zlib/adler32.c
+-SOURCES_C += $(CORE_DIR)/zlib/compress.c
+-SOURCES_C += $(CORE_DIR)/zlib/crc32.c
+-SOURCES_C += $(CORE_DIR)/zlib/deflate.c
+-SOURCES_C += $(CORE_DIR)/zlib/gzclose.c
+-SOURCES_C += $(CORE_DIR)/zlib/gzlib.c
+-SOURCES_C += $(CORE_DIR)/zlib/gzread.c
+-SOURCES_C += $(CORE_DIR)/zlib/gzwrite.c
+-SOURCES_C += $(CORE_DIR)/zlib/infback.c
+-SOURCES_C += $(CORE_DIR)/zlib/inffast.c
+-SOURCES_C += $(CORE_DIR)/zlib/inflate.c
+-SOURCES_C += $(CORE_DIR)/zlib/inftrees.c
+-SOURCES_C += $(CORE_DIR)/zlib/trees.c
+-SOURCES_C += $(CORE_DIR)/zlib/uncompr.c
+-SOURCES_C += $(CORE_DIR)/zlib/zutil.c
+-
+-SOURCES_C += $(CORE_DIR)/bzip2/blocksort.c
+-SOURCES_C += $(CORE_DIR)/bzip2/huffman.c
+-SOURCES_C += $(CORE_DIR)/bzip2/crctable.c
+-SOURCES_C += $(CORE_DIR)/bzip2/randtable.c
+-SOURCES_C += $(CORE_DIR)/bzip2/compress.c
+-SOURCES_C += $(CORE_DIR)/bzip2/decompress.c
+-SOURCES_C += $(CORE_DIR)/bzip2/bzlib.c
+-
+ ROMS += $(CORE_DIR)/fuse/roms/48.rom
+ ROMS += $(CORE_DIR)/fuse/roms/128-0.rom
+ ROMS += $(CORE_DIR)/fuse/roms/128-1.rom