mjpeg compilation fix

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@435 370017ae-e619-0410-ac65-c121f96126d4

diff --git a/mjpegtools/mjpegtools-1.8.0.diff b/mjpegtools/mjpegtools-1.8.0.diff
index 333aa011d51e0631e692aaad679850ba213c127c..928fa4c8ff95835532b01c3d8f0520f1ea9f18fc 100644 (file)
--- a/mjpegtools/mjpegtools-1.8.0.diff
+++ b/mjpegtools/mjpegtools-1.8.0.diff
@@ -1,10 +1,11 @@
---- Makefile.orig      2006-10-05 05:23:00.000000000 -0300
-+++ Makefile   2006-10-05 05:23:19.000000000 -0300
-@@ -257,7 +257,6 @@
- SUBDIRS = \
-       utils \
-       mpeg2enc \
--      lavtools \
-       aenc \
-       mplex \
-       scripts \
+--- 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/mjpegtools/mjpegtools.SlackBuild b/mjpegtools/mjpegtools.SlackBuild
index dbcc5d33738a2f7fef57a5a686147a05fcfa8ff3..453272d40662230c21c91bc30a03c8f2bfdf9a84 100755 (executable)
--- a/mjpegtools/mjpegtools.SlackBuild
+++ b/mjpegtools/mjpegtools.SlackBuild
@@ -67,14 +67,14 @@ cd $TMP
 tar xvf$tarflag $SRC_DIR/$SRC
 cd $PACKAGE-$VERSION
 
-
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$VERSION
-
-# a hack to compile without ffmpeg
 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
+
+
 make || exit 32
 make DESTDIR=$TMP/package-$PACKAGE install
 

diff --git a/mjpegtools/slack-required b/mjpegtools/slack-required
new file mode 100644 (file)
index 0000000..cd1ee77
--- /dev/null
+++ b/mjpegtools/slack-required
@@ -0,0 +1,2 @@
+libdv
+libquicktime