summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg010/README2
-rw-r--r--multimedia/ffmpeg010/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch28
-rw-r--r--multimedia/ffmpeg010/ffmpeg010.SlackBuild15
3 files changed, 36 insertions, 9 deletions
diff --git a/multimedia/ffmpeg010/README b/multimedia/ffmpeg010/README
index b7ffab79ac..691708f32e 100644
--- a/multimedia/ffmpeg010/README
+++ b/multimedia/ffmpeg010/README
@@ -11,7 +11,6 @@ DC1394=yes|no (default: no), requires libdc1394
FAAC=yes|no (default: no), requires faac (creates non-redistributable binary)
FREI0R=yes|no (default: no), requires frei0r
GSM=yes|no (default: no), requires gsm
-JP2=yes|no (default: no), requires openjpeg
LAME=yes|no (default: yes), requires lame
OPENAL=yes|no (default: no), requires OpenAL
OPENCORE=yes|no (default: no), requires opencore-amr
@@ -19,7 +18,6 @@ OPENSSL=yes|no (default: no), creates non-redistributable binary
RTMP=yes|no (default: no), requires rtmpdump
SCHROEDINGER=yes|no (default: no), requires schroedinger
SPEEX=yes|no (default: no), requires speex
-VPX=yes|no (default: no), requires libvpx
X264=yes|no (default: yes), requires x264
XVID=yes|no (default: no), requires xvidcore
diff --git a/multimedia/ffmpeg010/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/multimedia/ffmpeg010/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
new file mode 100644
index 0000000000..301303bac0
--- /dev/null
+++ b/multimedia/ffmpeg010/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
@@ -0,0 +1,28 @@
+Trivial backport of 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
+
+VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
+from libvpx and the remaining values were never used here
+
+diff -Nur ffmpeg-0.10.9.orig/libavcodec/libvpxenc.c ffmpeg-0.10.9/libavcodec/libvpxenc.c
+--- ffmpeg-0.10.9.orig/libavcodec/libvpxenc.c 2013-09-26 20:10:34.000000000 -0500
++++ ffmpeg-0.10.9/libavcodec/libvpxenc.c 2016-01-09 18:23:21.957215252 -0600
+@@ -78,19 +78,11 @@
+
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *ctlidstr[] = {
+- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
+- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
+- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
+- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
+- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
+- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
+ [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
+ [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
+ [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
+- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
+ [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
+ [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
+- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
+ [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
+ [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
+ [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",
diff --git a/multimedia/ffmpeg010/ffmpeg010.SlackBuild b/multimedia/ffmpeg010/ffmpeg010.SlackBuild
index ddb46bcea0..2759e407fa 100644
--- a/multimedia/ffmpeg010/ffmpeg010.SlackBuild
+++ b/multimedia/ffmpeg010/ffmpeg010.SlackBuild
@@ -77,9 +77,6 @@ libfaac="" ; [ "${FAAC:-no}" != "no" ] && \
{ libfaac="--enable-libfaac" ; 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=""
@@ -98,8 +95,12 @@ cd $SRCNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+sed -i 's,-lopenjpeg,-lopenmj2,' configure
+
+patch -p1 < $CWD/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
+
+CFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \
+CXXFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \
./configure \
--prefix=/usr \
--incdir=/usr/include/$PRGNAM \
@@ -121,8 +122,9 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-x11grab \
--enable-avfilter \
--enable-gnutls \
+ --enable-libopenjpeg \
+ --enable-libvpx \
--arch=$ARCH \
- $openjpeg \
$libdc1394 \
$mp3lame \
$libfaac \
@@ -132,7 +134,6 @@ CXXFLAGS="$SLKCFLAGS" \
$dirac_fast \
$non_free \
$libgsm \
- $libvpx \
$librtmp \
$opencore_amr \
$libfrei0r \