From ac86f5733e6733af945704fa546e49dbac346bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 23 Nov 2022 17:58:12 +0100 Subject: [PATCH 1/4] Use unique file names for sources --- .SRCINFO | 4 ++-- PKGBUILD | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 502e059..90e241f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -16,8 +16,8 @@ pkgbase = plasma5-wallpapers-wallpaper-engine depends = qt5-websockets optdepends = qt5-webchannel: for web support optdepends = mpv: alternative video backend - source = https://github.com/catsout/wallpaper-engine-kde-plugin/archive/v0.5.4.tar.gz - source = https://github.com/KhronosGroup/glslang/archive/11.10.0.tar.gz + source = https://github.com/catsout/wallpaper-engine-kde-plugin/archive/v0.5.4/wallpaper-engine-kde-plugin-0.5.4.tar.gz + source = https://github.com/KhronosGroup/glslang/archive/11.10.0/glslang-11.10.0.tar.gz sha256sums = 83354734f7ea36e7077206506dd05f0e6877eb51294b820fdbdc398255c6f803 sha256sums = 8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602 diff --git a/PKGBUILD b/PKGBUILD index beb660a..940d069 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,10 +13,10 @@ depends=('gst-libav' 'python-websockets' 'plasma-framework' 'qt5-declarative' 'q makedepends=('extra-cmake-modules' 'qt5-webchannel' 'mpv' 'vulkan-headers') optdepends=('qt5-webchannel: for web support' 'mpv: alternative video backend') -source=("https://github.com/catsout/${_pkgname}/archive/v${pkgver}.tar.gz" - "https://github.com/KhronosGroup/glslang/archive/${_pkgver_glslang}.tar.gz") +source=("https://github.com/catsout/${_pkgname}/archive/v${pkgver}/${_pkgname}-${pkgver}.tar.gz" + "https://github.com/KhronosGroup/glslang/archive/${_pkgver_glslang}/glslang-${_pkgver_glslang}.tar.gz") sha256sums=('83354734f7ea36e7077206506dd05f0e6877eb51294b820fdbdc398255c6f803' - '8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602') + '8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602') prepare() { mv -T "glslang-${_pkgver_glslang}" "${_pkgname}-${pkgver}/src/backend_scene/third_party/glslang" From 1989ad410380027a67465193f9f68da5085f509d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 23 Nov 2022 18:02:43 +0100 Subject: [PATCH 2/4] upgpkg: plasma5-wallpapers-wallpaper-engine 0.5.4-3 Bump glslang version --- .SRCINFO | 6 +++--- PKGBUILD | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 90e241f..e5871c2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = plasma5-wallpapers-wallpaper-engine pkgdesc = A KDE wallpaper plugin integrating wallpaper engine pkgver = 0.5.4 - pkgrel = 2 + pkgrel = 3 url = https://github.com/catsout/wallpaper-engine-kde-plugin arch = x86_64 license = GPL2 @@ -17,8 +17,8 @@ pkgbase = plasma5-wallpapers-wallpaper-engine optdepends = qt5-webchannel: for web support optdepends = mpv: alternative video backend source = https://github.com/catsout/wallpaper-engine-kde-plugin/archive/v0.5.4/wallpaper-engine-kde-plugin-0.5.4.tar.gz - source = https://github.com/KhronosGroup/glslang/archive/11.10.0/glslang-11.10.0.tar.gz + source = https://github.com/KhronosGroup/glslang/archive/11.11.0/glslang-11.11.0.tar.gz sha256sums = 83354734f7ea36e7077206506dd05f0e6877eb51294b820fdbdc398255c6f803 - sha256sums = 8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602 + sha256sums = 26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438 pkgname = plasma5-wallpapers-wallpaper-engine diff --git a/PKGBUILD b/PKGBUILD index 940d069..cd4053e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,11 +3,11 @@ pkgname=plasma5-wallpapers-wallpaper-engine _pkgname=wallpaper-engine-kde-plugin pkgver=0.5.4 -_pkgver_glslang=11.10.0 -pkgrel=2 +_pkgver_glslang=11.11.0 +pkgrel=3 pkgdesc='A KDE wallpaper plugin integrating wallpaper engine' arch=('x86_64') -url='https://github.com/catsout/wallpaper-engine-kde-plugin' +url="https://github.com/catsout/${_pkgname}" license=('GPL2') depends=('gst-libav' 'python-websockets' 'plasma-framework' 'qt5-declarative' 'qt5-websockets') makedepends=('extra-cmake-modules' 'qt5-webchannel' 'mpv' 'vulkan-headers') @@ -16,7 +16,7 @@ optdepends=('qt5-webchannel: for web support' source=("https://github.com/catsout/${_pkgname}/archive/v${pkgver}/${_pkgname}-${pkgver}.tar.gz" "https://github.com/KhronosGroup/glslang/archive/${_pkgver_glslang}/glslang-${_pkgver_glslang}.tar.gz") sha256sums=('83354734f7ea36e7077206506dd05f0e6877eb51294b820fdbdc398255c6f803' - '8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602') + '26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438') prepare() { mv -T "glslang-${_pkgver_glslang}" "${_pkgname}-${pkgver}/src/backend_scene/third_party/glslang" From 78b14ea445943136979755966569812b65e2327f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 28 May 2023 23:58:32 +0200 Subject: [PATCH 3/4] upgpkg: plasma5-wallpapers-wallpaper-engine 0.5.4-4 Include patch to fix build process --- .SRCINFO | 4 +++- PKGBUILD | 9 ++++++--- fbda175.patch | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 fbda175.patch diff --git a/.SRCINFO b/.SRCINFO index e5871c2..1bd0f29 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = plasma5-wallpapers-wallpaper-engine pkgdesc = A KDE wallpaper plugin integrating wallpaper engine pkgver = 0.5.4 - pkgrel = 3 + pkgrel = 4 url = https://github.com/catsout/wallpaper-engine-kde-plugin arch = x86_64 license = GPL2 @@ -18,7 +18,9 @@ pkgbase = plasma5-wallpapers-wallpaper-engine optdepends = mpv: alternative video backend source = https://github.com/catsout/wallpaper-engine-kde-plugin/archive/v0.5.4/wallpaper-engine-kde-plugin-0.5.4.tar.gz source = https://github.com/KhronosGroup/glslang/archive/11.11.0/glslang-11.11.0.tar.gz + source = fbda175.patch sha256sums = 83354734f7ea36e7077206506dd05f0e6877eb51294b820fdbdc398255c6f803 sha256sums = 26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438 + sha256sums = 1a7e937ab126b4d42ac750b6ab997e604963aeed7c8177888cc37a71fafda07e pkgname = plasma5-wallpapers-wallpaper-engine diff --git a/PKGBUILD b/PKGBUILD index cd4053e..af16066 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname=plasma5-wallpapers-wallpaper-engine _pkgname=wallpaper-engine-kde-plugin pkgver=0.5.4 _pkgver_glslang=11.11.0 -pkgrel=3 +pkgrel=4 pkgdesc='A KDE wallpaper plugin integrating wallpaper engine' arch=('x86_64') url="https://github.com/catsout/${_pkgname}" @@ -14,12 +14,15 @@ makedepends=('extra-cmake-modules' 'qt5-webchannel' 'mpv' 'vulkan-headers') optdepends=('qt5-webchannel: for web support' 'mpv: alternative video backend') source=("https://github.com/catsout/${_pkgname}/archive/v${pkgver}/${_pkgname}-${pkgver}.tar.gz" - "https://github.com/KhronosGroup/glslang/archive/${_pkgver_glslang}/glslang-${_pkgver_glslang}.tar.gz") + "https://github.com/KhronosGroup/glslang/archive/${_pkgver_glslang}/glslang-${_pkgver_glslang}.tar.gz" + 'fbda175.patch') sha256sums=('83354734f7ea36e7077206506dd05f0e6877eb51294b820fdbdc398255c6f803' - '26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438') + '26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438' + '1a7e937ab126b4d42ac750b6ab997e604963aeed7c8177888cc37a71fafda07e') prepare() { mv -T "glslang-${_pkgver_glslang}" "${_pkgname}-${pkgver}/src/backend_scene/third_party/glslang" + patch -Np1 -d "${_pkgname}-${pkgver}" < 'fbda175.patch' } build() { diff --git a/fbda175.patch b/fbda175.patch new file mode 100644 index 0000000..5591a38 --- /dev/null +++ b/fbda175.patch @@ -0,0 +1,21 @@ +From fbda175be3b93458ec06c9a1db507b2855e4caa1 Mon Sep 17 00:00:00 2001 +From: Seymur Bagirov +Date: Sat, 8 Apr 2023 13:24:52 +0400 +Subject: [PATCH] add cstdio to fix build on openSUSE TW + +--- + src/backend_scene/third_party/vk_mem_alloc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/backend_scene/third_party/vk_mem_alloc.h b/src/backend_scene/third_party/vk_mem_alloc.h +index 0d01d517..6a8f3e31 100644 +--- a/src/backend_scene/third_party/vk_mem_alloc.h ++++ b/src/backend_scene/third_party/vk_mem_alloc.h +@@ -2559,6 +2559,7 @@ remove them if not needed. + #include // for assert + #include // for min, max + #include ++ #include + #else + #include VMA_CONFIGURATION_USER_INCLUDES_H + #endif From 80f12fcd584e0d5f0955ad4f7f7effb275de415b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Fri, 20 Oct 2023 10:22:36 +0200 Subject: [PATCH 4/4] upgpkg: plasma5-wallpapers-wallpaper-engine 0.5.4-5 Update dependencies and use sha512 checksums --- .SRCINFO | 10 +++++----- PKGBUILD | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1bd0f29..71ced00 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = plasma5-wallpapers-wallpaper-engine pkgdesc = A KDE wallpaper plugin integrating wallpaper engine pkgver = 0.5.4 - pkgrel = 4 + pkgrel = 5 url = https://github.com/catsout/wallpaper-engine-kde-plugin arch = x86_64 license = GPL2 @@ -11,7 +11,7 @@ pkgbase = plasma5-wallpapers-wallpaper-engine makedepends = vulkan-headers depends = gst-libav depends = python-websockets - depends = plasma-framework + depends = plasma-framework5 depends = qt5-declarative depends = qt5-websockets optdepends = qt5-webchannel: for web support @@ -19,8 +19,8 @@ pkgbase = plasma5-wallpapers-wallpaper-engine source = https://github.com/catsout/wallpaper-engine-kde-plugin/archive/v0.5.4/wallpaper-engine-kde-plugin-0.5.4.tar.gz source = https://github.com/KhronosGroup/glslang/archive/11.11.0/glslang-11.11.0.tar.gz source = fbda175.patch - sha256sums = 83354734f7ea36e7077206506dd05f0e6877eb51294b820fdbdc398255c6f803 - sha256sums = 26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438 - sha256sums = 1a7e937ab126b4d42ac750b6ab997e604963aeed7c8177888cc37a71fafda07e + sha512sums = 73a0e134430659b457a73e95d8b96b3fd875e44146ec02f5e5662785ecbe8f73a74b642b69a293297e829d6332d7bfba75acaef2c7f6508141d5b60ceadb8e13 + sha512sums = c018271d499efff03540e4572a9c2f1f752c81c87efe7f2e63c2631ac47cecfedffdcfee68eddaf9187603eaae8ccd9a3e5640a022ba9fd7d05950f7827bf8cd + sha512sums = c386bde62b16a179f37d82cc2bfc86ee4bcd1f410130ad77aaa207a4a65c2d509b663da34feaf826edebd656d73bde36315f1d89df49cf1a22c016f450655aab pkgname = plasma5-wallpapers-wallpaper-engine diff --git a/PKGBUILD b/PKGBUILD index af16066..c056c0d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,21 +4,21 @@ pkgname=plasma5-wallpapers-wallpaper-engine _pkgname=wallpaper-engine-kde-plugin pkgver=0.5.4 _pkgver_glslang=11.11.0 -pkgrel=4 +pkgrel=5 pkgdesc='A KDE wallpaper plugin integrating wallpaper engine' arch=('x86_64') url="https://github.com/catsout/${_pkgname}" license=('GPL2') -depends=('gst-libav' 'python-websockets' 'plasma-framework' 'qt5-declarative' 'qt5-websockets') +depends=('gst-libav' 'python-websockets' 'plasma-framework5' 'qt5-declarative' 'qt5-websockets') makedepends=('extra-cmake-modules' 'qt5-webchannel' 'mpv' 'vulkan-headers') optdepends=('qt5-webchannel: for web support' 'mpv: alternative video backend') source=("https://github.com/catsout/${_pkgname}/archive/v${pkgver}/${_pkgname}-${pkgver}.tar.gz" "https://github.com/KhronosGroup/glslang/archive/${_pkgver_glslang}/glslang-${_pkgver_glslang}.tar.gz" 'fbda175.patch') -sha256sums=('83354734f7ea36e7077206506dd05f0e6877eb51294b820fdbdc398255c6f803' - '26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438' - '1a7e937ab126b4d42ac750b6ab997e604963aeed7c8177888cc37a71fafda07e') +sha512sums=('73a0e134430659b457a73e95d8b96b3fd875e44146ec02f5e5662785ecbe8f73a74b642b69a293297e829d6332d7bfba75acaef2c7f6508141d5b60ceadb8e13' + 'c018271d499efff03540e4572a9c2f1f752c81c87efe7f2e63c2631ac47cecfedffdcfee68eddaf9187603eaae8ccd9a3e5640a022ba9fd7d05950f7827bf8cd' + 'c386bde62b16a179f37d82cc2bfc86ee4bcd1f410130ad77aaa207a4a65c2d509b663da34feaf826edebd656d73bde36315f1d89df49cf1a22c016f450655aab') prepare() { mv -T "glslang-${_pkgver_glslang}" "${_pkgname}-${pkgver}/src/backend_scene/third_party/glslang"