Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (17f7f2d7061aa0ff2557c9e211a310dc7911aa96)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (17f7f2d7061aa0ff2557c9e211a310dc7911aa96)
  • Date: Tue, 4 Jul 2006 20:11:26 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

video/mjpegtools/DEPENDS | 4 ++++
video/mjpegtools/HISTORY | 5 +++++
video/mjpegtools/PRE_BUILD | 6 +++++-
video/mjpegtools/mjpegtools-configure.ac-pkgconfig.diff | 13 +++++++++++++
4 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 17f7f2d7061aa0ff2557c9e211a310dc7911aa96
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fixing configure(.ac) to enable png dependency (nobody missed png2yuv?);
png check was skipped without quicktime check...

diff --git a/video/mjpegtools/DEPENDS b/video/mjpegtools/DEPENDS
index cabb585..53ddca5 100755
--- a/video/mjpegtools/DEPENDS
+++ b/video/mjpegtools/DEPENDS
@@ -3,6 +3,10 @@ depends glib2 &&
depends jpeg &&
depends X11-LIBS &&
depends nasm &&
+message version 1.8.0 needs recreation of configure...
+depends autoconf &&
+depends automake &&
+

optional_depends libpng \
"--with-libpng" \
diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index b765fc8..d323cf3 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,3 +1,8 @@
+2006-07-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, DEPENDS, mjpegtools-configure.ac-pkgconfig.diff:
+ fix for configure(.ac) to actually enable the png stuff without
+ quicktime... hopefully obsoleted by new version soon
+
2006-06-24 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: moved the PICy alpha arch check into disable_pic in
grimoire FUNCTIONS and made the no-PIC comment generic
diff --git a/video/mjpegtools/PRE_BUILD b/video/mjpegtools/PRE_BUILD
index 8c58756..f1cb151 100755
--- a/video/mjpegtools/PRE_BUILD
+++ b/video/mjpegtools/PRE_BUILD
@@ -1,4 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# gcc 4.1 fix
-sedit '19i#include <cassert>' y4mdenoise/Region2D.hh
+sedit '19i#include <cassert>' y4mdenoise/Region2D.hh &&
+# configure of 1.8.0 is broken when providing without-quicktime!
+# check for fix if there is a new release; also remove automake/conf deps
+patch < ${SCRIPT_DIRECTORY}/mjpegtools-configure.ac-pkgconfig.diff &&
+./autogen.sh
diff --git a/video/mjpegtools/mjpegtools-configure.ac-pkgconfig.diff
b/video/mjpegtools/mjpegtools-configure.ac-pkgconfig.diff
new file mode 100644
index 0000000..a1d6757
--- /dev/null
+++ b/video/mjpegtools/mjpegtools-configure.ac-pkgconfig.diff
@@ -0,0 +1,13 @@
+--- ../mjpegtools-1.8.0-nopng/configure.ac 2006-07-04 17:56:00.000000000
+0200
++++ configure.ac 2006-07-04 18:49:09.801873871 +0200
+@@ -233,6 +233,10 @@
+ have_jpeg=true ],,)
+ fi
+
++dnl We need this so that skipping the quicktime test doesn't cause
++dnl png test to be skipped
++PKG_PROG_PKG_CONFIG()
++
+ have_libquicktime=false
+ if test x$with_libquicktime != xno ; then
+ PKG_CHECK_MODULES(LIBQUICKTIME, [libquicktime >= 0.9.4],




Archive powered by MHonArc 2.6.24.

Top of Page