Compare commits

...
Sign in to create a new pull request.

14 commits

Author SHA1 Message Date
Fedora Release Engineering
4b66145d8d Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 03:31:15 +00:00
Dominik 'Rathann' Mierzejewski
4fdb5f53e6 update to 3.6.2.16
- drop obsolete patch
2026-01-14 17:42:46 +01:00
Dominik 'Rathann' Mierzejewski
7d7129e51b update to 3.6.2.15 (resolves rhbz#2416531)
- drop serial ctest call work-around, fixed upstream
  (https://github.com/adventuregamestudio/ags/pull/2910)
2025-11-26 09:48:08 +01:00
Benjamin A. Beasley
2885cf2d5e Build tests as C++17; required for gtest 1.17 2025-11-03 09:36:10 +00:00
Dominik 'Rathann' Mierzejewski
7f97be54da 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
2025-10-29 20:14:03 +01:00
Dominik 'Rathann' Mierzejewski
cc49afcb48 update to 3.6.2.14 (resolves rhbz#2405254) 2025-10-27 22:06:12 +01:00
Dominik 'Rathann' Mierzejewski
55cc485e3a use upstream patch 2025-10-09 13:20:52 +02:00
Dominik 'Rathann' Mierzejewski
2a38a58271 make the system GTest support conditional 2025-10-09 13:11:00 +02:00
Dominik 'Rathann' Mierzejewski
fb80656b28 build tools and run tests 2025-10-08 16:13:02 +02:00
Dominik 'Rathann' Mierzejewski
20a7545e1a update to 3.6.2.13 (resolves rhbz#2393079) 2025-09-04 23:22:15 +02:00
Dominik 'Rathann' Mierzejewski
d5687daa6e fix chronological changelog order 2025-09-04 21:37:04 +02:00
Benjamin A. Beasley
826d70c223 Rebuilt for tinyxml2 11.0.0 2025-08-23 06:55:51 -04:00
Dominik 'Rathann' Mierzejewski
4a3393a565 follow upstream convention in option naming
- drop custom miniz detection and require a fixed build instead
2025-08-03 01:02:07 +02:00
Fedora Release Engineering
65adaf4d90 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 16:49:56 +00:00
5 changed files with 107 additions and 72 deletions

View file

@ -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)

View file

@ -0,0 +1,36 @@
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 17
CXX_EXTENSIONS NO
C_STANDARD 11
C_EXTENSIONS NO
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 17
CXX_EXTENSIONS NO
C_STANDARD 11
C_EXTENSIONS NO
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 17
CXX_EXTENSIONS NO
C_STANDARD 11
C_EXTENSIONS NO

View file

@ -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-09 13:07:24.743943475 +0200
@@ -1,6 +1,6 @@
# Grab system openAL or use embedded mojoAL
@ -9,28 +9,3 @@ 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-19 14:04:25.748967837 +0200
@@ -313,9 +313,21 @@ 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)

View file

@ -6,13 +6,12 @@
Name: ags
Summary: Engine for creating and running videogames of adventure (quest) genre
Version: 3.6.2.12
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
# https://github.com/richgel999/miniz/issues/249
Source1: FindMiniz.cmake
Patch0: ags-use-system-libraries.patch
Patch1: ags-build-tests-with-cxx17.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
@ -36,13 +35,14 @@ BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: glad
BuildRequires: glm-devel
BuildRequires: gtest-devel
# for KHR/khrplatform.h
BuildRequires: libglvnd-devel
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
@ -68,10 +68,17 @@ 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
cp -p %{S:1} CMake/
%patch 1 -p1 -b .cxx17
# delete unused bundled stuff
pushd Common/libinclude
rm -r ogg
@ -104,26 +111,77 @@ 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 \
-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 \
-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 Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jan 14 2026 Dominik Mierzejewski <dominik@greysector.net> - 3.6.2.16-1
- update to 3.6.2.16
- drop obsolete patch
* Wed Nov 26 2025 Dominik Mierzejewski <dominik@greysector.net> - 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 <code@musicinmybrain.net> - 3.6.2.14-2
- Build tests as C++17; required for gtest 1.17
* Mon Oct 27 2025 Dominik Mierzejewski <dominik@greysector.net> - 3.6.2.14-1
- update to 3.6.2.14 (resolves rhbz#2405254)
* Fri Sep 05 2025 Dominik Mierzejewski <dominik@greysector.net> - 3.6.2.13-2
- build tools and run tests
* Thu Sep 04 2025 Dominik Mierzejewski <dominik@greysector.net> - 3.6.2.13-1
- update to 3.6.2.13 (resolves rhbz#2393079)
* Sat Aug 23 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 3.6.2.12-4
- Rebuilt for tinyxml2 11.0.0
* Sun Aug 03 2025 Dominik Mierzejewski <dominik@greysector.net> - 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 <releng@fedoraproject.org> - 3.6.2.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sat Jul 19 2025 Dominik Mierzejewski <dominik@greysector.net> - 3.6.2.12-1
- update to 3.6.2.12
- switch back to bundled freetype per upstream recommendation

View file

@ -1 +1 @@
SHA512 (ags-v3.6.2.12.tar.gz) = 505c9210ee5fa58fd1570b152c6ef650ce51d39486389d487a7442ea3d3b99e607a9b882bf85a77be2da0fbf029a9f6789a74c0121092cff15241fbd40011cd5
SHA512 (ags-v3.6.2.16.tar.gz) = 4b3261284454fc4e770f684eb6ece5199bc9d8a731d433b96f1134ade8907d60f0658f481f5ed229346a6dfeac61622ce5d62adfc163489f1cbf335b7c088936