[oe-commits] org.oe.dev djvulibre: fix configure a bit and stage files

[koen commit]

djvulibre: fix configure a bit and stage files

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: e489a54b3044832979b96290bb957a196b1f9f51
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e489a54b3044832979b96290bb957a196b1f9f51
Files:
1
packages/djvulibre/djvulibre
packages/djvulibre/djvulibre/fix-cross-configure.patch
packages/djvulibre/djvulibre_3.5.19.bb
Diffs:

#
# mt diff -rdc3f7d89e69a7e398ead1be2943f1d42d2e50b05 -re489a54b3044832979b96290bb957a196b1f9f51
#
# 
# 
# add_dir "packages/djvulibre/djvulibre"
# 
# add_file "packages/djvulibre/djvulibre/fix-cross-configure.patch"
#  content [97cf74db9d78777336330ac85b4a96c336357b86]
# 
# patch "packages/djvulibre/djvulibre_3.5.19.bb"
#  from [c3c9caa3bf4ee3e46c6090f5d1317c4835a93ca7]
#    to [31780467586c24a7eb4054b32db0e117544ef4e0]
# 
============================================================
--- packages/djvulibre/djvulibre/fix-cross-configure.patch	97cf74db9d78777336330ac85b4a96c336357b86
+++ packages/djvulibre/djvulibre/fix-cross-configure.patch	97cf74db9d78777336330ac85b4a96c336357b86
@@ -0,0 +1,50 @@
+--- /tmp/acinclude.m4	2007-08-09 22:33:05.000000000 +0200
++++ djvulibre-3.5.19/config/acinclude.m4	2007-08-09 22:33:39.288400000 +0200
+@@ -784,30 +784,6 @@
+         QTDIR=no
+     fi
+   fi
+-  # Execute
+-  if test "x$ac_has_qt" != xno ; then
+-    AC_MSG_CHECKING([if a small Qt program runs])
+-    AC_LANG_PUSH(C++)
+-    save_CXXFLAGS="$CXXFLAGS"
+-    save_LIBS="$LIBS"
+-    CXXFLAGS="$CXXFLAGS $CFLAGS $THREAD_CFLAGS $QT_CFLAGS $X_CFLAGS"
+-    LIBS="$THREAD_LIBS $QT_LIBS $X_LIBS $LIBS"
+-    AC_TRY_RUN([
+-#include <qfile.h>
+-#include <qtextstream.h>
+-#include <qglobal.h>
+-int main() { 
+-QFile qf("confout"); if (!qf.open(IO_WriteOnly)) return 1;
+-QTextStream ts(&qf); ts << QT_VERSION; return 0;
+-}],[okay=yes],[okay=no; QTDIR=no]) 
+-    CXXFLAGS="$save_CXXFLAGS"
+-    LIBS="$save_LIBS"
+-    AC_LANG_POP(C++)
+-    AC_MSG_RESULT($okay)
+-    if test "x$okay" = xno ; then
+-      ac_has_qt=no
+-    fi
+-  fi
+   # Version
+   if test "x$ac_has_qt" != xno ; then
+      AC_MSG_CHECKING([Qt version])
+--- /tmp/configure.ac	2007-08-09 22:46:50.000000000 +0200
++++ djvulibre-3.5.19/configure.ac	2007-08-09 22:47:06.988400000 +0200
+@@ -563,14 +563,8 @@
+ 
+ /* - QT */
+ #ifdef HAVE_QT
+-#if HAVE_QT < 200
+-#define QT1
+-#elif HAVE_QT < 300
+-#define QT2
+-#else
+ #define QT3
+ #endif
+-#endif
+ 
+ /* - X STUFF */
+ #ifdef HAVE_SYS_IPC_H
============================================================
--- packages/djvulibre/djvulibre_3.5.19.bb	c3c9caa3bf4ee3e46c6090f5d1317c4835a93ca7
+++ packages/djvulibre/djvulibre_3.5.19.bb	31780467586c24a7eb4054b32db0e117544ef4e0
@@ -1,15 +1,27 @@ LICENSE = "GPL"
 DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
 LICENSE = "GPL"
-SRC_URI = "http://downloads.sourceforge.net/djvu/djvulibre-${PV}.tar.gz"
 
 DEPENDS = "jpeg libpng tiff"
 
-inherit autotools pkgconfig
+SRC_URI = "http://downloads.sourceforge.net/djvu/djvulibre-${PV}.tar.gz \
+           file://fix-cross-configure.patch;patch=1"
 
+
+inherit qt4x11 autotools pkgconfig
+
+#export QT_LIBS = "${OE_QMAKE_LIBS_QT}"
+#export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ "
+
+EXTRA_OECONF = " --enable-threads \
+                 --with-qt=${QTDIR} "
+
 PACKAGES =+ "libdjvulibre"
 
 FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
 FILES_${PN} += "${datadir}/djvu"
 
+do_stage() {
+        autotools_stage_all
+}