summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorponce <matteo.bernardini@gmail.com>2012-03-31 18:50:25 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-08-21 15:36:49 -0500
commitfca081d062b457421853f495d9042465ce7d60f3 (patch)
treed64972b2d9448582f1b2b2534bcddd84f7acdbc9 /multimedia
parentda3feaef8ced2fa59d0ed10623afbe323b675e68 (diff)
downloadslackbuilds-fca081d062b457421853f495d9042465ce7d60f3.tar.gz
multimedia/mjpegtools: Updated for version 2.0.0.
This fixes build with kernel headers > 2.6.37 and gcc-4.7.x. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch11
-rw-r--r--multimedia/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch24
-rw-r--r--multimedia/mjpegtools/mjpegtools.SlackBuild15
-rw-r--r--multimedia/mjpegtools/mjpegtools.info6
4 files changed, 10 insertions, 46 deletions
diff --git a/multimedia/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch b/multimedia/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch
deleted file mode 100644
index e161560468..0000000000
--- a/multimedia/mjpegtools/mjpegtools-1.9.0-glibc-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp.orig 2009-05-27 01:31:46.000000000 -0700
-+++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2009-05-27 01:33:09.000000000 -0700
-@@ -53,7 +53,7 @@
-
- bool LPCMStream::Probe(IBitStream &bs )
- {
-- char *last_dot = strrchr( bs.StreamName(), '.' );
-+ const char *last_dot = strrchr( bs.StreamName(), '.' );
- return
- last_dot != NULL
- && strcmp( last_dot+1, "lpcm") == 0;
diff --git a/multimedia/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch b/multimedia/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch
deleted file mode 100644
index ec36731862..0000000000
--- a/multimedia/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
-
-Patch by: Salah Coronya
-
-http://bugs.gentoo.org/show_bug.cgi?id=293919
-
---- lavtools/jpegutils.c
-+++ lavtools/jpegutils.c
-@@ -502,6 +502,7 @@
-
- jpeg_read_header (&dinfo, TRUE);
- dinfo.raw_data_out = TRUE;
-+ dinfo.do_fancy_upsampling = FALSE;
- dinfo.out_color_space = JCS_YCbCr;
- dinfo.dct_method = JDCT_IFAST;
- guarantee_huff_tables(&dinfo);
-@@ -599,6 +600,7 @@
- if (field > 0) {
- jpeg_read_header (&dinfo, TRUE);
- dinfo.raw_data_out = TRUE;
-+ dinfo.do_fancy_upsampling = FALSE;
- dinfo.out_color_space = JCS_YCbCr;
- dinfo.dct_method = JDCT_IFAST;
- jpeg_start_decompress (&dinfo);
diff --git a/multimedia/mjpegtools/mjpegtools.SlackBuild b/multimedia/mjpegtools/mjpegtools.SlackBuild
index e2566c373a..fce2888da8 100644
--- a/multimedia/mjpegtools/mjpegtools.SlackBuild
+++ b/multimedia/mjpegtools/mjpegtools.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mjpegtools
-VERSION=1.9.0
-BUILD=${BUILD:-3}
+VERSION=2.0.0
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -69,8 +69,9 @@ chmod -R a-s,u+w,go+r-w .
# Fix for x86_64
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-patch -p1 < $CWD/mjpegtools-1.9.0-glibc-2.10.patch
-patch -p0 < $CWD/mjpegtools-1.9.0-jpeg-7.patch
+
+# Fix for gcc-4.7.x
+sed -i 's/\tDeleteRegion/\tthis->DeleteRegion/' y4mdenoise/MotionSearcher.hh
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -91,10 +92,8 @@ make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*
diff --git a/multimedia/mjpegtools/mjpegtools.info b/multimedia/mjpegtools/mjpegtools.info
index e1053bde89..f0401c8e78 100644
--- a/multimedia/mjpegtools/mjpegtools.info
+++ b/multimedia/mjpegtools/mjpegtools.info
@@ -1,8 +1,8 @@
PRGNAM="mjpegtools"
-VERSION="1.9.0"
+VERSION="2.0.0"
HOMEPAGE="http://mjpeg.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/mjpeg/mjpegtools-1.9.0.tar.gz"
-MD5SUM="309a6fcf0900a010d6a9c1e91afc2f5c"
+DOWNLOAD="http://downloads.sourceforge.net/mjpeg/mjpegtools-2.0.0.tar.gz"
+MD5SUM="903e1e3b967eebcc5fe5626d7517dc46"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""