Package upgrades

index 62989bb..2a12a4c 100644
@@ -6,7 +6,7 @@ LICENSE = "Libpng"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \
                     file://png.h;beginline=310;endline=424;md5=b87b5e9252a3e14808a27b92912d268d"
 DEPENDS = "zlib"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.xz"
 

@@ -20,4 +20,4 @@ PACKAGES =+ "${PN}12"
 FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
 RPROVIDES_${PN}-dev += "${PN}12-dev"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"

similarity index 45%
rename from meta/recipes-graphics/xorg-lib/pixman/0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
rename to meta/recipes-graphics/xorg-lib/pixman/Generic-C-implementation-of-pixman_blt-with-overlapp.patch
index abd501a..5ac3228 100644
@@ -1,11 +1,4 @@
-From 211b2bcdb19f86f3868a18520df7dcb4fd122f05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
-Date: Sun, 19 Aug 2012 14:48:00 +0200
-Subject: [PATCH 2/2] Generic C implementation of pixman_blt with overlapping
- support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+Generic C implementation of pixman_blt with overlapping support
 
 This was ported from meta-oe's patch [1]:
 Uses memcpy/memmove functions to copy pixels, can handle the

@@ -21,31 +14,39 @@ unrealistic case anyway).
 
 [1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
 
-Upstream-Status: Unknown - this patch is in meta-oe for a while
-
+Upstream-Status: Pending
 Signed-off-by: Andreas Müller <[email protected]>
----
- pixman/pixman-general.c |   21 ++++++++++++++++++---
- pixman/pixman-private.h |   43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 61 insertions(+), 3 deletions(-)
+Signed-off-by: Constantin Musca <[email protected]>
 
-diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
-index d4b2daa..a86b206 100644
---- a/pixman/pixman-general.c
-+++ b/pixman/pixman-general.c
-@@ -215,9 +215,24 @@ general_blt (pixman_implementation_t *imp,
-              int                      width,
-              int                      height)
- {
--    /* We can't blit unless we have sse2 or mmx */
--
--    return FALSE;
+Index: pixman-0.28.0/pixman/pixman-general.c
+===================================================================
+--- pixman-0.28.0.orig/pixman/pixman-general.c
++++ pixman-0.28.0/pixman/pixman-general.c
+@@ -214,6 +214,41 @@ static const pixman_fast_path_t general_
+     { PIXMAN_OP_NONE }
+ };
+ 
++static pixman_bool_t
++general_blt (pixman_implementation_t *imp,
++             uint32_t *               src_bits,
++             uint32_t *               dst_bits,
++             int                      src_stride,
++             int                      dst_stride,
++             int                      src_bpp,
++             int                      dst_bpp,
++             int                      src_x,
++             int                      src_y,
++             int                      dest_x,
++             int                      dest_y,
++             int                      width,
++             int                      height)
++{
 +    uint8_t *dst_bytes = (uint8_t *)dst_bits;
 +    uint8_t *src_bytes = (uint8_t *)src_bits;
 +    int bpp;
 +
 +    if (src_bpp != dst_bpp || src_bpp & 7)
-+	return FALSE;
++        return FALSE;
 +
 +    bpp = src_bpp >> 3;
 +    width *= bpp;

@@ -58,24 +59,26 @@ index d4b2daa..a86b206 100644
 +                       width,
 +                       height);
 +    return TRUE;
- }
++}
++
+ pixman_implementation_t *
+ _pixman_implementation_create_general (void)
+ {
+@@ -222,6 +257,7 @@ _pixman_implementation_create_general (v
+     _pixman_setup_combiner_functions_32 (imp);
+     _pixman_setup_combiner_functions_float (imp);
+ 
++    imp->blt = general_blt;
+     imp->src_iter_init = general_src_iter_init;
+     imp->dest_iter_init = general_dest_iter_init;
  
- static pixman_bool_t
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index d5e6a72..c77d256 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -24,6 +24,7 @@
+Index: pixman-0.28.0/pixman/pixman-private.h
+===================================================================
+--- pixman-0.28.0.orig/pixman/pixman-private.h
++++ pixman-0.28.0/pixman/pixman-private.h
+@@ -1109,6 +1109,45 @@ void pixman_timer_register (pixman_timer
  
- #include "pixman.h"
- #include <time.h>
-+#include <string.h>
- #include <assert.h>
- #include <stdio.h>
- #include <string.h>
-@@ -1096,6 +1097,48 @@ void pixman_timer_register (pixman_timer_t *timer);
- extern const uint8_t linear_to_srgb[4096];
- extern const uint16_t srgb_to_linear[256];
+ #endif /* PIXMAN_TIMERS */
  
 +/* a helper function, can blit 8-bit images with src/dst overlapping support */
 +static inline void

@@ -93,35 +96,29 @@ index d5e6a72..c77d256 100644
 +     * prefetch and perceived as having more tearing.
 +     */
 +    if (src_bytes < dst_bytes + width &&
-+	src_bytes + src_stride * height > dst_bytes)
-+    {
-+	src_bytes += src_stride * height - src_stride;
-+	dst_bytes += dst_stride * height - dst_stride;
-+	dst_stride = -dst_stride;
-+	src_stride = -src_stride;
-+	/* Horizontal scrolling to the left needs memmove */
-+	if (src_bytes + width > dst_bytes)
-+	{
-+	    while (--height >= 0)
-+	    {
-+		memmove (dst_bytes, src_bytes, width);
-+		dst_bytes += dst_stride;
-+		src_bytes += src_stride;
-+	    }
-+	    return;
-+	}
++        src_bytes + src_stride * height > dst_bytes) {
++        src_bytes += src_stride * height - src_stride;
++        dst_bytes += dst_stride * height - dst_stride;
++        dst_stride = -dst_stride;
++        src_stride = -src_stride;
++
++        /* Horizontal scrolling to the left needs memmove */
++        if (src_bytes + width > dst_bytes) {
++            while (--height >= 0) {
++                memmove (dst_bytes, src_bytes, width);
++                dst_bytes += dst_stride;
++                src_bytes += src_stride;
++            }
++            return;
++        }
 +    }
-+    while (--height >= 0)
-+    {
-+	memcpy (dst_bytes, src_bytes, width);
-+	dst_bytes += dst_stride;
-+	src_bytes += src_stride;
++    while (--height >= 0) {
++        memcpy (dst_bytes, src_bytes, width);
++        dst_bytes += dst_stride;
++        src_bytes += src_stride;
 +    }
 +}
 +
  #endif /* __ASSEMBLER__ */
  
  #endif /* PIXMAN_PRIVATE_H */
--- 
-1.7.4.4
-

similarity index 80%
rename from meta/recipes-graphics/xorg-lib/pixman_0.27.2.bb
rename to meta/recipes-graphics/xorg-lib/pixman_0.28.0.bb
index 218808a..a3012f9 100644
@@ -13,9 +13,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \
                     file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \
                    "
 DEPENDS += "zlib libpng"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
 
-PR = "r2"
+PR = "r0"
 
 PE = "1"
 

@@ -30,7 +30,7 @@ EXTRA_OECONF_class-native = "--disable-gtk"
 
 SRC_URI += "\
             file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
-            file://0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+            file://Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
 "
-SRC_URI[md5sum] = "dd67154b23d88e6a75ad3a83f3052198"
-SRC_URI[sha256sum] = "cae9dc13727a84f11beb150c88d3a06ba114f82c52d68073c663c027e099123b"
+SRC_URI[md5sum] = "703c3f62437b161c610056e076560570"
+SRC_URI[sha256sum] = "6056f9aa0e0578a0492e34fc2ce6dd7bfb181090ed687993c03b969c8cec4828"

new file mode 100644
index 0000000..d56256e
@@ -0,0 +1,114 @@
+From 2cf7df441ce4c36525ba4d2d040f8cb0b0c75f14 Mon Sep 17 00:00:00 2001
+From: Constantin Musca <[email protected]>
+Date: Fri, 7 Dec 2012 12:33:42 +0200
+Subject: [PATCH] Revert "vmware_vga: Add back some info in local state
+ partially reverting aa32b38c"
+
+- this reverts commit 1f202568e0553b416483e5993f1bde219c22cf72
+- do not cache the DS depth (the depth might change)
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca <[email protected]>
+---
+ hw/vmware_vga.c | 30 +++++++++---------------------
+ 1 file changed, 9 insertions(+), 21 deletions(-)
+
+diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
+index 834588d..7c766fb 100644
+--- a/hw/vmware_vga.c
++++ b/hw/vmware_vga.c
+@@ -39,8 +39,6 @@ struct vmsvga_state_s {
+     VGACommonState vga;
+ 
+     int invalidated;
+-    int depth;
+-    int bypp;
+     int enable;
+     int config;
+     struct {
+@@ -57,9 +55,6 @@ struct vmsvga_state_s {
+     int new_height;
+     uint32_t guest;
+     uint32_t svgaid;
+-    uint32_t wred;
+-    uint32_t wgreen;
+-    uint32_t wblue;
+     int syncing;
+ 
+     MemoryRegion fifo_ram;
+@@ -723,25 +718,25 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address)
+         return SVGA_MAX_HEIGHT;
+ 
+     case SVGA_REG_DEPTH:
+-        return s->depth;
++        return ds_get_depth(s->vga.ds);
+ 
+     case SVGA_REG_BITS_PER_PIXEL:
+-        return (s->depth + 7) & ~7;
++        return ds_get_bits_per_pixel(s->vga.ds);
+ 
+     case SVGA_REG_PSEUDOCOLOR:
+         return 0x0;
+ 
+     case SVGA_REG_RED_MASK:
+-        return s->wred;
++        return ds_get_rmask(s->vga.ds);
+ 
+     case SVGA_REG_GREEN_MASK:
+-        return s->wgreen;
++        return ds_get_gmask(s->vga.ds);
+ 
+     case SVGA_REG_BLUE_MASK:
+-        return s->wblue;
++        return ds_get_bmask(s->vga.ds);
+ 
+     case SVGA_REG_BYTES_PER_LINE:
+-        return s->bypp * s->new_width;
++        return ds_get_bytes_per_pixel(s->vga.ds) * s->new_width;
+ 
+     case SVGA_REG_FB_START: {
+         struct pci_vmsvga_state_s *pci_vmsvga
+@@ -806,7 +801,7 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address)
+         return s->cursor.on;
+ 
+     case SVGA_REG_HOST_BITS_PER_PIXEL:
+-        return (s->depth + 7) & ~7;
++        return ds_get_bits_per_pixel(s->vga.ds);
+ 
+     case SVGA_REG_SCRATCH_SIZE:
+         return s->scratch_size;
+@@ -869,7 +864,7 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value)
+         break;
+ 
+     case SVGA_REG_BITS_PER_PIXEL:
+-        if (value != s->depth) {
++        if (value != ds_get_bits_per_pixel(s->vga.ds)) {
+             printf("%s: Bad bits per pixel: %i bits\n", __func__, value);
+             s->config = 0;
+         }
+@@ -1089,7 +1084,7 @@ static const VMStateDescription vmstate_vmware_vga_internal = {
+     .minimum_version_id_old = 0,
+     .post_load = vmsvga_post_load,
+     .fields      = (VMStateField[]) {
+-        VMSTATE_INT32_EQUAL(depth, struct vmsvga_state_s),
++        VMSTATE_UNUSED(4), /* was depth */
+         VMSTATE_INT32(enable, struct vmsvga_state_s),
+         VMSTATE_INT32(config, struct vmsvga_state_s),
+         VMSTATE_INT32(cursor.id, struct vmsvga_state_s),
+@@ -1142,13 +1137,6 @@ static void vmsvga_init(struct vmsvga_state_s *s,
+     vga_common_init(&s->vga);
+     vga_init(&s->vga, address_space, io, true);
+     vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga);
+-    /* Save some values here in case they are changed later.
+-     * This is suspicious and needs more though why it is needed. */
+-    s->depth = ds_get_bits_per_pixel(s->vga.ds);
+-    s->bypp = ds_get_bytes_per_pixel(s->vga.ds);
+-    s->wred = ds_get_rmask(s->vga.ds);
+-    s->wgreen = ds_get_gmask(s->vga.ds);
+-    s->wblue = ds_get_bmask(s->vga.ds);
+ }
+ 
+ static uint64_t vmsvga_io_read(void *opaque, hwaddr addr, unsigned size)
+-- 
+1.7.11.7
+

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch
rename to meta/recipes-devtools/qemu/files/arm-bgr.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-1.2.0/enable-i386-linux-user.patch
rename to meta/recipes-devtools/qemu/files/enable-i386-linux-user.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-1.2.0/fallback-to-safe-mmap_min_addr.patch
rename to meta/recipes-devtools/qemu/files/fallback-to-safe-mmap_min_addr.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch
rename to meta/recipes-devtools/qemu/files/fix-configure-checks.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-1.2.0/init-info.patch
rename to meta/recipes-devtools/qemu/files/init-info.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-1.2.0/larger_default_ram_size.patch
rename to meta/recipes-devtools/qemu/files/larger_default_ram_size.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch
rename to meta/recipes-devtools/qemu/files/linker-flags.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-1.2.0/no-strip.patch
rename to meta/recipes-devtools/qemu/files/no-strip.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-1.2.0/powerpc_rom.bin
rename to meta/recipes-devtools/qemu/files/powerpc_rom.bin

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-1.2.0/relocatable_sdk.patch
rename to meta/recipes-devtools/qemu/files/relocatable_sdk.patch

106 lines not on this page · raw message

41 lines not on this page · raw message

55 lines not on this page · raw message

deleted file mode 100644
index 4569643..0000000
@@ -1,25 +0,0 @@
-Fedora 13 switched the default behaviour of the linker to no longer
-indirectly link to required libraries (i.e. dependencies of a library
-already linked to). Therefore we need to explicitly pass the depended on
-libraries into the linker for building to work on Fedora 13.
-
-More information is available on the Fedora Wiki:
-https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
-
-JL - 15/06/10
-
-Upstream-Status: Inappropriate [configuration] 
-
-Index: qemu-0.14.0/Makefile.target
-===================================================================
---- qemu-0.14.0.orig/Makefile.target
-+++ qemu-0.14.0/Makefile.target
-@@ -218,7 +218,7 @@ obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p
- obj-y += rwhandler.o
- obj-$(CONFIG_KVM) += kvm.o kvm-all.o
- obj-$(CONFIG_NO_KVM) += kvm-stub.o
--LIBS+=-lz
-+LIBS+=-lz -lX11 -ldl
- 
- QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
- QEMU_CFLAGS += $(VNC_SASL_CFLAGS)

deleted file mode 100644
index 098070a..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration] 
-
-Index: qemu-0.14.0/Makefile
-===================================================================
---- qemu-0.14.0.orig/Makefile
-+++ qemu-0.14.0/Makefile
-@@ -235,7 +235,7 @@ install-sysconfig:
- install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig
- 	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
- ifneq ($(TOOLS),)
--	$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
-+	$(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)"
- endif
- ifneq ($(BLOBS),)
- 	$(INSTALL_DIR) "$(DESTDIR)$(datadir)"

deleted file mode 100644
index c4044296c51529878f5d2a46230949d09ef1d4e2..0000000000000000000000000000000000000000
GIT binary patch

118 lines not on this page · raw message

41 lines not on this page · raw message

90 lines not on this page · raw message

52 lines not on this page · raw message

new file mode 100644
index 0000000..7d007ea
@@ -0,0 +1,10 @@
+require qemu.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+                    file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
+
+SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2"
+SRC_URI[md5sum] = "a4030ddd2ba324152a97d65d3c0b247d"
+SRC_URI[sha256sum] = "878055ec05bc28fecfe2da97eb8bc992e8635575b67cebdfc5ca1ede171140a8"
+
+PR = "r0"

index 0b58cf7..9465203 100644
@@ -1,19 +1,14 @@
 require qemu.inc
 
-SRCREV = "6e4c0d1f03d6ab407509c32fab7cb4b8230f57ff"
+SRCREV = "6d6c9f59ca1b1a76ade7ad868bef191818f58819"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
-PV = "1.2+git"
+PV = "1.3.0+git${SRCPV}"
 PR = "r0"
 
-FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
-
-SRC_URI = "\
-    git://git.qemu.org/qemu.git;protocol=git \
-    file://powerpc_rom.bin \
-    "
+SRC_URI_prepend = "git://git.qemu.org/qemu.git;protocol=git"
 S = "${WORKDIR}/git"
 
 DEFAULT_PREFERENCE = "-1"