[PR PATCH] mpv: update to 0.34.0.

[PR PATCH] mpv: update to 0.34.0.

[dm1tz]

[-- Attachment #1: Type: text/plain, Size: 1720 bytes --]

There is a new pull request by dm1tz against master on the void-packages repository

https://github.com/dm1tz/void-packages mpv
https://github.com/void-linux/void-packages/pull/33870

mpv: update to 0.34.0.
Support for libplacebo older than v3.104.0 was dropped in https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/33870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mpv-33870.patch --]
[-- Type: text/x-diff, Size: 2584 bytes --]

From da91840f2004f2b9cebaebb0b6507aacb05b01d7 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Tue, 2 Nov 2021 23:56:32 +0200
Subject: [PATCH] mpv: update to 0.34.0.

Support for libplacebo older than v3.104.0 was dropped in https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.
---
 common/shlibs               | 2 +-
 srcpkgs/libplacebo/template | 4 ++--
 srcpkgs/mpv/template        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7e95fce39f7e..f6ea3aac5579 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3432,7 +3432,7 @@ libSoapySDR.so.0.7 SoapySDR-0.7.0_1
 libeditorconfig.so.0 editorconfig-0.12.2_1
 libcfitsio.so.9 cfitsio-3.480_1
 libapparmor.so.1 libapparmor-2.12.0_1
-libplacebo.so.72 libplacebo-2.72.0_1
+libplacebo.so.157 libplacebo-4.157.0_1
 libw2xc.so waifu2x-converter-cpp-5.2_1
 libnova-0.15.so.0 libnova-0.15.0_1
 libcue.so.2 libcue-2.2.0_1
diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index 9d843e26af13..3717c14984d8 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -1,6 +1,6 @@
 # Template file for 'libplacebo'
 pkgname=libplacebo
-version=2.72.2
+version=4.157.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://code.videolan.org/videolan/libplacebo"
 distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz"
-checksum=5d3c51bb98d9727a255234a522f631f00d62a9e87115fb14251d991fc5076979
+checksum=8ee7773fb7813520b6b1e5f8f207cdf0071a7cf48ca0ce871e956ae6f4d0d538
 
 build_options="lcms opengl"
 build_options_default="lcms opengl"
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f3ac99c6c335..e7fe729f33d4 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.33.1
+version=0.34.0
 revision=1
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
@@ -29,7 +29,7 @@ license="GPL-2.0-or-later"
 homepage="https://mpv.io"
 changelog="https://github.com/mpv-player/mpv/releases"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9
+checksum=f654fb6275e5178f57e055d20918d7d34e19949bc98ebbf4a7371902e88ce309
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

Re: [PR PATCH] [Updated] mpv: update to 0.34.0.

[dm1tz]

[-- Attachment #1: Type: text/plain, Size: 1725 bytes --]

There is an updated pull request by dm1tz against master on the void-packages repository

https://github.com/dm1tz/void-packages mpv
https://github.com/void-linux/void-packages/pull/33870

mpv: update to 0.34.0.
Support for libplacebo older than v3.104.0 was dropped in https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/33870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mpv-33870.patch --]
[-- Type: text/x-diff, Size: 2525 bytes --]

From a360fa9c5c331f68bee13e76c852eb33bcd7d35b Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Tue, 2 Nov 2021 23:56:32 +0200
Subject: [PATCH] mpv: update to 0.34.0.

Support for libplacebo older than v3.104.0 was dropped in
mpv-player/mpv@7c4465c.
---
 common/shlibs               | 2 +-
 srcpkgs/libplacebo/template | 4 ++--
 srcpkgs/mpv/template        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7e95fce39f7e..f6ea3aac5579 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3432,7 +3432,7 @@ libSoapySDR.so.0.7 SoapySDR-0.7.0_1
 libeditorconfig.so.0 editorconfig-0.12.2_1
 libcfitsio.so.9 cfitsio-3.480_1
 libapparmor.so.1 libapparmor-2.12.0_1
-libplacebo.so.72 libplacebo-2.72.0_1
+libplacebo.so.157 libplacebo-4.157.0_1
 libw2xc.so waifu2x-converter-cpp-5.2_1
 libnova-0.15.so.0 libnova-0.15.0_1
 libcue.so.2 libcue-2.2.0_1
diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index 9d843e26af13..3717c14984d8 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -1,6 +1,6 @@
 # Template file for 'libplacebo'
 pkgname=libplacebo
-version=2.72.2
+version=4.157.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://code.videolan.org/videolan/libplacebo"
 distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz"
-checksum=5d3c51bb98d9727a255234a522f631f00d62a9e87115fb14251d991fc5076979
+checksum=8ee7773fb7813520b6b1e5f8f207cdf0071a7cf48ca0ce871e956ae6f4d0d538
 
 build_options="lcms opengl"
 build_options_default="lcms opengl"
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f3ac99c6c335..e7fe729f33d4 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.33.1
+version=0.34.0
 revision=1
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
@@ -29,7 +29,7 @@ license="GPL-2.0-or-later"
 homepage="https://mpv.io"
 changelog="https://github.com/mpv-player/mpv/releases"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9
+checksum=f654fb6275e5178f57e055d20918d7d34e19949bc98ebbf4a7371902e88ce309
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

Re: mpv: update to 0.34.0.

[travankor]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/33870#issuecomment-958599216

Comment:
Seems like there's a build failure for libplacebo and armv6.

Re: [PR PATCH] [Updated] mpv: update to 0.34.0.

[dm1tz]

[-- Attachment #1: Type: text/plain, Size: 1725 bytes --]

There is an updated pull request by dm1tz against master on the void-packages repository

https://github.com/dm1tz/void-packages mpv
https://github.com/void-linux/void-packages/pull/33870

mpv: update to 0.34.0.
Support for libplacebo older than v3.104.0 was dropped in https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/33870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mpv-33870.patch --]
[-- Type: text/x-diff, Size: 3221 bytes --]

From a360fa9c5c331f68bee13e76c852eb33bcd7d35b Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Tue, 2 Nov 2021 23:56:32 +0200
Subject: [PATCH 1/2] mpv: update to 0.34.0.

Support for libplacebo older than v3.104.0 was dropped in
mpv-player/mpv@7c4465c.
---
 common/shlibs               | 2 +-
 srcpkgs/libplacebo/template | 4 ++--
 srcpkgs/mpv/template        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7e95fce39f7e..f6ea3aac5579 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3432,7 +3432,7 @@ libSoapySDR.so.0.7 SoapySDR-0.7.0_1
 libeditorconfig.so.0 editorconfig-0.12.2_1
 libcfitsio.so.9 cfitsio-3.480_1
 libapparmor.so.1 libapparmor-2.12.0_1
-libplacebo.so.72 libplacebo-2.72.0_1
+libplacebo.so.157 libplacebo-4.157.0_1
 libw2xc.so waifu2x-converter-cpp-5.2_1
 libnova-0.15.so.0 libnova-0.15.0_1
 libcue.so.2 libcue-2.2.0_1
diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index 9d843e26af13..3717c14984d8 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -1,6 +1,6 @@
 # Template file for 'libplacebo'
 pkgname=libplacebo
-version=2.72.2
+version=4.157.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://code.videolan.org/videolan/libplacebo"
 distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz"
-checksum=5d3c51bb98d9727a255234a522f631f00d62a9e87115fb14251d991fc5076979
+checksum=8ee7773fb7813520b6b1e5f8f207cdf0071a7cf48ca0ce871e956ae6f4d0d538
 
 build_options="lcms opengl"
 build_options_default="lcms opengl"
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f3ac99c6c335..e7fe729f33d4 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.33.1
+version=0.34.0
 revision=1
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
@@ -29,7 +29,7 @@ license="GPL-2.0-or-later"
 homepage="https://mpv.io"
 changelog="https://github.com/mpv-player/mpv/releases"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9
+checksum=f654fb6275e5178f57e055d20918d7d34e19949bc98ebbf4a7371902e88ce309
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d8f9d9d10b783f93b1ebb7afef33bae3a5623106 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Wed, 3 Nov 2021 16:15:06 +0200
Subject: [PATCH 2/2] vlc: revbump for libplacebo-4.157.0.

---
 srcpkgs/vlc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index c18324de4345..99281ee664bf 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread

Re: [PR PATCH] [Closed]: mpv: update to 0.34.0.

[dm1tz]

[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]

There's a closed pull request on the void-packages repository

mpv: update to 0.34.0.
https://github.com/void-linux/void-packages/pull/33870

Description:
Support for libplacebo older than v3.104.0 was dropped in https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->

Re: mpv: update to 0.34.0.

[dm1tz]

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

New comment by dm1tz on void-packages repository

https://github.com/void-linux/void-packages/pull/33870#issuecomment-960156257

Comment:
> Seems like there's a build failure for libplacebo and armv6.

Yeah, smth to do with atomic lib. I think it'd be better to use previous [3.120.3 ](https://github.com/haasn/libplacebo/releases/tag/v3.120.3) release since armv6 succeeds with that one.

Re: mpv: update to 0.34.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33870#issuecomment-960249246

Comment:
> Yeah, smth to do with atomic lib. I think it'd be better to use previous [3.120.3 ](https://github.com/haasn/libplacebo/releases/tag/v3.120.3) release since armv6 succeeds with that one.

let's fix it instead:
```sh
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
	makedepends+=" libatomic-devel"
	LDFLAGS+=" -latomic"
fi
```

Please do not open new PRs like #33880, instead force push to this PR.

Re: mpv: update to 0.34.0.

[dm1tz]

[-- Attachment #1: Type: text/plain, Size: 673 bytes --]

New comment by dm1tz on void-packages repository

https://github.com/void-linux/void-packages/pull/33870#issuecomment-960286731

Comment:
> > Yeah, smth to do with atomic lib. I think it'd be better to use previous [3.120.3 ](https://github.com/haasn/libplacebo/releases/tag/v3.120.3) release since armv6 succeeds with that one.
> 
> let's fix it instead:
> 
> ```shell
> if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
> 	makedepends+=" libatomic-devel"
> 	LDFLAGS+=" -latomic"
> fi
> ```
> 
> Please do not open new PRs like #33880, instead force push to this PR.

Got it. Thanks for the tip, I've tried that already but still get the same undefined reference error.

Re: mpv: update to 0.34.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33870#issuecomment-960572070

Comment:
> Got it. Thanks for the tip, I've tried that already but still get the same undefined reference error.

Are you sure?
```
=> Registering new packages to /host/binpkgs/mpv
index: added `libplacebo-4.157.0_1' (armv6l-musl).
index: added `libplacebo-devel-4.157.0_1' (armv6l-musl).
index: 2 packages registered.
```

Re: mpv: update to 0.34.0.

[dm1tz]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

New comment by dm1tz on void-packages repository

https://github.com/void-linux/void-packages/pull/33870#issuecomment-960723914

Comment:
> > Got it. Thanks for the tip, I've tried that already but still get the same undefined reference error.
> 
> Are you sure?
> 
> ```
> => Registering new packages to /host/binpkgs/mpv
> index: added `libplacebo-4.157.0_1' (armv6l-musl).
> index: added `libplacebo-devel-4.157.0_1' (armv6l-musl).
> index: 2 packages registered.
> ```

Well, let's give it a try then.

Re: [PR PATCH] [Updated] mpv: update to 0.34.0.

[dm1tz]

[-- Attachment #1: Type: text/plain, Size: 1725 bytes --]

There is an updated pull request by dm1tz against master on the void-packages repository

https://github.com/dm1tz/void-packages mpv
https://github.com/void-linux/void-packages/pull/33870

mpv: update to 0.34.0.
Support for libplacebo older than v3.104.0 was dropped in https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/33870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mpv-33870.patch --]
[-- Type: text/x-diff, Size: 3944 bytes --]

From a360fa9c5c331f68bee13e76c852eb33bcd7d35b Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Tue, 2 Nov 2021 23:56:32 +0200
Subject: [PATCH 1/3] mpv: update to 0.34.0.

Support for libplacebo older than v3.104.0 was dropped in
mpv-player/mpv@7c4465c.
---
 common/shlibs               | 2 +-
 srcpkgs/libplacebo/template | 4 ++--
 srcpkgs/mpv/template        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7e95fce39f7e..f6ea3aac5579 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3432,7 +3432,7 @@ libSoapySDR.so.0.7 SoapySDR-0.7.0_1
 libeditorconfig.so.0 editorconfig-0.12.2_1
 libcfitsio.so.9 cfitsio-3.480_1
 libapparmor.so.1 libapparmor-2.12.0_1
-libplacebo.so.72 libplacebo-2.72.0_1
+libplacebo.so.157 libplacebo-4.157.0_1
 libw2xc.so waifu2x-converter-cpp-5.2_1
 libnova-0.15.so.0 libnova-0.15.0_1
 libcue.so.2 libcue-2.2.0_1
diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index 9d843e26af13..3717c14984d8 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -1,6 +1,6 @@
 # Template file for 'libplacebo'
 pkgname=libplacebo
-version=2.72.2
+version=4.157.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://code.videolan.org/videolan/libplacebo"
 distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz"
-checksum=5d3c51bb98d9727a255234a522f631f00d62a9e87115fb14251d991fc5076979
+checksum=8ee7773fb7813520b6b1e5f8f207cdf0071a7cf48ca0ce871e956ae6f4d0d538
 
 build_options="lcms opengl"
 build_options_default="lcms opengl"
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f3ac99c6c335..e7fe729f33d4 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.33.1
+version=0.34.0
 revision=1
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
@@ -29,7 +29,7 @@ license="GPL-2.0-or-later"
 homepage="https://mpv.io"
 changelog="https://github.com/mpv-player/mpv/releases"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9
+checksum=f654fb6275e5178f57e055d20918d7d34e19949bc98ebbf4a7371902e88ce309
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d8f9d9d10b783f93b1ebb7afef33bae3a5623106 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Wed, 3 Nov 2021 16:15:06 +0200
Subject: [PATCH 2/3] vlc: revbump for libplacebo-4.157.0.

---
 srcpkgs/vlc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index c18324de4345..99281ee664bf 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread

From f65cc251d76ac0039b3825f44cce13927db1901f Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Thu, 4 Nov 2021 13:48:25 +0200
Subject: [PATCH 3/3] mpv: fix libatomic error for armv6l-musl build.

---
 srcpkgs/mpv/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index e7fe729f33d4..e4a050111b5e 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -33,6 +33,7 @@ checksum=f654fb6275e5178f57e055d20918d7d34e19949bc98ebbf4a7371902e88ce309
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	LDFLAGS+=" -latomic"
 fi
 
 build_options="alsa caca jack lcms lua openal pulseaudio sdl2 vapoursynth vdpau

Re: mpv: update to 0.34.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33870#issuecomment-961063274

Comment:
libplacebo build was failing, no? So why are you trying to fix atomics in mpv?

Re: [PR PATCH] [Updated] mpv: update to 0.34.0.

[dm1tz]

[-- Attachment #1: Type: text/plain, Size: 1725 bytes --]

There is an updated pull request by dm1tz against master on the void-packages repository

https://github.com/dm1tz/void-packages mpv
https://github.com/void-linux/void-packages/pull/33870

mpv: update to 0.34.0.
Support for libplacebo older than v3.104.0 was dropped in https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/33870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mpv-33870.patch --]
[-- Type: text/x-diff, Size: 3568 bytes --]

From 25062dcb7223c06ea78d59acc08b1abbe9305454 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Thu, 4 Nov 2021 17:05:05 +0200
Subject: [PATCH 1/3] mpv: update to 0.34.0

---
 srcpkgs/mpv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f3ac99c6c335..e7fe729f33d4 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.33.1
+version=0.34.0
 revision=1
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
@@ -29,7 +29,7 @@ license="GPL-2.0-or-later"
 homepage="https://mpv.io"
 changelog="https://github.com/mpv-player/mpv/releases"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9
+checksum=f654fb6275e5178f57e055d20918d7d34e19949bc98ebbf4a7371902e88ce309
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 62c6042a1a839588699bb78c1c67d40cb99c69f0 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Thu, 4 Nov 2021 17:12:16 +0200
Subject: [PATCH 2/3] libplacebo: update to 4.157.0.

Build for armv6l-musl fails without libatomic explicitly set.
---
 common/shlibs               | 2 +-
 srcpkgs/libplacebo/template | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7e95fce39f7e..f6ea3aac5579 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3432,7 +3432,7 @@ libSoapySDR.so.0.7 SoapySDR-0.7.0_1
 libeditorconfig.so.0 editorconfig-0.12.2_1
 libcfitsio.so.9 cfitsio-3.480_1
 libapparmor.so.1 libapparmor-2.12.0_1
-libplacebo.so.72 libplacebo-2.72.0_1
+libplacebo.so.157 libplacebo-4.157.0_1
 libw2xc.so waifu2x-converter-cpp-5.2_1
 libnova-0.15.so.0 libnova-0.15.0_1
 libcue.so.2 libcue-2.2.0_1
diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index 9d843e26af13..365249d96515 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -1,6 +1,6 @@
 # Template file for 'libplacebo'
 pkgname=libplacebo
-version=2.72.2
+version=4.157.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -14,7 +14,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://code.videolan.org/videolan/libplacebo"
 distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz"
-checksum=5d3c51bb98d9727a255234a522f631f00d62a9e87115fb14251d991fc5076979
+checksum=8ee7773fb7813520b6b1e5f8f207cdf0071a7cf48ca0ce871e956ae6f4d0d538
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS+=" -latomic"
+fi
 
 build_options="lcms opengl"
 build_options_default="lcms opengl"

From 276124ad3f5754548aea14825a22b5075ba2f410 Mon Sep 17 00:00:00 2001
From: Dmitry Zakharchenko <dmitriyz447@gmail.com>
Date: Wed, 3 Nov 2021 16:15:06 +0200
Subject: [PATCH 3/3] vlc: revbump for libplacebo-4.157.0.

---
 srcpkgs/vlc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index c18324de4345..99281ee664bf 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread

Re: mpv: update to 0.34.0.

[dm1tz]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

New comment by dm1tz on void-packages repository

https://github.com/void-linux/void-packages/pull/33870#issuecomment-961181997

Comment:
> libplacebo build was failing, no? So why are you trying to fix atomics in mpv?

That was dumb, sorry.


> Each package update should have exactly one commit in this PR. The mpv commit shouldn't contain the libplacebo update.

Should be good to go now.

Re: [PR PATCH] [Merged]: mpv: update to 0.34.0.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]

There's a merged pull request on the void-packages repository

mpv: update to 0.34.0.
https://github.com/void-linux/void-packages/pull/33870

Description:
Support for libplacebo older than v3.104.0 was dropped in https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->