[oe-commits] org.oe.dev merge of '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
mickeyl commit
oe at amethyst.openembedded.net
Tue Jul 8 12:52:47 UTC 2008
merge of '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
and 'fd2e08736e0fe9e7ddd372595adb5f733bc2ca19'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: c9263feb82078e96cdcfac1768ad6c15214d7689
ViewMTN: http://monotone.openembedded.org/revision/info/c9263feb82078e96cdcfac1768ad6c15214d7689
Files:
1
packages/images/fso-image.bb
packages/gtk-doc/gtk-doc.bb
packages/linux/linux-neuros/neuros-osd2/defconfig
packages/linux/linux-neuros_git.bb
packages/meta/meta-toolchain-neuros.bb
packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch
packages/qt4/qt-embedded_4.4.0.bb
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
Diffs:
#
# mt diff -r560558ea6e0ea810e06402a8fd1e19d8c46e68c6 -rc9263feb82078e96cdcfac1768ad6c15214d7689
#
#
#
# patch "packages/images/fso-image.bb"
# from [dce081cba6576f35793e776422e81e47ea57d62b]
# to [ed48a221328cfc4e99587341b1139811a37425d9]
#
============================================================
--- packages/images/fso-image.bb dce081cba6576f35793e776422e81e47ea57d62b
+++ packages/images/fso-image.bb ed48a221328cfc4e99587341b1139811a37425d9
@@ -39,6 +39,7 @@ TOOLS_INSTALL = "\
TOOLS_INSTALL = "\
# bash \
htop \
+ mickeydbus \
mickeyterm \
nano \
powertop \
#
# mt diff -rfd2e08736e0fe9e7ddd372595adb5f733bc2ca19 -rc9263feb82078e96cdcfac1768ad6c15214d7689
#
#
#
# patch "packages/gtk-doc/gtk-doc.bb"
# from [67b6c2ef4ebc159a3f8987b2bda9967bde992e9d]
# to [64f93dc7f8ebf7f55577f45d5f48394ab8c06fa9]
#
# patch "packages/linux/linux-neuros/neuros-osd2/defconfig"
# from [01904f3357f46a93c12b2301c94ddd9bb6276011]
# to [b437ee0b18fc27f9716c12f286fe71a31d157702]
#
# patch "packages/linux/linux-neuros_git.bb"
# from [d2e46023ffdd2a94c8a64a85a822d65cfa6ab270]
# to [34b3e338dd002f3fd5c5bc899e3ee6665bd2928f]
#
# patch "packages/meta/meta-toolchain-neuros.bb"
# from [066395dfafa447927fcf95e68c986d1bc094b788]
# to [975bc80b05a6d5c8ee34c730b23a41c8d922ad55]
#
# patch "packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch"
# from [d658de82afadd552dfebba2e14aae9fa06a2eb8b]
# to [36b5d42de52855e6a1ad8b8858043fbef8ec9963]
#
# patch "packages/qt4/qt-embedded_4.4.0.bb"
# from [86a85e11531033206bab2d45354a54a342a83cff]
# to [a43069a01436e4ec29441b3906a77bc1900b2514]
#
# patch "packages/qt4/qt_packaging.inc"
# from [39f09b583e2e9f61e01f5d75bf57e75690501ed4]
# to [cdcb30f8d5129d48f437eb3d17daf8637da3fc38]
#
# patch "packages/qt4/qt_staging.inc"
# from [311fad49c6f57f9d909e3aa12a9f4635e194da20]
# to [47a145dc6e238d6fffdbd1cfa27edaa0e623d3ef]
#
============================================================
--- packages/gtk-doc/gtk-doc.bb 67b6c2ef4ebc159a3f8987b2bda9967bde992e9d
+++ packages/gtk-doc/gtk-doc.bb 64f93dc7f8ebf7f55577f45d5f48394ab8c06fa9
@@ -1,8 +1,15 @@ LICENSE = "LGPL"
SECTION = "x11/base"
SRC_URI = "file://gtk-doc.m4"
LICENSE = "LGPL"
-PR="r1"
+PR = "r2"
+ALLOW_EMPTY_${PN} = "1"
+
+do_install() {
+ install -d ${D}/${datadir}/aclocal
+ install -m 0644 ${WORKDIR}/gtk-doc.m4 ${D}/${datadir}/aclocal
+}
+
do_stage() {
install -d ${STAGING_DATADIR}/aclocal
install -m 0644 ${WORKDIR}/gtk-doc.m4 ${STAGING_DATADIR}/aclocal/
============================================================
--- packages/linux/linux-neuros/neuros-osd2/defconfig 01904f3357f46a93c12b2301c94ddd9bb6276011
+++ packages/linux/linux-neuros/neuros-osd2/defconfig b437ee0b18fc27f9716c12f286fe71a31d157702
@@ -848,6 +848,8 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_DAVINCI=y
+CONFIG_VIDEO_TVP5150=y
# CONFIG_VIDEO_TVP5146 is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_CPIA2 is not set
@@ -1167,7 +1169,7 @@ CONFIG_AUTOFS4_FS=m
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=m
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=y
#
# CD-ROM/DVD Filesystems
============================================================
--- packages/linux/linux-neuros_git.bb d2e46023ffdd2a94c8a64a85a822d65cfa6ab270
+++ packages/linux/linux-neuros_git.bb 34b3e338dd002f3fd5c5bc899e3ee6665bd2928f
@@ -2,10 +2,10 @@ DESCRIPTION = "Linux kernel for Neuros O
DESCRIPTION = "Linux kernel for Neuros OSD devices"
-SRCREV = "730beeee197cef4ff1e92ee322481380996a0390"
+SRCREV = "723849a80153f079a653d06a660f63fec67f6d1e"
PV = "2.6.23-${PR}+git${SRCREV}"
-PR = "r3"
+PR = "r4"
COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
============================================================
--- packages/meta/meta-toolchain-neuros.bb 066395dfafa447927fcf95e68c986d1bc094b788
+++ packages/meta/meta-toolchain-neuros.bb 975bc80b05a6d5c8ee34c730b23a41c8d922ad55
@@ -1,5 +1,14 @@
+# Toolchain for neuros-osd devices
+
+PR = "r1"
+
TOOLCHAIN_HOST_TASK = "task-sdk-host"
require meta-toolchain.bb
+TOOLCHAIN_TARGET_TASK += " \
+ dbus dbus-dev \
+ qt-embedded qt-embedded-dev \
+ "
+
SDK_SUFFIX = "toolchain-neuros"
============================================================
--- packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch d658de82afadd552dfebba2e14aae9fa06a2eb8b
+++ packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch 36b5d42de52855e6a1ad8b8858043fbef8ec9963
@@ -1,6 +1,6 @@
--- /tmp/src.pro 2008-07-08 10:43:30.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.0/src/src.pro 2008-07-08 10:44:04.000000000 +0200
-@@ -6,7 +6,7 @@
++++ qt-embedded-linux-opensource-src-4.4.0/src/src.pro 2008-07-08 11:28:24.000000000 +0200
+@@ -6,12 +6,9 @@
wince*:{
SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
} else {
@@ -8,4 +8,9 @@
+ SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib
contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
+- !cross_compile {
+- contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
+- }
+ }
+ win32:!contains(QT_EDITION, OpenSource|Console): {
+ SRC_SUBDIRS += src_activeqt
- !cross_compile {
============================================================
--- packages/qt4/qt-embedded_4.4.0.bb 86a85e11531033206bab2d45354a54a342a83cff
+++ packages/qt4/qt-embedded_4.4.0.bb a43069a01436e4ec29441b3906a77bc1900b2514
@@ -1,5 +1,7 @@ require qtopia-core.inc
require qtopia-core.inc
+PR = "r2"
+
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
file://qconfig-oe.h \
file://0001-cross-compile.patch;patch=1 \
@@ -21,5 +23,7 @@ QT_CONFIG_FLAGS += " \
-DQT_KEYPAD_NAVIGATION \
"
+QT_BASE_NAME = "qt-embedded"
+QT_BASE_LIB = "libqt-embedded"
============================================================
--- packages/qt4/qt_packaging.inc 39f09b583e2e9f61e01f5d75bf57e75690501ed4
+++ packages/qt4/qt_packaging.inc cdcb30f8d5129d48f437eb3d17daf8637da3fc38
@@ -3,6 +3,7 @@ NONDEV_PACKAGES += "${QT_BASE_LIB}core4
${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \
${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \
${QT_BASE_LIB}dbus4 ${QT_BASE_LIB}opengl4 \
+ ${QT_BASE_LIB}help ${QT_BASE_LIB}clucene ${QT_BASE_LIB}webkit \
${QT_BASE_NAME}-assistant ${QT_BASE_NAME}-common \
${QT_BASE_NAME}-designer \
${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \
@@ -24,7 +25,11 @@ DEV_PACKAGES += "${QT_BASE_LIB}core4-dev
${QT_BASE_LIB}script4-dev \
${QT_BASE_LIB}dbus4-dev \
${QT_BASE_LIB}opengl4-dev \
- ${QT_BASE_LIB}uitools4-dev"
+ ${QT_BASE_LIB}uitools4-dev \
+ ${QT_BASE_LIB}help-dev \
+ ${QT_BASE_LIB}clucene-dev \
+ ${QT_BASE_LIB}webkit-dev \
+ "
DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \
${QT_BASE_LIB}gui4-dbg \
@@ -39,7 +44,11 @@ DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg
${QT_BASE_LIB}assistantclient4-dbg \
${QT_BASE_LIB}script4-dbg \
${QT_BASE_LIB}dbus4-dbg \
- ${QT_BASE_LIB}opengl4-dbg"
+ ${QT_BASE_LIB}opengl4-dbg \
+ ${QT_BASE_LIB}help-dbg \
+ ${QT_BASE_LIB}clucene-dbg \
+ ${QT_BASE_LIB}webkit-dbg \
+ "
PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}"
@@ -48,9 +57,9 @@ FILES_${PN}-dbg = "${bindir}/*/.debug "
FILES_${PN} = ""
FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*"
FILES_${PN}-dbg = "${bindir}/*/.debug "
-RDEPENDS_${PN} = "${NONDEV_PACKAGES}"
-RDEPENDS_${PN}-dev = "${DEV_PACKAGES}"
-RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}"
+RRECOMMENDS_${PN} = "${NONDEV_PACKAGES}"
+RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
+RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
def qt_default_dev(name):
return """${libdir}/libQt%(name)s${QT_LIBINFIX}.la
@@ -103,8 +112,16 @@ FILES_${QT_BASE_LIB}uitools4-dev
FILES_${QT_BASE_LIB}opengl4-dev = "${@qt_default_dev('OpenGL')}"
FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/libQtOpenGL*"
FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc"
+FILES_${QT_BASE_LIB}help = "${libdir}/libQtHelp${QT_LIBINFIX}.so.*"
+FILES_${QT_BASE_LIB}help-dev = "${@qt_default_dev('Help')}"
+FILES_${QT_BASE_LIB}help-dbg = "${libdir}/.debug/libQtHelp*"
+FILES_${QT_BASE_LIB}clucene = "${libdir}/libQtCLucene${QT_LIBINFIX}.so.*"
+FILES_${QT_BASE_LIB}clucene-dev = "${@qt_default_dev('CLucene')}"
+FILES_${QT_BASE_LIB}clucene-dbg = "${libdir}/.debug/libQtCLucene*"
+FILES_${QT_BASE_LIB}webkit = "${libdir}/libQtWebKit${QT_LIBINFIX}.so.*"
+FILES_${QT_BASE_LIB}webkit-dev = "${@qt_default_dev('WebKit')}"
+FILES_${QT_BASE_LIB}webkit-dbg = "${libdir}/.debug/libQtWebKit*"
-
FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*"
FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts"
============================================================
--- packages/qt4/qt_staging.inc 311fad49c6f57f9d909e3aa12a9f4635e194da20
+++ packages/qt4/qt_staging.inc 47a145dc6e238d6fffdbd1cfa27edaa0e623d3ef
@@ -6,6 +6,11 @@ do_stage_append() {
sed -i s#"uic_location=${STAGING_BINDIR}/uic4$"## Qt*.pc
sed -i s#"-L${STAGING_LIBDIR}"##g Qt*.pc
sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g Qt*.pc
+ sed -i s#"-L${S}/lib"##g phonon*.pc
+ sed -i s#"moc_location=${STAGING_BINDIR}/moc4$"## phonon*.pc
+ sed -i s#"uic_location=${STAGING_BINDIR}/uic4$"## phonon*.pc
+ sed -i s#"-L${STAGING_LIBDIR}"##g phonon*.pc
+ sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g phonon*.pc
cd ${STAGING_LIBDIR}
sed -i s#"-L${S}/lib"##g libQt*.la
More information about the Openembedded-commits
mailing list