From 12f2946cc430f3737a3b11fbdc798b4e365c870a Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 27 Aug 2016 12:13:52 -0400 Subject: [PATCH] libav: Removein favour of ffmpegd --- packages/libav/build.sh | 51 ---------------------------------- packages/libav/configure.patch | 19 ------------- 2 files changed, 70 deletions(-) delete mode 100644 packages/libav/build.sh delete mode 100644 packages/libav/configure.patch diff --git a/packages/libav/build.sh b/packages/libav/build.sh deleted file mode 100644 index 9272775e5..000000000 --- a/packages/libav/build.sh +++ /dev/null @@ -1,51 +0,0 @@ -TERMUX_PKG_HOMEPAGE=http://libav.org/ -TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols" -TERMUX_PKG_VERSION=11.7 -TERMUX_PKG_SRCURL=http://libav.org/releases/libav-${TERMUX_PKG_VERSION}.tar.xz -# libbz2 is used by matroska decoder: -TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac, libmp3lame" -TERMUX_PKG_CONFLICTS="ffmpeg" - -termux_step_configure () { - cd $TERMUX_PKG_BUILDDIR - - # Specify --disable-asm to prevent text relocations on i686, - # see https://trac.ffmpeg.org/ticket/4928 - # For libav we do it also for arm and aarch64 since text - # relocations happens there as well (while ffmpeg doesn't - # create text relocations even with asm for those). - local _EXTRA_CONFIGURE_FLAGS="--disable-asm" - - if [ $TERMUX_ARCH = "arm" ]; then - _ARCH="armeabi-v7a" - elif [ $TERMUX_ARCH = "i686" ]; then - _ARCH="x86" - elif [ $TERMUX_ARCH = "aarch64" -o $TERMUX_ARCH = "x86_64" ]; then - _ARCH=$TERMUX_ARCH - else - echo "Unsupported arch $TERMUX_ARCH" - exit 1 - fi - - $TERMUX_PKG_SRCDIR/configure \ - --arch=${_ARCH} \ - --cross-prefix=${TERMUX_HOST_PLATFORM}- \ - --disable-avdevice \ - --disable-avserver \ - --disable-static \ - --disable-symver \ - --enable-cross-compile \ - --enable-gpl \ - --enable-libmp3lame \ - --enable-libfaac \ - --enable-libvorbis \ - --enable-libx264 \ - --enable-libxvid \ - --enable-nonfree \ - --enable-openssl \ - --enable-shared \ - --prefix=$TERMUX_PREFIX \ - --target-os=linux \ - $_EXTRA_CONFIGURE_FLAGS -} - diff --git a/packages/libav/configure.patch b/packages/libav/configure.patch deleted file mode 100644 index faa289c0a..000000000 --- a/packages/libav/configure.patch +++ /dev/null @@ -1,19 +0,0 @@ -Avoid issue with strtod on arm: - https://github.com/termux/termux-packages/issues/179 - -diff -u -r ../libav-11.6/configure ./configure ---- ../libav-11.6/configure 2016-02-26 18:05:55.000000000 -0500 -+++ ./configure 2016-03-24 20:59:15.095178594 -0400 -@@ -3673,12 +3673,6 @@ - probe_libc host_ - test -n "$host_libc_type" && enable host_libc_$host_libc_type - --case $libc_type in -- bionic) -- add_compat strtod.o strtod=avpriv_strtod -- ;; --esac -- - # hacks for compiler/libc/os combinations - - if enabled_all tms470 libc_glibc; then