From 2a1b70f6de14a385e506c40151a216cdf8bc5901 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 23:23:17 +0100 Subject: [PATCH 1/4] libvpx: rename subpackages to libvpx6-* --- srcpkgs/{libvpx-devel => libvpx6-devel} | 0 srcpkgs/{libvpx-tools => libvpx6-tools} | 0 srcpkgs/libvpx6/template | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename srcpkgs/{libvpx-devel => libvpx6-devel} (100%) rename srcpkgs/{libvpx-tools => libvpx6-tools} (100%) diff --git a/srcpkgs/libvpx-devel b/srcpkgs/libvpx6-devel similarity index 100% rename from srcpkgs/libvpx-devel rename to srcpkgs/libvpx6-devel diff --git a/srcpkgs/libvpx-tools b/srcpkgs/libvpx6-tools similarity index 100% rename from srcpkgs/libvpx-tools rename to srcpkgs/libvpx6-tools diff --git a/srcpkgs/libvpx6/template b/srcpkgs/libvpx6/template index 8084243cc21d..a0e31b29ab81 100644 --- a/srcpkgs/libvpx6/template +++ b/srcpkgs/libvpx6/template @@ -4,7 +4,7 @@ pkgname=libvpx6 reverts="1.10.0_1" version=1.9.0 -revision=2 +revision=3 wrksrc=libvpx-${version} hostmakedepends="perl yasm" short_desc="VP8 and VP9 video codec" @@ -44,14 +44,14 @@ do_install() { vlicense LICENSE } -libvpx-tools_package() { +libvpx6-tools_package() { short_desc+=" - tools" pkg_install() { vmove usr/bin } } -libvpx-devel_package() { +libvpx6-devel_package() { depends="libvpx6>=${version}_${revision}" short_desc+=" - development files" pkg_install() { From a800f3196031803b55095e386312f4a181c1f405 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 15:30:50 +0100 Subject: [PATCH 2/4] New package: libvpx7-1.11.0 --- common/shlibs | 1 + srcpkgs/libvpx-devel | 1 + srcpkgs/libvpx-tools | 1 + srcpkgs/libvpx7/template | 61 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 120000 srcpkgs/libvpx-devel create mode 120000 srcpkgs/libvpx-tools create mode 100644 srcpkgs/libvpx7/template diff --git a/common/shlibs b/common/shlibs index f26b9bab58fd..cca89aacb5e5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -818,6 +818,7 @@ libchamplain-0.12.so.0 libchamplain-0.12.5_2 libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2 libvpx.so.5 libvpx5-1.7.0_1 libvpx.so.6 libvpx6-1.8.0_1 +libvpx.so.7 libvpx7-1.11.0_1 libXevie.so.1 libXevie-1.0.2_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/libvpx-devel b/srcpkgs/libvpx-devel new file mode 120000 index 000000000000..c7fce52cd7e0 --- /dev/null +++ b/srcpkgs/libvpx-devel @@ -0,0 +1 @@ +libvpx7 \ No newline at end of file diff --git a/srcpkgs/libvpx-tools b/srcpkgs/libvpx-tools new file mode 120000 index 000000000000..c7fce52cd7e0 --- /dev/null +++ b/srcpkgs/libvpx-tools @@ -0,0 +1 @@ +libvpx7 \ No newline at end of file diff --git a/srcpkgs/libvpx7/template b/srcpkgs/libvpx7/template new file mode 100644 index 000000000000..3526e2d28538 --- /dev/null +++ b/srcpkgs/libvpx7/template @@ -0,0 +1,61 @@ +# Template file for 'libvpx7' +# updates generally break abi, so if you update this, +# have fun rebuilding everything +pkgname=libvpx7 +version=1.11.0 +revision=1 +wrksrc=libvpx-${version} +hostmakedepends="perl yasm" +short_desc="VP8 and VP9 video codec" +maintainer="q66 " +license="BSD-3-Clause-Clear" +homepage="http://www.webmproject.org" +distfiles="https://github.com/webmproject/libvpx/archive/v${version}.tar.gz" +checksum=965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83 + +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 +} + +libvpx-tools_package() { + short_desc+=" - tools" + pkg_install() { + vmove usr/bin + } +} + +libvpx-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} From 2d47be399585f29437dce34fb92cb2467a7076f9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 14:50:31 +0100 Subject: [PATCH 3/4] telegram-desktop: update to 3.6.0. --- srcpkgs/telegram-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index d778d218ef30..f7b028a850cf 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,6 +1,6 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=3.4.8 +version=3.6.0 revision=1 wrksrc="tdesktop-${version}-full" build_style=cmake @@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL" homepage="https://desktop.telegram.org/" changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz" -checksum=6a962a1110bc15c21999832b0151af8125f33a3b6e978461b8f446217c76876e +checksum=a381a4aacaa41beaea31bdd30047ee7b127277d73f7591ccb7ed363a3f048a5c build_options="spellcheck" build_options_default="spellcheck" From 0396fe9c40db60c9ae9e2afc32aa6dfb205aa1b7 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 23:18:52 +0100 Subject: [PATCH 4/4] tg_owt: update to 0.0.0.20220202. --- srcpkgs/tg_owt/template | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template index 6afa56d321e4..16abbd1ec0a3 100644 --- a/srcpkgs/tg_owt/template +++ b/srcpkgs/tg_owt/template @@ -1,10 +1,9 @@ # Template file for 'tg_owt' pkgname=tg_owt -version=0.0.0.20211207 +version=0.0.0.20220202 revision=1 -_commit=d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589 +_commit=d618d0b5ff3e59bea0143e6070481f8f4316a428 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452 -_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9 wrksrc="tg_owt-$_commit" build_style=cmake configure_args="-DBUILD_SHARED_LIBS=OFF -DTG_OWT_ARCH_ARMV7_USE_NEON=OFF" @@ -12,19 +11,18 @@ hostmakedepends="pkg-config yasm protobuf" makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel pipewire-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel libevent-devel libXcomposite-devel libXrandr-devel libXdamage-devel - libXrender-devel libglib-devel" + libepoxy-devel libdrm-devel libXrender-devel libglib-devel libgbm-devel + libvpx7-devel" depends="$makedepends" short_desc="WebRTC library for Telegram-desktop" maintainer="John " license="GPL-3.0-or-later" homepage="https://github.com/desktop-app/tg_owt" distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz - https://chromium.googlesource.com/webm/libvpx/+archive/${_libvpx_commit}.tar.gz https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz" -checksum="@693bf80128946881c9dd357218c806c7e98f02daec02e076f1d123d3e6afc525 - @ea967f58e720be3a8f8105d48fedb983570679c8ced8ffbad48fb673089c7ed9 +checksum="@c6bd3464e917274963c4dc497917987c5e65cc1b7cdc17a0270a66b3c81c3195 @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3" -skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz" +skip_extraction="${_libyuv_commit}.tar.gz" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" @@ -36,5 +34,4 @@ fi post_extract() { bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libyuv_commit}.tar.gz -C ${wrksrc}/src/third_party/libyuv - bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libvpx_commit}.tar.gz -C ${wrksrc}/src/third_party/libvpx/source/libvpx }