From 3d6fcd7bf5b06c87bd99dea35f73b1c0542293ea Mon Sep 17 00:00:00 2001 From: triallax Date: Mon, 24 Apr 2023 22:17:25 +0100 Subject: [PATCH 1/2] libwebp: update to 1.3.0. --- common/shlibs | 1 + srcpkgs/libsharpyuv | 1 + srcpkgs/libsharpyuv-devel | 1 + srcpkgs/libwebp/template | 28 +++++++++++++++++++++++----- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 120000 srcpkgs/libsharpyuv create mode 120000 srcpkgs/libsharpyuv-devel diff --git a/common/shlibs b/common/shlibs index 21cafd798519..cb22b40e83f9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -865,6 +865,7 @@ libquadmath.so.0 libquadmath-4.4.0_1 libgfortran.so.5 libgfortran-8.2.0_1 libgnarl-12.so libada-12.2.0_1 libgnat-12.so libada-12.2.0_1 +libsharpyuv.so.0 libsharpyuv-1.3.0_1 libwebp.so.7 libwebp-0.6.0_1 libwebpmux.so.3 libwebp-0.6.0_1 libwebpdemux.so.2 libwebp-0.5.0_1 diff --git a/srcpkgs/libsharpyuv b/srcpkgs/libsharpyuv new file mode 120000 index 000000000000..41871e71d6b8 --- /dev/null +++ b/srcpkgs/libsharpyuv @@ -0,0 +1 @@ +libwebp \ No newline at end of file diff --git a/srcpkgs/libsharpyuv-devel b/srcpkgs/libsharpyuv-devel new file mode 120000 index 000000000000..41871e71d6b8 --- /dev/null +++ b/srcpkgs/libsharpyuv-devel @@ -0,0 +1 @@ +libwebp \ No newline at end of file diff --git a/srcpkgs/libwebp/template b/srcpkgs/libwebp/template index 6a938186d803..0727f099042f 100644 --- a/srcpkgs/libwebp/template +++ b/srcpkgs/libwebp/template @@ -1,7 +1,7 @@ # Template file for 'libwebp' pkgname=libwebp -version=1.2.4 -revision=2 +version=1.3.0 +revision=1 build_style=gnu-configure configure_args="--enable-libwebpmux --enable-libwebpdemux --enable-libwebpdecoder" hostmakedepends="pkg-config" @@ -10,8 +10,9 @@ short_desc="WebP image format" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://developers.google.com/speed/webp/" -distfiles="http://downloads.webmproject.org/releases/webp/${pkgname}-${version}.tar.gz" -checksum=7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df +changelog="https://chromium.googlesource.com/webm/libwebp/+/refs/heads/main/NEWS" +distfiles="http://downloads.webmproject.org/releases/webp/libwebp-${version}.tar.gz" +checksum=64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c case "$XBPS_TARGET_MACHINE" in armv6*) configure_args+=" --disable-neon";; @@ -32,7 +33,7 @@ libwebp-tools_package() { } libwebp-devel_package() { - depends="${makedepends/libfreeglut-devel/} ${sourcepkg}>=${version}_${revision}" + depends="${makedepends/libfreeglut-devel/} libsharpyuv-devel>=${version}_${revision} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -41,3 +42,20 @@ libwebp-devel_package() { vmove "usr/lib/*.a" } } + +libsharpyuv_package() { + short_desc="Library to expose libwebp's sharpyuv functionality" + pkg_install() { + vmove "usr/lib/libsharpyuv.so.*" + } +} + +libsharpyuv-devel_package() { + short_desc="Library to expose libwebp's sharpyuv functionality - development files" + pkg_install() { + vmove usr/include/webp/sharpyuv + vmove usr/lib/pkgconfig/libsharpyuv.pc + vmove usr/lib/libsharpyuv.so + vmove usr/lib/libsharpyuv.a + } +} From 487ca3424e06a99a9a737be0a1d8c8e6513985a2 Mon Sep 17 00:00:00 2001 From: triallax Date: Mon, 24 Apr 2023 22:21:37 +0100 Subject: [PATCH 2/2] libavif: enable sharpyuv support. --- srcpkgs/libavif/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libavif/template b/srcpkgs/libavif/template index 1edeb56fc725..2aa05423e208 100644 --- a/srcpkgs/libavif/template +++ b/srcpkgs/libavif/template @@ -1,13 +1,13 @@ # Template file for 'libavif' pkgname=libavif version=0.11.1 -revision=2 +revision=3 build_style=cmake configure_args="-DAVIF_BUILD_APPS=ON -DAVIF_BUILD_GDK_PIXBUF=ON -DAVIF_CODEC_AOM=ON $(vopt_bool dav1d AVIF_CODEC_DAV1D) $(vopt_bool rav1e AVIF_CODEC_RAV1E) $(vopt_bool svt AVIF_CODEC_SVT)" hostmakedepends="gdk-pixbuf-devel pkg-config" -makedepends="gdk-pixbuf-devel libaom-devel +makedepends="gdk-pixbuf-devel libaom-devel libsharpyuv-devel libjpeg-turbo-devel libpng-devel zlib-devel $(vopt_if dav1d "libdav1d-devel") $(vopt_if rav1e "rav1e-devel") $(vopt_if svt "libsvt-av1-devel")" @@ -15,7 +15,7 @@ short_desc="Library for encoding and decoding .avif files" maintainer="Leah Neukirchen " license="BSD-2-Clause" homepage="https://github.com/AOMediaCodec/libavif" -changelog="https://github.com/AOMediaCodec/libavif/blob/main/CHANGELOG.md" +changelog="https://raw.githubusercontent.com/AOMediaCodec/libavif/main/CHANGELOG.md" distfiles="https://github.com/AOMediaCodec/libavif/archive/refs/tags/v${version}.tar.gz" checksum=0eb49965562a0e5e5de58389650d434cff32af84c34185b6c9b7b2fccae06d4e @@ -39,7 +39,7 @@ libavif-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig vmove usr/lib/cmake }