jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

EmulationStation: update to 2.7.1.

Browse source
This commit is contained in:
Nick Hahn 2018-07-06 17:06:40 +02:00 committed by Enno Boland
parent 4998a52821
commit dfb79a28b9
3 changed files with 13 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
srcpkgs/EmulationStation/patches/fix-gcc6-round.patch
View file

@ -1,13 +0,0 @@
Explicit cast to float to avoid ambiguity.
--- es-core/src/components/HelpComponent.cpp 2016-03-13 20:31:00.000000000 +0100
+++ es-core/src/components/HelpComponent.cpp 2016-09-15 10:28:21.700078076 +0200
@@ -71,7 +71,7 @@
std::vector< std::shared_ptr<TextComponent> > labels;
float width = 0;
- const float height = round(font->getLetterHeight() * 1.25f);
+ const float height = round(static_cast<float>(font->getLetterHeight() * 1.25f));
for(auto it = mPrompts.begin(); it != mPrompts.end(); it++)
{
auto icon = std::make_shared<ImageComponent>(mWindow);

32
srcpkgs/EmulationStation/patches/fix-msc_check.patch
View file

@ -1,32 +0,0 @@
Also needs to check if _MSC_VER is defined at all.
--- es-core/src/Util.h 2016-03-13 20:31:00.000000000 +0100
+++ es-core/src/Util.h 2016-09-15 10:33:18.964427356 +0200
@@ -15,7 +15,7 @@
Eigen::Vector3f roundVector(const Eigen::Vector3f& vec);
Eigen::Vector2f roundVector(const Eigen::Vector2f& vec);
-#if _MSC_VER < 1800
+#if defined(_MSC_VER) && (_MSC_VER < 1800)
float round(float num);
#endif /* _MSC_VER */
--- es-core/src/Util.cpp 2016-03-13 20:31:00.000000000 +0100
+++ es-core/src/Util.cpp 2016-09-15 10:36:10.972624004 +0200
@@ -32,14 +32,14 @@
}
-#if _MSC_VER < 1800
+#if defined(_MSC_VER) && (_MSC_VER < 1800)
float round(float num)
{
return (float)((int)(num + 0.5f));
}
#endif
-#if _MSC_VER >= 1700
+#if defined(_MSC_VER) && (_MSC_VER >= 1700)
FILE iob[] = {*stdin, *stdout, *stderr };
FILE * __iob_func(void)
{

22
srcpkgs/EmulationStation/template
View file

@ -1,18 +1,22 @@
# Template file for 'EmulationStation'
pkgname=EmulationStation
version=2.0.1a
revision=5
_githash=93f6e11c95f9e7a0c00d3a70c744b22d9a931127
version=2.7.1
revision=1
build_style=cmake
hostmakedepends="pkg-config git"
makedepends="libcurl-devel MesaLib-devel freetype-devel freeimage-devel
SDL2-devel eigen boost-devel"
short_desc="A flexible emulator front-end"
SDL2-devel eigen boost-devel vlc-devel"
short_desc="Flexible emulator front-end"
maintainer="Enno Boland <gottox@voidlinux.eu>"
license="MIT"
homepage="https://github.com/Herdinger/EmulationStation"
distfiles="https://github.com/Herdinger/EmulationStation/archive/$_githash.tar.gz"
checksum=e144e06fdd64522c67f35b882eb0d8c5ab455075d9d3b4cd13e2c6f7764c7e38
wrksrc=EmulationStation-$_githash
homepage="https://github.com/RetroPie/EmulationStation"
distfiles="https://github.com/RetroPie/EmulationStation/archive/v$version.tar.gz"
checksum=07415511cc5abf36ba2e35d97bd2f651947040bcc8af9cffc491724a19afb214
pre_configure() {
rm -rf external/pugixml
git clone https://github.com/zeux/pugixml.git external/pugixml
}
post_install() {
vlicense LICENSE.md