From 8bb0d63ba584516ccf1531572c89ca22f93fc2f0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 13:52:39 +0200 Subject: [PATCH 01/19] libvpx6: remove, obsolete. --- common/shlibs | 1 - srcpkgs/libvpx6-devel | 1 - srcpkgs/libvpx6-tools | 1 - srcpkgs/libvpx6/template | 62 ---------------------------------------- 4 files changed, 65 deletions(-) delete mode 120000 srcpkgs/libvpx6-devel delete mode 120000 srcpkgs/libvpx6-tools delete mode 100644 srcpkgs/libvpx6/template diff --git a/common/shlibs b/common/shlibs index 13a439c085896..7412c01b8f0db 100644 --- a/common/shlibs +++ b/common/shlibs @@ -827,7 +827,6 @@ libclutter-gtk-1.0.so.0 clutter-gtk-1.1.2_1 libchamplain-0.12.so.0 libchamplain-0.12.5_2 libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2 libshumate-1.0.so.1 libshumate-1.0.0_1 -libvpx.so.6 libvpx6-1.8.0_1 libvpx.so.7 libvpx7-1.11.0_1 libatspi.so.0 at-spi2-core-1.91.91_1 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1 diff --git a/srcpkgs/libvpx6-devel b/srcpkgs/libvpx6-devel deleted file mode 120000 index 3f7ec763b5e37..0000000000000 --- a/srcpkgs/libvpx6-devel +++ /dev/null @@ -1 +0,0 @@ -libvpx6 \ No newline at end of file diff --git a/srcpkgs/libvpx6-tools b/srcpkgs/libvpx6-tools deleted file mode 120000 index 3f7ec763b5e37..0000000000000 --- a/srcpkgs/libvpx6-tools +++ /dev/null @@ -1 +0,0 @@ -libvpx6 \ No newline at end of file diff --git a/srcpkgs/libvpx6/template b/srcpkgs/libvpx6/template deleted file mode 100644 index c57d74f91bfdd..0000000000000 --- a/srcpkgs/libvpx6/template +++ /dev/null @@ -1,62 +0,0 @@ -# Template file for 'libvpx6' -# updates generally break abi, so if you update this, -# have fun rebuilding everything -pkgname=libvpx6 -reverts="1.10.0_1" -version=1.9.0 -revision=3 -hostmakedepends="perl yasm" -short_desc="VP8 and VP9 video codec" -maintainer="Orphaned " -license="BSD-3-Clause-Clear" -homepage="http://www.webmproject.org" -distfiles="https://github.com/webmproject/libvpx/archive/v${version}.tar.gz" -checksum=d279c10e4b9316bf11a570ba16c3d55791e1ad6faa4404c67422eb631782c80a -replaces="libvpx<1.8.0" - -do_configure() { - export LD="$CC" - local target args - - case "$XBPS_TARGET_MACHINE" in - x86_64*) target="x86_64-linux-gcc" ;; - i686*) target="x86-linux-gcc" ;; - armv7*) target="armv7-linux-gcc"; args="--disable-neon" ;; - aarch64*) target="arm64-linux-gcc" ;; - *) target="generic-gnu";; - esac - CFLAGS+=" -fPIC" - - ./configure --enable-vp8 --enable-vp9 \ - --enable-experimental \ - --enable-runtime-cpu-detect --enable-shared \ - --enable-postproc --enable-pic --disable-install-docs \ - --disable-install-srcs --as=yasm ${args} --target=${target} -} - -do_build() { - make ${makejobs} -} - -do_install() { - make DIST_DIR=${DESTDIR}/usr install - vlicense LICENSE -} - -libvpx6-tools_package() { - short_desc+=" - tools" - pkg_install() { - vmove usr/bin - } -} - -libvpx6-devel_package() { - depends="libvpx6>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} From d5b8961c5f3e3f8dcde07f013933e3496fa452fd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 13:55:49 +0200 Subject: [PATCH 02/19] libvpx: update to 1.13.0. Renamed from libvpx7. --- common/shlibs | 2 +- srcpkgs/libvpx-devel | 2 +- srcpkgs/libvpx-tools | 2 +- .../{libvpx7 => libvpx}/patches/CVE-2023-5217.patch | 0 srcpkgs/{libvpx7 => libvpx}/template | 10 +++++----- 5 files changed, 8 insertions(+), 8 deletions(-) rename srcpkgs/{libvpx7 => libvpx}/patches/CVE-2023-5217.patch (100%) rename srcpkgs/{libvpx7 => libvpx}/template (89%) diff --git a/common/shlibs b/common/shlibs index 7412c01b8f0db..ed1b717536e6a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -827,7 +827,7 @@ libclutter-gtk-1.0.so.0 clutter-gtk-1.1.2_1 libchamplain-0.12.so.0 libchamplain-0.12.5_2 libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2 libshumate-1.0.so.1 libshumate-1.0.0_1 -libvpx.so.7 libvpx7-1.11.0_1 +libvpx.so.8 libvpx-1.13.0_1 libatspi.so.0 at-spi2-core-1.91.91_1 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1 libvte-2.91.so.0 vte3-0.68.0_1 diff --git a/srcpkgs/libvpx-devel b/srcpkgs/libvpx-devel index c7fce52cd7e0e..230e0dffa9e9a 120000 --- a/srcpkgs/libvpx-devel +++ b/srcpkgs/libvpx-devel @@ -1 +1 @@ -libvpx7 \ No newline at end of file +libvpx \ No newline at end of file diff --git a/srcpkgs/libvpx-tools b/srcpkgs/libvpx-tools index c7fce52cd7e0e..230e0dffa9e9a 120000 --- a/srcpkgs/libvpx-tools +++ b/srcpkgs/libvpx-tools @@ -1 +1 @@ -libvpx7 \ No newline at end of file +libvpx \ No newline at end of file diff --git a/srcpkgs/libvpx7/patches/CVE-2023-5217.patch b/srcpkgs/libvpx/patches/CVE-2023-5217.patch similarity index 100% rename from srcpkgs/libvpx7/patches/CVE-2023-5217.patch rename to srcpkgs/libvpx/patches/CVE-2023-5217.patch diff --git a/srcpkgs/libvpx7/template b/srcpkgs/libvpx/template similarity index 89% rename from srcpkgs/libvpx7/template rename to srcpkgs/libvpx/template index db2d1e457ee53..913d5aa526b21 100644 --- a/srcpkgs/libvpx7/template +++ b/srcpkgs/libvpx/template @@ -1,16 +1,16 @@ -# Template file for 'libvpx7' +# Template file for 'libvpx' # updates generally break abi, so if you update this, # have fun rebuilding everything -pkgname=libvpx7 -version=1.11.0 -revision=2 +pkgname=libvpx +version=1.13.0 +revision=1 hostmakedepends="perl yasm" short_desc="VP8 and VP9 video codec" maintainer="Orphaned " license="BSD-3-Clause-Clear" homepage="http://www.webmproject.org" distfiles="https://github.com/webmproject/libvpx/archive/v${version}.tar.gz" -checksum=965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83 +checksum=cb2a393c9c1fae7aba76b950bb0ad393ba105409fe1a147ccd61b0aaa1501066 do_configure() { export LD="$CC" From 4315c0e5c7689884123815eeff6cf3792f22c820 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:21 +0200 Subject: [PATCH 03/19] utox: rebuild for libvpx-1.13.0. --- srcpkgs/utox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/utox/template b/srcpkgs/utox/template index 7178ea7aac138..d355ae72de2b8 100644 --- a/srcpkgs/utox/template +++ b/srcpkgs/utox/template @@ -1,7 +1,7 @@ # Template file for 'utox' pkgname=utox version=0.18.1 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_ASAN=OFF" hostmakedepends="pkg-config" From 1db261e51bc57c751e1538168ccd689b6649f171 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:21 +0200 Subject: [PATCH 04/19] baresip: rebuild for libvpx-1.13.0. --- srcpkgs/baresip/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template index f1bd1817048b5..b21e22334316e 100644 --- a/srcpkgs/baresip/template +++ b/srcpkgs/baresip/template @@ -1,7 +1,7 @@ # Template file for 'baresip' pkgname=baresip version=2.10.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config glib-devel" makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel From 35e5765c2bfa4ee1dc8ea6664c7f5e510d38b9ee Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:22 +0200 Subject: [PATCH 05/19] firefox: rebuild for libvpx-1.13.0. --- srcpkgs/firefox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 4c5ea87148a01..1a499c52aa2d1 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -4,7 +4,7 @@ # pkgname=firefox version=118.0 -revision=1 +revision=2 build_helper="rust" short_desc="Mozilla Firefox web browser" maintainer="Duncaen " From 28d9a11c5b629f833c11d341c73b8099f0cb1dd1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:22 +0200 Subject: [PATCH 06/19] firefox-esr: rebuild for libvpx-1.13.0. --- srcpkgs/firefox-esr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 2ddcc411b92eb..baa8e8455f224 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -5,7 +5,7 @@ # pkgname=firefox-esr version=115.0.2 -revision=1 +revision=2 build_helper="rust" short_desc="Mozilla Firefox web browser - Extended Support Release" maintainer="Orphaned " From ef9959165a6882c6c874d1db445846354aab2c1d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:22 +0200 Subject: [PATCH 07/19] gst-plugins-good1: rebuild for libvpx-1.13.0. --- srcpkgs/gst-plugins-good1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index 630ce38571242..4ffda61fb8b47 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-good1' pkgname=gst-plugins-good1 version=1.22.5 -revision=1 +revision=2 build_style=meson configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled $(vopt_feature gtk3 gtk3)" From 0733a622beccda57ec5cccd1eb21895b211af73e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:22 +0200 Subject: [PATCH 08/19] gzdoom: rebuild for libvpx-1.13.0. --- srcpkgs/gzdoom/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template index 4c8fe9effc86e..c2c3adcbb8b48 100644 --- a/srcpkgs/gzdoom/template +++ b/srcpkgs/gzdoom/template @@ -1,7 +1,7 @@ # Template file for 'gzdoom' pkgname=gzdoom version=4.10.0 -revision=1 +revision=2 archs="~i686* ~arm*" build_style=cmake configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF" From f25a8fd7828240ae6996116cffee9d4caa55f785 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:22 +0200 Subject: [PATCH 09/19] ffmpeg: rebuild for libvpx-1.13.0. --- srcpkgs/ffmpeg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index ae26496e79293..d2f8def0e25f7 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.4 -revision=2 +revision=3 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned " license="GPL-3.0-or-later" From 87daff944167e94c0a5dfd5f57aa862a6bf75f4b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:22 +0200 Subject: [PATCH 10/19] libopenglrecorder: rebuild for libvpx-1.13.0. --- srcpkgs/libopenglrecorder/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libopenglrecorder/template b/srcpkgs/libopenglrecorder/template index b0b06ee3797e8..46da80914efc7 100644 --- a/srcpkgs/libopenglrecorder/template +++ b/srcpkgs/libopenglrecorder/template @@ -1,7 +1,7 @@ # Template file for 'libopenglrecorder' pkgname=libopenglrecorder version=0.1.0 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config" makedepends="libvpx-devel libogg-devel libjpeg-turbo-devel libvorbis-devel pulseaudio-devel" From 5611c063b2b7f42072153159cd899fcb39f6357b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:23 +0200 Subject: [PATCH 11/19] mediastreamer: rebuild for libvpx-1.13.0. --- srcpkgs/mediastreamer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template index d0e97e858e29a..d29210c1bf9c7 100644 --- a/srcpkgs/mediastreamer/template +++ b/srcpkgs/mediastreamer/template @@ -1,7 +1,7 @@ # Template file for 'mediastreamer' pkgname=mediastreamer version=5.2.6 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0" hostmakedepends="python3" From 0de251806938bb1ecd94048e2df2361f7b1eb7be Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:23 +0200 Subject: [PATCH 12/19] qt5-webengine: rebuild for libvpx-1.13.0. --- srcpkgs/qt5-webengine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template index 679d0fa2ad84b..84de5b12ecdda 100644 --- a/srcpkgs/qt5-webengine/template +++ b/srcpkgs/qt5-webengine/template @@ -1,7 +1,7 @@ # Template file for 'qt5-webengine' pkgname=qt5-webengine version=5.15.11 -revision=4 +revision=5 _version="${version}-lts" _chromium_commit=be349eaf62e77955791d7bf29f893f1e8a37daf4 archs="x86_64* i686* armv[67]* ppc64* aarch64*" From 19ba2d03460c6b033e08098a3e35e85cf7eef07d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:23 +0200 Subject: [PATCH 13/19] qt6-webengine: rebuild for libvpx-1.13.0. --- srcpkgs/qt6-webengine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template index 933ab43f9babd..a92b06c6f0cca 100644 --- a/srcpkgs/qt6-webengine/template +++ b/srcpkgs/qt6-webengine/template @@ -1,7 +1,7 @@ # Template file for 'qt6-webengine' pkgname=qt6-webengine version=6.5.2 -revision=2 +revision=3 build_style=cmake configure_args=" -DQT_FEATURE_webengine_system_ffmpeg=ON From 511fcbba18dcace12dd4e3369622bba3d141abad Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:23 +0200 Subject: [PATCH 14/19] telegram-desktop: rebuild for libvpx-1.13.0. --- srcpkgs/telegram-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 1679ea8b2711c..26a167befd980 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop version=4.10.1 -revision=1 +revision=2 build_style=cmake build_helper="qemu gir" configure_args="-DTDESKTOP_API_ID=209235 From b131ab54eba6e9c10066e2e580720a0de16daae4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:23 +0200 Subject: [PATCH 15/19] thunderbird: rebuild for libvpx-1.13.0. --- srcpkgs/thunderbird/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index e278af633cd67..2400ca23ea8a8 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -4,7 +4,7 @@ # pkgname=thunderbird version=115.1.0 -revision=1 +revision=2 build_helper="rust" short_desc="Standalone Mail/News reader" maintainer="Érico Nogueira " From b5e83904809548badcbd38ed05ca4e70af60d5a0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:23 +0200 Subject: [PATCH 16/19] toxcore: rebuild for libvpx-1.13.0. --- srcpkgs/toxcore/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/toxcore/template b/srcpkgs/toxcore/template index aa739c67bac2c..7776430c29800 100644 --- a/srcpkgs/toxcore/template +++ b/srcpkgs/toxcore/template @@ -1,7 +1,7 @@ # Template file for 'toxcore' pkgname=toxcore version=0.2.18 -revision=1 +revision=2 build_style=cmake configure_args="-DMUST_BUILD_TOXAV=ON -DBUILD_TOXAV=ON -DDHT_BOOTSTRAP=OFF -DBOOTSTRAP_DAEMON=ON" From 60bcbe082926748a8fb0da1e4a0a2adb6b09fc92 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:24 +0200 Subject: [PATCH 17/19] toxic: rebuild for libvpx-1.13.0. --- srcpkgs/toxic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/toxic/template b/srcpkgs/toxic/template index a4b5ae76b99b0..f9aae0be988e8 100644 --- a/srcpkgs/toxic/template +++ b/srcpkgs/toxic/template @@ -1,7 +1,7 @@ # Template file for 'toxic' pkgname=toxic version=0.11.3 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="toxcore-devel libX11-devel freealut-devel libconfig-devel From 48c1f315394459d5cf1932edc3edda68174dd66f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:24 +0200 Subject: [PATCH 18/19] virtualbox-ose: rebuild for libvpx-1.13.0. --- srcpkgs/virtualbox-ose/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index b83b44985658c..3f3ecc696dbb7 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,7 +1,7 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose version=7.0.10 -revision=3 +revision=4 short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Orphaned " license="GPL-2.0-only, CDDL-1.0" From be251733c6437cdcc15de32d6a859433b57c19fa Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Sep 2023 14:04:24 +0200 Subject: [PATCH 19/19] xpra: rebuild for libvpx-1.13.0. --- srcpkgs/xpra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index 834ff20565b4b..a467e13861bbc 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,7 +1,7 @@ # Template file for 'xpra' pkgname=xpra version=5.0.2 -revision=1 +revision=2 build_style=python3-module make_build_args="--without-cuda_kernels --without-cuda_rebuild" make_install_args="$(vopt_with docs) ${make_build_args}"