merging with changes made since 21th May

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@233 18ef50b8-d735-4ccd-97c1-689132df3dd9

4 files changed, 172 insertions, 0 deletions

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 0000000..6036b1d
--- /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-1.8.0.diff b/media/video/mjpegtools/mjpegtools-1.8.0.diff
new file mode 100644
index 0000000..928fa4c
--- /dev/null
+++ b/media/video/mjpegtools/mjpegtools-1.8.0.diff
@@ -0,0 +1,11 @@
+--- lavtools/lav_io.c.orig	2006-10-18 17:15:20.000000000 -0200
++++ lavtools/lav_io.c	2006-10-18 17:17:54.000000000 -0200
+@@ -1367,7 +1367,7 @@
+          break;
+ #ifdef HAVE_LIBQUICKTIME
+       case 'q':
+-         res = fileno(((quicktime_t *)lav_file->qt_fd)->stream);
++         res = lqt_fileno((quicktime_t *)lav_file->qt_fd);
+          break;
+ #endif
+       default:
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 0000000..0b834df
--- /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.mkbuild b/media/video/mjpegtools/mjpegtools.mkbuild
new file mode 100644
index 0000000..b40a4dc
--- /dev/null
+++ b/media/video/mjpegtools/mjpegtools.mkbuild
@@ -0,0 +1,119 @@
+#
+#  This mkbuild is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or any later version.
+#
+#  This mkbuild is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+#  Place - Suite 330, Boston, MA 02111-1307, USA
+#
+
+#--------------------
+# Personal variables
+#--------------------
+# Author name
+[[SLACKBUILD AUTHOR]]="Silvio Rhatto"
+
+# Initials author name
+[[SLACKBUILD AUTHOR INITIALS]]="rha"
+
+#------------------------
+# Construction Variables
+#------------------------
+#
+# Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
+[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/mjpeg/mjpegtools-1.9.0rc3.tar.gz"
+
+#
+# Documentation files. Null ("") to auto-set commom doc-files:
+[[DOCUMENTATION FILES]]="AUTHORS BUGS CHANGES COPYING ChangeLog INSTALL NEWS PLANS README TODO"
+
+# Other configure arguments
+#
+# - Add --enable-runtime-cpudetection for package creation!
+# - Removing ivtv as for slack 12.1 it`s not compiling.
+[[OTHER CONFIGURE ARGS]]="--with-docdir=/usr/doc/$PKG_NAME-$VERSION"
+
+# SlackBuild model
+[[SLACKBUILD MODEL]]="generic.mkSlackBuild"
+
+# SlackBuild PATH in Slack.Sarava tree
+[[SLACKBUILD PATH]]="media/video/mjpegtools"
+
+#
+# Dependency list input
+[[SLACK REQUIRED]]="libdv: libquicktime"
+
+#---------------------
+# SlackBuild Sections
+#---------------------
+# Default sections:
+#      head, set_variables, slkflags, start_structure, untar_source,
+#      make_package, install_package, build_package
+# Warning: don't remove '#>>' and "#<<" tags.
+#>> Start SlackBuild Sections:
+ on: head
+ on: slackbuildrc
+ on: set_variables
+ on: slkflags
+ on: error_codes
+ on: start_structure
+off: create_build_user_and_group
+ on: download_source
+off: md5sum_download_and_check_0
+off: md5sum_download_and_check_1
+off: gpg_signature_check
+ on: untar_source
+ on: patch_source
+ on: configure
+ on: make_package
+ on: install_package
+ on: strip_binaries
+off: compress_manpages
+off: compress_info_files
+off: copy_init_scripts
+ on: install_documentation
+ on: slackdesc
+off: move_config_files
+off: postinstall_script
+ on: build_package
+ on: clean_builds
+#<< End SlackBuild Sections
+
+#------------------
+# Sections changes
+#------------------
+#>slackdesc
+mjpegtools: mjpegtools (mjpegtools is a set of softwares for MPEG A/V)
+mjpegtools:
+mjpegtools: The mjpeg programs are a set of tools that can do recording of videos
+mjpegtools: and playback, simple cut-and-paste editing and the MPEG compression
+mjpegtools: of audio and video under Linux.
+mjpegtools:
+mjpegtools: 
+mjpegtools: 
+mjpegtools:
+mjpegtools: http://mjpeg.sourceforge.net/
+mjpegtools: 
+#<slackdesc
+
+#p>
+ LIBDIR="$PREFIX/lib"
++
++if [ "$ARCH" == "i386" ] || [ "$ARCH" == "i486" ]; then
++  CONF_OPTIONS="$CONF_OPTIONS --disable-simd-accel"
++fi
+#p<
+
+#>configure
+# Configure
+autoreconf -vif 
+CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+#<configure