summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2019-09-08 12:34:38 +0000
committernia <nia@pkgsrc.org>2019-09-08 12:34:38 +0000
commitdfdc01060e1d2834f0c5016b887f4cc6244477d9 (patch)
tree96f254eea4f8dd5a6519fa88708088b8568272d6 /emulators
parentf3ed67cbea31031125576cb1e235378dfb8b3d41 (diff)
downloadpkgsrc-dfdc01060e1d2834f0c5016b887f4cc6244477d9.tar.gz
emulationstation: Update to 2.7.6
pkgsrc changes: Upstream changed to RetroPie. Some build fixes. Upstream changes: Latest (Dev) BUGFIX: Fix size of snapshot for md_video when using <size> theme option. BUGFIX: Fix scraper for Game & Watch. BUGFIX: Fix to properly allow md_video snapshot to display a different image then md_image. ENHANCEMENT: New horizontal wheel type for System View carousel. BUGFIX: Fix filters not updating properly after creating first favorite. NEW FEATURE: Rotate Screen support. ENHANCEMENT: Improved performance when fetching MAME names. BUGFIX: Fix VLC not muting audio after first loop. 2.7.4 (Stable) BUGFIX: Fix crash when removing last entry in favorites. 2.7.2 NEW FEATURE: CEC support. 2.7.1 ENHANCEMENT: Improved title scrolling in gamelist. BUGFIX: Fix for video screensaver when menu is open. 2.7.0 ENHANCEMENT: Enable Jump to letter when gamelist is filtered. NEW FEATURE: Support for file filtering and hiding systems via Kids Mode. ENHANCEMENT: Option to launch directly to a gamelist vs. system view. ENHANCEMENT: Support for default paths to game image/video. 2.6.5 ENHANCEMENT: Default image paths in themes. ENHANCEMENT: Normalize volume level for OMX player. NEW FEATURE: Kiosk Mode allows certain menu items. 2.6.4 BUGFIX: Fix scrolling bug when using Power Saver. 2.6.3 (RetroPie 4.3) NEW FEATURE: Image slideshow screensaver. 2.6.2 ENHANCEMENT: Adjust menu widths to be dependent on lesser of two dimensions. BUGFIX: Fix bug causing crash when entering gamelist on some platforms. 2.6.1 BUGFIX: System Carousel now properly renders when only one system is present. ENHANCEMENT: Swap time for Video Screensaver now configurable in settings menu. BUGFIX: Fix blank screen occurring when exit game animation is interrupted by key press. ENHANCEMENT: Volume setting now controls video volume when using OMX player. ENHANCEMENT: Carousel enhancements Size and opacity of logos are now animated and transition smoothly when scrolling. Origin now supported for <carousel> theme element. Support for new vertical wheel carousel type. BUGFIX: Text logos now increase in size properly. BUGFIX: Background extras and logos no longer bleed into gamelists when using vertical carousel. 2.6.0 NEW FEATURE: Custom Game Collections ENHANCEMENT: Theme enhancements Origin now supported for <text>, <rating> and <textlist> theme elements. Rotation support added for <image>, <text>, <rating>, and <video> theme elements. 2.5.2 BUGFIX: Fix screensaver not triggering when using PowerSaver BUGFIX: Various bugfixes and enhancements for PowerSaver. 2.5.1 BUGFIX: Fixed default font sizes when running in vertical orientation. 2.5.0 NEW FEATURE: Added option to hide *nix hidden files. NEW FEATURE: Implemented Power Saver feature. 2.4.1 BUGFIX: Fixed bug with random game selection. 2.4.0 NEW FEATURE: Game Collections: Currently supports "All", "Favorites" and "Last Played" systems. BUGFIX: Moved slider menu items back to the top of menu to work around bug affecting some users. ENHANCEMENT: Fix for lack of zoom transition on video view for systems without marquees. NEW FEATURE: Variable support for themes. Themes can now define and reference variables. (docs) Themes can now define a default theme that will be used for any systems that the theme does not explicitly support. (tutorial) Additional Theme options available for logoText element on System and Gamelist views. ENHANCEMENT: Carousel sliding transition can now be disabled. ENHANCEMENT: Returned 'JUMP TO LETTER' option back to top of menu. 2.3.2 BUGFIX: Fixed gamelist sizing by using max of computed size vs set size 2.3.1 BUGFIX: Fixed show snapshot on delay option for video element. BUGFIX: Fixed default color for rating component 2.3.0 NEW FEATURE: Adding Random Video Screensaver/Attract Mode ENHANCEMENT: Make color themable for ratings like image component. BUGFIX: Game names are no longer cut off in gamelist when using horizontalMargin option. BUGFIX: Selector bar now lines up properly when using lineSpacing option. ENHANCEMENT: Added additional theme options for gamelist to provide better control over rendering of the selector bar. ENHANCEMENT: Fixes for USB sound cards Ability to change device used for Volume control (PCM/Speaker/Master) only on Pi. Ability to change Audio device used for OMX player (local/hdmi/both/ALSA:HW:0,0/ALSA:HW:1,0) 2.2.1 BUGFIX: Fixed broken zoom launch transition. 2.2.0 NEW FEATURE: Added Instant transition. NEW FEATURE: Allow configuring the "hotkey enable" button ENHANCEMENT: Help Component now maintains styling from theme when in menus. BUGFIX: Prevent views from overflow onto an adjacent view. use clip rects to prevent views overflow onto other views ENHANCEMENT: Scaper is no longer blocks UI rendering and properly shows the busy animation. BUGFIX: Fixed image stretch in video component. ENHANCEMENT: Adding OMX Player option on RPI for improved video rendering. BUGFIX: Fixed Game Count display in System View when system is filtered. BUGFIX: Fixed default z-index values for metadata fields on detail view. ENHANCEMENT: Added new platforms to scraper 2.1.9 ENHANCEMENT: Scrapper improvements. Added FDS to scraper. Added support to search for specific game id using id:### ENHANCEMENT: Slide transition will slide vertically for vertical carousel. ENCHANCEMENT: Added sorting options for the number of players, release date, genre, developer and publisher. ENHANCEMENT: Switch to new splashscreen with black background NEW FEATURE: z-index support allow themes to specify drawing order (docs) BUGFIX: Changes to mitigate white flashes in heavier themes BUGFIX: Fixed Scrapping PSP games. 2.1.8 ENCHANCEMENT: Added menu option to explicitly choose the Gamelist type. NEW FEATURE: Added ability to filter gamelists by genre, players, ratings and publisher/developer. 2.1.7 BUGFIX: Fix black boxes appearing on gamelist after scrolling NEW FEATURE: Added Go-to Random Game feature. ENHANCEMENT: Added support for additional metadata fields on folders. BUGFIX: Fixed bug where carousel theme fails to load under certain conditions. 2.1.6 BUGFIX: Fix image ratio for first image in video game list view. NEW FEATURE: Added ability to theme the system carousel 2.1.5 (RetroPie 4.2) ENHANCEMENT: Fix initial text positioning and improve keyboard handling in TextEditComponent ENHANCEMENT: Added maxSize support for videos. ENHANCEMENT: Video view will no longer activate if the current theme does not support it. BUGFIX: Fix for Neo Geo games not being scraped. 2.1.4 BUGFIX: Fix WSOD by loading textures on demand in a separate thread when a user configurable texture memory threshold is reached. 2.1.3 NEW FEATURE: Added ability to disable the splashscreen. 2.1.2 ENHANCEMENT: Improve Shutdown time by only writing changes to gamelist.xml. 2.1.1 BUGFIX: Fix crash when saving metadata. 2.1.0 NEW FEATURE: Added video view to allow video preview of games in gamelist
Diffstat (limited to 'emulators')
-rw-r--r--emulators/emulationstation/Makefile31
-rw-r--r--emulators/emulationstation/distinfo13
-rw-r--r--emulators/emulationstation/options.mk8
-rw-r--r--emulators/emulationstation/patches/patch-CMakeLists.txt12
-rw-r--r--emulators/emulationstation/patches/patch-es-app_src_ScraperCmdLine.cpp20
-rw-r--r--emulators/emulationstation/patches/patch-external_CMakeLists.txt11
6 files changed, 60 insertions, 35 deletions
diff --git a/emulators/emulationstation/Makefile b/emulators/emulationstation/Makefile
index a670bc8b338..26311b1f0b8 100644
--- a/emulators/emulationstation/Makefile
+++ b/emulators/emulationstation/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.20 2019/08/22 12:23:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2019/09/08 12:34:38 nia Exp $
-DISTNAME= abba19584636c28cd98e3810e857f493cb63d06c
-PKGNAME= emulationstation-2.0.0_rc1_20150210
-PKGREVISION= 14
+DISTNAME= emulationstation-2.7.6
CATEGORIES= emulators games
-MASTER_SITES= https://github.com/Aloshi/EmulationStation/archive/
-EXTRACT_SUFX= .zip
+MASTER_SITES= ${MASTER_SITE_GITHUB:=RetroPie/}
+GITHUB_PROJECT= EmulationStation
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.emulationstation.org/
+HOMEPAGE= https://github.com/RetroPie/EmulationStation
COMMENT= Themeable multi-system emulator frontend
-
LICENSE= mit
+EXTRACT_USING= bsdtar
USE_CMAKE= yes
+USE_TOOLS+= pkg-config
USE_LANGUAGES+= c c++11
GCC_REQD+= 4.7 # C++11
-WRKSRC= ${WRKDIR}/EmulationStation-${DISTNAME}
+WRKSRC= ${WRKDIR}/EmulationStation-${PKGVERSION_NOREV}
INSTALLATION_DIRS= bin share/doc/emulationstation
@@ -48,6 +48,12 @@ SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX};g'
.include "options.mk"
+post-configure:
+ cd ${BUILDLINK_DIR} && ${MKDIR} -p include/pugixml/src
+ cd ${BUILDLINK_DIR} && ${CP} include/pugixml.hpp include/pugixml/src/pugixml.hpp
+
+# Deal with emulationstation's expectations for the location of the
+# pugixml header.
post-install:
${INSTALL_DATA} ${WRKSRC}/GAMELISTS.md ${WRKSRC}/README.md \
${WRKSRC}/SYSTEMS.md ${WRKSRC}/THEMES.md \
@@ -57,10 +63,9 @@ post-install:
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../graphics/freeimage/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../math/eigen3/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../multimedia/vlc/buildlink3.mk"
+.include "../../textproc/pugixml/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/emulationstation/distinfo b/emulators/emulationstation/distinfo
index ef85535a9e5..3dfa6f9a415 100644
--- a/emulators/emulationstation/distinfo
+++ b/emulators/emulationstation/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 20:30:57 agc Exp $
+$NetBSD: distinfo,v 1.5 2019/09/08 12:34:38 nia Exp $
-SHA1 (abba19584636c28cd98e3810e857f493cb63d06c.zip) = cdfef679f7b428a7cd4986e7b0f8e47965186130
-RMD160 (abba19584636c28cd98e3810e857f493cb63d06c.zip) = b70ad1a8e826c959b58eba36e73df9932104b139
-SHA512 (abba19584636c28cd98e3810e857f493cb63d06c.zip) = 32ad80836dbcaa5940687067193a85d752a5b573ea85e077881bae17bb24b5a059b64c6728b01a8410e0b72481eba5b03ddaf197fe3dae733df219a93e0f889c
-Size (abba19584636c28cd98e3810e857f493cb63d06c.zip) = 1183630 bytes
-SHA1 (patch-CMakeLists.txt) = 9b8d3f1b774e4bc35bac281f1723670707eb2435
+SHA1 (emulationstation-2.7.6.tar.gz) = d340b3092be0f041f850596f0959e45125ddfe68
+RMD160 (emulationstation-2.7.6.tar.gz) = 0ca33e9028a8d4ccd7bb2f330ae033385884eaa4
+SHA512 (emulationstation-2.7.6.tar.gz) = 9df1573d172b8a77a478283fad040d4ed535ba5ca90cf1d215e2d2eb0d258247e57c732a99034dc58d4b12afba2892d34f9f6c36c47a1b155b6328d4246e7cd9
+Size (emulationstation-2.7.6.tar.gz) = 1048857 bytes
+SHA1 (patch-es-app_src_ScraperCmdLine.cpp) = cdb2ccc0a1cff45e407b3608c9c95b9aae7b3366
SHA1 (patch-es-app_src_components_TextListComponent.h) = 63c33ad1f48a0654c881fc41455b22e3a8dc4c94
SHA1 (patch-es-core_src_components_ImageGridComponent.h) = f53ffe1528a351e58d99cfe76791c1ba4ab27b18
+SHA1 (patch-external_CMakeLists.txt) = d08cb2eecb59242ef1252338c6a79d6716ece8b1
diff --git a/emulators/emulationstation/options.mk b/emulators/emulationstation/options.mk
index bed31dab487..bf5303bded1 100644
--- a/emulators/emulationstation/options.mk
+++ b/emulators/emulationstation/options.mk
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.1 2015/02/13 19:47:51 jmcneill Exp $
+# $NetBSD: options.mk,v 1.2 2019/09/08 12:34:38 nia Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.emulationstation
+PKG_OPTIONS_VAR= PKG_OPTIONS.emulationstation
PKG_OPTIONS_REQUIRED_GROUPS= graphics
PKG_OPTIONS_GROUP.graphics= opengl
@@ -8,9 +8,9 @@ PKG_OPTIONS_GROUP.graphics= opengl
.if !empty(MACHINE_ARCH:M*arm*)
PKG_OPTIONS_GROUP.graphics+= rpi
-PKG_SUGGESTED_OPTIONS+= rpi
+PKG_SUGGESTED_OPTIONS+= rpi
.else
-PKG_SUGGESTED_OPTIONS+= opengl
+PKG_SUGGESTED_OPTIONS+= opengl
.endif
.include "../../mk/bsd.options.mk"
diff --git a/emulators/emulationstation/patches/patch-CMakeLists.txt b/emulators/emulationstation/patches/patch-CMakeLists.txt
deleted file mode 100644
index 1c5c87450c2..00000000000
--- a/emulators/emulationstation/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/02/13 19:47:51 jmcneill Exp $
-
---- CMakeLists.txt.orig 2015-02-13 13:16:56.000000000 +0000
-+++ CMakeLists.txt
-@@ -163,6 +163,7 @@ if(DEFINED BCMHOST)
- LIST(APPEND COMMON_LIBRARIES
- bcm_host
- EGL
-+ GLESv2
- ${OPENGLES_LIBRARIES}
- )
- else()
diff --git a/emulators/emulationstation/patches/patch-es-app_src_ScraperCmdLine.cpp b/emulators/emulationstation/patches/patch-es-app_src_ScraperCmdLine.cpp
new file mode 100644
index 00000000000..db68313c126
--- /dev/null
+++ b/emulators/emulationstation/patches/patch-es-app_src_ScraperCmdLine.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-es-app_src_ScraperCmdLine.cpp,v 1.1 2019/09/08 12:34:38 nia Exp $
+
+Support non-Linux unixes.
+
+--- es-app/src/ScraperCmdLine.cpp.orig 2018-07-11 17:16:47.000000000 +0000
++++ es-app/src/ScraperCmdLine.cpp
+@@ -5,10 +5,10 @@
+ #include "SystemData.h"
+ #include <iostream>
+ #include <signal.h>
+-#if defined(__linux__)
+-#include <unistd.h>
+-#elif defined(WIN32)
++#ifdef WIN32
+ #include <Windows.h>
++#else
++#include <unistd.h>
+ #endif
+
+ std::ostream& out = std::cout;
diff --git a/emulators/emulationstation/patches/patch-external_CMakeLists.txt b/emulators/emulationstation/patches/patch-external_CMakeLists.txt
new file mode 100644
index 00000000000..89d08e3b2c4
--- /dev/null
+++ b/emulators/emulationstation/patches/patch-external_CMakeLists.txt
@@ -0,0 +1,11 @@
+$NetBSD: patch-external_CMakeLists.txt,v 1.1 2019/09/08 12:34:38 nia Exp $
+
+Using pugixml from pkgsrc.
+
+--- external/CMakeLists.txt.orig 2018-07-11 17:16:47.000000000 +0000
++++ external/CMakeLists.txt
+@@ -2,4 +2,3 @@
+ # package managers are included with the project (in the 'external' folder)
+
+ add_subdirectory("nanosvg")
+-add_subdirectory("pugixml")