summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/mjpegtools/README16
-rw-r--r--multimedia/mjpegtools/mjpegtools.SlackBuild9
-rw-r--r--multimedia/mjpegtools/mjpegtools.info6
3 files changed, 14 insertions, 17 deletions
diff --git a/multimedia/mjpegtools/README b/multimedia/mjpegtools/README
index ab4849027d..733a91ee78 100644
--- a/multimedia/mjpegtools/README
+++ b/multimedia/mjpegtools/README
@@ -1,11 +1,13 @@
-The mjpeg programs are a set of tools that can do recording of videos and
-playback, simple cut-and-paste editing and the MPEG compression of audio
+The mjpeg programs are a set of tools that can do recording of videos and
+playback, simple cut-and-paste editing and the MPEG compression of audio
and video under Linux.
-Recording is supported for the Zoran based cards like the Buz (Iomega),
-DC10 (MIRO, Pinnacle), Matrox Marvel cards and the LML33 (Linux Media Labs).
+Recording is supported for the Zoran based cards like the Buz (Iomega),
+DC10 (MIRO, Pinnacle), Matrox Marvel cards and the LML33 (Linux Media Labs).
See related pages to the right to find the right driver for your card.
-The recorded videos can be converted to MPEG streams. The software playback
+The recorded videos can be converted to MPEG streams. The software playback
of MPEG streams works with almost every player and every OS.
-You can produce special forms of MPEG streams like VCD (Video CD) and SVCD
-for hardware playback.
+You can produce special forms of MPEG streams like VCD (Video CD) and SVCD
+for hardware playback.
+
+This optionally depends on libquicktime, libdv and SDL_gfx.
diff --git a/multimedia/mjpegtools/mjpegtools.SlackBuild b/multimedia/mjpegtools/mjpegtools.SlackBuild
index fce2888da8..b0b8cf1454 100644
--- a/multimedia/mjpegtools/mjpegtools.SlackBuild
+++ b/multimedia/mjpegtools/mjpegtools.SlackBuild
@@ -23,16 +23,14 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mjpegtools
-VERSION=2.0.0
-BUILD=${BUILD:-2}
+VERSION=2.1.0
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -70,9 +68,6 @@ chmod -R a-s,u+w,go+r-w .
# Fix for x86_64
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-# Fix for gcc-4.7.x
-sed -i 's/\tDeleteRegion/\tthis->DeleteRegion/' y4mdenoise/MotionSearcher.hh
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/multimedia/mjpegtools/mjpegtools.info b/multimedia/mjpegtools/mjpegtools.info
index f0401c8e78..3134513eea 100644
--- a/multimedia/mjpegtools/mjpegtools.info
+++ b/multimedia/mjpegtools/mjpegtools.info
@@ -1,8 +1,8 @@
PRGNAM="mjpegtools"
-VERSION="2.0.0"
+VERSION="2.1.0"
HOMEPAGE="http://mjpeg.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/mjpeg/mjpegtools-2.0.0.tar.gz"
-MD5SUM="903e1e3b967eebcc5fe5626d7517dc46"
+DOWNLOAD="http://downloads.sourceforge.net/mjpeg/mjpegtools-2.1.0.tar.gz"
+MD5SUM="57bf5dd78976ca9bac972a6511b236f3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""