summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/palmtop.bbclass1
-rw-r--r--classes/qmake-base.bbclass2
-rw-r--r--conf/documentation.conf3
-rw-r--r--packages/libsdl/libsdl-x11_1.2.9.bb6
-rw-r--r--packages/linux/linux-efika_2.6.21+git.bb2
-rw-r--r--packages/qpegps/qpegps.inc35
-rw-r--r--packages/qpegps/qpegps_0.9.2.3.3.bb34
-rw-r--r--packages/qpegps/qpegps_0.9.3.bb36
8 files changed, 47 insertions, 72 deletions
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index 39b9bd2b60..e99b31aaa3 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -16,6 +16,7 @@ EXTRA_QMAKEVARS_POST += "DEFINES+=QWS CONFIG+=qt ${CPP_SUPPORT_LIB}"
EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "CONFIG-=thread",d)}'
EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
FILES_${PN} = " ${palmtopdir} "
diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass
index 09694e97b8..5ca3ee2904 100644
--- a/classes/qmake-base.bbclass
+++ b/classes/qmake-base.bbclass
@@ -23,7 +23,7 @@ export OE_QMAKE_RPATH="-Wl,-rpath-link,"
# default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11
export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
-export OE_QMAKE_LIBS_QT="qte"
+export OE_QMAKE_LIBS_QT="${QT_LIBRARY}"
export OE_QMAKE_LIBS_X11=""
oe_qmake_mkspecs () {
diff --git a/conf/documentation.conf b/conf/documentation.conf
index b92c14f7f0..44a174a01b 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -98,6 +98,9 @@ PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slot
SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
+# insane bbclass
+QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log."
+
# palmtop build class
PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread"
diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb
index 1fba3c4174..42c0ad3579 100644
--- a/packages/libsdl/libsdl-x11_1.2.9.bb
+++ b/packages/libsdl/libsdl-x11_1.2.9.bb
@@ -1,11 +1,11 @@
DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "alsa-lib virtual/libx11 libxext"
+DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
PROVIDES = "virtual/libsdl"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://extra-keys.patch;patch=1 \
@@ -20,7 +20,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
--disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
--disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
--disable-video-xbios --disable-video-gem --disable-video-dummy \
- --disable-video-opengl --enable-input-events --enable-pthreads \
+ --enable-video-opengl --enable-input-events --enable-pthreads \
--disable-video-picogui --disable-video-qtopia --enable-dlopen"
FILES_${PN} = "${libdir}/lib*.so.*"
diff --git a/packages/linux/linux-efika_2.6.21+git.bb b/packages/linux/linux-efika_2.6.21+git.bb
index bd328aff67..0dcc8b3304 100644
--- a/packages/linux/linux-efika_2.6.21+git.bb
+++ b/packages/linux/linux-efika_2.6.21+git.bb
@@ -4,6 +4,8 @@ LICENSE = "GPL"
PR = "r0"
PV = "2.6.21+git${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
COMPATIBLE_MACHINE = "efika"
SRC_URI = "file://defconfig"
diff --git a/packages/qpegps/qpegps.inc b/packages/qpegps/qpegps.inc
new file mode 100644
index 0000000000..2e10bf40a6
--- /dev/null
+++ b/packages/qpegps/qpegps.inc
@@ -0,0 +1,35 @@
+DESCRIPTION = "A GPS navigation application for the Opie environment"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://qpegps.sourceforge.net/"
+
+RRECOMMENDS = "gpsd"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \
+ file://qpegps.desktop \
+ file://qpegps.png"
+S = "${WORKDIR}/qpegps"
+
+inherit palmtop
+
+QMAKE_PROFILES = "qpegps.pro"
+EXTRA_QMAKEVARS_POST = "LIBS=-lqpe LIBS+=-lgps"
+OE_QMAKE_CFLAGS += " -DQWS "
+
+do_install() {
+ install -d ${D}${palmtopdir}/bin \
+ ${D}${palmtopdir}/apps/Applications \
+ ${D}${palmtopdir}/pics/qpegps \
+ ${D}${palmtopdir}/help/html/qpegps_icons \
+ ${D}${palmtopdir}/qpegps/maps \
+ ${D}${palmtopdir}/qpegps/icons \
+ ${D}${palmtopdir}/qpegps/tracks
+ install -m 0755 qpegps ${D}${palmtopdir}/bin/
+ install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
+ install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
+ install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
+ install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
+ install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
+ install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/
+}
diff --git a/packages/qpegps/qpegps_0.9.2.3.3.bb b/packages/qpegps/qpegps_0.9.2.3.3.bb
index 7eaa456d74..4cdb945321 100644
--- a/packages/qpegps/qpegps_0.9.2.3.3.bb
+++ b/packages/qpegps/qpegps_0.9.2.3.3.bb
@@ -1,33 +1 @@
-DESCRIPTION = "A GPS navigation application for the Opie environment."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-RRECOMMENDS = "gpsd"
-LICENSE = "GPL"
-HOMEPAGE = "http://qpegps.sourceforge.net/"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \
- file://qpegps.desktop \
- file://qpegps.png"
-S = "${WORKDIR}/qpegps_my"
-
-inherit palmtop
-
-QMAKE_PROFILES = "qpegps.pro"
-
-do_install() {
- install -d ${D}${palmtopdir}/bin \
- ${D}${palmtopdir}/apps/Applications \
- ${D}${palmtopdir}/pics/qpegps \
- ${D}${palmtopdir}/help/html/qpegps_icons \
- ${D}${palmtopdir}/qpegps/maps \
- ${D}${palmtopdir}/qpegps/icons \
- ${D}${palmtopdir}/qpegps/tracks
- install -m 0755 qpegps ${D}${palmtopdir}/bin/
- install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
- install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
- install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
- install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
- install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
- install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/
-}
+require qpegps.inc
diff --git a/packages/qpegps/qpegps_0.9.3.bb b/packages/qpegps/qpegps_0.9.3.bb
index a4712f3dea..4cdb945321 100644
--- a/packages/qpegps/qpegps_0.9.3.bb
+++ b/packages/qpegps/qpegps_0.9.3.bb
@@ -1,35 +1 @@
-DESCRIPTION = "Navigation application for use with GPS adapters"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-
-RRECOMMENDS = "gpsd"
-LICENSE = "GPL"
-HOMEPAGE = "http://qpegps.sourceforge.net/"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \
- file://qpegps.desktop \
- file://qpegps.png"
-S = "${WORKDIR}/qpegps"
-
-inherit palmtop
-
-QMAKE_PROFILES = "qpegps.pro"
-EXTRA_QMAKEVARS_POST = "LIBS=-lqpe LIBS+=-lgps"
-
-do_install() {
- install -d ${D}${palmtopdir}/bin \
- ${D}${palmtopdir}/apps/Applications \
- ${D}${palmtopdir}/pics/qpegps \
- ${D}${palmtopdir}/help/html/qpegps_icons \
- ${D}${palmtopdir}/qpegps/maps \
- ${D}${palmtopdir}/qpegps/icons \
- ${D}${palmtopdir}/qpegps/tracks
- install -m 0755 qpegps ${D}${palmtopdir}/bin/
- install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
- install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
- install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
- install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
- install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
- install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/
-}
+require qpegps.inc
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-09 10:10:22 +0000