[chromium-vaapi] Add third_party/unrar
by hellbanger
commit 61d5af560dcd93da1f6304ec705a39ab19793480
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Sat Aug 10 19:01:27 2019 +0530
Add third_party/unrar
chromium-vaapi.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index ed40e6c..42db47a 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -430,6 +430,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/SPIRV-Tools \
third_party/sqlite \
third_party/tcmalloc \
+ third_party/unrar \
third_party/usb_ids \
third_party/usrsctp \
third_party/vulkan \
5 years, 3 months
[chromium-vaapi] Use unrar, it is free software and license permits to be freely distributable
by hellbanger
commit 9475c8a26c6a7bec01d6ee775a151a861d42837f
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Sat Aug 10 19:00:08 2019 +0530
Use unrar, it is free software and license permits to be freely distributable
chromium-vaapi.spec | 3 -
fixunrarwrapper.patch | 152 --------------------------------------------------
2 files changed, 155 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index c3d5d09..ed40e6c 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -184,8 +184,6 @@ Patch1: enable-vaapi.patch
Patch2: widevine.patch
Patch3: Do-not-use-VPP-on-Linux-Add-some-info-logs-and-fix-v.patch
Patch4: chromium-skia-harmony.patch
-#Fix unrar wrapper: https://bugs.chromium.org/p/chromium/issues/detail?id=884521
-Patch5: fixunrarwrapper.patch
# Bootstrap still uses python command
Patch51: py2-bootstrap.patch
# Fix building with system icu
@@ -226,7 +224,6 @@ chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
%patch2 -p1 -b .widevine
%patch3 -p1 -b .fixvaapi
%patch4 -p0 -b .skia
-%patch5 -p1 -b .unrarwrap
%patch51 -p1 -b .py2boot
%if %{with system_libicu}
%patch52 -p1 -b .icu
5 years, 3 months
[chromium-vaapi] Remove the no unrar patch
by hellbanger
commit b0a2aed5cb3ac028a3dfa1ea016a829cd3905212
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Sat Aug 10 18:34:34 2019 +0530
Remove the no unrar patch
chromium-vaapi.spec | 2 -
nounrar.patch | 152 ----------------------------------------------------
2 files changed, 154 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index b20a452..c3d5d09 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -186,7 +186,6 @@ Patch3: Do-not-use-VPP-on-Linux-Add-some-info-logs-and-fix-v.patch
Patch4: chromium-skia-harmony.patch
#Fix unrar wrapper: https://bugs.chromium.org/p/chromium/issues/detail?id=884521
Patch5: fixunrarwrapper.patch
-Patch50: nounrar.patch
# Bootstrap still uses python command
Patch51: py2-bootstrap.patch
# Fix building with system icu
@@ -228,7 +227,6 @@ chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
%patch3 -p1 -b .fixvaapi
%patch4 -p0 -b .skia
%patch5 -p1 -b .unrarwrap
-%patch50 -p1 -b .nounrar
%patch51 -p1 -b .py2boot
%if %{with system_libicu}
%patch52 -p1 -b .icu
5 years, 3 months
[plus4emu] Fixed building with python3 scons (BZ #5344) Used %set_build_flags macro Removed desktop scriptlets
by Andrea Musuruane
commit d63c95a13fb62a3724915c1afc586e278ac6a361
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Aug 10 14:06:46 2019 +0200
Fixed building with python3 scons (BZ #5344)
Used %set_build_flags macro
Removed desktop scriptlets
plus4emu-1.2.10.1-scons-python3.patch | 70 +++++++++++++++++++++++++++++++++++
plus4emu.spec | 38 +++++++------------
2 files changed, 84 insertions(+), 24 deletions(-)
---
diff --git a/plus4emu-1.2.10.1-scons-python3.patch b/plus4emu-1.2.10.1-scons-python3.patch
new file mode 100644
index 0000000..d78c672
--- /dev/null
+++ b/plus4emu-1.2.10.1-scons-python3.patch
@@ -0,0 +1,70 @@
+--- plus4emu-1.2.10.1.orig/SConstruct 2017-02-22 12:47:43.000000000 +0100
++++ plus4emu-1.2.10.1/SConstruct 2019-08-10 13:40:56.829682387 +0200
+@@ -77,17 +77,17 @@
+ if not disablePkgConfig:
+ for s in packageConfigs[pkgName][1]:
+ if not s:
+- print 'Checking for package ' + pkgName + '...',
++ print('Checking for package ' + pkgName + '...', end = '')
+ # hack to work around fltk-config adding unwanted compiler flags
+ savedCFlags = env['CCFLAGS']
+ savedCXXFlags = env['CXXFLAGS']
+ else:
+- print 'Checking for package ' + s + '...',
++ print('Checking for package ' + s + '...', end = '')
+ s = ' ' + s
+ try:
+ if not env.ParseConfig(packageConfigs[pkgName][0] + s):
+ raise Exception()
+- print 'yes'
++ print('yes')
+ if not s:
+ env['CCFLAGS'] = savedCFlags
+ env['CXXFLAGS'] = savedCXXFlags
+@@ -95,7 +95,7 @@
+ env['CPPDEFINES'].remove(['_FORTIFY_SOURCE', '2'])
+ return 1
+ except:
+- print 'no'
++ print('no')
+ continue
+ pkgFound = 0
+ else:
+@@ -110,9 +110,9 @@
+ packageConfigs[pkgName][2 + int(bool(mingwCrossCompile))])
+ if not pkgFound:
+ if not packageConfigs[pkgName][6]:
+- print ' *** error configuring ' + pkgName
++ print(' *** error configuring ' + pkgName)
+ Exit(-1)
+- print 'WARNING: package ' + pkgName + ' not found'
++ print('WARNING: package ' + pkgName + ' not found')
+ return 0
+ return 1
+
+@@ -218,14 +218,14 @@
+ if not configure.CheckType('PFNGLCOMPILESHADERPROC',
+ '#include <GL/gl.h>\n'
+ + '#include <GL/glext.h>'):
+- print 'WARNING: disabling GL shader support'
++ print('WARNING: disabling GL shader support')
+ enableGLShaders = 0
+ configure.Finish()
+ if sys.platform[:5] == 'linux' and not mingwCrossCompile:
+ plus4emuGUIEnvironment.Append(LIBS = ['X11'])
+ plus4emuGLGUIEnvironment.Append(LIBS = ['GL', 'X11'])
+ if disableOpenGL:
+- print 'WARNING: OpenGL is not found, only software video will be supported'
++ print('WARNING: OpenGL is not found, only software video will be supported')
+ enableGLShaders = 0
+ plus4emuGLGUIEnvironment = plus4emuGUIEnvironment.Clone()
+ plus4emuGLGUIEnvironment.Append(CCFLAGS = ['-DDISABLE_OPENGL_DISPLAY'])
+@@ -264,7 +264,7 @@
+ havePortAudioV19 = 1
+ else:
+ havePortAudioV19 = 0
+- print 'WARNING: using old v18 PortAudio interface'
++ print('WARNING: using old v18 PortAudio interface')
+ fltkVersion13 = 0
+ if configure.CheckCXXHeader('FL/Fl_Cairo.H'):
+ fltkVersion13 = 1
diff --git a/plus4emu.spec b/plus4emu.spec
index d4be5e1..263c54f 100644
--- a/plus4emu.spec
+++ b/plus4emu.spec
@@ -1,6 +1,6 @@
Name: plus4emu
Version: 1.2.10.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Portable emulator of the Commodore 264 family of computers
License: GPLv2+
URL: https://github.com/istvan-v/plus4emu
@@ -8,15 +8,17 @@ Source0: https://github.com/istvan-v/plus4emu/archive/%{version}.tar.gz#/
Source1: README_%{name}.Fedora
Source2: p4fliconv.desktop
Source3: p4makecfg.desktop
-Patch0: %{name}-1.2.10-SConstruct.patch
-Patch1: %{name}-1.2.5-fixpathissue.patch
+Patch0: %{name}-1.2.10.1-scons-python3.patch
+Patch1: %{name}-1.2.10-SConstruct.patch
+Patch2: %{name}-1.2.5-fixpathissue.patch
+
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: fltk-fluid
BuildRequires: libsndfile-devel
BuildRequires: lua-devel
BuildRequires: portaudio-devel
-BuildRequires: python2-scons
+BuildRequires: scons
BuildRequires: SDL-devel
BuildRequires: libXcursor-devel
BuildRequires: libXinerama-devel
@@ -29,9 +31,7 @@ quality hardware emulation.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
# Remove fltk_jpeg, fltk_png, and fltk_z libraries from SConstruct
sed -i 's/ -lfltk_jpeg//' SConstruct
@@ -46,9 +46,9 @@ sed -i 's|installDirectory + "roms"|"%{_datadir}/%{name}/roms"|' installer/makec
%build
-export CXXFLAGS="%{optflags}"
+%set_build_flags
# Use nopkgconfig=1 to disable package checking because it fails on Fedora
-scons-2 %{?_smp_mflags} \
+scons %{?_smp_mflags} \
VERBOSE=1 \
nopkgconfig=1 \
debug=1
@@ -79,21 +79,6 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/roms
install -pm0644 roms/* %{buildroot}%{_datadir}/%{name}/roms
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
%files
%{_bindir}/*
%{_datadir}/%{name}
@@ -106,6 +91,11 @@ fi
%changelog
+* Sat Aug 10 2019 Andrea Musuruane <musuruan(a)gmail.com> - 1.2.10.1-9
+- Fixed building with python3 scons (BZ #5344)
+- Used %%set_build_flags macro
+- Removed desktop scriptlets
+
* Sat Aug 10 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.10.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
5 years, 3 months
[kodi-pvr-filmon] Upload missing source
by Leigh Scott
commit 300dfe075d96138636b0d048e6d08f8dd8589da9
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Aug 10 12:37:31 2019 +0100
Upload missing source
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index 4aa88fa..475c6fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/kodi-pvr-filmon-ab9b519.tar.gz
/kodi-pvr-filmon-eba5bc5.tar.gz
/pvr.filmon-c7243fb.tar.gz
+/pvr.filmon-93ae10d.tar.gz
diff --git a/sources b/sources
index 515f342..f486746 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5223706cee73288de24a15a30d4c941 pvr.filmon-c7243fb.tar.gz
+c110d1a289fde6258957bb3a93d5e951 pvr.filmon-93ae10d.tar.gz
5 years, 3 months
[Cg] Remove old conditional, Groups tags and clean up
by Leigh Scott
commit 47010d694ba287a57def015f3085f3575c3c55b8
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Aug 10 12:34:44 2019 +0100
Remove old conditional, Groups tags and clean up
Cg.spec | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/Cg.spec b/Cg.spec
index e628927..3ac9123 100644
--- a/Cg.spec
+++ b/Cg.spec
@@ -18,19 +18,13 @@ Name: Cg
Version: %{maj_version}.%{min_version}
Release: 12%{?dist}
URL: http://developer.nvidia.com/object/cg_toolkit.html
-Group: Development/Languages
Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/Cg-%{maj_versio...
Source1: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/Cg-%{maj_versio...
License: Redistributable, no modification permitted and MIT
-%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+
ExclusiveArch: i686 x86_64
-%else 0%{?fedora} == 11
-ExclusiveArch: i586 x86_64
-%else
-ExclusiveArch: i386 x86_64
-%endif
+
Requires: lib%{name}(%{_target_cpu}) = %{version}-%{release}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-c++
BuildRequires: freeglut-devel
@@ -53,14 +47,12 @@ This is the %{date} release
%package docs
Summary: NVIDIA Cg Toolkit documentation
-Group: Documentation
%description docs
NVIDIA Cg Toolkit documentation.
%package -n lib%{name}
Summary: NVIDIA Cg Toolkit shared support library
-Group: System Environment/Libraries
Provides: lib%{name}(%{_target_cpu}) = %{version}-%{release}
%description -n lib%{name}
@@ -109,7 +101,6 @@ done
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir},%{_mandir}}
cp -pr usr/bin/* $RPM_BUILD_ROOT%{_bindir}/
cp -pr usr/include/* $RPM_BUILD_ROOT%{_includedir}/
@@ -121,9 +112,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/cgc $RPM_BUILD_ROOT%{_bindir}/cgc-%{_lib}
touch $RPM_BUILD_ROOT%{_bindir}/cgc
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
/usr/sbin/alternatives --install %{_bindir}/cgc cgc %{_bindir}/cgc-%{_lib} %{priority} || :
@@ -137,20 +125,16 @@ fi
%postun -n libCg -p /sbin/ldconfig
%files
-%defattr(755,root,root,755)
%ghost %{_bindir}/cgc
%{_bindir}/cgc-%{_lib}
%{_bindir}/cgfxcat
%{_bindir}/cginfo
-%defattr(644,root,root,755)
%{_includedir}/Cg/
%files docs
-%defattr(644,root,root,755)
%doc usr/local/Cg/docs usr/local/Cg/examples
%files -n libCg
-%defattr(755,root,root,755)
%{_libdir}/*.so
5 years, 3 months
[telegram-desktop/f29] Updated to version 1.8.1.
by Vitaly Zaitsev
commit c844a3dc9880ec26332c4a014e4ba19916a1e57b
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sat Aug 10 12:19:41 2019 +0200
Updated to version 1.8.1.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 2 +-
telegram-desktop-system-fonts.patch | 2 +-
telegram-desktop-unbundle-minizip.patch | 2 +-
telegram-desktop.spec | 5 ++++-
6 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2213858..638912a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,3 +96,4 @@
/crl-52baf11.tar.gz
/rlottie-d08a03b.tar.gz
/tdesktop-1.8.0.tar.gz
+/tdesktop-1.8.1.tar.gz
diff --git a/sources b/sources
index 9c8a42f..36771d6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
744e77b69697f659a356727be22d4247 crl-52baf11.tar.gz
d81386c7ddd0453463131a4a0e6c0f22 rlottie-d08a03b.tar.gz
-2a665c09ebdd10daac7e35912bf5eb14 tdesktop-1.8.0.tar.gz
+3be79a5299ab6b03e5af6da6b15fd4e3 tdesktop-1.8.1.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index ed93641..c159f69 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 14d4699a446910051fcd63705c1752ff3ab9ba30 Mon Sep 17 00:00:00 2001
+From 04dd4ccd8a229907c3638d26d2d66dd593d3cd16 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH 1/3] Fixed build under Fedora using rpmbuild and mock.
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
index 821a308..b1749ad 100644
--- a/telegram-desktop-system-fonts.patch
+++ b/telegram-desktop-system-fonts.patch
@@ -1,4 +1,4 @@
-From 9fc6815a554be97d2923608e72852d1151ae312f Mon Sep 17 00:00:00 2001
+From 94d509c819d65ed1a87991b5ee41224f64d8ed5d Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun, 24 Jun 2018 22:59:34 +0200
Subject: [PATCH 2/3] Backported and rebased patch from Debian maintainer
diff --git a/telegram-desktop-unbundle-minizip.patch b/telegram-desktop-unbundle-minizip.patch
index 03e119d..e0fb16d 100644
--- a/telegram-desktop-unbundle-minizip.patch
+++ b/telegram-desktop-unbundle-minizip.patch
@@ -1,4 +1,4 @@
-From ec229dc5d3ee999bbcf715345fc05178c5a1c113 Mon Sep 17 00:00:00 2001
+From 71547417846aa64ddd0927775ef7fb0facad62ea Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed, 17 Oct 2018 17:57:59 +0200
Subject: [PATCH 3/3] Use packaged version of minizip on Fedora <= 29.
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 50a741a..2e9883d 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -32,7 +32,7 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.8.0
+Version: 1.8.1
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -221,6 +221,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Sat Aug 10 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.1-1
+- Updated to 1.8.1.
+
* Fri Aug 09 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.8.0-1
- Updated to 1.8.0.
5 years, 3 months
[fceux] Fixed building with python3 scons
by Andrea Musuruane
commit e544737a0f8bfb0c8781842a3faecf0efd43e709
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Aug 10 11:06:04 2019 +0200
Fixed building with python3 scons
fceux-2.2.3-scons-python3.patch | 108 ++++++++++++++++++++++++++++++++++++++++
fceux.spec | 15 ++++--
2 files changed, 119 insertions(+), 4 deletions(-)
---
diff --git a/fceux-2.2.3-scons-python3.patch b/fceux-2.2.3-scons-python3.patch
new file mode 100644
index 0000000..d3be48d
--- /dev/null
+++ b/fceux-2.2.3-scons-python3.patch
@@ -0,0 +1,108 @@
+--- fceux-2.2.3/SConstruct.orig 2019-07-26 18:04:29.368573309 +0000
++++ fceux-2.2.3/SConstruct 2019-07-26 18:04:31.975265342 +0000
+@@ -46,30 +46,30 @@
+ # Default compiler flags:
+ env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare'])
+
+-if os.environ.has_key('PLATFORM'):
++if os.environ.get('PLATFORM'):
+ env.Replace(PLATFORM = os.environ['PLATFORM'])
+-if os.environ.has_key('CC'):
++if os.environ.get('CC'):
+ env.Replace(CC = os.environ['CC'])
+-if os.environ.has_key('CXX'):
++if os.environ.get('CXX'):
+ env.Replace(CXX = os.environ['CXX'])
+-if os.environ.has_key('WINDRES'):
++if os.environ.get('WINDRES'):
+ env.Replace(WINDRES = os.environ['WINDRES'])
+-if os.environ.has_key('CFLAGS'):
++if os.environ.get('CFLAGS'):
+ env.Append(CCFLAGS = os.environ['CFLAGS'].split())
+-if os.environ.has_key('CXXFLAGS'):
++if os.environ.get('CXXFLAGS'):
+ env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split())
+-if os.environ.has_key('CPPFLAGS'):
++if os.environ.get('CPPFLAGS'):
+ env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split())
+-if os.environ.has_key('LDFLAGS'):
++if os.environ.get('LDFLAGS'):
+ env.Append(LINKFLAGS = os.environ['LDFLAGS'].split())
+-if os.environ.has_key('PKG_CONFIG_PATH'):
++if os.environ.get('PKG_CONFIG_PATH'):
+ env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
+-if not os.environ.has_key('PKG_CONFIG_PATH') and env['PLATFORM'] == 'darwin':
++if not os.environ.get('PKG_CONFIG_PATH') 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 os.environ.get('PKG_CONFIG_LIBDIR'):
+ env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR']
+
+-print "platform: ", env['PLATFORM']
++print ("platform: ", env['PLATFORM'])
+
+ # compile with clang
+ if env['CLANG']:
+@@ -103,18 +103,18 @@
+ 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'
+@@ -153,7 +153,7 @@
+ 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"])
+@@ -167,7 +167,7 @@
+ 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")
+@@ -181,8 +181,8 @@
+ 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'])
+--- fceux-2.2.3/src/SConscript.orig 2019-07-26 18:08:11.297535443 +0000
++++ fceux-2.2.3/src/SConscript 2019-07-26 18:08:33.857781956 +0000
+@@ -33,7 +33,7 @@
+ 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/fceux.spec b/fceux.spec
index 238d550..8322ba8 100644
--- a/fceux.spec
+++ b/fceux.spec
@@ -1,14 +1,17 @@
Name: fceux
Version: 2.2.3
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A cross platform, NTSC and PAL Famicom/NES emulator
License: GPLv2+
URL: http://fceux.com/
Source: http://downloads.sourceforge.net/fceultra/%{name}-%{version}.src.tar.gz
+# Fix building with python3 scons
+# Patch from ArchLinux
+Patch0: %{name}-2.2.3-scons-python3.patch
BuildRequires: gcc-c++
-BuildRequires: python2-scons
+BuildRequires: scons
BuildRequires: SDL-devel >= 1.2.14
BuildRequires: gtk2-devel >= 2.18
BuildRequires: gd-devel
@@ -20,6 +23,7 @@ BuildRequires: minizip-devel
%endif
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
+
Provides: fceultra = %{version}-%{release}
Obsoletes: fceultra < 2.0.0
Provides: gfceu = %{version}-%{release}
@@ -47,7 +51,7 @@ the network.
%prep
-%setup -q
+%autosetup -p1
# Remove windows binary
rm fceux-server/fceux-net-server.exe
@@ -83,7 +87,7 @@ sed -i '/OnlyShowIn=*/s/$/;/' fceux.desktop
# Enable system LUA
# Enable system minizip
# Enable AVI creation
-scons-2 %{?_smp_mflags} \
+scons %{?_smp_mflags} \
SYSTEM_LUA=1 \
SYSTEM_MINIZIP=1 \
CREATE_AVI=1
@@ -142,6 +146,9 @@ install -p -m 644 fceux-server/fceux-server.conf \
%changelog
+* Sat Aug 10 2019 Andrea Musuruane <musuruan(a)gmail.com> - 2.2.3-8
+- Fixed building with python3 scons
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.2.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
5 years, 3 months