diff --git a/README.md b/README.md
index 315e6858bfaf3d..320365ef921a2b 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
- install(1) - GNU coreutils
- objcopy(1), objdump(1), strip(1): binutils
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
> NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
#### xbps-uunshare(1) (default)
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
This utility requires these Linux kernel options:
- CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
#### xbps-uchroot(1)
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
This utility requires these Linux kernel options:
- CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
proper permissions and owner/group as explained above.
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See .
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
### Install the bootstrap packages
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
$ tar xvf xbps-static-latest.-musl.tar.xz -C ~/XBPS
$ export PATH=~/XBPS/usr/bin:$PATH
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
- # chown root: ~/XBPS/usr/bin/xbps-uchroot.static
- # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
Clone the `void-packages` git repository:
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7dafe1..a6b68435eb439d 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
- *) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+ *)
+ msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+ return 1
+ ;;
esac
}
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad346..0304180a8c0d17 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
libdbus-1.so.3 dbus-libs-1.2.10_1
libdbus-glib-1.so.2 dbus-glib-0.80_1
libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
libfuse.so.2 fuse-2.8.1_1
libfuse3.so.3 fuse3-3.1.0_1
libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
libkColorPicker.so.0 kColorPicker-0.1.5_1
libbabl-0.1.so.0 babl-0.1.16_1
libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
libaspell.so.15 libaspell-0.60.8_2
libpspell.so.15 libaspell-0.60.8_2
libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
libgexiv2.so.2 libgexiv2-0.6.1_1
libraw.so.20 libraw-0.20.2_1
libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
libdjvulibre.so.21 libdjvulibre-3.5.24_1
libgxps.so.2 libgxps-0.2.0_1
libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
libQt5Xdg.so.3 libqtxdg-3.1.0_1
libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
libtommath.so.1 libtommath-1.0_1
libKF5ItemViews.so.5 kitemviews-5.26.0_1
libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
libspectrum.so.8 libspectrum-1.2.2_1
libbearssl.so.0 bearssl-0.3_1
libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
libweston-9.so.0 weston-9.0.0_1
libostree-1.so.1 libostree-2020.8_2
librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
libvalaccodegen.so libvala-0.44.0_1
libphodav-2.0.so.0 phodav-2.2_1
libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
libcpptest.so.1 cpptest-2.0.0_1
libhandy-0.0.so.0 libhandy-0.0.3_1
libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
libswitchboard-2.0.so.0 switchboard-2.3.2_1
libcodecore.so.0 libio.elementary.code-3.0_1
libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
librlottie.so.0 rlottie-0.0.20160709_1
libfstrm.so.0 fstrm-0.5.0_1
libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
libbcc.so.0 bcc-0.10.0_1
libbcc_bpf.so.0 bcc-0.10.0_1
libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
liblhasa.so.0 lhasa-0.3.1_2
libmt32emu.so.2 libmt32emu-2.5.1_1
libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9d1..488cc8b2d0a4ac 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
CATOSL-1.1
CC-BY-1.0
CC-BY-2.0
+CC-BY-2.5-AU
CC-BY-2.5
CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
CC-BY-3.0-US
CC-BY-3.0
CC-BY-4.0
CC-BY-NC-1.0
CC-BY-NC-2.0
CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
CC-BY-NC-3.0
CC-BY-NC-4.0
CC-BY-NC-ND-1.0
CC-BY-NC-ND-2.0
CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
CC-BY-NC-ND-3.0-IGO
CC-BY-NC-ND-3.0
CC-BY-NC-ND-4.0
CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
CC-BY-NC-SA-2.0
CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
CC-BY-NC-SA-3.0
CC-BY-NC-SA-4.0
CC-BY-ND-1.0
CC-BY-ND-2.0
CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
CC-BY-ND-3.0
CC-BY-ND-4.0
CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
CC-BY-SA-2.1-JP
CC-BY-SA-2.5
CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
CC-BY-SA-3.0
CC-BY-SA-4.0
CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
CDDL-1.1
CDL-1.0
CDLA-Permissive-1.0
+CDLA-Permissive-2.0
CDLA-Sharing-1.0
CECILL-1.0
CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
NIST-PD-fallback
NIST-PD
NLOD-1.0
+NLOD-2.0
NLPL
NOSL
NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
OLDAP-2.8
OML
OPL-1.0
+OPUBL-1.0
OSET-PL-2.1
OSL-1.0
OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d54c..0f37ba4625ddbb 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
# Template file for '0ad-data'
pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
revision=1
wrksrc="${pkgname%-data}-${version}-alpha"
short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski "
license="CC-BY-SA-3.0"
homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
nocross=yes
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42cda..93e90e139b4f57 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- arch = "arm"
- elseif string.find(machine, "aarch64") == 1 then
- arch = "aarch64"
-+ elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+ arch = "ppc64"
- elseif string.find(machine, "e2k") == 1 then
- arch = "e2k"
- else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- table.insert(source_dirs, "lib/sysdep/arch/arm");
- elseif arch == "aarch64" then
- table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+ elseif arch == "ppc64" then
-+ table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- elseif arch == "e2k" then
- table.insert(source_dirs, "lib/sysdep/arch/e2k");
- end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+ return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+ return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+ return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+ return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h 2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h 2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN 0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- # define BYTE_ORDER LITTLE_ENDIAN
- # else
- # define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp 2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp 2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+ scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
-
- #ifdef NDEBUG
- scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h 2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h 2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
-
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
-
--- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
+++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
@@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb48310137..66083eaae67aef 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
# Template file for '0ad'
pkgname=0ad
-version=0.0.24b
+version=0.0.25
revision=2
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski "
license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 00000000000000..d84f8c8aa9afcd
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave "
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e02..a00a75fe709d89 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.2.2
-revision=12
+revision=13
build_style=gnu-configure
configure_args="--disable-update-checker --with-alsa --with-ffms2
--with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e0e..a0bc5780731d12 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
# Template file for 'CLion'
pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
wrksrc="clion-${version}"
depends="jetbrains-jdk-bin giflib libXtst"
short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev "
license="custom:Commercial"
homepage="https://www.jetbrains.com/clion"
distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
repository=nonfree
restricted=yes
nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
desc_option_bundled_lldb="Install bundled LLDB"
post_extract() {
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
+ # Remove files for other OSes and/or CPU architectures
+ # Darwin (this is not packaged for macOS)
+ rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+ rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+ rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+ rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+ rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+ # Windows (this is not packaged for Windows)
+ rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+ rm -rf plugins/performanceTesting/bin/yjpagent.dll
+ rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+ rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+ rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+ # x86 (unsupported after v2021.1)
+ rm -rf bin/clion.vmoptions
+ rm -rf lib/pty4j-native/linux/x86
+ rm -rf plugins/performanceTesting/bin/libyjpagent.so
+ rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+ # MIPS
rm -rf lib/pty4j-native/linux/mips64el
+ # ARM
+ rm -rf lib/pty4j-native/linux/arm
+ # PPC
rm -rf lib/pty4j-native/linux/ppc64le
+
case "$XBPS_TARGET_MACHINE" in
x86_64)
- rm -rf bin/fsnotifier
- rm -rf bin/clion.vmoptions
- rm -rf bin/libyjpagent-linux.so
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+ rm -rf lib/pty4j-native/linux/aarch64
;;
- i686)
- rm -rf bin/fsnotifier64
- rm -rf bin/clion64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
+ aarch64)
rm -rf lib/pty4j-native/linux/x86-64
+ rm -rf plugins/performanceTesting/bin/libyjpagent64.so
rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
;;
esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 00000000000000..cd42858e4b114a
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 00000000000000..f142f9ee64c952
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik "
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+ vsed -e 's@./configure@:@' -i bootstrap
+ sh bootstrap .
+}
+
+post_install() {
+ mv ${DESTDIR}/usr/doc ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/man/man3
+ vmove usr/share/doc
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 00000000000000..90b1a7c7efd547
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?"
+maintainer="Orphaned "
license="ImageMagick"
homepage="https://www.imagemagick.org/"
changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c67..00000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes "
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
- # XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
- configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
- hostmakedepends+=" perl"
- subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
- autoreconf -if
-}
-
-do_check() {
- # Disable failing checks
- sed -i '/validate-formats/d' Makefile
-
- make check
-}
-
-post_install() {
- vlicense LICENSE
- vlicense NOTICE
-}
-
-libmagick6_package() {
- short_desc="ImageMagick6 low-level image manipulation libraries"
- pkg_install() {
- vmove "usr/lib/libMagick*.so.*"
- vmove "usr/lib/ImageMagick*"
- vmove "usr/share/ImageMagick*"
- }
-}
-
-libmagick6-devel_package() {
- depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
- libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
- short_desc="ImageMagick6 low-level image manipulation development files"
- conflicts="libmagick-devel>=0"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/share/doc
- vmove "usr/bin/*-config"
- vmove "usr/lib/*.so"
- vmove "usr/lib/*.la"
- vmove "usr/share/man/man1/*-config.1"
- }
-}
-
-libmagick6-perl_package() {
- short_desc="ImageMagick6 perl library bindings"
- pkg_install() {
- vmove usr/lib/perl5
- vmove usr/share/man/man3
- }
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667da..00000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 00000000000000..acccfd956a9103
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+ return None
+
++ def _manga_title_from_attributes(self, attributes):
++ if self.lang_code in attributes['title']:
++ return attributes['title'][self.lang_code]
++ elif 'en' in attributes['title']:
++ return attributes['title']['en']
++
++ else:
++ lang_code_alt_name = None
++ en_alt_name = None
++
++ for alt_title in attributes['altTitles']:
++ if not lang_code_alt_name and self.lang_code in alt_title:
++ lang_code_alt_name = alt_title['en']
++
++ if not en_alt_name and 'en' in alt_title:
++ en_alt_name = alt_title['en']
++
++ return lang_code_alt_name or en_alt_name
++
++
+ def get_manga_data(self, initial_data):
+ """
+ Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+ attributes = resp_json['data']['attributes']
+
+ # FIXME: Should probably be lang_code, but the API returns weird stuff
+- data['name'] = html.unescape(attributes['title']['en'])
++ _name = self._manga_title_from_attributes(attributes)
++ data['name'] = html.unescape(_name)
++ assert data['name'] is not None
+
+ for relationship in resp_json['relationships']:
+ if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+ elif attributes['status'] == 'hiatus':
+ data['status'] = 'hiatus'
+
+- # FIXME: lang_code
+- data['synopsis'] = html.unescape(attributes['description']['en'])
++ if self.lang_code in attributes['description']:
++ data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++ elif 'en' in attributes['description']:
++ # Fall back to english synopsis
++ data['synopsis'] = html.unescape(attributes['description']['en'])
++ else:
++ logger.warn('{}: No synopsis', data['name'])
++
+
+ data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+ if result['type'] != 'manga':
+ continue
+
+- results.append(dict(
+- slug=result['id'],
+- # FIXME: lang_code
+- name=result['attributes']['title']['en'],
+- ))
++ name = self._manga_title_from_attributes(result['attributes'])
++
++ if name:
++ results.append(dict(
++ slug=result['id'],
++ # FIXME: lang_code
++ name=name,
++ ))
++ else:
++ logger.warn("ignoring result {}, missing name".format(result['id']))
+
+ return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c63..954a910382b7a6 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=0.29.2
+version=0.30.0
revision=2
wrksrc=Komikku-v${version}
build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem "
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777b6..3000ca0ed3d532 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
This fixes crashes on ppc-musl, as musl only supports secureplt.
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
@@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
#undef GOTFUNC
#endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
}
#if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
@@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
};
#endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
ASMFunction got[LJ_GOT__MAX]; /* Global offset table. */
#endif
#if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
@@ -59,7 +59,12 @@
|.define ENV_OFS, 8
|.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd89a..7c865859da9233 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao
diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
@@ -257,9 +257,11 @@ map_op = {
addic_3 = "30000000RRI",
["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
end),
diff --git src/Makefile src/Makefile
index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
@@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
DASM_AFLAGS+= -D GPR64
endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
DASM_ARCH= ppc64
diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
@@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
#else
#define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
fprintf(ctx->fp, "\t.text\n");
diff --git src/lj_arch.h src/lj_arch.h
index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
@@ -269,10 +269,18 @@
#if LJ_TARGET_CONSOLE
#define LJ_ARCH_PPC32ON64 1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
#endif
diff --git src/lj_ccall.c src/lj_ccall.c
index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
@@ -369,21 +369,97 @@
#elif LJ_TARGET_PPC
/* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
#if LJ_TARGET_MIPS64
diff --git src/lj_ccall.h src/lj_ccall.h
index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
@@ -86,10 +86,23 @@ typedef union FPRArg {
#elif LJ_TARGET_PPC
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
typedef intptr_t GPRArg;
diff --git src/lj_ccallback.c src/lj_ccallback.c
index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
@@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
#elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
if (ctr->size <= 4 &&
diff --git src/lj_ctype.h src/lj_ctype.h
index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
@@ -153,7 +153,7 @@ typedef struct CType {
/* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
diff --git src/lj_def.h src/lj_def.h
index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
@@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
#define LJ_MAX_IDXCHAIN 100 /* __index/__newindex chain limit. */
#define LJ_STACK_EXTRA (5+2*LJ_FR2) /* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
#define LJ_MIN_GLOBAL 6 /* Min. global table size (hbits). */
diff --git src/lj_frame.h src/lj_frame.h
index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
@@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK }; /* Special continuations. */
#define CFRAME_OFS_MULTRES 408
#define CFRAME_SIZE 384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
#define CFRAME_OFS_NRES 468
diff --git src/lj_target_ppc.h src/lj_target_ppc.h
index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
@@ -30,8 +30,13 @@ enum {
/* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
PPCI_BC = 0x40800000,
diff --git src/vm_ppc.dasc src/vm_ppc.dasc
index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
@@ -22,35 +22,40 @@
|// GPR64 64 bit registers (but possibly 32 bit pointers, e.g. PS3).
|// Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f901d..f4e760b7383614 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc 2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc 2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc 2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc 2019-06-03 19:44:40.229686143 +0200
@@ -2774,7 +2774,7 @@
|
|->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7a7..5b8ab1beda11a6 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
msg_normal "patching: $i\n"
- patch -sNp0 -i ${i}
+ patch -sNp1 -i ${i}
done
}
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c339..7487ef8ad8d43e 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
_objects_version=1.0.21
_titles_version=0.1.2c
_replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
build_style=cmake
configure_args="
-DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
make_build_target="all g2"
hostmakedepends="pkg-config unzip"
makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
$(vopt_if multiplayer 'libcurl-devel openssl-devel')
$(vopt_if scripting duktape-devel)"
depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" OpenRCT2"
+ # for icu mass-rebuild
+ hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+ hostmakedepends+=" libnuspell libpsl"
CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
fi
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b699e..ddf1e5bb603818 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-ggplot2'
pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
revision=1
build_style=R-cran
makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
maintainer="Florian Wagner "
license="GPL-2.0-only"
homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4d9..56636534ddae17 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
# Template file for 'R-cran-stringi'
pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
build_style=R-cran
makedepends="pkg-config icu-devel"
short_desc="Character String Processing Facilities"
maintainer="Florian Wagner "
license="BSD-3-Clause"
homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f0f..2a3cb67d3feca6 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
# Template file for 'R'
pkgname=R
version=4.1.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
--with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 00000000000000..5c62275830ab3b
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+
+ /* Foolishly do what the compositor says here. If it's wrong, don't
+ * blame us, we were explicitly instructed to do this.
++ *
++ * UPDATE: Nope, we can't actually do that, the compositor may give
++ * us a completely stateless, sizeless configure, with which we have
++ * to enforce our own state anyway.
+ */
+- window->w = width;
+- window->h = height;
++ if (width != 0 && height != 0) {
++ window->w = width;
++ window->h = height;
++ }
+
+ /* This part is good though. */
+ if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21dd..b7c1db667dc422 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
# Template file for 'SDL2'
pkgname=SDL2
-version=2.0.14
+version=2.0.16
revision=1
build_style=gnu-configure
configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
short_desc="Simple DirectMedia Layer (version 2)"
maintainer="Orphaned "
license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
# Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
case "$XBPS_TARGET_MACHINE" in
arm*)
@@ -71,6 +72,13 @@ else
configure_args+=" --disable-pulseaudio"
fi
+if [ "$build_option_pipewire" ]; then
+ configure_args+=" --enable-pipewire"
+ makedepends+=" pipewire-devel"
+else
+ configure_args+=" --disable-pipewire"
+fi
+
if [ "$build_option_sndio" ]; then
configure_args+=" --enable-sndio"
makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
if [ -z "$build_option_gles" ]; then
msg_error "$pkgname: wayland option requires gles.\n"
fi
- configure_args+=" --enable-video-wayland --disable-wayland-shared"
- makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+ configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+ makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" wayland-devel"
fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b230..f7c5d5cd9ff89a 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/sirjuddington/SLADE"
changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
pre_configure() {
case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 00000000000000..4ae9ee619e3a7f
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+ // The rationale for ignoring it is that the only reason to specify
+ // an alignment and a with is to get a fixed width bar, and ">" is
+ // sufficient in this implementation.
++#if FMT_VERSION < 80000
+ width = parse_nonnegative_int(it, end, ctx);
++#else
++ width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+ }
+ return it;
+ }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter : fmt::formatter {
+ template
+ auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++ auto& tm_format = specs;
++#endif
+ return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+ }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e6698258..699c4baddb59cb 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.7
-revision=1
+revision=2
_date_version=3.0.0
create_wrksrc=yes
build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 00000000000000..c5dd100bfbc31b
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek "
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a93..9750c4c941a08b 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi-calendar'
pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John "
license="LGPL-2.1-or-later"
homepage="https://community.kde.org/KDE_PIM"
distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
akonadi-calendar-devel_package() {
depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a980..ddc4f95d844903 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
# Template file for 'akonadi-contacts'
pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
revision=1
build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
libkleo-devel grantlee5-devel grantleetheme-devel"
short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John "
license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://community.kde.org/KDE_PIM/Akonadi"
distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
if [ "$CROSS_BUILD" ];then
hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b6a..a2b72606fac359 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi-import-wizard'
pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John "
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://community.kde.org/KDE_PIM"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
akonadi-import-wizard-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db50992..d3dd0188e27518 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi-mime'
pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John "
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://community.kde.org/KDE_PIM/Akonadi"
distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
if [ "$CROSS_BUILD" ];then
hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d33..e08be40d821d9d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi-notes'
pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John "
license="LGPL-2.1-or-later"
homepage="https://kontact.kde.org/"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
akonadi-notes-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3cacd..fa3c6189d6ea31 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi-search'
pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John "
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://community.kde.org/KDE_PIM"
distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
akonadi-search-devel_package() {
depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d4b..e55cfaf89ebf75 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi5'
pkgname=akonadi5
-version=21.04.3
+version=21.08.0
revision=1
wrksrc="akonadi-${version}"
build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John "
license="LGPL-2.1-or-later"
homepage="https://community.kde.org/KDE_PIM/Akonadi"
distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c573..0aaa952d4daad1 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
# Template file for 'alacritty'
pkgname=alacritty
-version=0.8.0
+version=0.9.0
revision=1
build_wrksrc="${pkgname}"
build_style=cargo
hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
short_desc="Cross-platform, GPU-accelerated terminal emulator"
maintainer="Andrea Brancaleoni "
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://github.com/alacritty/alacritty"
changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 00000000000000..2472f31b7a6b58
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović "
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf000321..c6b356b5497667 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
- string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
-
-- if (CMAKE_BUILD_TYPE AND
-- NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
-- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-- endif()
--
- if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
- set(CMAKE_BUILD_TYPE_DEBUG ON)
- set(CMAKE_BUILD_TYPE_RELEASE OFF)
Index: xgl/CMakeLists.txt
===================================================================
--- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db63..c01b288f23288f 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
# Template file for 'amdvlk'
pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
_spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
_MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
_CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492da..e05c3c129e6442 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
# Template file for 'an'
pkgname=an
version=1.2
-revision=7
+revision=8
build_style=gnu-makefile
makedepends="icu-devel"
depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d52245177953..b218b76a2e37c9 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
# Template file for 'apk-tools'
pkgname=apk-tools
-version=2.12.6
+version=2.12.7
revision=1
build_style=gnu-makefile
# Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen "
license="GPL-2.0-only"
homepage="http://git.alpinelinux.org/cgit/apk-tools"
distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
CFLAGS="-Wno-error"
do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05a3..63a3e256df338e 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
# Template file for 'apostrophe'
pkgname=apostrophe
version=2.4
-revision=1
+revision=2
wrksrc=apostrophe-v$version
build_style=meson
build_helper=gir
hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
short_desc="GTK+ based distraction free Markdown editor"
maintainer="Orphaned "
license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479cb5..31bf6e62eec5ac 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
# Template file for 'arcan'
pkgname=arcan
version=0.6.0.1
-revision=1
+revision=2
build_wrksrc=src
build_style=cmake
make_cmd=make
configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
$(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
hostmakedepends="pkg-config
$(vopt_if wayland wayland-devel)"
makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
$(vopt_if tts 'libespeak-ng-devel')
$(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
$(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
vmove usr/include
}
}
+
+arcan_sdl_package() {
+ short_desc+=" - SDL platform server binary"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/bin/arcan_sdl
+ }
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 00000000000000..fb6a95edcfe5a2
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8cef7..b9f15ae83c2784 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
# Template file for 'ardour'
pkgname=ardour
-version=6.8
+version=6.9
revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
--libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be33a..1665ae95f762a1 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
# Template file for 'ark'
pkgname=ark
-version=21.04.3
+version=21.08.0
revision=1
build_style=cmake
configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John "
license="GPL-2.0-or-later"
homepage="https://kde.org/applications/en/utilities/org.kde.ark"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
do_check() {
cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c16..6a83617ae25adf 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
# Template file for 'attica'
pkgname=attica
-version=5.84.0
+version=5.85.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John "
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/attica"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
do_check() {
cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c43620..c4936a930e7fcb 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.7.6
-revision=1
+revision=2
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bcacc..8502d6e2979ad2 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
# Template file for 'babashka'
pkgname=babashka
-version=0.5.0
+version=0.5.1
revision=1
hostmakedepends="mandrel leiningen git"
makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
maintainer="Leah Neukirchen "
license="EPL-1.0"
homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
_babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
_depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
_pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69cf..c6fc3833c0e2e8 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
# Template file for 'baloo-widgets5'
pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
revision=1
wrksrc="baloo-widgets-${version}"
build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John "
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://invent.kde.org/libraries/baloo-widgets"
distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
baloo-widgets5-devel_package() {
short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebcea..8394cdec0d3ecf 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
# Template file for 'baloo5'
pkgname=baloo5
-version=5.84.0
+version=5.85.0
revision=1
wrksrc="${pkgname%5}-${version}"
build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John "
license="LGPL-2.1-or-later"
homepage="https://community.kde.org/Baloo"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
do_check() {
cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcfae..74fdd02597252e 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
# Template file for 'bcc'
pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
wrksrc="bcc"
build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
hostmakedepends="flex python3"
makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
maintainer="Leah Neukirchen "
license="Apache-2.0"
homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
python_version="3"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
post_extract() {
sed -i '/tests/d' CMakeLists.txt # break on musl
sed -i 's///' examples/cpp/KModRetExample.cc
+ # use a newer libbpf with fixes
+ rm -rf src/cc/libbpf
+ mv ../libbpf* src/cc/libbpf
}
bcc-tools_package() {
short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b94..b75095dfb136a0 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
# Template file for 'benchmark'
pkgname=benchmark
-version=1.5.5
+version=1.5.6
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz "
license="Apache-2.0"
homepage="https://github.com/google/benchmark/"
distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
benchmark-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba14..c10b2b2e89d090 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
# Template file for 'bluedevil'
pkgname=bluedevil
-version=5.22.3
+version=5.22.4
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John "
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/bluedevil"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65d8..eba7615720f41d 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
# Template file for 'bluez-qt5'
pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
revision=1
wrksrc="${pkgname%5}-${version}"
build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John "
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/bluez-qt"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
do_check() {
cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afdf2..f53a74678d11bd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
# Template file for 'bmake'
pkgname=bmake
-version=20210621
+version=20210808
revision=1
create_wrksrc=yes
short_desc="Portable version of the NetBSD make build tool"
maintainer="Orphaned "
license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
python_version=3
do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a7328..00000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c 2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c 2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include
-
- #include
--#include
- #include
- #include
- #include
---- a/src/mpv/audio/out/ao_lavc.c 2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c 2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include
-
- #include
--#include
-
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c 2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c 2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include
-
- #include
--#include
- #include
- #include
- #include
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654f4..00000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include