update to 3.4.6.r734.gc7672f8

author: Alexandre Bouvier 2024-04-12 02:52:15 +0200
committer: Alexandre Bouvier 2024-04-12 02:52:15 +0200
commit: 2ea5f76c2991100e3c467cde234c5187d3994271 (patch)
tree: 07d2fcee746b8e7d9486dee9ce6700e6e4bff033
parent: 561c96fe94f9cd7bf896542cac77b058394d61f1 (diff)
download: aur-2ea5f76c2991100e3c467cde234c5187d3994271.tar.gz
5 files changed, 77 insertions, 80 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2fc84905b483..283e9a3e17df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = apotris-git
 	pkgdesc = A block stacking puzzle game for the Game Boy Advance (Linux port)
-	pkgver = 3.4.6.r648.g7cb1d73
-	pkgrel = 2
+	pkgver = 3.4.6.r734.gc7672f8
+	pkgrel = 1
 	url = https://apotris.com/
 	arch = aarch64
 	arch = armv7h
@@ -11,8 +11,10 @@ pkgbase = apotris-git
 	arch = x86_64
 	license = GPL-3.0-only
 	makedepends = git
-	makedepends = libmodplug
+	makedepends = libogg
+	makedepends = libvorbis
 	makedepends = meson
+	makedepends = opus
 	makedepends = python
 	makedepends = sdl2_mixer
 	makedepends = xxd
@@ -20,7 +22,7 @@ pkgbase = apotris-git
 	depends = glibc
 	depends = libopenmpt
 	depends = sdl2
-	provides = apotris=3.4.6.r648.g7cb1d73
+	provides = apotris=3.4.6.r734.gc7672f8
 	conflicts = apotris
 	source = apotris::git+https://gitea.com/akouzoukos/apotris.git#branch=ports
 	source = soloud::git+https://github.com/akouzoukos/soloud.git
@@ -33,8 +35,8 @@ pkgbase = apotris-git
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = 6a5b652537461135895820391beb20bb2e64e312f08ddbd9ea8d313047118693556df26e89019e81b26c6650388597eebbc8ae4cf824739aadb41121d728ed80
-	b2sums = 435a83ad6efe373701eca5b1fed7cb83f99b82ce303e1fe330300abddb25bf166751800c28c62af303cded5d3a95944637f3978405fe13e044a7f3870a2753d4
-	b2sums = 3ef703d45b06cac59768c0e36ed09fe8238aef03d8a51893707aaf91c0efeb5518276e4985a0efc0bcec2370ce4abe1c7494a87327723779f0689550ebd9a8f6
-	b2sums = 1c92929a34ddf8c85572c3f0ef02ba7310cb85e5b6f0f3f852aa069d340b11b25608d388a94df15ec5558243105b632fe48ce090f18a4d5e924473e1436bb7e7
+	b2sums = 217b5d7781dbdb227c7e81305743383304e5068b297b6d3be0bf88f04a8b9e642fa509ff6023748a38e5d7723184b02f0356a3293561de29edcc44007f943aaf
+	b2sums = 8df45e7ece2bbac199470498f3b27c0fef707fcfcc25fdffac04d9bb825c76d29004c43c5fa77e21e343d32e03b885cb59e9d13a3e909cdaf17aaa825b111237
+	b2sums = 497d9ed7ed0c5d3bce10d23a14e5a6d4b39125045290048f8a4b813fd81767f9a459636c5e84fd17b3b0802fee6fd0afa0bddb0dbda7c04484a39a2bc176a0ba
 
 pkgname = apotris-git
diff --git a/PKGBUILD b/PKGBUILD
index e6874b4fedfe..baa02a552b99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,42 @@
 # Maintainer: Alexandre Bouvier <contact@amb.tf>
 _pkgname=apotris
 pkgname=$_pkgname-git
-pkgver=3.4.6.r648.g7cb1d73
-pkgrel=2
+pkgver=3.4.6.r734.gc7672f8
+pkgrel=1
 pkgdesc="A block stacking puzzle game for the Game Boy Advance (Linux port)"
 arch=('aarch64' 'armv7h' 'i486' 'i686' 'pentium4' 'x86_64')
 url="https://apotris.com/"
 license=('GPL-3.0-only')
 depends=('bash' 'glibc' 'libopenmpt' 'sdl2')
-makedepends=('git' 'libmodplug' 'meson' 'python' 'sdl2_mixer' 'xxd')
+makedepends=(
+	'git'
+	'libogg'
+	'libvorbis'
+	'meson'
+	'opus'
+	'python'
+	'sdl2_mixer'
+	'xxd'
+)
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
 source=(
 	"$_pkgname::git+https://gitea.com/akouzoukos/apotris.git#branch=ports"
 	'soloud::git+https://github.com/akouzoukos/soloud.git'
 	'Tilengine::git+https://github.com/akouzoukos/Tilengine.git'
-	'apotris.sh'
-	'apotris-install.patch'
-	'apotris-use-system-libs.patch'
+	"$_pkgname.sh"
+	"$_pkgname-install.patch"
+	"$_pkgname-use-system-libs.patch"
 	'soloud-use-system-libs.patch'
-
 )
 b2sums=(
 	'SKIP'
 	'SKIP'
 	'SKIP'
 	'6a5b652537461135895820391beb20bb2e64e312f08ddbd9ea8d313047118693556df26e89019e81b26c6650388597eebbc8ae4cf824739aadb41121d728ed80'
-	'435a83ad6efe373701eca5b1fed7cb83f99b82ce303e1fe330300abddb25bf166751800c28c62af303cded5d3a95944637f3978405fe13e044a7f3870a2753d4'
-	'3ef703d45b06cac59768c0e36ed09fe8238aef03d8a51893707aaf91c0efeb5518276e4985a0efc0bcec2370ce4abe1c7494a87327723779f0689550ebd9a8f6'
-	'1c92929a34ddf8c85572c3f0ef02ba7310cb85e5b6f0f3f852aa069d340b11b25608d388a94df15ec5558243105b632fe48ce090f18a4d5e924473e1436bb7e7'
+	'217b5d7781dbdb227c7e81305743383304e5068b297b6d3be0bf88f04a8b9e642fa509ff6023748a38e5d7723184b02f0356a3293561de29edcc44007f943aaf'
+	'8df45e7ece2bbac199470498f3b27c0fef707fcfcc25fdffac04d9bb825c76d29004c43c5fa77e21e343d32e03b885cb59e9d13a3e909cdaf17aaa825b111237'
+	'497d9ed7ed0c5d3bce10d23a14e5a6d4b39125045290048f8a4b813fd81767f9a459636c5e84fd17b3b0802fee6fd0afa0bddb0dbda7c04484a39a2bc176a0ba'
 )
 
 pkgver() {
@@ -41,8 +49,8 @@ prepare() {
 	git config submodule.subprojects/SoLoud.url ../soloud
 	git config submodule.tilengine.url ../Tilengine
 	git -c protocol.file.allow=always submodule update
-	patch -Np1 < ../apotris-use-system-libs.patch
-	patch -Np1 < ../apotris-install.patch
+	patch -Np1 < ../$_pkgname-use-system-libs.patch
+	patch -Np1 < ../$_pkgname-install.patch
 	sed -i "s|assets|/usr/share/$_pkgname|" source/{audio_files,liba_window}.cpp
 	sed -i 's/data_/apotris_&/' tools/callBin2S.py
 	cd subprojects/SoLoud
diff --git a/apotris-install.patch b/apotris-install.patch
index d21ee6d7bc00..2b6df84c9f74 100644
--- a/apotris-install.patch
+++ b/apotris-install.patch
@@ -13,16 +13,16 @@ index cbcfb10..6b6c4a7 100644
 +    install_data(filename, install_dir : 'share/apotris', install_mode : 'rw-r--r--')
  endforeach
 diff --git a/meson.build b/meson.build
-index 2c7318a..71d85ae 100644
+index f1964fc..8ddd9c0 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -215,7 +215,8 @@ if host_machine.system() != 'gba'
-         dependencies : dependencies,
-         link_args : link_args,
-         gui_app : true,
--        install_rpath: 'lib'
-+        install : true,
-+        install_dir : 'lib/apotris'
-     )
+@@ -294,7 +294,8 @@ if host_machine.system() != 'gba'
+             dependencies : dependencies,
+             link_args : link_args,
+             win_subsystem : 'windows',
+-            install_rpath: 'lib'
++            install : true,
++            install_dir : 'lib/apotris'
+         )
+     endif
  else
-     ##########################################
diff --git a/apotris-use-system-libs.patch b/apotris-use-system-libs.patch
index 2b97da541e90..180f68470b39 100644
--- a/apotris-use-system-libs.patch
+++ b/apotris-use-system-libs.patch
@@ -1,40 +1,26 @@
 diff --git a/meson.build b/meson.build
-index 2c7318a..cb7c05c 100644
+index f1964fc..2fb46c9 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -102,9 +102,6 @@ endif
+@@ -95,8 +95,6 @@ endif
  
  # Various helper libraries, subprojects, and scripts common to all builds
  fs = import('fs')
--cmake = import('cmake')
 -tools = subproject('general-tools')
 -padbin = tools.get_variable('padbin_executable')
  bin2s = files('tools/bin2s.py')
  call_bin2s = files('tools/callBin2S.py')
- 
-@@ -140,22 +137,17 @@ if host_machine.system() != 'gba'
-     subdir('assets')
- 
-     # libmodplug must be built as a dynamic/shared library
--    cmake_options = cmake.subproject_options()
--    cmake_options.add_cmake_defines({ 'BUILD_SHARED_LIBS' : 'ON' })
--    modplug = cmake.subproject('libmodplug', options : cmake_options)
- 
-     # Other required dependencies
-     tilengine = subproject('Tilengine', default_options : ['default_library=static'])
--    sdl = subproject('sdl2', default_options : ['default_library=shared'])
--    sdl_mixer = subproject('sdl2_mixer', default_options : ['default_library=shared'])
-     soloud = subproject('SoLoud', default_options : ['default_library=static'])
- 
-     dependencies = [
--        modplug.dependency('modplug'),
-+        dependency('libmodplug'),
-         tilengine.get_variable('tilengine_dep'),
--        sdl.get_variable('sdl2_dep'),
-+        dependency('sdl2'),
-         soloud.get_variable('soloud_dep'),
--        sdl_mixer.get_variable('sdl2_mixer_dep'),
-+        dependency('SDL2_mixer'),
-         # dependency('gl'),
-         # dependency('glew'),
-     ]
+ if host_machine.system() == 'horizon'
+@@ -150,10 +148,10 @@ if host_machine.system() != 'gba'
+         vorbisfile = dependency('vorbisfile', static : true, default_options : ['default_library=static'], fallback : ['vorbis', 'vorbisfile_dep'])
+     else
+         # Other required dependencies
+-        openmpt = dependency('openmpt', default_options : ['default_library=static'], fallback : ['openmpt', 'openmpt_dep'])
++        openmpt = dependency('libopenmpt', default_options : ['default_library=static'], fallback : ['openmpt', 'openmpt_dep'])
+         tilengine = dependency('Tilengine', default_options : ['default_library=static'], fallback : ['Tilengine', 'tilengine_dep'])
+         sdl2_dep = dependency('sdl2', default_options : ['default_library=static'], fallback : ['sdl2', 'sdl2_dep'])
+-        sdl_mixer = dependency('sdl2_mixer', default_options : ['default_library=static'], fallback : ['sdl2_mixer', 'sdl2_mixer_dep'])
++        sdl_mixer = dependency('SDL2_mixer', default_options : ['default_library=static'], fallback : ['sdl2_mixer', 'sdl2_mixer_dep'])
+         soloud = dependency('SoLoud', default_options : ['default_library=static'], fallback : ['SoLoud', 'soloud_dep'])
+         if host_machine.system() == 'linux'
+             vorbis = dependency('vorbis', default_options : ['default_library=static'], fallback : ['vorbis', 'vorbis_dep'])
diff --git a/soloud-use-system-libs.patch b/soloud-use-system-libs.patch
index 70498c88464d..f0e428e371ed 100644
--- a/soloud-use-system-libs.patch
+++ b/soloud-use-system-libs.patch
@@ -1,25 +1,26 @@
+diff --git a/include/soloud_openmpt.h b/include/soloud_openmpt.h
+index 0c7622d..178a79c 100644
+--- a/include/soloud_openmpt.h
++++ b/include/soloud_openmpt.h
+@@ -26,7 +26,7 @@ freely, subject to the following restrictions:
+ #define OPENMPT_H
+ 
+ #include "soloud.h"
+-#include <libopenmpt.h>
++#include <libopenmpt/libopenmpt.h>
+ 
+ namespace SoLoud
+ {
 diff --git a/meson.build b/meson.build
-index 6564170..855bf17 100644
+index 66cc82f..bdfb986 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -42,18 +42,13 @@ sources = files(
-     'src' / 'backend' / 'sdl' / 'soloud_sdl2_dll.c',
- )
- 
--cmake = import('cmake')
- 
--sdl = subproject('sdl2', default_options : ['default_library=shared'])
- 
--cmake_options = cmake.subproject_options()
--cmake_options.add_cmake_defines({ 'BUILD_SHARED_LIBS' : 'ON' })
--modplug = cmake.subproject('libmodplug', options : cmake_options)
- 
- link_args = []
- deps = [
--    modplug.dependency('modplug'),
--    sdl.get_variable('sdl2_dep')
-+    dependency('libmodplug'),
-+    dependency('sdl2')
- ]
+@@ -44,7 +44,7 @@ sources = files(
+ opus = dependency('opus', fallback : ['opus', 'opus_dep'])
+ ogg = dependency('ogg', fallback : ['ogg', 'libogg_dep'])
  
- inc = include_directories('include')
+-openmpt = dependency('openmpt', default_options : ['default_library=static'], fallback : ['openmpt', 'openmpt_dep'])
++openmpt = dependency('libopenmpt', default_options : ['default_library=static'], fallback : ['openmpt', 'openmpt_dep'])
+ sources += files('src/backend/sdl2_static/soloud_sdl2_static.cpp')
+ arg = '-DWITH_SDL2_STATIC=1'
+ sdl2_dep = dependency('sdl2', default_options : ['default_library=static'], fallback : ['sdl2', 'sdl2_dep'])
author	Alexandre Bouvier	2024-04-12 02:52:15 +0200
committer	Alexandre Bouvier	2024-04-12 02:52:15 +0200
commit	2ea5f76c2991100e3c467cde234c5187d3994271 (patch)
tree	07d2fcee746b8e7d9486dee9ce6700e6e4bff033
parent	561c96fe94f9cd7bf896542cac77b058394d61f1 (diff)
download	aur-2ea5f76c2991100e3c467cde234c5187d3994271.tar.gz