From e86d8070cef581ecf3921db10d132af8a4d008d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 24 Feb 2020 21:14:00 +0100
Subject: ffmpeg-rpi: fix execution of libversion.sh

---
 ffmpeg-rpi/APKBUILD             |  4 ++--
 ffmpeg-rpi/dbg.patch            |  9 ---------
 ffmpeg-rpi/fix-libversion.patch | 10 ++++++++++
 3 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 ffmpeg-rpi/dbg.patch
 create mode 100644 ffmpeg-rpi/fix-libversion.patch

(limited to 'ffmpeg-rpi')

diff --git a/ffmpeg-rpi/APKBUILD b/ffmpeg-rpi/APKBUILD
index 7935892..3e5d1c7 100644
--- a/ffmpeg-rpi/APKBUILD
+++ b/ffmpeg-rpi/APKBUILD
@@ -34,7 +34,7 @@ makedepends="
 	zlib-dev
 	"
 source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
-	dbg.patch"
+	fix-libversion.patch"
 
 # add support for AV1 codec for all archies except armhf and armv7
 # as aom is not available on them
@@ -102,4 +102,4 @@ package() {
 }
 
 sha512sums="381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3  ffmpeg-4.2.2.tar.xz
-5811124f8553c395f51151f8a76ea524f9d2ff124c0ad8ac3437efba687210e89b2aa91eba3111a61b76214384cf8d9559853a356af6f0cd64152671536c2787  dbg.patch"
+9125910cc402a36b92c0c92a13c1b435065ae3e18fbb4dc651d37b8dffbd69a57e706fa9efc009e989d9b8236fac5fca189ffeeb8a12f9d956d40b1cdda372c8  fix-libversion.patch"
diff --git a/ffmpeg-rpi/dbg.patch b/ffmpeg-rpi/dbg.patch
deleted file mode 100644
index 82b1bc3..0000000
--- a/ffmpeg-rpi/dbg.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/ffbuild/libversion.sh b/ffbuild/libversion.sh
-index 990ce9f640..aacef0b58e 100755
---- a/ffbuild/libversion.sh
-+++ b/ffbuild/libversion.sh
-@@ -1,3 +1,4 @@
-+set -x
- toupper(){
-     echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
- }
diff --git a/ffmpeg-rpi/fix-libversion.patch b/ffmpeg-rpi/fix-libversion.patch
new file mode 100644
index 0000000..2d12e40
--- /dev/null
+++ b/ffmpeg-rpi/fix-libversion.patch
@@ -0,0 +1,10 @@
+diff --git a/ffbuild/libversion.sh b/ffbuild/libversion.sh
+index 990ce9f640..30046b1d25 100755
+--- a/ffbuild/libversion.sh
++++ b/ffbuild/libversion.sh
+@@ -1,3 +1,5 @@
++#!/bin/sh
++
+ toupper(){
+     echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
+ }
-- 
cgit v1.2.3