mpv: add libcaca support v1 PROPOSED

Drew DeVault: 1
 mpv: add libcaca support

 2 files changed, 35 insertions(+), 3 deletions(-)

[PATCH] mpv: add libcaca support Export this patch

---
 .../0001-wscript-update-caca-version.patch    | 25 +++++++++++++++++++
 community/mpv/APKBUILD                        | 13 +++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 community/mpv/0001-wscript-update-caca-version.patch

diff --git a/community/mpv/0001-wscript-update-caca-version.patch b/community/mpv/0001-wscript-update-caca-version.patch
new file mode 100644
index 0000000000..c08ebcbc41
--- /dev/null
+++ b/community/mpv/0001-wscript-update-caca-version.patch
@@ -0,0 +1,25 @@
+From f64b22a8dac9c89a8ff376a0b7a654a599ac0502 Mon Sep 17 00:00:00 2001
+From: Drew DeVault <sir@cmpwn.com>
+Date: Wed, 23 Mar 2022 20:51:29 +0100
+Subject: [PATCH] wscript: update caca version
+
+---
+ wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 2331624ff3..61b5f63c68 100644
+--- a/wscript
++++ b/wscript
+@@ -664,7 +664,7 @@ video_output_features = [
+         'name': '--caca',
+         'desc': 'CACA',
+         'deps': 'gpl',
+-        'func': check_pkg_config('caca', '>= 0.99.beta18'),
++        'func': check_pkg_config('caca'),
+     }, {
+         'name': '--jpeg',
+         'desc': 'JPEG support',
+-- 
+2.35.1
+
diff --git a/community/mpv/APKBUILD b/community/mpv/APKBUILD
index d644626250..ad68414fac 100644
--- a/community/mpv/APKBUILD
+++ b/community/mpv/APKBUILD
@@ -5,7 +5,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mpv
 pkgver=0.34.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Video player based on MPlayer/mplayer2"
 url="https://mpv.io/"
 license="GPL-2.0-or-later"
@@ -21,10 +21,12 @@ makedepends="
 	libao-dev
 	libass-dev
 	libbluray-dev
+	libcaca-dev
 	libcdio-paranoia-dev
 	libdvdnav-dev
 	libmad-dev
 	libplacebo-dev
+	libsixel-dev
 	libtheora-dev
 	libva-dev>=2.4.1
 	libvdpau-dev
@@ -61,7 +63,10 @@ subpackages="
 	$pkgname-bash-completion
 	$pkgname-zsh-completion
 	"
-source="https://github.com/mpv-player/mpv/archive/v$pkgver/mpv-$pkgver.tar.gz"
+source="
+	https://github.com/mpv-player/mpv/archive/v$pkgver/mpv-$pkgver.tar.gz
+	0001-wscript-update-caca-version.patch
+"
 
 # secfixes:
 #   0.27.0-r3:
@@ -91,7 +96,8 @@ build() {
 		--enable-vulkan \
 		--enable-uchardet \
 		--enable-cdda \
-		--enable-dvdnav
+		--enable-dvdnav \
+		--enable-caca
 	python3 waf build
 }
 
@@ -114,4 +120,5 @@ package() {
 
 sha512sums="
 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e  mpv-0.34.1.tar.gz
+3f5a4764e7b41853bda6fc5c7e591bd0304c7605b2c3d659297be31ed9f977272acb68997f2a8db05dca77add1cd97a472769c3ad63a65ead55259d60312ac4b  0001-wscript-update-caca-version.patch
 "
-- 
2.35.1

Alpine Linux <alpine-infra@alpinelinux.org>

2 years ago

Hi!

We received your patch, but we were unable to apply it to the upstream
GitLab repository. Did you rebase?