x32 recipe fixes + misc commits

PATCH In review [email protected] 2 participants 8 messages Jan 5, 2012 – Jan 21, 2012

lore

Share & tools

lore

[email protected]

author

2012-01-05 01:09 UTC #0 lore raw

cover x32 recipe fixes + misc commits

From: Nitin A Kamble <[email protected]>

The following changes since commit 021848be9eeb71de8acfba6c66c11645b01523b8:

valgrind: Fix for automake update (2012-01-04 16:04:08 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/work
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/work

Nitin A Kamble (4):
python-pycairo: fix for x32
libevent: fix compilation for x32
libxxf86dga: fix compilation with x32 toolchain
vte: update patch header

 .../python/python-pycairo_1.10.0.bb                |    6 +-
 .../libxxf86dga-1.1.2_fix_for_x32.patch            |   30 ++++++++++++
 .../recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb |    5 ++-
 .../libevent/libevent-2.0.16_fix_for_x32.patch     |   47 ++++++++++++++++++++
 meta/recipes-support/libevent/libevent_2.0.16.bb   |    5 +-
 meta/recipes-support/vte/vte/introspection.patch   |    8 +++
 6 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
 create mode 100644 meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch

Signature · 1 line

1.7.6.4

[email protected]

author

2012-01-05 01:09 UTC #1 lore raw

PATCH 1/4 python-pycairo: fix for x32

From: Nitin A Kamble <[email protected]>

Add the libdir to configure so that path like /usr/libx32 can work.

Also passing parallel make flags to the building process.

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../python/python-pycairo_1.10.0.bb                |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

meta/recipes-devtools/python/python-pycairo_1.10.0.bb +3 -3

index 812acfb..7d1b6c1 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
 
 # cairo >= 1.8.8
 DEPENDS = "cairo"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://cairographics.org/releases/py2cairo-${PV}.tar.bz2"

@@ -21,11 +21,11 @@ S = "${WORKDIR}/py2cairo-${PV}"
 inherit distutils pkgconfig
 
 do_configure() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} ./waf configure --prefix=${D}${prefix}
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} ./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir}
 }
 
 do_compile() {
-	./waf build
+	./waf build ${PARALLEL_MAKE}
 }
 
 do_install() {

Signature · 1 line

1.7.6.4

[email protected]

author

2012-01-05 01:09 UTC #2 lore raw

PATCH 2/4 libevent: fix compilation for x32

From: Nitin A Kamble <[email protected]>

Pull a patch from gentoo to avoid sysctl syscall which is not defined for x32.

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../libevent/libevent-2.0.16_fix_for_x32.patch     |   47 ++++++++++++++++++++
 meta/recipes-support/libevent/libevent_2.0.16.bb   |    5 +-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch

meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch new file +47 -0

new file mode 100644
index 0000000..ef42863
@@ -0,0 +1,47 @@
+Upstream-Status: pending
+
+Pulled the patch from gentoo: from here:
+http://sources2.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libevent/files/libevent-2.0.16-sysctl.patch?revision=1.1
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2012/01/04
+
+From 358c745e5432f7648b6f8b3188f32b5551cbf9d6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <[email protected]>
+Date: Thu, 8 Dec 2011 11:39:48 -0500
+Subject: [PATCH] check for sysctl before we use it
+
+Not all C libraries under Linux support the sysctl() func.
+---
+ arc4random.c |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arc4random.c b/arc4random.c
+index 4833169..ef10fa8 100644
+--- a/arc4random.c
++++ b/arc4random.c
+@@ -166,7 +166,7 @@ arc4_seed_win32(void)
+ }
+ #endif
+ 
+-#if defined(_EVENT_HAVE_SYS_SYSCTL_H)
++#if defined(_EVENT_HAVE_SYS_SYSCTL_H) && defined(_EVENT_HAVE_SYSCTL)
+ #if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_RANDOM && _EVENT_HAVE_DECL_RANDOM_UUID
+ #define TRY_SEED_SYSCTL_LINUX
+ static int
+diff --git a/configure.in b/configure.in
+index da08cf4..4e24444 100644
+--- a/configure.in
++++ b/configure.in
+@@ -267,7 +267,7 @@ AC_HEADER_TIME
+ 
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep])
+-AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv])
++AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
+ 
+ AC_CACHE_CHECK(
+     [for getaddrinfo],
+-- 
+1.7.6.1

meta/recipes-support/libevent/libevent_2.0.16.bb +3 -2

index 6da3d94..38d42f0 100644
@@ -7,9 +7,10 @@ SECTION = "libs"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=50aad300de703db62baae12146832b45"
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz"
+SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz \
+           file://libevent-2.0.16_fix_for_x32.patch"
 
 SRC_URI[md5sum] = "899efcffccdb3d5111419df76e7dc8df"
 SRC_URI[sha256sum] = "a578c7bcaf3bab1cc7924bd4d219f2ea621ab8c51dfc4f886e234b6ef4d38295"

Signature · 1 line

1.7.6.4

[email protected]

author

2012-01-05 01:09 UTC #3 lore raw

PATCH 3/4 libxxf86dga: fix compilation with x32 toolchain

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

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 <[email protected]>

---
 .../libxxf86dga-1.1.2_fix_for_x32.patch            |   30 ++++++++++++++++++++
 .../recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb |    5 ++-
 2 files changed, 34 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch

meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch new file +30 -0

new file mode 100644
index 0000000..30692ad
@@ -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 <[email protected]>
+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);

meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb +4 -1

index 8e777c3..9a1c96f 100644
@@ -8,7 +8,10 @@ allows relative mouse reporting, et al.  It is mainly used by games and \
 emulators for games."
 
 DEPENDS += "libxext xf86dgaproto"
-PR = "r1"
+PR = "r2"
+
+SRC_URI += "file://libxxf86dga-1.1.2_fix_for_x32.patch"
+
 PE = "1"
 
 XORG_PN = "libXxf86dga"

Signature · 1 line

1.7.6.4

Khem Raj

2012-01-05 20:56 UTC #4 lore raw

Re: [PATCH 3/4] libxxf86dga: fix compilation with x32 toolchain

Quoted 30 lines · On Wed, Jan 4, 2012 at 5:02 PM, <[email protected]> wrote:

From: Nitin A Kamble <[email protected]>
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 <[email protected]>
---
.../libxxf86dga-1.1.2_fix_for_x32.patch | 30 ++++++++++++++++++++ .../recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb | 5 ++-
 2 files changed, 34 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch new file +2 -0
new file mode 100644
index 0000000..30692ad
@@ -0,0 +1,30 @@
+Upstream-Status: pending
+

meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch line 12

Quoted 10 lines

meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch new file +10 -0

+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.

where is pointer here ?
http://cvsweb.xfree86.org/cvsweb/xc/lib/Xxf86dga/XF86DGA2.c?rev=1.30&content-type=text/vnd.viewcvs-markup
shows that base is of type mmapOffset which is

#if !defined(_LP64) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) typedef unsigned long long mmapOffset;
#else
typedef unsigned long mmapOffset;
#endif

and off_t is typedef'ed to long int

Quoted 42 lines

meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch new file +18 -0

+
+Signed-Off-by: Nitin A Kamble <[email protected]>
+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);

meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb +0 -0

index 8e777c3..9a1c96f 100644
@@ -8,7 +8,10 @@ allows relative mouse reporting, et al.  It is mainly used by games and \

emulators for games."

DEPENDS += "libxext xf86dgaproto"

meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb +4 -1

-PR = "r1"
+PR = "r2"
+
+SRC_URI += "file://libxxf86dga-1.1.2_fix_for_x32.patch"
+

PE = "1"

XORG_PN = "libXxf86dga"
--
1.7.6.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Kamble, Nitin A

author

2012-01-06 18:35 UTC #5 lore raw

Re: [PATCH 3/4] libxxf86dga: fix compilation with x32 toolchain

Quoted 67 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Khem Raj
Sent: Thursday, January 05, 2012 12:49 PM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 3/4] libxxf86dga: fix compilation with x32 toolchain
Quoted 3 lines · On Wed, Jan 4, 2012 at 5:02 PM, <[email protected]> wrote:
From: Nitin A Kamble <[email protected]>
Fix type conversion for x32. For x32 the off_t is 64bit and pointers
are
Quoted 9 lines
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
Quoted 6 lines
Fixed it by typecasting pointer into unsigned long 1st and then again typecasting unsigned long to off_t.
Signed-off-by Nitin A Kamble <[email protected]>
---
.../libxxf86dga-1.1.2_fix_for_x32.patch | 30
++++++++++++++++++++
Quoted 3 lines
.../recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb | 5 ++-
 2 files changed, 34 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-
lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
Review
Quoted 2 lines
(quoted diff) +0 -0
1.1.2_fix_for_x32.patch b/meta/recipes-graphics/xorg- lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-
Quoted 4 lines
new file mode 100644
index 0000000..30692ad
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +0 -0
1.1.2_fix_for_x32.patch
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 3
Quoted 4 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +3 -0
@@ -0,0 +1,30 @@
+Upstream-Status: pending
+
+Fix type conversion for x32. For x32 the off_t is 64bit and pointers
are 32bit.
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 6
Quoted 3 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +3 -0
+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]
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 11
Quoted 5 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +5 -0
+| 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
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 12
Quoted 1 line
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +1 -0
+unsigned long to off_t.
where is pointer here ?
http://cvsweb.xfree86.org/cvsweb/xc/lib/Xxf86dga/XF86DGA2.c?rev=1.30&co
ntent-type=text/vnd.viewcvs-markup
shows that base is of type mmapOffset which is

Quoted 9 lines

#if !defined(_LP64) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
typedef unsigned long long mmapOffset;
#else
typedef unsigned long mmapOffset;
#endif
and off_t is typedef'ed to long int

Khem,
base is char * as seen in the changed file src/XF86DGA2.c:
static Bool
DGAMapPhysical(
int screen,

   char *name,                  /* optional device name */
   unsigned char* base,         /* physical memory */
   CARD32 size,                 /* size */
   CARD32 offset,               /* optional offset */
   CARD32 extra,                /* optional extra data */

DGAMapPtr pMap
) {

Nitin

Quoted 53 lines

meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 20
Quoted 8 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +8 -0
+
+Signed-Off-by: Nitin A Kamble <[email protected]>
+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
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 21
Quoted 1 line
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +1 -0
++++ libXxf86dga-1.1.2/src/XF86DGA2.c   2012-01-04 14:21:36.275971172
-0800
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 26
Quoted 5 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +5 -0
+@@ -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);
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 27
Quoted 1 line
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +1 -0
++                      MAP_FILE | MAP_SHARED, pMap->fd,
(off_t)(unsigned long)base);
Review
Quoted 4 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +3 -0
+     if (pMap->virtual == (void *)-1)
+       return False;
+     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
(quoted diff) +0 -0
b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb
meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb allows relative mouse reporting, et al. It is
Quoted 4 lines
index 8e777c3..9a1c96f 100644
meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb +0 -0
@@ -8,7 +8,10 @@ allows relative mouse reporting, et al.  It is
mainly used by games and \
Quoted 15 lines
emulators for games."
DEPENDS += "libxext xf86dgaproto"
meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb +4 -1
-PR = "r1"
+PR = "r2"
+
+SRC_URI += "file://libxxf86dga-1.1.2_fix_for_x32.patch"
+
PE = "1"
XORG_PN = "libXxf86dga"
--
1.7.6.4
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Khem Raj

2012-01-21 23:34 UTC #6 lore raw

Re: [PATCH 3/4] libxxf86dga: fix compilation with x32 toolchain

Quoted 81 lines · Nitin A

Quoted 67 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Khem Raj
Sent: Thursday, January 05, 2012 12:49 PM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 3/4] libxxf86dga: fix compilation with x32 toolchain
Quoted 3 lines · On Wed, Jan 4, 2012 at 5:02 PM, <[email protected]> wrote:
From: Nitin A Kamble <[email protected]>
Fix type conversion for x32. For x32 the off_t is 64bit and pointers
are
Quoted 9 lines
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
Quoted 6 lines
Fixed it by typecasting pointer into unsigned long 1st and then again typecasting unsigned long to off_t.
Signed-off-by Nitin A Kamble <[email protected]>
---
.../libxxf86dga-1.1.2_fix_for_x32.patch | 30
++++++++++++++++++++
Quoted 3 lines
.../recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb | 5 ++-
 2 files changed, 34 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-
lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
Review
Quoted 2 lines
(quoted diff) +0 -0
1.1.2_fix_for_x32.patch b/meta/recipes-graphics/xorg- lib/libxxf86dga/libxxf86dga-1.1.2_fix_for_x32.patch
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga-
Quoted 4 lines
new file mode 100644
index 0000000..30692ad
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +0 -0
1.1.2_fix_for_x32.patch
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 3
Quoted 4 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +3 -0
@@ -0,0 +1,30 @@
+Upstream-Status: pending
+
+Fix type conversion for x32. For x32 the off_t is 64bit and pointers
are 32bit.
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 6
Quoted 3 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +3 -0
+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]
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 11
Quoted 5 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +5 -0
+| 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
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 12
Quoted 1 line
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +1 -0
+unsigned long to off_t.
where is pointer here ?
http://cvsweb.xfree86.org/cvsweb/xc/lib/Xxf86dga/XF86DGA2.c?rev=1.30&co
ntent-type=text/vnd.viewcvs-markup
shows that base is of type mmapOffset which is
Quoted 9 lines
#if !defined(_LP64) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
typedef unsigned long long mmapOffset;
#else
typedef unsigned long mmapOffset;
#endif
and off_t is typedef'ed to long int
Khem,
base is char * as seen in the changed file src/XF86DGA2.c:
static Bool
DGAMapPhysical(
int screen,

Quoted 8 lines

   char *name,                  /* optional device name */
   unsigned char* base,         /* physical memory */
   CARD32 size,                 /* size */
   CARD32 offset,               /* optional offset */
   CARD32 extra,                /* optional extra data */

DGAMapPtr pMap
) {

is that a local change ?

Quoted 59 lines

Nitin
Quoted 44 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 20
Quoted 8 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +8 -0
+
+Signed-Off-by: Nitin A Kamble <[email protected]>
+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
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 21
Quoted 1 line
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +1 -0
++++ libXxf86dga-1.1.2/src/XF86DGA2.c   2012-01-04 14:21:36.275971172
-0800
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 26
Quoted 5 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +5 -0
+@@ -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);
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- line 27
Quoted 1 line
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +1 -0
++                      MAP_FILE | MAP_SHARED, pMap->fd,
(off_t)(unsigned long)base);
Review
Quoted 4 lines
meta/recipes-graphics/xorg-lib/libxxf86dga/libxxf86dga- new file +3 -0
+     if (pMap->virtual == (void *)-1)
+       return False;
+     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
(quoted diff) +0 -0
b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb
meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb allows relative mouse reporting, et al. It is
Quoted 4 lines
index 8e777c3..9a1c96f 100644
meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb +0 -0
@@ -8,7 +8,10 @@ allows relative mouse reporting, et al.  It is
mainly used by games and \
Quoted 15 lines
emulators for games."
DEPENDS += "libxext xf86dgaproto"
meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.2.bb +4 -1
-PR = "r1"
+PR = "r2"
+
+SRC_URI += "file://libxxf86dga-1.1.2_fix_for_x32.patch"
+
PE = "1"
XORG_PN = "libXxf86dga"
--
1.7.6.4
Quoted 9 lines
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

-Khem

[email protected]

author

2012-01-05 01:09 UTC #7 lore raw

PATCH 4/4 vte: update patch header

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

No functional change here. Just updating the headers of the patch.

Signed-off-by Nitin A Kamble <[email protected]>

---
 meta/recipes-support/vte/vte/introspection.patch |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

meta/recipes-support/vte/vte/introspection.patch +8 -0

index 76a841c..890ba31 100644
@@ -1,3 +1,11 @@
+Upstream-Status:  Inappropriate [configuration]
+
+Get this m4 file from introspection, so that we can configure without
+depending on the introspection package.
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2011/01/03
+
 Index: vte-0.28.2/m4/introspection.m4
 ===================================================================
 --- /dev/null

Signature · 1 line

1.7.6.4