[oe-commits] org.oe.dev merge of '15632785e576f4fbbf9cdccf18d8aae806bec193'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Aug 4 21:09:25 UTC 2007
merge of '15632785e576f4fbbf9cdccf18d8aae806bec193'
and 'dace6576f510b1f3af99d9580e3f0d3d18a773b1'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: ae2458fa8938ece8adcd655241bca8daa32f676a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ae2458fa8938ece8adcd655241bca8daa32f676a
Files:
1
packages/sysvinit/sysvinit/openmoko
packages/sysvinit/sysvinit/openmoko/rc
packages/sysvinit/sysvinit/openmoko/rcS
packages/gtk+/files/lower-quality-scaling-in-pixbuf-engine.patch
conf/distro/openmoko.conf
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/gtk+/gtk+_2.10.14.bb
packages/psplash/psplash_svn.bb
packages/tslib/tslib_1.0.bb
delete.txt
packages/gaim/files/purple-OE-branding.patch
packages/abiword/abiword-2.5.inc
packages/abiword/abiword_2.5.1.bb
packages/angstrom/angstrom-x11-base-depends.bb
packages/gaim/pidgin_2.1.0.bb
Diffs:
#
# mt diff -r15632785e576f4fbbf9cdccf18d8aae806bec193 -rae2458fa8938ece8adcd655241bca8daa32f676a
#
#
#
# delete "packages/sysvinit/sysvinit/openmoko"
#
# delete "packages/sysvinit/sysvinit/openmoko/rc"
#
# delete "packages/sysvinit/sysvinit/openmoko/rcS"
#
# add_file "packages/gtk+/files/lower-quality-scaling-in-pixbuf-engine.patch"
# content [9b2b5942f437637d6484f64ae700dd1c8335730b]
#
# patch "conf/distro/openmoko.conf"
# from [aa679464e78f9c1ff61366452bcb6a3bfcf3a3e2]
# to [c4f3798201c6d84f8635797befd0b9d72551dbef]
#
# patch "conf/machine/fic-gta01.conf"
# from [466d77dadd32f0dc79d242207f09ccd87533b0aa]
# to [1ef7e5d0dd0d861d301d9817a3ef3cf36959179d]
#
# patch "conf/machine/fic-gta02.conf"
# from [02cbabf3237da327316e9124d6c52fce6776baeb]
# to [998009f2b1180b5024ef1f0ce6e808ad71d71e1a]
#
# patch "packages/gtk+/gtk+_2.10.14.bb"
# from [5334ae3cb851a4bd67bacc6373c37cb286d09808]
# to [81d88b860767ea54cfcd4a8eee4be9c678e3a3ed]
#
# patch "packages/psplash/psplash_svn.bb"
# from [d807d122456dffb57ecb7b98eb6938b27656be98]
# to [f1826cfd4a06731d53778cf72dab8dbdb9cf57fd]
#
# patch "packages/tslib/tslib_1.0.bb"
# from [95e66f4eb82f0452567b7af1dcfc985b03714496]
# to [1c4fb53d13e4113521fe14d479e43b12dbfa9478]
#
============================================================
--- packages/gtk+/files/lower-quality-scaling-in-pixbuf-engine.patch 9b2b5942f437637d6484f64ae700dd1c8335730b
+++ packages/gtk+/files/lower-quality-scaling-in-pixbuf-engine.patch 9b2b5942f437637d6484f64ae700dd1c8335730b
@@ -0,0 +1,13 @@
+Index: gtk+-2.6.10/modules/engines/pixbuf/pixbuf-render.c
+===================================================================
+--- gtk+-2.6.10.orig/modules/engines/pixbuf/pixbuf-render.c 2005-08-18 14:11:00.000000000 +0000
++++ gtk+-2.6.10/modules/engines/pixbuf/pixbuf-render.c 2007-05-24 11:16:50.000000000 +0000
+@@ -407,7 +407,7 @@
+ 0, 0, rect.width, rect.height,
+ dest_x - rect.x, dest_y - rect.y,
+ x_scale, y_scale,
+- GDK_INTERP_BILINEAR);
++ GDK_INTERP_NEAREST);
+
+ g_object_unref (partial_src);
+
============================================================
--- conf/distro/openmoko.conf aa679464e78f9c1ff61366452bcb6a3bfcf3a3e2
+++ conf/distro/openmoko.conf c4f3798201c6d84f8635797befd0b9d72551dbef
@@ -7,7 +7,6 @@ require conf/distro/include/openmoko-src
require conf/distro/angstrom-2007.1.conf
require conf/distro/include/openmoko-srcdate-now.inc
-
#
# Header
#
@@ -17,6 +16,8 @@ DISTRO_TYPE = "debug"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
+OVERRIDES = "local:${MACHINE}:${DISTRO}:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/"
@@ -25,3 +26,4 @@ FEED_URIS = "\
all##http://buildhost.openmoko.org/tmp/deploy/ipk/all \
armv4t##http://buildhost.openmoko.org/tmp/deploy/ipk/armv4t \
fic-gta01##http://buildhost.openmoko.org/tmp/deploy/ipk/fic-gta01"
+
============================================================
--- conf/machine/fic-gta01.conf 466d77dadd32f0dc79d242207f09ccd87533b0aa
+++ conf/machine/fic-gta01.conf 1ef7e5d0dd0d861d301d9817a3ef3cf36959179d
@@ -33,7 +33,7 @@ ROOT_FLASH_SIZE = "60"
ROOT_FLASH_SIZE = "60"
# extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
# build / upload tools
EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
============================================================
--- conf/machine/fic-gta02.conf 02cbabf3237da327316e9124d6c52fce6776baeb
+++ conf/machine/fic-gta02.conf 998009f2b1180b5024ef1f0ce6e808ad71d71e1a
@@ -32,7 +32,7 @@ ROOT_FLASH_SIZE = "256"
ROOT_FLASH_SIZE = "256"
# extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
# build / upload tools
EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
============================================================
--- packages/gtk+/gtk+_2.10.14.bb 5334ae3cb851a4bd67bacc6373c37cb286d09808
+++ packages/gtk+/gtk+_2.10.14.bb 81d88b860767ea54cfcd4a8eee4be9c678e3a3ed
@@ -1,6 +1,6 @@ require gtk-2.10.inc
require gtk-2.10.inc
-PR = "r1"
+PR = "r2"
# disable per default - untested and not all patches included.
DEFAULT_PREFERENCE = "-1"
@@ -31,3 +31,8 @@ EXTRA_OECONF += "${@get_gtk_fpu_setting(
#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
require gtk-fpu.inc
EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
+
+# try to squeeze some more performance out of it
+SRC_URI_append_fic-gta01 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
+SRC_URI_append_fic-gta02 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
+
============================================================
--- packages/psplash/psplash_svn.bb d807d122456dffb57ecb7b98eb6938b27656be98
+++ packages/psplash/psplash_svn.bb f1826cfd4a06731d53778cf72dab8dbdb9cf57fd
@@ -1,8 +1,8 @@ PV = "0.0+svn${SRCDATE}"
DESCRIPTION = "Userspace framebuffer boot logo based on usplash."
SECTION = "base"
LICENSE = "GPL"
PV = "0.0+svn${SRCDATE}"
-PR = "r6"
+PR = "r7"
# You can create your own pslash-hand-img.h by doing
# ./make-image-header.sh <file>.png HAND
@@ -13,11 +13,10 @@ SRC_URI = "svn://svn.o-hand.com/repos/mi
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
file://psplash-hand-img.h \
file://psplash-bar-img.h \
- file://psplash-init "
+ file://psplash-init"
S = "${WORKDIR}/psplash"
-# for now only GTA01, later use openmoko distro override
-SRC_URI_append_fic-gta01 = "file://configurability.patch;patch=1 "
+SRC_URI_append_openmoko = " file://configurability.patch;patch=1 "
inherit autotools pkgconfig update-rc.d
============================================================
--- packages/tslib/tslib_1.0.bb 95e66f4eb82f0452567b7af1dcfc985b03714496
+++ packages/tslib/tslib_1.0.bb 1c4fb53d13e4113521fe14d479e43b12dbfa9478
@@ -1,10 +1,10 @@ LICENSE = "LGPL"
DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
HOMEPAGE = "http://tslib.berlios.de/"
AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
SECTION = "base"
LICENSE = "LGPL"
-PR = "r15"
+PR = "r16"
SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
file://tslib-input_raw-grab_events.patch;patch=1 \
@@ -75,7 +75,6 @@ RRECOMMENDS_angstrom = " pointercal "
RDEPENDS_${PN} = "tslib-conf"
# Ship calibration data if it exists
RRECOMMENDS_angstrom = " pointercal "
-RRECOMMENDS_openmoko = " pointercal "
FILES_${PN}-dbg += "${libdir}/ts/.debug*"
FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
#
# mt diff -rdace6576f510b1f3af99d9580e3f0d3d18a773b1 -rae2458fa8938ece8adcd655241bca8daa32f676a
#
#
#
# add_file "delete.txt"
# content [bd9617c3b4539ee027a89ed5100118f79fac7a56]
#
# add_file "packages/gaim/files/purple-OE-branding.patch"
# content [e98114902634c2bd92f9a0f1eb587e0abf559d96]
#
# patch "packages/abiword/abiword-2.5.inc"
# from [a2d60977f2ad75b56c1859748441a5644e35c555]
# to [e523d1c593851bbd008dc514dd17073707fc961a]
#
# patch "packages/abiword/abiword_2.5.1.bb"
# from [c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1]
# to [a3d8ed34e897eaee21387d1b1b4a9899feba167e]
#
# patch "packages/angstrom/angstrom-x11-base-depends.bb"
# from [2ec95cf285641811a12fb7787619753c508b8ebd]
# to [d989671115322c73a6610eb4c8b8fafa5ea4812b]
#
# patch "packages/gaim/pidgin_2.1.0.bb"
# from [f38dd9af51ab37706164482bcece1477daca655a]
# to [5d1d81cb5f095264cf7a6ca63aaa7e1fa5b87668]
#
============================================================
--- delete.txt bd9617c3b4539ee027a89ed5100118f79fac7a56
+++ delete.txt bd9617c3b4539ee027a89ed5100118f79fac7a56
@@ -0,0 +1,27 @@
+Packages to be removed from OpenEmbedded if no one will fix them.
+
+Dropping stuff from metadata is not best way so this file will be filled
+with informations about which parts of metadata will be removed.
+
+Please sort by removal date
+
+Package Name: recipe, directory or subsystem name
+Removal Date: YYYY-MM-DD
+Maintainer: Surname Name + e-mail
+Reason: description why it will get removed
+Proposed by: person which want entry to be removed
+
+-----------------------------------------------------------------------------
+
+Package Name: Maemo
+Removal Date: 2006-12-15
+Maintainer: none
+Reason: Unfetchable, obsoleted by IT2006 release.
+Proposed by: Marcin 'Hrw' Juszkiewicz
+
+Package Name: task-bootstrap*
+Removal Date: 2006-12-22
+Maintainer: None
+Reason: Obsoleted by task-base
+Proposed by: Koen Kooi
+Note: Moved to packages/obsolete/tasks on 2006-12-22
============================================================
--- packages/gaim/files/purple-OE-branding.patch e98114902634c2bd92f9a0f1eb587e0abf559d96
+++ packages/gaim/files/purple-OE-branding.patch e98114902634c2bd92f9a0f1eb587e0abf559d96
@@ -0,0 +1,14 @@
+--- /tmp/irc.h 2007-08-04 20:27:10.000000000 +0200
++++ pidgin-2.1.0/libpurple/protocols/irc/irc.h 2007-08-04 20:28:15.318400000 +0200
+@@ -35,9 +35,9 @@
+ #define IRC_DEFAULT_SSL_PORT 994
+
+ #define IRC_DEFAULT_CHARSET "UTF-8"
+-#define IRC_DEFAULT_ALIAS "purple"
++#define IRC_DEFAULT_ALIAS "OE-user"
+
+-#define IRC_DEFAULT_QUIT "Leaving."
++#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
+
+ #define IRC_INITIAL_BUFSIZE 1024
+
============================================================
--- packages/abiword/abiword-2.5.inc a2d60977f2ad75b56c1859748441a5644e35c555
+++ packages/abiword/abiword-2.5.inc e523d1c593851bbd008dc514dd17073707fc961a
@@ -13,21 +13,21 @@ FILES_${PN} += " \
FILES_${PN} += " \
${datadir}/icons/* \
- ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/glade \
- ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/scripts \
- ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en \
- ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en_GB \
-# ${datadir}/AbiSuite-${SHRT_VER}/templates/A4.awt \
-# ${datadir}/AbiSuite-${SHRT_VER}/templates/US-Letter.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt-en_GB \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Employee-Directory.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Business-Report.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Fax-Coversheet.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Resume.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Two-Columns.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Memo.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Press-Release.awt "
+ ${datadir}/abiword-${SHRT_VER}/AbiWord/glade \
+ ${datadir}/abiword-${SHRT_VER}/AbiWord/scripts \
+ ${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en \
+ ${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en_GB \
+# ${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
+# ${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
+ ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
inherit autotools pkgconfig
@@ -54,8 +54,8 @@ PACKAGES += " abiword-clipart abiword-ic
PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
+FILES_abiword-clipart += "${datadir}/abiword-${SHRT_VER}/clipart"
+FILES_abiword-icons += "${datadir}/abiword-${SHRT_VER}/icons"
+FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
+FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
+FILES_abiword-templates += "${datadir}/abiword-${SHRT_VER}/templates"
-FILES_abiword-clipart += "${datadir}/AbiSuite-${SHRT_VER}/clipart"
-FILES_abiword-icons += "${datadir}/AbiSuite-${SHRT_VER}/icons"
-FILES_abiword-strings += "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/strings"
-FILES_abiword-systemprofiles += "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile*"
-FILES_abiword-templates += "${datadir}/AbiSuite-${SHRT_VER}/templates"
============================================================
--- packages/abiword/abiword_2.5.1.bb c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1
+++ packages/abiword/abiword_2.5.1.bb a3d8ed34e897eaee21387d1b1b4a9899feba167e
@@ -1,7 +1,7 @@ DEFAULT_PREFERENCE = "-1"
require abiword-2.5.inc
DEFAULT_PREFERENCE = "-1"
-PR = "r0"
+PR = "r1"
RCONFLICTS = "abiword-embedded"
============================================================
--- packages/angstrom/angstrom-x11-base-depends.bb 2ec95cf285641811a12fb7787619753c508b8ebd
+++ packages/angstrom/angstrom-x11-base-depends.bb d989671115322c73a6610eb4c8b8fafa5ea4812b
@@ -1,9 +1,11 @@ DESCRIPTION = "Task packages for the Ang
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r32"
+PR = "r33"
ALLOW_EMPTY = "1"
XSERVER ?= "xserver-kdrive-fbdev"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
DEPENDS = "virtual/xserver"
RDEPENDS = "\
============================================================
--- packages/gaim/pidgin_2.1.0.bb f38dd9af51ab37706164482bcece1477daca655a
+++ packages/gaim/pidgin_2.1.0.bb 5d1d81cb5f095264cf7a6ca63aaa7e1fa5b87668
@@ -1,9 +1,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/
require pidgin.inc
SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
file://sanitize-configure.ac.patch;patch=1 \
file://gconf-no-errors.patch;patch=1 \
file://pidgin.desktop-set-icon.patch;patch=1 \
+ file://purple-OE-branding.patch;patch=1 \
"
+PR = "r1"
-PR = "r0"
More information about the Openembedded-commits
mailing list