diff --git a/vkquake/.signature b/vkquake/.signature index 219345c17..a966021ce 100644 --- a/vkquake/.signature +++ b/vkquake/.signature @@ -1,8 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+n2OICzAeA6GCjhwehEo7p6mjkUKqG4ftFbEGBd/JntiPDeK2lEYkwktdXtzJQaUokMfNleJm2W6r4mWoc+cgk= -SHA256 (Pkgfile) = 17c5f1f6783849d4362081a3e58bec3e3abb8a53ccf852af95a1252f24c292df +RWSagIOpLGJF31X6J350G7m8vWZAYALs9iI364NDUOgVlYo7RxwB+X0dAoBZIR2cnqbfd6JnBNjG+W5Yv1tTYdkPyh5PCfT+fw0= +SHA256 (Pkgfile) = 6de7fd98b602e2b7f9d554917df59857cad8ed354298d743e658f9b16949aa53 SHA256 (.footprint) = 38a54d0f4abc11161a94ffb0126523c3b4b816c2ca42d87f5c46b1889dd6e181 -SHA256 (vkquake-1.31.0.tar.gz) = 25b821e1644145026f3e2a43d04647ca88d954e027813bd9a809442f429e15a9 -SHA256 (f1a54fbdf403f0b2f54dd89879b82e68d5f08fcf.patch) = 3fd11c6f0dcde9b44e58a69a66d3936dc2d236626047cb5eb16f7446bd085118 +SHA256 (vkquake-1.31.1.tar.gz) = 369efae374ebb0f1c8677bb32ee65efa3d27db61c4300dca3d97ab1c42e154cd SHA256 (vkquake.desktop) = 022f8eac6de5dd75dc8c6be403fdfda3eaca44e13941c49cd48eeacb1be57385 SHA256 (vkquake.png) = 571ab4f163b31f1f56de2b5b9103cf1b48a4baf4f0ef9514bb4b2da6ba899755 diff --git a/vkquake/Pkgfile b/vkquake/Pkgfile index 036e77081..28b80dbc4 100644 --- a/vkquake/Pkgfile +++ b/vkquake/Pkgfile @@ -4,17 +4,15 @@ # Depends on: glslang libmad libsdl2 libvorbis vulkan-loader zopfli name=vkquake -version=1.31.0 +version=1.31.1 release=1 source=(https://github.com/Novum/vkQuake/archive/$version/$name-$version.tar.gz - f1a54fbdf403f0b2f54dd89879b82e68d5f08fcf.patch vkquake.desktop vkquake.png) build() { rm -rf vkQuake-$version/Windows sed -i 's#vulkan_core.h#vulkan.h#' vkQuake-$version/Quake/quakedef.h - patch -Np1 -d vkQuake-$version -i $SRC/f1a54fbdf403f0b2f54dd89879b82e68d5f08fcf.patch #meson setup vkQuake-$version build \ # --prefix=/usr \ # --buildtype=plain \ diff --git a/vkquake/f1a54fbdf403f0b2f54dd89879b82e68d5f08fcf.patch b/vkquake/f1a54fbdf403f0b2f54dd89879b82e68d5f08fcf.patch deleted file mode 100644 index 76fc4eb97..000000000 --- a/vkquake/f1a54fbdf403f0b2f54dd89879b82e68d5f08fcf.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f1a54fbdf403f0b2f54dd89879b82e68d5f08fcf Mon Sep 17 00:00:00 2001 -From: vsonnier -Date: Sat, 22 Jun 2024 17:10:36 +0200 -Subject: [PATCH] Fix compilation missing mimalloc using Make - ---- - Quake/Makefile.w32 | 2 +- - Quake/Makefile.w64 | 2 +- - Quake/common.make | 1 + - 3 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32 -index 38516637..1a3f8ef1 100644 ---- a/Quake/Makefile.w32 -+++ b/Quake/Makefile.w32 -@@ -63,7 +63,7 @@ endif - - NET_LIBS := -lws2_32 - --CFLAGS += -I../Windows/codecs/include -Imimalloc -+CFLAGS += -I../Windows/codecs/include - CODEC_LINK = -L../Windows/codecs/x86 - - VK_SDK_PATH ?= ../Windows/misc -diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64 -index f8d22eac..8abf4117 100644 ---- a/Quake/Makefile.w64 -+++ b/Quake/Makefile.w64 -@@ -57,7 +57,7 @@ endif - - NET_LIBS := -lws2_32 - --CFLAGS += -I../Windows/codecs/include -Imimalloc -+CFLAGS += -I../Windows/codecs/include - CODEC_LINK = -L../Windows/codecs/x64 - - VK_SDK_PATH ?= ../Windows/misc -diff --git a/Quake/common.make b/Quake/common.make -index c1d7b61c..f6f970af 100644 ---- a/Quake/common.make -+++ b/Quake/common.make -@@ -101,6 +101,7 @@ endif - ifeq ($(USE_CODEC_UMX),1) - CFLAGS += -DUSE_CODEC_UMX - endif -+CFLAGS += -Imimalloc - - # --------------------------- - # objects