[oe-commits] org.oe.dev merge of 'd7fd55c2b036fe77aaf2964c99702f65a6833031'
florian commit
openembedded-commits at lists.openembedded.org
Fri Jul 13 10:55:36 UTC 2007
merge of 'd7fd55c2b036fe77aaf2964c99702f65a6833031'
and 'df688aa66e8dd2c9f76bf0b2551461346a1d5981'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: aae8979a7887dab6f01cfba6a590b8e42f51cdc4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=aae8979a7887dab6f01cfba6a590b8e42f51cdc4
Files:
1
packages/alsa/alsa-states
packages/alsa/alsa-states/fic-gta01
packages/alsa/alsa-states_0.0.0.bb
packages/file/file-native_4.20.bb
packages/file/file_4.20.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
packages/qte/qte-2.3.10/devfs.patch
packages/qte/qte-2.3.10/deprecated/devfs.patch
packages/qte/qte-2.3.10/ipaq-keyboard.patch
packages/qte/qte-2.3.10/deprecated/ipaq-keyboard.patch
packages/libsigc++-2.0/libsigc++-2.0-2.0.17
packages/file/file-native_4.21.bb
packages/file/file_4.21.bb
packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch
packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
classes/qt4x11.bbclass
conf/bitbake.conf
conf/machine/palmld.conf
packages/alsa/alsa-state.bb
packages/efl1/ecore-native_0.9.9.038.bb
packages/linux/linux-hackndev-2.6_svn.bb
packages/qmake/qmake2-native_2.01a.bb
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt-static_2.3.10.bb
packages/qte/qte-mt_2.3.10.bb
packages/qte/qte_2.3.10.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
packages/alp/hiker_0.9.1.bb
packages/gnet/gnet_svn.bb
site/arm-linux
Diffs:
#
# mt diff -rd7fd55c2b036fe77aaf2964c99702f65a6833031 -raae8979a7887dab6f01cfba6a590b8e42f51cdc4
#
#
#
# delete "packages/alsa/alsa-states"
#
# delete "packages/alsa/alsa-states/fic-gta01"
#
# delete "packages/alsa/alsa-states_0.0.0.bb"
#
# delete "packages/file/file-native_4.20.bb"
#
# delete "packages/file/file_4.20.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"
#
# rename "packages/qte/qte-2.3.10/devfs.patch"
# to "packages/qte/qte-2.3.10/deprecated/devfs.patch"
#
# rename "packages/qte/qte-2.3.10/ipaq-keyboard.patch"
# to "packages/qte/qte-2.3.10/deprecated/ipaq-keyboard.patch"
#
# add_dir "packages/libsigc++-2.0/libsigc++-2.0-2.0.17"
#
# add_file "packages/file/file-native_4.21.bb"
# content [7f56042d15332b2149b6e86a6180dd1e4707ae80]
#
# add_file "packages/file/file_4.21.bb"
# content [3754c0dea941ef3f376efa559fe6e981cedfa9bf]
#
# add_file "packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch"
# content [db5f96d73cd196054bec8489dc3bd6ad1c731c19]
#
# add_file "packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb"
# content [98e500f0096ee080083cac017c0910fe2a207c46]
#
# patch "classes/qt4x11.bbclass"
# from [7d466c81d6791bc2458fe1e2eadfd62d9cfb02bd]
# to [c1c773af617672d8ff38e8bd5f5d04d6773ae67c]
#
# patch "conf/bitbake.conf"
# from [28be7aa3c03959211fa8fff38d1903e1ec2dd8de]
# to [1a40a8a4b4660be43379de36b41dceabe1bebd19]
#
# patch "conf/machine/palmld.conf"
# from [5733d4803a281832c68a5a1ff2eb4ead15b8fbba]
# to [36ef525ef87ccfbc617c0404c26bd3a750a58c1b]
#
# patch "packages/alsa/alsa-state.bb"
# from [6674988c91d8b1501ec9a8967baf1226e06cbc7a]
# to [481e31f5bed1ac2d402c743d5464c9a931503c91]
#
# patch "packages/efl1/ecore-native_0.9.9.038.bb"
# from [a6c082e1855fe38962b17d575b31619fd89ddc28]
# to [17a8335856faa8d9c108f59dd7ce54f1db34ec00]
#
# 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/qte/qte-common_2.3.10.inc"
# from [081ccc3634df29189d8c002cc7183777bdafc4a9]
# to [a48e62e21b1cc3068ee5963762c16ee388f3b3b9]
#
# patch "packages/qte/qte-mt-static_2.3.10.bb"
# from [32b5ae85f4bf2da0c3d5c54c6cd46449a07d89d4]
# to [cba36c3850ac2b08dab6647b33bf4f0538bf1ba5]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [ea3847c6b0e7010eb2a471918cdea3a7aa68f032]
# to [b12df9e6a73c7f287970ed781c24947bf8685426]
#
# patch "packages/qte/qte_2.3.10.bb"
# from [9602630cbdecdf5d5484aba24642f44a3340e0d1]
# to [08c1403421a8911e25ed338585d50422dd3f8fab]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
# from [bb258bfafd5b03ee012d8e4530a8f4219b862463]
# to [8520da26a06ef5cd286a9749b5a8e78337c3f665]
#
============================================================
--- packages/file/file-native_4.21.bb 7f56042d15332b2149b6e86a6180dd1e4707ae80
+++ packages/file/file-native_4.21.bb 7f56042d15332b2149b6e86a6180dd1e4707ae80
@@ -0,0 +1,6 @@
+require file_${PV}.bb
+inherit native
+DEPENDS = ""
+PR = "r0"
+
+SRC_URI += "file://native-fix.diff;patch=1"
============================================================
--- packages/file/file_4.21.bb 3754c0dea941ef3f376efa559fe6e981cedfa9bf
+++ packages/file/file_4.21.bb 3754c0dea941ef3f376efa559fe6e981cedfa9bf
@@ -0,0 +1,18 @@
+DESCRIPTION = "File attempts to classify files depending \
+on their contents and prints a description if a match is found."
+SECTION = "console/utils"
+LICENSE = "BSD-ADV"
+DEPENDS = "file-native"
+
+SRC_URI = "ftp://ftp.fi.debian.org/pub/gentoo/distfiles/file-${PV}.tar.gz"
+S = "${WORKDIR}/file-${PV}"
+
+inherit autotools
+
+do_configure_prepend() {
+ sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
+}
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch db5f96d73cd196054bec8489dc3bd6ad1c731c19
+++ packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch db5f96d73cd196054bec8489dc3bd6ad1c731c19
@@ -0,0 +1,15 @@
+Index: libsigc++-2.0.17/configure.ac
+===================================================================
+--- libsigc++-2.0.17.orig/configure.ac 2005-12-20 08:41:21.000000000 +0000
++++ libsigc++-2.0.17/configure.ac 2007-07-11 11:33:55.000000000 +0100
+@@ -105,6 +105,10 @@
+ SIGC_CXX_HAS_NAMESPACE_STD()
+ SIGC_CXX_HAS_SUN_REVERSE_ITERATOR()
+
++dnl FIXME Define this here since it does not seem to be defined elsewhere
++AC_DEFINE(SIGC_API, [], [Empty specifier])
++AC_DEFINE(SIGC_USING_STD(Symbol), [], [Empty specifier])
++
+ if test "X$config_error" = "Xyes" ; then
+ AC_ERROR(
+ [One or more of the required compiler features is missing.
============================================================
--- packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb 98e500f0096ee080083cac017c0910fe2a207c46
+++ packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb 98e500f0096ee080083cac017c0910fe2a207c46
@@ -0,0 +1,45 @@
+DESCRIPTION = "A library for loose coupling of C++ method calls"
+SECTION = "libs"
+PRIORITY = "optional"
+PR = "r1"
+LICENSE = "GPL LGPL"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-${PV}.tar.gz \
+ file://define_sigc_api.patch;patch=1 "
+S = "${WORKDIR}/libsigc++-${PV}"
+
+inherit autotools pkgconfig
+
+FILES_${PN}-dev += "${libdir}/sigc++-*/"
+
+# acpaths = ""
+
+do_stage() {
+ install -d ${STAGING_LIBDIR}/sigc++-2.0/include
+ install -m 0644 sigc++config.h ${STAGING_LIBDIR}/sigc++-2.0/include/
+ oe_libinstall -so -C sigc++ libsigc-2.0 ${STAGING_LIBDIR}
+
+ install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++
+ for f in sigc++/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/
+ done
+ install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/functors
+ for f in sigc++/functors/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/functors
+ done
+
+ install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors
+ for f in sigc++/adaptors/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors
+ done
+ install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors/lambda
+ for f in sigc++/adaptors/lambda/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors/lambda
+ done
+
+
+}
+
============================================================
--- 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"
============================================================
--- conf/bitbake.conf 28be7aa3c03959211fa8fff38d1903e1ec2dd8de
+++ conf/bitbake.conf 1a40a8a4b4660be43379de36b41dceabe1bebd19
@@ -468,7 +468,7 @@ OES_BITBAKE_CONF = "1"
OES_BITBAKE_CONF = "1"
##################################################################
-# Task-base stuff
+# Machine properties and task-base stuff
##################################################################
MACHINE_FEATURES ?= "kernel26"
@@ -477,7 +477,13 @@ ROOT_FLASH_SIZE ?= "256"
# This is used to limit what packages goes into images built, so set big by default
ROOT_FLASH_SIZE ?= "256"
-GUI_MACHINE_CLASS ?= "smallscreen"
+MACHINE_GUI_CLASS ?= "smallscreen"
+# GUI_MACHINE_CLASS is deprecated, please use MACHINE_GUI_CLASS instead
+GUI_MACHINE_CLASS ?= "${MACHINE_GUI_CLASS}"
+MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
+MACHINE_DISPLAY_ORIENTATION ?= "0"
+MACHINE_DISPLAY_BPP ?= "16"
DISTRO_EXTRA_RDEPENDS ?= ""
DISTRO_EXTRA_RRECOMMENDS ?= ""
============================================================
--- 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"
============================================================
--- packages/efl1/ecore-native_0.9.9.038.bb a6c082e1855fe38962b17d575b31619fd89ddc28
+++ packages/efl1/ecore-native_0.9.9.038.bb 17a8335856faa8d9c108f59dd7ce54f1db34ec00
@@ -1,11 +1,12 @@ DEPENDS = "eet-native evas-native"
require ecore.inc
inherit native
DEPENDS = "eet-native evas-native"
+PR = "r1"
EXTRA_OECONF = "\
--enable-ecore-txt \
--disable-ecore-x-xcb \
- --enable-ecore-x \
+ --disable-ecore-x \
--enable-ecore-job \
--enable-ecore-directfb \
--enable-ecore-fb \
============================================================
--- 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/qte/qte-common_2.3.10.inc 081ccc3634df29189d8c002cc7183777bdafc4a9
+++ packages/qte/qte-common_2.3.10.inc a48e62e21b1cc3068ee5963762c16ee388f3b3b9
@@ -54,7 +54,6 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
#
# add device specific patches here
#
-SRC_URI_append_simpad = "file://devfs.patch;patch=1 "
SRC_URI_append_c7x0 = "file://kernel-keymap-corgi.patch;patch=1 \
file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 \
file://c7x0-w100-gcc4.patch;patch=1 "
@@ -63,20 +62,13 @@ SRC_URI_append_tosa = "file://ke
SRC_URI_append_akita = "file://kernel-keymap-corgi.patch;patch=1 \
file://kernel-keymap-CXK.patch;patch=1 "
SRC_URI_append_tosa = "file://kernel-keymap-tosa.patch;patch=1 "
-SRC_URI_append_jornada7xx = "file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_jornada56x = "file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h1910 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h1940 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h2200 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h4000 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h5000 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h6300 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_hx2000 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_hx4700 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+# "ipaqs" used to have this, but later were proven to at least work
+# without it. Review again and see if has interesting bits to be applied
+# universally.
+#SRC_URI_append = "file://ipaq_sound_fix.patch;patch=1 "
+
S = "${WORKDIR}/qt-${PV}"
export QTDIR = "${S}"
============================================================
--- packages/qte/qte-mt-static_2.3.10.bb 32b5ae85f4bf2da0c3d5c54c6cd46449a07d89d4
+++ packages/qte/qte-mt-static_2.3.10.bb cba36c3850ac2b08dab6647b33bf4f0538bf1ba5
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r7"
+PR = "r8"
EXTRA_OECONF += "-static -thread"
@@ -18,4 +18,3 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "${palmqtdir}"
============================================================
--- packages/qte/qte-mt_2.3.10.bb ea3847c6b0e7010eb2a471918cdea3a7aa68f032
+++ packages/qte/qte-mt_2.3.10.bb b12df9e6a73c7f287970ed781c24947bf8685426
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r15"
+PR = "r16"
EXTRA_OECONF += "-thread"
============================================================
--- packages/qte/qte_2.3.10.bb 9602630cbdecdf5d5484aba24642f44a3340e0d1
+++ packages/qte/qte_2.3.10.bb 08c1403421a8911e25ed338585d50422dd3f8fab
@@ -1,3 +1,3 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r51"
+PR = "r52"
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.0.bb bb258bfafd5b03ee012d8e4530a8f4219b862463
+++ packages/uicmoc/uicmoc4-native_4.3.0.bb 8520da26a06ef5cd286a9749b5a8e%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rdf688aa66e8dd2c9f76bf0b2551461346a1d5981 -raae8979a7887dab6f01cfba6a590b8e42f51cdc4
#
#
#
# add_file "packages/alp/hiker_0.9.1.bb"
# content [ed64118b0e23a8e80aa6485489bfbfa90d146d77]
#
# add_file "packages/gnet/gnet_svn.bb"
# content [b65ff5fbcd917249e8926e7894d91152a731a034]
#
# patch "site/arm-linux"
# from [05faec46acb2d2d97efdb42243d94e8ba15050c8]
# to [017788fd0a47a59e3f7e27ad7bb78eb2a549c570]
#
============================================================
--- packages/alp/hiker_0.9.1.bb ed64118b0e23a8e80aa6485489bfbfa90d146d77
+++ packages/alp/hiker_0.9.1.bb ed64118b0e23a8e80aa6485489bfbfa90d146d77
@@ -0,0 +1,24 @@
+DESCRIPTION = "Hiker Application Frameworkâ„¢"
+LICENSE = "MPL"
+
+DEPENDS = "gtk+ sqlite3 gnet dbus-glib openssl"
+
+SRC_URI = "http://www.access-company.com/downloads/${P}.tar.gz"
+
+inherit autotools pkgconfig lib_package
+
+export CFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG"
+export CXXFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG"
+
+do_configure_prepend() {
+ sed -i s:unittest::g utils/Makefile.am
+}
+
+PACKAGES =+ "libhiker libsqlfs"
+FILES_libhiker += "${libdir}/libhiker*.so.*"
+FILES_libsqlfs += "${libdir}/libsql*.so.*"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/gnet/gnet_svn.bb b65ff5fbcd917249e8926e7894d91152a731a034
+++ packages/gnet/gnet_svn.bb b65ff5fbcd917249e8926e7894d91152a731a034
@@ -0,0 +1,21 @@
+DESCRIPTION = "GNet is a simple network library. It is written in C, object-oriented, and built upon GLib."
+LICENSE = "LGPL"
+SECTION = "libs/network"
+HOMEPAGE = "http://www.gnetlibrary.org"
+DEPENDS = "glib-2.0"
+PV = "2.0.7+svn${SRCDATE}"
+
+SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk \
+ file://buildfix.patch;patch=1"
+
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF = "--disable-pthreads"
+
+FILES_${PN}-dev += "${libdir}/gnet-2.0"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- site/arm-linux 05faec46acb2d2d97efdb42243d94e8ba15050c8
+++ site/arm-linux 017788fd0a47a59e3f7e27ad7bb78eb2a549c570
@@ -172,3 +172,7 @@ mono_cv_uscore=${mono_cv_uscore=no}
#mono
mono_cv_uscore=${mono_cv_uscore=no}
+# gnet
+ac_cv_member_struct_sockaddr_sa_len=${ac_cv_member_struct_sockaddr_sa_len=no}
+ac_cv_gnet_have_abstract_sockets=${ac_cv_gnet_have_abstract_sockets=no}
+gnet_sockaddr_family_field_name=${gnet_sockaddr_family_field_name=ss_family}
More information about the Openembedded-commits
mailing list