From 9eeb12496eb28e3d66039b4f0372ab8a875e541b Mon Sep 17 00:00:00 2001 From: Krzysztof Mrozowicz Date: Thu, 24 Mar 2022 10:43:56 +0000 Subject: [PATCH 1/4] - up to 2.6.4 --- fceultra.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fceultra.spec b/fceultra.spec index f6ba10d..f4682dd 100644 --- a/fceultra.spec +++ b/fceultra.spec @@ -1,17 +1,13 @@ -# -# TODO: bcond for non-gtk gui (gfceux) -# TODO: bcond for gtk3 interface instead of qt -# Summary: FCE Ultra - Linux Nintendo Entertainment System emulator Summary(pl.UTF-8): FCE Ultra - linuksowy emulator systemu Nintendo Name: fceultra -Version: 2.6.3 +Version: 2.6.4 Release: 1 License: GPL v2+ Group: X11/Applications/Games #Source0: http://downloads.sourceforge.net/fceultra/fceux-%{version}.src.tar.gz Source0: https://sourceforge.net/projects/fceultra/files/Source%20Code/%{version}%20src/fceux-%{version}.tar.gz -# Source0-md5: d45dbfca4a2c398889111b93e8f7f16f +# Source0-md5: 70d781780f2fcc73f3f5b7ceb76ad2e1 URL: http://fceultra.sourceforge.net/ BuildRequires: Mesa-libGLU-devel BuildRequires: Qt5Core-devel >= 5.11 -- 2.43.0 From a7cc409442cca4625c0dd1dc9adebc293394e837 Mon Sep 17 00:00:00 2001 From: Krzysztof Mrozowicz Date: Mon, 18 Sep 2023 11:26:54 +0000 Subject: [PATCH 2/4] - up to 2.6.6 --- fceultra.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fceultra.spec b/fceultra.spec index f4682dd..a72fa62 100644 --- a/fceultra.spec +++ b/fceultra.spec @@ -1,13 +1,12 @@ Summary: FCE Ultra - Linux Nintendo Entertainment System emulator Summary(pl.UTF-8): FCE Ultra - linuksowy emulator systemu Nintendo Name: fceultra -Version: 2.6.4 +Version: 2.6.6 Release: 1 License: GPL v2+ Group: X11/Applications/Games -#Source0: http://downloads.sourceforge.net/fceultra/fceux-%{version}.src.tar.gz -Source0: https://sourceforge.net/projects/fceultra/files/Source%20Code/%{version}%20src/fceux-%{version}.tar.gz -# Source0-md5: 70d781780f2fcc73f3f5b7ceb76ad2e1 +Source0: https://github.com/TASEmulators/fceux/archive/refs/tags/v%{version}.tar.gz +# Source0-md5: 8e1aede624ebe26f0a936daba3b87328 URL: http://fceultra.sourceforge.net/ BuildRequires: Mesa-libGLU-devel BuildRequires: Qt5Core-devel >= 5.11 -- 2.43.0 From 4db4bb8db16564545596e86631891e43d85b4811 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 16 Oct 2023 08:29:07 +0200 Subject: [PATCH 3/4] Release 2 (by relup.sh) --- fceultra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fceultra.spec b/fceultra.spec index a72fa62..740ff57 100644 --- a/fceultra.spec +++ b/fceultra.spec @@ -2,7 +2,7 @@ Summary: FCE Ultra - Linux Nintendo Entertainment System emulator Summary(pl.UTF-8): FCE Ultra - linuksowy emulator systemu Nintendo Name: fceultra Version: 2.6.6 -Release: 1 +Release: 2 License: GPL v2+ Group: X11/Applications/Games Source0: https://github.com/TASEmulators/fceux/archive/refs/tags/v%{version}.tar.gz -- 2.43.0 From 6bed159ad85bf520931c7dcb902d00c951d5ce8c Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 2 Mar 2024 09:51:01 +0100 Subject: [PATCH 4/4] - completed dependencies, release 3 (libx264 0.164) --- fceultra.spec | 60 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/fceultra.spec b/fceultra.spec index 740ff57..3eff586 100644 --- a/fceultra.spec +++ b/fceultra.spec @@ -1,24 +1,53 @@ +# +# Conditional build: +%bcond_with qt6 # Qt 6 instead of Qt 5 + Summary: FCE Ultra - Linux Nintendo Entertainment System emulator Summary(pl.UTF-8): FCE Ultra - linuksowy emulator systemu Nintendo Name: fceultra Version: 2.6.6 -Release: 2 +Release: 3 License: GPL v2+ Group: X11/Applications/Games +#Source0Download: https://fceux.com/web/download.html +# TODO: use named tarballs +#Source0: https://github.com/TASEmulators/fceux/archive/v%{version}/fceux-%{version}.tar.gz Source0: https://github.com/TASEmulators/fceux/archive/refs/tags/v%{version}.tar.gz # Source0-md5: 8e1aede624ebe26f0a936daba3b87328 -URL: http://fceultra.sourceforge.net/ -BuildRequires: Mesa-libGLU-devel +URL: https://fceux.com/ +BuildRequires: OpenGL-devel +BuildRequires: SDL2-devel >= 2.0 +BuildRequires: cmake >= 3.8 +# libavcodec libavformat libavutil libswresample libswscale +BuildRequires: ffmpeg-devel +BuildRequires: libarchive-devel +BuildRequires: libx264-devel +BuildRequires: libx265-devel +BuildRequires: lua51-devel >= 5.1 +BuildRequires: minizip-devel +BuildRequires: pkgconfig +BuildRequires: rpmbuild(macros) >= 1.605 +# checked but not used +#BuildRequires: xorg-lib-libX11-devel +#BuildRequires: xorg-lib-libxkbcommon-devel +BuildRequires: zlib-devel +%if %{with qt6} +BuildRequires: Qt6Core-devel >= 6.0 +BuildRequires: Qt6Gui-devel >= 6.0 +BuildRequires: Qt6Help-devel >= 6.0 +BuildRequires: Qt6OpenGL-devel >= 6.0 +BuildRequires: Qt6Widgets-devel >= 6.0 +BuildRequires: qt6-build >= 6.0 +Requires: Qt6Gui-platform-xcb-glx >= 5.11 +%else BuildRequires: Qt5Core-devel >= 5.11 BuildRequires: Qt5Gui-devel >= 5.11 +BuildRequires: Qt5Help-devel >= 5.11 BuildRequires: Qt5OpenGL-devel >= 5.11 BuildRequires: Qt5Widgets-devel >= 5.11 -BuildRequires: SDL2 >= 2.0 -BuildRequires: cmake -BuildRequires: lua51-devel -BuildRequires: minizip-devel -BuildRequires: pkgconfig +BuildRequires: qt5-build >= 5.11 Requires: Qt5Gui-platform-xcb-glx >= 5.11 +%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -35,20 +64,21 @@ CFLAGS="%{rpmcflags}" CXXFLAGS="%{rpmcxxflags}" mkdir -p build cd build -%cmake .. +%cmake .. \ + -DQHELP=ON \ + %{?with_qt6:-DQT6=ON} %{__make} %install rm -rf $RPM_BUILD_ROOT -cd build -%{__make} install \ + +%{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT -cd .. -install -d $RPM_BUILD_ROOT%{_mandir}/man6/ -%{__mv} documentation/fceux.6 $RPM_BUILD_ROOT%{_mandir}/man6/ -%{__mv} documentation/fceux-net-server.6 $RPM_BUILD_ROOT%{_mandir}/man6/ +install -d $RPM_BUILD_ROOT%{_mandir}/man6 +%{__mv} documentation/fceux.6 $RPM_BUILD_ROOT%{_mandir}/man6 +%{__mv} documentation/fceux-net-server.6 $RPM_BUILD_ROOT%{_mandir}/man6 %clean rm -rf $RPM_BUILD_ROOT -- 2.43.0