ffmpeg: downgrade to 2.8.14

RasPlex · Apr 14, 2018 · 59618df · 59618df
1 parent 2fef540
commit 59618df
Show file tree

Hide file tree

Showing 10 changed files with 747 additions and 30,627 deletions.
diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
@@ -17,14 +17,12 @@
 ################################################################################
 
 PKG_NAME="ffmpeg"
-# Current branch is: release/3.1-xbmc
-PKG_VERSION="9702d0d"
+PKG_VERSION="2.8.14"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
-PKG_URL="https://github.com/xbmc/FFmpeg/archive/${PKG_VERSION}.tar.gz"
-PKG_SOURCE_DIR="FFmpeg-${PKG_VERSION}*"
-PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 openssl speex"
+PKG_URL="https://ffmpeg.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libvorbis openssl dcadec speex"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
 PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
@@ -117,7 +115,7 @@ configure_target() {
               --host-ldflags="$HOST_LDFLAGS" \
               --host-libs="-lm" \
               --extra-cflags="$CFLAGS" \
-              --extra-ldflags="$LDFLAGS" \
+              --extra-ldflags="$LDFLAGS -fPIC" \
               --extra-libs="$FFMPEG_LIBS" \
               --disable-static \
               --enable-shared \
@@ -188,6 +186,7 @@ configure_target() {
               --disable-libopencore-amrwb \
               --disable-libopencv \
               --disable-libdc1394 \
+              --enable-libdcadec \
               --disable-libfaac \
               --disable-libfreetype \
               --disable-libgsm \
@@ -198,8 +197,9 @@ configure_target() {
               --disable-libschroedinger \
               --enable-libspeex \
               --disable-libtheora \
+              --disable-libvo-aacenc \
               --disable-libvo-amrwbenc \
-              --disable-libvorbis \
+              --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis \
               --disable-libvpx \
               --disable-libx264 \
               --disable-libxavs \

diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-Resolve-plex-direct-domains.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-Resolve-plex-direct-domains.patch
@@ -0,0 +1,37 @@
+commit eb2a7e1eb920cd9e44223607978344cf4b95d990
+Author: Jonas Karlman <jonas@kwiboo.se>
+Date:   Tue Jun 16 02:47:28 2015 +0200
+
+    Resolve .plex.direct domains
+
+diff --git a/libavformat/tcp.c b/libavformat/tcp.c
+index 3c3f4f5..e543c06 100644
+--- a/libavformat/tcp.c
++++ b/libavformat/tcp.c
+@@ -67,6 +67,8 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
+     int ret;
+     char hostname[1024],proto[1024],path[1024];
+     char portstr[10];
++    size_t len;
++    char *c;
+     s->open_timeout = 5000000;
+
+     av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
+@@ -102,6 +104,17 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
+     snprintf(portstr, sizeof(portstr), "%d", port);
+     if (s->listen)
+         hints.ai_flags |= AI_PASSIVE;
++    len = strlen(hostname);
++    if (len > 12 && !strcmp(hostname + len - 12, ".plex.direct")) {
++        for (c = hostname; *c; c++) {
++            if (*c == '-') {
++                *c = '.';
++            } else if (*c == '.') {
++                *c = '\0';
++                break;
++            }
++        }
++    }
+     if (!hostname[0])
+         ret = getaddrinfo(NULL, portstr, &hints, &ai);
+     else