X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/ec7f65e944161ab2f5c760723cc13f909ab7c9dc..d0195549d7b50b84fec1f1ff889861817730c6be:/packages/libvpx/build.sh

diff --git a/packages/libvpx/build.sh b/packages/libvpx/build.sh
index 36e57ffb..7b6d4be7 100644
--- a/packages/libvpx/build.sh
+++ b/packages/libvpx/build.sh
@@ -1,34 +1,45 @@
-TERMUX_PKG_HOMEPAGE=http://www.webmproject.org/
-TERMUX_PKG_DESCRIPTION="VP9 Codec SDK"
-TERMUX_PKG_VERSION=1.5.0
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_HOMEPAGE=https://www.webmproject.org
+TERMUX_PKG_DESCRIPTION="VP8 & VP9 Codec SDK"
+TERMUX_PKG_VERSION=1.6.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/webmproject/libvpx/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=libvpx-${TERMUX_PKG_VERSION}
-TERMUX_PKG_DEPENDS="libgnustl"
+TERMUX_PKG_SHA256=cda8bb6f0e4848c018177d3a576fa83ed96d762554d7010fe4cfb9d70c22e588
 
 termux_step_configure () {
+	# Force fresh install of header files:
+	rm -Rf $TERMUX_PREFIX/include/vpx
+
+	export LD=$CC
+
 	if [ $TERMUX_ARCH = "arm" ]; then
+		export AS=$TERMUX_HOST_PLATFORM-as
 		_CONFIGURE_TARGET="--target=armv7-android-gcc"
 	elif [ $TERMUX_ARCH = "i686" ]; then
 		export AS=yasm
-		export LD=$CC
 		_CONFIGURE_TARGET="--target=x86-android-gcc"
 	elif [ $TERMUX_ARCH = "aarch64" ]; then
 		_CONFIGURE_TARGET="--force-target=arm64-v8a-android-gcc"
 	elif [ $TERMUX_ARCH = "x86_64" ]; then
 		export AS=yasm
-		export LD=$CC
 		_CONFIGURE_TARGET="--target=x86_64-android-gcc"
 	else
-		echo "Unsupported arch: $TERMUX_ARCH"
-		exit 1
+		termux_error_exit "Unsupported arch: $TERMUX_ARCH"
 	fi
+
+	# For --disable-realtime-only, see
+	# https://bugs.chromium.org/p/webm/issues/detail?id=800
+	# "The issue is that on android we soft enable realtime only.
+	#  [..] You can enable non-realtime by setting --disable-realtime-only"
+	# Discovered in https://github.com/termux/termux-packages/issues/554
+	#CROSS=${TERMUX_HOST_PLATFORM}- CC=clang CXX=clang++ $TERMUX_PKG_SRCDIR/configure \
 	$TERMUX_PKG_SRCDIR/configure \
-		--sdk-path=$NDK \
 		$_CONFIGURE_TARGET \
 		--prefix=$TERMUX_PREFIX \
 		--disable-examples \
-		--disable-vp8 \
+		--disable-realtime-only \
+		--disable-unit-tests \
+		--enable-pic \
+		--enable-vp8 \
 		--enable-shared \
 		--enable-small
 }