diff options
| author | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2007-09-27 07:15:18 +0000 |
|---|---|---|
| committer | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2007-09-27 07:15:18 +0000 |
| commit | f25e63145d4e967446d355df82bb75cecd881b42 (patch) | |
| tree | 8974ba21b4b6012f32d174073dafd00270261481 /media/video | |
| parent | b79345c066141ebf07ff1ad73e9b3d91f3bc775d (diff) | |
| download | slackbuilds-f25e63145d4e967446d355df82bb75cecd881b42.tar.gz slackbuilds-f25e63145d4e967446d355df82bb75cecd881b42.tar.bz2 | |
mjpegtools fixed for x86_64 and version bump
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1389 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'media/video')
| -rw-r--r-- | media/video/mjpegtools/mjpegtools-1.9.0rc2-x86_64.diff | 31 | ||||
| -rwxr-xr-x | media/video/mjpegtools/mjpegtools.SlackBuild | 12 |
2 files changed, 42 insertions, 1 deletions
diff --git a/media/video/mjpegtools/mjpegtools-1.9.0rc2-x86_64.diff b/media/video/mjpegtools/mjpegtools-1.9.0rc2-x86_64.diff new file mode 100644 index 00000000..0b834dfb --- /dev/null +++ b/media/video/mjpegtools/mjpegtools-1.9.0rc2-x86_64.diff @@ -0,0 +1,31 @@ +--- configure.ac.old 2007-09-27 05:53:17.000000000 +0000 ++++ configure.ac 2007-09-27 05:56:20.000000000 +0000 +@@ -431,25 +431,9 @@ + dnl file). + + if test x$have_x86cpu = xtrue -o x$have_ppccpu = xtrue; then +- if test x$host_alias != x; then +- dnl This is to allow cross compiling +- AC_MSG_CHECKING(sub-architecture settings) +- if test x$have_x86cpu = xtrue; then +- host_mod_cpu=`echo $host_cpu | tr _ -` +- ARCHFLAGS="-march=$host_mod_cpu -mcpu=$host_mod_cpu" +- fi +- else +- if test ! -r $srcdir/cpuinfo.sh; then +- AC_MSG_ERROR([cpuinfo.sh script not found - do a cvs update]) +- fi +- AC_MSG_CHECKING(sub-architecture settings) +- chmod +x $srcdir/cpuinfo.sh +- if test x$have_x86cpu = xtrue; then +- ARCHFLAGS=`$srcdir/cpuinfo.sh x86` +- elif test x$have_ppccpu = xtrue; then +- ARCHFLAGS=`$srcdir/cpuinfo.sh ppc` +- fi +- fi ++ AC_MSG_CHECKING(sub-architecture settings) ++ host_mod_cpu=`echo $host_cpu | tr _ -` ++ ARCHFLAGS="-march=$host_mod_cpu -mcpu=$host_mod_cpu" + AC_MSG_RESULT($ARCHFLAGS) + fi + diff --git a/media/video/mjpegtools/mjpegtools.SlackBuild b/media/video/mjpegtools/mjpegtools.SlackBuild index 589f7de2..17dc380c 100755 --- a/media/video/mjpegtools/mjpegtools.SlackBuild +++ b/media/video/mjpegtools/mjpegtools.SlackBuild @@ -39,7 +39,7 @@ fi # default settings PACKAGE="mjpegtools" ARCH=${ARCH:=i486} -VERSION=${VERSION:=1.9.0rc1} +VERSION=${VERSION:=1.9.0rc2} BUILD=${BUILD:=1rd} SRC_DIR=${SRC:=$CWD} TMP=${TMP:=/tmp} @@ -81,6 +81,12 @@ if [ "$ARCH" == "powerpc" ] && [ "$HAVE_ALTIVEC" != "true" ] && [ "$VERSION" == patch -p0 < $CWD/$PACKAGE-$VERSION-powerpc.diff fi +RERUN_AUTOCONF="no" +if [ "$ARCH" == "x86_64" ] && [ "$VERSION" == "1.9.0rc2" ]; then + patch -p0 < $CWD/$PACKAGE-$VERSION-x86_64.diff + RERUN_AUTOCONF="yes" +fi + if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then patch -p0 < $CWD/$PACKAGE-$VERSION.diff fi @@ -91,6 +97,10 @@ if [ "$ARCH" == "i386" ] || [ "$ARCH" == "i486" ]; then EXTRA_AC_OPTIONS=" --disable-simd-accel" fi +if [ "$RERUN_AUTOCONF" == "yes" ]; then + autoreconf -f -i +fi + ./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$VERSION $EXTRA_AC_OPTIONS make || exit 32 |