summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-03-16 00:04:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 15:33:02 +0000
commit5eba491a58a4752b0356afae84af4f66ab960597 (patch)
tree2d60948bdc66cd385d6c7ec25e13b0f206287a79
parent42cc9b726dc52d82005376c7a5b025105d56fb85 (diff)
downloadpoky-5eba491a58a4752b0356afae84af4f66ab960597.tar.gz
libxxf86dga: Upgrade to 1.1.3
(From OE-Core rev: 99d3d7c461e3b19ea807dd7aabfcd4c239b531a6) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch (renamed from meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch)8
-rw-r--r--meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.3.bb (renamed from meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb)14
2 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch b/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch
index 30692ad9cb..4a0c682554 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
+++ b/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch
@@ -15,14 +15,14 @@ Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
152012/01/04 152012/01/04
16 16
17 17
18Index: libXxf86dga-1.1.2/src/XF86DGA2.c 18Index: libXxf86dga-1.1.3/src/XF86DGA2.c
19=================================================================== 19===================================================================
20--- libXxf86dga-1.1.2.orig/src/XF86DGA2.c 2010-10-06 21:17:11.000000000 -0700 20--- libXxf86dga-1.1.3.orig/src/XF86DGA2.c
21+++ libXxf86dga-1.1.2/src/XF86DGA2.c 2012-01-04 14:21:36.275971172 -0800 21+++ libXxf86dga-1.1.3/src/XF86DGA2.c
22@@ -928,7 +928,7 @@ DGAMapPhysical( 22@@ -928,7 +928,7 @@ DGAMapPhysical(
23 if ((pMap->fd = open(name, O_RDWR)) < 0) 23 if ((pMap->fd = open(name, O_RDWR)) < 0)
24 return False; 24 return False;
25 pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, 25 pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
26- MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); 26- MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
27+ MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(unsigned long)base); 27+ MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(unsigned long)base);
28 if (pMap->virtual == (void *)-1) 28 if (pMap->virtual == (void *)-1)
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.3.bb
index 9a1c96ffa7..dcb6701ef4 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.3.bb
@@ -7,16 +7,16 @@ allows direct graphics access to a framebuffer-like region, and also \
7allows relative mouse reporting, et al. It is mainly used by games and \ 7allows relative mouse reporting, et al. It is mainly used by games and \
8emulators for games." 8emulators for games."
9 9
10DEPENDS += "libxext xf86dgaproto" 10LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f"
11PR = "r2"
12 11
13SRC_URI += "file://libxxf86dga-1.1.2_fix_for_x32.patch" 12DEPENDS += "libxext xf86dgaproto"
14 13
15PE = "1" 14PE = "1"
15PR = "r2"
16 16
17XORG_PN = "libXxf86dga" 17SRC_URI += "file://libxxf86dga-1.1.3_fix_for_x32.patch"
18 18
19LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" 19SRC_URI[md5sum] = "b7f38465c46e7145782d37dbb9da8c09"
20SRC_URI[sha256sum] = "551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994"
20 21
21SRC_URI[md5sum] = "bbd5fdf63d4c107c8cb710d4df2012b4" 22XORG_PN = "libXxf86dga"
22SRC_URI[sha256sum] = "1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06"