[oe-commits] org.oe.dev merge of '95a513be8426c7ab7565ce3120697b9f88ce67c0'

crofton commit openembedded-commits at lists.openembedded.org
Mon Aug 20 19:03:59 UTC 2007


merge of '95a513be8426c7ab7565ce3120697b9f88ce67c0'
     and 'a4bed52e2d6c695d814b53319f20101071ca9bff'

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 32e6a3c5d4994942e12a0f14ff64ebd224726e17
ViewMTN: http://monotone.openembedded.org/revision.psp?id=32e6a3c5d4994942e12a0f14ff64ebd224726e17
Files:
1
packages/linux/linux-omap2_git.bb
conf/distro/include/openmoko-srcdate-now.inc
packages/gammu/gammu_1.12.94.bb
packages/tar/tar
packages/tar/tar/tar-native_1.13.25.oe
packages/gammu/gammu_1.10.0.bb
packages/gammu/gammu_1.13.0.bb
packages/libsdl/libsdl-net_1.2.5.bb
packages/libsdl/libsdl-net_1.2.7.bb
packages/ode
packages/nonworking/ode
packages/ode/ode_0.5.bb
packages/nonworking/ode/ode_0.8.bb
packages/python/python-pygtk-0.6.12
packages/python/python-pygtk-1.2
packages/python/python-pygtk-0.6.12/remove-imlib-et-al
packages/python/python-pygtk-1.2/remove-imlib-et-al.patch
packages/python/python-pyode_1.0.0.bb
packages/nonworking/python/python-pyode_1.2.0.bb
packages/python/python-pytest_0.6.0.bb
packages/python/python-pytester_0.6.0.bb
classes/task.bbclass
packages/alsa/alsa-plugins_1.0.14.bb
packages/gsm/files/fix-mlbuf.patch
packages/gstreamer/gst-plugin-pulse_0.9.4.bb
packages/initscripts/initscripts-1.0/functions
packages/libpng/libpng-native_1.2.19.bb
packages/libpng/libpng_1.2.19.bb
packages/matchbox-keyboard/files/fic-gta01-font-size.patch
packages/mrxvt/files/font-defaults.patch
packages/tar/tar_1.18.bb
packages/tasks/task-openmoko-debug.bb
packages/tasks/task-openmoko-native-sdk.bb
conf/distro/include/angstrom-glibc.inc
conf/distro/include/sane-srcdates.inc
conf/distro/openmoko.conf
packages/alsa/alsa-lib_1.0.13.bb
packages/alsa/alsa-state/fic-gta01/gsmhandset.state
packages/alsa/alsa-state.bb
packages/efl1/ecore/configure.patch
packages/efl1/ecore.inc
packages/efl1/evas/fix-configure.patch
packages/efl1/evas.inc
packages/gsm/libgsmd_svn.bb
packages/gstreamer/gst-meta-base_0.10.bb
packages/initscripts/initscripts_1.0.bb
packages/libtiff/tiff_3.7.2.bb
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/makedevs/makedevs-1.0.0/makedevs.c
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/mrxvt/mrxvt_0.5.2.bb
packages/openmoko2/libmokojournal2_svn.bb
packages/openmoko2/openmoko-feedreader2_svn.bb
packages/openmoko2/openmoko-terminal2_1.0.0.bb
packages/python/python-gammu_0.21.bb
packages/python/python-pygtk-1.2_0.6.12.bb
packages/tasks/task-openmoko.bb
packages/tasks/task-python-everything.bb
packages/zten/zten_1.6.2.bb
site/ix86-common
Diffs:

#
# mt diff -r95a513be8426c7ab7565ce3120697b9f88ce67c0 -r32e6a3c5d4994942e12a0f14ff64ebd224726e17
#
# 
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [ab62a543cf001bbe863e1adb93758519b57f7036]
#    to [51f14792a8bc6ce3690fa88f529d8b7a51ef40d9]
# 
============================================================
--- packages/linux/linux-omap2_git.bb	ab62a543cf001bbe863e1adb93758519b57f7036
+++ packages/linux/linux-omap2_git.bb	51f14792a8bc6ce3690fa88f529d8b7a51ef40d9
@@ -7,7 +7,6 @@ SRC_URI = "git://source.mvista.com/git/l
 COMPATIBLE_MACHINE = "omap2430sdp"
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
-           file://omap-2430-lcd.patch;patch=1;pnum=1 \
            file://defconfig.eabi \
            file://defconfig"
 


#
# mt diff -ra4bed52e2d6c695d814b53319f20101071ca9bff -r32e6a3c5d4994942e12a0f14ff64ebd224726e17
#
# 
# 
# delete "conf/distro/include/openmoko-srcdate-now.inc"
# 
# delete "packages/gammu/gammu_1.12.94.bb"
# 
# delete "packages/tar/tar"
# 
# delete "packages/tar/tar/tar-native_1.13.25.oe"
# 
# rename "packages/gammu/gammu_1.10.0.bb"
#     to "packages/gammu/gammu_1.13.0.bb"
# 
# rename "packages/libsdl/libsdl-net_1.2.5.bb"
#     to "packages/libsdl/libsdl-net_1.2.7.bb"
# 
# rename "packages/ode"
#     to "packages/nonworking/ode"
# 
# rename "packages/ode/ode_0.5.bb"
#     to "packages/nonworking/ode/ode_0.8.bb"
# 
# rename "packages/python/python-pygtk-0.6.12"
#     to "packages/python/python-pygtk-1.2"
# 
# rename "packages/python/python-pygtk-0.6.12/remove-imlib-et-al"
#     to "packages/python/python-pygtk-1.2/remove-imlib-et-al.patch"
# 
# rename "packages/python/python-pyode_1.0.0.bb"
#     to "packages/nonworking/python/python-pyode_1.2.0.bb"
# 
# rename "packages/python/python-pytest_0.6.0.bb"
#     to "packages/python/python-pytester_0.6.0.bb"
# 
# add_file "classes/task.bbclass"
#  content [e7e881f731b2d8e00055d9a95c21b50d2c2a208b]
# 
# add_file "packages/alsa/alsa-plugins_1.0.14.bb"
#  content [8f085bb2de8e8094c4500114a767eee8ce9b5612]
# 
# add_file "packages/gsm/files/fix-mlbuf.patch"
#  content [557dce80239fff8ac79176198ecf6c19a3aaa4e0]
# 
# add_file "packages/gstreamer/gst-plugin-pulse_0.9.4.bb"
#  content [1b6faaf0116a44c36595879d1ac3c0cecc52b771]
# 
# add_file "packages/initscripts/initscripts-1.0/functions"
#  content [cdb873e9c652d090c2e40fa96d5fd2db86db5413]
# 
# add_file "packages/libpng/libpng-native_1.2.19.bb"
#  content [f167e03f1cc222c183f8550ccbd0bd04fb3381e4]
# 
# add_file "packages/libpng/libpng_1.2.19.bb"
#  content [ba2b48a9b944d81e98b332c04a4cc1932a682fd4]
# 
# add_file "packages/matchbox-keyboard/files/fic-gta01-font-size.patch"
#  content [7faa8b53d7e6bc3188ea910931137b054c3e77f4]
# 
# add_file "packages/mrxvt/files/font-defaults.patch"
#  content [0794144b553a4f2c4ddb457f5ec2b8312dc35ecd]
# 
# add_file "packages/tar/tar_1.18.bb"
#  content [fdb536c98631133f166b631d1c6a2be653c4ac34]
# 
# add_file "packages/tasks/task-openmoko-debug.bb"
#  content [194fcf90f766fbdbc057be3fec031b632534283d]
# 
# add_file "packages/tasks/task-openmoko-native-sdk.bb"
#  content [5ffc742e0afbb22c7591fc1491dc5f96bdbb4388]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [c70c421338b418901a172a9210ea87a82ab763c0]
#    to [ec0e25a8758fde2b684a43cc8fb0b55d7c3a27cc]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [8474adf8121756bae4ae80bf72d1c091265f8ae3]
#    to [ccb3a58cdc94f8b3782b9c1addc3638f883f4b83]
# 
# patch "conf/distro/openmoko.conf"
#  from [c4f3798201c6d84f8635797befd0b9d72551dbef]
#    to [e0c801f07369b559ca30a4b14350a95774ebaedd]
# 
# patch "packages/alsa/alsa-lib_1.0.13.bb"
#  from [1cc7fb5837d3675969799d8e715b42605d72758c]
#    to [a683702c03094e9186bfd192d9bbac123c925bee]
# 
# patch "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
#  from [231596d55e7fd776cbb2db5bf845997ea39b8f09]
#    to [e26913ea8ef767872f2a1bed7529a897a38a0528]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [481e31f5bed1ac2d402c743d5464c9a931503c91]
#    to [fccf05313122b3efcff06e12d6028c79070b3f7b]
# 
# patch "packages/efl1/ecore/configure.patch"
#  from [f8d751202a5cfede1100f0216eba1146e5980a43]
#    to [2071aa5308ada0b0d149faee2e9cea2a3dc6064f]
# 
# patch "packages/efl1/ecore.inc"
#  from [77e800a680cc16d7b45d6800e92bbb3e3f2e02da]
#    to [a118a5964c5363f81cd965a8487f715eb588a60b]
# 
# patch "packages/efl1/evas/fix-configure.patch"
#  from [038b5c06de3db84675386207352adefc073bc947]
#    to [8c89e36034808e87ae9ad89bd075b3dc4786af3a]
# 
# patch "packages/efl1/evas.inc"
#  from [f72bdeb6410f9ee7c0b2e888e67a14c17fa3c1c1]
#    to [1174ba86379ac3fe19ba6930fa2f25cf794caba9]
# 
# patch "packages/gammu/gammu_1.13.0.bb"
#  from [1cb34c46e873f0aa5efd810dcecdb5ff8a9ebefb]
#    to [dbbfbd2cf47cb31eb603a90b621a074f7786c9f0]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [6387ca7f099a514f35eed5b601884e71694739b2]
#    to [ba98d351988038ba9049d25dc6f82ae76c983ee7]
# 
# patch "packages/gstreamer/gst-meta-base_0.10.bb"
#  from [1bf0c039007ac37d76a8902fecda3ef829830212]
#    to [b02e534fa5fcf08c8b48645d99f69a076d0ad955]
# 
# patch "packages/initscripts/initscripts_1.0.bb"
#  from [6c15812e6872f15d45072ac63fb02065a0639077]
#    to [4947d0fbf5c2bde2a6e56a3445f9c328b567a585]
# 
# patch "packages/libtiff/tiff_3.7.2.bb"
#  from [87afac8ebad21f27d937fcbf856fa987c3af79c2]
#    to [026a8c2d0b6d10cc0c2950f8266faf28a6c8d243]
# 
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
#  from [733c78dca4659e362fbd3a43ef5287380bb72f1b]
#    to [3ece7048b0db57ab0907cfe256ce71a1e13290f6]
# 
# patch "packages/makedevs/makedevs-1.0.0/makedevs.c"
#  from [ea1e63451b180d14554bdb8508f0c4189e250d6b]
#    to [d8baece6be2666c9a9d240fe16d7577ec42225c5]
# 
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
#  from [36d86adb332789d1285b9bbce6d99ba323d635ca]
#    to [476322a5c5ab168c1157580e33b08f9df5e136bd]
# 
# patch "packages/mrxvt/mrxvt_0.5.2.bb"
#  from [220b6520e7331de3e508e97124fd4bb4e65ab6f6]
#    to [5de23d329999b272273d1338d05468fb62b7edbb]
# 
# patch "packages/nonworking/ode/ode_0.8.bb"
#  from [4e3a30b5b3be7873cdc9d5a6aac9b2bf8b1504f4]
#    to [c374097c73abc403e4ef197689b6a674215f8b17]
# 
# patch "packages/openmoko2/libmokojournal2_svn.bb"
#  from [b98c1168531f1a502468e26cfa4bf0128a290237]
#    to [6251090262ba51c4d512b8224a2034e606137c8c]
# 
# patch "packages/openmoko2/openmoko-feedreader2_svn.bb"
#  from [f08e50dd63abd757d91d92c33789196eebe7128f]
#    to [71cac52424b6f0ef7fa1c1eb6c0c68596c0ee092]
# 
# patch "packages/openmoko2/openmoko-terminal2_1.0.0.bb"
#  from [8531e0d4c291c25ff4b4f7347aa4482504744c9a]
#    to [2ea84bd4f21c78174ab58bc7d9d93e18683612a1]
# 
# patch "packages/python/python-gammu_0.21.bb"
#  from [b985997bf86465ce82869a460e1336305461798f]
#    to [41ae201e5a819b7fe87d6622edcf2404f1475add]
# 
# patch "packages/python/python-pygtk-1.2_0.6.12.bb"
#  from [2abab9054c28a7d28d3c736bf7a117d55a4a9d3d]
#    to [e163172bcdbd8047dcaebf5c3b45b51861beac8a]
# 
# patch "packages/python/python-pytester_0.6.0.bb"
#  from [22b359ff5bca61d75a21b42fd254ce53cfdc227c]
#    to [6d5999f8f8ef96af3beace5ab8553bf3f7441967]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [8b037b50419fa01babd6a99e14c281d0c0b641bd]
#    to [6b1416c92dd8ec8abdc9cdb30e309d9b3885f8d9]
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [3da11e0123ff22657bf159c34f7cc113db67db51]
#    to [7c5d8562b7e55c346c3e9537d5021584b770f3dc]
# 
# patch "packages/zten/zten_1.6.2.bb"
#  from [6dc2302625ff7cc29b4fd02acda47bed412e77ae]
#    to [d16e5bbbdd5db91cc2059950ee052d9e1df00d1d]
# 
# patch "site/ix86-common"
#  from [9d67af966d6e1bf15300f65a6c132f686dbaa67c]
#    to [c94dc5adc2a936c8f531a54be0ce51d0b6b1a68d]
# 
============================================================
--- classes/task.bbclass	e7e881f731b2d8e00055d9a95c21b50d2c2a208b
+++ classes/task.bbclass	e7e881f731b2d8e00055d9a95c21b50d2c2a208b
@@ -0,0 +1,27 @@
+# Task packages are only used to pull in other packages
+# via their dependencies. They are empty.
+ALLOW_EMPTY = "1"
+
+# By default, only the task package itself is in PACKAGES.
+# -dbg and -dev flavours are handled by the anonfunc below.
+# This means that task recipes used to build multiple task
+# packages have to modify PACKAGES after inheriting task.bbclass.
+PACKAGES = "${PN}"
+
+# By default, task packages do not depend on a certain architecture.
+# Only if dependencies are modified by MACHINE_FEATURES, packages
+# need to be set to MACHINE_ARCH after inheriting task.bbclass
+PACKAGE_ARCH = "all"
+
+# This automatically adds -dbg and -dev flavours of all PACKAGES
+# to the list. Their dependencies (RRECOMMENDS) are handled as usual
+# by package_depchains in a following step.
+python () {
+    packages = bb.data.getVar('PACKAGES', d, 1).split()
+    genpackages = []
+    for pkg in packages:
+        for postfix in ['-dbg', '-dev']:
+            genpackages.append(pkg+postfix)
+    bb.data.setVar('PACKAGES', ' '.join(packages+genpackages), d)
+}
+
============================================================
--- packages/alsa/alsa-plugins_1.0.14.bb	8f085bb2de8e8094c4500114a767eee8ce9b5612
+++ packages/alsa/alsa-plugins_1.0.14.bb	8f085bb2de8e8094c4500114a767eee8ce9b5612
@@ -0,0 +1,20 @@
+DESCRIPTION = "ALSA Plugins"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "multimedia/alsa/plugins"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib pulseaudio"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2"
+
+inherit autotools
+
+PACKAGES_DYNAMIC = "libasound-module*"
+
+python populate_packages_prepend() {
+        plugindir = bb.data.expand('${libdir}/alsa-lib/', d)
+        do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' )
+}
+
+FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la"
+FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug"
============================================================
--- packages/gsm/files/fix-mlbuf.patch	557dce80239fff8ac79176198ecf6c19a3aaa4e0
+++ packages/gsm/files/fix-mlbuf.patch	557dce80239fff8ac79176198ecf6c19a3aaa4e0
@@ -0,0 +1,50 @@
+Index: gsm/src/gsmd/atcmd.c
+===================================================================
+--- gsm/src/gsmd/atcmd.c	(revision 2745)
++++ gsm/src/gsmd/atcmd.c	(working copy)
+@@ -370,8 +370,8 @@
+ 	if (g->mlbuf_len)
+ 		g->mlbuf[g->mlbuf_len ++] = '\n';
+ 	DEBUGP("Appending buf to mlbuf\n");
+-	if (len > sizeof(g->mlbuf) - g->mlbuf_len)
+-		len = sizeof(g->mlbuf) - g->mlbuf_len;
++	if (len > MLPARSE_BUF_SIZE - g->mlbuf_len)
++		len = MLPARSE_BUF_SIZE - g->mlbuf_len;
+ 	memcpy(g->mlbuf + g->mlbuf_len, buf, len);
+ 	g->mlbuf_len += len;
+ 
+@@ -470,7 +470,7 @@
+ 			if (cr)
+ 				len = cr - pos->cur;
+ 			else
+-				len = pos->buflen;
++				len = pos->buflen - 1;  /* assuming zero-terminated strings */
+ 			rc = write(fd, pos->cur, len);
+ 			if (rc == 0) {
+ 				gsmd_log(GSMD_ERROR, "write returns 0, aborting\n");
+@@ -480,8 +480,8 @@
+ 					fd, rc);
+ 				return rc;
+ 			}
+-			if (cr && rc == len)
+-				rc ++;	/* Skip the \n */
++			if (!cr || rc == len)
++				rc ++;	/* Skip the \n or \0 */
+ 			pos->buflen -= rc;
+ 			pos->cur += rc;
+ 			write(fd, "\r", 1);
+Index: gsm/src/gsmd/gsmd.c
+===================================================================
+--- gsm/src/gsmd/gsmd.c	(revision 2745)
++++ gsm/src/gsmd/gsmd.c	(working copy)
+@@ -301,6 +301,10 @@
+ {
+ 	INIT_LLIST_HEAD(&g->users);
+ 
++	g->mlbuf = talloc_array(gsmd_tallocs, unsigned char, MLPARSE_BUF_SIZE);
++	if (!g->mlbuf)
++		return -ENOMEM;
++
+ 	return 0;
+ }
+ 
============================================================
--- packages/gstreamer/gst-plugin-pulse_0.9.4.bb	1b6faaf0116a44c36595879d1ac3c0cecc52b771
+++ packages/gstreamer/gst-plugin-pulse_0.9.4.bb	1b6faaf0116a44c36595879d1ac3c0cecc52b771
@@ -0,0 +1,28 @@
+DESCRIPTION = "GStreamer plugin for using pulse audio as sink and source"
+HOMEPAGE = "http://0pointer.de/lennart/projects/gst-pulse/"
+LICENSE = "GPL"
+DEPENDS = "gstreamer pulseaudio"
+PR = "r1"
+
+SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz"
+S = "${WORKDIR}/gst-pulse-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-lynx"
+GST_LIBV = 0.10
+
+do_install() {
+	install -d ${D}${libdir}/gstreamer-${GST_LIBV}/
+	install -m 0755 src/.libs/libgstpulse.so ${D}${libdir}/gstreamer-${GST_LIBV}
+}
+
+export GST_MODDIR=${libdir}/gstreamer-0.10
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstpulse.so"
+FILES_${PN}-dev = "\
+  ${libdir}/gstreamer-0.10/libgstpulse.a \
+  ${libdir}/gstreamer-0.10/libgstpulse.la \
+  ${libdir}/gstreamer-0.10/libgstpulse.so*"
+FILES_${PN}-dbg = "${libdir}/gstreamer-0.10/.debug"
+
============================================================
--- packages/initscripts/initscripts-1.0/functions	cdb873e9c652d090c2e40fa96d5fd2db86db5413
+++ packages/initscripts/initscripts-1.0/functions	cdb873e9c652d090c2e40fa96d5fd2db86db5413
@@ -0,0 +1,17 @@
+# -*-Shell-script-*-
+#
+# functions     This file contains functions to be used by most or all
+#               shell scripts in the /etc/init.d directory.
+#
+
+cpuinfo_id() {		# return the Hardware module ID
+    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+killproc() {		# kill the named process(es)
+    pid=`/bin/ps -e x |
+         /bin/grep $1 |
+         /bin/grep -v grep |
+         /bin/sed -e 's/^  *//' -e 's/ .*//'`
+    [ "$pid" != "" ] && kill $pid
+}
============================================================
--- 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/matchbox-keyboard/files/fic-gta01-font-size.patch	7faa8b53d7e6bc3188ea910931137b054c3e77f4
+++ packages/matchbox-keyboard/files/fic-gta01-font-size.patch	7faa8b53d7e6bc3188ea910931137b054c3e77f4
@@ -0,0 +1,13 @@
+Index: matchbox-keyboard/src/matchbox-keyboard.c
+===================================================================
+--- matchbox-keyboard.orig/src/matchbox-keyboard.c	2007-08-19 17:26:59.000000000 +0200
++++ matchbox-keyboard/src/matchbox-keyboard.c	2007-08-19 17:27:06.000000000 +0200
+@@ -52,7 +52,7 @@
+   kb->row_spacing = 5;
+ 
+   kb->font_family  = strdup("sans");
+-  kb->font_pt_size = 5;
++  kb->font_pt_size = 3;
+   kb->font_variant = strdup("bold");
+ 
+   for (i = 1; i < argc; i++) 
============================================================
--- packages/mrxvt/files/font-defaults.patch	0794144b553a4f2c4ddb457f5ec2b8312dc35ecd
+++ packages/mrxvt/files/font-defaults.patch	0794144b553a4f2c4ddb457f5ec2b8312dc35ecd
@@ -0,0 +1,25 @@
+Index: mrxvt-0.5.2/src/feature.h
+===================================================================
+--- mrxvt-0.5.2.orig/src/feature.h
++++ mrxvt-0.5.2/src/feature.h
+@@ -474,15 +474,15 @@
+ #define DEFAULT_MIN_VISIBLE_TABS    (6)
+ 
+ /* Minimum Xft%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list