From 47063486c4f557cc55ac5916b0c372e15a49599b Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Wed, 8 Jul 2020 16:27:11 +0200 Subject: [PATCH 01/32] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- visualboyadvance-m.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 4ca432e..bb50b19 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -70,7 +70,7 @@ sed -i 's/ -mtune=generic//g' CMakeLists.txt chmod -x src/wx/rpi.h %build -%cmake . \ +%cmake \ -DCMAKE_SKIP_RPATH=ON \ -DVERSION="%{version}%{?rcversion: %{rcversion}}" \ -DVERSION_RELEASE=TRUE \ @@ -78,10 +78,10 @@ chmod -x src/wx/rpi.h -DENABLE_WX=ON \ -DENABLE_FFMPEG=OFF \ -DENABLE_LINK=ON -%make_build +%cmake_build %install -%make_install +%cmake_install %find_lang wx%{shortname} %check From 72472e3af6e34475ca77a82433ff8a0501f4329c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:48:40 +0000 Subject: [PATCH 02/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- visualboyadvance-m.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index bb50b19..6864e38 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 3%{?rctagfedora:.%{rctagfedora}}%{?dist} +Release: 3%{?rctagfedora:.%{rctagfedora}}%{?dist}.1 Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -108,6 +108,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.1.4-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Mar 11 2020 Jeremy Newton - 2.1.4-3 - Fix RHBZ#1776006 From 8a9fee9ad6e094736e97d48ececedf5ea77eb77f Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Tue, 26 Jan 2021 12:45:57 -0500 Subject: [PATCH 03/32] Cherry-pick F33+ build fix Related to SDL update, this is cherry-picked from upstream. --- ...th-SDL-2.0.14-after-KMOD_GUI-change-.patch | 30 +++++++++++++++++++ visualboyadvance-m.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-SDL-Fix-build-with-SDL-2.0.14-after-KMOD_GUI-change-.patch diff --git a/0001-SDL-Fix-build-with-SDL-2.0.14-after-KMOD_GUI-change-.patch b/0001-SDL-Fix-build-with-SDL-2.0.14-after-KMOD_GUI-change-.patch new file mode 100644 index 0000000..e32ed93 --- /dev/null +++ b/0001-SDL-Fix-build-with-SDL-2.0.14-after-KMOD_GUI-change-.patch @@ -0,0 +1,30 @@ +From 435959b0df68b6ac04a41e2a9b02d5e36dfc6fb7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= +Date: Thu, 31 Dec 2020 00:22:21 +0100 +Subject: [PATCH] SDL: Fix build with SDL 2.0.14 after KMOD_GUI change to enum + +Since SDL 2.0.14, KMOD_GUI is no longer a macro but an enum value: +https://hg.libsdl.org/SDL/rev/15a0bc9612e9 + +So this code broke as the enum value doesn't satisfy `defined()`. +--- + src/sdl/SDL.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp +index 44f00cfc..8d72cd54 100644 +--- a/src/sdl/SDL.cpp ++++ b/src/sdl/SDL.cpp +@@ -876,7 +876,8 @@ void sdlInitVideo() + + sdlResizeVideo(); + } +-#if defined(KMOD_GUI) ++ ++#ifndef KMOD_META + #define KMOD_META KMOD_GUI + #endif + +-- +2.29.2 + diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 6864e38..b4c4fe4 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 3%{?rctagfedora:.%{rctagfedora}}%{?dist}.1 +Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist} Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -21,6 +21,8 @@ Source0: https://github.com/%{name}/%{name}/archive/v%{upstreamtag}.tar.g Patch0: 0001-xbrz-fix-inline-asm-check.patch #https://github.com/visualboyadvance-m/visualboyadvance-m/commit/410ede543c98c8c6dd89c25484da3bffb46f4187 Patch1: 0001-Check-for-null-pointer-in-soundReset.patch +#https://github.com/visualboyadvance-m/visualboyadvance-m/commit/619a5cce683ec4b1d03f08f316ba276d8f8cd824 +Patch2: 0001-SDL-Fix-build-with-SDL-2.0.14-after-KMOD_GUI-change-.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cairo-devel @@ -108,6 +110,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Tue Jan 26 2021 Jeremy Newton - 2.1.4-4 +- Cherry-pick build fix for SDL + * Wed Jul 29 2020 Fedora Release Engineering - 2.1.4-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7f9306322a04ffb66cea3986be534b0ffa5e6798 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:35:03 +0000 Subject: [PATCH 04/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- visualboyadvance-m.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index b4c4fe4..5e89320 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist} +Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.1 Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.1.4-4.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Jeremy Newton - 2.1.4-4 - Cherry-pick build fix for SDL From 97a5a0f673662b2cd3c60e69b332a9709047d2f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:05:51 +0000 Subject: [PATCH 05/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- visualboyadvance-m.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 5e89320..f020961 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.1 +Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.2 Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.1.4-4.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.1.4-4.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1ed2d03ef0be5e3944a46a6c3e8d78825a418ec3 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Tue, 8 Mar 2022 06:07:22 +0000 Subject: [PATCH 06/32] Disable 32bit build As per the F37 proposal to disable unnecessary 32bit builds --- visualboyadvance-m.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index f020961..293053c 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -46,6 +46,9 @@ BuildRequires: libappstream-glib Requires: hicolor-icon-theme +# 32bit package serves very little purpose: +ExcludeArch: %{ix86} + #Using info from here: http://vba-m.com/about.html and debian files %description VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with From db7d1426da92afde7033402d3f45bc2b2b301bc3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:01:25 +0000 Subject: [PATCH 07/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- visualboyadvance-m.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 293053c..ff7f704 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.2 +Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.3 Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -113,6 +113,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.1.4-4.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.1.4-4.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 28c48e6ab2aea4e6aef6b7d53179e203cc2dd3df Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 4 Aug 2022 14:20:20 -0400 Subject: [PATCH 08/32] Rebuild with wxWidgets 3.2 --- visualboyadvance-m.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index ff7f704..7508280 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.3 +Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.4 Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -35,7 +35,7 @@ BuildRequires: nasm BuildRequires: openal-soft-devel BuildRequires: SDL2-devel BuildRequires: SFML-devel -BuildRequires: wxGTK3-devel +BuildRequires: wxGTK-devel BuildRequires: zlib-devel BuildRequires: zip @@ -113,6 +113,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Thu Aug 04 2022 Scott Talbert - 2.1.4-4.4 +- Rebuild with wxWidgets 3.2 + * Sat Jul 23 2022 Fedora Release Engineering - 2.1.4-4.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 3cb812fc34db6c9fd6768ad0b3caf6ebde67c0c6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 27 Nov 2022 11:16:21 +0900 Subject: [PATCH 09/32] Rebuild due to wxGLCanvas ABI change --- visualboyadvance-m.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 7508280..0b504a0 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.4 +Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.5 Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -113,6 +113,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Sun Nov 27 2022 Mamoru TASAKA - 2.1.4-4.5 +- Rebuild due to wxGLCanvas ABI change + * Thu Aug 04 2022 Scott Talbert - 2.1.4-4.4 - Rebuild with wxWidgets 3.2 From 9770d9376c74b87eee78410de10435569f6217c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:25:11 +0000 Subject: [PATCH 10/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- visualboyadvance-m.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 0b504a0..60640e7 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.5 +Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.6 Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -113,6 +113,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.1.4-4.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Nov 27 2022 Mamoru TASAKA - 2.1.4-4.5 - Rebuild due to wxGLCanvas ABI change From 7c72aa61e4196bcf4cc60e044469d13f0513ff04 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Sun, 18 Dec 2022 16:38:54 -0500 Subject: [PATCH 11/32] Update to 2.1.5 --- .gitignore | 1 + 0001-Add-stdint-includes.patch | 38 +++++ ...Check-for-null-pointer-in-soundReset.patch | 26 --- ...ild-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch | 149 ++++++++++++++++++ ...th-SDL-2.0.14-after-KMOD_GUI-change-.patch | 30 ---- 0001-xbrz-fix-inline-asm-check.patch | 40 ----- sources | 2 +- visualboyadvance-m.spec | 27 ++-- 8 files changed, 203 insertions(+), 110 deletions(-) create mode 100644 0001-Add-stdint-includes.patch delete mode 100644 0001-Check-for-null-pointer-in-soundReset.patch create mode 100644 0001-Fix-build-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch delete mode 100644 0001-SDL-Fix-build-with-SDL-2.0.14-after-KMOD_GUI-change-.patch delete mode 100644 0001-xbrz-fix-inline-asm-check.patch diff --git a/.gitignore b/.gitignore index 7c19f6b..1614a65 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /visualboyadvance-m-2.1.0.tar.gz /visualboyadvance-m-2.1.3.tar.gz /visualboyadvance-m-2.1.4.tar.gz +/visualboyadvance-m-2.1.5.tar.gz diff --git a/0001-Add-stdint-includes.patch b/0001-Add-stdint-includes.patch new file mode 100644 index 0000000..d91af5c --- /dev/null +++ b/0001-Add-stdint-includes.patch @@ -0,0 +1,38 @@ +From 425e7a0aa0e6c46b2986d9017566fa0ef3b04681 Mon Sep 17 00:00:00 2001 +From: Jeremy Newton +Date: Mon, 30 Jan 2023 22:12:57 -0500 +Subject: [PATCH] Add stdint includes + +I believe this is needed on newer GCC's +--- + src/wx/config/option.h | 1 + + src/wx/widgets/wx/wxmisc.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/wx/config/option.h b/src/wx/config/option.h +index fae2628a..47ecb8a5 100644 +--- a/src/wx/config/option.h ++++ b/src/wx/config/option.h +@@ -7,6 +7,7 @@ + #include + #include + ++#include + #include + + #include "config/option-id.h" +diff --git a/src/wx/widgets/wx/wxmisc.h b/src/wx/widgets/wx/wxmisc.h +index a72ef4e5..2aec4acc 100644 +--- a/src/wx/widgets/wx/wxmisc.h ++++ b/src/wx/widgets/wx/wxmisc.h +@@ -2,6 +2,7 @@ + #define WX_MISC_H + // utility widgets + ++#include + #include + #include + +-- +2.37.3 + diff --git a/0001-Check-for-null-pointer-in-soundReset.patch b/0001-Check-for-null-pointer-in-soundReset.patch deleted file mode 100644 index de22620..0000000 --- a/0001-Check-for-null-pointer-in-soundReset.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 410ede543c98c8c6dd89c25484da3bffb46f4187 Mon Sep 17 00:00:00 2001 -From: Mystro256 -Date: Fri, 6 Mar 2020 12:38:33 -0500 -Subject: [PATCH] Check for null pointer in soundReset(). - -Check that soundDriver is defined. ---- - src/gba/Sound.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gba/Sound.cpp b/src/gba/Sound.cpp -index d6376ff2..90144390 100644 ---- a/src/gba/Sound.cpp -+++ b/src/gba/Sound.cpp -@@ -517,6 +517,8 @@ int soundGetEnable() - - void soundReset() - { -+ if (!soundDriver) -+ return; - soundDriver->reset(); - - remake_stereo_buffer(); --- -2.21.1 - diff --git a/0001-Fix-build-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch b/0001-Fix-build-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch new file mode 100644 index 0000000..9b454c7 --- /dev/null +++ b/0001-Fix-build-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch @@ -0,0 +1,149 @@ +From 8e4acfc91d17b24d5ab64b9defd04f85010add1d Mon Sep 17 00:00:00 2001 +From: Rafael Kitover +Date: Wed, 28 Dec 2022 17:18:44 +0000 +Subject: [PATCH] Fix build w/wxUSE_GLCANVAS_EGL=0, on Fedora + +Disable the EGL subsurface move backport for Wayland GLCanvas if the wx +config sets wxUSE_GLCANVAS_EGL=0 (off.) + +This fixes the build failure on Fedora. To fix the functionality, +however, they need to enable the EGL GLCanvas in their wx builds. + +Also use a different hack to access the private wxGLCanvasEGL member +using template instantiation instead of redefining a keyword as a macro. + +Refer #1028 + +Signed-off-by: Rafael Kitover +--- + src/wx/CMakeLists.txt | 3 +-- + src/wx/wayland.cpp | 18 ++++++++++++++---- + src/wx/wayland.h | 7 ++++--- + src/wx/widgets/checkedlistctrl.cpp | 3 +-- + src/wx/wxhead.h | 7 ------- + 5 files changed, 20 insertions(+), 18 deletions(-) + +diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt +index e25780e8..a8fb9505 100644 +--- a/src/wx/CMakeLists.txt ++++ b/src/wx/CMakeLists.txt +@@ -318,7 +318,6 @@ else() + set(WX_TEST_CONSOLE_APP " + #include + #include +-#include + #include + + #ifdef _WIN32 +@@ -459,7 +458,7 @@ int main(int argc, char** argv) + + if(NOT DEFINED WX_HAS_OPENGL) + check_cxx_source_compiles(" +-#include ++#include + #include + #include + +diff --git a/src/wx/wayland.cpp b/src/wx/wayland.cpp +index 460c3d96..78b53696 100644 +--- a/src/wx/wayland.cpp ++++ b/src/wx/wayland.cpp +@@ -11,16 +11,26 @@ bool IsWayland() { return GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default()); } + // Temporary hack to backport 800d6ed69b from wxWidgets until 3.2.2 is released. + #ifdef WAYLAND_MOVE_SUBSURFACE_BACKPORT + #include +-#define private public + #include +-#undef private + +-void MoveWaylandSubsurface(wxGLCanvas* win) ++wl_subsurface* wxGLCanvasEGL::* private_ptr; ++ ++template ++struct accessor { ++ static int force_init; ++}; ++ ++template ++int accessor::force_init = ((private_ptr = Ptr), 0); ++ ++template struct accessor<&wxGLCanvasEGL::m_wlSubsurface>; ++ ++void MoveWaylandSubsurface(wxGLCanvasEGL* win) + { + if (!IsWayland()) return; + + int x, y; + gdk_window_get_origin(win->GTKGetDrawingWindow(), &x, &y); +- wl_subsurface_set_position(win->m_wlSubsurface, x, y); ++ wl_subsurface_set_position(win->*private_ptr, x, y); + } + #endif +diff --git a/src/wx/wayland.h b/src/wx/wayland.h +index 7b2a810f..65a14c5b 100644 +--- a/src/wx/wayland.h ++++ b/src/wx/wayland.h +@@ -3,7 +3,8 @@ + + #include + +-class wxGLCanvas; // Forward declare. ++class wxGLCanvas; // Forward declare. ++class wxGLCanvasEGL; + + #if defined(__WXGTK__) + #include +@@ -21,11 +22,11 @@ constexpr bool IsWayland() { return false; } + #endif // wayland + + // Temporary hack to backport 800d6ed69b from wxWidgets until 3.2.2 is released. +-#if defined(__WXGTK__) && defined(HAVE_EGL) && wxCHECK_VERSION(3, 2, 0) && !wxCHECK_VERSION(3, 2, 2) ++#if defined(__WXGTK__) && defined(HAVE_EGL) && wxCHECK_VERSION(3, 2, 0) && !wxCHECK_VERSION(3, 2, 2) && wxUSE_GLCANVAS_EGL + + #define WAYLAND_MOVE_SUBSURFACE_BACKPORT + +-void MoveWaylandSubsurface(wxGLCanvas* win); ++void MoveWaylandSubsurface(wxGLCanvasEGL* win); + + #else + +diff --git a/src/wx/widgets/checkedlistctrl.cpp b/src/wx/widgets/checkedlistctrl.cpp +index a5ad2b94..9dd8f8ed 100644 +--- a/src/wx/widgets/checkedlistctrl.cpp ++++ b/src/wx/widgets/checkedlistctrl.cpp +@@ -9,8 +9,7 @@ + // Licence: wxWidgets licence + ///////////////////////////////////////////////////////////////////////////// + +-// For compilers that support precompilation, includes "wx.h". +-#include "wx/wxprec.h" ++#include + + #ifdef __BORLANDC__ + #pragma hdrstop +diff --git a/src/wx/wxhead.h b/src/wx/wxhead.h +index b00bcd11..ad411187 100644 +--- a/src/wx/wxhead.h ++++ b/src/wx/wxhead.h +@@ -1,18 +1,11 @@ + #ifndef WX_WXHEAD_H + #define WX_WXHEAD_H + +-// For compilers that support precompilation, includes . +-#include +- + #ifdef __BORLANDC__ + #pragma hdrstop + #endif + +-// for all others, include the necessary headers (this file is usually all you +-// need because it includes almost all "standard" wxWidgets headers) +-#ifndef WX_PRECOMP + #include +-#endif + + // The following are not pulled in by wx.h + +-- +2.37.3 + diff --git a/0001-SDL-Fix-build-with-SDL-2.0.14-after-KMOD_GUI-change-.patch b/0001-SDL-Fix-build-with-SDL-2.0.14-after-KMOD_GUI-change-.patch deleted file mode 100644 index e32ed93..0000000 --- a/0001-SDL-Fix-build-with-SDL-2.0.14-after-KMOD_GUI-change-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 435959b0df68b6ac04a41e2a9b02d5e36dfc6fb7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= -Date: Thu, 31 Dec 2020 00:22:21 +0100 -Subject: [PATCH] SDL: Fix build with SDL 2.0.14 after KMOD_GUI change to enum - -Since SDL 2.0.14, KMOD_GUI is no longer a macro but an enum value: -https://hg.libsdl.org/SDL/rev/15a0bc9612e9 - -So this code broke as the enum value doesn't satisfy `defined()`. ---- - src/sdl/SDL.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp -index 44f00cfc..8d72cd54 100644 ---- a/src/sdl/SDL.cpp -+++ b/src/sdl/SDL.cpp -@@ -876,7 +876,8 @@ void sdlInitVideo() - - sdlResizeVideo(); - } --#if defined(KMOD_GUI) -+ -+#ifndef KMOD_META - #define KMOD_META KMOD_GUI - #endif - --- -2.29.2 - diff --git a/0001-xbrz-fix-inline-asm-check.patch b/0001-xbrz-fix-inline-asm-check.patch deleted file mode 100644 index 90df245..0000000 --- a/0001-xbrz-fix-inline-asm-check.patch +++ /dev/null @@ -1,40 +0,0 @@ -From af0de1c4b308ef8d9a081ecf407805b75a99d877 Mon Sep 17 00:00:00 2001 -From: Rafael Kitover -Date: Fri, 4 Oct 2019 07:35:49 +0000 -Subject: [PATCH] xbrz: fix inline asm check - -Use correct cpp code to detect x86/amd64 architecture to use inline asm. - -Signed-off-by: Rafael Kitover ---- - src/filters/xBRZ/xbrz.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/filters/xBRZ/xbrz.cpp b/src/filters/xBRZ/xbrz.cpp -index 36d70be2..13e6cdc1 100644 ---- a/src/filters/xBRZ/xbrz.cpp -+++ b/src/filters/xBRZ/xbrz.cpp -@@ -66,17 +66,17 @@ uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate c - - inline double fastSqrt(double n) - { --#ifdef __GNUC__ || __clang__ || __MINGW64_VERSION_MAJOR || __MINGW32_MAJOR_VERSION -+#if (defined(__GNUC__) || defined(__clang__)) && (defined(__x86_64__) || defined(__i386__)) - __asm__ ("fsqrt" : "+t" (n)); - return n; --#elif _MSC_VER && _M_IX86 -+#elif defined(_MSC_VER) && defined(_M_IX86) - // speeds up xBRZ by about 9% compared to std::sqrt which internally uses - // the same assembler instructions but adds some "fluff" - __asm { - fld n - fsqrt - } --#else // _MSC_VER && _M_X64 OR other platforms -+#else // defined(_MSC_VER) && defined(_M_X64) OR other platforms - // VisualStudio x86_64 does not allow inline ASM - return std::sqrt(n); - #endif --- -2.21.1 - diff --git a/sources b/sources index 201e9f6..d5da7a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visualboyadvance-m-2.1.4.tar.gz) = 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896 +SHA512 (visualboyadvance-m-2.1.5.tar.gz) = 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7 diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 60640e7..605e035 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -2,7 +2,7 @@ %global shortname vbam #Upstream git tag/commit: -%global upstreamtag 2.1.4 +%global upstreamtag 2.1.5 #Sanitized RC name (for fedora) #global rctagfedora git78cd223 #RC Version that appears in app @@ -10,19 +10,17 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 4%{?rctagfedora:.%{rctagfedora}}%{?dist}.6 +Release: 1%{?rctagfedora:.%{rctagfedora}}%{?dist} Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 Url: http://www.vba-m.com Source0: https://github.com/%{name}/%{name}/archive/v%{upstreamtag}.tar.gz#/%{name}-%{version}%{?rctagfedora:-%{rctagfedora}}.tar.gz -#Upstream patch: -#https://github.com/visualboyadvance-m/visualboyadvance-m/commit/af0de1c4b308ef8d9a081ecf407805b75a99d877 -Patch0: 0001-xbrz-fix-inline-asm-check.patch -#https://github.com/visualboyadvance-m/visualboyadvance-m/commit/410ede543c98c8c6dd89c25484da3bffb46f4187 -Patch1: 0001-Check-for-null-pointer-in-soundReset.patch -#https://github.com/visualboyadvance-m/visualboyadvance-m/commit/619a5cce683ec4b1d03f08f316ba276d8f8cd824 -Patch2: 0001-SDL-Fix-build-with-SDL-2.0.14-after-KMOD_GUI-change-.patch +#https://github.com/visualboyadvance-m/visualboyadvance-m/commit/8e4acfc91d17b24d5ab64b9defd04f85010add1d +Patch0: 0001-Fix-build-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch +#https://github.com/visualboyadvance-m/visualboyadvance-m/pull/1065 +Patch1: 0001-Add-stdint-includes.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cairo-devel @@ -91,7 +89,7 @@ chmod -x src/wx/rpi.h %check desktop-file-validate \ - %{buildroot}%{_datadir}/applications/wx%{shortname}.desktop + %{buildroot}%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet \ %{buildroot}/%{_datadir}/appdata/*.appdata.xml @@ -100,10 +98,10 @@ appstream-util validate-relax --nonet \ %doc doc/ips.htm %{_mandir}/man6/%{name}.* %{_bindir}/%{name} -%{_datadir}/applications/wx%{shortname}.desktop -%{_datadir}/appdata/wx%{shortname}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/%{shortname} -%{_datadir}/icons/hicolor/*/apps/%{shortname}.* +%{_datadir}/icons/hicolor/*/apps/%{name}.* %files sdl %doc doc/ReadMe.SDL.txt @@ -113,6 +111,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Mon Jan 30 2024 Jeremy Newton - 2.1.5-1 +- Update to 2.1.5 + * Sat Jan 21 2023 Fedora Release Engineering - 2.1.4-4.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 65249c981a5df5e6559bc8db7d46dad0c3a65be6 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Fri, 14 Jul 2023 17:41:07 -0400 Subject: [PATCH 12/32] Update to 2.1.6 --- .gitignore | 1 + 0001-Add-stdint-includes.patch | 38 ----- ...ild-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch | 149 ------------------ sources | 2 +- visualboyadvance-m.spec | 15 +- 5 files changed, 9 insertions(+), 196 deletions(-) delete mode 100644 0001-Add-stdint-includes.patch delete mode 100644 0001-Fix-build-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch diff --git a/.gitignore b/.gitignore index 1614a65..b8205ce 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /visualboyadvance-m-2.1.3.tar.gz /visualboyadvance-m-2.1.4.tar.gz /visualboyadvance-m-2.1.5.tar.gz +/visualboyadvance-m-2.1.6.tar.gz diff --git a/0001-Add-stdint-includes.patch b/0001-Add-stdint-includes.patch deleted file mode 100644 index d91af5c..0000000 --- a/0001-Add-stdint-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 425e7a0aa0e6c46b2986d9017566fa0ef3b04681 Mon Sep 17 00:00:00 2001 -From: Jeremy Newton -Date: Mon, 30 Jan 2023 22:12:57 -0500 -Subject: [PATCH] Add stdint includes - -I believe this is needed on newer GCC's ---- - src/wx/config/option.h | 1 + - src/wx/widgets/wx/wxmisc.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/wx/config/option.h b/src/wx/config/option.h -index fae2628a..47ecb8a5 100644 ---- a/src/wx/config/option.h -+++ b/src/wx/config/option.h -@@ -7,6 +7,7 @@ - #include - #include - -+#include - #include - - #include "config/option-id.h" -diff --git a/src/wx/widgets/wx/wxmisc.h b/src/wx/widgets/wx/wxmisc.h -index a72ef4e5..2aec4acc 100644 ---- a/src/wx/widgets/wx/wxmisc.h -+++ b/src/wx/widgets/wx/wxmisc.h -@@ -2,6 +2,7 @@ - #define WX_MISC_H - // utility widgets - -+#include - #include - #include - --- -2.37.3 - diff --git a/0001-Fix-build-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch b/0001-Fix-build-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch deleted file mode 100644 index 9b454c7..0000000 --- a/0001-Fix-build-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 8e4acfc91d17b24d5ab64b9defd04f85010add1d Mon Sep 17 00:00:00 2001 -From: Rafael Kitover -Date: Wed, 28 Dec 2022 17:18:44 +0000 -Subject: [PATCH] Fix build w/wxUSE_GLCANVAS_EGL=0, on Fedora - -Disable the EGL subsurface move backport for Wayland GLCanvas if the wx -config sets wxUSE_GLCANVAS_EGL=0 (off.) - -This fixes the build failure on Fedora. To fix the functionality, -however, they need to enable the EGL GLCanvas in their wx builds. - -Also use a different hack to access the private wxGLCanvasEGL member -using template instantiation instead of redefining a keyword as a macro. - -Refer #1028 - -Signed-off-by: Rafael Kitover ---- - src/wx/CMakeLists.txt | 3 +-- - src/wx/wayland.cpp | 18 ++++++++++++++---- - src/wx/wayland.h | 7 ++++--- - src/wx/widgets/checkedlistctrl.cpp | 3 +-- - src/wx/wxhead.h | 7 ------- - 5 files changed, 20 insertions(+), 18 deletions(-) - -diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt -index e25780e8..a8fb9505 100644 ---- a/src/wx/CMakeLists.txt -+++ b/src/wx/CMakeLists.txt -@@ -318,7 +318,6 @@ else() - set(WX_TEST_CONSOLE_APP " - #include - #include --#include - #include - - #ifdef _WIN32 -@@ -459,7 +458,7 @@ int main(int argc, char** argv) - - if(NOT DEFINED WX_HAS_OPENGL) - check_cxx_source_compiles(" --#include -+#include - #include - #include - -diff --git a/src/wx/wayland.cpp b/src/wx/wayland.cpp -index 460c3d96..78b53696 100644 ---- a/src/wx/wayland.cpp -+++ b/src/wx/wayland.cpp -@@ -11,16 +11,26 @@ bool IsWayland() { return GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default()); } - // Temporary hack to backport 800d6ed69b from wxWidgets until 3.2.2 is released. - #ifdef WAYLAND_MOVE_SUBSURFACE_BACKPORT - #include --#define private public - #include --#undef private - --void MoveWaylandSubsurface(wxGLCanvas* win) -+wl_subsurface* wxGLCanvasEGL::* private_ptr; -+ -+template -+struct accessor { -+ static int force_init; -+}; -+ -+template -+int accessor::force_init = ((private_ptr = Ptr), 0); -+ -+template struct accessor<&wxGLCanvasEGL::m_wlSubsurface>; -+ -+void MoveWaylandSubsurface(wxGLCanvasEGL* win) - { - if (!IsWayland()) return; - - int x, y; - gdk_window_get_origin(win->GTKGetDrawingWindow(), &x, &y); -- wl_subsurface_set_position(win->m_wlSubsurface, x, y); -+ wl_subsurface_set_position(win->*private_ptr, x, y); - } - #endif -diff --git a/src/wx/wayland.h b/src/wx/wayland.h -index 7b2a810f..65a14c5b 100644 ---- a/src/wx/wayland.h -+++ b/src/wx/wayland.h -@@ -3,7 +3,8 @@ - - #include - --class wxGLCanvas; // Forward declare. -+class wxGLCanvas; // Forward declare. -+class wxGLCanvasEGL; - - #if defined(__WXGTK__) - #include -@@ -21,11 +22,11 @@ constexpr bool IsWayland() { return false; } - #endif // wayland - - // Temporary hack to backport 800d6ed69b from wxWidgets until 3.2.2 is released. --#if defined(__WXGTK__) && defined(HAVE_EGL) && wxCHECK_VERSION(3, 2, 0) && !wxCHECK_VERSION(3, 2, 2) -+#if defined(__WXGTK__) && defined(HAVE_EGL) && wxCHECK_VERSION(3, 2, 0) && !wxCHECK_VERSION(3, 2, 2) && wxUSE_GLCANVAS_EGL - - #define WAYLAND_MOVE_SUBSURFACE_BACKPORT - --void MoveWaylandSubsurface(wxGLCanvas* win); -+void MoveWaylandSubsurface(wxGLCanvasEGL* win); - - #else - -diff --git a/src/wx/widgets/checkedlistctrl.cpp b/src/wx/widgets/checkedlistctrl.cpp -index a5ad2b94..9dd8f8ed 100644 ---- a/src/wx/widgets/checkedlistctrl.cpp -+++ b/src/wx/widgets/checkedlistctrl.cpp -@@ -9,8 +9,7 @@ - // Licence: wxWidgets licence - ///////////////////////////////////////////////////////////////////////////// - --// For compilers that support precompilation, includes "wx.h". --#include "wx/wxprec.h" -+#include - - #ifdef __BORLANDC__ - #pragma hdrstop -diff --git a/src/wx/wxhead.h b/src/wx/wxhead.h -index b00bcd11..ad411187 100644 ---- a/src/wx/wxhead.h -+++ b/src/wx/wxhead.h -@@ -1,18 +1,11 @@ - #ifndef WX_WXHEAD_H - #define WX_WXHEAD_H - --// For compilers that support precompilation, includes . --#include -- - #ifdef __BORLANDC__ - #pragma hdrstop - #endif - --// for all others, include the necessary headers (this file is usually all you --// need because it includes almost all "standard" wxWidgets headers) --#ifndef WX_PRECOMP - #include --#endif - - // The following are not pulled in by wx.h - --- -2.37.3 - diff --git a/sources b/sources index d5da7a1..e03843e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visualboyadvance-m-2.1.5.tar.gz) = 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7 +SHA512 (visualboyadvance-m-2.1.6.tar.gz) = 7a49de78e21b9d2bd12ca5954340009cd16b33764d8e711b066c90fb8268bd6d3ab35b4f7ae044b95e394e9aaaac7124195052b294e9630e62579cf5647c26ec diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 605e035..713edc2 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -2,7 +2,7 @@ %global shortname vbam #Upstream git tag/commit: -%global upstreamtag 2.1.5 +%global upstreamtag 2.1.6 #Sanitized RC name (for fedora) #global rctagfedora git78cd223 #RC Version that appears in app @@ -16,10 +16,6 @@ Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 Url: http://www.vba-m.com Source0: https://github.com/%{name}/%{name}/archive/v%{upstreamtag}.tar.gz#/%{name}-%{version}%{?rctagfedora:-%{rctagfedora}}.tar.gz -#https://github.com/visualboyadvance-m/visualboyadvance-m/commit/8e4acfc91d17b24d5ab64b9defd04f85010add1d -Patch0: 0001-Fix-build-w-wxUSE_GLCANVAS_EGL-0-on-Fedora.patch -#https://github.com/visualboyadvance-m/visualboyadvance-m/pull/1065 -Patch1: 0001-Add-stdint-includes.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -91,7 +87,7 @@ chmod -x src/wx/rpi.h desktop-file-validate \ %{buildroot}%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/appdata/*.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{name}.metainfo.xml %files -f wx%{shortname}.lang %license doc/gpl.txt doc/License.txt @@ -99,7 +95,7 @@ appstream-util validate-relax --nonet \ %{_mandir}/man6/%{name}.* %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/%{name}.metainfo.xml %{_datadir}/%{shortname} %{_datadir}/icons/hicolor/*/apps/%{name}.* @@ -111,7 +107,10 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog -* Mon Jan 30 2024 Jeremy Newton - 2.1.5-1 +* Fri Jul 14 2023 Jeremy Newton - 2.1.6-1 +- Update to 2.1.6 + +* Mon Jan 30 2023 Jeremy Newton - 2.1.5-1 - Update to 2.1.5 * Sat Jan 21 2023 Fedora Release Engineering - 2.1.4-4.6 From 958a3c91bef8231a4f363f8f10244e55949fbc1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:46:41 +0000 Subject: [PATCH 13/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- visualboyadvance-m.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 713edc2..f44fb14 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 1%{?rctagfedora:.%{rctagfedora}}%{?dist} +Release: 1%{?rctagfedora:.%{rctagfedora}}%{?dist}.1 Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -107,6 +107,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.1.6-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jul 14 2023 Jeremy Newton - 2.1.6-1 - Update to 2.1.6 From c28e2f68629c75dd05fe6827fdcceefbc2048964 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Wed, 13 Sep 2023 18:32:31 -0400 Subject: [PATCH 14/32] Update to 2.1.7 --- .gitignore | 1 + sources | 2 +- visualboyadvance-m.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b8205ce..485b9b7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /visualboyadvance-m-2.1.4.tar.gz /visualboyadvance-m-2.1.5.tar.gz /visualboyadvance-m-2.1.6.tar.gz +/visualboyadvance-m-2.1.7.tar.gz diff --git a/sources b/sources index e03843e..fe80ffb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visualboyadvance-m-2.1.6.tar.gz) = 7a49de78e21b9d2bd12ca5954340009cd16b33764d8e711b066c90fb8268bd6d3ab35b4f7ae044b95e394e9aaaac7124195052b294e9630e62579cf5647c26ec +SHA512 (visualboyadvance-m-2.1.7.tar.gz) = 3aab71c6843beb3446f30318580ca6df890560d85498d0112666a7e65fecec3d7c8d13a02bb561917d46019ecd39713e189748ae39353dee39c04d49ff82ce88 diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index f44fb14..2bd018e 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -2,7 +2,7 @@ %global shortname vbam #Upstream git tag/commit: -%global upstreamtag 2.1.6 +%global upstreamtag 2.1.7 #Sanitized RC name (for fedora) #global rctagfedora git78cd223 #RC Version that appears in app @@ -107,6 +107,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Wed Sep 13 2023 Jeremy Newton - 2.1.7-1 +- Update to 2.1.7 + * Sat Jul 22 2023 Fedora Release Engineering - 2.1.6-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 6e5165685d79424e69acf6c3f5e473a6112cf29e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 5 Nov 2023 20:02:25 +0000 Subject: [PATCH 15/32] Rebuild for SFML-2.6.1 --- visualboyadvance-m.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 2bd018e..41adf9b 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 1%{?rctagfedora:.%{rctagfedora}}%{?dist}.1 +Release: 1%{?rctagfedora:.%{rctagfedora}}%{?dist}.2 Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -107,6 +107,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Sun Nov 05 2023 Sérgio Basto - 2.1.7-1.2 +- Rebuild for SFML-2.6.1 + * Wed Sep 13 2023 Jeremy Newton - 2.1.7-1 - Update to 2.1.7 From 2aaa7b6d19a05a13b4794d4df752af9d19bfcfc8 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Thu, 4 Jan 2024 13:29:11 -0500 Subject: [PATCH 16/32] Convert to auto changelog Clean up logic --- changelog | 235 +++++++++++++++++++++++++++++++++++++ visualboyadvance-m.spec | 252 +--------------------------------------- 2 files changed, 241 insertions(+), 246 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..71eb4bc --- /dev/null +++ b/changelog @@ -0,0 +1,235 @@ +* Sun Nov 05 2023 Sérgio Basto - 2.1.7-1.2 +- Rebuild for SFML-2.6.1 + +* Wed Sep 13 2023 Jeremy Newton - 2.1.7-1 +- Update to 2.1.7 + +* Sat Jul 22 2023 Fedora Release Engineering - 2.1.6-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 14 2023 Jeremy Newton - 2.1.6-1 +- Update to 2.1.6 + +* Mon Jan 30 2023 Jeremy Newton - 2.1.5-1 +- Update to 2.1.5 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.1.4-4.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Nov 27 2022 Mamoru TASAKA - 2.1.4-4.5 +- Rebuild due to wxGLCanvas ABI change + +* Thu Aug 04 2022 Scott Talbert - 2.1.4-4.4 +- Rebuild with wxWidgets 3.2 + +* Sat Jul 23 2022 Fedora Release Engineering - 2.1.4-4.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.1.4-4.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.1.4-4.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Jeremy Newton - 2.1.4-4 +- Cherry-pick build fix for SDL + +* Wed Jul 29 2020 Fedora Release Engineering - 2.1.4-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Mar 11 2020 Jeremy Newton - 2.1.4-3 +- Fix RHBZ#1776006 + +* Fri Mar 6 2020 Jeremy Newton - 2.1.4-2 +- Fix non x86 arches (backported a patch from upstream) + +* Fri Jan 31 2020 Fedora Release Engineering - 2.1.4-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + + * Wed Dec 11 2019 Jeremy Newton - 2.1.4-1 +- Update to v2.1.4 + +* Sat Jul 27 2019 Fedora Release Engineering - 2.1.3-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + + * Tue Apr 23 2019 Jeremy Newton - 2.1.3-1 +- Update to v2.1.3 + +* Sun Feb 03 2019 Fedora Release Engineering - 2.1.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + + * Sat Sep 15 2018 Jeremy Newton - 2.1.0-2 +- Actually use 2.1.0 sources +- Add performance patch for xserver + +* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + + * Sun Jul 01 2018 Jeremy Newton - 2.1.0-1 +- Update to v2.1.0 + +* Thu Mar 15 2018 Jeremy Newton - 2.0.2-1 +- Update to v2.0.2 +- Cleanup old rpmfusion provides + +* Fri Feb 09 2018 Fedora Release Engineering - 2.0.1-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Igor Gnatenko - 2.0.1-1.1 +- Remove obsolete scriptlets + +* Mon Dec 11 2017 Jeremy Newton - 2.0.1-1 +- Update to v2.0.1 +- Cleanup + +* Thu Aug 03 2017 Fedora Release Engineering - 2.0.0-0.18.git78cd223 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.0-0.17.git78cd223 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Mar 16 2017 Jeremy Newton - 2.0.0-0.16.git78cd223 +- Update to new git snapshot + +* Sun Mar 05 2017 Jeremy Newton - 2.0.0-0.15.git7b85964 +- Update to new git snapshot + +* Sun Mar 05 2017 Jeremy Newton - 2.0.0-0.14.waylandplus +- Update to new version +- Add patch for SDL issues +- Fix incorrect bug tracker link + +* Mon Feb 20 2017 Jeremy Newton - 2.0.0-0.13.git6a7d494 +- Update to git snapshot, fixes many issues +- Drop wayland and openal fixes (better fixes have been upstreamed) +- Better workaround patch for sound syncing issue + +* Wed Feb 15 2017 Jeremy Newton - 2.0.0-0.12.Beta3 +- Rebuilt for SFML 2.4 + +* Sat Feb 11 2017 Jeremy Newton - 2.0.0-0.11.Beta3 +- Added missing obsoletes for vbam-common (from rpmfusion) +- Tweaking openal patch + +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.0-0.10.Beta3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 30 2017 Jeremy Newton - 2.0.0-0.9.Beta3 +- Fix dynamic loading of openal library if openal-soft-devel is not installed + +* Sun Jan 29 2017 Jeremy Newton - 2.0.0-0.8.Beta3 +- Add patch to fix wayland drawing +- Remove launcher to force xwayland + +* Thu Jan 19 2017 Jeremy Newton - 2.0.0-0.7.Beta3 +- Force X11/xwayland, rendering issues exist on Wayland +- Enable cairo to fix wx segfaults on xwayland + +* Thu Jan 19 2017 Dan Horák - 2.0.0-0.6.Beta3 +- Don't override distro-wide -mtune option + +* Wed Jan 18 2017 Jeremy Newton - 2.0.0-0.5.Beta3 +- Added fix for armv7hl and pcc + +* Fri Dec 30 2016 Jeremy Newton - 2.0.0-0.4.Beta3 +- Added missing desktop scriptlet for f24 +- Added missing build requires +- Missing hicolor-icon-theme require +- Use sysconfdir macro in spec + +* Wed Dec 21 2016 Jeremy Newton - 2.0.0-0.3.Beta3 +- Update to beta 3 +- Dropping GTK, upstream no longer supports this +- Change packagename visualboyadvance-m to reflect upstream +- Various tweaks + +* Sat Dec 10 2016 Jeremy Newton - 2.0.0-0.2.beta2 +- Added patch to fix audio syncing issues +- Added fixes for linux data files + +* Fri Dec 9 2016 Jeremy Newton - 2.0.0-0.1.beta2 +- Update to 2.0.0 beta 2 +- Re-enable wx GUI +- Rename common subpackage to data +- Added appdata +- Build Require cleanup + +* Thu Jul 7 2016 Hans de Goede - 1.8.0.1229-3 +- Fix building with gcc6 / fix FTBFS + +* Mon Jan 12 2015 Jeremy Newton - 1.8.0.1229-2 +- Fix typo in desktop file + +* Sat Apr 5 2014 Jeremy Newton - 1.8.0.1229-1 +- Update to latest "release" version + +* Mon Nov 18 2013 Jeremy Newton - 1.8.0.1228-3 +- Update patch for SFML, thanks to Hans de Goede + +* Sun Nov 17 2013 Jeremy Newton - 1.8.0.1228-2 +- Added patch for SFML + +* Sun Nov 17 2013 Jeremy Newton - 1.8.0.1228-1 +- Updated to new snapshot version + +* Fri Mar 1 2013 Jeremy Newton - 1.8.0.1159-1 +- Updated to new upstream version +- Fixed some spec date typos + +* Mon Dec 10 2012 Jeremy Newton - 1.8.0.1149-1 +- Updated to new upstream version +- FFMpeg dep removed due to only needed by wx and now disabled by default + +* Thu Jul 5 2012 Jeremy Newton - 1.8.0.1097-1 +- Updated to new upstream version +- Disabling WX because its not supported +- Removed extra sources as they are now included +- Removed FFMPEG fix +- Moved ips.htm doc file into common to avoid duplicates +- Various cleanup + +* Wed Mar 28 2012 Jeremy Newton - 1.8.0.1054-6 +- Added man pages + +* Tue Feb 14 2012 Jeremy Newton - 1.8.0.1054-5 +- Added Zip as a dependancy + +* Tue Feb 14 2012 Jeremy Newton - 1.8.0.1054-4 +- Changed building commands to avoid failed builds + +* Sun Jan 29 2012 Jeremy Newton - 1.8.0.1054-3 +- Added missing Build Requirement: openal-soft-devel +- Removed redundant license files + +* Thu Jan 26 2012 Jeremy Newton - 1.8.0.1054-2 +- Added DCMAKE_SKIP_RPATH=ON to cmake (fixes rpath error) +- Added more relevant package summaries +- Fixed up the descriptions a bit +- Enabled Linking Support +- Various tweaks + +* Thu Jan 26 2012 Jeremy Newton - 1.8.0.1054-1 +- Updated to new upstream version +- Added new WX subpackage for new GUI +- Adding WX requires gui common subpackage to avoid conflicts +- Added DVERSION cmake tag for aesthetic reasons + +* Sun Jan 22 2012 Jeremy Newton - 1.8.0.1001-4 +- Added vbam-common package to avoid conflicts with common files +- Added ImageMagick build dep, as cmake checks for it +- Building now uses cmake macro +- Turned off building shared libs +- Removed unnecessary lines +- Fixed debuginfo-without-sources issue + +* Sun Jan 22 2012 Jeremy Newton - 1.8.0.1001-3 +- Fixed SPM summary +- Cleaned up SPEC for easier reading + +* Sun Jan 8 2012 Jeremy Newton - 1.8.0.1001-2 +- Fixed up spec file +- Split into two packages: sdl, gtk + +* Sun Dec 18 2011 Jeremy Newton - 1.8.0.1001-1 +- Initial package SPEC created + diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 41adf9b..18d32a6 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -1,21 +1,15 @@ %undefine _hardened_build %global shortname vbam -#Upstream git tag/commit: -%global upstreamtag 2.1.7 -#Sanitized RC name (for fedora) -#global rctagfedora git78cd223 -#RC Version that appears in app -#global rcversion Beta3-07032017 Name: visualboyadvance-m -Version: %{upstreamtag} -Release: 1%{?rctagfedora:.%{rctagfedora}}%{?dist}.2 +Version: 2.1.7 +Release: %autorelease Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 Url: http://www.vba-m.com -Source0: https://github.com/%{name}/%{name}/archive/v%{upstreamtag}.tar.gz#/%{name}-%{version}%{?rctagfedora:-%{rctagfedora}}.tar.gz +Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ @@ -63,7 +57,7 @@ variants. VBA-M is a continued development of the now inactive VisualBoy Advance project, with many improvements from various developments of VBA. %prep -%autosetup -p1 -n %{name}-%{upstreamtag} +%autosetup -p1 -n %{name}-%{version} sed -i 's/ -mtune=generic//g' CMakeLists.txt #Some odd permission issues: chmod -x src/wx/rpi.h @@ -71,7 +65,7 @@ chmod -x src/wx/rpi.h %build %cmake \ -DCMAKE_SKIP_RPATH=ON \ - -DVERSION="%{version}%{?rcversion: %{rcversion}}" \ + -DVERSION="%{version}" \ -DVERSION_RELEASE=TRUE \ -DENABLE_SDL=ON \ -DENABLE_WX=ON \ @@ -107,238 +101,4 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog -* Sun Nov 05 2023 Sérgio Basto - 2.1.7-1.2 -- Rebuild for SFML-2.6.1 - -* Wed Sep 13 2023 Jeremy Newton - 2.1.7-1 -- Update to 2.1.7 - -* Sat Jul 22 2023 Fedora Release Engineering - 2.1.6-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jul 14 2023 Jeremy Newton - 2.1.6-1 -- Update to 2.1.6 - -* Mon Jan 30 2023 Jeremy Newton - 2.1.5-1 -- Update to 2.1.5 - -* Sat Jan 21 2023 Fedora Release Engineering - 2.1.4-4.6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sun Nov 27 2022 Mamoru TASAKA - 2.1.4-4.5 -- Rebuild due to wxGLCanvas ABI change - -* Thu Aug 04 2022 Scott Talbert - 2.1.4-4.4 -- Rebuild with wxWidgets 3.2 - -* Sat Jul 23 2022 Fedora Release Engineering - 2.1.4-4.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.1.4-4.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.1.4-4.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Jeremy Newton - 2.1.4-4 -- Cherry-pick build fix for SDL - -* Wed Jul 29 2020 Fedora Release Engineering - 2.1.4-3.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Mar 11 2020 Jeremy Newton - 2.1.4-3 -- Fix RHBZ#1776006 - -* Fri Mar 6 2020 Jeremy Newton - 2.1.4-2 -- Fix non x86 arches (backported a patch from upstream) - -* Fri Jan 31 2020 Fedora Release Engineering - 2.1.4-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - - * Wed Dec 11 2019 Jeremy Newton - 2.1.4-1 -- Update to v2.1.4 - -* Sat Jul 27 2019 Fedora Release Engineering - 2.1.3-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - - * Tue Apr 23 2019 Jeremy Newton - 2.1.3-1 -- Update to v2.1.3 - -* Sun Feb 03 2019 Fedora Release Engineering - 2.1.0-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - - * Sat Sep 15 2018 Jeremy Newton - 2.1.0-2 -- Actually use 2.1.0 sources -- Add performance patch for xserver - -* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - - * Sun Jul 01 2018 Jeremy Newton - 2.1.0-1 -- Update to v2.1.0 - -* Thu Mar 15 2018 Jeremy Newton - 2.0.2-1 -- Update to v2.0.2 -- Cleanup old rpmfusion provides - -* Fri Feb 09 2018 Fedora Release Engineering - 2.0.1-1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 2.0.1-1.1 -- Remove obsolete scriptlets - -* Mon Dec 11 2017 Jeremy Newton - 2.0.1-1 -- Update to v2.0.1 -- Cleanup - -* Thu Aug 03 2017 Fedora Release Engineering - 2.0.0-0.18.git78cd223 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0.0-0.17.git78cd223 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Mar 16 2017 Jeremy Newton - 2.0.0-0.16.git78cd223 -- Update to new git snapshot - -* Sun Mar 05 2017 Jeremy Newton - 2.0.0-0.15.git7b85964 -- Update to new git snapshot - -* Sun Mar 05 2017 Jeremy Newton - 2.0.0-0.14.waylandplus -- Update to new version -- Add patch for SDL issues -- Fix incorrect bug tracker link - -* Mon Feb 20 2017 Jeremy Newton - 2.0.0-0.13.git6a7d494 -- Update to git snapshot, fixes many issues -- Drop wayland and openal fixes (better fixes have been upstreamed) -- Better workaround patch for sound syncing issue - -* Wed Feb 15 2017 Jeremy Newton - 2.0.0-0.12.Beta3 -- Rebuilt for SFML 2.4 - -* Sat Feb 11 2017 Jeremy Newton - 2.0.0-0.11.Beta3 -- Added missing obsoletes for vbam-common (from rpmfusion) -- Tweaking openal patch - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0.0-0.10.Beta3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jan 30 2017 Jeremy Newton - 2.0.0-0.9.Beta3 -- Fix dynamic loading of openal library if openal-soft-devel is not installed - -* Sun Jan 29 2017 Jeremy Newton - 2.0.0-0.8.Beta3 -- Add patch to fix wayland drawing -- Remove launcher to force xwayland - -* Thu Jan 19 2017 Jeremy Newton - 2.0.0-0.7.Beta3 -- Force X11/xwayland, rendering issues exist on Wayland -- Enable cairo to fix wx segfaults on xwayland - -* Thu Jan 19 2017 Dan Horák - 2.0.0-0.6.Beta3 -- Don't override distro-wide -mtune option - -* Wed Jan 18 2017 Jeremy Newton - 2.0.0-0.5.Beta3 -- Added fix for armv7hl and pcc - -* Fri Dec 30 2016 Jeremy Newton - 2.0.0-0.4.Beta3 -- Added missing desktop scriptlet for f24 -- Added missing build requires -- Missing hicolor-icon-theme require -- Use sysconfdir macro in spec - -* Wed Dec 21 2016 Jeremy Newton - 2.0.0-0.3.Beta3 -- Update to beta 3 -- Dropping GTK, upstream no longer supports this -- Change packagename visualboyadvance-m to reflect upstream -- Various tweaks - -* Sat Dec 10 2016 Jeremy Newton - 2.0.0-0.2.beta2 -- Added patch to fix audio syncing issues -- Added fixes for linux data files - -* Fri Dec 9 2016 Jeremy Newton - 2.0.0-0.1.beta2 -- Update to 2.0.0 beta 2 -- Re-enable wx GUI -- Rename common subpackage to data -- Added appdata -- Build Require cleanup - -* Thu Jul 7 2016 Hans de Goede - 1.8.0.1229-3 -- Fix building with gcc6 / fix FTBFS - -* Mon Jan 12 2015 Jeremy Newton - 1.8.0.1229-2 -- Fix typo in desktop file - -* Sat Apr 5 2014 Jeremy Newton - 1.8.0.1229-1 -- Update to latest "release" version - -* Mon Nov 18 2013 Jeremy Newton - 1.8.0.1228-3 -- Update patch for SFML, thanks to Hans de Goede - -* Sun Nov 17 2013 Jeremy Newton - 1.8.0.1228-2 -- Added patch for SFML - -* Sun Nov 17 2013 Jeremy Newton - 1.8.0.1228-1 -- Updated to new snapshot version - -* Fri Mar 1 2013 Jeremy Newton - 1.8.0.1159-1 -- Updated to new upstream version -- Fixed some spec date typos - -* Mon Dec 10 2012 Jeremy Newton - 1.8.0.1149-1 -- Updated to new upstream version -- FFMpeg dep removed due to only needed by wx and now disabled by default - -* Thu Jul 5 2012 Jeremy Newton - 1.8.0.1097-1 -- Updated to new upstream version -- Disabling WX because its not supported -- Removed extra sources as they are now included -- Removed FFMPEG fix -- Moved ips.htm doc file into common to avoid duplicates -- Various cleanup - -* Wed Mar 28 2012 Jeremy Newton - 1.8.0.1054-6 -- Added man pages - -* Tue Feb 14 2012 Jeremy Newton - 1.8.0.1054-5 -- Added Zip as a dependancy - -* Tue Feb 14 2012 Jeremy Newton - 1.8.0.1054-4 -- Changed building commands to avoid failed builds - -* Sun Jan 29 2012 Jeremy Newton - 1.8.0.1054-3 -- Added missing Build Requirement: openal-soft-devel -- Removed redundant license files - -* Thu Jan 26 2012 Jeremy Newton - 1.8.0.1054-2 -- Added DCMAKE_SKIP_RPATH=ON to cmake (fixes rpath error) -- Added more relevant package summaries -- Fixed up the descriptions a bit -- Enabled Linking Support -- Various tweaks - -* Thu Jan 26 2012 Jeremy Newton - 1.8.0.1054-1 -- Updated to new upstream version -- Added new WX subpackage for new GUI -- Adding WX requires gui common subpackage to avoid conflicts -- Added DVERSION cmake tag for aesthetic reasons - -* Sun Jan 22 2012 Jeremy Newton - 1.8.0.1001-4 -- Added vbam-common package to avoid conflicts with common files -- Added ImageMagick build dep, as cmake checks for it -- Building now uses cmake macro -- Turned off building shared libs -- Removed unnecessary lines -- Fixed debuginfo-without-sources issue - -* Sun Jan 22 2012 Jeremy Newton - 1.8.0.1001-3 -- Fixed SPM summary -- Cleaned up SPEC for easier reading - -* Sun Jan 8 2012 Jeremy Newton - 1.8.0.1001-2 -- Fixed up spec file -- Split into two packages: sdl, gtk - -* Sun Dec 18 2011 Jeremy Newton - 1.8.0.1001-1 -- Initial package SPEC created - +%autochangelog From f549360ba5a8bc107bce68549222e3c0dd64bb89 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Thu, 4 Jan 2024 14:29:13 -0500 Subject: [PATCH 17/32] Update to 2.1.8 --- .gitignore | 1 + sources | 2 +- visualboyadvance-m.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 485b9b7..baf3453 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /visualboyadvance-m-2.1.5.tar.gz /visualboyadvance-m-2.1.6.tar.gz /visualboyadvance-m-2.1.7.tar.gz +/visualboyadvance-m-2.1.8.tar.gz diff --git a/sources b/sources index fe80ffb..bb900ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visualboyadvance-m-2.1.7.tar.gz) = 3aab71c6843beb3446f30318580ca6df890560d85498d0112666a7e65fecec3d7c8d13a02bb561917d46019ecd39713e189748ae39353dee39c04d49ff82ce88 +SHA512 (visualboyadvance-m-2.1.8.tar.gz) = 01c0b0ddd498d285bc02c1cbd05c3b99014d23616e8bf2ac7016fbce076a2135c77a0857543f748e696f7fef681defbd859969ba232722c541cef812295c3153 diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 18d32a6..c9cc458 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -3,7 +3,7 @@ %global shortname vbam Name: visualboyadvance-m -Version: 2.1.7 +Version: 2.1.8 Release: %autorelease Summary: High compatibility Gameboy Advance Emulator combining VBA builds From 5b800d363a60c6054442a78c8f8daacbab4b9e78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:01:28 +0000 Subject: [PATCH 18/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 43dd0266873f191266ae1034b7e322ad70a6d851 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Thu, 8 Feb 2024 21:42:14 -0500 Subject: [PATCH 19/32] Update to 2.1.9 --- .gitignore | 1 + sources | 2 +- visualboyadvance-m.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index baf3453..a717fa9 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /visualboyadvance-m-2.1.6.tar.gz /visualboyadvance-m-2.1.7.tar.gz /visualboyadvance-m-2.1.8.tar.gz +/visualboyadvance-m-2.1.9.tar.gz diff --git a/sources b/sources index bb900ba..f85952c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visualboyadvance-m-2.1.8.tar.gz) = 01c0b0ddd498d285bc02c1cbd05c3b99014d23616e8bf2ac7016fbce076a2135c77a0857543f748e696f7fef681defbd859969ba232722c541cef812295c3153 +SHA512 (visualboyadvance-m-2.1.9.tar.gz) = de3d9256e18eec7cad785871d002fd6defa148cfe80001c4ff00c8dd04ffec53a721bd280a590c7ef5213a82125f190966c7769250a6aa660c477707ba5539d6 diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index c9cc458..83d6e36 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -3,7 +3,7 @@ %global shortname vbam Name: visualboyadvance-m -Version: 2.1.8 +Version: 2.1.9 Release: %autorelease Summary: High compatibility Gameboy Advance Emulator combining VBA builds From 0440f8231b42a565ea446d1fe7489ed2888a0cc9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:54:36 +0000 Subject: [PATCH 20/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f6015a91d2b5f15317694c3976fda9e622c36c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 12:28:39 +0200 Subject: [PATCH 21/32] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- visualboyadvance-m.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 83d6e36..bbca26f 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -7,7 +7,8 @@ Version: 2.1.9 Release: %autorelease Summary: High compatibility Gameboy Advance Emulator combining VBA builds -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only Url: http://www.vba-m.com Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz From cddb07d050be555c405daa36c257fbfe09fceda6 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Fri, 13 Sep 2024 09:59:33 -0400 Subject: [PATCH 22/32] Update to 2.1.10 --- .gitignore | 1 + sources | 2 +- visualboyadvance-m.spec | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a717fa9..dc4b06c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /visualboyadvance-m-2.1.7.tar.gz /visualboyadvance-m-2.1.8.tar.gz /visualboyadvance-m-2.1.9.tar.gz +/visualboyadvance-m-2.1.10.tar.gz diff --git a/sources b/sources index f85952c..45957c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visualboyadvance-m-2.1.9.tar.gz) = de3d9256e18eec7cad785871d002fd6defa148cfe80001c4ff00c8dd04ffec53a721bd280a590c7ef5213a82125f190966c7769250a6aa660c477707ba5539d6 +SHA512 (visualboyadvance-m-2.1.10.tar.gz) = 85bb8ca5a12199c9d6bf3741147416a086f7001020874c098a5db015ee4079ffe3d0cee1e69c1ce9eabcf3615baabeb11988df0ae8742eb9caffd1a7a5cc7231 diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index bbca26f..77e5023 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -3,7 +3,7 @@ %global shortname vbam Name: visualboyadvance-m -Version: 2.1.9 +Version: 2.1.10 Release: %autorelease Summary: High compatibility Gameboy Advance Emulator combining VBA builds @@ -71,6 +71,7 @@ chmod -x src/wx/rpi.h -DENABLE_SDL=ON \ -DENABLE_WX=ON \ -DENABLE_FFMPEG=OFF \ + -DBUILD_TESTING=OFF \ -DENABLE_LINK=ON %cmake_build From b601686a2d4f70b6d2c9cd4bb25fb0df1305e992 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Fri, 13 Sep 2024 10:45:57 -0400 Subject: [PATCH 23/32] Don't build on s390x --- visualboyadvance-m.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 77e5023..76f4717 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -35,8 +35,8 @@ BuildRequires: libappstream-glib Requires: hicolor-icon-theme -# 32bit package serves very little purpose: -ExcludeArch: %{ix86} +# 32bit package serves very little purpose, s390x has build issues: +ExcludeArch: %{ix86} s390x #Using info from here: http://vba-m.com/about.html and debian files %description From 0b8f46ca42e34c0912f3d2359a1e8ba33f6c3dd0 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Mon, 16 Sep 2024 20:34:44 -0400 Subject: [PATCH 24/32] Update to 2.1.11 --- .gitignore | 1 + sources | 2 +- visualboyadvance-m.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dc4b06c..dc1835d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /visualboyadvance-m-2.1.8.tar.gz /visualboyadvance-m-2.1.9.tar.gz /visualboyadvance-m-2.1.10.tar.gz +/visualboyadvance-m-2.1.11.tar.gz diff --git a/sources b/sources index 45957c1..a6c284c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visualboyadvance-m-2.1.10.tar.gz) = 85bb8ca5a12199c9d6bf3741147416a086f7001020874c098a5db015ee4079ffe3d0cee1e69c1ce9eabcf3615baabeb11988df0ae8742eb9caffd1a7a5cc7231 +SHA512 (visualboyadvance-m-2.1.11.tar.gz) = ca4bf876af85c23e32ea52aa29fcde9b6da7e3064b23bf4f4fcc95fece06065299ed5da032ad5179341e118f1925fa804ff7698d370b2e234c2077b13d26c02d diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 76f4717..75df619 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -3,7 +3,7 @@ %global shortname vbam Name: visualboyadvance-m -Version: 2.1.10 +Version: 2.1.11 Release: %autorelease Summary: High compatibility Gameboy Advance Emulator combining VBA builds @@ -71,7 +71,7 @@ chmod -x src/wx/rpi.h -DENABLE_SDL=ON \ -DENABLE_WX=ON \ -DENABLE_FFMPEG=OFF \ - -DBUILD_TESTING=OFF \ + -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ -DENABLE_LINK=ON %cmake_build From 1111c7b87b8430cc22833bd33daaef4d7cba2ae9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:30:18 +0000 Subject: [PATCH 25/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 007fda416aadc5a57d44c049ca383422fa156626 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Fri, 7 Feb 2025 15:53:33 -0500 Subject: [PATCH 26/32] Update URL --- visualboyadvance-m.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 75df619..96d7c81 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -9,8 +9,8 @@ Summary: High compatibility Gameboy Advance Emulator combining VBA builds # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only -Url: http://www.vba-m.com -Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Url: https://github.com/visualboyadvance-m/visualboyadvance-m +Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ From cf39d5def8f81bfe7a8955dd1992b4efb0bf5ca8 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Tue, 8 Jul 2025 23:05:09 -0400 Subject: [PATCH 27/32] Update to 2.2.0 --- .gitignore | 1 + sources | 2 +- visualboyadvance-m.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dc1835d..1a9124f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /visualboyadvance-m-2.1.9.tar.gz /visualboyadvance-m-2.1.10.tar.gz /visualboyadvance-m-2.1.11.tar.gz +/visualboyadvance-m-2.2.0.tar.gz diff --git a/sources b/sources index a6c284c..53b7184 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visualboyadvance-m-2.1.11.tar.gz) = ca4bf876af85c23e32ea52aa29fcde9b6da7e3064b23bf4f4fcc95fece06065299ed5da032ad5179341e118f1925fa804ff7698d370b2e234c2077b13d26c02d +SHA512 (visualboyadvance-m-2.2.0.tar.gz) = 8cfc7ba88226d125e124a1f9874fae88ae3a56c58747a756809a5abda0f6ab1669a52ea85cf002aae4ca7558f2b56be752fcfb5bb7b70ed78d5e64ce62af9642 diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 96d7c81..60a9882 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -3,7 +3,7 @@ %global shortname vbam Name: visualboyadvance-m -Version: 2.1.11 +Version: 2.2.0 Release: %autorelease Summary: High compatibility Gameboy Advance Emulator combining VBA builds From c1536aa1c0b1b5418e98977d3c218a12df7d59b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:10:03 +0000 Subject: [PATCH 28/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e39f05a1077feef578a7f14e20fc801c9786fbc3 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Thu, 7 Aug 2025 13:52:02 -0400 Subject: [PATCH 29/32] Update to 2.2.2 Fixes RHBZ#2379014 --- .gitignore | 1 + sources | 2 +- visualboyadvance-m.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1a9124f..5ceedfe 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /visualboyadvance-m-2.1.10.tar.gz /visualboyadvance-m-2.1.11.tar.gz /visualboyadvance-m-2.2.0.tar.gz +/visualboyadvance-m-2.2.2.tar.gz diff --git a/sources b/sources index 53b7184..129b5a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (visualboyadvance-m-2.2.0.tar.gz) = 8cfc7ba88226d125e124a1f9874fae88ae3a56c58747a756809a5abda0f6ab1669a52ea85cf002aae4ca7558f2b56be752fcfb5bb7b70ed78d5e64ce62af9642 +SHA512 (visualboyadvance-m-2.2.2.tar.gz) = 1568a31ff3b06f44202f71f56b42bd734b87da58bdd8e521f8b3ab919da56441a10588460733f823108b5532d3b39f1d05a9f5b0956b4ada36c87e8433b31954 diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 60a9882..718288d 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -3,7 +3,7 @@ %global shortname vbam Name: visualboyadvance-m -Version: 2.2.0 +Version: 2.2.2 Release: %autorelease Summary: High compatibility Gameboy Advance Emulator combining VBA builds From 87c53967041e2a0d9ea7b98837fe6dcad6ceddb8 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Fri, 8 Aug 2025 09:15:15 -0400 Subject: [PATCH 30/32] Actually fix RHBZ#2379014 SFML is too old, so this needs to use the bundled version for now, which can be statically linked in. Once SFML is updated, it can be easily unbundled. --- visualboyadvance-m.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 718288d..fb888c7 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -1,4 +1,6 @@ %undefine _hardened_build +#Needed for bundled SFML +%undefine _cmake_shared_libs %global shortname vbam @@ -23,7 +25,7 @@ BuildRequires: mesa-libGL-devel BuildRequires: nasm BuildRequires: openal-soft-devel BuildRequires: SDL2-devel -BuildRequires: SFML-devel +#BuildRequires: SFML-devel BuildRequires: wxGTK-devel BuildRequires: zlib-devel BuildRequires: zip @@ -35,6 +37,9 @@ BuildRequires: libappstream-glib Requires: hicolor-icon-theme +#TODO remove when SFML is updated in fedora +Provides: bundled(SFML) = 3.1.0 + # 32bit package serves very little purpose, s390x has build issues: ExcludeArch: %{ix86} s390x @@ -62,6 +67,11 @@ Advance project, with many improvements from various developments of VBA. sed -i 's/ -mtune=generic//g' CMakeLists.txt #Some odd permission issues: chmod -x src/wx/rpi.h +#TODO Remove bundled sfml when updated in fedora to 3.0 +#rm -rf third_party/sfml +#sed -i "/third_party\/sfml/d" CMakeLists.txt +#sed -i "s|[./]*third_party/sfml/include/||" \ +# src/core/gba/gbaLink.cpp src/core/gba/internal/gbaSockClient.h %build %cmake \ From 8bcd08ae6fc3412bdab020b730400a84a8bf74cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:59:39 +0000 Subject: [PATCH 31/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From a3a97d7e1287e553caa5b8619f5b8579aadfe5b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:33:50 +0000 Subject: [PATCH 32/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild