[-- Attachment #1: Type: text/plain, Size: 1220 bytes --] There is a new pull request by tibequadorian against master on the void-packages repository https://github.com/tibequadorian/void-packages libaom https://github.com/void-linux/void-packages/pull/35494 libaom: update to 3.2.0. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35494.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-libaom-35494.patch --] [-- Type: text/x-diff, Size: 4187 bytes --] From a3d4feb4d7961ecc40e6ad2b302c5329f4148ebc Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:40:15 +0100 Subject: [PATCH 1/4] libaom: update to 3.2.0. --- common/shlibs | 2 +- srcpkgs/libaom/template | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 39137dbe048f..eddbba7f1a39 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3460,7 +3460,7 @@ libticalcs2.so.12 libticalcs2-1.1.9_1 libhtmlcxx.so.3 htmlcxx-0.86_1 libcss_parser_pp.so.0 htmlcxx-0.86_1 libcss_parser.so.0 htmlcxx-0.86_1 -libaom.so.2 libaom-2.0.0_1 +libaom.so.3 libaom-3.2.0_1 libre.so.1 re-2.0.1_1 libtpms.so.0 libtpms-0.9.0_1 libswtpm_libtpms.so.0 libswtpm-0.6.1_1 diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template index 657301c7309a..e514aafe14f5 100644 --- a/srcpkgs/libaom/template +++ b/srcpkgs/libaom/template @@ -1,9 +1,10 @@ # Template file for 'libaom' pkgname=libaom -version=2.0.1 +version=3.2.0 revision=1 create_wrksrc=yes build_style=cmake +make_cmd=make configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON" hostmakedepends="yasm doxygen perl python" short_desc="AV1 Codec library implementation" @@ -12,7 +13,9 @@ license="BSD-2-Clause" homepage="https://aomedia.org/" changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" -checksum=@b89acd3304531a9f6c99eba13e1de66605893ff8d08abc8c6e0586481a90033a +checksum=@358ac353cb20555aa8ad8faa4d14b98bf89dd05f76c45548d7219673c767d247 + +CMAKE_GENERATOR="Unix Makefiles" # aom segfaults with default musl stack size LDFLAGS="-Wl,-z,stack-size=2097152" @@ -35,11 +38,11 @@ pre_check() { do_check() { cd build - make testdata ${makejobs} + ${make_cmd} testdata ${makejobs} ../test/examples.sh --bin-path examples if [ "$XBPS_CHECK_PKGS" = full ]; then - make runtests ${makejobs} + ${make_cmd} runtests ${makejobs} fi } From 7acb064e9fb9f68ccb003ffea70eab7d0ccb0b58 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:41:56 +0100 Subject: [PATCH 2/4] gst-plugins-bad1: rebuild against libaom-3.2.0. --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 451f73cb9f55..e0d7500c79e8 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 version=1.18.5 -revision=1 +revision=2 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson From 637ba082401017dabba0c8a22cc2933ef86c302c Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:43:57 +0100 Subject: [PATCH 3/4] ffmpeg: rebuild against libaom-3.2.0. --- srcpkgs/ffmpeg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index c5929b4582f3..51bf6a9bc105 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.1 -revision=1 +revision=2 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-3.0-or-later" From 8859efa06b3320a8e7e6e429102bab214b25a5e2 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:45:31 +0100 Subject: [PATCH 4/4] libheif: rebuild against libaom-3.2.0. --- srcpkgs/libheif/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template index 1972c5b8ad7c..48b4279b9f3a 100644 --- a/srcpkgs/libheif/template +++ b/srcpkgs/libheif/template @@ -1,7 +1,7 @@ # Template file for 'libheif' pkgname=libheif version=1.12.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-option-checking" hostmakedepends="automake autoconf pkg-config libtool"
[-- Attachment #1: Type: text/plain, Size: 1225 bytes --] There is an updated pull request by tibequadorian against master on the void-packages repository https://github.com/tibequadorian/void-packages libaom https://github.com/void-linux/void-packages/pull/35494 libaom: update to 3.2.0. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35494.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-libaom-35494.patch --] [-- Type: text/x-diff, Size: 4194 bytes --] From cb4b5f9b574143430fa574160fa02338398576b4 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:40:15 +0100 Subject: [PATCH 1/4] libaom: update to 3.2.0. --- common/shlibs | 2 +- srcpkgs/libaom/template | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 39137dbe048f..eddbba7f1a39 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3460,7 +3460,7 @@ libticalcs2.so.12 libticalcs2-1.1.9_1 libhtmlcxx.so.3 htmlcxx-0.86_1 libcss_parser_pp.so.0 htmlcxx-0.86_1 libcss_parser.so.0 htmlcxx-0.86_1 -libaom.so.2 libaom-2.0.0_1 +libaom.so.3 libaom-3.2.0_1 libre.so.1 re-2.0.1_1 libtpms.so.0 libtpms-0.9.0_1 libswtpm_libtpms.so.0 libswtpm-0.6.1_1 diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template index 657301c7309a..75c2cae19e8d 100644 --- a/srcpkgs/libaom/template +++ b/srcpkgs/libaom/template @@ -1,9 +1,10 @@ # Template file for 'libaom' pkgname=libaom -version=2.0.1 +version=3.2.0 revision=1 create_wrksrc=yes build_style=cmake +make_cmd=make configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON" hostmakedepends="yasm doxygen perl python" short_desc="AV1 Codec library implementation" @@ -12,7 +13,9 @@ license="BSD-2-Clause" homepage="https://aomedia.org/" changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" -checksum=@b89acd3304531a9f6c99eba13e1de66605893ff8d08abc8c6e0586481a90033a +checksum=@358ac353cb20555aa8ad8faa4d14b98bf89dd05f76c45548d7219673c767d247 + +export CMAKE_GENERATOR="Unix Makefiles" # aom segfaults with default musl stack size LDFLAGS="-Wl,-z,stack-size=2097152" @@ -35,11 +38,11 @@ pre_check() { do_check() { cd build - make testdata ${makejobs} + ${make_cmd} testdata ${makejobs} ../test/examples.sh --bin-path examples if [ "$XBPS_CHECK_PKGS" = full ]; then - make runtests ${makejobs} + ${make_cmd} runtests ${makejobs} fi } From 9aadc8f98b5a7f5cb39f67fe1e0cd3548e52065c Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:41:56 +0100 Subject: [PATCH 2/4] gst-plugins-bad1: rebuild against libaom-3.2.0. --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 451f73cb9f55..e0d7500c79e8 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 version=1.18.5 -revision=1 +revision=2 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson From 4ff9c9d0f19866ad5c7819cc7569d5b14c796e28 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:43:57 +0100 Subject: [PATCH 3/4] ffmpeg: rebuild against libaom-3.2.0. --- srcpkgs/ffmpeg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index c5929b4582f3..51bf6a9bc105 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.1 -revision=1 +revision=2 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-3.0-or-later" From 13c07b204172eac67711b0decbd54366fce88274 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:45:31 +0100 Subject: [PATCH 4/4] libheif: rebuild against libaom-3.2.0. --- srcpkgs/libheif/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template index 1972c5b8ad7c..48b4279b9f3a 100644 --- a/srcpkgs/libheif/template +++ b/srcpkgs/libheif/template @@ -1,7 +1,7 @@ # Template file for 'libheif' pkgname=libheif version=1.12.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-option-checking" hostmakedepends="automake autoconf pkg-config libtool"
[-- Attachment #1: Type: text/plain, Size: 169 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35494#discussion_r810662878 Comment: why is this necessary?
[-- Attachment #1: Type: text/plain, Size: 249 bytes --] New review comment by tibequadorian on void-packages repository https://github.com/void-linux/void-packages/pull/35494#discussion_r810664752 Comment: It doesn't work with ninja. Tell me if there's another way to make it use make instead of ninja.
[-- Attachment #1: Type: text/plain, Size: 227 bytes --] New review comment by tibequadorian on void-packages repository https://github.com/void-linux/void-packages/pull/35494#discussion_r810664986 Comment: More precisely, the tests don't work with ninja when I remember correctly.
[-- Attachment #1: Type: text/plain, Size: 454 bytes --] New review comment by tibequadorian on void-packages repository https://github.com/void-linux/void-packages/pull/35494#discussion_r810666531 Comment: Now I know: Until now the `do_check` function calls `make` for testing. But because we use `ninja` instead of `make` this fails, so I changed `make` to `${make_cmd}`. This fails too, because the tests doesn't work with `ninja`, so I set `make_cmd=make` and `export CMAKE_GENERATOR="Unix Makefiles"` :)
[-- Attachment #1: Type: text/plain, Size: 475 bytes --] New review comment by tibequadorian on void-packages repository https://github.com/void-linux/void-packages/pull/35494#discussion_r810666531 Comment: Now I know: Until now the `do_check` function calls `make` for testing. But because we use `ninja` instead of `make` this fails, so I changed `make` to `${make_cmd}` and `make_cmd=ninja`. This fails too, because the tests doesn't work with `ninja`, so I set `make_cmd=make` and `export CMAKE_GENERATOR="Unix Makefiles"` :)
[-- Attachment #1: Type: text/plain, Size: 194 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35494#discussion_r810682084 Comment: `ninja -C build testdata` seems to work for me.
[-- Attachment #1: Type: text/plain, Size: 1225 bytes --] There is an updated pull request by tibequadorian against master on the void-packages repository https://github.com/tibequadorian/void-packages libaom https://github.com/void-linux/void-packages/pull/35494 libaom: update to 3.2.0. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35494.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-libaom-35494.patch --] [-- Type: text/x-diff, Size: 5340 bytes --] From 618d6c971238969377cc9226631bc2a57a34ca52 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:40:15 +0100 Subject: [PATCH 1/4] libaom: update to 3.2.0. --- common/shlibs | 2 +- srcpkgs/libaom/template | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7c253776c381..e478344de356 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3460,7 +3460,7 @@ libticalcs2.so.12 libticalcs2-1.1.9_1 libhtmlcxx.so.3 htmlcxx-0.86_1 libcss_parser_pp.so.0 htmlcxx-0.86_1 libcss_parser.so.0 htmlcxx-0.86_1 -libaom.so.2 libaom-2.0.0_1 +libaom.so.3 libaom-3.2.0_1 libre.so.1 re-2.0.1_1 libtpms.so.0 libtpms-0.9.0_1 libswtpm_libtpms.so.0 libswtpm-0.6.1_1 diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template index 657301c7309a..75c2cae19e8d 100644 --- a/srcpkgs/libaom/template +++ b/srcpkgs/libaom/template @@ -1,9 +1,10 @@ # Template file for 'libaom' pkgname=libaom -version=2.0.1 +version=3.2.0 revision=1 create_wrksrc=yes build_style=cmake +make_cmd=make configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON" hostmakedepends="yasm doxygen perl python" short_desc="AV1 Codec library implementation" @@ -12,7 +13,9 @@ license="BSD-2-Clause" homepage="https://aomedia.org/" changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" -checksum=@b89acd3304531a9f6c99eba13e1de66605893ff8d08abc8c6e0586481a90033a +checksum=@358ac353cb20555aa8ad8faa4d14b98bf89dd05f76c45548d7219673c767d247 + +export CMAKE_GENERATOR="Unix Makefiles" # aom segfaults with default musl stack size LDFLAGS="-Wl,-z,stack-size=2097152" @@ -35,11 +38,11 @@ pre_check() { do_check() { cd build - make testdata ${makejobs} + ${make_cmd} testdata ${makejobs} ../test/examples.sh --bin-path examples if [ "$XBPS_CHECK_PKGS" = full ]; then - make runtests ${makejobs} + ${make_cmd} runtests ${makejobs} fi } From 2ba37c0b85bc1a555565be0f9619c574a3c7c1d1 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:41:56 +0100 Subject: [PATCH 2/4] gst-plugins-bad1: rebuild against libaom-3.2.0. --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 451f73cb9f55..e0d7500c79e8 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 version=1.18.5 -revision=1 +revision=2 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson From 2a89110fc78ece57c15a06829a5819b297192acb Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:43:57 +0100 Subject: [PATCH 3/4] ffmpeg: rebuild against libaom-3.2.0. --- srcpkgs/ffmpeg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index c5929b4582f3..51bf6a9bc105 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.1 -revision=1 +revision=2 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-3.0-or-later" From a0a1be3a560d5949c8ee891a4fd56205409b8250 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:45:31 +0100 Subject: [PATCH 4/4] libheif: rebuild against libaom-3.2.0. --- srcpkgs/libaom/template | 9 +++------ srcpkgs/libheif/template | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template index 75c2cae19e8d..549e4a7c5dc4 100644 --- a/srcpkgs/libaom/template +++ b/srcpkgs/libaom/template @@ -4,7 +4,6 @@ version=3.2.0 revision=1 create_wrksrc=yes build_style=cmake -make_cmd=make configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON" hostmakedepends="yasm doxygen perl python" short_desc="AV1 Codec library implementation" @@ -15,8 +14,6 @@ changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" checksum=@358ac353cb20555aa8ad8faa4d14b98bf89dd05f76c45548d7219673c767d247 -export CMAKE_GENERATOR="Unix Makefiles" - # aom segfaults with default musl stack size LDFLAGS="-Wl,-z,stack-size=2097152" @@ -38,11 +35,11 @@ pre_check() { do_check() { cd build - ${make_cmd} testdata ${makejobs} - ../test/examples.sh --bin-path examples + ninja testdata ${makejobs} + test/examples.sh --bin-path examples if [ "$XBPS_CHECK_PKGS" = full ]; then - ${make_cmd} runtests ${makejobs} + ninja runtests ${makejobs} fi } diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template index 1972c5b8ad7c..48b4279b9f3a 100644 --- a/srcpkgs/libheif/template +++ b/srcpkgs/libheif/template @@ -1,7 +1,7 @@ # Template file for 'libheif' pkgname=libheif version=1.12.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-option-checking" hostmakedepends="automake autoconf pkg-config libtool"
[-- Attachment #1: Type: text/plain, Size: 1225 bytes --] There is an updated pull request by tibequadorian against master on the void-packages repository https://github.com/tibequadorian/void-packages libaom https://github.com/void-linux/void-packages/pull/35494 libaom: update to 3.2.0. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35494.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-libaom-35494.patch --] [-- Type: text/x-diff, Size: 5299 bytes --] From 618d6c971238969377cc9226631bc2a57a34ca52 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:40:15 +0100 Subject: [PATCH 1/4] libaom: update to 3.2.0. --- common/shlibs | 2 +- srcpkgs/libaom/template | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7c253776c381..e478344de356 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3460,7 +3460,7 @@ libticalcs2.so.12 libticalcs2-1.1.9_1 libhtmlcxx.so.3 htmlcxx-0.86_1 libcss_parser_pp.so.0 htmlcxx-0.86_1 libcss_parser.so.0 htmlcxx-0.86_1 -libaom.so.2 libaom-2.0.0_1 +libaom.so.3 libaom-3.2.0_1 libre.so.1 re-2.0.1_1 libtpms.so.0 libtpms-0.9.0_1 libswtpm_libtpms.so.0 libswtpm-0.6.1_1 diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template index 657301c7309a..75c2cae19e8d 100644 --- a/srcpkgs/libaom/template +++ b/srcpkgs/libaom/template @@ -1,9 +1,10 @@ # Template file for 'libaom' pkgname=libaom -version=2.0.1 +version=3.2.0 revision=1 create_wrksrc=yes build_style=cmake +make_cmd=make configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON" hostmakedepends="yasm doxygen perl python" short_desc="AV1 Codec library implementation" @@ -12,7 +13,9 @@ license="BSD-2-Clause" homepage="https://aomedia.org/" changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" -checksum=@b89acd3304531a9f6c99eba13e1de66605893ff8d08abc8c6e0586481a90033a +checksum=@358ac353cb20555aa8ad8faa4d14b98bf89dd05f76c45548d7219673c767d247 + +export CMAKE_GENERATOR="Unix Makefiles" # aom segfaults with default musl stack size LDFLAGS="-Wl,-z,stack-size=2097152" @@ -35,11 +38,11 @@ pre_check() { do_check() { cd build - make testdata ${makejobs} + ${make_cmd} testdata ${makejobs} ../test/examples.sh --bin-path examples if [ "$XBPS_CHECK_PKGS" = full ]; then - make runtests ${makejobs} + ${make_cmd} runtests ${makejobs} fi } From 2ba37c0b85bc1a555565be0f9619c574a3c7c1d1 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:41:56 +0100 Subject: [PATCH 2/4] gst-plugins-bad1: rebuild against libaom-3.2.0. --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 451f73cb9f55..e0d7500c79e8 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 version=1.18.5 -revision=1 +revision=2 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson From 2a89110fc78ece57c15a06829a5819b297192acb Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:43:57 +0100 Subject: [PATCH 3/4] ffmpeg: rebuild against libaom-3.2.0. --- srcpkgs/ffmpeg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index c5929b4582f3..51bf6a9bc105 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.1 -revision=1 +revision=2 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-3.0-or-later" From e644c788feda1433eb2cd15ab9dba28525850939 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Wed, 9 Feb 2022 19:45:31 +0100 Subject: [PATCH 4/4] libheif: rebuild against libaom-3.2.0. --- srcpkgs/libaom/template | 7 ++----- srcpkgs/libheif/template | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template index 75c2cae19e8d..50e3a90fc7e8 100644 --- a/srcpkgs/libaom/template +++ b/srcpkgs/libaom/template @@ -4,7 +4,6 @@ version=3.2.0 revision=1 create_wrksrc=yes build_style=cmake -make_cmd=make configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON" hostmakedepends="yasm doxygen perl python" short_desc="AV1 Codec library implementation" @@ -15,8 +14,6 @@ changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" checksum=@358ac353cb20555aa8ad8faa4d14b98bf89dd05f76c45548d7219673c767d247 -export CMAKE_GENERATOR="Unix Makefiles" - # aom segfaults with default musl stack size LDFLAGS="-Wl,-z,stack-size=2097152" @@ -38,11 +35,11 @@ pre_check() { do_check() { cd build - ${make_cmd} testdata ${makejobs} + ninja testdata ${makejobs} ../test/examples.sh --bin-path examples if [ "$XBPS_CHECK_PKGS" = full ]; then - ${make_cmd} runtests ${makejobs} + ninja runtests ${makejobs} fi } diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template index 1972c5b8ad7c..48b4279b9f3a 100644 --- a/srcpkgs/libheif/template +++ b/srcpkgs/libheif/template @@ -1,7 +1,7 @@ # Template file for 'libheif' pkgname=libheif version=1.12.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-option-checking" hostmakedepends="automake autoconf pkg-config libtool"
[-- Attachment #1: Type: text/plain, Size: 1225 bytes --] There is an updated pull request by tibequadorian against master on the void-packages repository https://github.com/tibequadorian/void-packages libaom https://github.com/void-linux/void-packages/pull/35494 libaom: update to 3.2.0. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35494.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-libaom-35494.patch --] [-- Type: text/x-diff, Size: 4137 bytes --] From b8a19064a52bc9a6518c337d7aa4d11c0f840618 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Sun, 20 Feb 2022 22:35:03 +0100 Subject: [PATCH 1/4] libaom: update to 3.2.0. --- common/shlibs | 2 +- srcpkgs/libaom/template | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7c253776c381..e478344de356 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3460,7 +3460,7 @@ libticalcs2.so.12 libticalcs2-1.1.9_1 libhtmlcxx.so.3 htmlcxx-0.86_1 libcss_parser_pp.so.0 htmlcxx-0.86_1 libcss_parser.so.0 htmlcxx-0.86_1 -libaom.so.2 libaom-2.0.0_1 +libaom.so.3 libaom-3.2.0_1 libre.so.1 re-2.0.1_1 libtpms.so.0 libtpms-0.9.0_1 libswtpm_libtpms.so.0 libswtpm-0.6.1_1 diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template index 657301c7309a..523f8dde3821 100644 --- a/srcpkgs/libaom/template +++ b/srcpkgs/libaom/template @@ -1,6 +1,6 @@ # Template file for 'libaom' pkgname=libaom -version=2.0.1 +version=3.2.0 revision=1 create_wrksrc=yes build_style=cmake @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://aomedia.org/" changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" -checksum=@b89acd3304531a9f6c99eba13e1de66605893ff8d08abc8c6e0586481a90033a +checksum=@358ac353cb20555aa8ad8faa4d14b98bf89dd05f76c45548d7219673c767d247 # aom segfaults with default musl stack size LDFLAGS="-Wl,-z,stack-size=2097152" @@ -34,13 +34,15 @@ pre_check() { } do_check() { - cd build - make testdata ${makejobs} - ../test/examples.sh --bin-path examples + ninja -C build testdata - if [ "$XBPS_CHECK_PKGS" = full ]; then - make runtests ${makejobs} - fi +# cd build +# ninja testdata ${makejobs} +# ../test/examples.sh --bin-path examples +# +# if [ "$XBPS_CHECK_PKGS" = full ]; then +# ninja runtests ${makejobs} +# fi } post_install() { From 0d810ead30344a99bd3f31d9b3350d0fbf101924 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Sun, 20 Feb 2022 22:36:20 +0100 Subject: [PATCH 2/4] ffmpeg: rebuild against libaom-3.2.0 --- srcpkgs/ffmpeg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index c5929b4582f3..1ee19f21dfd8 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.1 -revision=1 +revision=3 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-3.0-or-later" From 94947e4d5f0b2388b14969df0656992f20734c5b Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Sun, 20 Feb 2022 22:36:20 +0100 Subject: [PATCH 3/4] gst-plugins-bad1: rebuild against libaom-3.2.0 --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 451f73cb9f55..656d67f31b23 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 version=1.18.5 -revision=1 +revision=3 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson From 43fbc77ac34462dea983ff3f31ecd2748b33b1a5 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Sun, 20 Feb 2022 22:36:20 +0100 Subject: [PATCH 4/4] libheif: rebuild against libaom-3.2.0 --- srcpkgs/libheif/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template index 1972c5b8ad7c..35a77ce8908b 100644 --- a/srcpkgs/libheif/template +++ b/srcpkgs/libheif/template @@ -1,7 +1,7 @@ # Template file for 'libheif' pkgname=libheif version=1.12.0 -revision=2 +revision=4 build_style=gnu-configure configure_args="--disable-option-checking" hostmakedepends="automake autoconf pkg-config libtool"
[-- Attachment #1: Type: text/plain, Size: 1225 bytes --] There is an updated pull request by tibequadorian against master on the void-packages repository https://github.com/tibequadorian/void-packages libaom https://github.com/void-linux/void-packages/pull/35494 libaom: update to 3.2.0. <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35494.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-libaom-35494.patch --] [-- Type: text/x-diff, Size: 4170 bytes --] From a94acd1349dad664845dec5b4d8363025a4dbe7e Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Sun, 20 Feb 2022 22:35:03 +0100 Subject: [PATCH 1/4] libaom: update to 3.2.0. --- common/shlibs | 2 +- srcpkgs/libaom/template | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7c253776c381..e478344de356 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3460,7 +3460,7 @@ libticalcs2.so.12 libticalcs2-1.1.9_1 libhtmlcxx.so.3 htmlcxx-0.86_1 libcss_parser_pp.so.0 htmlcxx-0.86_1 libcss_parser.so.0 htmlcxx-0.86_1 -libaom.so.2 libaom-2.0.0_1 +libaom.so.3 libaom-3.2.0_1 libre.so.1 re-2.0.1_1 libtpms.so.0 libtpms-0.9.0_1 libswtpm_libtpms.so.0 libswtpm-0.6.1_1 diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template index 657301c7309a..28cd48b343b6 100644 --- a/srcpkgs/libaom/template +++ b/srcpkgs/libaom/template @@ -1,6 +1,6 @@ # Template file for 'libaom' pkgname=libaom -version=2.0.1 +version=3.2.0 revision=1 create_wrksrc=yes build_style=cmake @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://aomedia.org/" changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" -checksum=@b89acd3304531a9f6c99eba13e1de66605893ff8d08abc8c6e0586481a90033a +checksum=@358ac353cb20555aa8ad8faa4d14b98bf89dd05f76c45548d7219673c767d247 # aom segfaults with default musl stack size LDFLAGS="-Wl,-z,stack-size=2097152" @@ -35,12 +35,16 @@ pre_check() { do_check() { cd build - make testdata ${makejobs} - ../test/examples.sh --bin-path examples + ninja testdata + ../test/examples.sh --bin-path ../examples - if [ "$XBPS_CHECK_PKGS" = full ]; then - make runtests ${makejobs} - fi +# cd build +# ninja testdata ${makejobs} +# ../test/examples.sh --bin-path examples +# +# if [ "$XBPS_CHECK_PKGS" = full ]; then +# ninja runtests ${makejobs} +# fi } post_install() { From 31ea2e4e5fb25185d6e11eeb468952c3c162d782 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Sun, 20 Feb 2022 22:36:20 +0100 Subject: [PATCH 2/4] ffmpeg: rebuild against libaom-3.2.0 --- srcpkgs/ffmpeg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index c5929b4582f3..1ee19f21dfd8 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.1 -revision=1 +revision=3 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned <orphan@voidlinux.org>" license="GPL-3.0-or-later" From 72eed52dd9d23ea6e8589c68daa03293f717eb32 Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Sun, 20 Feb 2022 22:36:20 +0100 Subject: [PATCH 3/4] gst-plugins-bad1: rebuild against libaom-3.2.0 --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 451f73cb9f55..656d67f31b23 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 version=1.18.5 -revision=1 +revision=3 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson From e7434c86ada85ceeee441336dba1ce03a24e5d8e Mon Sep 17 00:00:00 2001 From: tibequadorian <tibequadorian@posteo.de> Date: Sun, 20 Feb 2022 22:36:20 +0100 Subject: [PATCH 4/4] libheif: rebuild against libaom-3.2.0 --- srcpkgs/libheif/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template index 1972c5b8ad7c..35a77ce8908b 100644 --- a/srcpkgs/libheif/template +++ b/srcpkgs/libheif/template @@ -1,7 +1,7 @@ # Template file for 'libheif' pkgname=libheif version=1.12.0 -revision=2 +revision=4 build_style=gnu-configure configure_args="--disable-option-checking" hostmakedepends="automake autoconf pkg-config libtool"
[-- Attachment #1: Type: text/plain, Size: 219 bytes --] New review comment by tibequadorian on void-packages repository https://github.com/void-linux/void-packages/pull/35494#discussion_r810697340 Comment: sorry i am a little lost at this :/ don't know why it doesn't work
[-- Attachment #1: Type: text/plain, Size: 305 bytes --] New comment by github-actions[bot] on void-packages repository https://github.com/void-linux/void-packages/pull/35494#issuecomment-1163847357 Comment: Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
[-- Attachment #1: Type: text/plain, Size: 1058 bytes --] There's a closed pull request on the void-packages repository libaom: update to 3.2.0. https://github.com/void-linux/void-packages/pull/35494 Description: <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl -->