From ed2f3dd5e8aa9b202042355173c60108202ec545 Mon Sep 17 00:00:00 2001
From: rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4>
Date: Mon, 26 Feb 2007 02:12:53 +0000
Subject: small fixes and version bump

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1027 370017ae-e619-0410-ac65-c121f96126d4
---
 media/video/mjpegtools/mjpegtools-1.8.0-powerpc.diff | 11 +++++++++++
 media/video/mjpegtools/mjpegtools-powerpc.diff       | 11 -----------
 media/video/mjpegtools/mjpegtools.SlackBuild         | 14 ++++++++++----
 3 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 media/video/mjpegtools/mjpegtools-1.8.0-powerpc.diff
 delete mode 100644 media/video/mjpegtools/mjpegtools-powerpc.diff

(limited to 'media/video/mjpegtools')

diff --git a/media/video/mjpegtools/mjpegtools-1.8.0-powerpc.diff b/media/video/mjpegtools/mjpegtools-1.8.0-powerpc.diff
new file mode 100644
index 00000000..6036b1de
--- /dev/null
+++ b/media/video/mjpegtools/mjpegtools-1.8.0-powerpc.diff
@@ -0,0 +1,11 @@
+--- configure.orig	2006-10-17 07:55:24.000000000 +0000
++++ configure	2006-10-17 07:56:56.000000000 +0000
+@@ -27077,6 +27077,8 @@
+     fi
+     rm -f conftest*;
+ 
++have_altivec=false
++
+     if test x$have_altivec = xtrue
+     then
+       CFLAGS="$CFLAGS ${ALTIVEC_CFLAGS}"
diff --git a/media/video/mjpegtools/mjpegtools-powerpc.diff b/media/video/mjpegtools/mjpegtools-powerpc.diff
deleted file mode 100644
index 6036b1de..00000000
--- a/media/video/mjpegtools/mjpegtools-powerpc.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2006-10-17 07:55:24.000000000 +0000
-+++ configure	2006-10-17 07:56:56.000000000 +0000
-@@ -27077,6 +27077,8 @@
-     fi
-     rm -f conftest*;
- 
-+have_altivec=false
-+
-     if test x$have_altivec = xtrue
-     then
-       CFLAGS="$CFLAGS ${ALTIVEC_CFLAGS}"
diff --git a/media/video/mjpegtools/mjpegtools.SlackBuild b/media/video/mjpegtools/mjpegtools.SlackBuild
index bc233100..e4de5a78 100755
--- a/media/video/mjpegtools/mjpegtools.SlackBuild
+++ b/media/video/mjpegtools/mjpegtools.SlackBuild
@@ -27,7 +27,7 @@ fi
 # default settings
 PACKAGE="mjpegtools"
 ARCH=${ARCH:=i486}
-VERSION=${VERSION:=1.8.0}
+VERSION=${VERSION:=1.9.0rc1}
 BUILD=${BUILD:=1rd}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
@@ -65,15 +65,21 @@ cd $TMP
 tar xvf$tarflag $SRC_DIR/$SRC
 cd $PACKAGE-$VERSION
 
-if [ "$ARCH" == "powerpc" ]; then
-  patch -p0 < $CWD/$PACKAGE-powerpc.diff
+if [ "$ARCH" == "powerpc" ] && [ "$HAVE_ALTIVEC" != "true" ] && [ "$VERSION" == "1.8.0" ] ; then
+  patch -p0 < $CWD/$PACKAGE-$VERSION-powerpc.diff
 fi
 
 if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then
   patch -p0 < $CWD/$PACKAGE-$VERSION.diff
 fi
 
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$VERSION
+EXTRA_AC_OPTIONS=""
+
+if [ "$ARCH" == "i386" ] || [ "$ARCH" == "i486" ]; then
+  EXTRA_AC_OPTIONS=" --disable-simd-accel"
+fi
+
+./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$VERSION $EXTRA_AC_OPTIONS
 
 make || exit 32
 make DESTDIR=$TMP/package-$PACKAGE install
-- 
cgit v1.2.3