[oe-commits] org.oe.dev merge of '5a2399197df237f82ef95027a49f2340a2303958'
pfalcon commit
openembedded-commits at lists.openembedded.org
Mon Dec 3 15:06:43 UTC 2007
merge of '5a2399197df237f82ef95027a49f2340a2303958'
and '87484c4eb87efff598e72698f1723e6aa9cd0111'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: a5835e350969f436aec7b4c92890a1e73dcd6c3e
ViewMTN: http://monotone.openembedded.org/revision/info/a5835e350969f436aec7b4c92890a1e73dcd6c3e
Files:
1
packages/directfb/files/fix-configure-include-path.patch
packages/gtk-webcore/midori_0.0.12.bb
packages/meta/external-toolchain.bb
packages/xorg-lib/libx11-native_1.0.3.bb
packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch
packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch
packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch
packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch
classes/nslu2-image.bbclass
conf/machine/include/ixp4xx.inc
conf/machine/mpc8313e-rdb.conf
packages/devmem2/devmem2.bb
packages/directfb/directfb-examples_1.0.0.bb
packages/directfb/directfb_1.1.0.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/libungif/libungif_4.1.3.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/perl/libxml-parser-perl_2.34.bb
packages/tasks/task-base.bb
packages/tasks/task-native-sdk.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
conf/distro/angstrom-2007.1.conf
Diffs:
#
# mt diff -r5a2399197df237f82ef95027a49f2340a2303958 -ra5835e350969f436aec7b4c92890a1e73dcd6c3e
#
#
#
# add_file "packages/directfb/files/fix-configure-include-path.patch"
# content [95a5712b69ed26362c0a8e8e8624e9b05fb506b2]
#
# add_file "packages/gtk-webcore/midori_0.0.12.bb"
# content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
#
# add_file "packages/meta/external-toolchain.bb"
# content [32574844f3d4c4554cb6e4193123ab1c001b9046]
#
# add_file "packages/xorg-lib/libx11-native_1.0.3.bb"
# content [cdad9b5aab7c4683bfe87d0933aa450930c75451]
#
# add_file "packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch"
# content [40fbc88aeca77b3ecfd3423640b5bb8c73ff2d8e]
#
# add_file "packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch"
# content [e1e35716d43087fd5b9c8998f1ae47c4a2f0d310]
#
# add_file "packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch"
# content [d55aaf76a170f85331d871611303f1cd82979cd2]
#
# add_file "packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch"
# content [0d2f4f6126fdfc57820090618c5c6f64744550fc]
#
# patch "classes/nslu2-image.bbclass"
# from [3ba57cc877ce3060583122672952bf4a937be2d7]
# to [3be606504758bf5647ff8fed09280bbd1b34944c]
#
# patch "conf/machine/include/ixp4xx.inc"
# from [061e47cc6cd7843090e32bb8bbe59909e1f3df1e]
# to [9b1bce804bb05f3a19b3b29e053d8eeb3ee452d1]
#
# patch "conf/machine/mpc8313e-rdb.conf"
# from [ea78b004c7226c86a8a3cc969bf9582d74faaec6]
# to [74259c283b88887c4f38522bae31bc486a835867]
#
# patch "packages/devmem2/devmem2.bb"
# from [e6803ee2445609b09c3b9e7e69e2cfc7824d4d65]
# to [39279aa13e745b68c91754bed7bef12c96f23f74]
#
# patch "packages/directfb/directfb-examples_1.0.0.bb"
# from [88c9cc59f32b02ec4cd0c0f876b204399b265bdf]
# to [1905769a0ea0cc18c68ea7969adaa55fe65ad9aa]
#
# patch "packages/directfb/directfb_1.1.0.bb"
# from [c9da95fb956d450af0c360a3364023c960f9d1af]
# to [1af7bf22ffbfcbc869a08e6664c2dde2ff16c7d2]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [78905ac03fe3db35fb352b69c6d94fa42889ce6a]
# to [9ec0920876981474a325a47766fa7d50bbb1cfd3]
#
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
# from [d35a7304f640113a413721c8b4758cfad4a17c72]
# to [f248fbf9a457e0555c36e5377bc412ced8f568db]
#
# patch "packages/libungif/libungif_4.1.3.bb"
# from [749851b5ad634df7ec9f6cd59ea1d85ea18d9f9a]
# to [f24748385903ac535f59065d84441ff4ad58742e]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [17503c55f830f3a3deb1876d7d390a42edb3bc6b]
# to [bc9b6320d36d6556339ca6526a84f192b7c3f86f]
#
# patch "packages/perl/libxml-parser-perl_2.34.bb"
# from [9fe85cf758444af63185e9cfaffa8e9c253451ce]
# to [df4c8dc1823ab29c423c8b3de34f375a43450cb0]
#
# patch "packages/tasks/task-base.bb"
# from [6f33e4ea8083953d24993dca089ae71114f8a639]
# to [bd9f0978ca2a00519da16302f7e73d3fad3879fd]
#
# patch "packages/tasks/task-native-sdk.bb"
# from [7a8357c0638184a616c5933e9d5a31908b09a3e0]
# to [e9aff3af03f3423a34dcb2853582e08fdd66a6a5]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [31f806960351e14859e325b9073986126a23ca3a]
# to [f9825c85f0e52ef579e9bef9ad5f2469dae32694]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
# from [1e81dbe9f52b510804a38b11386d85bcfad8085c]
# to [e821c51279e2a4f57e41bfef13c8b1ee196e71c2]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [4475aa19d15d8d38e8e7b1fa831c3c012ef9c190]
# to [82f390a2257420604caa01ac186221938ae505ce]
#
============================================================
--- packages/directfb/files/fix-configure-include-path.patch 95a5712b69ed26362c0a8e8e8624e9b05fb506b2
+++ packages/directfb/files/fix-configure-include-path.patch 95a5712b69ed26362c0a8e8e8624e9b05fb506b2
@@ -0,0 +1,13 @@
+--- DirectFB-1.1.0/configure.in-orig 2007-08-27 00:07:00.000000000 -0700
++++ DirectFB-1.1.0/configure.in 2007-11-26 12:05:52.000000000 -0800
+@@ -1380,8 +1380,8 @@
+
+ MODULEDIR=$libdir/$MODULEDIRNAME
+ DATADIR=$datadir/directfb-$VERSION
+-INCLUDEDIR=$includedir/directfb
+-INTERNALINCLUDEDIR=$includedir/directfb-internal
++INCLUDEDIR=$includedir/
++INTERNALINCLUDEDIR=$includedir/
+
+ SOPATH=$libdir/libdirectfb-$LT_RELEASE.so.$LT_CURRENT
+ AC_SUBST(SOPATH)
============================================================
--- packages/gtk-webcore/midori_0.0.12.bb 248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
+++ packages/gtk-webcore/midori_0.0.12.bb 248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \
+ "
+
+
============================================================
--- packages/meta/external-toolchain.bb 32574844f3d4c4554cb6e4193123ab1c001b9046
+++ packages/meta/external-toolchain.bb 32574844f3d4c4554cb6e4193123ab1c001b9046
@@ -0,0 +1,50 @@
+DESCRIPTION = "This package allows OE to work with an external toolchain generated \
+ by meta-toolchain instead of building its own. It expects that toolchain \
+ to be located in SDK_PREFIX/prefix."
+
+PROVIDES = "\
+ linux-libc-headers \
+ virtual/${TARGET_PREFIX}gcc \
+ virtual/${TARGET_PREFIX}gcc-initial \
+ virtual/${TARGET_PREFIX}binutils \
+ virtual/${TARGET_PREFIX}libc-for-gcc \
+ virtual/libc \
+ virtual/libintl \
+ virtual/libiconv \
+ glibc-thread-db \
+ virtual/linux-libc-headers \
+ "
+
+RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+PACKAGES_DYNAMIC = "glibc-gconv-*"
+PR = "r1"
+
+inherit sdk
+
+do_stage() {
+ if [ ! -e ${prefix}/package-status ]; then
+ echo "The external toolchain could not be found in ${prefix}!"
+ exit 1
+ fi
+
+ install -d ${STAGING_DIR}/pkgdata/
+ install -d ${STAGING_DIR_TARGET}/shlibs/
+
+ cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
+ cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
+
+ if [ -d ${prefix}/ipk ]; then
+ install -d ${DEPLOY_DIR_IPK}/
+ cp -ar ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/
+ fi
+
+ if [ -d ${prefix}/deb ]; then
+ install -d ${DEPLOY_DIR_DEB}/
+ cp -ar ${prefix}/deb/* ${DEPLOY_DIR_DEB}/
+ fi
+
+ if [ -d ${prefix}/pstage -a "x${DEPLOY_DIR_PSTAGE}" != "x" ]; then
+ install -d ${DEPLOY_DIR_PSTAGE}/
+ cp -ar ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/
+ fi
+}
============================================================
--- packages/xorg-lib/libx11-native_1.0.3.bb cdad9b5aab7c4683bfe87d0933aa450930c75451
+++ packages/xorg-lib/libx11-native_1.0.3.bb cdad9b5aab7c4683bfe87d0933aa450930c75451
@@ -0,0 +1,28 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+PE = "1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = "x11-native"
+
+XORG_PN = "libX11"
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit native autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+ )
+ rm -f ${STAGING_INCDIR}/X11/Xlib.h
+ oe_runmake
+}
============================================================
--- packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch 40fbc88aeca77b3ecfd3423640b5bb8c73ff2d8e
+++ packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch 40fbc88aeca77b3ecfd3423640b5bb8c73ff2d8e
@@ -0,0 +1,386 @@
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/Makefile.am 2007-11-28 18:44:27.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am 2007-11-28 18:44:28.000000000 +0100
+@@ -20,6 +20,7 @@
+ noinst_LIBRARIES = libglamo.a
+
+ libglamo_a_SOURCES = \
++ glamo-log.h \
+ glamo_dma.c \
+ glamo_dma.h \
+ glamo_draw.c \
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo-log.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo-log.h 2007-11-29 09:05:53.000000000 +0100
+@@ -0,0 +1,63 @@
++/*
++ * Copyright © 2007 OpenMoko, Inc.
++ *
++ * This driver is based on Xati,
++ * Copyright © 2004 Eric Anholt
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that copyright
++ * notice and this permission notice appear in supporting documentation, and
++ * that the name of the copyright holders not be used in advertising or
++ * publicity pertaining to distribution of the software without specific,
++ * written prior permission. The copyright holders make no representations
++ * about the suitability of this software for any purpose. It is provided "as
++ * is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
++ * OF THIS SOFTWARE.
++ *
++ * Author: Dodji Seketeli <dodji at openedhand.com>
++ */
++#ifndef _GLAMO_LOG_H_
++#define _GLAMO_LOG_H_
++#ifdef HAVE_CONFIG_H
++#include <kdrive-config.h>
++#endif
++
++#include <assert.h>
++#include "os.h"
++
++#ifdef NDEBUG
++/*we are not in debug mode*/
++#define GLAMO_LOG
++#define GLAMO_LOG_ERROR
++
++#else /*NDEBUG*/
++
++#define ERROR_LOG_LEVEL 3
++#define INFO_LOG_LEVEL 4
++
++#ifndef GLAMO_LOG
++#define GLAMO_LOG(...) \
++LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, "in %s:%d:%s: ",\
++ __FILE__, __LINE__, __func__) ; \
++LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, __VA_ARGS__)
++#endif /*GLAMO_LOG*/
++
++#ifndef GLAMO_LOG_ERROR
++#define GLAMO_LOG_ERROR(...) \
++LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, "Error:in %s:%d:%s: ",\
++ __FILE__, __LINE__, __func__) ; \
++LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, __VA_ARGS__)
++#endif /*GLAMO_LOG_ERROR*/
++
++#endif /*NDEBUG*/
++
++#endif /*_GLAMO_LOG_H_*/
++
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_draw.c 2007-11-28 18:44:27.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c 2007-11-29 09:33:11.000000000 +0100
+@@ -26,6 +26,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include <kdrive-config.h>
+ #endif
++#include "glamo-log.h"
+ #include "glamo.h"
+ #include "glamo-regs.h"
+ #include "glamo_dma.h"
+@@ -90,45 +91,11 @@
+ KdScreenPriv(pScreen);
+ GLAMOScreenInfo(pScreenPriv);
+
+- ENTER_DRAW(0);
++ GLAMO_LOG("enter");
+ GLAMOWaitIdle(glamos);
+- LEAVE_DRAW(0);
++ GLAMO_LOG("leave");
+ }
+
+-#if GLAMO_TRACE_DRAW
+-void
+-GLAMOEnterDraw (PixmapPtr pPix, const char *function)
+-{
+- if (pPix != NULL) {
+- KdScreenPriv(pPix->drawable.pScreen);
+- CARD32 offset;
+-
+- offset = ((CARD8 *)pPix->devPrivate.ptr -
+- pScreenPriv->screen->memory_base);
+-
+- ErrorF ("Enter %s 0x%x (%dx%dx%d/%d)\n", function, (unsigned int) offset,
+- pPix->drawable.width, pPix->drawable.height, pPix->drawable.depth,
+- (unsigned int) pPix->drawable.bitsPerPixel);
+- } else
+- ErrorF ("Enter %s\n", function);
+-}
+-
+-void
+-GLAMOLeaveDraw (PixmapPtr pPix, const char *function)
+-{
+- if (pPix != NULL) {
+- KdScreenPriv(pPix->drawable.pScreen);
+- CARD32 offset;
+-
+- offset = ((CARD8 *)pPix->devPrivate.ptr -
+- pScreenPriv->screen->memory_base);
+-
+- ErrorF ("Leave %s 0x%x\n", function, (unsigned int) offset);
+- } else
+- ErrorF ("Leave %s\n", function);
+-}
+-#endif
+-
+ static Bool
+ GLAMOPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
+ {
+@@ -152,7 +119,7 @@
+ pScreenPriv->screen->memory_base);
+ pitch = pPix->devKind;
+
+- ENTER_DRAW(pPix);
++ GLAMO_LOG("enter");
+
+ BEGIN_DMA(12);
+ OUT_REG(GLAMO_REG_2D_DST_ADDRL, offset & 0xffff);
+@@ -163,7 +130,7 @@
+ OUT_REG(GLAMO_REG_2D_COMMAND2, settings);
+ END_DMA();
+
+- LEAVE_DRAW(pPix);
++ GLAMO_LOG("leave");
+
+ return TRUE;
+ }
+@@ -171,7 +138,7 @@
+ static void
+ GLAMOSolid(int x1, int y1, int x2, int y2)
+ {
+- ENTER_DRAW(0);
++ GLAMO_LOG("enter");
+ GLAMOScreenInfo *glamos = accel_glamos;
+ RING_LOCALS;
+
+@@ -184,14 +151,12 @@
+ OUT_REG(GLAMO_REG_2D_ID1, 0);
+ OUT_REG(GLAMO_REG_2D_ID2, 0);
+ END_DMA();
+- LEAVE_DRAW(0);
++ GLAMO_LOG("leave");
+ }
+
+ static void
+ GLAMODoneSolid(void)
+ {
+- ENTER_DRAW(0);
+- LEAVE_DRAW(0);
+ }
+
+ static Bool
+@@ -204,6 +169,8 @@
+ FbBits mask;
+ RING_LOCALS;
+
++ GLAMO_LOG("enter");
++
+ if (pSrc->drawable.bitsPerPixel != 16 ||
+ pDst->drawable.bitsPerPixel != 16)
+ GLAMO_FALLBACK(("Only 16bpp is supported"));
+@@ -224,8 +191,6 @@
+
+ settings = GLAMOBltRop[alu] << 8;
+
+- ENTER_DRAW (pDst);
+-
+ BEGIN_DMA(16);
+
+ OUT_REG(GLAMO_REG_2D_SRC_ADDRL, src_offset & 0xffff);
+@@ -241,7 +206,7 @@
+
+ END_DMA();
+
+- LEAVE_DRAW(pDst);
++ GLAMO_LOG("leave");
+
+ return TRUE;
+ }
+@@ -268,8 +233,10 @@
+ static void
+ GLAMODoneCopy(void)
+ {
+- ENTER_DRAW(0);
+- LEAVE_DRAW(0);
++ GLAMOScreenInfo *glamos = accel_glamos;
++ GLAMO_LOG("enter");
++ GLAMOFlushIndirect(glamos, 1);
++ GLAMO_LOG("leave");
+ }
+
+ static Bool
+@@ -279,6 +246,7 @@
+ CARD8 *dst_offset;
+ int dst_pitch;
+
++ GLAMO_LOG("enter");
+ dst_offset = (CARD8 *)pDst->devPrivate.ptr;
+ dst_pitch = pDst->devKind;
+ width = pDst->drawable.width;
+@@ -294,83 +262,9 @@
+ src += src_pitch;
+ }
+
+- ErrorF("hostdata upload %d,%d %dbpp\n", width, height, bpp);
+-
+ return TRUE;
+ }
+
+-
+-#if 0
+-static Bool
+-GLAMOUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst)
+-{
+- KdScreenPriv(pSrc->drawable.pScreen);
+- GLAMOCardInfo(pScreenPriv);
+- GLAMOScreenInfo(pScreenPriv);
+- int dst_pitch, src_pitch, w, i, size, bytes;
+- unsigned char *dst, *src;
+- RING_LOCALS;
+-
+- ENTER_DRAW(pSrc);
+- /* Align width to log 2, useful for R128 composite. This should be a
+- * KAA flag we check for (and supported in kaa.c in general) since many
+- * older bits of hardware are going to want POT pitches.
+- */
+- w = pSrc->drawable.width;
+- if (glamos->kaa.flags & KAA_OFFSCREEN_ALIGN_POT)
+- w = 1 << (GLAMOLog2(w - 1) + 1);
+- dst_pitch = (w * pSrc->drawable.bitsPerPixel / 8 +
+- glamos->kaa.pitchAlign - 1) & ~(glamos->kaa.pitchAlign - 1);
+-
+- size = dst_pitch * pSrc->drawable.height;
+- if (size > glamos->scratch_area->size)
+- GLAMO_FALLBACK(("Pixmap too large for scratch (%d,%d)\n",
+- pSrc->drawable.width, pSrc->drawable.height));
+-
+- glamos->scratch_next = (glamos->scratch_next + glamos->kaa.offsetAlign - 1) &
+- ~(glamos->kaa.offsetAlign - 1);
+- if (glamos->scratch_next + size > glamos->scratch_area->offset +
+- glamos->scratch_area->size) {
+- /* Only sync when we've used all of the scratch area. */
+- kaaWaitSync(pSrc->drawable.pScreen);
+- glamos->scratch_next = glamos->scratch_area->offset;
+- }
+- memcpy(pDst, pSrc, sizeof(*pDst));
+- pDst->devKind = dst_pitch;
+- pDst->devPrivate.ptr = pScreenPriv->screen->memory_base +
+- glamos->scratch_next;
+- glamos->scratch_next += size;
+-
+- src = pSrc->devPrivate.ptr;
+- src_pitch = pSrc->devKind;
+- dst = pDst->devPrivate.ptr;
+- bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
+-
+- i = pSrc->drawable.height;
+- while (i--) {
+- memcpy(dst, src, bytes);
+- dst += dst_pitch;
+- src += src_pitch;
+- }
+-
+- /* Flush the pixel cache */
+- if (glamoc->is_3362) {
+%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r87484c4eb87efff598e72698f1723e6aa9cd0111 -ra5835e350969f436aec7b4c92890a1e73dcd6c3e
#
#
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [c6bbfa10816eda24513e92b21827c75003bb4daa]
# to [0333915fd642b2db9af96929a6b9fd60df4292bc]
#
============================================================
--- conf/distro/angstrom-2007.1.conf c6bbfa10816eda24513e92b21827c75003bb4daa
+++ conf/distro/angstrom-2007.1.conf 0333915fd642b2db9af96929a6b9fd60df4292bc
@@ -60,7 +60,7 @@ PCMCIA_MANAGER = "pcmciautils"
PCMCIA_MANAGER = "pcmciautils"
#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19"
PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
RDEPENDS_kernel-base_hx4700 = ""
RDEPENDS_kernel-base_htcuniversal = ""
More information about the Openembedded-commits
mailing list