ffmpeg: Update from 3.4.2 to 4.0.1

packages/gst-libav/build.sh → disabled-packages/gst-libav/build.sh

@@ -1,3 +1,4 @@
+# NOTE: Disabled due to not being ffmpeg 4 compatible.
 TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="GStreamer libav/ffmpeg wrapper"
 TERMUX_PKG_VERSION=1.14.1

packages/bs1770gain/build.sh

@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://bs1770gain.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Tool to normalize the loudness of different audio files to the same level"
 TERMUX_PKG_VERSION=0.4.12
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/bs1770gain/bs1770gain/${TERMUX_PKG_VERSION}/bs1770gain-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=cafc5440cf4940939c675e98c8dbeb839f4965d60f74270a37d4ee70559b3a59

packages/bs1770gain/ffmpeg-4-compatibility.patch

@@ -0,0 +1,36 @@
+diff -u -r ../bs1770gain-0.4.12/libffsox-2/ffsox_frame.c ./libffsox-2/ffsox_frame.c
+--- ../bs1770gain-0.4.12/libffsox-2/ffsox_frame.c	2015-06-23 07:38:44.000000000 +0000
++++ ./libffsox-2/ffsox_frame.c	2018-06-24 00:20:40.757492455 +0000
+@@ -48,7 +48,7 @@
+     goto frame;
+   }
+ 
+-  if (NULL!=codec&&(codec->capabilities&CODEC_CAP_VARIABLE_FRAME_SIZE))
++  if (NULL!=codec&&(codec->capabilities&AV_CODEC_CAP_VARIABLE_FRAME_SIZE))
+     nb_samples=10000;
+   else
+     nb_samples=cc->frame_size;
+diff -u -r ../bs1770gain-0.4.12/libffsox-2/ffsox_frame_writer.c ./libffsox-2/ffsox_frame_writer.c
+--- ../bs1770gain-0.4.12/libffsox-2/ffsox_frame_writer.c	2015-06-23 07:38:44.000000000 +0000
++++ ./libffsox-2/ffsox_frame_writer.c	2018-06-24 00:20:40.757492455 +0000
+@@ -66,7 +66,7 @@
+     goto open;
+ 
+   if (fw->so.fc->oformat->flags&AVFMT_GLOBALHEADER)
+-    fw->so.cc->flags|=CODEC_FLAG_GLOBAL_HEADER;
++    fw->so.cc->flags|=AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+   fw->so.st->time_base=fw->so.cc->time_base;
+   //fw->so.st->time_base=fr->si.st->time_base;
+diff -u -r ../bs1770gain-0.4.12/libffsox-2/ffsox_packet_writer.c ./libffsox-2/ffsox_packet_writer.c
+--- ../bs1770gain-0.4.12/libffsox-2/ffsox_packet_writer.c	2015-06-23 07:38:44.000000000 +0000
++++ ./libffsox-2/ffsox_packet_writer.c	2018-06-24 00:20:59.189280111 +0000
+@@ -65,7 +65,7 @@
+   pw->so.cc->codec_tag=0;
+ 
+   if (pw->so.fc->oformat->flags&AVFMT_GLOBALHEADER)
+-    pw->so.cc->flags|=CODEC_FLAG_GLOBAL_HEADER;
++    pw->so.cc->flags|=AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+   if (ffsox_sink_append(so,&pw->si,&pw->so)<0) {
+     DMESSAGE("appending output stream");

packages/ffmpeg/build.sh

@@ -1,9 +1,8 @@
 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.4.2
+TERMUX_PKG_VERSION=4.0.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_SHA256=605f5c01c60db35d3b617a79cabb2c7032412be243554602eeed1b628125c0ee
-TERMUX_PKG_SHA256=2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740
 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
@@ -45,7 +44,6 @@ termux_step_configure () {
 		--cxx=$CXX \
 		--cross-prefix=${TERMUX_HOST_PLATFORM}- \
 		--disable-avdevice \
-		--disable-ffserver \
 		--disable-static \
 		--disable-symver \
 		--disable-lzma \

packages/gegl/build.sh

@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://gegl.org/
 TERMUX_PKG_DESCRIPTION="Data flow based image processing framework"
 TERMUX_PKG_VERSION=0.4.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=6a358bc19d20b8ac1daf645cc8b53cdc2ea6f9c98a6036179a57045a26a07f8d
 TERMUX_PKG_SRCURL=https://download.gimp.org/pub/gegl/${TERMUX_PKG_VERSION:0:3}/gegl-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libandroid-support, ffmpeg, babl, json-glib, libjpeg-turbo, libpng, libjasper, littlecms, libtiff, librsvg"

packages/mpd/build.sh

@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.musicpd.org
 TERMUX_PKG_DESCRIPTION="Music player daemon"
 TERMUX_PKG_VERSION=0.20.20
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=d804b47a981b0398f119e9f398775706422c3d4d887dd7c0f5460904df89bbf2
 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="libcurl, libid3tag, libopus, libevent, fftw, libpulseaudio, libmpdclient, boost, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2"

packages/mpv/build.sh

@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://mpv.io/
 TERMUX_PKG_DESCRIPTION="Command-line media player"
-TERMUX_PKG_VERSION=0.27.2
+TERMUX_PKG_VERSION=0.28.2
-TERMUX_PKG_SHA256=2ad104d83fd3b2b9457716615acad57e479fd1537b8fc5e37bfe9065359b50be
+TERMUX_PKG_SHA256=aada14e025317b5b3e8e58ffaf7902e8b6e4ec347a93d25a7c10d3579426d795
 TERMUX_PKG_SRCURL=https://github.com/mpv-player/mpv/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="ffmpeg, openal-soft, libandroid-glob"
 TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/applications"
@@ -20,6 +20,7 @@ termux_step_make_install () {
 		--disable-gl \
 		--disable-jpeg \
 		--disable-lcms2 \
+		--disable-libarchive \
 		--disable-libass \
 		--disable-lua \
 		--disable-pulse \
@@ -28,7 +29,7 @@ termux_step_make_install () {
 		--disable-alsa \
 		--disable-x11
 
-	./waf install
+	./waf -v install
 
 	# Use opensles audio out be default:
 	mkdir -p $TERMUX_PREFIX/etc/mpv

packages/mpv/video-out-gpu.context.c.patch

@@ -0,0 +1,13 @@
+diff -u -r ../mpv-0.28.2/video/out/gpu/context.c ./video/out/gpu/context.c
+--- ../mpv-0.28.2/video/out/gpu/context.c	2018-02-13 02:07:05.000000000 +0000
++++ ./video/out/gpu/context.c	2018-06-24 00:34:19.827691478 +0000
+@@ -63,7 +63,9 @@
+ 
+ // OpenGL contexts:
+ #if HAVE_ANDROID
++# if HAVE_GL
+     &ra_ctx_android,
++# endif
+ #endif
+ #if HAVE_RPI
+     &ra_ctx_rpi,

packages/mpv/wscript.patch

@@ -0,0 +1,23 @@
+diff -u -r ../mpv-0.28.2/wscript ./wscript
+--- ../mpv-0.28.2/wscript	2018-02-13 03:07:05.000000000 +0100
++++ ./wscript	2018-06-25 14:48:26.288156610 +0200
+@@ -154,9 +154,7 @@
+         'name': '--android',
+         'desc': 'Android environment',
+         'func': compose_checks(
+-            check_statement('android/api-level.h', '(void)__ANDROID__'),  # arbitrary android-specific header
+-            check_cc(lib="android"),
+-            check_cc(lib="EGL"),
++            check_statement('android/api-level.h', '(void)__ANDROID__')  # arbitrary android-specific header
+         )
+     }, {
+         'name': 'posix-or-mingw',
+@@ -813,7 +811,7 @@
+         'name': 'egl-helpers',
+         'desc': 'EGL helper functions',
+         'deps': 'egl-x11 || mali-fbdev || rpi || gl-wayland || egl-drm || ' +
+-                'egl-angle-win32 || android',
++                'egl-angle-win32',
+         'func': check_true
+     }
+ ]

packages/mpv/wscript_build.py.patch

@@ -0,0 +1,12 @@
+diff -u -r ../mpv-0.28.2/wscript_build.py ./wscript_build.py
+--- ../mpv-0.28.2/wscript_build.py	2018-02-13 02:07:05.000000000 +0000
++++ ./wscript_build.py	2018-06-24 00:28:49.967625363 +0000
+@@ -409,7 +409,7 @@
+         ( "video/out/opengl/context_drm_egl.c",  "egl-drm" ),
+         ( "video/out/opengl/context_dxinterop.c","gl-dxinterop" ),
+         ( "video/out/opengl/context_mali_fbdev.c","mali-fbdev" ),
+-        ( "video/out/opengl/context_android.c",  "android" ),
++        ( "video/out/opengl/context_android.c",  "android && gl" ),
+         ( "video/out/opengl/context_rpi.c",      "rpi" ),
+         ( "video/out/opengl/context_vdpau.c",    "vdpau-gl-x11" ),
+         ( "video/out/opengl/context_wayland.c",  "gl-wayland" ),