[oe-commits] org.oe.dev merge of '854af845cc8e7d6a3ae568387115eb89f78fba82'
mickeyl commit
oe at amethyst.openembedded.net
Tue May 20 14:32:44 UTC 2008
merge of '854af845cc8e7d6a3ae568387115eb89f78fba82'
and 'b580e935f43d469d6a35f9c89515741825cb9375'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0423aa20e6813e1ee9357282a05d9578bb49c242
ViewMTN: http://monotone.openembedded.org/revision/info/0423aa20e6813e1ee9357282a05d9578bb49c242
Files:
1
packages/mtd/mtd-utils_1.1.0.bb
packages/mtools/mtools-native_3.9.9.bb
packages/mtools/mtools-native_3.9.11.bb
packages/mtools/mtools_3.9.9.bb
packages/mtools/mtools_3.9.11.bb
packages/syslinux/syslinux-native_3.36.bb
packages/syslinux/syslinux-native_3.63.bb
packages/acpid/acpid_1.0.6.bb
packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
packages/efl1/edb_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/edje_cvs.bb
packages/efl1/eet_cvs.bb
packages/efl1/efreet_cvs.bb
packages/efl1/embryo_cvs.bb
packages/efl1/esmart_cvs.bb
packages/efl1/evas-native_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/glibc/glibc-package.bbclass
packages/startup-notification/startup-notification_0.8.bb
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
Diffs:
#
# mt diff -r854af845cc8e7d6a3ae568387115eb89f78fba82 -r0423aa20e6813e1ee9357282a05d9578bb49c242
#
#
#
# patch "packages/mtd/mtd-utils_1.1.0.bb"
# from [62670e998ad85120543b4c4d96eb8c4d85363ab3]
# to [f1a35c998ce14edbfdea2856cdb5bbbd723506f6]
#
============================================================
--- packages/mtd/mtd-utils_1.1.0.bb 62670e998ad85120543b4c4d96eb8c4d85363ab3
+++ packages/mtd/mtd-utils_1.1.0.bb f1a35c998ce14edbfdea2856cdb5bbbd723506f6
@@ -3,11 +3,8 @@ LICENSE = "GPLv2"
DEPENDS = "zlib lzo"
HOMEPAGE = "http://www.linux-mtd.infradead.org/"
LICENSE = "GPLv2"
-PR = "r1"
+PR = "r3"
-# scheduled to enable 15-03-2008
-DEFAULT_PREFERENCE = "-1"
-
SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.1.0.tar.bz2 \
file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \
file://fix-ignoreerrors-git.patch;patch=1 \
#
# mt diff -rb580e935f43d469d6a35f9c89515741825cb9375 -r0423aa20e6813e1ee9357282a05d9578bb49c242
#
#
#
# rename "packages/mtools/mtools-native_3.9.9.bb"
# to "packages/mtools/mtools-native_3.9.11.bb"
#
# rename "packages/mtools/mtools_3.9.9.bb"
# to "packages/mtools/mtools_3.9.11.bb"
#
# rename "packages/syslinux/syslinux-native_3.36.bb"
# to "packages/syslinux/syslinux-native_3.63.bb"
#
# add_file "packages/acpid/acpid_1.0.6.bb"
# content [c44a19e28b91e0ba71888ce49af8c2a1e1a36bf4]
#
# add_file "packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch"
# content [0a664afb7d51c2cd332153d72b4d8bd35559d350]
#
# patch "packages/efl1/ecore-native_cvs.bb"
# from [454bc7eb7c9a1579123625d9b419ea0982f3b381]
# to [47c2a5e1692381f93bef6ef8180ff7daaf1a3760]
#
# patch "packages/efl1/ecore.inc"
# from [b736e8d906a16691f28e2de920bf7b69469cb020]
# to [d132e5d100eb3a87ef5d6cb123c586e203ef5143]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [8e141a68d3fb8691ee914a2ac970129fe14f8aed]
# to [db9ceefb6209514dcc2b22c3b7d8e0816820f762]
#
# patch "packages/efl1/edb_cvs.bb"
# from [cfec22c11caa4150e22a2640ef1292b5fc9dd9df]
# to [7d8fdec465a882e0ed9272e63c54cbdfd4aa19d2]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [7f6f010883128a2dc595086674f08caa1bf29d74]
# to [e051cb48a3921952f001b55f34a5f92b4234574a]
#
# patch "packages/efl1/edje_cvs.bb"
# from [c97e863a88bf2970d41f1107b5d64b248abf57e0]
# to [62eea4a4a904f412cb2ae26142d346a3a70cd876]
#
# patch "packages/efl1/eet_cvs.bb"
# from [eada78b9148d3a22f1b46d69d3aabbdfe747410c]
# to [9979a56ebf0921e6b1c374aaf525e1fbdce50a27]
#
# patch "packages/efl1/efreet_cvs.bb"
# from [4b80740afd5106d5bc474fa4921c6522ca473d30]
# to [c7934aa1ab83cf5bde841da90247d731b5dff0de]
#
# patch "packages/efl1/embryo_cvs.bb"
# from [d1e3b9f6212724c6df80aec5468b565a407a77bb]
# to [5e61b438e4ebdca460ac0b5b906d852025c76747]
#
# patch "packages/efl1/esmart_cvs.bb"
# from [6502bab7ea2f2d0380e49644e4204603a1395ff1]
# to [ffe66023913a2de6c11a7669d205c89954fd43c7]
#
# patch "packages/efl1/evas-native_cvs.bb"
# from [6187f8e7ba476dd0db7fa8a5c523f6a000d9e5fa]
# to [6d464a30990003574c9db7b5255cf707856408c4]
#
# patch "packages/efl1/evas.inc"
# from [9c61e64a2a646cac813a4701bd1a5c5a4ac16964]
# to [3832fb27b48f99ab029bbdcd20863a3daa1a3009]
#
# patch "packages/efl1/evas_cvs.bb"
# from [82f126668ed700106fce2efb55f6d16c371b4bd1]
# to [698aa57979dcff374e859909316b7b53c0a2b985]
#
# patch "packages/glibc/glibc-package.bbclass"
# from [2d2b8c3ea8f41c3fc6f5410c830c9e148ffbeaf6]
# to [cc608cf169b73c5795935b63f2ff1bb56dd743d8]
#
# patch "packages/startup-notification/startup-notification_0.8.bb"
# from [d98452e8ff11d1f979b2e846cae86aa0602c958f]
# to [c1d63af980014d68a74b102dce2e49edfdcc9658]
#
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
# from [228af28a9592f1bb445ca5ffd4054533d0a5498e]
# to [6474fcf082bf05c6ca166e3988f5b8aeb31a503d]
#
============================================================
--- packages/acpid/acpid_1.0.6.bb c44a19e28b91e0ba71888ce49af8c2a1e1a36bf4
+++ packages/acpid/acpid_1.0.6.bb c44a19e28b91e0ba71888ce49af8c2a1e1a36bf4
@@ -0,0 +1,4 @@
+require acpid.inc
+SRC_URI += "file://gcc40.patch;patch=1"
+PR = "r3"
+
============================================================
--- packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch 0a664afb7d51c2cd332153d72b4d8bd35559d350
+++ packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch 0a664afb7d51c2cd332153d72b4d8bd35559d350
@@ -0,0 +1,10 @@
+--- xorg-server-1.3.0.0/render/glyphstr.h~ 2006-09-18 03:04:18.000000000 -0300
++++ xorg-server-1.3.0.0/render/glyphstr.h 2008-02-03 22:14:23.187159732 -0200
+@@ -25,6 +25,7 @@
+ #ifndef _GLYPHSTR_H_
+ #define _GLYPHSTR_H_
+
++#include <X11/X.h>
+ #include <X11/extensions/renderproto.h>
+ #include "picture.h"
+ #include "screenint.h"
============================================================
--- packages/efl1/ecore-native_cvs.bb 454bc7eb7c9a1579123625d9b419ea0982f3b381
+++ packages/efl1/ecore-native_cvs.bb 47c2a5e1692381f93bef6ef8180ff7daaf1a3760
@@ -1,7 +1,7 @@ DEPENDS = "eet-native evas-native"
require ecore.inc
inherit native
DEPENDS = "eet-native evas-native"
-PR = "r4"
+PR = "r0"
EXTRA_OECONF = "\
--enable-ecore-txt \
============================================================
--- packages/efl1/ecore.inc b736e8d906a16691f28e2de920bf7b69469cb020
+++ packages/efl1/ecore.inc d132e5d100eb3a87ef5d6cb123c586e203ef5143
@@ -3,7 +3,7 @@ DEPENDS = "curl eet evas tslib libxtst l
DEPENDS = "curl eet evas tslib libxtst libxscrnsaver"
# optional
# DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
-PV = "0.9.9.042+cvs${SRCDATE}"
+PV = "0.9.9.043+cvs${SRCDATE}"
inherit efl
============================================================
--- packages/efl1/ecore_cvs.bb 8e141a68d3fb8691ee914a2ac970129fe14f8aed
+++ packages/efl1/ecore_cvs.bb db9ceefb6209514dcc2b22c3b7d8e0816820f762
@@ -1,5 +1,5 @@ require ecore.inc
require ecore.inc
-PR = "r3"
+PR = "r0"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
============================================================
--- packages/efl1/edb_cvs.bb cfec22c11caa4150e22a2640ef1292b5fc9dd9df
+++ packages/efl1/edb_cvs.bb 7d8fdec465a882e0ed9272e63c54cbdfd4aa19d2
@@ -1,7 +1,7 @@ DEPENDS = "zlib"
DESCRIPTION = "Edb is the Enlightenment database library"
LICENSE = "MIT BSD"
DEPENDS = "zlib"
-PV = "1.0.5.042+cvs${SRCDATE}"
+PV = "1.0.5.043+cvs${SRCDATE}"
PR = "r0"
inherit efl
============================================================
--- packages/efl1/edbus_cvs.bb 7f6f010883128a2dc595086674f08caa1bf29d74
+++ packages/efl1/edbus_cvs.bb e051cb48a3921952f001b55f34a5f92b4234574a
@@ -1,8 +1,8 @@ LICENSE = "MIT BSD"
DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
DEPENDS = "dbus ecore efreet ewl"
LICENSE = "MIT BSD"
-PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r5"
+PV = "0.5.0.043+cvs${SRCDATE}"
+PR = "r0"
inherit efl
============================================================
--- packages/efl1/edje_cvs.bb c97e863a88bf2970d41f1107b5d64b248abf57e0
+++ packages/efl1/edje_cvs.bb 62eea4a4a904f412cb2ae26142d346a3a70cd876
@@ -1,7 +1,7 @@ LICENSE = "MIT BSD"
DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
DEPENDS = "eet evas ecore embryo edje-native"
LICENSE = "MIT BSD"
-PV = "0.5.0.042+cvs${SRCDATE}"
+PV = "0.9.9.043+cvs${SRCDATE}"
PR = "r0"
inherit efl
============================================================
--- packages/efl1/eet_cvs.bb eada78b9148d3a22f1b46d69d3aabbdfe747410c
+++ packages/efl1/eet_cvs.bb 9979a56ebf0921e6b1c374aaf525e1fbdce50a27
@@ -1,7 +1,7 @@ LICENSE = "MIT BSD"
DESCRIPTION = "EET is the Enlightenment data storage library"
DEPENDS = "zlib jpeg"
LICENSE = "MIT BSD"
-PV = "0.9.10.042+cvs${SRCDATE}"
+PV = "1.0.1+cvs${SRCDATE}"
PR = "r0"
inherit efl
============================================================
--- packages/efl1/efreet_cvs.bb 4b80740afd5106d5bc474fa4921c6522ca473d30
+++ packages/efl1/efreet_cvs.bb c7934aa1ab83cf5bde841da90247d731b5dff0de
@@ -1,7 +1,7 @@ LICENSE = "MIT BSD"
DESCRIPTION = "The Enlightenment freedesktop.org library"
DEPENDS = "ecore"
LICENSE = "MIT BSD"
-PV = "0.0.3.042+cvs${SRCDATE}"
+PV = "0.5.0.043+cvs${SRCDATE}"
PR = "r0"
inherit efl
============================================================
--- packages/efl1/embryo_cvs.bb d1e3b9f6212724c6df80aec5468b565a407a77bb
+++ packages/efl1/embryo_cvs.bb 5e61b438e4ebdca460ac0b5b906d852025c76747
@@ -1,6 +1,6 @@ LICENSE = "MIT BSD"
DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
LICENSE = "MIT BSD"
-PV = "0.9.1.042+cvs${SRCDATE}"
+PV = "0.9.9.043+cvs${SRCDATE}"
PR = "r0"
inherit efl
============================================================
--- packages/efl1/esmart_cvs.bb 6502bab7ea2f2d0380e49644e4204603a1395ff1
+++ packages/efl1/esmart_cvs.bb ffe66023913a2de6c11a7669d205c89954fd43c7
@@ -1,7 +1,8 @@ DEPENDS = "evas ecore edje imlib2 epsilo
DESCRIPTION = "ESmart is a collection of smart Evas objects"
LICENSE = "MIT BSD"
DEPENDS = "evas ecore edje imlib2 epsilon libtool"
-PV = "0.9.0.042+cvs${SRCDATE}"
+PV = "0.9.0.043+cvs${SRCDATE}"
+PR = "r0"
inherit efl
============================================================
--- packages/efl1/evas-native_cvs.bb 6187f8e7ba476dd0db7fa8a5c523f6a000d9e5fa
+++ packages/efl1/evas-native_cvs.bb 6d464a30990003574c9db7b5255cf707856408c4
@@ -1,7 +1,7 @@ DEPENDS = "freetype-native libpng-native
require evas.inc
inherit native
DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
-PR = "r1"
+PR = "r0"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
============================================================
--- packages/efl1/evas.inc 9c61e64a2a646cac813a4701bd1a5c5a4ac16964
+++ packages/efl1/evas.inc 3832fb27b48f99ab029bbdcd20863a3daa1a3009
@@ -2,7 +2,7 @@ DEPENDS = "eet freetype jpeg libpng virt
LICENSE = "MIT BSD"
# can also depend on valgrind, libsdl-x11, directfb
DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender"
-PV = "0.9.9.042+cvs${SRCDATE}"
+PV = "0.9.9.043+cvs${SRCDATE}"
inherit efl
============================================================
--- packages/efl1/evas_cvs.bb 82f126668ed700106fce2efb55f6d16c371b4bd1
+++ packages/efl1/evas_cvs.bb 698aa57979dcff374e859909316b7b53c0a2b985
@@ -1,5 +1,5 @@ require evas.inc
require evas.inc
-PR = "r1"
+PR = "r0"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
============================================================
--- packages/glibc/glibc-package.bbclass 2d2b8c3ea8f41c3fc6f5410c830c9e148ffbeaf6
+++ packages/glibc/glibc-package.bbclass cc608cf169b73c5795935b63f2ff1bb56dd743d8
@@ -247,6 +247,9 @@ python package_do_split_gconvs () {
def output_locale_binary(name, locale, encoding):
target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+ if target_arch in ("i586", "i686"):
+ target_arch = "i386"
+
qemu = "qemu-%s -r 2.6.16" % target_arch
pkgname = 'locale-base-' + legitimize_package_name(name)
m = re.match("(.*)\.(.*)", name)
============================================================
--- packages/startup-notification/startup-notification_0.8.bb d98452e8ff11d1f979b2e846cae86aa0602c958f
+++ packages/startup-notification/startup-notification_0.8.bb c1d63af980014d68a74b102dce2e49edfdcc9658
@@ -2,7 +2,7 @@ PRIORITY = "optional"
LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "virtual/libx11"
+DEPENDS = "virtual/libx11 libsm"
inherit autotools pkgconfig
============================================================
--- packages/xorg-xserver/xserver-xorg_1.3.0.0.bb 228af28a9592f1bb445ca5ffd4054533d0a5498e
+++ packages/xorg-xserver/xserver-xorg_1.3.0.0.bb 6474fcf082bf05c6ca166e3988f5b8aeb31a503d
@@ -4,7 +4,8 @@ PR = "r4"
PE = "1"
PR = "r4"
-SRC_URI += "file://drmfix.patch;patch=1"
+SRC_URI += "file://drmfix.patch;patch=1 \
+ file://glyphstr.patch;patch=1"
EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
More information about the Openembedded-commits
mailing list