rpms/ags
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'f33' into f34

Browse source
This commit is contained in:
Dominik 'Rathann' Mierzejewski 2021-04-08 12:04:44 +02:00
commit fa5c1906e1
5 changed files with 8 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/ags-v.3.4.4.1.tar.xz
/ags-v.3.4.4.2.tar.gz
/ags-v.3.5.0.25.tar.gz
/ags-v.3.5.0.31.tar.gz

13
ags-big.patch
View file

@ -1,13 +0,0 @@
diff -up ags-v.3.5.0.25/Common/util/compress.cpp.big ags-v.3.5.0.25/Common/util/compress.cpp
--- ags-v.3.5.0.25/Common/util/compress.cpp.big 2020-07-12 00:18:03.000000000 +0000
+++ ags-v.3.5.0.25/Common/util/compress.cpp 2020-08-05 14:33:42.303360129 +0000
@@ -25,6 +25,9 @@
#include "util/lzw.h"
#include "util/misc.h"
#include "util/stream.h"
+#if AGS_PLATFORM_ENDIAN_BIG
+#include "util/bbop.h"
+#endif
using namespace AGS::Common;

121
ags-gcc10.patch
View file

@ -1,121 +0,0 @@
diff -up ags-v.3.5.0.25/Common/font/fonts.cpp.gcc10 ags-v.3.5.0.25/Common/font/fonts.cpp
--- ags-v.3.5.0.25/Common/font/fonts.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Common/font/fonts.cpp 2020-08-04 14:45:38.562128618 +0200
@@ -12,6 +12,7 @@
//
//=============================================================================
+#include <cstdio>
#include <vector>
#include <alfont.h>
#include "ac/common.h" // set_our_eip
diff -up ags-v.3.5.0.25/Common/game/main_game_file.cpp.gcc10 ags-v.3.5.0.25/Common/game/main_game_file.cpp
--- ags-v.3.5.0.25/Common/game/main_game_file.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Common/game/main_game_file.cpp 2020-08-04 14:46:04.688326178 +0200
@@ -12,6 +12,7 @@
//
//=============================================================================
+#include <cstdio>
#include "ac/audiocliptype.h"
#include "ac/dialogtopic.h"
#include "ac/gamesetupstruct.h"
diff -up ags-v.3.5.0.25/Engine/ac/global_debug.cpp.gcc10 ags-v.3.5.0.25/Engine/ac/global_debug.cpp
--- ags-v.3.5.0.25/Engine/ac/global_debug.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Engine/ac/global_debug.cpp 2020-08-04 12:56:31.962203312 +0200
@@ -12,6 +12,7 @@
//
//=============================================================================
+#include <cstdio>
#include "ac/global_debug.h"
#include "ac/common.h"
#include "ac/characterinfo.h"
diff -up ags-v.3.5.0.25/Engine/ac/global_display.cpp.gcc10 ags-v.3.5.0.25/Engine/ac/global_display.cpp
--- ags-v.3.5.0.25/Engine/ac/global_display.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Engine/ac/global_display.cpp 2020-08-04 12:56:31.962203312 +0200
@@ -12,6 +12,7 @@
//
//=============================================================================
+#include <cstdio>
#include <stdarg.h>
#include "ac/common.h"
#include "ac/character.h"
diff -up ags-v.3.5.0.25/Engine/ac/gui.cpp.gcc10 ags-v.3.5.0.25/Engine/ac/gui.cpp
--- ags-v.3.5.0.25/Engine/ac/gui.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Engine/ac/gui.cpp 2020-08-04 12:56:31.962203312 +0200
@@ -12,6 +12,7 @@
//
//=============================================================================
+#include <cstdio>
#include "ac/gui.h"
#include "ac/common.h"
#include "ac/draw.h"
diff -up ags-v.3.5.0.25/Engine/ac/parser.cpp.gcc10 ags-v.3.5.0.25/Engine/ac/parser.cpp
--- ags-v.3.5.0.25/Engine/ac/parser.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Engine/ac/parser.cpp 2020-08-04 12:56:31.962203312 +0200
@@ -13,6 +13,7 @@
//=============================================================================
#include <cctype> //isalnum()
+#include <cstdio>
#include "ac/common.h"
#include "ac/gamesetupstruct.h"
#include "ac/gamestate.h"
diff -up ags-v.3.5.0.25/Engine/ac/string.cpp.gcc10 ags-v.3.5.0.25/Engine/ac/string.cpp
--- ags-v.3.5.0.25/Engine/ac/string.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Engine/ac/string.cpp 2020-08-04 12:56:31.962203312 +0200
@@ -12,6 +12,7 @@
//
//=============================================================================
+#include <cstdio>
#include "ac/string.h"
#include "ac/common.h"
#include "ac/display.h"
diff -up ags-v.3.5.0.25/Engine/ac/translation.cpp.gcc10 ags-v.3.5.0.25/Engine/ac/translation.cpp
--- ags-v.3.5.0.25/Engine/ac/translation.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Engine/ac/translation.cpp 2020-08-04 12:56:31.962203312 +0200
@@ -12,6 +12,7 @@
//
//=============================================================================
+#include <cstdio>
#include "ac/asset_helper.h"
#include "ac/common.h"
#include "ac/gamesetup.h"
diff -up ags-v.3.5.0.25/Engine/debug/filebasedagsdebugger.cpp.gcc10 ags-v.3.5.0.25/Engine/debug/filebasedagsdebugger.cpp
--- ags-v.3.5.0.25/Engine/debug/filebasedagsdebugger.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Engine/debug/filebasedagsdebugger.cpp 2020-08-04 14:42:43.988808731 +0200
@@ -12,6 +12,7 @@
//
//=============================================================================
+#include <cstdio>
#include "debug/filebasedagsdebugger.h"
#include "ac/file.h" // filelength()
#include "util/stream.h"
diff -up ags-v.3.5.0.25/Engine/gui/guidialog.cpp.gcc10 ags-v.3.5.0.25/Engine/gui/guidialog.cpp
--- ags-v.3.5.0.25/Engine/gui/guidialog.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Engine/gui/guidialog.cpp 2020-08-04 14:44:16.379507272 +0200
@@ -12,6 +12,7 @@
//
//=============================================================================
+#include <cstdio>
#include "gui/guidialog.h"
#include "ac/common.h"
diff -up ags-v.3.5.0.25/Engine/script/cc_instance.cpp.gcc10 ags-v.3.5.0.25/Engine/script/cc_instance.cpp
--- ags-v.3.5.0.25/Engine/script/cc_instance.cpp.gcc10 2020-07-12 02:18:03.000000000 +0200
+++ ags-v.3.5.0.25/Engine/script/cc_instance.cpp 2020-08-04 14:45:00.790843049 +0200
@@ -12,6 +12,7 @@
//
//=============================================================================
+#include <cstdio>
#include <string.h>
#include "ac/common.h"
#include "ac/dynobj/cc_dynamicarray.h"

14
ags.spec
View file

@ -2,9 +2,9 @@
Name: ags
Summary: Engine for creating and running videogames of adventure (quest) genre
Version: 3.5.0.25
Version: 3.5.0.31
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
# unbundle alfont
Patch0: %{name}-use-system-alfont.patch
@ -12,12 +12,8 @@ Patch0: %{name}-use-system-alfont.patch
Patch1: %{name}-use-system-allegro.patch
# unbundle freetype
Patch2: %{name}-use-system-freetype.patch
# fix missing includes under GCC10
Patch3: %{name}-gcc10.patch
# use dynamic linking for dumb
Patch4: %{name}-dynamic-dumb.patch
# fix compilation on big-endian (missing include)
Patch5: %{name}-big.patch
License: Artistic 2.0 and BSD and Giftware and LGPLv2+ and Public Domain and zlib
BuildRequires: alfont-devel
BuildRequires: allegro-devel
@ -62,9 +58,7 @@ since continued to be developed by contributors.
%patch0 -p1 -b .alfont
%patch1 -p1 -b .allegro
%patch2 -p1 -b .noft
%patch3 -p1 -b .gcc10
%patch4 -p1 -b .dynamic
%patch5 -p1 -b .big
# delete unused bundled stuff
pushd Common/libinclude
rm -r internal
@ -100,6 +94,10 @@ make V=1 -C Engine PREFIX=%{buildroot}%{_prefix} install
%{_bindir}/ags
%changelog
* Thu Apr 08 2021 Dominik Mierzejewski <rpm@greysector.net> - 3.5.0.31-1
- update to 3.5.0.31
- drop obsolete patches
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0.25-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

2
sources
View file

@ -1 +1 @@
SHA512 (ags-v.3.5.0.25.tar.gz) = aeffae5285fd35f065d48b6e8a30f4092a61e4e6849b4269e986121e3576ddc6c5f8a205b889295f40c22d5ab4438e16162cced8f3f38e3dc191b40fb42ea920
SHA512 (ags-v.3.5.0.31.tar.gz) = 8cc58698a5b024275543b8231738add676d3451d604b48c7bd5074838f69fb4a0dcafb39df73d2235b5266bd63fa3c4edbeed85b1cc6c36d8d022621de9b649e