ffmpeg: enable globbing (#1718)

7 years ago · 620ba4f416
2 changed files with 37 additions and 2 deletions
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@ -2,13 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://ffmpeg.org
 TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
 # NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
 TERMUX_PKG_VERSION=3.3.4
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
 # libbz2 is used by matroska decoder:
 # libvpx is the VP8 & VP9 video encoder for WebM, see
 # https://trac.ffmpeg.org/wiki/Encode/VP8 and https://trac.ffmpeg.org/wiki/Encode/VP9
-TERMUX_PKG_DEPENDS="libbz2, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx, libgnutls"
+TERMUX_PKG_DEPENDS="libbz2, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx, libgnutls, libandroid-glob"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
 TERMUX_PKG_CONFLICTS="libav"

@ -62,6 +62,7 @@ termux_step_configure () {
 		--enable-shared \
 		--prefix=$TERMUX_PREFIX \
 		--target-os=android \
+		--extra-libs="-landroid-glob" \
 		$_EXTRA_CONFIGURE_FLAGS
 }

--- a/packages/ffmpeg/enable-glob.patch
+++ b/packages/ffmpeg/enable-glob.patch
@ -0,0 +1,34 @@
+diff -uNr ffmpeg-3.3.4/libavformat/img2dec.c ffmpeg-3.3.4.mod/libavformat/img2dec.c
+--- ffmpeg-3.3.4/libavformat/img2dec.c	2017-09-12 03:51:35.000000000 +0300
+++ ffmpeg-3.3.4.mod/libavformat/img2dec.c	2017-10-26 17:29:21.068365225 +0300
+@@ -35,6 +35,13 @@
+ #include "img2.h"
+ #include "libavcodec/mjpeg.h"
+ 
+#ifndef HAVE_GLOB
+#define HAVE_GLOB 1
+#else
+#undef HAVE_GLOB
+#define HAVE_GLOB 1
+#endif
+
+ #if HAVE_GLOB
+ /* Locally define as 0 (bitwise-OR no-op) any missing glob options that
+    are non-posix glibc/bsd extensions. */
+diff -uNr ffmpeg-3.3.4/libavformat/img2.h ffmpeg-3.3.4.mod/libavformat/img2.h
+--- ffmpeg-3.3.4/libavformat/img2.h	2017-09-12 03:51:35.000000000 +0300
+++ ffmpeg-3.3.4.mod/libavformat/img2.h	2017-10-26 17:29:35.528626598 +0300
+@@ -26,6 +26,13 @@
+ #include "avformat.h"
+ #include "libavutil/opt.h"
+ 
+#ifndef HAVE_GLOB
+#define HAVE_GLOB 1
+#else
+#undef HAVE_GLOB
+#define HAVE_GLOB 1
+#endif
+
+ #if HAVE_GLOB
+ #include <glob.h>
+ #endif