oasis

commit: 979ec8e98ba1bf83bef4915cb4178c56d5fcb71d
parent a695987176b9106cf37367dcc7f7b73f38f6087e
Author: Michael Forney <mforney@mforney.org>
Date:   Fri,  3 Jan 2020 12:57:00 -0800

ffmpeg: Remove version.sh patch

For build reproducibility, we don't use version.sh anymore, and
instead create it ourselves.

Diffstat:
R
pkg/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch -> pkg/ffmpeg/patch/0001-Fix-build-with-LibreSSL.patch
0

D
pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch
25
-------------------------
R
pkg/ffmpeg/patch/0003-libavformat-tls_libtls-handle-TLS_WANT_POLLIN-and-TL.patch -> pkg/ffmpeg/patch/0002-libavformat-tls_libtls-handle-TLS_WANT_POLLIN-and-TL.patch
0

M
pkg/ffmpeg/ver
2
+-

4 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/pkg/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch b/pkg/ffmpeg/patch/0001-Fix-build-with-LibreSSL.patch
diff --git a/pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch b/pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch
@@ -1,25 +0,0 @@
-From 333db73f3ce45055c77bf951153c8fddb3de5e42 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 2 Jul 2016 11:58:07 -0700
-Subject: [PATCH] version.sh: Replace all slashes
-
----
- ffbuild/version.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ffbuild/version.sh b/ffbuild/version.sh
-index edc4dd33c5..331aa385c3 100755
---- a/ffbuild/version.sh
-+++ b/ffbuild/version.sh
-@@ -49,7 +49,7 @@ NEW_REVISION="#define FFMPEG_VERSION \"$version\""
- OLD_REVISION=$(cat "$2" 2> /dev/null | head -4 | tail -1)
- 
- # String used for preprocessor guard
--GUARD=$(echo "$2" | sed 's/\//_/' | sed 's/\./_/' | tr '[:lower:]' '[:upper:]' | sed 's/LIB//')
-+GUARD=$(echo "$2" | sed 's/\//_/g' | sed 's/\./_/' | tr '[:lower:]' '[:upper:]' | sed 's/LIB//')
- 
- # Update version header only on revision changes to avoid spurious rebuilds
- if test "$NEW_REVISION" != "$OLD_REVISION"; then
--- 
-2.14.2
-
diff --git a/pkg/ffmpeg/patch/0003-libavformat-tls_libtls-handle-TLS_WANT_POLLIN-and-TL.patch b/pkg/ffmpeg/patch/0002-libavformat-tls_libtls-handle-TLS_WANT_POLLIN-and-TL.patch
diff --git a/pkg/ffmpeg/ver b/pkg/ffmpeg/ver
@@ -1 +1 @@
-4.2.1 r1
+4.2.1 r2