From 5eba491a58a4752b0356afae84af4f66ab960597 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 16 Mar 2012 00:04:17 -0700 Subject: libxxf86dga: Upgrade to 1.1.3 (From OE-Core rev: 99d3d7c461e3b19ea807dd7aabfcd4c239b531a6) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../libxxf86dga-1.1.2_fix_for_x32.patch | 30 ---------------------- .../libxxf86dga-1.1.3_fix_for_x32.patch | 30 ++++++++++++++++++++++ .../recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb | 22 ---------------- .../recipes-graphics/xorg-lib/libxxf86dga_1.1.3.bb | 22 ++++++++++++++++ 4 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.3.bb (limited to 'meta/recipes-graphics') 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.2_fix_for_x32.patch deleted file mode 100644 index 30692ad9cb..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: pending - -Fix type conversion for x32. For x32 the off_t is 64bit and pointers are 32bit. -so the conversion of pointer to off_t was resulting into this error: - -| XF86DGA2.c:931:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] -| cc1: some warnings being treated as errors -| -| make[2]: *** [XF86DGA2.lo] Error 1 - -Fixed it by typecasting pointer into unsigned long 1st and then again typecasting -unsigned long to off_t. - -Signed-Off-by: Nitin A Kamble -2012/01/04 - - -Index: libXxf86dga-1.1.2/src/XF86DGA2.c -=================================================================== ---- libXxf86dga-1.1.2.orig/src/XF86DGA2.c 2010-10-06 21:17:11.000000000 -0700 -+++ libXxf86dga-1.1.2/src/XF86DGA2.c 2012-01-04 14:21:36.275971172 -0800 -@@ -928,7 +928,7 @@ DGAMapPhysical( - if ((pMap->fd = open(name, O_RDWR)) < 0) - return False; - pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, -- MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); -+ MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(unsigned long)base); - if (pMap->virtual == (void *)-1) - return False; - mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE); diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch b/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch new file mode 100644 index 0000000000..4a0c682554 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.3_fix_for_x32.patch @@ -0,0 +1,30 @@ +Upstream-Status: pending + +Fix type conversion for x32. For x32 the off_t is 64bit and pointers are 32bit. +so the conversion of pointer to off_t was resulting into this error: + +| XF86DGA2.c:931:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] +| cc1: some warnings being treated as errors +| +| make[2]: *** [XF86DGA2.lo] Error 1 + +Fixed it by typecasting pointer into unsigned long 1st and then again typecasting +unsigned long to off_t. + +Signed-Off-by: Nitin A Kamble +2012/01/04 + + +Index: libXxf86dga-1.1.3/src/XF86DGA2.c +=================================================================== +--- libXxf86dga-1.1.3.orig/src/XF86DGA2.c ++++ libXxf86dga-1.1.3/src/XF86DGA2.c +@@ -928,7 +928,7 @@ DGAMapPhysical( + if ((pMap->fd = open(name, O_RDWR)) < 0) + return False; + pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, +- MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); ++ MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(unsigned long)base); + if (pMap->virtual == (void *)-1) + return False; + mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE); diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb deleted file mode 100644 index 9a1c96ffa7..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension library" - -DESCRIPTION = "libXxf86dga provides the XFree86-DGA extension, which \ -allows direct graphics access to a framebuffer-like region, and also \ -allows relative mouse reporting, et al. It is mainly used by games and \ -emulators for games." - -DEPENDS += "libxext xf86dgaproto" -PR = "r2" - -SRC_URI += "file://libxxf86dga-1.1.2_fix_for_x32.patch" - -PE = "1" - -XORG_PN = "libXxf86dga" - -LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" - -SRC_URI[md5sum] = "bbd5fdf63d4c107c8cb710d4df2012b4" -SRC_URI[sha256sum] = "1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06" diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.3.bb new file mode 100644 index 0000000000..dcb6701ef4 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.3.bb @@ -0,0 +1,22 @@ +require xorg-lib-common.inc + +SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension library" + +DESCRIPTION = "libXxf86dga provides the XFree86-DGA extension, which \ +allows direct graphics access to a framebuffer-like region, and also \ +allows relative mouse reporting, et al. It is mainly used by games and \ +emulators for games." + +LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" + +DEPENDS += "libxext xf86dgaproto" + +PE = "1" +PR = "r2" + +SRC_URI += "file://libxxf86dga-1.1.3_fix_for_x32.patch" + +SRC_URI[md5sum] = "b7f38465c46e7145782d37dbb9da8c09" +SRC_URI[sha256sum] = "551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994" + +XORG_PN = "libXxf86dga" -- cgit v1.2.3-54-g00ecf