Merge bk://openembedded@openembedded.bkbits.net/packages

into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/09/29 18:03:23+02:00 uni-frankfurt.de!mickeyl
konqueror and libqpe-opie: catch up with qt staging changes

2004/09/29 18:02:28+02:00 uni-frankfurt.de!mickeyl
first bits for the qt2/qt3 split. Notes: a) qte2 is default, so no changes should be necessary for packages using the qmake or qmake-derived oeclasses. b) overriding QTDIR is no longer supported, remove that from your .oe files. c) manual changes for non-qmake packages can be necessary. d) inherit qt3x11 to configure qmake for Qt3/X11 (sic)

2004/09/29 17:58:32+02:00 uni-frankfurt.de!mickeyl
fix section for mikmod and modplugplay

2004/09/29 17:12:08+02:00 uni-frankfurt.de!mickeyl
enable losetup in default busybox config

BKrev: 415adcea4UMfz2lvSSK4JcNs17Q9sQ

diff --git a/busybox/busybox-1.00-rc3/defconfig b/busybox/busybox-1.00-rc3/defconfig
index 5a206f4..9deb97b 100644 (file)
--- a/busybox/busybox-1.00-rc3/defconfig
+++ b/busybox/busybox-1.00-rc3/defconfig
@@ -451,7 +451,7 @@ CONFIG_FEATURE_MINIX2=y
 CONFIG_HEXDUMP=y
 CONFIG_HWCLOCK=y
 CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
-# CONFIG_LOSETUP is not set
+CONFIG_LOSETUP=y
 CONFIG_MKSWAP=y
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y

diff --git a/busybox/busybox_1.00-rc3.oe b/busybox/busybox_1.00-rc3.oe
index a0ba322..2117177 100644 (file)
--- a/busybox/busybox_1.00-rc3.oe
+++ b/busybox/busybox_1.00-rc3.oe
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r9"
+PR = "r10"
 
 #      file://busybox-1.00-pre10-fuser.patch;patch=1
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \

diff --git a/classes/qmake-base.oeclass b/classes/qmake-base.oeclass
index 798ad5c..b689036 100644 (file)
--- a/classes/qmake-base.oeclass
+++ b/classes/qmake-base.oeclass
@@ -9,7 +9,7 @@ EXTRA_OEMAKE = ' MAKEFLAGS= '
 export OE_QMAKE_CC="${CC}"
 export OE_QMAKE_CFLAGS="${CFLAGS}"
 export OE_QMAKE_CXX="${CXX}"
-export OE_QMAKE_CXXFLAGS="${CXXFLAGS}"
+export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
 export OE_QMAKE_LDFLAGS="${LDFLAGS}"
 export OE_QMAKE_LINK="${CCLD}"
 export OE_QMAKE_AR="${AR}"
@@ -18,9 +18,10 @@ export OE_QMAKE_UIC="${STAGING_BINDIR}/uic"
 export OE_QMAKE_MOC="${STAGING_BINDIR}/moc"
 export OE_QMAKE_RPATH="-Wl,-rpath-link,"
 
-# default to QTDIR
+# default to qte2 via oe.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"
 
 oe_qmake_mkspecs () {
     mkdir -p mkspecs/${OE_QMAKE_PLATFORM}

diff --git a/classes/qt3x11.oeclass b/classes/qt3x11.oeclass
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/conf/oe.conf b/conf/oe.conf
index e1455ae..c6820c9 100644 (file)
--- a/conf/oe.conf
+++ b/conf/oe.conf
@@ -195,8 +195,8 @@ CROSS_DATADIR = "${CROSS_DIR}/share"
 # Add staging and cross to the PATH
 export PATH_prepend = "${STAGING_BINDIR}:${CROSS_DIR}/bin:"
 
-# palmtop things - opie, qtopia
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}"
+# palmtop things - per default for opie, qtopia
+export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
 export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
 export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
 export palmtopdir = "/opt/QtPalmtop"

diff --git a/konqueror/konqueror-embedded_20030705.oe b/konqueror/konqueror-embedded_20030705.oe
index 701795d..035ade1 100644 (file)
--- a/konqueror/konqueror-embedded_20030705.oe
+++ b/konqueror/konqueror-embedded_20030705.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition
 SECTION = "opie/applications"
 PRIORITY = "optional"
 DEPENDS = "libqpe-opie openssl pcre"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://devel-home.kde.org/~hausmann/snapshots/konqueror-embedded-snapshot-${PV}.tar.gz \
            file://opie1.patch;patch=1 \
@@ -25,7 +25,7 @@ EXTRA_OECONF = "--prefix=${palmtopdir} --exec-prefix=${palmtopdir}
                 --with-javascript=static --enable-qpe --enable-qt-embedded                      \
                 --with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR}     \
                 --with-ssl-version=0.9.7c --with-ssl-dir=${STAGING_LIBDIR}/..                   \
-                --with-qt-dir=${STAGING_LIBDIR}/.. --with-qtopia-dir=${STAGING_LIBDIR}/..       "
+                --with-qt-dir=${QTDIR} --with-qtopia-dir=${OPIEDIR}                             "
 
 CXXFLAGS += "-DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
 

diff --git a/libqpe/libqpe-opie_1.1.6.oe b/libqpe/libqpe-opie_1.1.6.oe
index e69de29..d3c6224 100644 (file)
--- a/libqpe/libqpe-opie_1.1.6.oe
+++ b/libqpe/libqpe-opie_1.1.6.oe
@@ -0,0 +1,53 @@
+DESCRIPTION = "Base library for the Qt Palmtop Environment"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "uicmoc-native qte-for-opie"
+PROVIDES = "virtual/libqpe"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/library"
+S = "${WORKDIR}/library"
+
+inherit qmake
+
+QMAKE_PROFILES = "library.pro"
+EXTRA_QMAKEVARS_PRE  = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
+EXTRA_QMAKEVARS_POST = "DESTDIR="
+
+CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC  -fno-rtti -fno-exceptions"
+
+do_compile() {
+        mkdir -p ${STAGING_INCDIR}/qpe \
+                 ${STAGING_INCDIR}/qtopia \
+                 ${STAGING_INCDIR}/opie \
+                 ${STAGING_INCDIR}/opie2 \
+                 ${STAGING_INCDIR}/qtopia/private
+       for i in ${S}/*.h
+       do
+               install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
+               install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
+               install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
+       done
+       for i in ${S}/backend/*.h
+       do
+               install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
+               install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
+               install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
+       done
+       rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
+       oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic
+}
+
+do_stage() {
+       oe_libinstall -so libqpe ${STAGING_LIBDIR}
+       # include files already done during do_compile
+}
+
+do_install() {
+       oe_libinstall -so libqpe ${D}/${palmtopdir}/lib
+}
+
+PACKAGES = "libqpe1"
+FILES_libqpe1 = "${palmtopdir}/lib"

diff --git a/libqpe/libqpe-opie_cvs.oe b/libqpe/libqpe-opie_cvs.oe
index 34d62ce..ba2532b 100644 (file)
--- a/libqpe/libqpe-opie_cvs.oe
+++ b/libqpe/libqpe-opie_cvs.oe
@@ -14,9 +14,6 @@ S = "${WORKDIR}/library"
 inherit qmake
 
 QMAKE_PROFILES = "library.pro"
-
-export QTDIR = "${STAGING_LIBDIR}/.."
-export OPIEDIR = "${STAGING_LIBDIR}/.."
 EXTRA_QMAKEVARS_PRE  = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
 EXTRA_QMAKEVARS_POST = "DESTDIR="
 

diff --git a/mikmod/mikmod_3.2.2-beta1.oe b/mikmod/mikmod_3.2.2-beta1.oe
index 3061a5c..8d25ad9 100644 (file)
--- a/mikmod/mikmod_3.2.2-beta1.oe
+++ b/mikmod/mikmod_3.2.2-beta1.oe
@@ -1,7 +1,9 @@
 DESCRIPTION = "A module player based on libmikmod."
-SECTION = "base"
-PRIORITY = "optional"
+SECTION = "console/multimedia"
+HOMEPAGE = "http://mikmod.raphnet.net"
+MAINTAINER = "Michael 'Mickey' Lauer"
 DEPENDS = "libmikmod"
+PR = "r1"
 
 SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \
            file://m4.patch;patch=1"

diff --git a/modplugplay/modplugplay_1.0.oe b/modplugplay/modplugplay_1.0.oe
index baa085e..290fa71 100644 (file)
--- a/modplugplay/modplugplay_1.0.oe
+++ b/modplugplay/modplugplay_1.0.oe
@@ -1,5 +1,8 @@
-DEPENDS = "libmodplug"
 DESCRIPTION = "modplugplay is a commandline mod-like audio file player."
+SECTION = "console/multimedia"
+MAINTAINER = "Michael 'Mickey' Lauer"
+DEPENDS = "libmodplug"
+PR = "r1"
 
 SRC_URI = "http://www.linuks.mine.nu/modplugplay/modplugplay-${PV}.tar.gz"
 

diff --git a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
index 4af0a02..62410c5 100644 (file)
--- a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
+++ b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
@@ -21,7 +21,7 @@ QMAKE_CFLAGS_YACC     = -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD    = -D_REENTRANT
 
 QMAKE_CXX              = $(OE_QMAKE_CXX)
-QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA)
+QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA)
 QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF        = $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
@@ -54,8 +54,8 @@ QMAKE_LIBS            = $(LIBS_EXTRA)
 QMAKE_LIBS_DYNLOAD      = -ldl
 QMAKE_LIBS_X11         = 
 QMAKE_LIBS_X11SM       = 
-QMAKE_LIBS_QT          = -lqte
-QMAKE_LIBS_QT_THREAD    = -lqte-mt
+QMAKE_LIBS_QT          = -l$(OE_QMAKE_LIBS_QT)
+QMAKE_LIBS_QT_THREAD    = -l$(OE_QMAKE_LIBS_QT)-mt
 QMAKE_LIBS_QT_OPENGL   = -lqgl
 QMAKE_LIBS_THREAD       = -lpthread
 

diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index 6df2b97..df675f7 100644 (file)
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -97,9 +97,11 @@ do_compile() {
 }
 
 do_stage() {
-       oe_libinstall -so -C lib libqte ${STAGING_LIBDIR}
+       install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
+       oe_libinstall -so -C lib libqte ${STAGING_DIR}/${HOST_SYS}/qt2/lib
        rm -f include/qxt.h
-       cp -pfLR include/* ${STAGING_INCDIR}/
+       install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include
+       cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include
 }
 
 do_install() {