diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-08-09 21:32:29 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-08-09 21:32:29 +0000 |
| commit | 3e77d8d1dbda169294334f6eda1e30a6317bc9bd (patch) | |
| tree | 971a67d8ecd819fa3d36850bc935123e43b4efa1 /packages | |
| parent | 7f5a5b5b677552eb0f158355d10915654bb80f3c (diff) | |
djvulibre: fix configure a bit and stage files
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/djvulibre/djvulibre/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/djvulibre/djvulibre/fix-cross-configure.patch | 50 | ||||
| -rw-r--r-- | packages/djvulibre/djvulibre_3.5.19.bb | 16 |
3 files changed, 64 insertions, 2 deletions
diff --git a/packages/djvulibre/djvulibre/.mtn2git_empty b/packages/djvulibre/djvulibre/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/djvulibre/djvulibre/.mtn2git_empty diff --git a/packages/djvulibre/djvulibre/fix-cross-configure.patch b/packages/djvulibre/djvulibre/fix-cross-configure.patch new file mode 100644 index 0000000000..42d4eff715 --- /dev/null +++ b/packages/djvulibre/djvulibre/fix-cross-configure.patch @@ -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 diff --git a/packages/djvulibre/djvulibre_3.5.19.bb b/packages/djvulibre/djvulibre_3.5.19.bb index aab08cb937..5ba5751f2d 100644 --- a/packages/djvulibre/djvulibre_3.5.19.bb +++ b/packages/djvulibre/djvulibre_3.5.19.bb @@ -1,15 +1,27 @@ 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 +} |