Merge branch 'f38' into f39

This commit is contained in:
Dominik 'Rathann' Mierzejewski 2024-01-19 18:02:01 +01:00
commit 6fdcd73191
3 changed files with 22 additions and 15 deletions

View file

@ -1,20 +1,24 @@
diff -up ags-v.3.6.0.22/Engine/Makefile-defs.linux.openal ags-v.3.6.0.22/Engine/Makefile-defs.linux
--- ags-v.3.6.0.22/Engine/Makefile-defs.linux.openal 2022-03-31 22:47:27.000000000 +0200
+++ ags-v.3.6.0.22/Engine/Makefile-defs.linux 2022-04-01 23:34:19.014773295 +0200
@@ -37,6 +37,9 @@ SDL2_LIBS = $(shell sdl2-config --libs)
CFLAGS += $(SDL2_CFLAGS)
LIBS += $(SDL2_LIBS) -lSDL2_sound
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 += $(shell pkg-config --cflags openal)
+LIBS += $(shell pkg-config --libs openal)
-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
ifdef BUILD_STR
diff -up ags-v.3.6.0.22/Engine/Makefile-objs.openal ags-v.3.6.0.22/Engine/Makefile-objs
--- ags-v.3.6.0.22/Engine/Makefile-objs.openal 2022-03-31 22:47:27.000000000 +0200
+++ ags-v.3.6.0.22/Engine/Makefile-objs 2022-04-01 23:32:14.054815899 +0200
@@ -58,8 +58,6 @@ PLUGINS = ../Plugins/AGSflashlight/agsfl
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

View file

@ -11,7 +11,7 @@
Name: ags
Summary: Engine for creating and running videogames of adventure (quest) genre
Version: 3.6.0.51
Version: 3.6.0.56
URL: http://www.adventuregamestudio.co.uk/site/ags/
Release: 1%{?dist}
Source0: https://github.com/adventuregamestudio/ags/archive/%{fver}/ags-%{fver}.tar.gz
@ -115,6 +115,9 @@ make V=1 -C Engine PREFIX=%{buildroot}%{_prefix} install
%{_bindir}/ags
%changelog
* Fri Jan 19 2024 Dominik Mierzejewski <dominik@greysector.net> - 3.6.0.56-1
- update to 3.6.0.56
* Fri Sep 01 2023 Dominik Mierzejewski <dominik@greysector.net> - 3.6.0.51-1
- update to 3.6.0.51

View file

@ -1 +1 @@
SHA512 (ags-v3.6.0.51.tar.gz) = f816909bb94c2f2d9e3527f80312df94bb1d2f2a962b883954cd57c75957405255da290e26a8d00d22a49f7110405449291e3ae7bd0ebe09c3d2359a6f1e1f58
SHA512 (ags-v3.6.0.56.tar.gz) = f36ec7c34a232e109d0dffff438fb8a6dc3e7ad5825b66b009c982c2505bc136ed660dc871b1c65fc799592f3dcac9082680b7d212a5081198d7bb56ca8be3f6