Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] fceux: update to 2.3.0.
@ 2021-01-03 20:41 CameronNemo
  2021-01-03 20:54 ` ericonr
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: CameronNemo @ 2021-01-03 20:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 471 bytes --]

There is a new pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages fceux
https://github.com/void-linux/void-packages/pull/27646

fceux: update to 2.3.0.
This switches the GUI from GTK3 to Qt.
GTK3 is still available, but did not work fully in my testing.
Qt is the default and recommended GUI, and it worked.

A patch file from https://github.com/void-linux/void-packages/pull/27646.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fceux-27646.patch --]
[-- Type: text/x-diff, Size: 7320 bytes --]

From f9e328377253fbd03f4834e71655f9efeeae1e73 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Jan 2021 17:38:38 -0800
Subject: [PATCH] fceux: update to 2.3.0.

This switches the GUI from GTK3 to Qt.
GTK3 is still available, but did not work fully in my testing.
Qt is the default and recommended GUI, and it worked.
---
 srcpkgs/fceux/patches/fix-cross-compile.patch |  10 --
 srcpkgs/fceux/patches/scons-python-3.patch    | 111 ------------------
 srcpkgs/fceux/template                        |  30 ++---
 3 files changed, 9 insertions(+), 142 deletions(-)
 delete mode 100644 srcpkgs/fceux/patches/fix-cross-compile.patch
 delete mode 100644 srcpkgs/fceux/patches/scons-python-3.patch

diff --git a/srcpkgs/fceux/patches/fix-cross-compile.patch b/srcpkgs/fceux/patches/fix-cross-compile.patch
deleted file mode 100644
index a4caee5bb7a..00000000000
--- a/srcpkgs/fceux/patches/fix-cross-compile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- SConstruct.orig
-+++ SConstruct
-@@ -34,6 +34,7 @@
- 
- prefix = GetOption('prefix')
- env = Environment(options = opts)
-+env.Append(ENV = {'PATH' : os.environ['PATH']})
- 
- if env['RELEASE']:
-   env.Append(CPPDEFINES=["PUBLIC_RELEASE"])
diff --git a/srcpkgs/fceux/patches/scons-python-3.patch b/srcpkgs/fceux/patches/scons-python-3.patch
deleted file mode 100644
index b4805e93309..00000000000
--- a/srcpkgs/fceux/patches/scons-python-3.patch
+++ /dev/null
@@ -1,111 +0,0 @@
- backported from 878245fe Altered SCons build scripts to work with Python 3.
-diff --git SConstruct SConstruct
---- SConstruct
-+++ SConstruct
-@@ -47,30 +47,30 @@ if platform.system == "ppc":
- # Default compiler flags:
- env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare'])
- 
--if os.environ.has_key('PLATFORM'):
-+if 'PLATFORM' in os.environ:
-   env.Replace(PLATFORM = os.environ['PLATFORM'])
--if os.environ.has_key('CC'):
-+if 'CC' in os.environ:
-   env.Replace(CC = os.environ['CC'])
--if os.environ.has_key('CXX'):
-+if 'CXX' in os.environ:
-   env.Replace(CXX = os.environ['CXX'])
--if os.environ.has_key('WINDRES'):
-+if 'WINDRES' in os.environ:
-   env.Replace(WINDRES = os.environ['WINDRES'])
--if os.environ.has_key('CFLAGS'):
-+if 'CFLAGS' in os.environ:
-   env.Append(CCFLAGS = os.environ['CFLAGS'].split())
--if os.environ.has_key('CXXFLAGS'):
-+if 'CXXFLAGS' in os.environ:
-   env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split())
--if os.environ.has_key('CPPFLAGS'):
-+if 'CPPFLAGS' in os.environ:
-   env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split())
--if os.environ.has_key('LDFLAGS'):
-+if 'LDFLAGS' in os.environ:
-   env.Append(LINKFLAGS = os.environ['LDFLAGS'].split())
--if os.environ.has_key('PKG_CONFIG_PATH'):
-+if 'PKG_CONFIG_PATH' in os.environ:
-   env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
--if not os.environ.has_key('PKG_CONFIG_PATH') and env['PLATFORM'] == 'darwin':
-+if 'PKG_CONFIG_PATH' not in os.environ and env['PLATFORM'] == 'darwin':
-   env['ENV']['PKG_CONFIG_PATH'] = "/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig"
--if os.environ.has_key('PKG_CONFIG_LIBDIR'):
-+if 'PKG_CONFIG_LIBDIR' in os.environ:
-   env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR']
- 
--print "platform: ", env['PLATFORM']
-+print("platform: ", env['PLATFORM'])
- 
- # compile with clang
- if env['CLANG']:
-@@ -104,18 +104,18 @@ else:
-     assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
-   if env['SDL2']:
-     if not conf.CheckLib('SDL2'):
--      print 'Did not find libSDL2 or SDL2.lib, exiting!'
-+      print('Did not find libSDL2 or SDL2.lib, exiting!')
-       Exit(1)
-     env.Append(CPPDEFINES=["_SDL2"])
-     env.ParseConfig('pkg-config sdl2 --cflags --libs')
-   else:
-     if not conf.CheckLib('SDL'):
--      print 'Did not find libSDL or SDL.lib, exiting!'
-+      print('Did not find libSDL or SDL.lib, exiting!')
-       Exit(1)
-     env.ParseConfig('sdl-config --cflags --libs')
-   if env['GTK']:
-     if not conf.CheckLib('gtk-x11-2.0'):
--      print 'Could not find libgtk-2.0, exiting!'
-+      print('Could not find libgtk-2.0, exiting!')
-       Exit(1)
-     # Add compiler and linker flags from pkg-config
-     config_string = 'pkg-config --cflags --libs gtk+-2.0'
-@@ -154,7 +154,7 @@ else:
-         env.Append(CCFLAGS = ["-I/usr/include/lua"])
-         lua_available = True
-       if lua_available == False:
--        print 'Could not find liblua, exiting!'
-+        print ('Could not find liblua, exiting!')
-         Exit(1)
-     else:
-       env.Append(CCFLAGS = ["-Isrc/lua/src"])
-@@ -168,7 +168,7 @@ else:
-     gd = conf.CheckLib('gd', autoadd=1)
-     if gd == 0:
-       env['LOGO'] = 0
--      print 'Did not find libgd, you won\'t be able to create a logo screen for your avis.'
-+      print('Did not find libgd, you won\'t be able to create a logo screen for your avis.')
-    
-   if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c', autoadd=1):
-     conf.env.Append(CCFLAGS = "-DOPENGL")
-@@ -182,8 +182,8 @@ if sys.byteorder == 'little' or env['PLATFORM'] == 'win32':
- if env['FRAMESKIP']:
-   env.Append(CPPDEFINES = ['FRAMESKIP'])
- 
--print "base CPPDEFINES:",env['CPPDEFINES']
--print "base CCFLAGS:",env['CCFLAGS']
-+print("base CPPDEFINES:",env['CPPDEFINES'])
-+print("base CCFLAGS:",env['CCFLAGS'])
- 
- if env['DEBUG']:
-   env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0'])
-diff --git src/SConscript src/SConscript
-index 4713e15..2001146 100644
---- src/SConscript
-+++ src/SConscript
-@@ -33,7 +33,7 @@ else:
-   platform_files = SConscript('drivers/sdl/SConscript')
- file_list.append(platform_files)
- 
--print env['LINKFLAGS']
-+print(env['LINKFLAGS'])
- 
- if env['PLATFORM'] == 'win32':
-   fceux = env.Program('fceux.exe', file_list)
diff --git a/srcpkgs/fceux/template b/srcpkgs/fceux/template
index bb96ffd5ced..5ecaa9c7e08 100644
--- a/srcpkgs/fceux/template
+++ b/srcpkgs/fceux/template
@@ -1,26 +1,14 @@
 # Template file for 'fceux'
 pkgname=fceux
-version=2.2.3
-revision=4
-build_style=scons
-make_build_args="SYSTEM_LUA=1 RELEASE=1 GTK=0 GTK3=1"
-hostmakedepends="pkg-config"
-makedepends="zlib-devel lua51-devel SDL-devel gtk+3-devel gd-devel glu-devel"
+version=2.3.0
+revision=1
+wrksrc="fceux-fceux-$version"
+build_style=cmake
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
+makedepends="zlib-devel lua51-devel SDL2-devel qt5-devel minizip-devel"
 short_desc="All in one NES/Famicom Emulator"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.fceux.com/"
-distfiles="${SOURCEFORGE_SITE}/fceultra/Source%20Code/${version}%20src/${pkgname}-${version}.src.tar.gz"
-checksum=4be6dda9a347f941809a3c4a90d21815b502384adfdd596adaa7b2daf088823e
-
-export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
-export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
-
-pre_build() {
-	CPPFLAGS+=" $($PKG_CONFIG --cflags lua)"
-}
-
-do_install() {
-	CPPFLAGS+=" $($PKG_CONFIG --cflags lua)"
-	scons --prefix=${DESTDIR}/usr $make_build_args install
-}
+homepage="https://fceux.com/web/home.html"
+distfiles="https://github.com/TASVideos/fceux/archive/fceux-${version}.tar.gz"
+checksum=0d3b02b3f15032f7675acb95423fd81fae286615313dfbc58cdd4de2bce17f6e

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-15  4:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-03 20:41 [PR PATCH] fceux: update to 2.3.0 CameronNemo
2021-01-03 20:54 ` ericonr
2021-01-03 21:09 ` ericonr
2021-01-05  2:36 ` ericonr
2021-02-15  4:37 ` [PR PATCH] [Closed]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).