aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--multimedia/ffmpeg/README11
-rw-r--r--multimedia/ffmpeg/ffmpeg.SlackBuild48
-rw-r--r--multimedia/ffmpeg/ffmpeg.info8
-rw-r--r--multimedia/ffmpeg/libilbc.patch23
4 files changed, 46 insertions, 44 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
index 4737373543ad7..63993b2ba3e7b 100644
--- a/multimedia/ffmpeg/README
+++ b/multimedia/ffmpeg/README
@@ -9,26 +9,33 @@ BLURAY=yes|no (default: no), requires libbluray
CELT=yes|no (default: no), requires celt
DC1394=yes|no (default: no), requires libdc1394
FAAC=yes|no (default: no), requires faac (creates non-redistributable binary)
+FDK_AAC=yes|no (default: no), requires libfdk-aac (creates non-redistributable binary)
+FLITE=yes|no (default: no), requires flite
FREI0R=yes|no (default: no), requires frei0r
GSM=yes|no (default: no), requires gsm
IEC61883=yes|no (default: no), requires libiec61883 and libavc1394
ILBC=yes|no (default: no), requires libilbc
JP2=yes|no (default: no), requires openjpeg
LADSPA=yes|no (default: no), requires ladspa_sdk
-LAME=yes|no (default: yes), requires lame
+LAME=yes|no (default: no), requires lame
MODPLUG=yes|no (default: no), requires libmodplug
OPENAL=yes|no (default: no), requires OpenAL
OPENCORE=yes|no (default: no), requires opencore-amr
+OPENCV=yes|no (default: no), requires opencv
OPENSSL=yes|no (default: no), creates non-redistributable binary
OPUS=yes|no (default: no), requires opus
PULSEAUDIO=yes|no (default: no), requires pulseaudio
+QUVI=yes|no (default: no), requires libquvi
RTMP=yes|no (default: no), requires rtmpdump
SCHROEDINGER=yes|no (default: no), requires schroedinger
SPEEX=yes|no (default: no), requires speex
TWOLAME=yes|no (default: no), requires twolame
+VIDSTAB=yes|no (default: no), requires vid.stab
VPX=yes|no (default: no), requires libvpx
-X264=yes|no (default: yes), requires x264
+X264=yes|no (default: no), requires x264
+X265=yes|no (default: no), requires x265
XVID=yes|no (default: no), requires xvidcore
+ZVBI=yes|no (default: no), requires zvbi
Make sure to run this script in a real root shell ("su -") and that you
have either tetex or texlive installed.
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index 349e8045a12d1..5953f4735c47d 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for ffmpeg
-# Copyright 2010-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2010-2015 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
# Modified by Robby Workman <rworkman@slackbuilds.org>
PRGNAM=ffmpeg
-VERSION=${VERSION:-2.1.5}
+VERSION=${VERSION:-2.6.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -75,6 +75,8 @@ PKGARCH=$(uname -m)_custom
# Unfortunately ffmpeg's configure doesn't support --enable-feature=yes
# syntax, so we have to do it the complicated way :/
+mp3lame="" ; [ "${LAME:-no}" != "no" ] && mp3lame="--enable-libmp3lame"
+libx264="" ; [ "${X264:-no}" != "no" ] && libx264="--enable-libx264"
libcelt="" ; [ "${CELT:-no}" != "no" ] && libcelt="--enable-libcelt"
libdc1394="" ; [ "${DC1394:-no}" != "no" ] && libdc1394="--enable-libdc1394"
libfrei0r="" ; [ "${FREI0R:-no}" != "no" ] && libfrei0r="--enable-frei0r"
@@ -88,29 +90,34 @@ libbluray="" ; [ "${BLURAY:-no}" != "no" ] && libbluray="--enable-libblur
libass="" ; [ "${ASS:-no}" != "no" ] && libass="--enable-libass"
libopenal="" ; [ "${OPENAL:-no}" != "no" ] && libopenal="--enable-openal"
libiec61883=""; [ "${IEC61883:-no}" != "no" ] && libiec61883="--enable-libiec61883"
-libilbc=""; [ "${ILBC:-no}" != "no" ] && libilbc="--enable-libilbc"
-libmodplug=""; [ "${MODPLUG:-no}" != "no" ] && libmodplug="--enable-libmodplug"
-libopus=""; [ "${OPUS:-no}" != "no" ] && libopus="--enable-libopus"
-libtwolame=""; [ "${TWOLAME:-no}" != "no" ] && libtwolame="--enable-libtwolame"
-ladspa=""; [ "${LADSPA:-no}" != "no" ] && ladspa="--enable-ladspa"
-pulse=""; [ "${PULSEAUDIO:-no}" != "no" ] && pulse="--enable-libpulse"
+libilbc="" ; [ "${ILBC:-no}" != "no" ] && libilbc="--enable-libilbc"
+libmodplug="" ; [ "${MODPLUG:-no}" != "no" ] && libmodplug="--enable-libmodplug"
+libopus="" ; [ "${OPUS:-no}" != "no" ] && libopus="--enable-libopus"
+libtwolame="" ; [ "${TWOLAME:-no}" != "no" ] && libtwolame="--enable-libtwolame"
+ladspa="" ; [ "${LADSPA:-no}" != "no" ] && ladspa="--enable-ladspa"
+pulse="" ; [ "${PULSEAUDIO:-no}" != "no" ] && pulse="--enable-libpulse"
+libflite="" ; [ "${FLITE:-no}" != "no" ] && libflite="--enable-libflite"
+libquvi="" ; [ "${QUVI:-no}" != "no" ] && libquvi="--enable-libquvi"
+libvidstab="" ; [ "${VIDSTAB:-no}" != "no" ] && libvidstab="--enable-libvidstab"
+libx265="" ; [ "${X265:-no}" != "no" ] && libx265="--enable-libx265"
+libzvbi="" ; [ "${ZVBI:-no}" != "no" ] && libzvbi="--enable-libzvbi"
+libopencv="" ; [ "${OPENCV:-no}" != "no" ] && libopencv="--enable-libopencv"
#opencl=""; [ "${OPENCL:-no}" != "no" ] && opencl="--enable-opencl"
opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \
opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb"
libfaac="" ; [ "${FAAC:-no}" != "no" ] && \
{ libfaac="--enable-libfaac" ; non_free="--enable-nonfree" ; }
+fdk="" ; [ "${FDK_AAC:-no}" != "no" ] && \
+ { fdk="--enable-libfdk-aac"; non_free="--enable-nonfree" ; }
ssl="" ; [ "${OPENSSL:-no}" != "no" ] && \
{ ssl="--enable-openssl" ; non_free="--enable-nonfree" ; }
openjpeg="" ; [ "${JP2:-no}" != "no" ] && \
{ openjpeg="--enable-libopenjpeg" ; \
SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg-1.5" ; }
-mp3lame="--enable-libmp3lame" ; [ "${LAME:-yes}" != "yes" ] && mp3lame=""
-libx264="--enable-libx264" ; [ "${X264:-yes}" != "yes" ] && libx264=""
-
-# opencv support is currently broken: http://code.opencv.org/issues/1925
-#libopencv="" ; [ "${OPENCV:-no}" != "no" ] && libopencv="--enable-libopencv"
+# zeromq support requires zeromq > 3.x
+#libzmq="" ; [ "${ZMQ:-no}" != "no" ] && libzmq="--enable-libzmq"
set -e
@@ -127,8 +134,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix compiling with libilbc 2.0.x
-patch -p1 -i $CWD/libilbc.patch
+# Fix linking with flite
+sed -i "s| -lflite\"| -lflite -lm -lasound\"|" \
+ ./configure
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -153,6 +161,9 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-gnutls \
--enable-libcdio \
--enable-libssh \
+ --enable-libcaca \
+ --enable-libsmbclient \
+ --enable-opengl \
--arch=$ARCH \
$openjpeg \
$libdc1394 \
@@ -179,6 +190,13 @@ CXXFLAGS="$SLKCFLAGS" \
$libtwolame \
$ladspa \
$pulse \
+ $fdk \
+ $libflite \
+ $libquvi \
+ $libvidstab \
+ $libx265 \
+ $libzvbi \
+ $libopencv \
$ssl
make
diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info
index 0076372a532a3..f13ce573aef61 100644
--- a/multimedia/ffmpeg/ffmpeg.info
+++ b/multimedia/ffmpeg/ffmpeg.info
@@ -1,10 +1,10 @@
PRGNAM="ffmpeg"
-VERSION="2.1.5"
+VERSION="2.6.3"
HOMEPAGE="http://www.ffmpeg.org"
-DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.1.5.tar.bz2"
-MD5SUM="c97586adb18e61f56b819b6ebb1d6a1d"
+DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.6.3.tar.bz2"
+MD5SUM="e2cc3c209f91393d35ab58598e41cf22"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="%README% lame x264"
+REQUIRES="%README%"
MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@liwjatan.at"
diff --git a/multimedia/ffmpeg/libilbc.patch b/multimedia/ffmpeg/libilbc.patch
deleted file mode 100644
index 29274120af843..0000000000000
--- a/multimedia/ffmpeg/libilbc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c
-index 898fe83..9fdd3c8 100644
---- a/libavcodec/libilbc.c
-+++ b/libavcodec/libilbc.c
-@@ -96,8 +96,7 @@ static int ilbc_decode_frame(AVCodecContext *avctx, void *data,
- if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
- return ret;
-
-- WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0],
-- (const WebRtc_UWord16*) buf, &s->decoder, 1);
-+ WebRtcIlbcfix_DecodeImpl((int16_t *) frame->data[0], (const uint16_t *) buf, &s->decoder, 1);
-
- *got_frame_ptr = 1;
-
-@@ -170,7 +169,7 @@ static int ilbc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
- if ((ret = ff_alloc_packet2(avctx, avpkt, 50)) < 0)
- return ret;
-
-- WebRtcIlbcfix_EncodeImpl((WebRtc_UWord16*) avpkt->data, (const WebRtc_Word16*) frame->data[0], &s->encoder);
-+ WebRtcIlbcfix_EncodeImpl((uint16_t *) avpkt->data, (const int16_t *) frame->data[0], &s->encoder);
-
- avpkt->size = s->encoder.no_of_bytes;
- *got_packet_ptr = 1;
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-25 19:42:17 +0000