[oe-commits] org.oe.dev merge of '1aa9d5d2291a43dd7550da56fed4507af7db2c81'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Aug 20 15:38:39 UTC 2007
merge of '1aa9d5d2291a43dd7550da56fed4507af7db2c81'
and 'e36bd25beb3708ad700892730953005d81ac203b'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 9f017db15b461e7ea8c39a577138ba7d4e44b348
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9f017db15b461e7ea8c39a577138ba7d4e44b348
Files:
1
packages/gammu/gammu_1.12.94.bb
packages/gammu/gammu_1.10.0.bb
packages/gammu/gammu_1.13.0.bb
packages/python/python-gammu_0.21.bb
packages/libpng/libpng-native_1.2.19.bb
packages/libpng/libpng_1.2.19.bb
packages/efl1/evas.inc
packages/openmoko2/openmoko-terminal2_1.0.0.bb
Diffs:
#
# mt diff -r1aa9d5d2291a43dd7550da56fed4507af7db2c81 -r9f017db15b461e7ea8c39a577138ba7d4e44b348
#
#
#
# delete "packages/gammu/gammu_1.12.94.bb"
#
# rename "packages/gammu/gammu_1.10.0.bb"
# to "packages/gammu/gammu_1.13.0.bb"
#
# patch "packages/gammu/gammu_1.13.0.bb"
# from [1cb34c46e873f0aa5efd810dcecdb5ff8a9ebefb]
# to [dbbfbd2cf47cb31eb603a90b621a074f7786c9f0]
#
# patch "packages/python/python-gammu_0.21.bb"
# from [b985997bf86465ce82869a460e1336305461798f]
# to [41ae201e5a819b7fe87d6622edcf2404f1475add]
#
============================================================
--- packages/gammu/gammu_1.10.0.bb 1cb34c46e873f0aa5efd810dcecdb5ff8a9ebefb
+++ packages/gammu/gammu_1.13.0.bb dbbfbd2cf47cb31eb603a90b621a074f7786c9f0
@@ -1,78 +1,33 @@ SECTION = "console/network"
DESCRIPTION = "GNU All Mobile Managment Utilities"
SECTION = "console/network"
-DEPENDS = "bluez-libs"
+DEPENDS = "bluez-libs cmake-native"
LICENSE = "GPL"
HOMEPAGE = "http://www.gammu.org/"
-PR = "r1"
-SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \
- file://ldflags-again.patch;patch=1"
+SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 "
-EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}"
+inherit pkgconfig
-EXTRA_LDFLAGS = "-lbluetooth2"
+do_configure() {
+ cd ${S} && CMAKE_C_COMPILER=${TARGET_OS}-gcc ./configure --prefix=${prefix} --enable-shared --enable-backup
+}
-inherit autotools pkgconfig
-
do_compile () {
- oe_runmake shared LDFLAGS='-L${STAGING_LIBDIR} -lbluetooth'
+ oe_runmake
}
-do_stage() {
- install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \
- ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
- ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
- ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 \
- ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
- ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
- ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
- ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
- ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
- ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
- ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
- ${STAGING_INCDIR}/gammu/protocol/alcatel
-
- oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
-
- install -m 0644 common/*.h ${STAGING_INCDIR}/gammu/
- install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc
- install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding
- install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone
- install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at
- install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex
- install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia
- install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3
- install -m 0644 common/phone/nokia/dct4s40/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40
- install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian
- install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel
- install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service
- install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms
- install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup
- install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device
- install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda
- install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth
- install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial
- install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol
- install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at
- install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex
- install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia
- install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian
- install -m 0644 common/protocol/alcatel/*.h ${STAGING_INCDIR}/gammu/protocol/alcatel
+do_install () {
+ oe_runmake install DESTDIR=${D}
}
-do_install () {
- oe_runmake 'DESTDIR=${D}' installshared
+do_stage() {
+ install -d ${STAGING_INCDIR}/gammu/
+ install -m 0644 build-configure/include/*.h ${STAGING_INCDIR}/gammu/
+
+ oe_libinstall -so -C build-configure/common libGammu ${STAGING_LIBDIR}
}
PACKAGES =+ "libgammu"
FILES_${PN} = "${bindir}/gammu"
FILES_libgammu = "${libdir}/libGammu.so*"
-
-PACKAGES_DYNAMIC = "gammu-locale-*"
-
-python populate_packages_prepend () {
- help_dir = bb.data.expand('${datadir}/gammu/', d)
-
- do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
-}
============================================================
--- packages/python/python-gammu_0.21.bb b985997bf86465ce82869a460e1336305461798f
+++ packages/python/python-gammu_0.21.bb 41ae201e5a819b7fe87d6622edcf2404f1475add
@@ -1,6 +1,3 @@
-#TODO needs recent gammu, which in turn needs cmake which we don't have yet
-BROKEN = "1"
-
DESCRIPTION = "Python bindings for the gammu GSM phone communication library."
HOMEPAGE = "http://cihar.com/gammu/python"
SECTION = "devel/python"
@@ -11,4 +8,3 @@ inherit distutils
SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2"
inherit distutils
-
#
# mt diff -re36bd25beb3708ad700892730953005d81ac203b -r9f017db15b461e7ea8c39a577138ba7d4e44b348
#
#
#
# add_file "packages/libpng/libpng-native_1.2.19.bb"
# content [f167e03f1cc222c183f8550ccbd0bd04fb3381e4]
#
# add_file "packages/libpng/libpng_1.2.19.bb"
# content [ba2b48a9b944d81e98b332c04a4cc1932a682fd4]
#
# patch "packages/efl1/evas.inc"
# from [f72bdeb6410f9ee7c0b2e888e67a14c17fa3c1c1]
# to [a0a8221d4e2bce64eaf06314987a4f4267e7fe52]
#
# patch "packages/openmoko2/openmoko-terminal2_1.0.0.bb"
# from [0e41bc0bf76744acfac0c3e3abb4219a2d258187]
# to [2ea84bd4f21c78174ab58bc7d9d93e18683612a1]
#
============================================================
--- packages/libpng/libpng-native_1.2.19.bb f167e03f1cc222c183f8550ccbd0bd04fb3381e4
+++ packages/libpng/libpng-native_1.2.19.bb f167e03f1cc222c183f8550ccbd0bd04fb3381e4
@@ -0,0 +1,14 @@
+require libpng_${PV}.bb
+inherit native
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
+DEPENDS = "zlib-native"
+
+INHIBIT_NATIVE_STAGE_INSTALL = "1"
+
+do_stage_append() {
+ cp libpng.pc libpng12.pc
+ install -m 644 png.h ${STAGING_INCDIR}/png.h
+ install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
+ oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
+ ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
+}
============================================================
--- packages/libpng/libpng_1.2.19.bb ba2b48a9b944d81e98b332c04a4cc1932a682fd4
+++ packages/libpng/libpng_1.2.19.bb ba2b48a9b944d81e98b332c04a4cc1932a682fd4
@@ -0,0 +1,50 @@
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+LICENSE = "libpng"
+SECTION = "libs"
+DEPENDS = "zlib"
+PRIORITY = "required"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
+S = "${WORKDIR}/libpng-${PV}"
+
+inherit autotools binconfig pkgconfig
+
+do_stage() {
+ cp libpng.pc libpng12.pc
+ install -m 644 png.h ${STAGING_INCDIR}/png.h
+ install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
+ oe_libinstall -so libpng ${STAGING_LIBDIR}/
+ oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
+ ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${mandir}
+ install -d ${D}${libdir}
+ install -d ${D}${includedir}
+ unset LDFLAGS
+ oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
+ 'DB=${D}${bindir}' 'DI=${D}${includedir}' \
+ 'DL=${D}${libdir}' 'DM=${D}${mandir}' \
+ install
+}
+
+python do_package() {
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_${PN}', 'libpng12', d)
+ bb.build.exec_func('package_do_package', d)
+}
+
+PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
+
+FILES_${PN}12-dbg = "${libdir}/libpng12*.dbg"
+FILES_${PN}12 = "${libdir}/libpng12.so.*"
+FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+ ${libdir}/*.a ${libdir}/pkgconfig \
+ ${datadir}/aclocal ${bindir} ${sbindir}"
+
============================================================
--- packages/efl1/evas.inc f72bdeb6410f9ee7c0b2e888e67a14c17fa3c1c1
+++ packages/efl1/evas.inc a0a8221d4e2bce64eaf06314987a4f4267e7fe52
@@ -11,7 +11,6 @@ export FREETYPE_CONFIG = "${STAGING_BIND
export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
-SRC_URI += "file://fix-configure.patch;patch=1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
EXTRA_OECONF = "<override me>"
============================================================
--- packages/openmoko2/openmoko-terminal2_1.0.0.bb 0e41bc0bf76744acfac0c3e3abb4219a2d258187
+++ packages/openmoko2/openmoko-terminal2_1.0.0.bb 2ea84bd4f21c78174ab58bc7d9d93e18683612a1
@@ -1,7 +1,7 @@ RDEPENDS += "mrxvt"
DESCRIPTION = "The OpenMoko Command Line Console"
SECTION = "openmoko/applications"
RDEPENDS += "mrxvt"
-PR = "r3"
+PR = "r4"
RCONFLICTS = "openmoko-terminal"
RREPLACES = "openmoko-terminal"
@@ -30,7 +30,7 @@ Mrxvt.xftSize: 5
Mrxvt.xft: 1
Mrxvt.xftFont: Bitstream Vera Sans Mono
Mrxvt.xftSize: 5
-Mrxvt.xftAntialias: 0
+Mrxvt.xftAntialias: 1
# Don't load a multi-char font. This will reduce the line space if your multi
# char font has different dimensions than the regular font. You might need to
@@ -39,7 +39,7 @@ Mrxvt.xftPFont: Bitstrea
# Font to use for tab bar / menus. This need not be mono-spaced ;).
Mrxvt.xftPFont: Bitstream Vera Sans
-Mrxvt.xftPSize: 8
+Mrxvt.xftPSize: 6
EOF
}
More information about the Openembedded-commits
mailing list