[oe-commits] org.oe.dev merge of '9b6cdd024207fb27c1273c341b1610c554f948e9'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Aug 9 21:48:13 UTC 2007
merge of '9b6cdd024207fb27c1273c341b1610c554f948e9'
and 'a8e71f07bc5697f18dc65c9774d84f92706d66b8'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a3238428069890cd5cf99ac6dca5e381e53253c5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a3238428069890cd5cf99ac6dca5e381e53253c5
Files:
1
packages/hsetroot
packages/hsetroot/files
packages/hsetroot/files/pkgconfigize-imlib.patch
packages/hsetroot/hsetroot_1.0.2.bb
packages/openmoko2/openmoko-today2-folders_svn.bb
packages/xorg-app/xsetroot_1.0.1.bb
packages/xorg-data/xbitmaps_1.0.1.bb
classes/openmoko2.bbclass
packages/openmoko2/openmoko-today2_svn.bb
packages/xorg-data/xorg-data-common.inc
packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch
packages/djvulibre
packages/djvulibre/djvulibre
packages/djvulibre/djvulibre/fix-cross-configure.patch
packages/djvulibre/djvulibre_3.5.19.bb
conf/machine/compulab-pxa270.conf
packages/evince/evince_0.9.2.bb
packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
Diffs:
#
# mt diff -r9b6cdd024207fb27c1273c341b1610c554f948e9 -ra3238428069890cd5cf99ac6dca5e381e53253c5
#
#
#
# add_dir "packages/hsetroot"
#
# add_dir "packages/hsetroot/files"
#
# add_file "packages/hsetroot/files/pkgconfigize-imlib.patch"
# content [c4cb582c5b2c500412e13ff7a2c1c4df2cfda76c]
#
# add_file "packages/hsetroot/hsetroot_1.0.2.bb"
# content [d7436d5169735ccc2cfc6d3f2757aef56a883580]
#
# add_file "packages/openmoko2/openmoko-today2-folders_svn.bb"
# content [0006363c7115bfb714551d3d98576cd6dc8f5b63]
#
# add_file "packages/xorg-app/xsetroot_1.0.1.bb"
# content [c84c12a9d20aa36a5ccb5fc39af4a91c858026d5]
#
# add_file "packages/xorg-data/xbitmaps_1.0.1.bb"
# content [613ab066e8981893ec5634d14519baa5129ae981]
#
# patch "classes/openmoko2.bbclass"
# from [0df47a563a30739aee9506ceb7ea8c79053d4d43]
# to [aeee18267ff406fd5434a5b0cfc049c370d20948]
#
# patch "packages/openmoko2/openmoko-today2_svn.bb"
# from [f0230b08ffc42d89e2beb89f2688d27e306bd201]
# to [4a336d3c6f2934119aa14c0b8ff939b2524d8fd3]
#
# patch "packages/xorg-data/xorg-data-common.inc"
# from [6dce0e942b799f95d54b1dcd7fbb6b30b6f2e647]
# to [e93106fee5d6c2e7561d0522c7a6ed0e4faf274e]
#
============================================================
--- packages/hsetroot/files/pkgconfigize-imlib.patch c4cb582c5b2c500412e13ff7a2c1c4df2cfda76c
+++ packages/hsetroot/files/pkgconfigize-imlib.patch c4cb582c5b2c500412e13ff7a2c1c4df2cfda76c
@@ -0,0 +1,22 @@
+Index: hsetroot-1.0.2/configure.ac
+===================================================================
+--- hsetroot-1.0.2.orig/configure.ac 2003-09-05 21:41:38.000000000 +0000
++++ hsetroot-1.0.2/configure.ac 2007-08-09 21:14:09.000000000 +0000
+@@ -39,16 +39,7 @@
+ AC_C_CONST
+
+ # Check for imlib2
+-AC_CHECK_PROGS(imlib2config_cmd, imlib2-config)
+-if test x$imlib2config_cmd = "x"; then
+- AC_MSG_ERROR([error. Imlib2 is required to compile.])
+-fi
+-
+-IMLIB2_CFLAGS=`$imlib2config_cmd --cflags`
+-AC_SUBST(IMLIB2_CFLAGS)
+-
+-IMLIB2_LIBS=`$imlib2config_cmd --libs`
+-AC_SUBST(IMLIB2_LIBS)
++PKG_CHECK_MODULES(IMLIB2, imlib2)
+
+ # Some extra definitions for config.h
+ AC_DEFINE(DESCRIPTION, "yet another wallpaper application", [single line package description])
============================================================
--- packages/hsetroot/hsetroot_1.0.2.bb d7436d5169735ccc2cfc6d3f2757aef56a883580
+++ packages/hsetroot/hsetroot_1.0.2.bb d7436d5169735ccc2cfc6d3f2757aef56a883580
@@ -0,0 +1,10 @@
+DESCRIPTION = "Yet another X Wallpaper Utility"
+DEPENDS += "imlib2 freetype zlib virtual/libx11 libxext"
+RDEPENDS += "imlib2-loaders"
+LICENSE = "GPL"
+
+SRC_URI = "http://thegraveyard.org/files/hsetroot-${PV}.tar.gz \
+ file://pkgconfigize-imlib.patch;patch=1"
+
+inherit autotools
+
============================================================
--- packages/openmoko2/openmoko-today2-folders_svn.bb 0006363c7115bfb714551d3d98576cd6dc8f5b63
+++ packages/openmoko2/openmoko-today2-folders_svn.bb 0006363c7115bfb714551d3d98576cd6dc8f5b63
@@ -0,0 +1,8 @@
+DESCRIPTION = "The OpenMoko Today2 vfolder files"
+SECTION = "openmoko/misc"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r1"
+
+inherit openmoko2
+
+FILES_${PN} += "${datadir}"
============================================================
--- packages/xorg-app/xsetroot_1.0.1.bb c84c12a9d20aa36a5ccb5fc39af4a91c858026d5
+++ packages/xorg-app/xsetroot_1.0.1.bb c84c12a9d20aa36a5ccb5fc39af4a91c858026d5
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
============================================================
--- packages/xorg-data/xbitmaps_1.0.1.bb 613ab066e8981893ec5634d14519baa5129ae981
+++ packages/xorg-data/xbitmaps_1.0.1.bb 613ab066e8981893ec5634d14519baa5129ae981
@@ -0,0 +1,6 @@
+require xorg-data-common.inc
+
+DESCRIPTION = "Common X11 Bitmaps"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+
============================================================
--- classes/openmoko2.bbclass 0df47a563a30739aee9506ceb7ea8c79053d4d43
+++ classes/openmoko2.bbclass aeee18267ff406fd5434a5b0cfc049c370d20948
@@ -18,6 +18,7 @@ def openmoko_two_get_subdir(d):
elif section == "panel-plugin": return "panel-plugins"
elif section == "inputmethods": return "inputmethods"
elif section == "daemons": return "daemons"
+ elif section == "misc": return "misc"
else: return section
LICENSE = "${@openmoko_two_get_license(d)}"
@@ -30,4 +31,3 @@ SVNREV = "${SRCDATE}"
# SVNREV = "r${SRCREV}"
SVNREV = "${SRCDATE}"
-
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb f0230b08ffc42d89e2beb89f2688d27e306bd201
+++ packages/openmoko2/openmoko-today2_svn.bb 4a336d3c6f2934119aa14c0b8ff939b2524d8fd3
@@ -1,7 +1,7 @@ DEPENDS = "libmokoui2 libmokojournal2 st
DESCRIPTION = "The OpenMoko Application Launcher"
SECTION = "openmoko/pim"
DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
-RDEPENDS = "libedata-cal"
+RDEPENDS = "libedata-cal openmoko-today2-folders"
PV = "0.1.0+svn${SVNREV}"
PR = "r1"
============================================================
--- packages/xorg-data/xorg-data-common.inc 6dce0e942b799f95d54b1dcd7fbb6b30b6f2e647
+++ packages/xorg-data/xorg-data-common.inc e93106fee5d6c2e7561d0522c7a6ed0e4faf274e
@@ -1,15 +1,14 @@
-DESCRIPTION = "X data files"
HOMEPAGE = "http://www.x.org"
-SECTION = "x11/datas"
+SECTION = "x11/data"
LICENSE = "MIT-X"
-#DEPENDS = ""
XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.bz2"
+
+SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2"
S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
do_stage() {
- autotools_stage_all
+ autotools_stage_all
}
#
# mt diff -ra8e71f07bc5697f18dc65c9774d84f92706d66b8 -ra3238428069890cd5cf99ac6dca5e381e53253c5
#
#
#
# delete "packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch"
#
# add_dir "packages/djvulibre"
#
# add_dir "packages/djvulibre/djvulibre"
#
# add_file "packages/djvulibre/djvulibre/fix-cross-configure.patch"
# content [97cf74db9d78777336330ac85b4a96c336357b86]
#
# add_file "packages/djvulibre/djvulibre_3.5.19.bb"
# content [31780467586c24a7eb4054b32db0e117544ef4e0]
#
# patch "conf/machine/compulab-pxa270.conf"
# from [d9dda180b32b678bbc7dc3203f202d0227bd7798]
# to [d1c4d22022e1eaefa1637b8babd925a8cb738cde]
#
# patch "packages/evince/evince_0.9.2.bb"
# from [c874b55da09d3037d303e145d2cc1507fa7402e6]
# to [89ebf8b7f1349cc3376ba3c7c781805d0338ba57]
#
# patch "packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb"
# from [66be2f89db871d9f47bb60ef860291f8a044a83a]
# to [f797773ba0845c30eddffcfbb49a48cfe714c5f8]
#
# patch "packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb"
# from [9e69c08c4d3dafe0040fce4094a659f68c3c46ce]
# to [46fb3e7b690e3d2f04c2000b9fee01b49940a3f7]
#
============================================================
--- 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 31780467586c24a7eb4054b32db0e117544ef4e0
+++ packages/djvulibre/djvulibre_3.5.19.bb 31780467586c24a7eb4054b32db0e117544ef4e0
@@ -0,0 +1,27 @@
+DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
+LICENSE = "GPL"
+
+DEPENDS = "jpeg libpng tiff"
+
+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
+}
+
+
============================================================
--- conf/machine/compulab-pxa270.conf d9dda180b32b678bbc7dc3203f202d0227bd7798
+++ conf/machine/compulab-pxa270.conf d1c4d22022e1eaefa1637b8babd925a8cb738cde
@@ -1,9 +1,9 @@ TARGET_ARCH = "arm"
#@TYPE: Machine
#@Name: Compulab PXA270 system
#@DESCRIPTION: Machine configuration for Compulab PXA270 system
#OLDEST_KERNEL = "2.6.16"
TARGET_ARCH = "arm"
-PREFERRED_VERSION_compulab-pxa270 = "2.6.16"
+PREFERRED_VERSION_compulab-pxa270 = "2.6.22"
GUI_MACHINE_CLASS ?= "bigscreen"
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
============================================================
--- packages/evince/evince_0.9.2.bb c874b55da09d3037d303e145d2cc1507fa7402e6
+++ packages/evince/evince_0.9.2.bb 89ebf8b7f1349cc3376ba3c7c781805d0338ba57
@@ -1,7 +1,7 @@ SECTION = "x11/office"
DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
LICENSE = "GPL"
SECTION = "x11/office"
-DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
+DEPENDS = "tiff djvulibre libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
RDEPENDS = "espgs "
RRECOMMENDS = "gnome-vfs-plugin-file"
PR = "r1"
@@ -12,5 +12,9 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOM
file://no-icon-theme.diff;patch=1;pnum=0 \
file://no-help-dir.patch;patch=1"
-EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper"
+EXTRA_OECONF = " --without-libgnome \
+ --disable-thumbnailer \
+ --disable-scrollkeeper \
+ --enable-djvu \
+ "
============================================================
--- packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb 66be2f89db871d9f47bb60ef860291f8a044a83a
+++ packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb f797773ba0845c30eddffcfbb49a48cfe714c5f8
@@ -1,8 +1,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};m
require ${PN}.inc
PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet"
-
-# file://sysconfig-bluetooth.patch;patch=1"
============================================================
--- packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb 9e69c08c4d3dafe0040fce4094a659f68c3c46ce
+++ packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb 46fb3e7b690e3d2f04c2000b9fee01b49940a3f7
@@ -1,8 +1,7 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
+ ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
- ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \
- file://sysconfig-bluetooth.patch;patch=1"
More information about the Openembedded-commits
mailing list