summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-06-04 21:06:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-02 23:08:40 +0100
commitedb240b43f382f68206397c6e7c7d791b89e3da4 (patch)
treee45b2df7928deb54daaa7a931a8116bb39cafaf9 /meta/recipes-graphics
parent7803567498dca3e2c31b3aff892f6b07ba59232b (diff)
downloadpoky-edb240b43f382f68206397c6e7c7d791b89e3da4.tar.gz
libpciaccess: Upgrade to 0.13.4
Drop upstreamed patch backport portablility fixes from upstream Add a fix to not use io function on ARM they dont work (From OE-Core rev: d70678477f142eb90c6bba6631e7485d6fe20fbf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch187
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch34
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch32
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch28
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch17
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb16
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb21
7 files changed, 302 insertions, 33 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch
new file mode 100644
index 0000000000..e92fc0d95d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch
@@ -0,0 +1,187 @@
1From b14696a55796e739624bbda4f772427032efff2a Mon Sep 17 00:00:00 2001
2From: Julien Cristau <jcristau@debian.org>
3Date: Sun, 26 Apr 2015 15:20:57 +0200
4Subject: [PATCH 1/4] Include config.h before anything else in *.c
5
6Debian bug#749008 <https://bugs.debian.org/749008>
7
8Reported-by: Michael Tautschnig <mt@debian.org>
9Signed-off-by: Julien Cristau <jcristau@debian.org>
10Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
11---
12Upstream-Status: Backport
13
14 src/common_capability.c | 3 +++
15 src/common_init.c | 3 +++
16 src/common_interface.c | 3 +++
17 src/common_io.c | 3 +++
18 src/common_iterator.c | 3 +++
19 src/common_map.c | 3 +++
20 src/common_vgaarb_stub.c | 3 +++
21 src/linux_devmem.c | 5 +++--
22 src/openbsd_pci.c | 3 +++
23 src/solx_devfs.c | 3 +++
24 src/x86_pci.c | 4 +++-
25 11 files changed, 33 insertions(+), 3 deletions(-)
26
27diff --git a/src/common_capability.c b/src/common_capability.c
28index 488743d..15d395d 100644
29--- a/src/common_capability.c
30+++ b/src/common_capability.c
31@@ -31,6 +31,9 @@
32 *
33 * \author Ian Romanick <idr@us.ibm.com>
34 */
35+#ifdef HAVE_CONFIG_H
36+#include "config.h"
37+#endif
38
39 #include <stdlib.h>
40 #include <stdio.h>
41diff --git a/src/common_init.c b/src/common_init.c
42index b1c0c3e..f7b59bd 100644
43--- a/src/common_init.c
44+++ b/src/common_init.c
45@@ -28,6 +28,9 @@
46 *
47 * \author Ian Romanick <idr@us.ibm.com>
48 */
49+#ifdef HAVE_CONFIG_H
50+#include "config.h"
51+#endif
52
53 #include <stdlib.h>
54 #include <errno.h>
55diff --git a/src/common_interface.c b/src/common_interface.c
56index 59778cf..cb95e90 100644
57--- a/src/common_interface.c
58+++ b/src/common_interface.c
59@@ -28,6 +28,9 @@
60 *
61 * \author Ian Romanick <idr@us.ibm.com>
62 */
63+#ifdef HAVE_CONFIG_H
64+#include "config.h"
65+#endif
66
67 #include <stdlib.h>
68 #include <string.h>
69diff --git a/src/common_io.c b/src/common_io.c
70index f5c9e45..e9586ad 100644
71--- a/src/common_io.c
72+++ b/src/common_io.c
73@@ -22,6 +22,9 @@
74 * Author:
75 * Adam Jackson <ajax@redhat.com>
76 */
77+#ifdef HAVE_CONFIG_H
78+#include "config.h"
79+#endif
80
81 #include <stdlib.h>
82 #include <string.h>
83diff --git a/src/common_iterator.c b/src/common_iterator.c
84index ccf656d..2beb180 100644
85--- a/src/common_iterator.c
86+++ b/src/common_iterator.c
87@@ -28,6 +28,9 @@
88 *
89 * \author Ian Romanick <idr@us.ibm.com>
90 */
91+#ifdef HAVE_CONFIG_H
92+#include "config.h"
93+#endif
94
95 #include <stdlib.h>
96 #include <string.h>
97diff --git a/src/common_map.c b/src/common_map.c
98index 8757151..f1854bb 100644
99--- a/src/common_map.c
100+++ b/src/common_map.c
101@@ -21,6 +21,9 @@
102 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
103 * DEALINGS IN THE SOFTWARE.
104 */
105+#ifdef HAVE_CONFIG_H
106+#include "config.h"
107+#endif
108
109 #include <sys/types.h>
110 #include <sys/mman.h>
111diff --git a/src/common_vgaarb_stub.c b/src/common_vgaarb_stub.c
112index 9394273..c1708f6 100644
113--- a/src/common_vgaarb_stub.c
114+++ b/src/common_vgaarb_stub.c
115@@ -23,6 +23,9 @@
116 * OTHER DEALINGS IN THE SOFTWARE.
117 *
118 */
119+#ifdef HAVE_CONFIG_H
120+#include "config.h"
121+#endif
122
123 #include <stdio.h>
124 #include "pciaccess.h"
125diff --git a/src/linux_devmem.c b/src/linux_devmem.c
126index 10e3bde..0d0567c 100644
127--- a/src/linux_devmem.c
128+++ b/src/linux_devmem.c
129@@ -32,8 +32,9 @@
130 *
131 * \author Ian Romanick <idr@us.ibm.com>
132 */
133-
134-#define _GNU_SOURCE
135+#ifdef HAVE_CONFIG_H
136+#include "config.h"
137+#endif
138
139 #include <stdlib.h>
140 #include <string.h>
141diff --git a/src/openbsd_pci.c b/src/openbsd_pci.c
142index 4d1b5cd..b8ce318 100644
143--- a/src/openbsd_pci.c
144+++ b/src/openbsd_pci.c
145@@ -13,6 +13,9 @@
146 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
147 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
148 */
149+#ifdef HAVE_CONFIG_H
150+#include "config.h"
151+#endif
152
153 #include <sys/param.h>
154 #include <sys/ioctl.h>
155diff --git a/src/solx_devfs.c b/src/solx_devfs.c
156index f572393..cf96467 100644
157--- a/src/solx_devfs.c
158+++ b/src/solx_devfs.c
159@@ -25,6 +25,9 @@
160 /*
161 * Solaris devfs interfaces
162 */
163+#ifdef HAVE_CONFIG_H
164+#include "config.h"
165+#endif
166
167 #include <stdlib.h>
168 #include <strings.h>
169diff --git a/src/x86_pci.c b/src/x86_pci.c
170index 49c1cab..32daa04 100644
171--- a/src/x86_pci.c
172+++ b/src/x86_pci.c
173@@ -18,8 +18,10 @@
174 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
175 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
176 */
177+#ifdef HAVE_CONFIG_H
178+#include "config.h"
179+#endif
180
181-#define _GNU_SOURCE
182 #include <unistd.h>
183 #include <stdio.h>
184 #include <stdlib.h>
185--
1862.1.4
187
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch
new file mode 100644
index 0000000000..16d69a82a4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch
@@ -0,0 +1,34 @@
1From 765e0a38cb8c40f8865af5cb356ffe6039ffb08f Mon Sep 17 00:00:00 2001
2From: Thomas Klausner <wiz@NetBSD.org>
3Date: Sun, 22 Mar 2015 21:38:23 +0100
4Subject: [PATCH 2/4] Fix quoting issue.
5
6m4 has '[]' as quoting characters, so if we want '[]' to
7end up in the configure script, we need to quote them again.
8
9Reported by Greg Troxel <gdt@ir.bbn.com>.
10
11Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
12Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
13---
14Upstream-Status: Backport
15
16 configure.ac | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/configure.ac b/configure.ac
20index e67e9e1..888330b 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -76,7 +76,7 @@ case $host_os in
24 ;;
25 *netbsd*)
26 case $host in
27- *i[3-9]86*)
28+ *i[[3-9]]86*)
29 PCIACCESS_LIBS="$PCIACCESS_LIBS -li386"
30 ;;
31 *x86_64*|*amd64*)
32--
332.1.4
34
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
new file mode 100644
index 0000000000..f513c8e59c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
@@ -0,0 +1,32 @@
1From 6bd2f7f92eae713663f4e13f6e2cb23526607b8c Mon Sep 17 00:00:00 2001
2From: Felix Janda <felix.janda@posteo.de>
3Date: Fri, 1 May 2015 16:36:50 +0200
4Subject: [PATCH 3/4] linux_sysfs.c: Include <limits.h> for PATH_MAX
5
6Fixes compilation with musl libc.
7
8Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>
9Signed-off-by: Felix Janda <felix.janda@posteo.de>
10Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
11Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
12---
13Upstream-Status: Backport
14
15 src/linux_sysfs.c | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
19index 50d94cf..3f95e53 100644
20--- a/src/linux_sysfs.c
21+++ b/src/linux_sysfs.c
22@@ -45,6 +45,7 @@
23 #include <sys/types.h>
24 #include <sys/stat.h>
25 #include <fcntl.h>
26+#include <limits.h>
27 #include <sys/mman.h>
28 #include <dirent.h>
29 #include <errno.h>
30--
312.1.4
32
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
new file mode 100644
index 0000000000..f532858244
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
@@ -0,0 +1,28 @@
1From b6df5202306bd71158b482f25ca2e6919645d4dd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 4 Jun 2015 20:55:06 -0700
4Subject: [PATCH 4/4] Don't include sys/io.h on arm
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Pending
9
10 src/linux_sysfs.c | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
14index 3f95e53..1e3aad3 100644
15--- a/src/linux_sysfs.c
16+++ b/src/linux_sysfs.c
17@@ -50,7 +50,7 @@
18 #include <dirent.h>
19 #include <errno.h>
20
21-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
22+#if defined(__i386__) || defined(__x86_64__)
23 #include <sys/io.h>
24 #else
25 #define inb(x) -1
26--
272.1.4
28
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch
deleted file mode 100644
index 498020e534..0000000000
--- a/meta/recipes-graphics/xorg-lib/libpciaccess/limits.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Add missing include file to get definition of PATH_MAX
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending
5
6Index: libpciaccess-0.13.3/src/linux_sysfs.c
7===================================================================
8--- libpciaccess-0.13.3.orig/src/linux_sysfs.c
9+++ libpciaccess-0.13.3/src/linux_sysfs.c
10@@ -44,6 +44,7 @@
11 #include <sys/mman.h>
12 #include <dirent.h>
13 #include <errno.h>
14+#include <limits.h>
15
16 #if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
17 #include <sys/io.h>
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb
deleted file mode 100644
index 4a832e8ccb..0000000000
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1SUMMARY = "Generic PCI access library for X"
2
3DESCRIPTION = "libpciaccess provides functionality for X to access the \
4PCI bus and devices in a platform-independent way."
5
6require xorg-lib-common.inc
7
8SRC_URI += "file://limits.patch"
9
10LICENSE = "MIT & MIT-style"
11LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"
12
13SRC_URI[md5sum] = "1f65be5ffc55641c1846c2f41d180d00"
14SRC_URI[sha256sum] = "6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3"
15
16REQUIRED_DISTRO_FEATURES = ""
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb
new file mode 100644
index 0000000000..ffa6a609f3
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb
@@ -0,0 +1,21 @@
1SUMMARY = "Generic PCI access library for X"
2
3DESCRIPTION = "libpciaccess provides functionality for X to access the \
4PCI bus and devices in a platform-independent way."
5
6require xorg-lib-common.inc
7
8SRC_URI += "\
9 file://0001-Include-config.h-before-anything-else-in-.c.patch \
10 file://0002-Fix-quoting-issue.patch \
11 file://0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch \
12 file://0004-Don-t-include-sys-io.h-on-arm.patch \
13"
14
15SRC_URI[md5sum] = "ace78aec799b1cf6dfaea55d3879ed9f"
16SRC_URI[sha256sum] = "07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf"
17
18LICENSE = "MIT & MIT-style"
19LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"
20
21REQUIRED_DISTRO_FEATURES = ""