diff --git a/glib-networking/PKGBUILD b/glib-networking/PKGBUILD index a49db54..7fdf86f 100644 --- a/glib-networking/PKGBUILD +++ b/glib-networking/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=glib-networking -pkgver=2.78.0 +pkgver=2.78.1 pkgrel=01 epoch=1 pkgdesc="Network extensions for GLib w/o systemd" @@ -15,12 +15,12 @@ depends=(glib2 libproxy gnutls gsettings-desktop-schemas) makedepends=(meson git libxml2) checkdepends=(ca-certificates) # options=(debug) ## uncomment this line to have the debug pkg produced -_commit=40c448faf7cf32647d457a8bcda171c3d21bef22 # tags/2.78.0^0 +_commit=ff3ed94057edfd2e4d4c45c5e53e5b41d19fad6a # tags/2.78.1^0 source=("git+https://gitlab.gnome.org/GNOME/glib-networking.git#commit=$_commit") pkgver() { cd $pkgname - git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' + git describe --tags | sed -r 's/\.([a-z])/\1/;s/([a-z])\./\1/;s/[^-]*-g/r&/;s/-/+/g' } prepare() { @@ -50,8 +50,9 @@ package() { arch=(x86_64) -license=(GPL2) +license=(LGPL-2.1-or-later) sha256sums=(SKIP) -## ea3821cd7b2ce962b383f167dfa2b4d6ab6d7c099d8cf1db6b50f7b238cafed1 glib-networking-1_2.78.0-01-x86_64.pkg.tar.lz +## bf157373bb2b46b99052ee07395f07f63dfc2e18cf7b7f40cb385d4a3da9b8d0 glib-networking-1_2.78.1-01-x86_64.pkg.tar.lz + diff --git a/glib-networking/PKGBUILD-arch b/glib-networking/PKGBUILD-arch index 4602681..1143380 100644 --- a/glib-networking/PKGBUILD-arch +++ b/glib-networking/PKGBUILD-arch @@ -1,13 +1,14 @@ # Maintainer: Jan Alexander Steffens (heftig) +# Maintainer: Fabian Bornschein pkgname=glib-networking -pkgver=2.78.0 +pkgver=2.78.1 pkgrel=1 epoch=1 pkgdesc="Network extensions for GLib" url="https://gitlab.gnome.org/GNOME/glib-networking" arch=(x86_64) -license=(GPL2) +license=(LGPL-2.1-or-later) depends=( glib2 gnutls @@ -19,13 +20,13 @@ makedepends=( meson ) checkdepends=(ca-certificates) -_commit=40c448faf7cf32647d457a8bcda171c3d21bef22 # tags/2.78.0^0 +_commit=ff3ed94057edfd2e4d4c45c5e53e5b41d19fad6a # tags/2.78.1^0 source=("git+https://gitlab.gnome.org/GNOME/glib-networking.git#commit=$_commit") b2sums=('SKIP') pkgver() { cd glib-networking - git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' + git describe --tags | sed -r 's/\.([a-z])/\1/;s/([a-z])\./\1/;s/[^-]*-g/r&/;s/-/+/g' } prepare() { diff --git a/glib-networking/time b/glib-networking/time index 27bb370..39830eb 100644 --- a/glib-networking/time +++ b/glib-networking/time @@ -1,6 +1,6 @@ -real 0m23.164s -user 0m20.161s -sys 0m2.680s +real 0m13.024s +user 0m18.543s +sys 0m2.079s diff --git a/mesa/PKGBUILD b/mesa/PKGBUILD index 38e04bb..c277713 100644 --- a/mesa/PKGBUILD +++ b/mesa/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=mesa pkgname=('vulkan-mesa-layers' 'opencl-clover-mesa' 'opencl-rusticl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'vulkan-virtio' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') -pkgver=24.0.1 +pkgver=24.0.2 pkgrel=01 epoch=1 pkgdesc="An open-source implementation of the OpenGL specification w/o systemd or zstd" @@ -64,11 +64,19 @@ makedepends=( #source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} # alt site since above is not working source=(https://archive.mesa3d.org/mesa-${pkgver}.tar.xz{,.sig} + radeon_bo_can_reclaim_slab.diff + vulkan-dispatch-table-add-an-uncompacted-version.patch LICENSE) prepare() { cd mesa-$pkgver + # Proposed crash fix from https://gitlab.freedesktop.org/mesa/mesa/-/issues/10613#note_2290167 + patch -Np1 -i ../radeon_bo_can_reclaim_slab.diff + + # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27834 + patch -Np1 -i ../vulkan-dispatch-table-add-an-uncompacted-version.patch + # Include package release in version string so Chromium invalidates # its GPU cache; otherwise it can cause pages to render incorrectly. # https://bugs.launchpad.net/ubuntu/+source/chromium-browser/+bug/2020604 @@ -302,18 +310,21 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom -sha256sums=(f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613 # mesa-24.0.1.tar.xz - e2bfe7507058ab0737293a335d29f9e9478cc2b5715c741b2b6a57e511a6cf4f # mesa-24.0.1.tar.xz.sig +sha256sums=(94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8 # mesa-24.0.2.tar.xz + 5fa25f014d71637b567314aec4bd97d8df36c5272157936bee113e123267110b # mesa-24.0.2.tar.xz.sig + 3fd1ad8cd29319502a6f80ecb96bb9a059e5de83a8b6e39f23de8d93921fd922 # radeon_bo_can_reclaim_slab.diff + 1733ec76f735788837833e7571b641fc64b56ec3176b93e9234fc0b5428ee6d8 # vulkan-dispatch-table-add-an-uncompacted-version.patch 7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE -## e9b054fd447ee2ddc19eceeb61f840102de9dcc8a01a32eb65e372584ce6c054 libva-mesa-driver-1_24.0.1-01-x86_64.pkg.tar.lz -## 5a760d21e86e9a39640491cc5eeb8d4f9b53bd793254da63a29dca7b64704c6a mesa-1_24.0.1-01-x86_64.pkg.tar.lz -## 73e276eab503eb433b8377f5e2349810b5555502d6e325779d43da5f5b47ba37 mesa-vdpau-1_24.0.1-01-x86_64.pkg.tar.lz -## f36f5189391222ed67248ca8b64fccf1b86cf3c2c98d5331adeafeeaf0ca726e opencl-clover-mesa-1_24.0.1-01-x86_64.pkg.tar.lz -## 38b3a6fef4e8cefa26037acca24f981dfead23f1475278168286f5cfed8aeb87 opencl-rusticl-mesa-1_24.0.1-01-x86_64.pkg.tar.lz -## 29b5afe1025056ca2805fe5434209354223015d604e87fbf1c848c2b232008bc vulkan-intel-1_24.0.1-01-x86_64.pkg.tar.lz -## 6ac2fc78bef94b872df94df0de5135f8e02b200337050c014e9a76ab09d98777 vulkan-mesa-layers-1_24.0.1-01-x86_64.pkg.tar.lz -## 7d278be99786e5110ca8b2bf08086f2715d18e8d68c496551b56646e805e5b2b vulkan-radeon-1_24.0.1-01-x86_64.pkg.tar.lz -## 79f651b6c2d3593a6a2f55dbfaec308143b9e051eb99f2a4e9f70ff2348e1a91 vulkan-swrast-1_24.0.1-01-x86_64.pkg.tar.lz -## 79ad932d61ffdb3cefd9c1b2d528cab77d1e0424acacc9be0da5fc10231cffd8 vulkan-virtio-1_24.0.1-01-x86_64.pkg.tar.lz + +## 04540723c70f197f44b02d59779a7644185915463927a6dbb22a12bfde022b4a libva-mesa-driver-1_24.0.2-01-x86_64.pkg.tar.lz +## a8e720d7d8134860caa4ae211ab6f971d24319e823e3ca6e6f5120fa0acdfe82 mesa-1_24.0.2-01-x86_64.pkg.tar.lz +## 1c0fdb7fa72fff7d60ade56788f9586f4e59faa6ac024dd2254322baa2252b60 mesa-vdpau-1_24.0.2-01-x86_64.pkg.tar.lz +## bdb794b0b6d6e157ed1b716dc566e8334c6eb88fb530cc7ec84e21d5d41a37c1 opencl-clover-mesa-1_24.0.2-01-x86_64.pkg.tar.lz +## becfb9fc5f8a2b6a5a0fd13eb82d8c8cca2baf580835e34c54447d5d191db430 opencl-rusticl-mesa-1_24.0.2-01-x86_64.pkg.tar.lz +## 2b774902a5eecb04e1d8117845fdcc6a412b846e1d1a3037e69cceee47b72623 vulkan-intel-1_24.0.2-01-x86_64.pkg.tar.lz +## b6fb44f5cb6119ee9567464fc652cf0883dbadab30f369b04dad3fe459624708 vulkan-mesa-layers-1_24.0.2-01-x86_64.pkg.tar.lz +## 1604bc751946d0cd6221ce027363431ba2c27e615a48d72bb545cd484375fc06 vulkan-radeon-1_24.0.2-01-x86_64.pkg.tar.lz +## afbeacea99e6aecd00706a67998075514ef2807ac80538dc3af1dbc649b59f74 vulkan-swrast-1_24.0.2-01-x86_64.pkg.tar.lz +## 0cea25f0e67d4abec22225df5de564824b0d7972d9c67c090eb38e390c0dec56 vulkan-virtio-1_24.0.2-01-x86_64.pkg.tar.lz diff --git a/mesa/PKGBUILD-arch b/mesa/PKGBUILD-arch index 6bab1da..7f1f1f1 100644 --- a/mesa/PKGBUILD-arch +++ b/mesa/PKGBUILD-arch @@ -16,7 +16,7 @@ pkgname=( 'mesa-vdpau' 'mesa' ) -pkgver=24.0.1 +pkgver=24.0.2 pkgrel=1 epoch=1 pkgdesc="An open-source implementation of the OpenGL specification" @@ -73,13 +73,19 @@ makedepends=( ) source=( https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} + radeon_bo_can_reclaim_slab.diff + vulkan-dispatch-table-add-an-uncompacted-version.patch LICENSE ) -sha256sums=('f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613' +sha256sums=('94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8' 'SKIP' + '3fd1ad8cd29319502a6f80ecb96bb9a059e5de83a8b6e39f23de8d93921fd922' + '1733ec76f735788837833e7571b641fc64b56ec3176b93e9234fc0b5428ee6d8' '7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537') -b2sums=('05eb98f2fec0d15e63e8da2ca2e563d0b6fb7e29d639e66fc69074b7550939160e6f29121b80f2c64083625f2b13aa728221443b1f5adf2dd0fd92056ed9dc40' +b2sums=('f69e0b3edb7b8611f528a2e04104fe14b2fe8c799921be2d112dba744133813a19f90aa11d39f3f87a282e518003c7cc7966143d25e845f1f4489c461b22f661' 'SKIP' + 'e7c3451a342cc648149375ce58697ae24273d47060e74ca2948d45ea8fe29b104f1daae4c91968fb6f37d41963d176987abf9ee21acfba0172a9b5d30300a72e' + 'e057a085bf7a9faceaa90b29555626d79e8c818e84a9424ade53dd21c512b2ea37dabb1d8ecccdf0f8fa69a4c6e7b66a6fe970b65baf1d368d6b9cc94ba532c7' '1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez @@ -91,6 +97,12 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov base); ++ return radeon_bo_can_reclaim(priv, &bo->base); + } + + static void radeon_bo_slab_destroy(void *winsys, struct pb_buffer_lean *_buf) diff --git a/mesa/vulkan-dispatch-table-add-an-uncompacted-version.patch b/mesa/vulkan-dispatch-table-add-an-uncompacted-version.patch new file mode 100644 index 0000000..04f102b --- /dev/null +++ b/mesa/vulkan-dispatch-table-add-an-uncompacted-version.patch @@ -0,0 +1,230 @@ +From 5d91db9666ea61be549b2edc28d5ad4c34b34aab Mon Sep 17 00:00:00 2001 +From: Mike Blumenkrantz +Date: Tue, 27 Feb 2024 14:41:28 -0500 +Subject: [PATCH 1/2] vulkan/dispatch_table: add an uncompacted version of the + table + +this is a bandaid fix that allows users (zink) to actually call the +functions intended to be called. the real fix would be to figure out +which extensions are enabled on the device and then only GPA the +functions associated with those extensions + +that's too hard though so I'm slapping some flex tape on it + +cc: mesa-stable + +Acked-by: Dave Airlie +Part-of: +--- + src/vulkan/util/vk_dispatch_table_gen.py | 109 +++++++++++++++++++++++ + 1 file changed, 109 insertions(+) + +diff --git a/src/vulkan/util/vk_dispatch_table_gen.py b/src/vulkan/util/vk_dispatch_table_gen.py +index 2db977b25deff..7a3b459b37155 100644 +--- a/src/vulkan/util/vk_dispatch_table_gen.py ++++ b/src/vulkan/util/vk_dispatch_table_gen.py +@@ -152,6 +152,62 @@ ${entrypoint_table('instance', instance_entrypoints)} + ${entrypoint_table('physical_device', physical_device_entrypoints)} + ${entrypoint_table('device', device_entrypoints)} + ++<%def name="uncompacted_dispatch_table(entrypoints)"> ++% for e in entrypoints: ++ % if e.alias: ++ <% continue %> ++ % endif ++ % if e.guard is not None: ++#ifdef ${e.guard} ++ % endif ++ PFN_vk${e.name} ${e.name}; ++ % if e.aliases: ++ % for a in e.aliases: ++ PFN_vk${a.name} ${a.name}; ++ % endfor ++ % endif ++ % if e.guard is not None: ++#else ++ PFN_vkVoidFunction ${e.name}; ++ % if e.aliases: ++ % for a in e.aliases: ++ PFN_vkVoidFunction ${a.name}; ++ % endfor ++ % endif ++#endif ++ % endif ++% endfor ++ ++ ++ ++struct vk_instance_uncompacted_dispatch_table { ++ ${uncompacted_dispatch_table(instance_entrypoints)} ++}; ++ ++struct vk_physical_device_uncompacted_dispatch_table { ++ ${uncompacted_dispatch_table(physical_device_entrypoints)} ++}; ++ ++struct vk_device_uncompacted_dispatch_table { ++ ${uncompacted_dispatch_table(device_entrypoints)} ++}; ++ ++struct vk_uncompacted_dispatch_table { ++ union { ++ struct { ++ struct vk_instance_uncompacted_dispatch_table instance; ++ struct vk_physical_device_uncompacted_dispatch_table physical_device; ++ struct vk_device_uncompacted_dispatch_table device; ++ }; ++ ++ struct { ++ ${uncompacted_dispatch_table(instance_entrypoints)} ++ ${uncompacted_dispatch_table(physical_device_entrypoints)} ++ ${uncompacted_dispatch_table(device_entrypoints)} ++ }; ++ }; ++}; ++ + void + vk_instance_dispatch_table_load(struct vk_instance_dispatch_table *table, + PFN_vkGetInstanceProcAddr gpa, +@@ -165,6 +221,19 @@ vk_device_dispatch_table_load(struct vk_device_dispatch_table *table, + PFN_vkGetDeviceProcAddr gpa, + VkDevice device); + ++void ++vk_instance_uncompacted_dispatch_table_load(struct vk_instance_uncompacted_dispatch_table *table, ++ PFN_vkGetInstanceProcAddr gpa, ++ VkInstance instance); ++void ++vk_physical_device_uncompacted_dispatch_table_load(struct vk_physical_device_uncompacted_dispatch_table *table, ++ PFN_vkGetInstanceProcAddr gpa, ++ VkInstance instance); ++void ++vk_device_uncompacted_dispatch_table_load(struct vk_device_uncompacted_dispatch_table *table, ++ PFN_vkGetDeviceProcAddr gpa, ++ VkDevice device); ++ + void vk_instance_dispatch_table_from_entrypoints( + struct vk_instance_dispatch_table *dispatch_table, + const struct vk_instance_entrypoint_table *entrypoint_table, +@@ -267,6 +336,46 @@ ${load_dispatch_table('physical_device', 'VkInstance', 'GetInstanceProcAddr', + ${load_dispatch_table('device', 'VkDevice', 'GetDeviceProcAddr', + device_entrypoints)} + ++<%def name="load_uncompacted_dispatch_table(type, VkType, ProcAddr, entrypoints)"> ++void ++vk_${type}_uncompacted_dispatch_table_load(struct vk_${type}_uncompacted_dispatch_table *table, ++ PFN_vk${ProcAddr} gpa, ++ ${VkType} obj) ++{ ++% if type != 'physical_device': ++ table->${ProcAddr} = gpa; ++% endif ++% for e in entrypoints: ++ % if e.alias or e.name == '${ProcAddr}': ++ <% continue %> ++ % endif ++ % if e.guard is not None: ++#ifdef ${e.guard} ++ % endif ++ table->${e.name} = (PFN_vk${e.name}) gpa(obj, "vk${e.name}"); ++ % for a in e.aliases: ++ table->${a.name} = (PFN_vk${a.name}) gpa(obj, "vk${a.name}"); ++ if (table->${e.name} && !table->${a.name}) ++ table->${a.name} = (PFN_vk${a.name}) table->${e.name}; ++ if (!table->${e.name}) ++ table->${e.name} = (PFN_vk${e.name}) table->${a.name}; ++ % endfor ++ % if e.guard is not None: ++#endif ++ % endif ++% endfor ++} ++ ++ ++${load_uncompacted_dispatch_table('instance', 'VkInstance', 'GetInstanceProcAddr', ++ instance_entrypoints)} ++ ++${load_uncompacted_dispatch_table('physical_device', 'VkInstance', 'GetInstanceProcAddr', ++ physical_device_entrypoints)} ++ ++${load_uncompacted_dispatch_table('device', 'VkDevice', 'GetDeviceProcAddr', ++ device_entrypoints)} ++ + + struct string_map_entry { + uint32_t name; +-- +GitLab + + +From d4f3770ea232e015e445b9d1fcab699119417fac Mon Sep 17 00:00:00 2001 +From: Mike Blumenkrantz +Date: Tue, 27 Feb 2024 16:20:48 -0500 +Subject: [PATCH 2/2] zink: use uncompacted vk_dispatch_table + +the dispatch table doesn't know which extensions zink wants to use, +so let zink use the extensions it wants to use + +fixes #10513 + +cc: mesa-stable + +Acked-by: Dave Airlie +Part-of: +--- + src/gallium/drivers/zink/zink_screen.c | 18 +++++++++--------- + src/gallium/drivers/zink/zink_types.h | 2 +- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c +index 11e54a0054a09..035e742c98af7 100644 +--- a/src/gallium/drivers/zink/zink_screen.c ++++ b/src/gallium/drivers/zink/zink_screen.c +@@ -3288,12 +3288,12 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev + } + } + +- vk_instance_dispatch_table_load(&screen->vk.instance, +- screen->vk_GetInstanceProcAddr, +- screen->instance); +- vk_physical_device_dispatch_table_load(&screen->vk.physical_device, +- screen->vk_GetInstanceProcAddr, +- screen->instance); ++ vk_instance_uncompacted_dispatch_table_load(&screen->vk.instance, ++ screen->vk_GetInstanceProcAddr, ++ screen->instance); ++ vk_physical_device_uncompacted_dispatch_table_load(&screen->vk.physical_device, ++ screen->vk_GetInstanceProcAddr, ++ screen->instance); + + zink_verify_instance_extensions(screen); + +@@ -3390,9 +3390,9 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev + if (!screen->dev) + goto fail; + +- vk_device_dispatch_table_load(&screen->vk.device, +- screen->vk_GetDeviceProcAddr, +- screen->dev); ++ vk_device_uncompacted_dispatch_table_load(&screen->vk.device, ++ screen->vk_GetDeviceProcAddr, ++ screen->dev); + + init_queue(screen); + +diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h +index bc668b60d8e64..ddfb2532c8432 100644 +--- a/src/gallium/drivers/zink/zink_types.h ++++ b/src/gallium/drivers/zink/zink_types.h +@@ -1523,7 +1523,7 @@ struct zink_screen { + bool renderdoc_capture_all; + #endif + +- struct vk_dispatch_table vk; ++ struct vk_uncompacted_dispatch_table vk; + + void (*buffer_barrier)(struct zink_context *ctx, struct zink_resource *res, VkAccessFlags flags, VkPipelineStageFlags pipeline); + void (*image_barrier)(struct zink_context *ctx, struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline); +-- +GitLab + diff --git a/openjpeg2/PKGBUILD b/openjpeg2/PKGBUILD index c01def9..a2480fc 100644 --- a/openjpeg2/PKGBUILD +++ b/openjpeg2/PKGBUILD @@ -6,48 +6,48 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=openjpeg2 -pkgver=2.5.0 -pkgrel=03 +pkgver=2.5.2 +pkgrel=01 pkgdesc="An open source JPEG 2000 codec, version ${pkgver}" url="https://github.com/uclouvain/openjpeg" -makedepends=('cmake' 'doxygen') +makedepends=('cmake' 'doxygen' 'graphviz') source=("$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz") prepare() { - cd "${srcdir}" - mkdir build + # Remove all third party libraries just to be sure + find openjpeg-"${pkgver}"/thirdparty/ -mindepth 1 -maxdepth 1 -type d -exec rm -rf {} \; + } build() { - cd "${srcdir}/build" + cmake -B build -S openjpeg-"${pkgver}" \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_STATIC_LIBS=OFF \ + -DBUILD_DOC=on + + VERBOSE=1 cmake --build build +} - cmake "../openjpeg-${pkgver}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_STATIC_LIBS=OFF \ - -DBUILD_DOC=on - - make +check() { + ctest --test-dir build --output-on-failure } package() { - cd "${srcdir}/build" depends=('libpng' 'libtiff' 'lcms2') - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg2" - mv "${pkgdir}"/usr/share/doc/openjpeg-*/LICENSE "${pkgdir}"/usr/share/licenses/openjpeg2 + DESTDIR="$pkgdir" cmake --install build + install -Dm 644 "${srcdir}"/openjpeg-"${pkgver}"/LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/ + } #---- arch license gpg-key & sha256sums ---- arch=(x86_64) -license=('custom: BSD') +license=('BSD-2-Clause' 'MIT') -sha256sums=(0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a) # v2.5.0.tar.gz +sha256sums=(90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a) # v2.5.2.tar.gz + +## 328666891d3ba69b4177615735a0f397ff0aed1aa2c2f93d3036bf5c85df9d69 openjpeg2-2.5.2-01-x86_64.pkg.tar.lz -## 4c116b28db3a9d0322fdc0d28fb60cea4797226f74961b0ccd33b35ea61f3631 openjpeg2-2.5.0-03-x86_64.pkg.tar.lz -## 36093cd448147c279f0c91cbabc05c4ad5432896a490eca685639e9aa0f900e1 openjpeg2-2.5.0-03-x86_64.pkg.tar.lz -0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a openjpeg2-2.5.0.tar.gz diff --git a/openjpeg2/PKGBUILD-arch b/openjpeg2/PKGBUILD-arch index 64827c5..f578136 100644 --- a/openjpeg2/PKGBUILD-arch +++ b/openjpeg2/PKGBUILD-arch @@ -2,40 +2,38 @@ # Contributor: Sergej Pupykin pkgname=openjpeg2 -pkgver=2.5.0 -pkgrel=3 +pkgver=2.5.2 +pkgrel=1 pkgdesc="An open source JPEG 2000 codec, version ${pkgver}" arch=(x86_64) -license=('custom: BSD') +license=('BSD-2-Clause' 'MIT') url="https://github.com/uclouvain/openjpeg" -makedepends=('cmake' 'doxygen') -depends=('libpng' 'libtiff' 'lcms2') +makedepends=('cmake' 'doxygen' 'graphviz') +depends=('libpng' 'libtiff' 'lcms2' 'glibc') source=("$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz") -sha256sums=('0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a') +sha256sums=('90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a') prepare() { - cd "${srcdir}" - mkdir build + # Remove all third party libraries just to be sure + find openjpeg-"${pkgver}"/thirdparty/ -mindepth 1 -maxdepth 1 -type d -exec rm -rf {} \; } build() { - cd "${srcdir}/build" - - cmake "../openjpeg-${pkgver}" \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S openjpeg-"${pkgver}" \ + -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_STATIC_LIBS=OFF \ -DBUILD_DOC=on - make + VERBOSE=1 cmake --build build +} + +check() { + ctest --test-dir build --output-on-failure } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg2" - mv "${pkgdir}"/usr/share/doc/openjpeg-*/LICENSE "${pkgdir}"/usr/share/licenses/openjpeg2 + DESTDIR="$pkgdir" cmake --install build + install -Dm 644 "${srcdir}"/openjpeg-"${pkgver}"/LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/ } -## diff --git a/openjpeg2/deps b/openjpeg2/deps index e0fe9f7..0d3eaa5 100644 --- a/openjpeg2/deps +++ b/openjpeg2/deps @@ -3,5 +3,6 @@ doxygen libpng libtiff lcms2 +graphviz diff --git a/pahole/PKGBUILD b/pahole/PKGBUILD index 06c09fc..24eb562 100644 --- a/pahole/PKGBUILD +++ b/pahole/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=pahole pkgname=(pahole ostra-cg) -pkgver=1.25 -pkgrel=04 +pkgver=1.26 +pkgrel=01 epoch=1 pkgdesc="Pahole and other DWARF utils" url="https://git.kernel.org/pub/scm/devel/pahole/pahole.git" @@ -25,9 +25,9 @@ prepare() { build() { local cmake_options=( - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_BUILD_TYPE=None - -D__LIB=lib + -D CMAKE_INSTALL_PREFIX=/usr + -D CMAKE_BUILD_TYPE=None + -D __LIB=lib ) cmake -S dwarves-$pkgver -B build -G Ninja "${cmake_options[@]}" @@ -35,8 +35,7 @@ build() { } check() { - cd build - ctest --output-on-failure --stop-on-failure -j$(nproc) + ctest --test-dir build --output-on-failure --stop-on-failure -j$(nproc) } _pick() { @@ -81,17 +80,18 @@ package_ostra-cg() { arch=(x86_64) -license=(GPL2) +license=(GPL-2.0-only) validpgpkeys=(2DBF5BAA46FB4DED338A335BD65016F35352AA40) # Arnaldo Carvalho de Melo -b2sums=('1926fa1fa123fc3ad0f7f063406260b1e1e2611c563fedebee4c837e491164571fdb40408421c0c4ea2fd24e89c54a7a1ea669313b6dd6d7dcfa4934e2c1336e' - 'SKIP' - 'e88fcda77c0a6aaea0d83949cabbaaaf24f6a4b2324a14e459efc202b210c31b58f7a90c75c34ffd08911514b3b6db4be4423e3f8e0fb50b6d914da5be002319') +b2sums=('cb86bf964f22633432e80d335937379c2096877c6130f49dbe03f2653b7c932bb1c5d87621ac93383be9e4f35294a4f95aadb6392491fb782812db519b39b666' + 'SKIP' + 'd423eb1e05b634516ae1cf652e291fd559650b00b016ed35d0f2bd8ccb04ffd9e1ed1c53e95d86039d656651633792932544de1871a09cb8b4953fa8026492e9') -sha256sums=(e7d45955f6f4eca25a4c8c3bd6611059b35dc217e45976681d7db170fccdec4a # dwarves-1.25.tar.xz - 786a006594f685ffcbbbfd7fb5abbf2463f15874d6b976bcd50f92f65072f0b4 # dwarves-1.25.tar.sign - 0b80b6f8d14fb60e51a9c14746709f8e379a83afe2896f1adc4dae2f87e5e74a) # python.diff +sha256sums=(ad4c08339850e404609e2808012580b7e98366d2b91054bb93fe6dca94651fb4 # dwarves-1.26.tar.xz + 67c02c3714cd778b4c4b5c5ea808f6921ee9bf855d1ea6a816943d73037c4c1e # dwarves-1.26.tar.sign + b208e4fc49c11caaa7fb3fdc8840ecb0cdb84e6d73312a97f6e68f9eb81dd622) # python.diff + +## d6f63c8b499474d1724d481328a54d0b93fa53a70b7c00977542a7e5d00884d9 pahole-1_1.26-01-x86_64.pkg.tar.lz +## 364be13bbef7abd7a440152bee1b047a32b5b240e5ddff9068349c4980dce380 ostra-cg-1_1.26-01-x86_64.pkg.tar.lz -## b1c579ee2a381eb3914cdefc2a0ba58c113be130e839ac9e0114b14a3ad121c1 ostra-cg-1_1.25-04-x86_64.pkg.tar.lz -## 80654d9a808b7eeb5006ce831f60202f79388553f6cfe8fc5ff00274c4019418 pahole-1_1.25-04-x86_64.pkg.tar.lz diff --git a/pahole/PKGBUILD-arch b/pahole/PKGBUILD-arch index 329ab06..6d0f5df 100644 --- a/pahole/PKGBUILD-arch +++ b/pahole/PKGBUILD-arch @@ -5,13 +5,13 @@ pkgname=( pahole ostra-cg ) -pkgver=1.25 -pkgrel=4 +pkgver=1.26 +pkgrel=1 epoch=1 pkgdesc="Pahole and other DWARF utils" url="https://git.kernel.org/pub/scm/devel/pahole/pahole.git" arch=(x86_64) -license=(GPL2) +license=(GPL-2.0-only) makedepends=( bash cmake @@ -25,9 +25,9 @@ source=( https://fedorapeople.org/~acme/dwarves/dwarves-$pkgver.tar.{xz,sign} python.diff ) -b2sums=('1926fa1fa123fc3ad0f7f063406260b1e1e2611c563fedebee4c837e491164571fdb40408421c0c4ea2fd24e89c54a7a1ea669313b6dd6d7dcfa4934e2c1336e' +b2sums=('cb86bf964f22633432e80d335937379c2096877c6130f49dbe03f2653b7c932bb1c5d87621ac93383be9e4f35294a4f95aadb6392491fb782812db519b39b666' 'SKIP' - 'e88fcda77c0a6aaea0d83949cabbaaaf24f6a4b2324a14e459efc202b210c31b58f7a90c75c34ffd08911514b3b6db4be4423e3f8e0fb50b6d914da5be002319') + 'd423eb1e05b634516ae1cf652e291fd559650b00b016ed35d0f2bd8ccb04ffd9e1ed1c53e95d86039d656651633792932544de1871a09cb8b4953fa8026492e9') validpgpkeys=( 2DBF5BAA46FB4DED338A335BD65016F35352AA40 # Arnaldo Carvalho de Melo ) @@ -41,9 +41,9 @@ prepare() { build() { local cmake_options=( - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_BUILD_TYPE=None - -D__LIB=lib + -D CMAKE_INSTALL_PREFIX=/usr + -D CMAKE_BUILD_TYPE=None + -D __LIB=lib ) cmake -S dwarves-$pkgver -B build -G Ninja "${cmake_options[@]}" @@ -51,8 +51,7 @@ build() { } check() { - cd build - ctest --output-on-failure --stop-on-failure -j$(nproc) + ctest --test-dir build --output-on-failure --stop-on-failure -j$(nproc) } _pick() { @@ -94,4 +93,3 @@ package_ostra-cg() { } # vim:set sw=2 sts=-1 et: -## diff --git a/pahole/deps b/pahole/deps index 8a53bc8..76b0059 100644 --- a/pahole/deps +++ b/pahole/deps @@ -3,3 +3,5 @@ ninja python python-matplotlib + +graphite diff --git a/pahole/python.diff b/pahole/python.diff index 4ce2d86..d8e1c41 100644 --- a/pahole/python.diff +++ b/pahole/python.diff @@ -1,5 +1,5 @@ diff --git i/CMakeLists.txt w/CMakeLists.txt -index 98642e1..b4295fd 100644 +index a250182..b9f7bed 100644 --- i/CMakeLists.txt +++ w/CMakeLists.txt @@ -188,7 +188,7 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorganize.h diff --git a/pango/PKGBUILD b/pango/PKGBUILD index e5fb76a..2155c33 100644 --- a/pango/PKGBUILD +++ b/pango/PKGBUILD @@ -7,14 +7,14 @@ #pkgbase=pango pkgname=(pango) # pango-docs) -pkgver=1.51.2 +pkgver=1.52.0 pkgrel=01 epoch=1 pkgdesc="A library for layout and rendering of text" url="https://www.pango.org/" depends=(cairo fribidi harfbuzz libthai libxft) makedepends=(gi-docgen git gobject-introspection help2man meson) -_commit=54c5f4ec01ce9c89a590cdc7e4c2c6e3948bb029 # tags/1.51.2^0 +_commit=fed7be510f58ed848f23f653f3fba45f44eb3b9c # tags/1.52.0^0 source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit") pkgver() { @@ -62,6 +62,5 @@ license=(LGPL-2.1-or-later) sha256sums=(SKIP) -## 4edfd1d309624524c35919c15bead7a51ed34ee141cf4fb8db4065b18f6223ea pango-1_1.51.2-01-x86_64.pkg.tar.lz - +## 455115077bf4e43d4689f45290485832e9367debea76c750ac4a54c710824a17 pango-1_1.52.0-01-x86_64.pkg.tar.lz diff --git a/pango/PKGBUILD-arch b/pango/PKGBUILD-arch index 14c4ec6..2f56991 100644 --- a/pango/PKGBUILD-arch +++ b/pango/PKGBUILD-arch @@ -6,7 +6,7 @@ pkgname=( pango pango-docs ) -pkgver=1.51.2 +pkgver=1.52.0 pkgrel=1 epoch=1 pkgdesc="A library for layout and rendering of text" @@ -27,7 +27,7 @@ makedepends=( help2man meson ) -_commit=54c5f4ec01ce9c89a590cdc7e4c2c6e3948bb029 # tags/1.51.2^0 +_commit=fed7be510f58ed848f23f653f3fba45f44eb3b9c # tags/1.52.0^0 source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit") b2sums=('SKIP') @@ -69,4 +69,3 @@ package_pango-docs() { } # vim:set sw=2 sts=-1 et: -## diff --git a/pango/deps b/pango/deps index 0711706..7c39bd3 100644 --- a/pango/deps +++ b/pango/deps @@ -9,3 +9,4 @@ gobject-introspection help2man meson + diff --git a/pixman/PKGBUILD b/pixman/PKGBUILD index 838fc68..490a8b2 100644 --- a/pixman/PKGBUILD +++ b/pixman/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=pixman -pkgver=0.43.2 +pkgver=0.43.4 pkgrel=01 pkgdesc="The pixel-manipulation library for X and cairo" url="https://cgit.freedesktop.org/pixman/" @@ -45,7 +45,6 @@ license=('MIT') #validpgpkeys=('') # Maarten Lankhorst -sha256sums=(b43dc9549c02c598fb11321d6fca47151f739a076c73fcd8971b5c023a06949e) # pixman-0.43.2.tar.xz - -## af19e7d9bb391521ea85f310fb5f9ebad6e41bb6651b90832ff917a2ed3532ed pixman-0.43.2-01-x86_64.pkg.tar.lz +sha256sums=(48d8539f35488d694a2fef3ce17394d1153ed4e71c05d1e621904d574be5df19) # pixman-0.43.4.tar.xz +## 314e917050c436691a3700ae3d44e58e083efdfdd49ae54862b9b6a33268bc56 pixman-0.43.4-01-x86_64.pkg.tar.lz diff --git a/pixman/PKGBUILD-arch b/pixman/PKGBUILD-arch index d2973ce..f2d7c00 100644 --- a/pixman/PKGBUILD-arch +++ b/pixman/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Alexander Baldeck pkgname=pixman -pkgver=0.43.2 +pkgver=0.43.4 pkgrel=1 pkgdesc="The pixel-manipulation library for X and cairo" arch=(x86_64) @@ -13,7 +13,7 @@ depends=('glibc') makedepends=('meson' 'libpng') provides=('libpixman-1.so') source=(https://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.xz) -sha512sums=('1a1d21b86b3c6784c4c2606b7069723b4dbb747eac9fce95bca86516787840379ffd49abc42d11e7143e85c32c85496f33c2562c7a910ca6f963599affdc3224') +sha512sums=('b40fb05bd58dc78f4e4e9b19c86991ab0611b708657c9a7fb42bfe82d57820a0fde01a34b00a0848a41da6c3fb90c2213942a70f435a0e9467631695d3bc7e36') #validpgpkeys=('') # Maarten Lankhorst build() { @@ -37,4 +37,3 @@ package() { DESTDIR="$pkgdir" meson install -C build install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname-$pkgver/COPYING } -## diff --git a/pixman/deps b/pixman/deps index c855cb8..c014ea9 100644 --- a/pixman/deps +++ b/pixman/deps @@ -1,2 +1,4 @@ meson libpng + + diff --git a/pixman/time b/pixman/time index bc9fda8..7b7668b 100644 --- a/pixman/time +++ b/pixman/time @@ -1,5 +1,6 @@ -real 3m0.172s -user 5m51.647s -sys 0m6.075s + +real 1m39.421s +user 6m13.063s +sys 0m7.253s diff --git a/unrar/PKGBUILD b/unrar/PKGBUILD index fb400b6..998cf1a 100644 --- a/unrar/PKGBUILD +++ b/unrar/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=unrar pkgname=(unrar libunrar) -pkgver=6.2.12 +pkgver=7.0.7 pkgrel=01 epoch=1 depends=(gcc-libs glibc) @@ -46,9 +46,10 @@ package_libunrar() { arch=(x86_64) -license=(custom) +license=(LicenseRef-UnRAR) -sha256sums=(a008b5f949bca9bb4ffa1bebbfc8b3c14b89df10a10354809b845232d5f582e5) # unrarsrc-6.2.12.tar.gz +sha256sums=(da95829c7e66fe461c06eb4bea8145e58d88d76909432d0875cd1ff86669f728) # unrarsrc-7.0.7.tar.gz + +## 3040340c3b7648017b0ca9426252523460ac67eb73bc7ee9c7bee2a5f84ddf0a libunrar-1:7.0.7-01-x86_64.pkg.tar.lz +## 89c478d27f0b54da57dc8874e4cd0e069953ca26322c0f82e87b5a99d74c1b4a unrar-1:7.0.7-01-x86_64.pkg.tar.lz -## 84bbef884d4e7371cdbf0d30c5a7b7eb046f26325e5642a7891da361ebf62d96 libunrar-1_6.2.12-01-x86_64.pkg.tar.lz -## abbcb88889fb92849e9f9eb66f875cbd5538ac555d2b3d85cd863a5aa7ca5a48 unrar-1_6.2.12-01-x86_64.pkg.tar.lz diff --git a/unrar/PKGBUILD-arch b/unrar/PKGBUILD-arch index c41aee9..f75ea24 100644 --- a/unrar/PKGBUILD-arch +++ b/unrar/PKGBUILD-arch @@ -5,16 +5,16 @@ pkgbase=unrar pkgname=(libunrar unrar) -pkgver=6.2.12 +pkgver=7.0.7 pkgrel=1 epoch=1 arch=(x86_64) url='https://www.rarlab.com/rar_add.htm' depends=(gcc-libs glibc) -license=(custom) +license=(LicenseRef-UnRAR) source=(https://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz) -sha256sums=('a008b5f949bca9bb4ffa1bebbfc8b3c14b89df10a10354809b845232d5f582e5') +sha256sums=('da95829c7e66fe461c06eb4bea8145e58d88d76909432d0875cd1ff86669f728') prepare() { sed -e '/CXXFLAGS=/d' -e '/LDFLAGS=/d' -i unrar/makefile # Use system build flags diff --git a/unrar/deps b/unrar/deps index b28b04f..139597f 100644 --- a/unrar/deps +++ b/unrar/deps @@ -1,3 +1,2 @@ -