Add libvpx7-1.10 package, move libvpx-{devel,tools} to libvpx7, update telegram-desktop

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

srcpkgs/libvpx-devel

@@ -1 +1 @@
-libvpx6
+libvpx7

srcpkgs/libvpx-tools

@@ -1 +1 @@
-libvpx6
+libvpx7

srcpkgs/libvpx6-devel

@@ -0,0 +1 @@
+libvpx6

srcpkgs/libvpx6-tools

@@ -0,0 +1 @@
+libvpx6

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() {

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 <daniel@octaforge.org>"
+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
+	}
+}

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"

srcpkgs/tg_owt/template

@@ -1,30 +1,28 @@
 # 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"
 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 <me@johnnynator.dev>"
 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
 }