[oe-commits] org.oe.dev merge of '339d8c23276df48d5bd47404a5a8da2f987f0713'
hrw commit
openembedded-commits at lists.openembedded.org
Thu Aug 2 15:15:21 UTC 2007
merge of '339d8c23276df48d5bd47404a5a8da2f987f0713'
and 'a280ff075699a8837095830f4f486c8493cead58'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: b25e19744697afbbde21b5770c7d4f474f5c201b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b25e19744697afbbde21b5770c7d4f474f5c201b
Files:
1
packages/ttf-fonts/ttf-dejavu_2.15.bb
packages/ttf-fonts/ttf-dejavu_2.18.bb
packages/lighttpd/lighttpd_1.4.13.bb
packages/lighttpd/lighttpd_1.4.15.bb
packages/lighttpd/lighttpd_1.4.16.bb
packages/xorg-xserver/xserver-kdrive-1.2.0/xcalibrate_coords.patch
packages/angstrom/angstrom-x11-base-depends.bb
packages/brutefir/brutefir_1.0i.bb
packages/thc/thcrut_1.2.5.bb
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb
packages/xorg-xserver/xserver-kdrive_1.1.0.bb
packages/xorg-xserver/xserver-kdrive_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/xorg-xserver/xserver-kdrive_git.bb
packages/xorg-xserver/xserver-xorg_cvs.bb
Diffs:
#
# mt diff -r339d8c23276df48d5bd47404a5a8da2f987f0713 -rb25e19744697afbbde21b5770c7d4f474f5c201b
#
#
#
# rename "packages/ttf-fonts/ttf-dejavu_2.15.bb"
# to "packages/ttf-fonts/ttf-dejavu_2.18.bb"
#
# patch "packages/ttf-fonts/ttf-dejavu_2.18.bb"
# from [57ffaaeed790be635608824543e1fccbc2dd9a00]
# to [3e7c69ee69d752d1a709105e277c51e691f01bd0]
#
============================================================
--- 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}"
#
# mt diff -ra280ff075699a8837095830f4f486c8493cead58 -rb25e19744697afbbde21b5770c7d4f474f5c201b
#
#
#
# delete "packages/lighttpd/lighttpd_1.4.13.bb"
#
# rename "packages/lighttpd/lighttpd_1.4.15.bb"
# to "packages/lighttpd/lighttpd_1.4.16.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/brutefir/brutefir_1.0i.bb"
# from [e02d07dc7527439ee60d4c2ec25ba9b3d2df741b]
# to [b055cef93c54cc43e7e096fdf1eb621bdc58fb2a]
#
# patch "packages/lighttpd/lighttpd_1.4.16.bb"
# from [80df13ced322353f2d1d271b79bba2e817effd2c]
# to [430d84860a0bc15af2e58a72402d5c70f9277ee2]
#
# patch "packages/thc/thcrut_1.2.5.bb"
# from [2f657d8faa27de41e2655a314fcc09fcb2df8a7e]
# to [3dbdb20fdb8da483b3a6cf04962de7fe6321db1f]
#
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
# from [9dccb60e157f1a3ff2540d6f5389735882719979]
# to [693ce6e2621655052632c3ddfdd9427c170673b8]
#
# patch "packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb"
# from [241b9027f2a6f96e6a69654904f9c0a7d22e0f9c]
# to [b63b5b5391f8da15b751eae497f5292846ae03e4]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.1.0.bb"
# from [db186196fb8172f32d0a88226ae86df57177aa3e]
# to [e614149bd894aaa2aceaf26e5d46fb2ffaca4e3a]
#
# 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]
#
# patch "packages/xorg-xserver/xserver-kdrive_git.bb"
# from [3d7bb560a68f622d8b4d89862f9c8e16a6ef9f54]
# to [42b262dd40e9be4cfc18266789dfbcb89138c6e1]
#
# patch "packages/xorg-xserver/xserver-xorg_cvs.bb"
# from [af9ffc9b7af3ce03a695ee4eeb48ab88856bc5e1]
# to [079dc4cc229cd16b1c45724bf99b6e23e440230a]
#
============================================================
--- 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/brutefir/brutefir_1.0i.bb e02d07dc7527439ee60d4c2ec25ba9b3d2df741b
+++ packages/brutefir/brutefir_1.0i.bb b055cef93c54cc43e7e096fdf1eb621bdc58fb2a
@@ -1,7 +1,7 @@ LICENSE = "GPLv2"
DESCRIPTION = "BruteFIR is a software convolution engine, a program for applying long FIR filters to multi-channel digital audio, either offline or in realtime."
LICENSE = "GPLv2"
-DEPENDS = "fftw fftwf fftwl"
+DEPENDS = "alsa-lib fftw fftwf fftwl"
PR = "r1"
============================================================
--- packages/lighttpd/lighttpd_1.4.15.bb 80df13ced322353f2d1d271b79bba2e817effd2c
+++ packages/lighttpd/lighttpd_1.4.16.bb 430d84860a0bc15af2e58a72402d5c70f9277ee2
@@ -1,9 +1,9 @@ LICENSE = "BSD"
DESCRIPTION = "Web server"
SECTION = "net"
LICENSE = "BSD"
-PR = "r1"
+DEPENDS = "libpcre"
-SRC_URI = "http://www.lighttpd.net/download/lighttpd-1.4.15.tar.gz \
+SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \
file://configure.in.patch;patch=1 \
file://src-server.c.patch;patch=1 \
file://index.html \
@@ -14,7 +14,7 @@ EXTRA_OECONF="--without-bzip2 \
--without-ldap \
--without-lua \
--without-memcache \
- --without-pcre \
+ --with-pcre \
--without-webdav-props \
--without-webdav-locks \
--without-openssl \
============================================================
--- packages/thc/thcrut_1.2.5.bb 2f657d8faa27de41e2655a314fcc09fcb2df8a7e
+++ packages/thc/thcrut_1.2.5.bb 3dbdb20fdb8da483b3a6cf04962de7fe6321db1f
@@ -1,6 +1,6 @@ SECTION = "console/network"
DESCRIPTION = "RUT (aRe-yoU-There) RUT gathers informations from local and remote networks"
SECTION = "console/network"
-DEPENDS = "openssl libnet"
+DEPENDS = "libpcre openssl libnet libpcap"
HOMEPAGE = "http://thc.org/thc-rut/"
LICENSE = "GPL"
PR = "r1"
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb 9dccb60e157f1a3ff2540d6f5389735882719979
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb 693ce6e2621655052632c3ddfdd9427c170673b8
@@ -5,10 +5,9 @@ PROVIDES = "virtual/xserver"
DEPENDS += "libxkbfile libxcalibrate"
PROVIDES = "virtual/xserver"
-RPROVIDES = "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 \
@@ -17,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-imageon_X11R7.1-1.1.0.bb 241b9027f2a6f96e6a69654904f9c0a7d22e0f9c
+++ packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb b63b5b5391f8da15b751eae497f5292846ae03e4
@@ -9,7 +9,6 @@ PROVIDES = "virtual/xserver"
DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto"
PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
PR = "r3"
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.1.0.bb db186196fb8172f32d0a88226ae86df57177aa3e
+++ packages/xorg-xserver/xserver-kdrive_1.1.0.bb e614149bd894aaa2aceaf26e5d46fb2ffaca4e3a
@@ -1,8 +1,7 @@ PROVIDES = "virtual/xserver"
LICENSE = "MIT"
DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto calibrateproto recordproto videoproto scrnsaverproto"
PROVIDES = "virtual/xserver"
-# RPROVIDES = "virtual/xserver"
PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr"
SECTION = "x11/base"
DESCRIPTION = "X server from freedesktop.org"
============================================================
--- 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"
+
============================================================
--- packages/xorg-xserver/xserver-kdrive_git.bb 3d7bb560a68f622d8b4d89862f9c8e16a6ef9f54
+++ packages/xorg-xserver/xserver-kdrive_git.bb 42b262dd40e9be4cfc18266789dfbcb89138c6e1
@@ -5,7 +5,6 @@ PROVIDES = "virtual/xserver"
DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto calibrateproto recordproto videoproto scrnsaverproto"
PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
SECTION = "x11/base"
DESCRIPTION = "X server from freedesktop.org"
============================================================
--- packages/xorg-xserver/xserver-xorg_cvs.bb af9ffc9b7af3ce03a695ee4eeb48ab88856bc5e1
+++ packages/xorg-xserver/xserver-xorg_cvs.bb 079dc4cc229cd16b1c45724bf99b6e23e440230a
@@ -1,6 +1,5 @@ LICENSE = "Xorg"
SECTION = "x11/base"
LICENSE = "Xorg"
-RPROVIDES = "virtual/xserver"
PROVIDES = "virtual/xserver"
PR = "r3"
PV = "6.8.1+cvs${SRCDATE}"
More information about the Openembedded-commits
mailing list