diff options
| author | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2007-02-26 02:12:53 +0000 |
|---|---|---|
| committer | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2007-02-26 02:12:53 +0000 |
| commit | ed2f3dd5e8aa9b202042355173c60108202ec545 (patch) | |
| tree | 7174eb2c2f62891ea900fc8b10d67955bccd183e /media | |
| parent | 0322370c2291e91f9852ebe872111aaa4c47093d (diff) | |
| download | slackbuilds-ed2f3dd5e8aa9b202042355173c60108202ec545.tar.gz slackbuilds-ed2f3dd5e8aa9b202042355173c60108202ec545.tar.bz2 | |
small fixes and version bump
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1027 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'media')
| -rw-r--r-- | media/video/mjpegtools/mjpegtools-1.8.0-powerpc.diff (renamed from media/video/mjpegtools/mjpegtools-powerpc.diff) | 0 | ||||
| -rwxr-xr-x | media/video/mjpegtools/mjpegtools.SlackBuild | 14 |
2 files changed, 10 insertions, 4 deletions
diff --git a/media/video/mjpegtools/mjpegtools-powerpc.diff b/media/video/mjpegtools/mjpegtools-1.8.0-powerpc.diff index 6036b1de..6036b1de 100644 --- a/media/video/mjpegtools/mjpegtools-powerpc.diff +++ b/media/video/mjpegtools/mjpegtools-1.8.0-powerpc.diff 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 |