pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators Simplify retroarch packagaing by removing re...

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d876e1ec416
branches:  trunk
changeset: 312545:4d876e1ec416
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Sep 06 09:33:38 2018 +0000

description:
Simplify retroarch packagaing by removing retroarch-assets.

Switch to a bundled release for the assets, and make libretro-database
and glsls-headers current. This will make it easier to update versions
between releses where the database compatibility differs (e.g. for fbalpha)

diffstat:

 emulators/Makefile                       |     3 +-
 emulators/libretro-database/Makefile     |    19 +-
 emulators/libretro-database/distinfo     |    10 +-
 emulators/libretro-glsl-shaders/Makefile |    16 +-
 emulators/libretro-glsl-shaders/distinfo |    10 +-
 emulators/retroarch-assets/DESCR         |     2 -
 emulators/retroarch-assets/Makefile      |    56 -
 emulators/retroarch-assets/PLIST         |  3188 -------------------------
 emulators/retroarch-assets/distinfo      |     6 -
 emulators/retroarch/Makefile             |    17 +-
 emulators/retroarch/PLIST                |  3684 +++++++++++++++++++++++++++++-
 emulators/retroarch/distinfo             |    10 +-
 emulators/retroarch/options.mk           |    10 +-
 emulators/retroarch/version.mk           |     6 +-
 14 files changed, 3727 insertions(+), 3310 deletions(-)

diffs (truncated from 7191 to 300 lines):

diff -r ff49a21c2ba7 -r 4d876e1ec416 emulators/Makefile
--- a/emulators/Makefile        Thu Sep 06 09:30:07 2018 +0000
+++ b/emulators/Makefile        Thu Sep 06 09:33:38 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.283 2018/08/31 09:24:25 hauke Exp $
+# $NetBSD: Makefile,v 1.284 2018/09/06 09:33:38 nia Exp $
 #
 
 COMMENT=       Emulators for other operating systems
@@ -157,7 +157,6 @@
 SUBDIR+=       raine
 SUBDIR+=       realboy
 SUBDIR+=       retroarch
-SUBDIR+=       retroarch-assets
 SUBDIR+=       shoebill
 SUBDIR+=       simh
 SUBDIR+=       simulavr
diff -r ff49a21c2ba7 -r 4d876e1ec416 emulators/libretro-database/Makefile
--- a/emulators/libretro-database/Makefile      Thu Sep 06 09:30:07 2018 +0000
+++ b/emulators/libretro-database/Makefile      Thu Sep 06 09:33:38 2018 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2018/09/06 07:50:20 nia Exp $
+# $NetBSD: Makefile,v 1.4 2018/09/06 09:33:38 nia Exp $
 
-PKGNAME=       libretro-database-${RETROARCH_VERSION}
-DISTNAME=      retroarch-assets-${RETROARCH_VERSION}
+DISTNAME=      libretro-database-20180904
 CATEGORIES=    emulators
-MASTER_SITES=  -http://buildbot.libretro.com/stable/${PKGVERSION_NOREV}/windows-msvc2010/x86_64/RetroArch.7z
-EXTRACT_SUFX=  .7z
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=        libretro-database
+GITHUB_TAG=    aa0f09390e45da02c84732812103abb9cd63ee65
 
+MAINTAINER=    nia%NetBSD.org@localhost
 HOMEPAGE=      https://www.libretro.com/
-MAINTAINER=    nia%NetBSD.org@localhost
 COMMENT=       ROM scanning data provided by the libretro project
 LICENSE=       gnu-gpl-v3
 
-WRKSRC=                ${WRKDIR}
+EXTRACT_USING= bsdtar
 USE_LANGUAGES= # none
 NO_BUILD=      yes
 
@@ -19,10 +19,9 @@
 INSTALLATION_DIRS+=    share/libretro/database/cursors
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/database/rdb/*.rdb \
+       ${INSTALL_DATA} ${WRKSRC}/rdb/*.rdb \
            ${DESTDIR}${PREFIX}/share/libretro/database/rdb
-       ${INSTALL_DATA} ${WRKSRC}/database/cursors/*.dbc \
+       ${INSTALL_DATA} ${WRKSRC}/cursors/*.dbc \
            ${DESTDIR}${PREFIX}/share/libretro/database/cursors
 
-.include "../../emulators/retroarch/version.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ff49a21c2ba7 -r 4d876e1ec416 emulators/libretro-database/distinfo
--- a/emulators/libretro-database/distinfo      Thu Sep 06 09:30:07 2018 +0000
+++ b/emulators/libretro-database/distinfo      Thu Sep 06 09:33:38 2018 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2018/09/06 07:50:20 nia Exp $
+$NetBSD: distinfo,v 1.3 2018/09/06 09:33:38 nia Exp $
 
-SHA1 (retroarch-assets-1.7.4.7z) = f1ed75c1d46d4f886a13872b578db7efdcb48865
-RMD160 (retroarch-assets-1.7.4.7z) = 4f1e5d875971dbda0aaf191302f780b18ecb1233
-SHA512 (retroarch-assets-1.7.4.7z) = 41a3fd36f3b0ef9f2d2fc9733dd7c87912e61e2150cec70e6ce2da10f549f77e73ab6d4c2a95d311a1ad532a3c16424f5e80051043b6562b1920a3bc9159fea3
-Size (retroarch-assets-1.7.4.7z) = 186956996 bytes
+SHA1 (libretro-database-20180904-aa0f09390e45da02c84732812103abb9cd63ee65.tar.gz) = b68148ca7652409b655f65478c4f9c9246c02d7c
+RMD160 (libretro-database-20180904-aa0f09390e45da02c84732812103abb9cd63ee65.tar.gz) = e87f6612a681a38bc633ba5d8e79148d82c8a063
+SHA512 (libretro-database-20180904-aa0f09390e45da02c84732812103abb9cd63ee65.tar.gz) = 
d8d288b0f990459a627e7f93d9c59c2ee8eb0902c7b6fb3c945280ce59225fc9ddf6831c81838a63c986473e7320343e3acdbc90da146eca4f4d78799a5b5d0d
+Size (libretro-database-20180904-aa0f09390e45da02c84732812103abb9cd63ee65.tar.gz) = 113409990 bytes
diff -r ff49a21c2ba7 -r 4d876e1ec416 emulators/libretro-glsl-shaders/Makefile
--- a/emulators/libretro-glsl-shaders/Makefile  Thu Sep 06 09:30:07 2018 +0000
+++ b/emulators/libretro-glsl-shaders/Makefile  Thu Sep 06 09:33:38 2018 +0000
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.2 2018/08/07 16:46:08 nia Exp $
+# $NetBSD: Makefile,v 1.3 2018/09/06 09:33:38 nia Exp $
 
-DISTNAME=      retroarch-assets-${RETROARCH_VERSION}
-PKGNAME=       libretro-glsl-shaders-${RETROARCH_VERSION}
+DISTNAME=      libretro-glsl-shaders-20180828
 CATEGORIES=    emulators
-MASTER_SITES=  -http://buildbot.libretro.com/stable/${PKGVERSION_NOREV}/windows-msvc2010/x86_64/RetroArch.7z
-EXTRACT_SUFX=  .7z
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=        glsl-shaders
+GITHUB_TAG=    a52c8b6798c7a10fd72971ef8e8b135e0f7a9ca0
 
+MAINTAINER=    nia%NetBSD.org@localhost
 HOMEPAGE=      https://www.libretro.com/
-MAINTAINER=    nia%NetBSD.org@localhost
 COMMENT=       Libretro GLSL shaders
 LICENSE=       gnu-gpl-v3
 
+EXTRACT_USING= bsdtar
 USE_LANGUAGES= # none
 NO_BUILD=      yes
 
-WRKSRC=                ${WRKDIR}/shaders/shaders_glsl
-
 do-install:
        cd ${WRKSRC} && ${FIND} * -type d -exec ${INSTALL_DATA_DIR} \
            ${DESTDIR}${PREFIX}/share/libretro/shaders/{} \;
        cd ${WRKSRC} && ${FIND} * -type f -exec ${INSTALL_DATA} {} \
            ${DESTDIR}${PREFIX}/share/libretro/shaders/{} \;
 
-.include "../../emulators/retroarch/version.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ff49a21c2ba7 -r 4d876e1ec416 emulators/libretro-glsl-shaders/distinfo
--- a/emulators/libretro-glsl-shaders/distinfo  Thu Sep 06 09:30:07 2018 +0000
+++ b/emulators/libretro-glsl-shaders/distinfo  Thu Sep 06 09:33:38 2018 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2018/09/06 07:50:20 nia Exp $
+$NetBSD: distinfo,v 1.3 2018/09/06 09:33:38 nia Exp $
 
-SHA1 (retroarch-assets-1.7.4.7z) = f1ed75c1d46d4f886a13872b578db7efdcb48865
-RMD160 (retroarch-assets-1.7.4.7z) = 4f1e5d875971dbda0aaf191302f780b18ecb1233
-SHA512 (retroarch-assets-1.7.4.7z) = 41a3fd36f3b0ef9f2d2fc9733dd7c87912e61e2150cec70e6ce2da10f549f77e73ab6d4c2a95d311a1ad532a3c16424f5e80051043b6562b1920a3bc9159fea3
-Size (retroarch-assets-1.7.4.7z) = 186956996 bytes
+SHA1 (libretro-glsl-shaders-20180828-a52c8b6798c7a10fd72971ef8e8b135e0f7a9ca0.tar.gz) = 6908bbf45e0ac56e59e8f75c8cd47ac8a9742ad8
+RMD160 (libretro-glsl-shaders-20180828-a52c8b6798c7a10fd72971ef8e8b135e0f7a9ca0.tar.gz) = f1bf70211e7a41496a1870b25804161127e83bda
+SHA512 (libretro-glsl-shaders-20180828-a52c8b6798c7a10fd72971ef8e8b135e0f7a9ca0.tar.gz) = 
e97e8d934400053112fec45e44d13eb48f1c28fc8917f0732aeea01078a72eac0af69f7c8cdff3083772e69116cc4f8a7aa1644eeabe5932fd9dc239d47938fc
+Size (libretro-glsl-shaders-20180828-a52c8b6798c7a10fd72971ef8e8b135e0f7a9ca0.tar.gz) = 24537044 bytes
diff -r ff49a21c2ba7 -r 4d876e1ec416 emulators/retroarch-assets/DESCR
--- a/emulators/retroarch-assets/DESCR  Thu Sep 06 09:30:07 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Assets needed for RetroArch - icons and fonts for different menu drivers,
-etc.
diff -r ff49a21c2ba7 -r 4d876e1ec416 emulators/retroarch-assets/Makefile
--- a/emulators/retroarch-assets/Makefile       Thu Sep 06 09:30:07 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2018/09/06 07:50:20 nia Exp $
-
-DISTNAME=              retroarch-assets-${RETROARCH_VERSION}
-CATEGORIES=            emulators
-MASTER_SITES=          -https://buildbot.libretro.com/stable/${PKGVERSION_NOREV}/windows-msvc2010/x86_64/RetroArch.7z
-EXTRACT_SUFX=          .7z
-
-MAINTAINER=            nia%NetBSD.org@localhost
-HOMEPAGE=              https://www.retroarch.com/
-COMMENT=               Assets for RetroArch
-LICENSE=               cc-by-v4.0
-
-USE_LANGUAGES=         # none
-NO_BUILD=              yes
-
-WRKSRC=                        ${WRKDIR}
-
-RA_ASSET_DIRS+=                branding
-RA_ASSET_DIRS+=                glui
-RA_ASSET_DIRS+=                xmb
-RA_ASSET_DIRS+=                xmb/dot-art
-RA_ASSET_DIRS+=                xmb/dot-art/png
-RA_ASSET_DIRS+=                xmb/emojiactive
-RA_ASSET_DIRS+=                xmb/emojiactive/png
-RA_ASSET_DIRS+=                xmb/flatui
-RA_ASSET_DIRS+=                xmb/flatui/png
-RA_ASSET_DIRS+=                xmb/monochrome
-RA_ASSET_DIRS+=                xmb/monochrome/png
-RA_ASSET_DIRS+=                xmb/monochrome-inverted
-RA_ASSET_DIRS+=                xmb/monochrome-inverted/png
-RA_ASSET_DIRS+=                xmb/neoactive
-RA_ASSET_DIRS+=                xmb/neoactive/png
-RA_ASSET_DIRS+=                xmb/pixel
-RA_ASSET_DIRS+=                xmb/pixel/png
-RA_ASSET_DIRS+=                xmb/retroactive
-RA_ASSET_DIRS+=                xmb/retroactive/png
-RA_ASSET_DIRS+=                xmb/retrosystem
-RA_ASSET_DIRS+=                xmb/retrosystem/png
-RA_ASSET_DIRS+=                xmb/systematic
-RA_ASSET_DIRS+=                xmb/systematic/png
-
-.for i in ${RA_ASSET_DIRS}
-INSTALLATION_DIRS+=    share/retroarch/assets/${i}
-.endfor
-
-do-install:
-.for dir in ${RA_ASSET_DIRS}
-.  for type in ttf png
-       if ${LS} -1 ${WRKSRC}/assets/${dir} | ${GREP} -q .${type}$$; then \
-               ${INSTALL_DATA} ${WRKSRC}/assets/${dir}/*.${type} \
-                   ${DESTDIR}${PREFIX}/share/retroarch/assets/${dir}; fi
-.  endfor
-.endfor
-
-.include "../../emulators/retroarch/version.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r ff49a21c2ba7 -r 4d876e1ec416 emulators/retroarch-assets/PLIST
--- a/emulators/retroarch-assets/PLIST  Thu Sep 06 09:30:07 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3188 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2018/09/06 07:50:20 nia Exp $
-share/retroarch/assets/branding/libretro_logo.png
-share/retroarch/assets/branding/libretro_logo_white.png
-share/retroarch/assets/branding/retroarch-plain-logo.png
-share/retroarch/assets/branding/retroarch_bg.png
-share/retroarch/assets/branding/retroarch_libretro_bg.png
-share/retroarch/assets/branding/retroarch_nologo_bg.png
-share/retroarch/assets/glui/add.png
-share/retroarch/assets/glui/add_to_favorites.png
-share/retroarch/assets/glui/add_to_mixer.png
-share/retroarch/assets/glui/archive.png
-share/retroarch/assets/glui/back.png
-share/retroarch/assets/glui/close.png
-share/retroarch/assets/glui/configurations.png
-share/retroarch/assets/glui/controls.png
-share/retroarch/assets/glui/core_cheat_options.png
-share/retroarch/assets/glui/core_options.png
-share/retroarch/assets/glui/cores.png
-share/retroarch/assets/glui/database.png
-share/retroarch/assets/glui/disk.png
-share/retroarch/assets/glui/eject.png
-share/retroarch/assets/glui/file.png
-share/retroarch/assets/glui/folder.png
-share/retroarch/assets/glui/font.ttf
-share/retroarch/assets/glui/help.png
-share/retroarch/assets/glui/history.png
-share/retroarch/assets/glui/image.png
-share/retroarch/assets/glui/information.png
-share/retroarch/assets/glui/key-hover.png
-share/retroarch/assets/glui/key.png
-share/retroarch/assets/glui/load_content.png
-share/retroarch/assets/glui/load_state.png
-share/retroarch/assets/glui/main_tab_active.png
-share/retroarch/assets/glui/main_tab_passive.png
-share/retroarch/assets/glui/music.png
-share/retroarch/assets/glui/netplay.png
-share/retroarch/assets/glui/off.png
-share/retroarch/assets/glui/on.png
-share/retroarch/assets/glui/parent_directory.png
-share/retroarch/assets/glui/playlist.png
-share/retroarch/assets/glui/playlists_tab_active.png
-share/retroarch/assets/glui/playlists_tab_passive.png
-share/retroarch/assets/glui/pointer.png
-share/retroarch/assets/glui/quickmenu.png
-share/retroarch/assets/glui/quit.png
-share/retroarch/assets/glui/refresh.png
-share/retroarch/assets/glui/remove.png
-share/retroarch/assets/glui/rename.png
-share/retroarch/assets/glui/restart.png
-share/retroarch/assets/glui/resume.png
-share/retroarch/assets/glui/run.png
-share/retroarch/assets/glui/save_state.png
-share/retroarch/assets/glui/scan.png
-share/retroarch/assets/glui/settings.png
-share/retroarch/assets/glui/settings_tab_active.png
-share/retroarch/assets/glui/settings_tab_passive.png
-share/retroarch/assets/glui/shaders.png
-share/retroarch/assets/glui/start_core.png
-share/retroarch/assets/glui/state_slot.png
-share/retroarch/assets/glui/take_screenshot.png
-share/retroarch/assets/glui/undo_load_state.png
-share/retroarch/assets/glui/undo_save_state.png
-share/retroarch/assets/glui/update.png
-share/retroarch/assets/glui/video.png
-share/retroarch/assets/xmb/dot-art/font.ttf
-share/retroarch/assets/xmb/dot-art/png/2048-content.png
-share/retroarch/assets/xmb/dot-art/png/2048.png
-share/retroarch/assets/xmb/dot-art/png/Amstrad - CPC-content.png
-share/retroarch/assets/xmb/dot-art/png/Amstrad - CPC.png
-share/retroarch/assets/xmb/dot-art/png/Atari - 2600-content.png
-share/retroarch/assets/xmb/dot-art/png/Atari - 2600.png
-share/retroarch/assets/xmb/dot-art/png/Atari - 5200-content.png
-share/retroarch/assets/xmb/dot-art/png/Atari - 5200.png
-share/retroarch/assets/xmb/dot-art/png/Atari - 7800-content.png
-share/retroarch/assets/xmb/dot-art/png/Atari - 7800.png
-share/retroarch/assets/xmb/dot-art/png/Atari - Jaguar Cd-content.png
-share/retroarch/assets/xmb/dot-art/png/Atari - Jaguar Cd.png
-share/retroarch/assets/xmb/dot-art/png/Atari - Jaguar-content.png
-share/retroarch/assets/xmb/dot-art/png/Atari - Jaguar.png
-share/retroarch/assets/xmb/dot-art/png/Atari - Lynx-content.png
-share/retroarch/assets/xmb/dot-art/png/Atari - Lynx.png
-share/retroarch/assets/xmb/dot-art/png/Atari - ST-content.png
-share/retroarch/assets/xmb/dot-art/png/Atari - ST.png
-share/retroarch/assets/xmb/dot-art/png/Bally - Astrocade-content.png
-share/retroarch/assets/xmb/dot-art/png/Bally - Astrocade.png
-share/retroarch/assets/xmb/dot-art/png/Bandai - WonderSwan Color-content.png
-share/retroarch/assets/xmb/dot-art/png/Bandai - WonderSwan Color.png
-share/retroarch/assets/xmb/dot-art/png/Bandai - WonderSwan-content.png
-share/retroarch/assets/xmb/dot-art/png/Bandai - WonderSwan.png
-share/retroarch/assets/xmb/dot-art/png/Benesse - Pocket Challenge V2-content.png
-share/retroarch/assets/xmb/dot-art/png/Benesse - Pocket Challenge V2.png
-share/retroarch/assets/xmb/dot-art/png/CHIP-8-content.png
-share/retroarch/assets/xmb/dot-art/png/CHIP-8.png
-share/retroarch/assets/xmb/dot-art/png/Casio - Loopy-content.png
-share/retroarch/assets/xmb/dot-art/png/Casio - Loopy.png
-share/retroarch/assets/xmb/dot-art/png/Casio - PV-1000-content.png
-share/retroarch/assets/xmb/dot-art/png/Casio - PV-1000.png
-share/retroarch/assets/xmb/dot-art/png/Cave Story-content.png
-share/retroarch/assets/xmb/dot-art/png/Cave Story.png
-share/retroarch/assets/xmb/dot-art/png/ChaiLove-content.png
-share/retroarch/assets/xmb/dot-art/png/ChaiLove.png
-share/retroarch/assets/xmb/dot-art/png/Coleco - ColecoVision ADAM-content.png
-share/retroarch/assets/xmb/dot-art/png/Coleco - ColecoVision ADAM.png
-share/retroarch/assets/xmb/dot-art/png/Coleco - ColecoVision-content.png
-share/retroarch/assets/xmb/dot-art/png/Coleco - ColecoVision.png
Home | Main Index | Thread Index | Old Index