[SCM] openmovieeditor/master: Don't fail if libquicktime lacks lame and x264

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f0ac018cf0c9079c23335041776ee779de1a212d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 24 23:25:25 2011 +0100

    Don't fail if libquicktime lacks lame and x264

diff --git a/debian/patches/06-non-fatal-libquicktime b/debian/patches/06-non-fatal-libquicktime
new file mode 100644
index 0000000..27a0d6e
--- /dev/null
+++ b/debian/patches/06-non-fatal-libquicktime
@@ -0,0 +1,23 @@
+From: Reinhard Tartler <siretart at tauware.de>
+Subject: Don't fail if libquicktime lacks lame and x264
+
+Debian doesn't ship lame and x264 at this point
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,13 +139,13 @@ AC_RUN_IFELSE(
+      [AC_LANG_PROGRAM([[#include <lqt/lqt.h>]],
+                       [[ if ( lqt_find_audio_codec_by_name( "lame" ) ) { return 0; } return 1; ]])],
+                       [],
+-                      [AC_MSG_ERROR([Lame Codec in libquicktime not found, reinstall libquicktime with lame enabled])] )
++                      [AC_MSG_WARN([Lame Codec in libquicktime not found, reinstall libquicktime with lame enabled])] )
+ 
+ AC_RUN_IFELSE(
+      [AC_LANG_PROGRAM([[#include <lqt/lqt.h>]],
+                       [[ if ( lqt_find_video_codec_by_name( "x264" ) ) { return 0; } return 1; ]])],
+                       [],
+-                      [AC_MSG_ERROR([x264 Codec in libquicktime not found, reinstall libquicktime with x264 enabled])] )
++                      [AC_MSG_WARN([x264 Codec in libquicktime not found, reinstall libquicktime with x264 enabled])] )
+ 
+ LDFLAGS="$LDFLAGS_RESTORE"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2b3524b..e4a280e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 05-gcc_4.4.patch
+06-non-fatal-libquicktime

-- 
openmovieeditor packaging