[SCM] openmovieeditor/master: explicitly link against libx11 and libgl

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fe47f1a049a70f39137219ae84951abfb09d6602
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Feb 25 07:04:03 2011 +0100

    explicitly link against libx11 and libgl

diff --git a/debian/patches/08-fix-no-add-needed.patch b/debian/patches/08-fix-no-add-needed.patch
new file mode 100644
index 0000000..3a33f38
--- /dev/null
+++ b/debian/patches/08-fix-no-add-needed.patch
@@ -0,0 +1,43 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,6 +17,7 @@ EXTRA_DIST = nle.fl FilterItemWidget.fl
+ AM_CPPFLAGS =  -D__STDC_CONSTANT_MACROS -ggdb -DINSTALL_PREFIX="\"$(prefix)\"" -I$(top_srcdir)/icons -I$(top_srcdir)/src -I$(top_srcdir)/src/tinyxml -I$(top_srcdir)/src/sl @CPPFLAGS@
+ 
+ bin_PROGRAMS = openmovieeditor
++openmovieeditor_CFLAGS = @X11_CFLAGS@
+ openmovieeditor_LDADD = tinyxml/libtinyxml.a timeline/libtimeline.a\
+ 	ProgressDialog/libProgressDialog.a\
+ 	sl/libsl.a\
+@@ -28,6 +29,8 @@ openmovieeditor_LDADD = tinyxml/libtinyx
+ 	Frei0r/libFrei0r.a\
+ 	ColorCurve/libColorCurve.a\
+ 	RenderDialog/libRenderDialog.a\
++	@X11_LIBS@\
++	@GL_LIBS@\
+ 	@PORTAUDIO19_LIBS@\
+ 	@SAMPLERATE_LIBS@\
+ 	@SNDFILE_LIBS@\
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,9 +93,20 @@ PKG_CHECK_MODULES(PORTAUDIO19, portaudio
+   AC_MSG_ERROR([*** portaudio-2.0 not found - this program requires portaudio >= 19 ***]))
+ CPPFLAGS="$CPPFLAGS $PORTAUDIO19_CFLAGS"
+ 
++PKG_CHECK_MODULES(X11, [x11],
++  [
++     AC_DEFINE(HAVE_X11, 1, [Define if X11 development libraries is available])
++  ],
++  [
++     AC_MSG_ERROR([Required X11 development libraries not found])
++  ])
++AC_SUBST(X11_CFLAGS)
++AC_SUBST(X11_LIBS)
++
+  AC_CHECK_HEADER(GL/gl.h,,
+   AC_MSG_ERROR([*** GL/gl.h not found - this program requires OpenGL or compatible (Mesa) Hint: install mesa-common-dev ***]))
+-
++GL_LIBS="-lGL"
++AC_SUBST(GL_LIBS)
+ 
+ dnl FLTK-Check Shamelessly stolen from SpiralSynthModular
+ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
diff --git a/debian/patches/series b/debian/patches/series
index 7c60134..452de60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 05-gcc_4.4.patch
 06-non-fatal-libquicktime
 07-fix-ftbfs-stdc_constant_macros.patch
+08-fix-no-add-needed.patch

-- 
openmovieeditor packaging