Update opengothic 0.63

4 files changed, 92 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 335642f96d61..5821e687192e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opengothic
 	pkgdesc = Open source remake of Gothic 2: Night of the raven
-	pkgver = 0.59
+	pkgver = 0.63
 	pkgrel = 1
 	url = https://github.com/Try/OpenGothic
 	arch = x86_64
@@ -14,17 +14,20 @@ pkgbase = opengothic
 	depends = gcc-libs
 	depends = libx11
 	depends = vulkan-icd-loader
-	conflicts = bullet
+	depends = bullet
+	depends = physfs
 	options = !emptydirs
-	source = git+https://github.com/Try/OpenGothic#commit=2de4fd8cf49f4f4626ae715d257be7594b0b79b5
-	source = git+https://github.com/Try/Tempest.git#commit=09b49484861b63f2e7676fc2eb3413b7bf12a3b8
+	source = git+https://github.com/Try/OpenGothic#commit=15d89bca24c04bfdf287d9b5ec12a65c9cb69a49
+	source = git+https://github.com/Try/Tempest.git#commit=827449a81776ecfc8e6b34314abf5d5eb9b5134b
 	source = git+https://github.com/schellingb/TinySoundFont.git#commit=d4ffcdc8a34d3f61f22e4b283b4c100f5adf4b82
-	source = git+https://github.com/Try/ZenLib.git#commit=0867083b2f882373f81805ba096bcf07c63e42af
-	source = git+https://github.com/bulletphysics/bullet3.git#commit=ebe1916b90acae8b13cd8c6b637d8327cdc64e94
-	sha512sums = SKIP
+	source = git+https://github.com/Try/ZenLib.git#commit=65b2c1f34e3d3dcd4dd6e6e1c9526996f76e0fe3
+	source = bullet_dynamic.diff
+	source = zenlib_dynamic_physfs.diff
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
+	sha512sums = 5aa822c283aefa0da9c75ae87e37ec66d50e71f65191187bb15e48a43fb6ea713278dd4a056e9ad04a25a622cdd85834ba5e2c4bf60bd178a46ce4eaba082981
+	sha512sums = 331db32a87762503d4b6abda25369497e8e8660ea381b4363a7a6fccda65d4b1595f83fb27e05f368a943b2b00968ecb5ae8f2323a40ac85f37d68ed4bb172d0
 
 pkgname = opengothic
diff --git a/PKGBUILD b/PKGBUILD
index 971a7d1713f8..f60b5352e1ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,56 @@
 # Maintainer:  Christopher Reimer <mail at c-reimer dot de>
 
 pkgname=opengothic
-pkgver=0.59
+pkgver=0.63
 pkgrel=1
 pkgdesc="Open source remake of Gothic 2: Night of the raven"
 arch=('x86_64')
 url='https://github.com/Try/OpenGothic'
 license=('MIT')
-depends=('alsa-lib' 'gcc-libs' 'libx11' 'vulkan-icd-loader')
+depends=('alsa-lib' 'gcc-libs' 'libx11' 'vulkan-icd-loader' 'bullet' 'physfs')
 makedepends=('cmake' 'git' 'glslang' 'libglvnd' 'vulkan-headers')
-conflicts=('bullet')
-source=("git+https://github.com/Try/OpenGothic#commit=2de4fd8cf49f4f4626ae715d257be7594b0b79b5" #tag=v0.59
-        "git+https://github.com/Try/Tempest.git#commit=09b49484861b63f2e7676fc2eb3413b7bf12a3b8"
+source=("git+https://github.com/Try/OpenGothic#commit=15d89bca24c04bfdf287d9b5ec12a65c9cb69a49" #tag=v0.63
+        "git+https://github.com/Try/Tempest.git#commit=827449a81776ecfc8e6b34314abf5d5eb9b5134b"
         "git+https://github.com/schellingb/TinySoundFont.git#commit=d4ffcdc8a34d3f61f22e4b283b4c100f5adf4b82"
-        "git+https://github.com/Try/ZenLib.git#commit=0867083b2f882373f81805ba096bcf07c63e42af"
-        "git+https://github.com/bulletphysics/bullet3.git#commit=ebe1916b90acae8b13cd8c6b637d8327cdc64e94"
+        "git+https://github.com/Try/ZenLib.git#commit=65b2c1f34e3d3dcd4dd6e6e1c9526996f76e0fe3"
+        "bullet_dynamic.diff"
+        "zenlib_dynamic_physfs.diff"
 )
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP')
+            '5aa822c283aefa0da9c75ae87e37ec66d50e71f65191187bb15e48a43fb6ea713278dd4a056e9ad04a25a622cdd85834ba5e2c4bf60bd178a46ce4eaba082981'
+            '331db32a87762503d4b6abda25369497e8e8660ea381b4363a7a6fccda65d4b1595f83fb27e05f368a943b2b00968ecb5ae8f2323a40ac85f37d68ed4bb172d0')
 options=('!emptydirs')
 
 prepare() {
+  cd "${srcdir}/ZenLib"
+  patch -p1 -i "$srcdir/zenlib_dynamic_physfs.diff"
+
   cd "${srcdir}/OpenGothic"
-  git submodule init
-  git config submodule.lib/Tempest.url "${srcdir}/Tempest"
-  git config submodule.lib/TinySoundFont.url "${srcdir}/TinySoundFont"
-  git config submodule.lib/ZenLib.url "${srcdir}/ZenLib"
-  git config submodule.lib/bullet3.url "${srcdir}/bullet3"
-  git submodule update
+  patch -p1 -i "$srcdir/bullet_dynamic.diff"
+  rmdir lib/ZenLib
+  ln -sf "$srcdir"/ZenLib/ lib/ZenLib
+  
+  rmdir lib/Tempest
+  ln -sf "$srcdir"/Tempest lib/Tempest
+  
+  rmdir lib/TinySoundFont
+  ln -sf "$srcdir"/TinySoundFont lib/TinySoundFont
 }
 
 build() {
   cd "OpenGothic"
-  cmake -B build -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
+  cmake -B build \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_BUILD_TYPE=None \
+    -DOpenGL_GL_PREFERENCE='GLVND' \
+    -DPHYSFS_BUILD_SHARED='OFF' \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSPIRV_CROSS_STATIC=OFF \
+    -DSPIRV_CROSS_SHARED=OFF \
+    -DSPIRV_CROSS_CLI=OFF
   make -C build
 }
 
diff --git a/bullet_dynamic.diff b/bullet_dynamic.diff
new file mode 100644
index 000000000000..b2c7fa4e949f
--- /dev/null
+++ b/bullet_dynamic.diff
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e0c193f9..aa927c8d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -111,16 +111,10 @@ set(GLFW_BUILD_EXAMPLES          OFF CACHE INTERNAL "")
+ set(GLFW_BUILD_TESTS             OFF CACHE INTERNAL "")
+ set(GLFW_BUILD_DOCS              OFF CACHE INTERNAL "")
+ set(BUILD_BULLET3                OFF CACHE INTERNAL "") # Can use bullet2, bullet3 wants to build examples...
+-add_subdirectory(lib/bullet3)
+ if(NOT MSVC)
+-  target_compile_options(BulletDynamics         PRIVATE -Wno-argument-outside-range)
+-  target_compile_options(BulletInverseDynamics  PRIVATE -Wno-argument-outside-range)
+-  target_compile_options(BulletSoftBody         PRIVATE -Wno-argument-outside-range)
+-  target_compile_options(Bullet3Common          PRIVATE -Wno-argument-outside-range)
+-  target_compile_options(BulletCollision        PRIVATE -Wno-argument-outside-range)
+-  target_compile_options(LinearMath             PRIVATE -Wno-argument-outside-range)
++  find_package( Bullet REQUIRED )
+ endif()
+-include_directories(lib/bullet3/src)
++include_directories(${BULLET_INCLUDE_DIR})
+ target_link_libraries(${PROJECT_NAME} BulletDynamics BulletCollision LinearMath)
+ 
+ # script for launching in binary directory
diff --git a/zenlib_dynamic_physfs.diff b/zenlib_dynamic_physfs.diff
new file mode 100644
index 000000000000..94a74dc3299e
--- /dev/null
+++ b/zenlib_dynamic_physfs.diff
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6c350f4..abb5f63 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,10 +11,8 @@ set(PHYSFS_BUILD_SHARED OFF)
+ set(CMAKE_CXX_STANDARD 14)
+ 
+ # 3rd-party dependencies
+-set(PHYSFS_BUILD_TEST OFF CACHE STRING "" FORCE)
+-add_subdirectory(lib/physfs)
+-
+-include_directories(lib/physfs/src)
++find_package( PhysFS REQUIRED )
++include_directories(${PHYSFS_INCLUDE_DIR})
+ include_directories(.)
+ 
+ # Internal libraries
+diff --git a/vdfs/CMakeLists.txt b/vdfs/CMakeLists.txt
+index 505ec46..e09006e 100644
+--- a/vdfs/CMakeLists.txt
++++ b/vdfs/CMakeLists.txt
+@@ -13,6 +13,6 @@ if(MSVC)
+ 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DNOMINMAX")
+ endif()
+ 
+-target_link_libraries(vdfs physfs-static)
++target_link_libraries(vdfs physfs)
+ set_target_properties(vdfs PROPERTIES LINKER_LANGUAGE C)
+ target_include_directories(vdfs PUBLIC ..)