[pcsx2] Try fix rfbz #4962 Use the same SDL that wxGTK depends on (F27 SDL, F28 SDL2)
by Sérgio M. Basto
commit f231010616b06c0547582e4a789517c11405af49
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jul 28 18:09:34 2018 +0100
Try fix rfbz #4962
Use the same SDL that wxGTK depends on (F27 SDL, F28 SDL2)
pcsx2-wxWidgets-SDL2.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++
pcsx2.spec | 15 ++++++++--
2 files changed, 86 insertions(+), 3 deletions(-)
---
diff --git a/pcsx2-wxWidgets-SDL2.patch b/pcsx2-wxWidgets-SDL2.patch
new file mode 100644
index 0000000..ce313ae
--- /dev/null
+++ b/pcsx2-wxWidgets-SDL2.patch
@@ -0,0 +1,74 @@
+From 41c49faa81d4970e903e7d85616774c979e103a5 Mon Sep 17 00:00:00 2001
+From: Jonathan Li <jonathan.li(a)hotmail.co.uk>
+Date: Sun, 4 Feb 2018 14:04:17 +0000
+Subject: [PATCH] cmake: Improve wxWidgets and SDL linkage check
+
+If wxWidgets is linked to SDL, check what version it's actually linked
+against instead of assuming it's linked to SDL1.2 (which isn't true on
+Fedora 27).
+---
+ cmake/ApiValidation.cmake | 41 ++++++++++++++++++++++++++++-------------
+ 1 file changed, 28 insertions(+), 13 deletions(-)
+
+diff --git a/cmake/ApiValidation.cmake b/cmake/ApiValidation.cmake
+index e7a4f99a77..f93bc67fcd 100644
+--- a/cmake/ApiValidation.cmake
++++ b/cmake/ApiValidation.cmake
+@@ -1,9 +1,14 @@
+ set(wx_sdl_c_code "
+ #include <wx/setup.h>
+
+-#if (wxUSE_LIBSDL != 0)
++#if (wxUSE_LIBSDL == 0)
+ #error cmake_WX_SDL
+ #endif
++
++int main()
++{
++ return 0;
++}
+ ")
+
+ set(gcc7_mmx_code "
+@@ -83,19 +88,29 @@ function(WX_vs_SDL)
+ file(WRITE "${CMAKE_BINARY_DIR}/wx_sdl.c" "${wx_sdl_c_code}")
+ enable_language(C)
+
+- try_run(
+- run_result_unused
+- compile_result_unused
+- "${CMAKE_BINARY_DIR}"
+- "${CMAKE_BINARY_DIR}/wx_sdl.c"
+- COMPILE_OUTPUT_VARIABLE OUT
+- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${wxWidgets_INCLUDE_DIRS}"
+- )
++ try_compile(
++ wx_linked_to_sdl
++ "${CMAKE_BINARY_DIR}"
++ "${CMAKE_BINARY_DIR}/wx_sdl.c"
++ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${wxWidgets_INCLUDE_DIRS}"
++ LINK_LIBRARIES "${wxWidgets_LIBRARIES}"
++ COPY_FILE "${CMAKE_BINARY_DIR}/wx_sdl"
++ )
++
++ if (NOT wx_linked_to_sdl)
++ return()
++ endif()
++
++ execute_process(
++ COMMAND ldd "${CMAKE_BINARY_DIR}/wx_sdl"
++ COMMAND grep -c SDL2
++ OUTPUT_VARIABLE sdl2_count
++ )
+
+- if (${OUT} MATCHES "cmake_WX_SDL" AND SDL2_API)
+- message(FATAL_ERROR "WxWidget is linked to SDL (wxUSE_LIBSDL) and it is likely SDL1.2.
+- Unfortunately you try to build PCSX2 with SDL2 support which is not compatible
+- Please use -DSDL2_API=FALSE")
++ if (SDL2_API AND sdl2_count STREQUAL "0")
++ message(FATAL_ERROR "wxWidgets is linked to SDL1.2. Please use -DSDL2_API=FALSE.")
++ elseif (NOT SDL2_API AND NOT sdl2_count STREQUAL "0")
++ message(FATAL_ERROR "wxWidgets is linked to SDL2. Please use -DSDL2_API=TRUE")
+ endif()
+ endfunction()
+
diff --git a/pcsx2.spec b/pcsx2.spec
index 73b049a..ff9cb39 100644
--- a/pcsx2.spec
+++ b/pcsx2.spec
@@ -1,6 +1,6 @@
Name: pcsx2
Version: 1.4
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A Sony Playstation2 emulator
License: GPLv3
URL: https://github.com/PCSX2/pcsx2
@@ -9,6 +9,7 @@ URL: https://github.com/PCSX2/pcsx2
Source0: pcsx2.1.4.tar.gz
Source1: download_pcsx2_1.4_tarball.sh
Patch1: pcsx2-gcc6.patch
+Patch2: pcsx2-wxWidgets-SDL2.patch
# PCSX2 does not support running as a 64 bit application.
# http://code.google.com/p/pcsx2/wiki/ChrootAnd64bStatusLinux
ExclusiveArch: i686
@@ -26,12 +27,16 @@ BuildRequires: libICE-devel
BuildRequires: libXrandr-devel
BuildRequires: mesa-libGLES-devel
BuildRequires: alsa-lib-devel
-BuildRequires: SDL-devel
-#BuildRequires: SDL2-devel
BuildRequires: gtk2-devel
#BuildRequires: gtk3-devel
BuildRequires: portaudio-devel
BuildRequires: sparsehash-devel
+%if (0%{?fedora} >= 28)
+BuildRequires: SDL2-devel
+%else
+BuildRequires: SDL-devel
+%endif
+# use SDL that depends wxGTK
%if (0%{?fedora} >= 27)
BuildRequires: compat-wxGTK3-gtk2-devel
%else
@@ -163,6 +168,10 @@ fi
%changelog
+* Sat Jul 28 2018 Sérgio Basto <sergio(a)serjux.com> - 1.4-10
+- Try fix rfbz #4962
+- Use the same SDL that wxGTK depends on (F27 SDL, F28 SDL2)
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <sergio(a)serjux.com> - 1.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 8 months
[pdflib-lite] BR gcc
by Sérgio M. Basto
commit a2db47d8b7aff8ef660bd22790629e142523c157
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jul 28 17:42:14 2018 +0100
BR gcc
pdflib-lite.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/pdflib-lite.spec b/pdflib-lite.spec
index 71f7eb1..0a5cf16 100644
--- a/pdflib-lite.spec
+++ b/pdflib-lite.spec
@@ -14,6 +14,8 @@ Source: http://www.pdflib.com/binaries/PDFlib/705/PDFlib-Lite-%{version}
Patch0: pdflib-lite-7.0.4-gcc43.patch
Patch1: pdflib-lite-7.0.5-format-security.patch
+BuildRequires: gcc gcc-c++
+
%description
PDFlib is a development tool for PDF-enabling your software,
or generating PDF on your server. PDFlib offers a simple-to-use API
5 years, 8 months
[pdflib-lite] Restore python2_include macro
by Sérgio M. Basto
commit 7a7eda75ad5a9180ef680d5e15d677d0451e5bf3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jul 28 17:09:28 2018 +0100
Restore python2_include macro
pdflib-lite.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/pdflib-lite.spec b/pdflib-lite.spec
index c1bb48b..71f7eb1 100644
--- a/pdflib-lite.spec
+++ b/pdflib-lite.spec
@@ -1,3 +1,5 @@
+%{!?python2_include: %global python2_include %(%{__python2} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(0)")}
+
Summary: Portable C library for dynamically generating PDF files
Name: pdflib-lite
# Remenber to check the URL after changing this...
5 years, 8 months
[bubbros] I can't be bothered to fix this obsolete package so have used a dirty hack pt2
by Leigh Scott
commit 6e4c05fe6055956b08990a78e8ef91e3ae6d6c1b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jul 28 17:11:43 2018 +0100
I can't be bothered to fix this obsolete package so have used a dirty hack pt2
bubbros.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/bubbros.spec b/bubbros.spec
index 8547425..d6d1b35 100644
--- a/bubbros.spec
+++ b/bubbros.spec
@@ -19,6 +19,10 @@ BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: java-devel
+# I can't be bothered to fix this obsolete package so have used a dirty hack
+%if 0%{?fedora} >= 29
+Requires: python-unversioned-command
+%endif
Requires: pygame
Requires: pygtk2
Requires: hicolor-icon-theme
5 years, 8 months
[bubbros] I can't be bothered to fix this obsolete package so have used a dirty hack
by Leigh Scott
commit 9c0f9be6fafd74962fca9c332c238ccc7f868f59
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jul 28 17:09:18 2018 +0100
I can't be bothered to fix this obsolete package so have used a dirty hack
bubbros.spec | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/bubbros.spec b/bubbros.spec
index b4e75e3..8547425 100644
--- a/bubbros.spec
+++ b/bubbros.spec
@@ -8,9 +8,20 @@ URL: http://bub-n-bros.sourceforge.net/
Source0: http://downloads.sourceforge.net/bub-n-bros/%{name}-%{version}.tar.gz
Source1: bubbros.desktop
Patch0: bubbros-1.5-fixes.patch
-BuildRequires: python-devel ImageMagick desktop-file-utils libX11-devel
-BuildRequires: libXext-devel xorg-x11-proto-devel java-devel
-Requires: pygame pygtk2 hicolor-icon-theme
+BuildRequires: python2-devel
+# I can't be bothered to fix this obsolete package so have used a dirty hack
+%if 0%{?fedora} >= 29
+BuildRequires: python-unversioned-command
+%endif
+BuildRequires: ImageMagick
+BuildRequires: desktop-file-utils
+BuildRequires: libX11-devel
+BuildRequires: libXext-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: java-devel
+Requires: pygame
+Requires: pygtk2
+Requires: hicolor-icon-theme
%description
This is a direct clone of the MacOS game Bub & Bob of McSebi. Thanks Sebi for
@@ -30,7 +41,7 @@ Features:
%setup -q
#no backups for this patch, otherwise they end up getting installed!
%patch0 -p1
-sed -i 's:#! /usr/bin/env python:#!%{__python}:' BubBob.py bubbob/bb.py \
+sed -i 's:#! /usr/bin/env python:#!%{__python2}:' BubBob.py bubbob/bb.py \
display/Client.py
chmod +x display/Client.py
# for %doc
@@ -40,7 +51,7 @@ mv bubbob/levels/README.txt levels.txt
%build
make %{?_smp_mflags}
pushd bubbob/images
-python buildcolors.py
+python2 buildcolors.py
popd
pushd java
rm *.class
@@ -94,19 +105,6 @@ install -p -m 644 %{name}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
%files
%doc LICENSE.txt artistic.txt levels.txt
%{_bindir}/bubbros*
5 years, 8 months
[pdflib-lite] Add python2 support
by Sérgio M. Basto
commit e35176def5c7fc9fda9755be9970caa537d168eb
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jul 28 16:44:15 2018 +0100
Add python2 support
pdflib-lite.spec | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/pdflib-lite.spec b/pdflib-lite.spec
index e46ebb7..c1bb48b 100644
--- a/pdflib-lite.spec
+++ b/pdflib-lite.spec
@@ -1,6 +1,3 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?python_include: %global python_include %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(0)")}
-
Summary: Portable C library for dynamically generating PDF files
Name: pdflib-lite
# Remenber to check the URL after changing this...
@@ -15,8 +12,6 @@ Source: http://www.pdflib.com/binaries/PDFlib/705/PDFlib-Lite-%{version}
Patch0: pdflib-lite-7.0.4-gcc43.patch
Patch1: pdflib-lite-7.0.5-format-security.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
%description
PDFlib is a development tool for PDF-enabling your software,
or generating PDF on your server. PDFlib offers a simple-to-use API
@@ -42,7 +37,7 @@ the PDFlib library.
%package python
Summary: Python shared library for pdflib
Group: System Environment/Libraries
-BuildRequires: python-devel
+BuildRequires: python2-devel
Requires: %{name} = %{version}-%{release}
Provides: python-pdflib = %{version}-%{release}
@@ -81,7 +76,7 @@ that will use the PDFlib library.
%patch0 -p0 -b .gcc43
%patch1 -b .format-security
-sed -i -e 's,^PYTHONLIBDIR.*,PYTHONLIBDIR = %{python_sitearch},' \
+sed -i -e 's,^PYTHONLIBDIR.*,PYTHONLIBDIR = %{python2_sitearch},' \
-e 's,^PERLLIBDIR.*,PERLLIBDIR = %{perl_vendorarch},' \
config/mkcommon.inc.in
@@ -90,7 +85,7 @@ sed -i -e 's,^PYTHONLIBDIR.*,PYTHONLIBDIR = %{python_sitearch},' \
# java, ruby and tcl disabled
# File a bug with RFE and patch if you need it
%configure \
- --with-pyincl=%{python_include} \
+ --with-pyincl=%{python2_include} \
--with-java=no \
--with-ruby=no \
--with-tcl=no \
@@ -109,7 +104,7 @@ done
%install
rm -rf %{buildroot} examples
-mkdir -p %{buildroot}%{python_sitearch}
+mkdir -p %{buildroot}%{python2_sitearch}
mkdir -p %{buildroot}%{perl_vendorarch}
make install DESTDIR=%{buildroot}
@@ -121,12 +116,12 @@ done
install -p -m 0644 bind/pdflib/cpp/pdflib.hpp %{buildroot}%{_includedir}/pdflib.hpp
rm %{buildroot}%{_libdir}/*.{la,a}
-rm %{buildroot}%{python_sitearch}/*.{la,a}
+rm %{buildroot}%{python2_sitearch}/*.{la,a}
rm %{buildroot}%{perl_vendorarch}/*.{la,a}
# require to extract debuginfo
chmod +x %{buildroot}%{_libdir}/libpdf*
-chmod +x %{buildroot}%{python_sitearch}/pdflib_py.so*
+chmod +x %{buildroot}%{python2_sitearch}/pdflib_py.so*
chmod +x %{buildroot}%{perl_vendorarch}/pdflib_pl.so*
# Only sources
@@ -182,7 +177,7 @@ rm -rf %{buildroot}
%files python
%doc doc/pdflib/PDFlib-Lite-license.pdf
-%{python_sitearch}/pdflib_py.so*
+%{python2_sitearch}/pdflib_py.so*
%files perl
@@ -193,6 +188,7 @@ rm -rf %{buildroot}
%changelog
* Fri Jul 27 2018 RPM Fusion Release Engineering <sergio(a)serjux.com> - 7.0.5-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Add python2 support
* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 7.0.5-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
5 years, 8 months
[vdr-xineliboutput] Update to 2.1.0-7.20180701git97b7e78
by Martin Gansser
commit 270fc51bab506cca3c31b960a74ef92601acf12d
Author: Martin Gansser <mgansser(a)online.de>
Date: Sat Jul 28 12:38:51 2018 +0200
Update to 2.1.0-7.20180701git97b7e78
.gitignore | 1 +
sources | 2 +-
vdr-xineliboutput.spec | 9 ++++++---
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 51b2fd7..0e43daf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ vdr-xineliboutput-1.1.0-20150422.tgz
/vdr-xineliboutput-2.0.0-f397e7e.tar.gz
/vdr-xineliboutput-2.1.0-cdd6595.tar.gz
/vdr-xineliboutput-2.1.0-747f03e.tar.gz
+/vdr-xineliboutput-2.1.0-97b7e78.tar.gz
diff --git a/sources b/sources
index 13d5923..00ffcd8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b21e1b5c064dae8b1b8132bb531c7fc vdr-xineliboutput-2.1.0-747f03e.tar.gz
+d88a7934ad77d42efe795a593fc606b5 vdr-xineliboutput-2.1.0-97b7e78.tar.gz
diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec
index 6092261..51cd7bc 100644
--- a/vdr-xineliboutput.spec
+++ b/vdr-xineliboutput.spec
@@ -3,14 +3,14 @@
%global xinepluginver 2.1.0
%global pname xineliboutput
%global vdrver %(pkg-config --modversion vdr 2>/dev/null || echo ERROR)
-%global gitrev 747f03e
-%global gitdate 20180226
+%global gitrev 97b7e78
+%global gitdate 20180701
# build bluray support (disabled for now)
%global have_bluray 1
Name: vdr-%{pname}
Version: 2.1.0
-Release: 6.%{gitdate}git%{gitrev}%{?dist}
+Release: 7.%{gitdate}git%{gitrev}%{?dist}
Summary: Plugins for watching VDR over Xine
Group: Applications/Multimedia
License: GPLv2+
@@ -146,6 +146,9 @@ find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';'
%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}
%changelog
+* Sat Jul 28 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 2.1.0-7.20180701git97b7e78
+- Update to 2.1.0-7.20180701git97b7e78
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.1.0-6.20180226git747f03e
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 8 months
[yabause] Fix qt 5.11 build
by Leigh Scott
commit 6e535c019a42fc119837b6d40698a91862266925
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jul 28 10:09:49 2018 +0100
Fix qt 5.11 build
Fix_qt_5.11.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
yabause.spec | 19 +++++++++++-----
2 files changed, 80 insertions(+), 5 deletions(-)
---
diff --git a/Fix_qt_5.11.patch b/Fix_qt_5.11.patch
new file mode 100644
index 0000000..6b41603
--- /dev/null
+++ b/Fix_qt_5.11.patch
@@ -0,0 +1,66 @@
+From 06a816c032c6f7fd79ced6e594dd4b33571a0e73 Mon Sep 17 00:00:00 2001
+From: Guillaume Duhamel <guillaume.duhamel(a)gmail.com>
+Date: Fri, 6 Jul 2018 08:08:22 +0200
+Subject: [PATCH] Fix qt 5.11 (#422)
+
+Header fixes for Qt 5.11
+---
+ yabause/src/qt/ui/UICheatRaw.cpp | 2 --
+ yabause/src/qt/ui/UICheatRaw.h | 2 +-
+ yabause/src/qt/ui/UICheats.cpp | 2 ++
+ yabause/src/qt/ui/UIHexInput.h | 2 ++
+ 4 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/yabause/src/qt/ui/UICheatRaw.cpp b/yabause/src/qt/ui/UICheatRaw.cpp
+index 4ad82d770..3f78486bf 100755
+--- a/yabause/src/qt/ui/UICheatRaw.cpp
++++ b/yabause/src/qt/ui/UICheatRaw.cpp
+@@ -20,8 +20,6 @@
+ #include "UIHexInput.h"
+ #include "../QtYabause.h"
+
+-#include <QButtonGroup>
+-
+ UICheatRaw::UICheatRaw( QWidget* p )
+ : QDialog( p )
+ {
+diff --git a/yabause/src/qt/ui/UICheatRaw.h b/yabause/src/qt/ui/UICheatRaw.h
+index d97b429da..20318c670 100755
+--- a/yabause/src/qt/ui/UICheatRaw.h
++++ b/yabause/src/qt/ui/UICheatRaw.h
+@@ -21,7 +21,7 @@
+
+ #include "ui_UICheatRaw.h"
+
+-class QButtonGroup;
++#include <QButtonGroup>
+
+ class UICheatRaw : public QDialog, public Ui::UICheatRaw
+ {
+diff --git a/yabause/src/qt/ui/UICheats.cpp b/yabause/src/qt/ui/UICheats.cpp
+index c60279723..44d341c34 100755
+--- a/yabause/src/qt/ui/UICheats.cpp
++++ b/yabause/src/qt/ui/UICheats.cpp
+@@ -21,6 +21,8 @@
+ #include "UICheatRaw.h"
+ #include "../CommonDialogs.h"
+
++#include <QButtonGroup>
++
+ UICheats::UICheats( QWidget* p )
+ : QDialog( p )
+ {
+diff --git a/yabause/src/qt/ui/UIHexInput.h b/yabause/src/qt/ui/UIHexInput.h
+index f333b0166..4bd8aed48 100644
+--- a/yabause/src/qt/ui/UIHexInput.h
++++ b/yabause/src/qt/ui/UIHexInput.h
+@@ -22,6 +22,8 @@
+ #include "ui_UIHexInput.h"
+ #include "../QtYabause.h"
+
++#include <QValidator>
++
+ class HexValidator : public QValidator
+ {
+ Q_OBJECT
+
diff --git a/yabause.spec b/yabause.spec
index a53971b..dae5e86 100644
--- a/yabause.spec
+++ b/yabause.spec
@@ -2,13 +2,16 @@
Name: yabause
Version: 0.9.15
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A Sega Saturn emulator
License: GPLv2+
URL: http://yabause.org
Source0: https://download.tuxfamily.org/%{name}/releases/%{version}/%{name}-%{vers...
+# https://github.com/Yabause/yabause/commit/06a816c032c6f7fd79ced6e594dd4b3...
+Patch0: Fix_qt_5.11.patch
-BuildRequires: cmake
+BuildRequires: cmake3
+BuildRequires: dos2unix
BuildRequires: desktop-file-utils
BuildRequires: freeglut-devel
BuildRequires: glew-devel
@@ -29,7 +32,10 @@ but optionally a real Saturn BIOS can be used, however it is not included.
%prep
-%autosetup
+%setup
+# Fix the dos crap to make patching easy
+dos2unix src/qt/ui/*
+%patch0 -p2
#fix end-of-line encoding
find \( -name \*.c\* -or -name \*.h\* -or -name AUTHORS \) -exec sed -i 's/\r$//' {} \;
@@ -46,9 +52,9 @@ export CXXFLAGS
#arm dynarec is broken
%ifarch %{ix86} x86_64
-%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DYAB_PORTS=qt -DYAB_OPTIMIZATION=-O2 .
+%cmake3 -DBUILD_SHARED_LIBS:BOOL=OFF -DYAB_PORTS=qt -DYAB_OPTIMIZATION=-O2 .
%else
-%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DYAB_PORTS=qt -DYAB_OPTIMIZATION=-O2 \
+%cmake3 -DBUILD_SHARED_LIBS:BOOL=OFF -DYAB_PORTS=qt -DYAB_OPTIMIZATION=-O2 \
-DSH2_DYNAREC:BOOL=OFF .
%endif
%make_build
@@ -70,6 +76,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Sat Jul 28 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.9.15-6
+- Fix qt 5.11 build
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.9.15-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 8 months