diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/ffmpeg/patch/0001-Fix-build-with-LibreSSL.patch (renamed from pkg/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch) | 0 | ||||
| -rw-r--r-- | pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch | 25 | ||||
| -rw-r--r-- | pkg/ffmpeg/patch/0002-libavformat-tls_libtls-handle-TLS_WANT_POLLIN-and-TL.patch (renamed from pkg/ffmpeg/patch/0003-libavformat-tls_libtls-handle-TLS_WANT_POLLIN-and-TL.patch) | 0 | ||||
| -rw-r--r-- | pkg/ffmpeg/ver | 2 |
4 files changed, 1 insertions, 26 deletions
diff --git a/pkg/ffmpeg/patch/0002-Fix-build-with-LibreSSL.patch b/pkg/ffmpeg/patch/0001-Fix-build-with-LibreSSL.patch index 5e4a070c..5e4a070c 100644 --- 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 deleted file mode 100644 index d970c36f..00000000 --- a/pkg/ffmpeg/patch/0001-version.sh-Replace-all-slashes.patch +++ /dev/null @@ -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 index 521b5288..521b5288 100644 --- 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 index 910e79f3..f857e9aa 100644 --- a/pkg/ffmpeg/ver +++ b/pkg/ffmpeg/ver @@ -1 +1 @@ -4.2.1 r1 +4.2.1 r2 |