CVS commit: pkgsrc/emulators

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon May 18 12:27:37 UTC 2020

Modified Files:
        pkgsrc/emulators/libretro-stella: Makefile
        pkgsrc/emulators/stella: DESCR Makefile distinfo
Added Files:
        pkgsrc/emulators/stella: Makefile.common
Removed Files:
        pkgsrc/emulators/libretro-stella: distinfo

Log Message:
stella: Update to 6.1.2. Unify with libretro-stella.

6.1.1 to 6.1.2: (April 25, 2020)

  * Fixed bug with remapped events not being reloaded in certain cases.

  * Fixed bug in debugger for 3E scheme when displaying active RAM bank.

  * Fixed bug in "Dragon Defender" ROM being misconfigured for Mindlink
    controller.

6.1 to 6.1.1: (April 4, 2020)

  * Fixed crash in 3E bankswitching scheme when writing to ROM addresses.

  * Fix snapshots on Retina HiDPI displays capturing only the top-left
    corner.

  * Fixed wrong color for BK (background) swatch in the debugger.

  * Fixed 'Right Diff' button in Command menu changing left difficulty
    instead.

  * Fixed compilation of libretro port on Debian Buster.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/libretro-stella/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/emulators/libretro-stella/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/stella/DESCR
cvs rdiff -u -r1.53 -r1.54 pkgsrc/emulators/stella/Makefile
cvs rdiff -u -r0 -r1.4 pkgsrc/emulators/stella/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/emulators/stella/distinfo

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-stella/Makefile
diff -u pkgsrc/emulators/libretro-stella/Makefile:1.3 pkgsrc/emulators/libretro-stella/Makefile:1.4
--- pkgsrc/emulators/libretro-stella/Makefile:1.3       Tue Oct  2 21:09:30 2018
+++ pkgsrc/emulators/libretro-stella/Makefile   Mon May 18 12:27:37 2020
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.3 2018/10/02 21:09:30 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/18 12:27:37 nia Exp $
 
-DISTNAME=      libretro-stella-20180411
-CATEGORIES=    emulators
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/}
-GITHUB_PROJECT=        stella-libretro
-GITHUB_TAG=    b0d525b724fa0a9a313e2ea33a590aba98deaabf
+.include "../../emulators/stella/Makefile.common"
+
+PKGNAME=       libretro-${DISTNAME:S/-src//1}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://docs.libretro.com/library/stella/
 COMMENT=       Libretro core based on the Stella Atari 2600 (VCS) emulator
-LICENSE=       gnu-gpl-v2
 
-EXTRACT_USING= bsdtar
-USE_LANGUAGES= c c++
+BUILD_DIRS=    src/libretro
+
 USE_TOOLS+=    gmake
 
 MAKE_FLAGS+=   GIT_VERSION="-${PKGVERSION_NOREV}-pkgsrc"
+MAKE_FLAGS+=   LTO=
+
+# Should not be combined with -fPIC
+BUILDLINK_TRANSFORM+=  rm:-static-libgcc
+BUILDLINK_TRANSFORM+=  rm:-static-libstdc++
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--no-undefined
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=link.T
@@ -23,7 +25,7 @@ BUILDLINK_TRANSFORM.SunOS+=   rm:-Wl,--ver
 INSTALLATION_DIRS+=    ${PREFIX}/lib/libretro
 
 do-install:
-       ${INSTALL_LIB} ${WRKSRC}/stella_libretro.so \
+       ${INSTALL_LIB} ${WRKSRC}/src/libretro/stella_libretro.so \
            ${DESTDIR}${PREFIX}/lib/libretro/stella_libretro.so
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/stella/DESCR
diff -u pkgsrc/emulators/stella/DESCR:1.1 pkgsrc/emulators/stella/DESCR:1.2
--- pkgsrc/emulators/stella/DESCR:1.1   Wed Oct 31 23:53:28 2001
+++ pkgsrc/emulators/stella/DESCR       Mon May 18 12:27:36 2020
@@ -1,7 +1,4 @@
 Stella is a freely distributed multi-platform Atari 2600 VCS emulator;
-originally developed for Linux by Bradford W. Mott. Stella allows you to
-enjoy all of your favorite 2600 games once again by emulating the 2600's
-hardware with software. Stella is written in C++, which allows it to be
-ported to other operating systems and architectures. Since its original
-release Stella has been ported to AcornOS, AmigaOS, DOS, FreeBSD, IRIX,
-Linux, MacOS, OpenStep, OS/2, Unix, and Windows.
+originally developed by Bradford W. Mott. Stella allows you to enjoy all
+of your favorite 2600 games once again by emulating the 2600's hardware
+with software.

Index: pkgsrc/emulators/stella/Makefile
diff -u pkgsrc/emulators/stella/Makefile:1.53 pkgsrc/emulators/stella/Makefile:1.54
--- pkgsrc/emulators/stella/Makefile:1.53       Mon Mar 23 12:01:15 2020
+++ pkgsrc/emulators/stella/Makefile    Mon May 18 12:27:36 2020
@@ -1,26 +1,15 @@
-# $NetBSD: Makefile,v 1.53 2020/03/23 12:01:15 nia Exp $
+# $NetBSD: Makefile,v 1.54 2020/05/18 12:27:36 nia Exp $
+
+.include "Makefile.common"
 
-DISTNAME=      stella-6.1-src
 PKGNAME=       ${DISTNAME:S/-src//1}
-CATEGORIES=    emulators
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=stella-emu/}
-GITHUB_RELEASE=        ${PKGVERSION_NOREV}
-EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://stella-emu.github.io/
 COMMENT=       Multi-platform Atari 2600 VCS emulator
-LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
-USE_LANGUAGES= c c++14
 USE_TOOLS+=    gmake
 
-# c++14
-GCC_REQD+=     5
-
-UNLIMIT_RESOURCES=     datasize
-
 HAS_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 

Index: pkgsrc/emulators/stella/distinfo
diff -u pkgsrc/emulators/stella/distinfo:1.26 pkgsrc/emulators/stella/distinfo:1.27
--- pkgsrc/emulators/stella/distinfo:1.26       Mon Mar 23 12:01:15 2020
+++ pkgsrc/emulators/stella/distinfo    Mon May 18 12:27:36 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2020/03/23 12:01:15 nia Exp $
+$NetBSD: distinfo,v 1.27 2020/05/18 12:27:36 nia Exp $
 
-SHA1 (stella-6.1-src.tar.xz) = 150897e4184a6ad1eb00e786aef84a6732740927
-RMD160 (stella-6.1-src.tar.xz) = 614db20bdf700d3d44273f8056d6d8b0cbbbf318
-SHA512 (stella-6.1-src.tar.xz) = 46f1a562c7cdcc7e2e36d4cd6976be2cac1587969f66af89c00ac95a82de9b3420044c721e53c71fe4e5a8c50f27df1dd74a583d40723ef1e343cb3c1efcec8e
-Size (stella-6.1-src.tar.xz) = 2047380 bytes
+SHA1 (stella-6.1.2-src.tar.xz) = 7d8be0214e398bad21dc3e7e3b788f8c7b98a280
+RMD160 (stella-6.1.2-src.tar.xz) = 8dd3c3197bc6d80832aaed4e24a0539fb3fc60d5
+SHA512 (stella-6.1.2-src.tar.xz) = 48dcefd322ea27e90970c5b8b43dd6cf919a30674e75601ce5de5931f54c61e751b2d72b863be98ae3e332ce4f8db7a02f16dcb97b7eda2d5515989b0cd6a8c5
+Size (stella-6.1.2-src.tar.xz) = 2048220 bytes
 SHA1 (patch-configure) = 4818245fe59c6c73e6d7647e7d3aed1f3c938c90

Added files:

Index: pkgsrc/emulators/stella/Makefile.common
diff -u /dev/null pkgsrc/emulators/stella/Makefile.common:1.4
--- /dev/null   Mon May 18 12:27:37 2020
+++ pkgsrc/emulators/stella/Makefile.common     Mon May 18 12:27:36 2020
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.common,v 1.4 2020/05/18 12:27:36 nia Exp $
+# used by emulators/stella/Makefile
+# used by emulators/libretro-stella/Makefile
+
+DISTNAME=      stella-6.1.2-src
+CATEGORIES=    emulators
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=stella-emu/}
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
+EXTRACT_SUFX=  .tar.xz
+
+LICENSE=       gnu-gpl-v2
+
+DISTINFO_FILE= ${.CURDIR}/../../emulators/stella/distinfo
+PATCHDIR=      ${.CURDIR}/../../emulators/stella/patches
+
+WRKSRC=                ${WRKDIR}/${DISTNAME:S/-src//1}
+
+USE_LANGUAGES= c c++
+
+# c++14
+GCC_REQD+=     5
+
+UNLIMIT_RESOURCES=     datasize