gzdoom-4.11.0-1

3 files changed, 9 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 933a91493efd..cfcd049e228a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gzdoom
 	pkgdesc = Feature centric port for all Doom engine games
-	pkgver = 4.10.0
-	pkgrel = 3
+	pkgver = 4.11.0
+	pkgrel = 1
 	url = http://www.zdoom.org/
 	arch = i686
 	arch = x86_64
@@ -15,8 +15,8 @@ pkgbase = gzdoom
 	depends = gtk3
 	depends = hicolor-icon-theme
 	depends = libgl
-	depends = libjpeg
 	depends = libvpx>=1.13
+	depends = libwebp
 	depends = openal
 	depends = sdl2
 	depends = zmusic>=1.1.8
@@ -38,14 +38,12 @@ pkgbase = gzdoom
 	replaces = gzdoom1
 	replaces = gzdoom-legacy
 	options = !lto
-	source = gzdoom::git+https://github.com/coelckers/gzdoom.git#tag=g4.10.0
+	source = gzdoom::git+https://github.com/coelckers/gzdoom.git#tag=g4.11.0
 	source = gzdoom.desktop
 	source = 0001-Fix-file-paths.patch
-	source = 0002-build-resolve-missing-includes-under-gcc-13.patch
 	sha256sums = SKIP
 	sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
 	sha256sums = a37dde8274e1a9fd511af951da2e362d503ab4be72e79d4843e1ca3a0129549f
-	sha256sums = a5b1db9ddef99234db138bca534c13a769e25f5dd85e37b3604108a62a35c46e
 	optdepends_x86_64 = vulkan-driver: Vulkan renderer
 	optdepends_x86_64 = vulkan-icd-loader: Vulkan renderer
 
diff --git a/0002-build-resolve-missing-includes-under-gcc-13.patch b/0002-build-resolve-missing-includes-under-gcc-13.patch
deleted file mode 100644
index 4083e06f801a..000000000000
--- a/0002-build-resolve-missing-includes-under-gcc-13.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From ee8c12eac62349f4524229370da20915624485ef Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Thu, 30 Mar 2023 23:41:22 +0200
-Subject: [PATCH] build: resolve missing includes under gcc-13
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-$ make
-...
-~/gzdoom/libraries/ZVulkan/src/vulkanbuilders.cpp: In member function ‘std::unique_ptr<VulkanShader> ShaderBuilder::Create(const char*, VulkanDevice*)’:
-~/gzdoom/libraries/ZVulkan/src/vulkanbuilders.cpp:168:28: error: ‘runtime_error’ is not a member of ‘std’
-~/gzdoom/libraries/ZVulkan/include/zvulkan/vk_mem_alloc/vk_mem_alloc.h: In function ‘void VmaUint32ToStr(char*, size_t, uint32_t)’:
-~/gzdoom/libraries/ZVulkan/include/zvulkan/vk_mem_alloc/vk_mem_alloc.h:2410:9: error: ‘snprint ’ was not declared in this scope
----
- src/common/rendering/vulkan/system/vk_builders.cpp              | 1 +
- src/common/rendering/vulkan/system/vk_swapchain.cpp             | 1 +
- .../rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h     | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/src/common/rendering/vulkan/system/vk_builders.cpp b/src/common/rendering/vulkan/system/vk_builders.cpp
-index aff0de50a9..b8d4a13de9 100644
---- a/src/common/rendering/vulkan/system/vk_builders.cpp
-+++ b/src/common/rendering/vulkan/system/vk_builders.cpp
-@@ -20,6 +20,7 @@
- **
- */
- 
-+#include <stdexcept>
- #include "vk_builders.h"
- #include "engineerrors.h"
- #include "renderstyle.h"
-diff --git a/src/common/rendering/vulkan/system/vk_swapchain.cpp b/src/common/rendering/vulkan/system/vk_swapchain.cpp
-index f44139b1f5..e89a6bd823 100644
---- a/src/common/rendering/vulkan/system/vk_swapchain.cpp
-+++ b/src/common/rendering/vulkan/system/vk_swapchain.cpp
-@@ -20,6 +20,7 @@
- **
- */
- 
-+#include <stdexcept>
- #include "vk_swapchain.h"
- #include "vk_objects.h"
- #include "c_cvars.h"
-diff --git a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
-index fd4472286b..db0b94f4e8 100644
---- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
-+++ b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
-@@ -104,6 +104,8 @@ Documentation of all members: vk_mem_alloc.h
- - [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator)
- */
- 
-+#include <stdio.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
--- 
-2.40.1
-
diff --git a/PKGBUILD b/PKGBUILD
index d7fdf22aefca..124b32a1546a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Christoph Zeiler <rabyte*gmail>
 
 pkgname=gzdoom
-pkgver=4.10.0
-pkgrel=3
+pkgver=4.11.0
+pkgrel=1
 pkgdesc='Feature centric port for all Doom engine games'
 arch=('i686' 'x86_64' 'aarch64')
 url='http://www.zdoom.org/'
@@ -11,8 +11,8 @@ license=('BSD' 'GPL3' 'LGPL3')
 depends=('gtk3'
          'hicolor-icon-theme'
          'libgl'
-         'libjpeg'
          'libvpx>=1.13'
+         'libwebp'
          'openal'
          'sdl2'
          'zmusic>=1.1.8')
@@ -38,17 +38,14 @@ replaces=('gzdoom1' 'gzdoom-legacy')
 options=(!lto)
 source=("gzdoom::git+https://github.com/coelckers/gzdoom.git#tag=g${pkgver}"
         'gzdoom.desktop'
-        '0001-Fix-file-paths.patch'
-        '0002-build-resolve-missing-includes-under-gcc-13.patch')
+        '0001-Fix-file-paths.patch')
 sha256sums=('SKIP'
             '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d'
-            'a37dde8274e1a9fd511af951da2e362d503ab4be72e79d4843e1ca3a0129549f'
-            'a5b1db9ddef99234db138bca534c13a769e25f5dd85e37b3604108a62a35c46e')
+            'a37dde8274e1a9fd511af951da2e362d503ab4be72e79d4843e1ca3a0129549f')
 
 prepare() {
     cd gzdoom
     patch -i "$srcdir"/0001-Fix-file-paths.patch -p 1
-    patch -i "$srcdir"/0002-build-resolve-missing-includes-under-gcc-13.patch -p 1
 }
 
 build() {