diff --git a/common/shlibs b/common/shlibs index dc044fe2fcdaa1..91b8e0fa73ebc7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1876,7 +1876,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.215 x265-4.1_1 +libx265.so.216 x265-4.2_1 libQt5Xdg.so.3 libqt5xdg-3.2.0_1 libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1 libQt6Xdg.so.4 libqtxdg-4.0.0_1 diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template index 3e2c7816c91c95..0c234c3124caa0 100644 --- a/srcpkgs/avidemux/template +++ b/srcpkgs/avidemux/template @@ -1,7 +1,7 @@ # Template file for 'avidemux' pkgname=avidemux version=2.8.1 -revision=5 +revision=6 # Can't be compiled for aarch64, arm* or mips* archs="x86_64* i686*" hostmakedepends="cmake-bootstrap pkg-config qt5-host-tools qt5-devel tar yasm" diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template index 9d8c95d314d2e2..6a1d2f508f06f3 100644 --- a/srcpkgs/digikam/template +++ b/srcpkgs/digikam/template @@ -1,7 +1,7 @@ # Template file for 'digikam' pkgname=digikam version=9.1.0 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake -DENABLE_AKONADICONTACTSUPPORT=ON -DENABLE_KFILEMETADATASUPPORT=ON diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index b500d962b3610e..f1e8a7f02bae8b 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -2,7 +2,7 @@ # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg version=4.4.6 -revision=5 +revision=6 metapackage=yes hostmakedepends="pkg-config perl" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template index c660eaff3343ef..1147af7e0302c4 100644 --- a/srcpkgs/ffmpeg6/template +++ b/srcpkgs/ffmpeg6/template @@ -2,7 +2,7 @@ # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg6 version=6.1.6 -revision=2 +revision=3 hostmakedepends="pkg-config perl" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template index 58b9a57123634d..a5dc79e38acfd9 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -1,7 +1,7 @@ # Template file for 'handbrake' pkgname=handbrake version=1.11.0 -revision=2 +revision=3 build_style=configure configure_args="--force --disable-df-fetch --harden --prefix=/usr $(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)" diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template index bbfc3e966583b1..1101097a7a2ec0 100644 --- a/srcpkgs/libheif/template +++ b/srcpkgs/libheif/template @@ -1,7 +1,7 @@ # Template file for 'libheif' pkgname=libheif version=1.23.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config libaom-tools" makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template index 33d34767901ce4..6c57886b5a8eec 100644 --- a/srcpkgs/rtmpdump/template +++ b/srcpkgs/rtmpdump/template @@ -1,42 +1,41 @@ # Template file for 'rtmpdump' pkgname=rtmpdump -version=2.4.20161210 -revision=10 -_patchlevel=${version##*.} -create_wrksrc=yes +version=2.6 +revision=1 makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')" short_desc="Toolkit for RTMP streams" maintainer="Orphaned " -license="GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="http://rtmpdump.mplayerhq.hu/" -distfiles="https://repo-default.voidlinux.org/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz" -checksum=d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f - -CFLAGS="-Wno-unused-const-variable -Wno-unused-but-set-variable" -case "$XBPS_TARGET_MACHINE" in - *-musl) CFLAGS+=" -D__LINUX_NETFILTER_H" -esac +license="GPL-2.0-or-later" +homepage="https://rtmpdump.mplayerhq.hu/" +changelog="https://rtmpdump.mplayerhq.hu/ChangeLog" +# git clone git://git.ffmpeg.org/rtmpdump; cd rtmpdump +# git archive --prefix rtmpdump-2.6/ -o rtmpdump-2.6.tar.xz v2.6 +distfiles="https://devspace.voidlinux.org/duncaen/rtmpdump-${version}.tar.xz" +checksum=157da049da3ebfaaff7976970028be755e059d20dfa89eb92329ac44865cb732 build_options="gnutls" build_options_default="gnutls" do_build() { - make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs} + make ${makejobs} CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" } + do_install() { - vmkdir usr/lib make prefix=/usr sbindir=/usr/bin mandir=/usr/share/man DESTDIR=$DESTDIR install } librtmp_package() { short_desc+=" - shared library" + license="LGPL-2.1-or-later" pkg_install() { vmove "usr/lib/*.so.*" } } + librtmp-devel_package() { depends="${makedepends} librtmp>=${version}_${revision}" short_desc+=" - development files" + license="LGPL-2.1-or-later" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template index b74584a4e9ca9a..aaaf71cff742c9 100644 --- a/srcpkgs/runc/template +++ b/srcpkgs/runc/template @@ -1,6 +1,6 @@ # Template file for 'runc' pkgname=runc -version=1.4.2 +version=1.5.1 revision=1 build_style=go go_import_path=github.com/opencontainers/runc @@ -15,8 +15,8 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/opencontainers/runc" changelog="https://github.com/opencontainers/runc/raw/main/CHANGELOG.md" -distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc.tar.xz" -checksum=cc7b4630a2940cc844f01da81765a3fe6713ceb7f0dbf287f6b20fd89f55d05f +distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc-${version}.tar.xz" +checksum=db743b39fd7de8da88adce5a61a54529a494928cd59227fffb622f5cb4ba6ef9 post_build() { make man diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template index 500053851063e8..c439eb993c7333 100644 --- a/srcpkgs/twitch-cli/template +++ b/srcpkgs/twitch-cli/template @@ -1,6 +1,6 @@ # Template file for 'twitch-cli' pkgname=twitch-cli -version=1.1.24 +version=1.1.25 revision=1 build_style=go go_import_path="github.com/twitchdev/twitch-cli" @@ -9,5 +9,8 @@ short_desc="Official Twitch CLI to make developing on Twitch easier" maintainer="Orphaned " license="Apache-2.0" homepage="https://dev.twitch.tv/docs/cli" -distfiles="https://github.com/twitchdev/twitch-cli/archive/refs/tags/v$version.tar.gz" -checksum=8f796e1413b5b9f6d159cbdf5296acb22851822c024f6545acd707a71219a239 +distfiles="https://github.com/twitchdev/twitch-cli/archive/refs/tags/v${version}.tar.gz" +checksum=63d13cd54b64e17237650d7aaadb1453fe28565f54111be056beb24d58831c67 + +# for pread64/pwrite64 in musl +CPPFLAGS="-D_LARGEFILE64_SOURCE" diff --git a/srcpkgs/ubridge/patches/musl-fixes.patch b/srcpkgs/ubridge/patches/musl-fixes.patch new file mode 100644 index 00000000000000..f0d923c7f5dad8 --- /dev/null +++ b/srcpkgs/ubridge/patches/musl-fixes.patch @@ -0,0 +1,13 @@ +Source: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/ubridge/musl-fixes.patch +diff --git a/src/netlink/nl.h b/src/netlink/nl.h +index 34aeb36..d25a65d 100644 +--- a/src/netlink/nl.h ++++ b/src/netlink/nl.h +@@ -26,6 +26,7 @@ + /* + * Use this as a good size to allocate generic netlink messages + */ ++#include + #ifndef PAGE_SIZE + #define PAGE_SIZE 4096 + #endif diff --git a/srcpkgs/ubridge/template b/srcpkgs/ubridge/template index c740953af14dbb..b3fc5199808dd7 100644 --- a/srcpkgs/ubridge/template +++ b/srcpkgs/ubridge/template @@ -1,6 +1,6 @@ # Template file for 'ubridge' pkgname=ubridge -version=1.0.0 +version=1.1.1 revision=1 build_style=gnu-makefile make_build_args="SYSTEM_INIPARSER=1" @@ -9,10 +9,9 @@ short_desc="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/GNS3/ubridge" +changelog="https://github.com/GNS3/ubridge/releases" distfiles="https://github.com/GNS3/ubridge/archive/refs/tags/v${version}.tar.gz" -checksum=56e66a3588f7fbba3bf1c66b68c96c088015fea6526205d0fc3fa0c7198f6a1f - -CFLAGS="-DLINUX_RAW" +checksum=9bf68e46fd68f262ccd3f4d5244d50f44fe3a4f09c57cddc4670fa167a0380d8 do_install() { vbin ubridge diff --git a/srcpkgs/urlscan/template b/srcpkgs/urlscan/template index 74c6a520570b60..278ab31aef7deb 100644 --- a/srcpkgs/urlscan/template +++ b/srcpkgs/urlscan/template @@ -1,6 +1,6 @@ # Template file for 'urlscan' pkgname=urlscan -version=1.0.8 +version=1.0.9 revision=1 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" @@ -11,4 +11,4 @@ license="GPL-2.0-or-later" homepage="https://github.com/firecat53/urlscan" changelog="https://github.com/firecat53/urlscan/releases" distfiles="${PYPI_SITE}/u/urlscan/urlscan-${version}.tar.gz" -checksum=15c1dc59a2c0c9d697acec1e4823f4a801aa79c176eff603c93d79b413003757 +checksum=067087895077762807ff028ed332e4e1ab6e1a7c249188dc846f6d160afba7ff diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 97aff2445a2b8f..cd2080d3eda611 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.23 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread diff --git a/srcpkgs/volctl/patches/fix-32bit.patch b/srcpkgs/volctl/patches/fix-32bit.patch new file mode 100644 index 00000000000000..5a5ab632095872 --- /dev/null +++ b/srcpkgs/volctl/patches/fix-32bit.patch @@ -0,0 +1,31 @@ +--- a/src/ui/x11.rs ++++ b/src/ui/x11.rs +@@ -1,5 +1,5 @@ + use std::ffi::CString; +-use std::os::raw::c_int; ++use std::os::raw::{c_int, c_long}; + + use gdk_x11::{ + X11Display, +@@ -160,8 +160,8 @@ + s1: xlib::Atom, + s2: xlib::Atom, + ) { +- const NET_WM_STATE_ADD: i64 = 1; +- const NET_WM_STATE_APP: i64 = 1; ++ const NET_WM_STATE_ADD: c_long = 1; ++ const NET_WM_STATE_APP: c_long = 1; + + unsafe { + let c = ctx.xlib(); +@@ -173,8 +173,8 @@ + event.client_message.format = 32; + let data = event.client_message.data.as_longs_mut(); + data[0] = NET_WM_STATE_ADD; +- data[1] = s1 as i64; +- data[2] = s2 as i64; ++ data[1] = s1 as c_long; ++ data[2] = s2 as c_long; + data[3] = NET_WM_STATE_APP; + data[4] = 0; + diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template index e2f8483c6dcf38..691a8e16c7f01b 100644 --- a/srcpkgs/volctl/template +++ b/srcpkgs/volctl/template @@ -1,14 +1,19 @@ # Template file for 'volctl' pkgname=volctl -version=0.9.3 -revision=4 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-pulsectl" -short_desc="Lightweight volume control for pulseaudio in your systray" +version=1.0.0 +revision=1 +build_style=cargo +hostmakedepends="pkg-config" +makedepends="libglib-devel pango-devel gtk4-devel gtk4-layer-shell-devel pulseaudio-devel" +short_desc="Per-application volume control and OSD for Linux desktops" maintainer="Orphaned " -license="GPL-2.0-only" +license="GPL-3.0-or-later" homepage="https://buzz.github.io/volctl/" +changelog="https://raw.githubusercontent.com/buzz/volctl/refs/heads/main/CHANGELOG.md" distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz" -checksum=43bea60968c0163be3107a9730671b0c29d1a4477eb9ea468dfc6878f7ac4f88 -make_check=no # no tests, but check fails with a non-zero return code +checksum=b951f533f95ab2dfa7edb491c118c195dc56c10c924c0f9a5c339c8bcd5b83d3 + +post_install() { + vinstall data/apps.volctl.gschema.xml 644 usr/share/glib-2.0/schemas + vinstall data/volctl.desktop 644 usr/share/applications +} diff --git a/srcpkgs/x265/patches/cmake-4.patch b/srcpkgs/x265/patches/cmake-4.patch deleted file mode 100644 index 15e2d363e07f6c..00000000000000 --- a/srcpkgs/x265/patches/cmake-4.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -6,15 +6,9 @@ if(NOT CMAKE_BUILD_TYPE) - FORCE) - endif() - message(STATUS "cmake version ${CMAKE_VERSION}") --if(POLICY CMP0025) -- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang --endif() - if(POLICY CMP0042) - cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH - endif() --if(POLICY CMP0054) -- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted --endif() - - project (x265) - cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8 diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template index d73d7a7254ea54..641b9950ee2a86 100644 --- a/srcpkgs/x265/template +++ b/srcpkgs/x265/template @@ -1,6 +1,6 @@ # Template file for 'x265' pkgname=x265 -version=4.1 +version=4.2 revision=1 build_wrksrc=source build_style=cmake @@ -10,8 +10,9 @@ short_desc="Open Source H.265/HEVC video encoder" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://x265.org/" -distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz" -checksum=7d23cdcdbd510728202c0dfbf7c51eda26a395de2096c504c2b10d6035711102 +changelog="https://raw.githubusercontent.com/Multicorewareinc/x265/refs/heads/master/doc/reST/releasenotes.rst" +distfiles="https://github.com/Multicorewareinc/x265/releases/download/${version}/x265_${version}.tar.gz" +checksum=40b1ea0453e0309f0eba934e0ddf533f8f6295966679e8894e8f1c1c8d5e1210 build_options="altivec assembly"