[oe-commits] org.oe.dev merge of 'd94271d90df576fb623a5afb9f75864f7ec34546'

slapin commit openembedded-commits at lists.openembedded.org
Fri Jul 13 10:55:06 UTC 2007 

merge of 'd94271d90df576fb623a5afb9f75864f7ec34546'
     and 'f8480b9fe4209b03c291b9506684fe033956afa6'

Author: slapin at openembedded.org
Branch: org.openembedded.dev
Revision: 5e082795f9bdcb7a895ebe0387566db073a6b4f6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5e082795f9bdcb7a895ebe0387566db073a6b4f6
Files:
1
classes/qt4x11.bbclass
packages/linux/linux-hackndev-2.6_svn.bb
packages/qmake/qmake2-native_2.01a.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
packages/alsa/alsa-states
packages/alsa/alsa-states/fic-gta01
packages/alsa/alsa-states_0.0.0.bb
packages/alsa/alsa-states/fic-gta01/capturehandset.state
packages/alsa/alsa-state/fic-gta01/capturehandset.state
packages/alsa/alsa-states/fic-gta01/captureheadset.state
packages/alsa/alsa-state/fic-gta01/captureheadset.state
packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-states/fic-gta01/gsmhandset.state
packages/alsa/alsa-state/fic-gta01/gsmhandset.state
packages/alsa/alsa-states/fic-gta01/gsmheadset.state
packages/alsa/alsa-state/fic-gta01/gsmheadset.state
packages/alsa/alsa-states/fic-gta01/stereoout.state
packages/alsa/alsa-state/fic-gta01/stereoout.state
conf/machine/palmld.conf
packages/alsa/alsa-state.bb
Diffs:

#
# mt diff -rd94271d90df576fb623a5afb9f75864f7ec34546 -r5e082795f9bdcb7a895ebe0387566db073a6b4f6
#
# 
# 
# patch "classes/qt4x11.bbclass"
#  from [7d466c81d6791bc2458fe1e2eadfd62d9cfb02bd]
#    to [c1c773af617672d8ff38e8bd5f5d04d6773ae67c]
# 
# patch "packages/linux/linux-hackndev-2.6_svn.bb"
#  from [26f695138f79aa36b6295fed70133ebbe8bb094d]
#    to [0443280419176af894e9dbcf3743350927ef2ccb]
# 
# patch "packages/qmake/qmake2-native_2.01a.bb"
#  from [17ddd6208bf05e7171ef2ba6625d25bf7c067677]
#    to [b58e6dceed352069e13fc28ed8c4120809744506]
# 
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
#  from [bb258bfafd5b03ee012d8e4530a8f4219b862463]
#    to [8520da26a06ef5cd286a9749b5a8e78337c3f665]
# 
============================================================
--- classes/qt4x11.bbclass	7d466c81d6791bc2458fe1e2eadfd62d9cfb02bd
+++ classes/qt4x11.bbclass	c1c773af617672d8ff38e8bd5f5d04d6773ae67c
@@ -6,6 +6,7 @@ export OE_QMAKE_UIC = "${STAGING_BINDIR_
 export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
 export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
+export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
 export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
 export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
 export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
============================================================
--- packages/linux/linux-hackndev-2.6_svn.bb	26f695138f79aa36b6295fed70133ebbe8bb094d
+++ packages/linux/linux-hackndev-2.6_svn.bb	0443280419176af894e9dbcf3743350927ef2ccb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "(palmtt3|palmtx|pa
 
 COMPATIBLE_MACHINE = "(palmtt3|palmtx|palmld|palmz72)"
 
-SRC_URI = "svn://svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \
+SRC_URI = "svn://hackndev.svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \
 	   file://defconfig"
 
 SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \
============================================================
--- packages/qmake/qmake2-native_2.01a.bb	17ddd6208bf05e7171ef2ba6625d25bf7c067677
+++ packages/qmake/qmake2-native_2.01a.bb	b58e6dceed352069e13fc28ed8c4120809744506
@@ -1,10 +1,10 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "TrollTech Makefile Generator"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
 
-PR = "r1"
+PR = "r2"
 
 QTVER = "qt-x11-opensource-src-4.3.0"
 
@@ -58,6 +58,8 @@ do_stage() {
 	install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4
 	install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
 	cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
+	install -d ${STAGING_DIR}/${HOST_SYS}/qt4/
+	cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/
 }
 
 do_install() {
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.0.bb	bb258bfafd5b03ee012d8e4530a8f4219b862463
+++ packages/uicmoc/uicmoc4-native_4.3.0.bb	8520da26a06ef5cd286a9749b5a8e78337c3f665
@@ -1,7 +1,8 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
 
@@ -9,7 +10,8 @@ inherit native
 
 inherit native
 
-EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+		-qt-libjpeg -qt-gif -system-zlib \
 		-no-nis -no-cups -no-exceptions  \
 		-no-accessibility -no-libjpeg    \
                 -no-nas-sound -no-sm             \
@@ -18,7 +20,8 @@ EXTRA_OECONF = "-qt-libjpeg -qt-gif -sys
                 -no-xrender   -no-fontconfig     \
                 -no-tablet    -no-xkb            \
                 -no-libpng                       \
-                -verbose -release  -fast -static "
+                -verbose -release  -fast -static \
+                -qt3support "
 EXTRA_OEMAKE = " "
 
 do_configure() {
@@ -27,15 +30,23 @@ do_compile() {
 
 do_compile() {
 	unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
-	cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/corelib   && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/xml       && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/moc  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/corelib    && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/sql        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/qt3support && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/xml        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/uic  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/rcc  && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/network    && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/gui        && oe_runmake CC="${CC}" CXX="${CXX}"
+	cd ${S}/src/tools/uic3 && oe_runmake CC="${CC}" CXX="${CXX}"
 }
 
 do_stage() {
         install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
         install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+        install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
         install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+        install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+        install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
 }


#
# mt diff -rf8480b9fe4209b03c291b9506684fe033956afa6 -r5e082795f9bdcb7a895ebe0387566db073a6b4f6
#
# 
# 
# delete "packages/alsa/alsa-states"
# 
# delete "packages/alsa/alsa-states/fic-gta01"
# 
# delete "packages/alsa/alsa-states_0.0.0.bb"
# 
# rename "packages/alsa/alsa-states/fic-gta01/capturehandset.state"
#     to "packages/alsa/alsa-state/fic-gta01/capturehandset.state"
# 
# rename "packages/alsa/alsa-states/fic-gta01/captureheadset.state"
#     to "packages/alsa/alsa-state/fic-gta01/captureheadset.state"
# 
# rename "packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state"
#     to "packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state"
# 
# rename "packages/alsa/alsa-states/fic-gta01/gsmhandset.state"
#     to "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
# 
# rename "packages/alsa/alsa-states/fic-gta01/gsmheadset.state"
#     to "packages/alsa/alsa-state/fic-gta01/gsmheadset.state"
# 
# rename "packages/alsa/alsa-states/fic-gta01/stereoout.state"
#     to "packages/alsa/alsa-state/fic-gta01/stereoout.state"
# 
# patch "conf/machine/palmld.conf"
#  from [5733d4803a281832c68a5a1ff2eb4ead15b8fbba]
#    to [36ef525ef87ccfbc617c0404c26bd3a750a58c1b]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [6674988c91d8b1501ec9a8967baf1226e06cbc7a]
#    to [481e31f5bed1ac2d402c743d5464c9a931503c91]
# 
============================================================
--- conf/machine/palmld.conf	5733d4803a281832c68a5a1ff2eb4ead15b8fbba
+++ conf/machine/palmld.conf	36ef525ef87ccfbc617c0404c26bd3a750a58c1b
@@ -24,7 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 	kernel-module-pxapwm-bl \
 	kernel-module-snd-pxa2xx-ac97 \
 	kernel-module-snd-pxa2xx-pcm \
-	kernel-module-wm97xx-ts \		
 	"
 
 #
============================================================
--- packages/alsa/alsa-state.bb	6674988c91d8b1501ec9a8967baf1226e06cbc7a
+++ packages/alsa/alsa-state.bb	481e31f5bed1ac2d402c743d5464c9a931503c91
@@ -9,26 +9,38 @@ LICENSE = "GPL"
 
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
-
+RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.0.4"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "file://asound.state \
-	   file://alsa-state"
+           file://alsa-state "
 
+SRC_URI_append_fic-gta01 = " \
+  file://capturehandset.state \
+  file://captureheadset.state \
+  file://gsmbluetooth.state \
+  file://gsmhandset.state \
+  file://gsmheadset.state \
+  file://stereoout.state"
+
 inherit update-rc.d
 
 INITSCRIPT_NAME = "alsa-state"
 INITSCRIPT_PARAMS = "defaults 10"
 
 do_install() {
-	install -d ${D}${sysconfdir}/init.d
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
 	
-	install -m 0644 ${WORKDIR}/asound.state ${D}${sysconfdir}
-	install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
+	install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
 }
 
-FILES_${PN} = "${sysconfdir}/*"
+PACKAGES += "alsa-states"
+FILES_${PN} = "${sysconfdir}/init.d"
+FILES_alsa-states = "${sysconfdir}/*.state"
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_alsa-states = "${MACHINE}"
 
 pkg_postinst_${PN}() {
 	if test -z "$D"

More information about the Openembedded-commits mailing list