From 852fd598b638d02a436a9a5c2b18bef4988ae7a7 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 27 Feb 2025 15:39:23 +0100 Subject: [PATCH 01/22] update to 3.6.2.7 - switch build system to cmake - unbundle miniz - update SPDX expression in License: field after review --- FindMiniz.cmake | 34 ++++++++++++++++ ags-c23.patch | 12 ------ ags-use-openal.patch | 29 -------------- ags-use-system-freetype.patch | 22 ----------- ags-use-system-libraries.patch | 46 ++++++++++++++++++++++ ags.spec | 72 ++++++++++++++++++++++------------ sources | 2 +- 7 files changed, 127 insertions(+), 90 deletions(-) create mode 100644 FindMiniz.cmake delete mode 100644 ags-c23.patch delete mode 100644 ags-use-openal.patch delete mode 100644 ags-use-system-freetype.patch create mode 100644 ags-use-system-libraries.patch diff --git a/FindMiniz.cmake b/FindMiniz.cmake new file mode 100644 index 0000000..c11f082 --- /dev/null +++ b/FindMiniz.cmake @@ -0,0 +1,34 @@ +# This module tries to find miniz library and include files +# +# MINIZ_INCLUDE_DIR, path where to find miniz.h +# MINIZ_LIBRARY_DIR, path where to find libminiz.so +# MINIZ_LIBRARIES, the library to link against +# MINIZ_FOUND, If false, do not try to use miniz +# +# This currently works probably only for Linux +FIND_PATH ( MINIZ_INCLUDE_DIR miniz.h + /usr/local/include + /usr/include +) +FIND_LIBRARY ( MINIZ_LIBRARIES libminiz.so libminiz.a libminiz.so.2 libminiz.so.0.1 + /usr/local/lib + /usr/local/lib64 + /usr/lib + /usr/lib64 +) +GET_FILENAME_COMPONENT( MINIZ_LIBRARY_DIR ${MINIZ_LIBRARIES} PATH ) +SET ( MINIZ_FOUND "NO" ) +IF ( MINIZ_INCLUDE_DIR ) + IF ( MINIZ_LIBRARIES ) + SET ( MINIZ_FOUND "YES" ) + ENDIF ( MINIZ_LIBRARIES ) +ENDIF ( MINIZ_INCLUDE_DIR ) +MARK_AS_ADVANCED( + MINIZ_LIBRARY_DIR + MINIZ_INCLUDE_DIR + MINIZ_LIBRARIES +) +add_library(miniz INTERFACE) +target_link_libraries(miniz INTERFACE ${MINIZ_LIBRARIES}) +target_include_directories(miniz INTERFACE ${MINIZ_INCLUDE_DIR}) +add_library(MiniZ::MiniZ ALIAS miniz) diff --git a/ags-c23.patch b/ags-c23.patch deleted file mode 100644 index 875b349..0000000 --- a/ags-c23.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ags-3.6.1.30/libsrc/allegro/src/file.c.c23 ags-3.6.1.30/libsrc/allegro/src/file.c ---- ags-3.6.1.30/libsrc/allegro/src/file.c.c23 2024-11-16 23:40:17.000000000 +0100 -+++ ags-3.6.1.30/libsrc/allegro/src/file.c 2025-01-13 01:02:43.238320733 +0100 -@@ -658,7 +658,7 @@ PACKFILE *pack_fopen_vtable(AL_CONST PAC - ASSERT(vtable->pf_feof); - ASSERT(vtable->pf_ferror); - -- if ((f = create_packfile(FALSE)) == NULL) -+ if ((f = create_packfile()) == NULL) - return NULL; - - f->vtable = vtable; diff --git a/ags-use-openal.patch b/ags-use-openal.patch deleted file mode 100644 index 62f6d8e..0000000 --- a/ags-use-openal.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up ags-3.6.0.56/Engine/Makefile-defs.linux.openal ags-3.6.0.56/Engine/Makefile-defs.linux ---- ags-3.6.0.56/Engine/Makefile-defs.linux.openal 2024-01-19 17:35:02.292347784 +0100 -+++ ags-3.6.0.56/Engine/Makefile-defs.linux 2024-01-19 17:36:49.822882355 +0100 -@@ -36,8 +36,11 @@ SDL2_SOUND_LIBS = $(shell pkg-config --l - SDL2_CFLAGS = $(shell sdl2-config --cflags) - SDL2_LIBS = $(shell sdl2-config --libs) - --CFLAGS += $(SDL2_CFLAGS) $(SDL2_SOUND_CFLAGS) --LIBS += $(SDL2_LIBS) $(SDL2_SOUND_LIBS) -+OPENAL_CFLAGS = $(shell pkg-config --cflags openal) -+OPENAL_LIBS = $(shell pkg-config --libs openal) -+ -+CFLAGS += $(SDL2_CFLAGS) $(SDL2_SOUND_CFLAGS) $(OPENAL_CFLAGS) -+LIBS += $(SDL2_LIBS) $(SDL2_SOUND_LIBS) $(OPENAL_LIBS) - - LIBS += -ldl -lpthread -lm - -diff -up ags-3.6.0.56/Engine/Makefile-objs.openal ags-3.6.0.56/Engine/Makefile-objs ---- ags-3.6.0.56/Engine/Makefile-objs.openal 2024-01-08 22:35:50.000000000 +0100 -+++ ags-3.6.0.56/Engine/Makefile-objs 2024-01-19 17:35:02.292347784 +0100 -@@ -59,8 +59,6 @@ PLUGINS = ../Plugins/AGSflashlight/agsfl - - ALFONT = ../Common/libsrc/alfont-2.0.9/alfont.c - --MOJOAL = ../libsrc/mojoAL/mojoal.c -- - APEG = libsrc/apeg-1.2.1/adisplay.c libsrc/apeg-1.2.1/getbits.c libsrc/apeg-1.2.1/getblk.c libsrc/apeg-1.2.1/gethdr.c libsrc/apeg-1.2.1/getpic.c libsrc/apeg-1.2.1/idct.c libsrc/apeg-1.2.1/motion.c libsrc/apeg-1.2.1/mpeg1dec.c libsrc/apeg-1.2.1/ogg.c libsrc/apeg-1.2.1/recon.c libsrc/apeg-1.2.1/audio/apegcommon.c libsrc/apeg-1.2.1/audio/aaudio.c libsrc/apeg-1.2.1/audio/dct64.c libsrc/apeg-1.2.1/audio/decode_1to1.c libsrc/apeg-1.2.1/audio/decode_2to1.c libsrc/apeg-1.2.1/audio/decode_4to1.c libsrc/apeg-1.2.1/audio/layer1.c libsrc/apeg-1.2.1/audio/layer2.c libsrc/apeg-1.2.1/audio/layer3.c libsrc/apeg-1.2.1/audio/mpg123.c libsrc/apeg-1.2.1/audio/readers.c libsrc/apeg-1.2.1/audio/tabinit.c libsrc/apeg-1.2.1/audio/vbrhead.c - - AASTR = ../Common/libsrc/aastr-0.1.1/aarot.c ../Common/libsrc/aastr-0.1.1/aastr.c ../Common/libsrc/aastr-0.1.1/aautil.c diff --git a/ags-use-system-freetype.patch b/ags-use-system-freetype.patch deleted file mode 100644 index e0c7bc4..0000000 --- a/ags-use-system-freetype.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up ags-3.6.1.30/Engine/Makefile-defs.linux.noft ags-3.6.1.30/Engine/Makefile-defs.linux ---- ags-3.6.1.30/Engine/Makefile-defs.linux.noft 2024-11-16 23:40:17.000000000 +0100 -+++ ags-3.6.1.30/Engine/Makefile-defs.linux 2024-11-30 13:31:16.924755279 +0100 -@@ -1,8 +1,6 @@ - USE_BUILT_IN_LIBSRC = 0 - USE_MIDI_PATCH = 1 - --include Makefile-defs.freetype -- - INCDIR = ../Engine ../Common ../Common/libinclude ../Common/libsrc/alfont-2.0.9 ../Engine/libsrc/apeg-1.2.1/ ../libsrc/mojoAL ../Plugins ../Engine/libsrc/glad/include ../libsrc/miniz ../libsrc/glm $(ALLEGRO_SRCDIR)/include - LIBDIR = - -@@ -19,7 +17,8 @@ CFLAGS := -O2 -g \ - - CXXFLAGS := -std=c++11 -Werror=delete-non-virtual-dtor $(CXXFLAGS) - --LIBS += $(FT_LDFLAGS) -+CFLAGS += $(shell pkg-config --cflags freetype2) -+LIBS += $(shell pkg-config --libs freetype2) - LIBS += $(shell pkg-config --libs ogg) - LIBS += $(shell pkg-config --libs theora) - diff --git a/ags-use-system-libraries.patch b/ags-use-system-libraries.patch new file mode 100644 index 0000000..f9f5018 --- /dev/null +++ b/ags-use-system-libraries.patch @@ -0,0 +1,46 @@ +diff -up ags-3.6.2.7/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.7/CMake/FindLocalOpenAL.cmake +--- ags-3.6.2.7/CMake/FindLocalOpenAL.cmake.orig 2025-02-11 16:28:57.000000000 +0100 ++++ ags-3.6.2.7/CMake/FindLocalOpenAL.cmake 2025-02-27 14:44:12.560375876 +0100 +@@ -1,6 +1,6 @@ + # Grab system openAL or use embedded mojoAL + +-if(WIN32 OR LINUX OR MACOS OR FREEBSD) ++if(WIN32 OR MACOS OR FREEBSD) + set(AGS_USE_MOJO_AL TRUE) + endif() + +diff -up ags-3.6.2.7/CMakeLists.txt.orig ags-3.6.2.7/CMakeLists.txt +--- ags-3.6.2.7/CMakeLists.txt.orig 2025-02-11 16:28:57.000000000 +0100 ++++ ags-3.6.2.7/CMakeLists.txt 2025-02-27 14:47:44.216770826 +0100 +@@ -308,14 +308,31 @@ endif() + include(FindLocalOpenAL) + include(FindLocalAllegro) + ++if (NOT AGS_USE_SYSTEM_GLM) + add_subdirectory(libsrc/glm EXCLUDE_FROM_ALL) ++else() ++ find_package(glm REQUIRED) ++endif() ++if (NOT AGS_USE_SYSTEM_TINYXML2) + add_subdirectory(libsrc/tinyxml2 EXCLUDE_FROM_ALL) ++else() ++ find_package(tinyxml2 REQUIRED) ++endif() ++if (NOT AGS_USE_SYSTEM_MINIZ) + add_subdirectory(libsrc/miniz EXCLUDE_FROM_ALL) ++else() ++ include(FindMiniz) ++endif() + + add_subdirectory(Common/libsrc/aastr-0.1.1 EXCLUDE_FROM_ALL) + ++if (NOT AGS_USE_SYSTEM_FREETYPE) + add_subdirectory(Common/libsrc/freetype-2.1.3 EXCLUDE_FROM_ALL) + set(FREETYPE_LIBRARIES FreeType::FreeType) ++else() ++ include(FindFreetype) ++ include_directories("${FREETYPE_INCLUDE_DIRS}") ++endif() + + add_subdirectory(Common/libsrc/alfont-2.0.9 EXCLUDE_FROM_ALL) + add_subdirectory(Common) diff --git a/ags.spec b/ags.spec index 9efb55a..c41cf8a 100644 --- a/ags.spec +++ b/ags.spec @@ -2,27 +2,29 @@ %bcond_without openal %global fver v%{version} -# Automatically converted from old format: Artistic 2.0 and BSD and Giftware and LGPLv2+ and Public Domain and zlib - review is highly recommended. -%define ags_license Artistic-2.0 AND LicenseRef-Callaway-BSD and Giftware AND LicenseRef-Callaway-LGPLv2+ AND LicenseRef-Callaway-Public-Domain AND Zlib -%if %{without freetype} -%define license_full %{ags_license} AND FTL -%else -%define license_full %{ags_license} -%endif +# avoid building bundled libraries as shared +%undefine _cmake_shared_libs Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.1.31 +Version: 3.6.2.7 URL: http://www.adventuregamestudio.co.uk/site/ags/ Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz -# fix build with C23 -Patch0: %{name}-c23.patch -# unbundle freetype -Patch2: %{name}-use-system-freetype.patch -# use openal-soft -Patch3: %{name}-use-openal.patch -License: %{license_full} +# https://github.com/richgel999/miniz/issues/249 +Source1: FindMiniz.cmake +Patch0: ags-use-system-libraries.patch +# Most code is under Artistic-2.0, except: +# Common/libsrc/aastr-0.1.1: Giftware-like (https://gitlab.com/fedora/legal/fedora-license-data/-/issues/631) +# Common/libsrc/alfont-2.0.9: FTL +# Engine/libsrc/apeg-1.2.1: MPEG-SSG +# Engine/libsrc/glad: Apache-2.0 AND MIT-Khronos-old +# Engine/libsrc/libcda-0.5: Zlib +# Plugins/agsblend/agsblend: MIT +# Plugins/agspalrender/agspalrender/raycast.{cpp,h}: BSD-2-Clause +# Plugins/AGSSpriteFont: CC0-1.0 +# libsrc/allegro: Giftware +License: Artistic-2.0 AND Giftware AND FTL AND MPEG-SSG AND Apache-2.0 AND MIT-Khronos-old AND Zlib AND MIT AND BSD-2-Clause AND CC0-1.0 %if %{with freetype} BuildRequires: freetype-devel %else @@ -35,6 +37,7 @@ BuildRequires: openal-soft-devel # https://github.com/icculus/mojoAL (zlib) Provides: bundled(mojoal) %endif +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: glm-devel # for KHR/khrplatform.h @@ -43,6 +46,7 @@ BuildRequires: libogg-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel BuildRequires: make +BuildRequires: miniz-devel BuildRequires: SDL2-devel BuildRequires: SDL2_sound-devel BuildRequires: tinyxml2-devel @@ -70,13 +74,8 @@ since continued to be developed by contributors. %prep %setup -q -%patch -P0 -p1 -b .c23 -%if %{with freetype} -%patch -P2 -p1 -b .noft -%endif -%if %{with openal} -%patch -P3 -p1 -b .openal -%endif +%patch 0 -p1 -b .orig +cp -p %{S:1} CMake/ # delete unused bundled stuff pushd Common/libinclude rm -r ogg @@ -91,12 +90,15 @@ rmdir googletest popd pushd Engine/libsrc rm -r glad{,-gles2}/include/KHR +ln -s /usr/include/KHR glad/include +ln -s /usr/include/KHR glad-gles2/include rm -r ogg rm -r theora rm -r vorbis popd pushd libsrc rm -r glm +rm -r miniz %if %{with openal} rm -r mojoAL %endif @@ -107,12 +109,24 @@ touch -r Changes.txt Changes.txt.utf-8 && \ mv Changes.txt.utf-8 Changes.txt %build -%set_build_flags -export CFLAGS="$CFLAGS -Wno-error=format-truncation" -%make_build -C Engine +%cmake \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DAGS_USE_LOCAL_SDL2=TRUE \ + -DAGS_USE_LOCAL_SDL2_SOUND=TRUE \ + -DAGS_USE_LOCAL_OGG=TRUE \ + -DAGS_USE_LOCAL_VORBIS=TRUE \ + -DAGS_USE_LOCAL_THEORA=TRUE \ + -DAGS_USE_SYSTEM_GLM=TRUE \ + -DAGS_USE_SYSTEM_TINYXML2=TRUE \ + -DAGS_USE_SYSTEM_MINIZ=TRUE \ +%if %{with freetype} + -DAGS_USE_SYSTEM_FREETYPE=TRUE \ +%endif + +%cmake_build %install -make V=1 -C Engine PREFIX=%{buildroot}%{_prefix} install +%cmake_install %files %license License.txt @@ -120,6 +134,12 @@ make V=1 -C Engine PREFIX=%{buildroot}%{_prefix} install %{_bindir}/ags %changelog +* Fri Feb 28 2025 Dominik Mierzejewski - 3.6.2.7-1 +- update to 3.6.2.7 +- switch build system to cmake +- unbundle miniz +- update SPDX expression in License: field after review + * Thu Feb 27 2025 Dominik Mierzejewski - 3.6.1.31-1 - update to 3.6.1.31 - fix build with C23 (resolves rhbz#2336273) diff --git a/sources b/sources index f0ad311..458c68a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.1.31.tar.gz) = e57f3c70d69cd98ebc51dc6e2649e1e00cbae0e313208262cfa12beb6e72312f1423cd21f01bbef38bcc9507012df30da494a07118ff0bda57cf2ef2cc7d8d64 +SHA512 (ags-v3.6.2.7.tar.gz) = c6488ceafa029b090d9db3dcf34a61223d443672adc0d77fb06eb8c88cea71c5a873b61344cd2abb6194a8d411fbc06b7ddce140d09d86a45444a373307a9b9f From 3697095c1aa380cb988acac7ce5306c72c04c2f4 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 28 Feb 2025 10:48:48 +0100 Subject: [PATCH 02/22] aastr license is LicenseRef-Fedora-UltraPermissive See https://gitlab.com/fedora/legal/fedora-license-data/-/issues/631 --- ags.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ags.spec b/ags.spec index c41cf8a..77c6988 100644 --- a/ags.spec +++ b/ags.spec @@ -15,7 +15,7 @@ Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}. Source1: FindMiniz.cmake Patch0: ags-use-system-libraries.patch # Most code is under Artistic-2.0, except: -# Common/libsrc/aastr-0.1.1: Giftware-like (https://gitlab.com/fedora/legal/fedora-license-data/-/issues/631) +# Common/libsrc/aastr-0.1.1: LicenseRef-Fedora-UltraPermissive # Common/libsrc/alfont-2.0.9: FTL # Engine/libsrc/apeg-1.2.1: MPEG-SSG # Engine/libsrc/glad: Apache-2.0 AND MIT-Khronos-old @@ -24,7 +24,7 @@ Patch0: ags-use-system-libraries.patch # Plugins/agspalrender/agspalrender/raycast.{cpp,h}: BSD-2-Clause # Plugins/AGSSpriteFont: CC0-1.0 # libsrc/allegro: Giftware -License: Artistic-2.0 AND Giftware AND FTL AND MPEG-SSG AND Apache-2.0 AND MIT-Khronos-old AND Zlib AND MIT AND BSD-2-Clause AND CC0-1.0 +License: Artistic-2.0 AND LicenseRef-Fedora-UltraPermissive AND FTL AND MPEG-SSG AND Apache-2.0 AND MIT-Khronos-old AND Zlib AND MIT AND BSD-2-Clause AND CC0-1.0 AND Giftware %if %{with freetype} BuildRequires: freetype-devel %else From 7f459794a977accd53773018c8038c3cccecb652 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 9 May 2025 23:03:45 +0200 Subject: [PATCH 03/22] update to 3.6.1.32 --- ags.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ags.spec b/ags.spec index 9efb55a..a8bd753 100644 --- a/ags.spec +++ b/ags.spec @@ -12,7 +12,7 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.1.31 +Version: 3.6.1.32 URL: http://www.adventuregamestudio.co.uk/site/ags/ Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz @@ -120,6 +120,9 @@ make V=1 -C Engine PREFIX=%{buildroot}%{_prefix} install %{_bindir}/ags %changelog +* Fri May 09 2025 Dominik Mierzejewski - 3.6.1.32-1 +- update to 3.6.1.32 + * Thu Feb 27 2025 Dominik Mierzejewski - 3.6.1.31-1 - update to 3.6.1.31 - fix build with C23 (resolves rhbz#2336273) diff --git a/sources b/sources index f0ad311..9f94620 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.1.31.tar.gz) = e57f3c70d69cd98ebc51dc6e2649e1e00cbae0e313208262cfa12beb6e72312f1423cd21f01bbef38bcc9507012df30da494a07118ff0bda57cf2ef2cc7d8d64 +SHA512 (ags-v3.6.1.32.tar.gz) = 9dd7ffaa1d1c28d6565c4213832651e18cdd4af48e9cb18d947db82c2f56f3a54b0e0680d77efe5602ca998c3ef07a0ef8283a40be8f9884737d413388968961 From 24dbd2205cb9b4885c17b50419f6c8eb6cb39e4a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 9 May 2025 23:40:01 +0200 Subject: [PATCH 04/22] update to 3.6.2.9 - regenerate glad sources --- ags.spec | 13 +++++++++---- sources | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ags.spec b/ags.spec index 77c6988..a9be9f9 100644 --- a/ags.spec +++ b/ags.spec @@ -7,7 +7,7 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.2.7 +Version: 3.6.2.9 URL: http://www.adventuregamestudio.co.uk/site/ags/ Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz @@ -39,6 +39,7 @@ Provides: bundled(mojoal) %endif BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: glad BuildRequires: glm-devel # for KHR/khrplatform.h BuildRequires: libglvnd-devel @@ -89,9 +90,9 @@ rm -r freetype-2.1.3 rmdir googletest popd pushd Engine/libsrc -rm -r glad{,-gles2}/include/KHR -ln -s /usr/include/KHR glad/include -ln -s /usr/include/KHR glad-gles2/include +rm -r glad{,-gles2}/{src,include} +glad --reproducible --out-path=glad --profile="compatibility" --api="gl=2.1" --generator="c" --spec="gl" --extensions="GL_EXT_framebuffer_object" +glad --reproducible --out-path=glad-gles2 --profile="core" --api="gles2=2.0" --generator="c" --spec="gl" --extensions="" rm -r ogg rm -r theora rm -r vorbis @@ -134,6 +135,10 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Fri May 09 2025 Dominik Mierzejewski - 3.6.2.9-1 +- update to 3.6.2.9 +- regenerate glad sources + * Fri Feb 28 2025 Dominik Mierzejewski - 3.6.2.7-1 - update to 3.6.2.7 - switch build system to cmake diff --git a/sources b/sources index 458c68a..ac6129c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.2.7.tar.gz) = c6488ceafa029b090d9db3dcf34a61223d443672adc0d77fb06eb8c88cea71c5a873b61344cd2abb6194a8d411fbc06b7ddce140d09d86a45444a373307a9b9f +SHA512 (ags-v3.6.2.9.tar.gz) = 91aefa9109055be6220900d51a8c7ff9b97a0c16b0df3e16d5652d707e23430fc7b18a58a8843702dc8e1bce535b7cb5589552b6098f4bba89c9a3cf0799fcb3 From b1adcd1d9a4b7d394d79ff3740326659e67726f8 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 7 Jul 2025 00:20:13 +0200 Subject: [PATCH 05/22] update to 3.6.2.11 --- ags.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ags.spec b/ags.spec index a9be9f9..9d4e75f 100644 --- a/ags.spec +++ b/ags.spec @@ -7,7 +7,7 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.2.9 +Version: 3.6.2.11 URL: http://www.adventuregamestudio.co.uk/site/ags/ Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz @@ -135,6 +135,9 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Sun Jul 06 2025 Dominik Mierzejewski - 3.6.2.11-1 +- update to 3.6.2.11 + * Fri May 09 2025 Dominik Mierzejewski - 3.6.2.9-1 - update to 3.6.2.9 - regenerate glad sources diff --git a/sources b/sources index ac6129c..b179bb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.2.9.tar.gz) = 91aefa9109055be6220900d51a8c7ff9b97a0c16b0df3e16d5652d707e23430fc7b18a58a8843702dc8e1bce535b7cb5589552b6098f4bba89c9a3cf0799fcb3 +SHA512 (ags-v3.6.2.11.tar.gz) = f99fbdae1616efc5dae08e5beb2c49fead5990b5c1e68705029993411fd9fed367ec7dea6b3ac7e7b1f4806a21734eafa7972250c8f232516050c1abcea26cb7 From db119026692efd65ffb451a3c1b0d45a8e41b017 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 7 Jul 2025 00:22:59 +0200 Subject: [PATCH 06/22] update to 3.6.1.33 --- ags.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ags.spec b/ags.spec index a8bd753..7a9aa35 100644 --- a/ags.spec +++ b/ags.spec @@ -12,7 +12,7 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.1.32 +Version: 3.6.1.33 URL: http://www.adventuregamestudio.co.uk/site/ags/ Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz @@ -120,6 +120,9 @@ make V=1 -C Engine PREFIX=%{buildroot}%{_prefix} install %{_bindir}/ags %changelog +* Sun Jul 06 2025 Dominik Mierzejewski - 3.6.1.33-1 +- update to 3.6.1.33 + * Fri May 09 2025 Dominik Mierzejewski - 3.6.1.32-1 - update to 3.6.1.32 diff --git a/sources b/sources index 9f94620..def59be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.1.32.tar.gz) = 9dd7ffaa1d1c28d6565c4213832651e18cdd4af48e9cb18d947db82c2f56f3a54b0e0680d77efe5602ca998c3ef07a0ef8283a40be8f9884737d413388968961 +SHA512 (ags-v3.6.1.33.tar.gz) = 93480243493c8088e87bae0a3b277a8e603add2ef75ba72e06be9b9b182f2860eac88c139cf320fbd59dfa16789196b7d6c7bd8c6e635318e820fde8e29b3b26 From 96469d59e54208c92e775528088f066decf147a5 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sat, 19 Jul 2025 14:09:52 +0200 Subject: [PATCH 07/22] update to 3.6.2.12 (resolves rhbz#2382051) - switch back to bundled freetype per upstream recommendation --- ags-use-system-libraries.patch | 24 +++++++----------------- ags.spec | 17 +++++------------ sources | 2 +- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/ags-use-system-libraries.patch b/ags-use-system-libraries.patch index f9f5018..8e5bc71 100644 --- a/ags-use-system-libraries.patch +++ b/ags-use-system-libraries.patch @@ -1,6 +1,6 @@ -diff -up ags-3.6.2.7/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.7/CMake/FindLocalOpenAL.cmake ---- ags-3.6.2.7/CMake/FindLocalOpenAL.cmake.orig 2025-02-11 16:28:57.000000000 +0100 -+++ ags-3.6.2.7/CMake/FindLocalOpenAL.cmake 2025-02-27 14:44:12.560375876 +0100 +diff -up ags-3.6.2.12/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.12/CMake/FindLocalOpenAL.cmake +--- ags-3.6.2.12/CMake/FindLocalOpenAL.cmake.orig 2025-07-18 23:24:38.000000000 +0200 ++++ ags-3.6.2.12/CMake/FindLocalOpenAL.cmake 2025-07-19 14:03:42.772659440 +0200 @@ -1,6 +1,6 @@ # Grab system openAL or use embedded mojoAL @@ -9,10 +9,10 @@ diff -up ags-3.6.2.7/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.7/CMake/FindLoca set(AGS_USE_MOJO_AL TRUE) endif() -diff -up ags-3.6.2.7/CMakeLists.txt.orig ags-3.6.2.7/CMakeLists.txt ---- ags-3.6.2.7/CMakeLists.txt.orig 2025-02-11 16:28:57.000000000 +0100 -+++ ags-3.6.2.7/CMakeLists.txt 2025-02-27 14:47:44.216770826 +0100 -@@ -308,14 +308,31 @@ endif() +diff -up ags-3.6.2.12/CMakeLists.txt.orig ags-3.6.2.12/CMakeLists.txt +--- ags-3.6.2.12/CMakeLists.txt.orig 2025-07-18 23:24:38.000000000 +0200 ++++ ags-3.6.2.12/CMakeLists.txt 2025-07-19 14:04:25.748967837 +0200 +@@ -313,9 +313,21 @@ endif() include(FindLocalOpenAL) include(FindLocalAllegro) @@ -34,13 +34,3 @@ diff -up ags-3.6.2.7/CMakeLists.txt.orig ags-3.6.2.7/CMakeLists.txt add_subdirectory(Common/libsrc/aastr-0.1.1 EXCLUDE_FROM_ALL) -+if (NOT AGS_USE_SYSTEM_FREETYPE) - add_subdirectory(Common/libsrc/freetype-2.1.3 EXCLUDE_FROM_ALL) - set(FREETYPE_LIBRARIES FreeType::FreeType) -+else() -+ include(FindFreetype) -+ include_directories("${FREETYPE_INCLUDE_DIRS}") -+endif() - - add_subdirectory(Common/libsrc/alfont-2.0.9 EXCLUDE_FROM_ALL) - add_subdirectory(Common) diff --git a/ags.spec b/ags.spec index 9d4e75f..0358487 100644 --- a/ags.spec +++ b/ags.spec @@ -1,4 +1,3 @@ -%bcond_without freetype %bcond_without openal %global fver v%{version} @@ -7,7 +6,7 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.2.11 +Version: 3.6.2.12 URL: http://www.adventuregamestudio.co.uk/site/ags/ Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz @@ -25,12 +24,8 @@ Patch0: ags-use-system-libraries.patch # Plugins/AGSSpriteFont: CC0-1.0 # libsrc/allegro: Giftware License: Artistic-2.0 AND LicenseRef-Fedora-UltraPermissive AND FTL AND MPEG-SSG AND Apache-2.0 AND MIT-Khronos-old AND Zlib AND MIT AND BSD-2-Clause AND CC0-1.0 AND Giftware -%if %{with freetype} -BuildRequires: freetype-devel -%else # incorrect rendering with new FT: https://github.com/adventuregamestudio/ags/issues/1528 Provides: bundled(freetype) = 2.1.3 -%endif %if %{with openal} BuildRequires: openal-soft-devel %else @@ -84,9 +79,6 @@ rm -r theora rm -r vorbis popd pushd Common/libsrc -%if %{with freetype} -rm -r freetype-2.1.3 -%endif rmdir googletest popd pushd Engine/libsrc @@ -120,9 +112,6 @@ mv Changes.txt.utf-8 Changes.txt -DAGS_USE_SYSTEM_GLM=TRUE \ -DAGS_USE_SYSTEM_TINYXML2=TRUE \ -DAGS_USE_SYSTEM_MINIZ=TRUE \ -%if %{with freetype} - -DAGS_USE_SYSTEM_FREETYPE=TRUE \ -%endif %cmake_build @@ -135,6 +124,10 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Sat Jul 19 2025 Dominik Mierzejewski - 3.6.2.12-1 +- update to 3.6.2.12 +- switch back to bundled freetype per upstream recommendation + * Sun Jul 06 2025 Dominik Mierzejewski - 3.6.2.11-1 - update to 3.6.2.11 diff --git a/sources b/sources index b179bb1..11a2c1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.2.11.tar.gz) = f99fbdae1616efc5dae08e5beb2c49fead5990b5c1e68705029993411fd9fed367ec7dea6b3ac7e7b1f4806a21734eafa7972250c8f232516050c1abcea26cb7 +SHA512 (ags-v3.6.2.12.tar.gz) = 505c9210ee5fa58fd1570b152c6ef650ce51d39486389d487a7442ea3d3b99e607a9b882bf85a77be2da0fbf029a9f6789a74c0121092cff15241fbd40011cd5 From 65adaf4d90e2385571746ec0f21b410b9a87131e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:49:56 +0000 Subject: [PATCH 08/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ags.spec b/ags.spec index 0358487..202f822 100644 --- a/ags.spec +++ b/ags.spec @@ -8,7 +8,7 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre Version: 3.6.2.12 URL: http://www.adventuregamestudio.co.uk/site/ags/ -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz # https://github.com/richgel999/miniz/issues/249 Source1: FindMiniz.cmake @@ -124,6 +124,9 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.6.2.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jul 19 2025 Dominik Mierzejewski - 3.6.2.12-1 - update to 3.6.2.12 - switch back to bundled freetype per upstream recommendation From 4a3393a565c036c448a8c79eb324057e9740c625 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 21 Jul 2025 10:23:27 +0200 Subject: [PATCH 09/22] follow upstream convention in option naming - drop custom miniz detection and require a fixed build instead --- FindMiniz.cmake | 34 -------------------------------- ags-use-system-libraries.patch | 36 ++++++++++++++++++++++++++++------ ags.spec | 17 ++++++++-------- 3 files changed, 39 insertions(+), 48 deletions(-) delete mode 100644 FindMiniz.cmake diff --git a/FindMiniz.cmake b/FindMiniz.cmake deleted file mode 100644 index c11f082..0000000 --- a/FindMiniz.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# This module tries to find miniz library and include files -# -# MINIZ_INCLUDE_DIR, path where to find miniz.h -# MINIZ_LIBRARY_DIR, path where to find libminiz.so -# MINIZ_LIBRARIES, the library to link against -# MINIZ_FOUND, If false, do not try to use miniz -# -# This currently works probably only for Linux -FIND_PATH ( MINIZ_INCLUDE_DIR miniz.h - /usr/local/include - /usr/include -) -FIND_LIBRARY ( MINIZ_LIBRARIES libminiz.so libminiz.a libminiz.so.2 libminiz.so.0.1 - /usr/local/lib - /usr/local/lib64 - /usr/lib - /usr/lib64 -) -GET_FILENAME_COMPONENT( MINIZ_LIBRARY_DIR ${MINIZ_LIBRARIES} PATH ) -SET ( MINIZ_FOUND "NO" ) -IF ( MINIZ_INCLUDE_DIR ) - IF ( MINIZ_LIBRARIES ) - SET ( MINIZ_FOUND "YES" ) - ENDIF ( MINIZ_LIBRARIES ) -ENDIF ( MINIZ_INCLUDE_DIR ) -MARK_AS_ADVANCED( - MINIZ_LIBRARY_DIR - MINIZ_INCLUDE_DIR - MINIZ_LIBRARIES -) -add_library(miniz INTERFACE) -target_link_libraries(miniz INTERFACE ${MINIZ_LIBRARIES}) -target_include_directories(miniz INTERFACE ${MINIZ_INCLUDE_DIR}) -add_library(MiniZ::MiniZ ALIAS miniz) diff --git a/ags-use-system-libraries.patch b/ags-use-system-libraries.patch index 8e5bc71..d2059db 100644 --- a/ags-use-system-libraries.patch +++ b/ags-use-system-libraries.patch @@ -11,26 +11,50 @@ diff -up ags-3.6.2.12/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.12/CMake/FindLo diff -up ags-3.6.2.12/CMakeLists.txt.orig ags-3.6.2.12/CMakeLists.txt --- ags-3.6.2.12/CMakeLists.txt.orig 2025-07-18 23:24:38.000000000 +0200 -+++ ags-3.6.2.12/CMakeLists.txt 2025-07-19 14:04:25.748967837 +0200 -@@ -313,9 +313,21 @@ endif() ++++ ags-3.6.2.12/CMakeLists.txt 2025-07-20 13:18:35.622533999 +0200 +@@ -18,6 +18,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT + option(AGS_USE_LOCAL_ALL_LIBRARIES "Use a locally installed libraries" OFF) + option(AGS_USE_LOCAL_SDL2 "Use a locally installed SDL2" ${AGS_USE_LOCAL_ALL_LIBRARIES}) + option(AGS_USE_LOCAL_SDL2_SOUND "Use a locally installed SDL2 Sound" ${AGS_USE_LOCAL_ALL_LIBRARIES}) ++option(AGS_USE_LOCAL_GLM "Use a locally installed GLM" ${AGS_USE_LOCAL_ALL_LIBRARIES}) ++option(AGS_USE_LOCAL_MINIZ "Use a locally installed Miniz" ${AGS_USE_LOCAL_ALL_LIBRARIES}) ++option(AGS_USE_LOCAL_TINYXML "Use a locally installed TinyXML" ${AGS_USE_LOCAL_ALL_LIBRARIES}) + option(AGS_USE_LOCAL_OGG "Use a locally installed OGG" ${AGS_USE_LOCAL_ALL_LIBRARIES}) + option(AGS_USE_LOCAL_THEORA "Use a locally installed Theora" ${AGS_USE_LOCAL_ALL_LIBRARIES}) + option(AGS_USE_LOCAL_VORBIS "Use a locally installed Vorbis" ${AGS_USE_LOCAL_ALL_LIBRARIES}) +@@ -313,9 +316,22 @@ endif() include(FindLocalOpenAL) include(FindLocalAllegro) -+if (NOT AGS_USE_SYSTEM_GLM) ++if (NOT AGS_USE_LOCAL_GLM) add_subdirectory(libsrc/glm EXCLUDE_FROM_ALL) +else() + find_package(glm REQUIRED) +endif() -+if (NOT AGS_USE_SYSTEM_TINYXML2) ++if (NOT AGS_USE_LOCAL_TINYXML2) add_subdirectory(libsrc/tinyxml2 EXCLUDE_FROM_ALL) +else() + find_package(tinyxml2 REQUIRED) +endif() -+if (NOT AGS_USE_SYSTEM_MINIZ) ++if (NOT AGS_USE_LOCAL_MINIZ) add_subdirectory(libsrc/miniz EXCLUDE_FROM_ALL) +else() -+ include(FindMiniz) ++ find_package(miniz REQUIRED) ++ add_library(MiniZ::MiniZ ALIAS miniz::miniz) +endif() add_subdirectory(Common/libsrc/aastr-0.1.1 EXCLUDE_FROM_ALL) +diff -up ags-3.6.2.12/CMAKE.md.orig ags-3.6.2.12/CMAKE.md +--- ags-3.6.2.12/CMAKE.md.orig 2025-07-18 23:24:38.000000000 +0200 ++++ ags-3.6.2.12/CMAKE.md 2025-07-20 13:16:13.775985811 +0200 +@@ -97,6 +97,9 @@ The available flags are: + + - `AGS_USE_LOCAL_SDL2` : Find SDL2 locally + - `AGS_USE_LOCAL_SDL2_SOUND` : Find SDL sound locally ++- `AGS_USE_LOCAL_GLM` : Find GLM locally ++- `AGS_USE_LOCAL_MINIZ` : Find Miniz locally ++- `AGS_USE_LOCAL_TINYXML` : Find TinyXML locally + - `AGS_USE_LOCAL_OGG` : Find OGG locally + - `AGS_USE_LOCAL_THEORA` : Find Theora locally + - `AGS_USE_LOCAL_VORBIS` : Find Vorbis locally diff --git a/ags.spec b/ags.spec index 202f822..b8fc727 100644 --- a/ags.spec +++ b/ags.spec @@ -8,10 +8,8 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre Version: 3.6.2.12 URL: http://www.adventuregamestudio.co.uk/site/ags/ -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz -# https://github.com/richgel999/miniz/issues/249 -Source1: FindMiniz.cmake Patch0: ags-use-system-libraries.patch # Most code is under Artistic-2.0, except: # Common/libsrc/aastr-0.1.1: LicenseRef-Fedora-UltraPermissive @@ -42,7 +40,7 @@ BuildRequires: libogg-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel BuildRequires: make -BuildRequires: miniz-devel +BuildRequires: cmake(miniz) BuildRequires: SDL2-devel BuildRequires: SDL2_sound-devel BuildRequires: tinyxml2-devel @@ -71,7 +69,6 @@ since continued to be developed by contributors. %prep %setup -q %patch 0 -p1 -b .orig -cp -p %{S:1} CMake/ # delete unused bundled stuff pushd Common/libinclude rm -r ogg @@ -109,9 +106,9 @@ mv Changes.txt.utf-8 Changes.txt -DAGS_USE_LOCAL_OGG=TRUE \ -DAGS_USE_LOCAL_VORBIS=TRUE \ -DAGS_USE_LOCAL_THEORA=TRUE \ - -DAGS_USE_SYSTEM_GLM=TRUE \ - -DAGS_USE_SYSTEM_TINYXML2=TRUE \ - -DAGS_USE_SYSTEM_MINIZ=TRUE \ + -DAGS_USE_LOCAL_GLM=TRUE \ + -DAGS_USE_LOCAL_TINYXML2=TRUE \ + -DAGS_USE_LOCAL_MINIZ=TRUE \ %cmake_build @@ -124,6 +121,10 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Sun Jul 20 2025 Dominik Mierzejewski - 3.6.2.12-3 +- follow upstream convention in option naming +- drop custom miniz detection and require a fixed build instead + * Wed Jul 23 2025 Fedora Release Engineering - 3.6.2.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 826d70c2236ea7ed17d519c71e30eefce6ac6b2d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 23 Aug 2025 06:55:51 -0400 Subject: [PATCH 10/22] Rebuilt for tinyxml2 11.0.0 --- ags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ags.spec b/ags.spec index b8fc727..acb6ac6 100644 --- a/ags.spec +++ b/ags.spec @@ -8,7 +8,7 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre Version: 3.6.2.12 URL: http://www.adventuregamestudio.co.uk/site/ags/ -Release: 3%{?dist} +Release: 4%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz Patch0: ags-use-system-libraries.patch # Most code is under Artistic-2.0, except: @@ -121,6 +121,9 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Sat Aug 23 2025 Benjamin A. Beasley - 3.6.2.12-4 +- Rebuilt for tinyxml2 11.0.0 + * Sun Jul 20 2025 Dominik Mierzejewski - 3.6.2.12-3 - follow upstream convention in option naming - drop custom miniz detection and require a fixed build instead From d5687daa6ef67d185ba6d4b1b3316544bee810ca Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 4 Sep 2025 21:37:04 +0200 Subject: [PATCH 11/22] fix chronological changelog order --- ags.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ags.spec b/ags.spec index acb6ac6..a19176b 100644 --- a/ags.spec +++ b/ags.spec @@ -124,7 +124,7 @@ mv Changes.txt.utf-8 Changes.txt * Sat Aug 23 2025 Benjamin A. Beasley - 3.6.2.12-4 - Rebuilt for tinyxml2 11.0.0 -* Sun Jul 20 2025 Dominik Mierzejewski - 3.6.2.12-3 +* Sun Aug 03 2025 Dominik Mierzejewski - 3.6.2.12-3 - follow upstream convention in option naming - drop custom miniz detection and require a fixed build instead From 20a7545e1a276e61a687a59a71e247ab707835b0 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 4 Sep 2025 23:22:15 +0200 Subject: [PATCH 12/22] update to 3.6.2.13 (resolves rhbz#2393079) --- ags.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ags.spec b/ags.spec index a19176b..3e0f7e6 100644 --- a/ags.spec +++ b/ags.spec @@ -6,9 +6,9 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.2.12 +Version: 3.6.2.13 URL: http://www.adventuregamestudio.co.uk/site/ags/ -Release: 4%{?dist} +Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz Patch0: ags-use-system-libraries.patch # Most code is under Artistic-2.0, except: @@ -121,6 +121,9 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Thu Sep 04 2025 Dominik Mierzejewski - 3.6.2.13-1 +- update to 3.6.2.13 (resolves rhbz#2393079) + * Sat Aug 23 2025 Benjamin A. Beasley - 3.6.2.12-4 - Rebuilt for tinyxml2 11.0.0 diff --git a/sources b/sources index 11a2c1f..331ce0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.2.12.tar.gz) = 505c9210ee5fa58fd1570b152c6ef650ce51d39486389d487a7442ea3d3b99e607a9b882bf85a77be2da0fbf029a9f6789a74c0121092cff15241fbd40011cd5 +SHA512 (ags-v3.6.2.13.tar.gz) = b33a7813f5cc611e6f82f74a29ab33fdc2a817218fdcf4c96de81dc63e4129146e5f3390d92c405c0f170507473282d7f953d692eae21624d29ebf9a0bd535d1 From fb80656b28efa20d8befd060b51e0ca007c5743c Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 8 Oct 2025 16:13:02 +0200 Subject: [PATCH 13/22] build tools and run tests --- ags-build-tests-with-cxx14.patch | 36 +++++++++++++ ags-missing-includes.patch | 11 ++++ ags-use-system-libraries.patch | 88 +++++++++++++++++++++++++++----- ags.spec | 34 +++++++++++- 4 files changed, 156 insertions(+), 13 deletions(-) create mode 100644 ags-build-tests-with-cxx14.patch create mode 100644 ags-missing-includes.patch diff --git a/ags-build-tests-with-cxx14.patch b/ags-build-tests-with-cxx14.patch new file mode 100644 index 0000000..815617e --- /dev/null +++ b/ags-build-tests-with-cxx14.patch @@ -0,0 +1,36 @@ +diff -up ags-3.6.2.13/Common/CMakeLists.txt.cxx14 ags-3.6.2.13/Common/CMakeLists.txt +--- ags-3.6.2.13/Common/CMakeLists.txt.cxx14 2025-09-04 10:13:12.000000000 +0200 ++++ ags-3.6.2.13/Common/CMakeLists.txt 2025-09-05 00:52:47.300264039 +0200 +@@ -241,7 +241,7 @@ if(AGS_TESTS) + test/version_test.cpp + ) + set_target_properties(common_test PROPERTIES +- CXX_STANDARD 11 ++ CXX_STANDARD 14 + CXX_EXTENSIONS NO + C_STANDARD 11 + C_EXTENSIONS NO +diff -up ags-3.6.2.13/Compiler/CMakeLists.txt.cxx14 ags-3.6.2.13/Compiler/CMakeLists.txt +--- ags-3.6.2.13/Compiler/CMakeLists.txt.cxx14 2025-09-04 10:13:12.000000000 +0200 ++++ ags-3.6.2.13/Compiler/CMakeLists.txt 2025-09-05 00:54:51.632435890 +0200 +@@ -92,7 +92,7 @@ if(AGS_TESTS) + test/cc_test_helper.h + ) + set_target_properties(compiler_test PROPERTIES +- CXX_STANDARD 11 ++ CXX_STANDARD 14 + CXX_EXTENSIONS NO + C_STANDARD 11 + C_EXTENSIONS NO +diff -up ags-3.6.2.13/Engine/CMakeLists.txt.cxx14 ags-3.6.2.13/Engine/CMakeLists.txt +--- ags-3.6.2.13/Engine/CMakeLists.txt.cxx14 2025-09-04 10:13:12.000000000 +0200 ++++ ags-3.6.2.13/Engine/CMakeLists.txt 2025-09-05 00:55:12.224488252 +0200 +@@ -649,7 +649,7 @@ if(AGS_TESTS) + test/systemimports_test.cpp + ) + set_target_properties(engine_test PROPERTIES +- CXX_STANDARD 11 ++ CXX_STANDARD 14 + CXX_EXTENSIONS NO + C_STANDARD 11 + C_EXTENSIONS NO diff --git a/ags-missing-includes.patch b/ags-missing-includes.patch new file mode 100644 index 0000000..ccada4c --- /dev/null +++ b/ags-missing-includes.patch @@ -0,0 +1,11 @@ +diff -up ags-3.6.2.13/Common/util/string_compat.c.orig ags-3.6.2.13/Common/util/string_compat.c +--- ags-3.6.2.13/Common/util/string_compat.c.orig 2025-09-04 10:13:12.000000000 +0200 ++++ ags-3.6.2.13/Common/util/string_compat.c 2025-10-08 13:38:06.444603269 +0200 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + #include "core/platform.h" + #include "debug/assert.h" + diff --git a/ags-use-system-libraries.patch b/ags-use-system-libraries.patch index d2059db..68b6b01 100644 --- a/ags-use-system-libraries.patch +++ b/ags-use-system-libraries.patch @@ -1,6 +1,6 @@ -diff -up ags-3.6.2.12/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.12/CMake/FindLocalOpenAL.cmake ---- ags-3.6.2.12/CMake/FindLocalOpenAL.cmake.orig 2025-07-18 23:24:38.000000000 +0200 -+++ ags-3.6.2.12/CMake/FindLocalOpenAL.cmake 2025-07-19 14:03:42.772659440 +0200 +diff -up ags-3.6.2.13/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.13/CMake/FindLocalOpenAL.cmake +--- ags-3.6.2.13/CMake/FindLocalOpenAL.cmake.orig 2025-09-04 10:13:12.000000000 +0200 ++++ ags-3.6.2.13/CMake/FindLocalOpenAL.cmake 2025-10-08 14:38:31.897433814 +0200 @@ -1,6 +1,6 @@ # Grab system openAL or use embedded mojoAL @@ -9,20 +9,50 @@ diff -up ags-3.6.2.12/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.12/CMake/FindLo set(AGS_USE_MOJO_AL TRUE) endif() -diff -up ags-3.6.2.12/CMakeLists.txt.orig ags-3.6.2.12/CMakeLists.txt ---- ags-3.6.2.12/CMakeLists.txt.orig 2025-07-18 23:24:38.000000000 +0200 -+++ ags-3.6.2.12/CMakeLists.txt 2025-07-20 13:18:35.622533999 +0200 -@@ -18,6 +18,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT +diff -up ags-3.6.2.13/CMakeLists.txt.orig ags-3.6.2.13/CMakeLists.txt +--- ags-3.6.2.13/CMakeLists.txt.orig 2025-09-04 10:13:12.000000000 +0200 ++++ ags-3.6.2.13/CMakeLists.txt 2025-10-08 14:38:31.897433814 +0200 +@@ -18,9 +18,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT option(AGS_USE_LOCAL_ALL_LIBRARIES "Use a locally installed libraries" OFF) option(AGS_USE_LOCAL_SDL2 "Use a locally installed SDL2" ${AGS_USE_LOCAL_ALL_LIBRARIES}) option(AGS_USE_LOCAL_SDL2_SOUND "Use a locally installed SDL2 Sound" ${AGS_USE_LOCAL_ALL_LIBRARIES}) +option(AGS_USE_LOCAL_GLM "Use a locally installed GLM" ${AGS_USE_LOCAL_ALL_LIBRARIES}) +option(AGS_USE_LOCAL_MINIZ "Use a locally installed Miniz" ${AGS_USE_LOCAL_ALL_LIBRARIES}) -+option(AGS_USE_LOCAL_TINYXML "Use a locally installed TinyXML" ${AGS_USE_LOCAL_ALL_LIBRARIES}) ++option(AGS_USE_LOCAL_TINYXML2 "Use a locally installed TinyXML2" ${AGS_USE_LOCAL_ALL_LIBRARIES}) option(AGS_USE_LOCAL_OGG "Use a locally installed OGG" ${AGS_USE_LOCAL_ALL_LIBRARIES}) option(AGS_USE_LOCAL_THEORA "Use a locally installed Theora" ${AGS_USE_LOCAL_ALL_LIBRARIES}) option(AGS_USE_LOCAL_VORBIS "Use a locally installed Vorbis" ${AGS_USE_LOCAL_ALL_LIBRARIES}) -@@ -313,9 +316,22 @@ endif() ++option(AGS_USE_LOCAL_GTEST "Use a locally installed GTest" ${AGS_USE_LOCAL_ALL_LIBRARIES}) + + option(AGS_TESTS "Build tests" OFF) + option(AGS_BUILD_ENGINE "Build Engine" ON) +@@ -37,9 +41,13 @@ message("------- AGS dependencies option + message(" AGS_USE_LOCAL_ALL_LIBRARIES: ${AGS_USE_LOCAL_ALL_LIBRARIES}") + message(" AGS_USE_LOCAL_SDL2: ${AGS_USE_LOCAL_SDL2}") + message(" AGS_USE_LOCAL_SDL2_SOUND: ${AGS_USE_LOCAL_SDL2_SOUND}") ++message(" AGS_USE_LOCAL_GLM: ${AGS_USE_LOCAL_GLM}") ++message(" AGS_USE_LOCAL_MINIZ: ${AGS_USE_LOCAL_MINIZ}") ++message(" AGS_USE_LOCAL_TINYXML2: ${AGS_USE_LOCAL_TINYXML2}") + message(" AGS_USE_LOCAL_OGG: ${AGS_USE_LOCAL_OGG}") + message(" AGS_USE_LOCAL_THEORA: ${AGS_USE_LOCAL_THEORA}") + message(" AGS_USE_LOCAL_VORBIS: ${AGS_USE_LOCAL_VORBIS}") ++message(" AGS_USE_LOCAL_GTEST: ${AGS_USE_LOCAL_GTEST}") + message("------ AGS selected CMake options ------") + message(" AGS_TESTS: ${AGS_TESTS}") + message(" AGS_BUILD_ENGINE: ${AGS_BUILD_ENGINE}") +@@ -265,7 +273,11 @@ find_package(PkgConfig) + find_package(Threads) + + if(AGS_TESTS) ++ if(NOT AGS_USE_LOCAL_GTEST) + include(FetchGoogleTest) ++ else() ++ find_package(GTest REQUIRED) ++ endif() + enable_testing() + endif() + +@@ -313,9 +325,23 @@ endif() include(FindLocalOpenAL) include(FindLocalAllegro) @@ -35,6 +65,7 @@ diff -up ags-3.6.2.12/CMakeLists.txt.orig ags-3.6.2.12/CMakeLists.txt add_subdirectory(libsrc/tinyxml2 EXCLUDE_FROM_ALL) +else() + find_package(tinyxml2 REQUIRED) ++ add_library(TinyXML2::TinyXML2 ALIAS tinyxml2::tinyxml2) +endif() +if (NOT AGS_USE_LOCAL_MINIZ) add_subdirectory(libsrc/miniz EXCLUDE_FROM_ALL) @@ -45,9 +76,9 @@ diff -up ags-3.6.2.12/CMakeLists.txt.orig ags-3.6.2.12/CMakeLists.txt add_subdirectory(Common/libsrc/aastr-0.1.1 EXCLUDE_FROM_ALL) -diff -up ags-3.6.2.12/CMAKE.md.orig ags-3.6.2.12/CMAKE.md ---- ags-3.6.2.12/CMAKE.md.orig 2025-07-18 23:24:38.000000000 +0200 -+++ ags-3.6.2.12/CMAKE.md 2025-07-20 13:16:13.775985811 +0200 +diff -up ags-3.6.2.13/CMAKE.md.orig ags-3.6.2.13/CMAKE.md +--- ags-3.6.2.13/CMAKE.md.orig 2025-09-04 10:13:12.000000000 +0200 ++++ ags-3.6.2.13/CMAKE.md 2025-10-08 14:38:31.898433823 +0200 @@ -97,6 +97,9 @@ The available flags are: - `AGS_USE_LOCAL_SDL2` : Find SDL2 locally @@ -58,3 +89,36 @@ diff -up ags-3.6.2.12/CMAKE.md.orig ags-3.6.2.12/CMAKE.md - `AGS_USE_LOCAL_OGG` : Find OGG locally - `AGS_USE_LOCAL_THEORA` : Find Theora locally - `AGS_USE_LOCAL_VORBIS` : Find Vorbis locally +diff -up ags-3.6.2.13/Common/CMakeLists.txt.orig ags-3.6.2.13/Common/CMakeLists.txt +--- ags-3.6.2.13/Common/CMakeLists.txt.orig 2025-09-04 10:13:12.000000000 +0200 ++++ ags-3.6.2.13/Common/CMakeLists.txt 2025-10-08 14:38:31.900433840 +0200 +@@ -250,6 +250,7 @@ if(AGS_TESTS) + target_link_libraries(common_test + common + gtest_main ++ gtest + ) + + include(GoogleTest) +diff -up ags-3.6.2.13/Compiler/CMakeLists.txt.orig ags-3.6.2.13/Compiler/CMakeLists.txt +--- ags-3.6.2.13/Compiler/CMakeLists.txt.orig 2025-10-08 14:38:31.900433840 +0200 ++++ ags-3.6.2.13/Compiler/CMakeLists.txt 2025-10-08 15:00:07.456886639 +0200 +@@ -102,6 +102,7 @@ if(AGS_TESTS) + compiler_test + compiler + gtest_main ++ gtest + ) + + include(GoogleTest) +diff -up ags-3.6.2.13/Engine/CMakeLists.txt.orig ags-3.6.2.13/Engine/CMakeLists.txt +--- ags-3.6.2.13/Engine/CMakeLists.txt.orig 2025-10-08 14:38:31.901433848 +0200 ++++ ags-3.6.2.13/Engine/CMakeLists.txt 2025-10-08 15:01:10.681457075 +0200 +@@ -660,6 +660,7 @@ if(AGS_TESTS) + engine + common + gtest_main ++ gtest + ) + + include(GoogleTest) diff --git a/ags.spec b/ags.spec index 3e0f7e6..f5f08ef 100644 --- a/ags.spec +++ b/ags.spec @@ -8,9 +8,11 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre Version: 3.6.2.13 URL: http://www.adventuregamestudio.co.uk/site/ags/ -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz Patch0: ags-use-system-libraries.patch +Patch1: ags-build-tests-with-cxx14.patch +Patch2: ags-missing-includes.patch # Most code is under Artistic-2.0, except: # Common/libsrc/aastr-0.1.1: LicenseRef-Fedora-UltraPermissive # Common/libsrc/alfont-2.0.9: FTL @@ -34,6 +36,7 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: glad BuildRequires: glm-devel +BuildRequires: gtest-devel # for KHR/khrplatform.h BuildRequires: libglvnd-devel BuildRequires: libogg-devel @@ -66,9 +69,18 @@ limited, support for other genres as well. Originally created by Chris Jones back in 1999, AGS was opensourced in 2011 and since continued to be developed by contributors. +%package tools +Summary: Tools for Adventure Game Studio engine game development +Requires: %{name}%{_isa} = %{version}-%{release} + +%description tools +This package contains the AGS engine game development tools. + %prep %setup -q %patch 0 -p1 -b .orig +%patch 1 -p1 -b .cxx14 +%patch 2 -p1 -b .incl # delete unused bundled stuff pushd Common/libinclude rm -r ogg @@ -101,6 +113,8 @@ mv Changes.txt.utf-8 Changes.txt %build %cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DAGS_BUILD_TOOLS=TRUE \ + -DAGS_TESTS=TRUE \ -DAGS_USE_LOCAL_SDL2=TRUE \ -DAGS_USE_LOCAL_SDL2_SOUND=TRUE \ -DAGS_USE_LOCAL_OGG=TRUE \ @@ -109,18 +123,36 @@ mv Changes.txt.utf-8 Changes.txt -DAGS_USE_LOCAL_GLM=TRUE \ -DAGS_USE_LOCAL_TINYXML2=TRUE \ -DAGS_USE_LOCAL_MINIZ=TRUE \ + -DAGS_USE_LOCAL_GTEST=TRUE \ %cmake_build %install %cmake_install +%check +%ctest + %files %license License.txt %doc Changes.txt Copyright.txt OPTIONS.md README.md %{_bindir}/ags +%files tools +%{_bindir}/agscc +%{_bindir}/agf2dlgasc +%{_bindir}/agfexport +%{_bindir}/agspak +%{_bindir}/agsunpak +%{_bindir}/crm2ash +%{_bindir}/crmpak +%{_bindir}/trac +%{_bindir}/ags + %changelog +* Fri Sep 05 2025 Dominik Mierzejewski - 3.6.2.13-2 +- build tools and run tests + * Thu Sep 04 2025 Dominik Mierzejewski - 3.6.2.13-1 - update to 3.6.2.13 (resolves rhbz#2393079) From 2a38a58271210a961010e8b9e079f0b19630c7ee Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 9 Oct 2025 13:11:00 +0200 Subject: [PATCH 14/22] make the system GTest support conditional --- ags-use-system-libraries.patch | 54 ++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/ags-use-system-libraries.patch b/ags-use-system-libraries.patch index 68b6b01..f141bab 100644 --- a/ags-use-system-libraries.patch +++ b/ags-use-system-libraries.patch @@ -1,6 +1,6 @@ diff -up ags-3.6.2.13/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.13/CMake/FindLocalOpenAL.cmake --- ags-3.6.2.13/CMake/FindLocalOpenAL.cmake.orig 2025-09-04 10:13:12.000000000 +0200 -+++ ags-3.6.2.13/CMake/FindLocalOpenAL.cmake 2025-10-08 14:38:31.897433814 +0200 ++++ ags-3.6.2.13/CMake/FindLocalOpenAL.cmake 2025-10-09 13:07:24.743943475 +0200 @@ -1,6 +1,6 @@ # Grab system openAL or use embedded mojoAL @@ -11,7 +11,7 @@ diff -up ags-3.6.2.13/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.13/CMake/FindLo diff -up ags-3.6.2.13/CMakeLists.txt.orig ags-3.6.2.13/CMakeLists.txt --- ags-3.6.2.13/CMakeLists.txt.orig 2025-09-04 10:13:12.000000000 +0200 -+++ ags-3.6.2.13/CMakeLists.txt 2025-10-08 14:38:31.897433814 +0200 ++++ ags-3.6.2.13/CMakeLists.txt 2025-10-09 13:09:41.300365784 +0200 @@ -18,9 +18,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT option(AGS_USE_LOCAL_ALL_LIBRARIES "Use a locally installed libraries" OFF) option(AGS_USE_LOCAL_SDL2 "Use a locally installed SDL2" ${AGS_USE_LOCAL_ALL_LIBRARIES}) @@ -44,10 +44,10 @@ diff -up ags-3.6.2.13/CMakeLists.txt.orig ags-3.6.2.13/CMakeLists.txt find_package(Threads) if(AGS_TESTS) -+ if(NOT AGS_USE_LOCAL_GTEST) - include(FetchGoogleTest) -+ else() ++ if(AGS_USE_LOCAL_GTEST) + find_package(GTest REQUIRED) ++ else() + include(FetchGoogleTest) + endif() enable_testing() endif() @@ -78,47 +78,57 @@ diff -up ags-3.6.2.13/CMakeLists.txt.orig ags-3.6.2.13/CMakeLists.txt diff -up ags-3.6.2.13/CMAKE.md.orig ags-3.6.2.13/CMAKE.md --- ags-3.6.2.13/CMAKE.md.orig 2025-09-04 10:13:12.000000000 +0200 -+++ ags-3.6.2.13/CMAKE.md 2025-10-08 14:38:31.898433823 +0200 -@@ -97,6 +97,9 @@ The available flags are: ++++ ags-3.6.2.13/CMAKE.md 2025-10-09 13:07:58.165691257 +0200 +@@ -97,9 +97,13 @@ The available flags are: - `AGS_USE_LOCAL_SDL2` : Find SDL2 locally - `AGS_USE_LOCAL_SDL2_SOUND` : Find SDL sound locally +- `AGS_USE_LOCAL_GLM` : Find GLM locally +- `AGS_USE_LOCAL_MINIZ` : Find Miniz locally -+- `AGS_USE_LOCAL_TINYXML` : Find TinyXML locally ++- `AGS_USE_LOCAL_TINYXML2` : Find TinyXML2 locally - `AGS_USE_LOCAL_OGG` : Find OGG locally - `AGS_USE_LOCAL_THEORA` : Find Theora locally - `AGS_USE_LOCAL_VORBIS` : Find Vorbis locally ++- `AGS_USE_LOCAL_GTEST` : Find GTest locally + - `AGS_USE_LOCAL_ALL_LIBRARIES` : Force all the above to be local libraries + + While default fetching scripts static link AGS to required libraries, when using local libraries AGS should dynamic link diff -up ags-3.6.2.13/Common/CMakeLists.txt.orig ags-3.6.2.13/Common/CMakeLists.txt --- ags-3.6.2.13/Common/CMakeLists.txt.orig 2025-09-04 10:13:12.000000000 +0200 -+++ ags-3.6.2.13/Common/CMakeLists.txt 2025-10-08 14:38:31.900433840 +0200 -@@ -250,6 +250,7 @@ if(AGS_TESTS) - target_link_libraries(common_test ++++ ags-3.6.2.13/Common/CMakeLists.txt 2025-10-09 13:08:18.835311002 +0200 +@@ -251,6 +251,9 @@ if(AGS_TESTS) common gtest_main -+ gtest ) ++ if(AGS_USE_LOCAL_GTEST) ++ target_link_libraries(common_test gtest) ++ endif() include(GoogleTest) + gtest_add_tests(TARGET common_test) diff -up ags-3.6.2.13/Compiler/CMakeLists.txt.orig ags-3.6.2.13/Compiler/CMakeLists.txt ---- ags-3.6.2.13/Compiler/CMakeLists.txt.orig 2025-10-08 14:38:31.900433840 +0200 -+++ ags-3.6.2.13/Compiler/CMakeLists.txt 2025-10-08 15:00:07.456886639 +0200 -@@ -102,6 +102,7 @@ if(AGS_TESTS) - compiler_test +--- ags-3.6.2.13/Compiler/CMakeLists.txt.orig 2025-09-04 10:13:12.000000000 +0200 ++++ ags-3.6.2.13/Compiler/CMakeLists.txt 2025-10-09 13:08:32.869527542 +0200 +@@ -103,6 +103,9 @@ if(AGS_TESTS) compiler gtest_main -+ gtest ) ++ if(AGS_USE_LOCAL_GTEST) ++ target_link_libraries(compiler_test gtest) ++ endif() include(GoogleTest) + gtest_add_tests(TARGET compiler_test) diff -up ags-3.6.2.13/Engine/CMakeLists.txt.orig ags-3.6.2.13/Engine/CMakeLists.txt ---- ags-3.6.2.13/Engine/CMakeLists.txt.orig 2025-10-08 14:38:31.901433848 +0200 -+++ ags-3.6.2.13/Engine/CMakeLists.txt 2025-10-08 15:01:10.681457075 +0200 -@@ -660,6 +660,7 @@ if(AGS_TESTS) - engine +--- ags-3.6.2.13/Engine/CMakeLists.txt.orig 2025-09-04 10:13:12.000000000 +0200 ++++ ags-3.6.2.13/Engine/CMakeLists.txt 2025-10-09 13:08:49.390009002 +0200 +@@ -661,6 +661,9 @@ if(AGS_TESTS) common gtest_main -+ gtest ) ++ if(AGS_USE_LOCAL_GTEST) ++ target_link_libraries(engine_test gtest) ++ endif() include(GoogleTest) + gtest_add_tests(TARGET engine_test) From 55cc485e3a930a6c279f641be75d6ef296d74f44 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 9 Oct 2025 13:20:52 +0200 Subject: [PATCH 15/22] use upstream patch --- ags-missing-includes.patch | 25 +++++++++++++++++++------ ags.spec | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ags-missing-includes.patch b/ags-missing-includes.patch index ccada4c..d7d7db5 100644 --- a/ags-missing-includes.patch +++ b/ags-missing-includes.patch @@ -1,11 +1,24 @@ -diff -up ags-3.6.2.13/Common/util/string_compat.c.orig ags-3.6.2.13/Common/util/string_compat.c ---- ags-3.6.2.13/Common/util/string_compat.c.orig 2025-09-04 10:13:12.000000000 +0200 -+++ ags-3.6.2.13/Common/util/string_compat.c 2025-10-08 13:38:06.444603269 +0200 -@@ -16,6 +16,7 @@ - #include +From d1ec1705381f3684bf85666b3cea4978efb4fbac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89rico=20Porto?= +Date: Sat, 9 Aug 2025 17:39:11 -0300 +Subject: [PATCH] Common: fix strcasecmp/strncasecmp fails on Emscripten clang + build + +--- + Common/util/string_compat.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Common/util/string_compat.c b/Common/util/string_compat.c +index 2ea5d84d9fb..e126ae89d2b 100644 +--- a/Common/util/string_compat.c ++++ b/Common/util/string_compat.c +@@ -17,6 +17,9 @@ #include #include -+#include #include "core/platform.h" ++#if !AGS_PLATFORM_OS_WINDOWS ++#include ++#endif #include "debug/assert.h" + char *ags_strlwr(char *s) diff --git a/ags.spec b/ags.spec index f5f08ef..bb0d11a 100644 --- a/ags.spec +++ b/ags.spec @@ -12,7 +12,7 @@ Release: 2%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz Patch0: ags-use-system-libraries.patch Patch1: ags-build-tests-with-cxx14.patch -Patch2: ags-missing-includes.patch +Patch2: https://github.com/adventuregamestudio/ags/commit/d1ec1705381f3684bf85666b3cea4978efb4fbac.patch#/ags-missing-includes.patch # Most code is under Artistic-2.0, except: # Common/libsrc/aastr-0.1.1: LicenseRef-Fedora-UltraPermissive # Common/libsrc/alfont-2.0.9: FTL From cc49afcb48626b616108569d67c0088334346f47 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 27 Oct 2025 22:06:12 +0100 Subject: [PATCH 16/22] update to 3.6.2.14 (resolves rhbz#2405254) --- ags-use-system-libraries.patch | 123 --------------------------------- ags.spec | 7 +- sources | 2 +- 3 files changed, 6 insertions(+), 126 deletions(-) diff --git a/ags-use-system-libraries.patch b/ags-use-system-libraries.patch index f141bab..0ea5cd9 100644 --- a/ags-use-system-libraries.patch +++ b/ags-use-system-libraries.patch @@ -9,126 +9,3 @@ diff -up ags-3.6.2.13/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.13/CMake/FindLo set(AGS_USE_MOJO_AL TRUE) endif() -diff -up ags-3.6.2.13/CMakeLists.txt.orig ags-3.6.2.13/CMakeLists.txt ---- ags-3.6.2.13/CMakeLists.txt.orig 2025-09-04 10:13:12.000000000 +0200 -+++ ags-3.6.2.13/CMakeLists.txt 2025-10-09 13:09:41.300365784 +0200 -@@ -18,9 +18,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT - option(AGS_USE_LOCAL_ALL_LIBRARIES "Use a locally installed libraries" OFF) - option(AGS_USE_LOCAL_SDL2 "Use a locally installed SDL2" ${AGS_USE_LOCAL_ALL_LIBRARIES}) - option(AGS_USE_LOCAL_SDL2_SOUND "Use a locally installed SDL2 Sound" ${AGS_USE_LOCAL_ALL_LIBRARIES}) -+option(AGS_USE_LOCAL_GLM "Use a locally installed GLM" ${AGS_USE_LOCAL_ALL_LIBRARIES}) -+option(AGS_USE_LOCAL_MINIZ "Use a locally installed Miniz" ${AGS_USE_LOCAL_ALL_LIBRARIES}) -+option(AGS_USE_LOCAL_TINYXML2 "Use a locally installed TinyXML2" ${AGS_USE_LOCAL_ALL_LIBRARIES}) - option(AGS_USE_LOCAL_OGG "Use a locally installed OGG" ${AGS_USE_LOCAL_ALL_LIBRARIES}) - option(AGS_USE_LOCAL_THEORA "Use a locally installed Theora" ${AGS_USE_LOCAL_ALL_LIBRARIES}) - option(AGS_USE_LOCAL_VORBIS "Use a locally installed Vorbis" ${AGS_USE_LOCAL_ALL_LIBRARIES}) -+option(AGS_USE_LOCAL_GTEST "Use a locally installed GTest" ${AGS_USE_LOCAL_ALL_LIBRARIES}) - - option(AGS_TESTS "Build tests" OFF) - option(AGS_BUILD_ENGINE "Build Engine" ON) -@@ -37,9 +41,13 @@ message("------- AGS dependencies option - message(" AGS_USE_LOCAL_ALL_LIBRARIES: ${AGS_USE_LOCAL_ALL_LIBRARIES}") - message(" AGS_USE_LOCAL_SDL2: ${AGS_USE_LOCAL_SDL2}") - message(" AGS_USE_LOCAL_SDL2_SOUND: ${AGS_USE_LOCAL_SDL2_SOUND}") -+message(" AGS_USE_LOCAL_GLM: ${AGS_USE_LOCAL_GLM}") -+message(" AGS_USE_LOCAL_MINIZ: ${AGS_USE_LOCAL_MINIZ}") -+message(" AGS_USE_LOCAL_TINYXML2: ${AGS_USE_LOCAL_TINYXML2}") - message(" AGS_USE_LOCAL_OGG: ${AGS_USE_LOCAL_OGG}") - message(" AGS_USE_LOCAL_THEORA: ${AGS_USE_LOCAL_THEORA}") - message(" AGS_USE_LOCAL_VORBIS: ${AGS_USE_LOCAL_VORBIS}") -+message(" AGS_USE_LOCAL_GTEST: ${AGS_USE_LOCAL_GTEST}") - message("------ AGS selected CMake options ------") - message(" AGS_TESTS: ${AGS_TESTS}") - message(" AGS_BUILD_ENGINE: ${AGS_BUILD_ENGINE}") -@@ -265,7 +273,11 @@ find_package(PkgConfig) - find_package(Threads) - - if(AGS_TESTS) -+ if(AGS_USE_LOCAL_GTEST) -+ find_package(GTest REQUIRED) -+ else() - include(FetchGoogleTest) -+ endif() - enable_testing() - endif() - -@@ -313,9 +325,23 @@ endif() - include(FindLocalOpenAL) - include(FindLocalAllegro) - -+if (NOT AGS_USE_LOCAL_GLM) - add_subdirectory(libsrc/glm EXCLUDE_FROM_ALL) -+else() -+ find_package(glm REQUIRED) -+endif() -+if (NOT AGS_USE_LOCAL_TINYXML2) - add_subdirectory(libsrc/tinyxml2 EXCLUDE_FROM_ALL) -+else() -+ find_package(tinyxml2 REQUIRED) -+ add_library(TinyXML2::TinyXML2 ALIAS tinyxml2::tinyxml2) -+endif() -+if (NOT AGS_USE_LOCAL_MINIZ) - add_subdirectory(libsrc/miniz EXCLUDE_FROM_ALL) -+else() -+ find_package(miniz REQUIRED) -+ add_library(MiniZ::MiniZ ALIAS miniz::miniz) -+endif() - - add_subdirectory(Common/libsrc/aastr-0.1.1 EXCLUDE_FROM_ALL) - -diff -up ags-3.6.2.13/CMAKE.md.orig ags-3.6.2.13/CMAKE.md ---- ags-3.6.2.13/CMAKE.md.orig 2025-09-04 10:13:12.000000000 +0200 -+++ ags-3.6.2.13/CMAKE.md 2025-10-09 13:07:58.165691257 +0200 -@@ -97,9 +97,13 @@ The available flags are: - - - `AGS_USE_LOCAL_SDL2` : Find SDL2 locally - - `AGS_USE_LOCAL_SDL2_SOUND` : Find SDL sound locally -+- `AGS_USE_LOCAL_GLM` : Find GLM locally -+- `AGS_USE_LOCAL_MINIZ` : Find Miniz locally -+- `AGS_USE_LOCAL_TINYXML2` : Find TinyXML2 locally - - `AGS_USE_LOCAL_OGG` : Find OGG locally - - `AGS_USE_LOCAL_THEORA` : Find Theora locally - - `AGS_USE_LOCAL_VORBIS` : Find Vorbis locally -+- `AGS_USE_LOCAL_GTEST` : Find GTest locally - - `AGS_USE_LOCAL_ALL_LIBRARIES` : Force all the above to be local libraries - - While default fetching scripts static link AGS to required libraries, when using local libraries AGS should dynamic link -diff -up ags-3.6.2.13/Common/CMakeLists.txt.orig ags-3.6.2.13/Common/CMakeLists.txt ---- ags-3.6.2.13/Common/CMakeLists.txt.orig 2025-09-04 10:13:12.000000000 +0200 -+++ ags-3.6.2.13/Common/CMakeLists.txt 2025-10-09 13:08:18.835311002 +0200 -@@ -251,6 +251,9 @@ if(AGS_TESTS) - common - gtest_main - ) -+ if(AGS_USE_LOCAL_GTEST) -+ target_link_libraries(common_test gtest) -+ endif() - - include(GoogleTest) - gtest_add_tests(TARGET common_test) -diff -up ags-3.6.2.13/Compiler/CMakeLists.txt.orig ags-3.6.2.13/Compiler/CMakeLists.txt ---- ags-3.6.2.13/Compiler/CMakeLists.txt.orig 2025-09-04 10:13:12.000000000 +0200 -+++ ags-3.6.2.13/Compiler/CMakeLists.txt 2025-10-09 13:08:32.869527542 +0200 -@@ -103,6 +103,9 @@ if(AGS_TESTS) - compiler - gtest_main - ) -+ if(AGS_USE_LOCAL_GTEST) -+ target_link_libraries(compiler_test gtest) -+ endif() - - include(GoogleTest) - gtest_add_tests(TARGET compiler_test) -diff -up ags-3.6.2.13/Engine/CMakeLists.txt.orig ags-3.6.2.13/Engine/CMakeLists.txt ---- ags-3.6.2.13/Engine/CMakeLists.txt.orig 2025-09-04 10:13:12.000000000 +0200 -+++ ags-3.6.2.13/Engine/CMakeLists.txt 2025-10-09 13:08:49.390009002 +0200 -@@ -661,6 +661,9 @@ if(AGS_TESTS) - common - gtest_main - ) -+ if(AGS_USE_LOCAL_GTEST) -+ target_link_libraries(engine_test gtest) -+ endif() - - include(GoogleTest) - gtest_add_tests(TARGET engine_test) diff --git a/ags.spec b/ags.spec index bb0d11a..e5d2a7b 100644 --- a/ags.spec +++ b/ags.spec @@ -6,9 +6,9 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.2.13 +Version: 3.6.2.14 URL: http://www.adventuregamestudio.co.uk/site/ags/ -Release: 2%{?dist} +Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz Patch0: ags-use-system-libraries.patch Patch1: ags-build-tests-with-cxx14.patch @@ -150,6 +150,9 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Mon Oct 27 2025 Dominik Mierzejewski - 3.6.2.14-1 +- update to 3.6.2.14 (resolves rhbz#2405254) + * Fri Sep 05 2025 Dominik Mierzejewski - 3.6.2.13-2 - build tools and run tests diff --git a/sources b/sources index 331ce0e..029fa19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.2.13.tar.gz) = b33a7813f5cc611e6f82f74a29ab33fdc2a817218fdcf4c96de81dc63e4129146e5f3390d92c405c0f170507473282d7f953d692eae21624d29ebf9a0bd535d1 +SHA512 (ags-v3.6.2.14.tar.gz) = 6ab161c61e7e475b0305691c6d0577b9033799256020366636d38b749cdfad755a69cd6b415086645e6a9d522d109930aa0d2e6d5f12b0198ab0a54917c9eab1 From 809ad01474815288b1f09407186792a9505701bb Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 27 Oct 2025 23:03:29 +0100 Subject: [PATCH 17/22] update to 3.6.1.34 --- ags.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ags.spec b/ags.spec index 7a9aa35..96bc560 100644 --- a/ags.spec +++ b/ags.spec @@ -12,7 +12,7 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.1.33 +Version: 3.6.1.34 URL: http://www.adventuregamestudio.co.uk/site/ags/ Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz @@ -120,6 +120,9 @@ make V=1 -C Engine PREFIX=%{buildroot}%{_prefix} install %{_bindir}/ags %changelog +* Mon Oct 27 2025 Dominik Mierzejewski - 3.6.1.34-1 +- update to 3.6.1.34 + * Sun Jul 06 2025 Dominik Mierzejewski - 3.6.1.33-1 - update to 3.6.1.33 diff --git a/sources b/sources index def59be..9199e47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.1.33.tar.gz) = 93480243493c8088e87bae0a3b277a8e603add2ef75ba72e06be9b9b182f2860eac88c139cf320fbd59dfa16789196b7d6c7bd8c6e635318e820fde8e29b3b26 +SHA512 (ags-v3.6.1.34.tar.gz) = ae3d006eb63229f54825bd9a687e4097751f3c7975d6f52b271416a45da2161c1e0692c58e8b0c170a9379ac678bc78a7985f7fdfc40f051407349350835d10e From 7f97be54dacf418241024033598d8900b45f9c9a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 29 Oct 2025 20:14:03 +0100 Subject: [PATCH 18/22] worked around upstream testsuite failures Some tests fail randomly when run in parallel, so run them sequentially for now. Upstream report: https://github.com/adventuregamestudio/ags/issues/2906 --- ags.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ags.spec b/ags.spec index e5d2a7b..6e606c6 100644 --- a/ags.spec +++ b/ags.spec @@ -131,7 +131,9 @@ mv Changes.txt.utf-8 Changes.txt %cmake_install %check -%ctest +# some tests fail randomly when run in parallel: +# https://github.com/adventuregamestudio/ags/issues/2906 +%ctest -j1 %files %license License.txt From 2885cf2d5e765f8231aec96caace1cf1d1690a43 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 3 Nov 2025 09:36:10 +0000 Subject: [PATCH 19/22] Build tests as C++17; required for gtest 1.17 --- ...4.patch => ags-build-tests-with-cxx17.patch | 18 +++++++++--------- ags.spec | 9 ++++++--- 2 files changed, 15 insertions(+), 12 deletions(-) rename ags-build-tests-with-cxx14.patch => ags-build-tests-with-cxx17.patch (69%) diff --git a/ags-build-tests-with-cxx14.patch b/ags-build-tests-with-cxx17.patch similarity index 69% rename from ags-build-tests-with-cxx14.patch rename to ags-build-tests-with-cxx17.patch index 815617e..daea83b 100644 --- a/ags-build-tests-with-cxx14.patch +++ b/ags-build-tests-with-cxx17.patch @@ -1,36 +1,36 @@ -diff -up ags-3.6.2.13/Common/CMakeLists.txt.cxx14 ags-3.6.2.13/Common/CMakeLists.txt ---- ags-3.6.2.13/Common/CMakeLists.txt.cxx14 2025-09-04 10:13:12.000000000 +0200 +diff -up ags-3.6.2.13/Common/CMakeLists.txt.cxx17 ags-3.6.2.13/Common/CMakeLists.txt +--- ags-3.6.2.13/Common/CMakeLists.txt.cxx17 2025-09-04 10:13:12.000000000 +0200 +++ ags-3.6.2.13/Common/CMakeLists.txt 2025-09-05 00:52:47.300264039 +0200 @@ -241,7 +241,7 @@ if(AGS_TESTS) test/version_test.cpp ) set_target_properties(common_test PROPERTIES - CXX_STANDARD 11 -+ CXX_STANDARD 14 ++ CXX_STANDARD 17 CXX_EXTENSIONS NO C_STANDARD 11 C_EXTENSIONS NO -diff -up ags-3.6.2.13/Compiler/CMakeLists.txt.cxx14 ags-3.6.2.13/Compiler/CMakeLists.txt ---- ags-3.6.2.13/Compiler/CMakeLists.txt.cxx14 2025-09-04 10:13:12.000000000 +0200 +diff -up ags-3.6.2.13/Compiler/CMakeLists.txt.cxx17 ags-3.6.2.13/Compiler/CMakeLists.txt +--- ags-3.6.2.13/Compiler/CMakeLists.txt.cxx17 2025-09-04 10:13:12.000000000 +0200 +++ ags-3.6.2.13/Compiler/CMakeLists.txt 2025-09-05 00:54:51.632435890 +0200 @@ -92,7 +92,7 @@ if(AGS_TESTS) test/cc_test_helper.h ) set_target_properties(compiler_test PROPERTIES - CXX_STANDARD 11 -+ CXX_STANDARD 14 ++ CXX_STANDARD 17 CXX_EXTENSIONS NO C_STANDARD 11 C_EXTENSIONS NO -diff -up ags-3.6.2.13/Engine/CMakeLists.txt.cxx14 ags-3.6.2.13/Engine/CMakeLists.txt ---- ags-3.6.2.13/Engine/CMakeLists.txt.cxx14 2025-09-04 10:13:12.000000000 +0200 +diff -up ags-3.6.2.13/Engine/CMakeLists.txt.cxx17 ags-3.6.2.13/Engine/CMakeLists.txt +--- ags-3.6.2.13/Engine/CMakeLists.txt.cxx17 2025-09-04 10:13:12.000000000 +0200 +++ ags-3.6.2.13/Engine/CMakeLists.txt 2025-09-05 00:55:12.224488252 +0200 @@ -649,7 +649,7 @@ if(AGS_TESTS) test/systemimports_test.cpp ) set_target_properties(engine_test PROPERTIES - CXX_STANDARD 11 -+ CXX_STANDARD 14 ++ CXX_STANDARD 17 CXX_EXTENSIONS NO C_STANDARD 11 C_EXTENSIONS NO diff --git a/ags.spec b/ags.spec index 6e606c6..b8130a9 100644 --- a/ags.spec +++ b/ags.spec @@ -8,10 +8,10 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre Version: 3.6.2.14 URL: http://www.adventuregamestudio.co.uk/site/ags/ -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz Patch0: ags-use-system-libraries.patch -Patch1: ags-build-tests-with-cxx14.patch +Patch1: ags-build-tests-with-cxx17.patch Patch2: https://github.com/adventuregamestudio/ags/commit/d1ec1705381f3684bf85666b3cea4978efb4fbac.patch#/ags-missing-includes.patch # Most code is under Artistic-2.0, except: # Common/libsrc/aastr-0.1.1: LicenseRef-Fedora-UltraPermissive @@ -79,7 +79,7 @@ This package contains the AGS engine game development tools. %prep %setup -q %patch 0 -p1 -b .orig -%patch 1 -p1 -b .cxx14 +%patch 1 -p1 -b .cxx17 %patch 2 -p1 -b .incl # delete unused bundled stuff pushd Common/libinclude @@ -152,6 +152,9 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Mon Nov 03 2025 Benjamin A. Beasley - 3.6.2.14-2 +- Build tests as C++17; required for gtest 1.17 + * Mon Oct 27 2025 Dominik Mierzejewski - 3.6.2.14-1 - update to 3.6.2.14 (resolves rhbz#2405254) From 7d7129e51b404c0b5485be9561e490470618f5d3 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 26 Nov 2025 09:47:28 +0100 Subject: [PATCH 20/22] update to 3.6.2.15 (resolves rhbz#2416531) - drop serial ctest call work-around, fixed upstream (https://github.com/adventuregamestudio/ags/pull/2910) --- ags.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ags.spec b/ags.spec index b8130a9..6e6ecc0 100644 --- a/ags.spec +++ b/ags.spec @@ -6,9 +6,9 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.2.14 +Version: 3.6.2.15 URL: http://www.adventuregamestudio.co.uk/site/ags/ -Release: 2%{?dist} +Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz Patch0: ags-use-system-libraries.patch Patch1: ags-build-tests-with-cxx17.patch @@ -131,9 +131,7 @@ mv Changes.txt.utf-8 Changes.txt %cmake_install %check -# some tests fail randomly when run in parallel: -# https://github.com/adventuregamestudio/ags/issues/2906 -%ctest -j1 +%ctest %files %license License.txt @@ -152,6 +150,11 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Wed Nov 26 2025 Dominik Mierzejewski - 3.6.2.15-1 +- update to 3.6.2.15 (resolves rhbz#2416531) +- drop serial ctest call work-around, fixed upstream + (https://github.com/adventuregamestudio/ags/pull/2910) + * Mon Nov 03 2025 Benjamin A. Beasley - 3.6.2.14-2 - Build tests as C++17; required for gtest 1.17 diff --git a/sources b/sources index 029fa19..586f7f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.2.14.tar.gz) = 6ab161c61e7e475b0305691c6d0577b9033799256020366636d38b749cdfad755a69cd6b415086645e6a9d522d109930aa0d2e6d5f12b0198ab0a54917c9eab1 +SHA512 (ags-v3.6.2.15.tar.gz) = 52b3250c17a416b2f37e4334b0d84e681c78d2b261aa926412ab758b788cc9c12f3ec92e50834ea21e4ddf879396ca1041d1a02a8970d21be4475ffd9e264530 From 4fdb5f53e633ca4e9cced2a4761b1782d40ef4d5 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 14 Jan 2026 17:42:46 +0100 Subject: [PATCH 21/22] update to 3.6.2.16 - drop obsolete patch --- ags-missing-includes.patch | 24 ------------------------ ags.spec | 8 +++++--- sources | 2 +- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 ags-missing-includes.patch diff --git a/ags-missing-includes.patch b/ags-missing-includes.patch deleted file mode 100644 index d7d7db5..0000000 --- a/ags-missing-includes.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d1ec1705381f3684bf85666b3cea4978efb4fbac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89rico=20Porto?= -Date: Sat, 9 Aug 2025 17:39:11 -0300 -Subject: [PATCH] Common: fix strcasecmp/strncasecmp fails on Emscripten clang - build - ---- - Common/util/string_compat.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Common/util/string_compat.c b/Common/util/string_compat.c -index 2ea5d84d9fb..e126ae89d2b 100644 ---- a/Common/util/string_compat.c -+++ b/Common/util/string_compat.c -@@ -17,6 +17,9 @@ - #include - #include - #include "core/platform.h" -+#if !AGS_PLATFORM_OS_WINDOWS -+#include -+#endif - #include "debug/assert.h" - - char *ags_strlwr(char *s) diff --git a/ags.spec b/ags.spec index 6e6ecc0..f26950d 100644 --- a/ags.spec +++ b/ags.spec @@ -6,13 +6,12 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre -Version: 3.6.2.15 +Version: 3.6.2.16 URL: http://www.adventuregamestudio.co.uk/site/ags/ Release: 1%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz Patch0: ags-use-system-libraries.patch Patch1: ags-build-tests-with-cxx17.patch -Patch2: https://github.com/adventuregamestudio/ags/commit/d1ec1705381f3684bf85666b3cea4978efb4fbac.patch#/ags-missing-includes.patch # Most code is under Artistic-2.0, except: # Common/libsrc/aastr-0.1.1: LicenseRef-Fedora-UltraPermissive # Common/libsrc/alfont-2.0.9: FTL @@ -80,7 +79,6 @@ This package contains the AGS engine game development tools. %setup -q %patch 0 -p1 -b .orig %patch 1 -p1 -b .cxx17 -%patch 2 -p1 -b .incl # delete unused bundled stuff pushd Common/libinclude rm -r ogg @@ -150,6 +148,10 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Wed Jan 14 2026 Dominik Mierzejewski - 3.6.2.16-1 +- update to 3.6.2.16 +- drop obsolete patch + * Wed Nov 26 2025 Dominik Mierzejewski - 3.6.2.15-1 - update to 3.6.2.15 (resolves rhbz#2416531) - drop serial ctest call work-around, fixed upstream diff --git a/sources b/sources index 586f7f1..2c31f17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ags-v3.6.2.15.tar.gz) = 52b3250c17a416b2f37e4334b0d84e681c78d2b261aa926412ab758b788cc9c12f3ec92e50834ea21e4ddf879396ca1041d1a02a8970d21be4475ffd9e264530 +SHA512 (ags-v3.6.2.16.tar.gz) = 4b3261284454fc4e770f684eb6ece5199bc9d8a731d433b96f1134ade8907d60f0658f481f5ed229346a6dfeac61622ce5d62adfc163489f1cbf335b7c088936 From 4b66145d8ddff5aae0df94c30e521768ca063bc0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:31:15 +0000 Subject: [PATCH 22/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- ags.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ags.spec b/ags.spec index f26950d..1e42828 100644 --- a/ags.spec +++ b/ags.spec @@ -8,7 +8,7 @@ Name: ags Summary: Engine for creating and running videogames of adventure (quest) genre Version: 3.6.2.16 URL: http://www.adventuregamestudio.co.uk/site/ags/ -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz Patch0: ags-use-system-libraries.patch Patch1: ags-build-tests-with-cxx17.patch @@ -148,6 +148,9 @@ mv Changes.txt.utf-8 Changes.txt %{_bindir}/ags %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 3.6.2.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jan 14 2026 Dominik Mierzejewski - 3.6.2.16-1 - update to 3.6.2.16 - drop obsolete patch