[oe-commits] org.oe.dev merge of '2c4ce910697bba06555153194e59aa010346bb7c'
florian commit
openembedded-commits at lists.openembedded.org
Thu Aug 2 15:33:41 UTC 2007
merge of '2c4ce910697bba06555153194e59aa010346bb7c'
and '8b8fb841c5173c325347c89a0c911e34aff7fdd3'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: fe3d35212a54b3e2d97ca1cc018087a4e8312696
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fe3d35212a54b3e2d97ca1cc018087a4e8312696
Files:
1
packages/gpe-package/gpe-package_0.4.bb
conf/distro/include/preferred-gpe-versions-2.8.inc
packages/ttf-fonts/ttf-dejavu_2.15.bb
packages/ttf-fonts/ttf-dejavu_2.18.bb
packages/xorg-xserver/xserver-kdrive-1.2.0/xcalibrate_coords.patch
packages/angstrom/angstrom-x11-base-depends.bb
packages/libw100/libw100_0.0.2.bb
packages/libw100/libw100_svn.bb
packages/vincent/vincent_svn.bb
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
Diffs:
#
# mt diff -r2c4ce910697bba06555153194e59aa010346bb7c -rfe3d35212a54b3e2d97ca1cc018087a4e8312696
#
#
#
# add_file "packages/gpe-package/gpe-package_0.4.bb"
# content [ac02803b23c91214af3324e6ca5d8d9d4c58e039]
#
# patch "conf/distro/include/preferred-gpe-versions-2.8.inc"
# from [4da9f57943c6dcb788c21e20c21df62d371ca70d]
# to [8e83ca18284fdaba2088bf9e7b5b1d5ce3990031]
#
============================================================
--- packages/gpe-package/gpe-package_0.4.bb ac02803b23c91214af3324e6ca5d8d9d4c58e039
+++ packages/gpe-package/gpe-package_0.4.bb ac02803b23c91214af3324e6ca5d8d9d4c58e039
@@ -0,0 +1,22 @@
+LICENSE = "GPL"
+PR = "r0"
+inherit gpe pkgconfig
+
+DESCRIPTION = "A package manager GUI for GPE"
+DEPENDS = "ipkg libpcre libgpewidget"
+RDEPENDS = "gpe-icons gpe-su"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += " file://sbin-and-no-suid-install.patch;patch=1 \
+ file://gpe-package"
+
+FILES_${PN} += " /usr/bin/gpe-package"
+
+CFLAGS += "-DENABLE_PCRE"
+LDFLAGS += "-lpcre"
+
+do_install_append() {
+ install -d ${D}${bindir}
+ install -m 0755 ${WORKDIR}/gpe-package ${D}${bindir}
+}
============================================================
--- conf/distro/include/preferred-gpe-versions-2.8.inc 4da9f57943c6dcb788c21e20c21df62d371ca70d
+++ conf/distro/include/preferred-gpe-versions-2.8.inc 8e83ca18284fdaba2088bf9e7b5b1d5ce3990031
@@ -8,5 +8,70 @@ PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco
PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
+#specify versions, as the header says :)
+PREFERRED_VERSION_glib-2.0 ?= "2.8.6"
+PREFERRED_VERSION_pango ?= "1.8.2"
+PREFERRED_VERSION_gtk+ ?= "2.6.10"
+PREFERRED_VERSION_gtk-engines ?= "2.6.5"
+PREFERRED_VERSION_librsvg ?= "2.16.1"
+
+PREFERRED_VERSION_libgpewidget ?= "0.115"
+PREFERRED_VERSION_libgpepimc ?= "0.9"
+PREFERRED_VERSION_libgpevtype ?= "0.50"
+PREFERRED_VERSION_libschedule ?= "0.17"
+PREFERRED_VERSION_libcontactsdb ?= "0.5"
+PREFERRED_VERSION_libtododb ?= "0.11"
+PREFERRED_VERSION_libhandoff ?= "0.1"
+PREFERRED_VERSION_libmimedir ?= "0.4.1"
+PREFERRED_VERSION_libsoundgen ?= "0.6"
+
+PREFERRED_VERSION_gpe-icons ?= "0.25"
+
+PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
+PREFERRED_VERSION_gpe-su ?= "0.19"
+PREFERRED_VERSION_keylaunch ?= "2.0.7"
+PREFERRED_VERSION_startup-monitor ?= "0.18-2"
+PREFERRED_VERSION_gpe-dm ?= "0.51"
+
+PREFERRED_VERSION_gpe-todo ?= "0.56"
+PREFERRED_VERSION_gpe-calendar ?= "0.91"
+PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
+PREFERRED_VERSION_gpe-contacts ?= "0.47"
+PREFERRED_VERSION_gpe-beam ?= "0.2.9"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.55"
+PREFERRED_VERSION_gpe-conf ?= "0.2.6"
+PREFERRED_VERSION_gpe-clock ?= "0.25"
+PREFERRED_VERSION_gpe-mininet ?= "0.7"
+PREFERRED_VERSION_gpe-mixer ?= "0.42"
+PREFERRED_VERSION_gpe-shield ?= "0.9"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.20"
+PREFERRED_VERSION_minilite ?= "0.50"
+PREFERRED_VERSION_gpe-edit ?= "0.40"
+PREFERRED_VERSION_gpe-gallery ?= "0.97"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-package ?= "0.4"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.43"
+PREFERRED_VERSION_gpe-filemanager ?= "0.30"
+PREFERRED_VERSION_gpe-mini-browser ?= "0.21"
+PREFERRED_VERSION_gpe-scap ?= "1.3"
+PREFERRED_VERSION_gpesyncd ?= "2.0"
+PREFERRED_VERSION_gpe-synctool ?= "0.2"
+PREFERRED_VERSION_gpe-announce ?= "0.13"
+PREFERRED_VERSION_gpe-timesheet ?= "0.32"
+PREFERRED_VERSION_gpe-irc ?= "0.08"
+PREFERRED_VERSION_starling ?= "0.2"
+
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-plucker ?= "0.4"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+
+PREFERRED_VERSION_vlc-gpe ?= "0.8.4"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
-# - the GPE roadmap doesn't state any versions for 2.8 yet
-# http://www.handhelds.org/moin/moin.cgi/GPERoadmap
#
# mt diff -r8b8fb841c5173c325347c89a0c911e34aff7fdd3 -rfe3d35212a54b3e2d97ca1cc018087a4e8312696
#
#
#
# rename "packages/ttf-fonts/ttf-dejavu_2.15.bb"
# to "packages/ttf-fonts/ttf-dejavu_2.18.bb"
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.2.0/xcalibrate_coords.patch"
# content [5609d186544899c77e1719cc694048d4a359ec4f]
#
# patch "packages/angstrom/angstrom-x11-base-depends.bb"
# from [51412708aea81f1e5628ce9f0c2b7b0785f1fdbf]
# to [2ec95cf285641811a12fb7787619753c508b8ebd]
#
# patch "packages/libw100/libw100_0.0.2.bb"
# from [000dc807d486a38187d6b1792f6bd0b34ae7c625]
# to [fe0113702d93c9aef80aff0354fe6cf87670915a]
#
# patch "packages/libw100/libw100_svn.bb"
# from [f2b1602b9eee4497e5a24827f353dcd9b114b553]
# to [18a77b08b3d7029d0d870ff8390ae53047a723c4]
#
# patch "packages/ttf-fonts/ttf-dejavu_2.18.bb"
# from [57ffaaeed790be635608824543e1fccbc2dd9a00]
# to [3e7c69ee69d752d1a709105e277c51e691f01bd0]
#
# patch "packages/vincent/vincent_svn.bb"
# from [f32fd968be006b9ffc200941ea25b6ea58bdfb50]
# to [fdfd4862fdfb6f8a34987f36ec109345e45a3142]
#
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
# from [6f46a29c5e12dd307e0dc9163fbbab191f87c59f]
# to [693ce6e2621655052632c3ddfdd9427c170673b8]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.2.0.bb"
# from [25f60a16c5e4f8c1191858a7e16e298ec11b693d]
# to [6006f4a33e9017387993d00c8f97b256f0f29b1f]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [1368de007e2a82db52e17e262ab0d1e3e15cc205]
# to [a073b2cf6fabe9e21d85dd47d1a5d7235eec93ac]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.2.0/xcalibrate_coords.patch 5609d186544899c77e1719cc694048d4a359ec4f
+++ packages/xorg-xserver/xserver-kdrive-1.2.0/xcalibrate_coords.patch 5609d186544899c77e1719cc694048d4a359ec4f
@@ -0,0 +1,122 @@
+---
+ Xext/xcalibrate.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
+ hw/kdrive/src/kdrive.h | 3 +++
+ hw/kdrive/src/kinput.c | 12 ++++++++++++
+ 3 files changed, 61 insertions(+), 1 deletion(-)
+
+Index: xorg-server-1.3.0.0/Xext/xcalibrate.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xext/xcalibrate.c 2007-06-29 17:30:03.000000000 +0100
++++ xorg-server-1.3.0.0/Xext/xcalibrate.c 2007-06-30 14:04:40.000000000 +0100
+@@ -166,7 +166,6 @@ ProcXCalibrateSetRawMode (ClientPtr clie
+ return (client->noClientException);
+ }
+
+-
+ static int
+ SProcXCalibrateSetRawMode (ClientPtr client)
+ {
+@@ -180,6 +179,47 @@ SProcXCalibrateSetRawMode (ClientPtr cli
+ return ProcXCalibrateSetRawMode(client);
+ }
+
++static int
++ProcXCalibrateScreenToCoord (ClientPtr client)
++{
++ REQUEST(xXCalibrateScreenToCoordReq);
++ xXCalibrateScreenToCoordReply rep;
++
++ REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
++
++ memset (&rep, 0, sizeof (rep));
++ rep.type = X_Reply;
++ rep.sequenceNumber = client->sequence;
++ rep.x = stuff->x;
++ rep.y = stuff->y;
++
++ KdScreenToMouseCoords(&rep.x, &rep.y);
++
++ if (client->swapped)
++ {
++ int n;
++
++ swaps (&rep.x, n);
++ swaps (&rep.y, n);
++ }
++ WriteToClient(client, sizeof (rep), (char *) &rep);
++ return (client->noClientException);
++}
++
++static int
++SProcXCalibrateScreenToCoord (ClientPtr client)
++{
++ REQUEST(xXCalibrateScreenToCoordReq);
++ int n;
++
++ REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
++
++ swaps(&stuff->x, n);
++ swaps(&stuff->y, n);
++
++ return ProcXCalibrateScreenToCoord(client);
++}
++
+ static void
+ XCalibrateResetProc (ExtensionEntry *extEntry)
+ {
+@@ -194,6 +234,9 @@ ProcXCalibrateDispatch (ClientPtr client
+ return ProcXCalibrateQueryVersion(client);
+ case X_XCalibrateRawMode:
+ return ProcXCalibrateSetRawMode(client);
++ case X_XCalibrateScreenToCoord:
++ return ProcXCalibrateScreenToCoord(client);
++
+ default: break;
+ }
+
+@@ -213,6 +256,8 @@ SProcXCalibrateDispatch (ClientPtr clien
+ return SProcXCalibrateQueryVersion(client);
+ case X_XCalibrateRawMode:
+ return SProcXCalibrateSetRawMode(client);
++ case X_XCalibrateScreenToCoord:
++ return SProcXCalibrateScreenToCoord(client);
+
+ default: break;
+ }
+Index: xorg-server-1.3.0.0/hw/kdrive/src/kdrive.h
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kdrive.h 2007-06-30 13:43:45.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/src/kdrive.h 2007-06-30 13:45:03.000000000 +0100
+@@ -746,6 +746,9 @@ void
+ KdSetMouseMatrix (KdMouseMatrix *matrix);
+
+ void
++KdScreenToMouseCoords (int *x, int *y);
++
++void
+ KdComputeMouseMatrix (KdMouseMatrix *matrix, Rotation randr, int width, int height);
+
+ void
+Index: xorg-server-1.3.0.0/hw/kdrive/src/kinput.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kinput.c 2007-06-29 17:30:16.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/src/kinput.c 2007-06-30 15:52:16.000000000 +0100
+@@ -381,6 +381,18 @@ KdSetMouseMatrix (KdMouseMatrix *matrix)
+ }
+
+ void
++KdScreenToMouseCoords (int *x, int *y)
++{
++ int (*m)[3] = kdMouseMatrix.matrix;
++ int div = m[0][1] * m[1][0] - m[1][1] * m[0][0];
++ int sx = *x;
++ int sy = *y;
++
++ *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div;
++ *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div;
++}
++
++void
+ KdComputeMouseMatrix (KdMouseMatrix *m, Rotation randr, int width, int height)
+ {
+ int x_dir = 1, y_dir = 1;
============================================================
--- packages/angstrom/angstrom-x11-base-depends.bb 51412708aea81f1e5628ce9f0c2b7b0785f1fdbf
+++ packages/angstrom/angstrom-x11-base-depends.bb 2ec95cf285641811a12fb7787619753c508b8ebd
@@ -1,10 +1,14 @@ DESCRIPTION = "Task packages for the Ang
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
+PR = "r32"
ALLOW_EMPTY = "1"
+XSERVER ?= "xserver-kdrive-fbdev"
+
+DEPENDS = "virtual/xserver"
+
RDEPENDS = "\
virtual/libx11 \
- virtual/xserver \
+ ${XSERVER} \
ttf-dejavu-sans \
ttf-dejavu-sans-mono \
"
============================================================
--- packages/libw100/libw100_0.0.2.bb 000dc807d486a38187d6b1792f6bd0b34ae7c625
+++ packages/libw100/libw100_0.0.2.bb fe0113702d93c9aef80aff0354fe6cf87670915a
@@ -1,7 +1,7 @@ LICENSE = "GPLv2"
DESCRIPTION = "Acceleration library for ATI imageon chipsets (w100 and w3220)"
LICENSE = "GPLv2"
-SRC_URI = "svn://libw100.svn.sf.net/svnroot/libw100/tags;module=rev_0_0_2;proto=https"
+SRC_URI = "svn://libw100.svn.sourceforge.net/svnroot/libw100/tags;module=rev_0_0_2;proto=https"
S = "${WORKDIR}/rev_0_0_2"
============================================================
--- packages/libw100/libw100_svn.bb f2b1602b9eee4497e5a24827f353dcd9b114b553
+++ packages/libw100/libw100_svn.bb 18a77b08b3d7029d0d870ff8390ae53047a723c4
@@ -1,8 +1,8 @@ PV = "0.0.2+svn${SRCDATE}"
DESCRIPTION = "Acceleration library for ATI imageon chipsets (w100 and w3220)"
LICENSE = "GPLv2"
PV = "0.0.2+svn${SRCDATE}"
-SRC_URI = "svn://libw100.svn.sf.net/svnroot/libw100;module=trunk;proto=https"
+SRC_URI = "svn://libw100.svn.sourceforge.net/svnroot/libw100;module=trunk;proto=https"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/ttf-fonts/ttf-dejavu_2.15.bb 57ffaaeed790be635608824543e1fccbc2dd9a00
+++ packages/ttf-fonts/ttf-dejavu_2.18.bb 3e7c69ee69d752d1a709105e277c51e691f01bd0
@@ -1,18 +1,27 @@ HOMEPAGE = "http://dejavu.sourceforge.ne
DESCRIPTION = "DejaVu font - TTF Edition"
LICENSE = "Bitstream Vera"
HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page"
+RDEPENDS = "ttf-dejavu-common"
+RDEPENDS_ttf-dejavu-common = ""
-SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2 \
+ file://30-dejavu-aliases.conf"
require ttf.inc
S = "${WORKDIR}/dejavu-ttf-${PV}"
+do_install_append () {
+ install -d ${D}${sysconfdir}/fonts/conf.d/
+ install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
+}
+
PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \
- ttf-dejavu-serif ttf-dejavu-serif-condensed"
+ ttf-dejavu-serif ttf-dejavu-serif-condensed ttf-dejavu-common"
FILES_ttf-dejavu-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf"
FILES_ttf-dejavu-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf"
FILES_ttf-dejavu-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf"
FILES_ttf-dejavu-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf"
FILES_ttf-dejavu-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf"
+FILES_ttf-dejavu-common = "${sysconfdir}"
============================================================
--- packages/vincent/vincent_svn.bb f32fd968be006b9ffc200941ea25b6ea58bdfb50
+++ packages/vincent/vincent_svn.bb fdfd4862fdfb6f8a34987f36ec109345e45a3142
@@ -5,7 +5,7 @@ PR = "r0"
PV = "0.0+svn${SRCDATE}"
PR = "r0"
-SRC_URI = "svn://ogl-es.svn.sf.net/svnroot/ogl-es/branches;module=linux_nokia_770;proto=https"
+SRC_URI = "svn://ogl-es.svn.sourceforge.net/svnroot/ogl-es/branches;module=linux_nokia_770;proto=https"
S = "${WORKDIR}/linux_nokia_770/ogles/projects/linux-x11"
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb 6f46a29c5e12dd307e0dc9163fbbab191f87c59f
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb 693ce6e2621655052632c3ddfdd9427c170673b8
@@ -7,7 +7,7 @@ PE = "1"
PROVIDES = "virtual/xserver"
PE = "1"
-PR = "r0"
+PR = "r1"
FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -16,6 +16,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
file://fbcompositesrc8888revnpx0565.patch;patch=1 \
file://kdrive-vidmemarea.patch;patch=1 \
file://kdrive-imageon.patch;patch=1 \
+ file://xcalibrate_coords.patch;patch=1 \
"
S = "${WORKDIR}/xorg-server-${PV}"
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.2.0.bb 25f60a16c5e4f8c1191858a7e16e298ec11b693d
+++ packages/xorg-xserver/xserver-kdrive_1.2.0.bb 6006f4a33e9017387993d00c8f97b256f0f29b1f
@@ -1,9 +1,9 @@ PE = "1"
require xserver-kdrive-common.inc
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r8"
+PR = "r9"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
@@ -11,7 +11,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
file://w100.patch;patch=1 \
file://w100-fix-offscreen-bmp.patch;patch=1 \
file://fbcompositesrc8888revnpx0565.patch;patch=1 \
- "
+ file://xcalibrate_coords.patch;patch=1 \
+ "
S = "${WORKDIR}/xorg-server-${PV}"
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb 1368de007e2a82db52e17e262ab0d1e3e15cc205
+++ packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb a073b2cf6fabe9e21d85dd47d1a5d7235eec93ac
@@ -1,15 +1,22 @@ PE = "1"
require xserver-kdrive-common.inc
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r15"
+PR = "r16"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
file://fix_default_mode.patch;patch=1 \
file://enable-xcalibrate.patch;patch=1 \
file://hide-cursor-and-ppm-root.patch;patch=1 \
- file://xcalibrate_coords.patch;patch=1"
+ file://xcalibrate_coords.patch;patch=1 \
+ file://w100.patch;patch=1 \
+ file://w100-fix-offscreen-bmp.patch;patch=1 \
+ "
S = "${WORKDIR}/xorg-server-${PV}"
+
+W100_OECONF = "--disable-w100"
+W100_OECONF_arm = "--enable-w100"
+
More information about the Openembedded-commits
mailing list