summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/gtk-doc/gtk-doc.bb9
-rw-r--r--packages/linux/linux-neuros/neuros-osd2/defconfig4
-rw-r--r--packages/linux/linux-neuros_git.bb4
-rw-r--r--packages/meta/meta-toolchain-neuros.bb9
-rw-r--r--packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch11
-rw-r--r--packages/qt4/qt-embedded_4.4.0.bb4
-rw-r--r--packages/qt4/qt_packaging.inc29
-rw-r--r--packages/qt4/qt_staging.inc5
8 files changed, 62 insertions, 13 deletions
diff --git a/packages/gtk-doc/gtk-doc.bb b/packages/gtk-doc/gtk-doc.bb
index 8609138bac..f0dbdd0bae 100644
--- a/packages/gtk-doc/gtk-doc.bb
+++ b/packages/gtk-doc/gtk-doc.bb
@@ -1,7 +1,14 @@
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
diff --git a/packages/linux/linux-neuros/neuros-osd2/defconfig b/packages/linux/linux-neuros/neuros-osd2/defconfig
index b729767e3e..d68f2d069f 100644
--- a/packages/linux/linux-neuros/neuros-osd2/defconfig
+++ b/packages/linux/linux-neuros/neuros-osd2/defconfig
@@ -848,6 +848,8 @@ CONFIG_VIDEO_V4L2=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_INOTIFY_USER=y
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
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index db04361de6..5450fe75f8 100644
--- a/packages/linux/linux-neuros_git.bb
+++ b/packages/linux/linux-neuros_git.bb
@@ -2,10 +2,10 @@ require linux.inc
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)"
diff --git a/packages/meta/meta-toolchain-neuros.bb b/packages/meta/meta-toolchain-neuros.bb
index c8ed213dc4..5905eceec1 100644
--- a/packages/meta/meta-toolchain-neuros.bb
+++ b/packages/meta/meta-toolchain-neuros.bb
@@ -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"
diff --git a/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch b/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch
index 21e9fffe5e..bb36444f80 100644
--- a/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch
+++ b/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch
@@ -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 {
+- !cross_compile {
+- contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
+- }
+ }
+ win32:!contains(QT_EDITION, OpenSource|Console): {
+ SRC_SUBDIRS += src_activeqt
diff --git a/packages/qt4/qt-embedded_4.4.0.bb b/packages/qt4/qt-embedded_4.4.0.bb
index 027c049f46..f7b8ab0267 100644
--- a/packages/qt4/qt-embedded_4.4.0.bb
+++ b/packages/qt4/qt-embedded_4.4.0.bb
@@ -1,5 +1,7 @@
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"
diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc
index 1b4faf97d2..a0d4bf8bbc 100644
--- a/packages/qt4/qt_packaging.inc
+++ b/packages/qt4/qt_packaging.inc
@@ -3,6 +3,7 @@ NONDEV_PACKAGES += "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network
${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 @@ ALLOW_EMPTY_${PN} = "1"
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,7 +112,15 @@ FILES_${QT_BASE_LIB}opengl4 = "${libdir}/libQtOpenGL${QT_LIBINFI
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*"
diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc
index a49be4757e..705ae14f8d 100644
--- a/packages/qt4/qt_staging.inc
+++ b/packages/qt4/qt_staging.inc
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 16:13:24 +0000