From 88d8f24ac9313c3753cba0b3de14f6996aa1736c Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Tue, 9 May 2017 10:22:25 +0800 Subject: libpciaccess: 0.13.4 -> 0.13.5 1) Upgrade libpciaccess from 0.13.4 to 0.13.5. 3) Delete three patches, since they are integrated upstream. 0001-Include-config.h-before-anything-else-in-.c.patch 0002-Fix-quoting-issue.patch 0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch (From OE-Core rev: ef4bc266fb9e27d3335ba81a6a0f8ba19e3eb41f) Signed-off-by: Huang Qiyu Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...clude-config.h-before-anything-else-in-.c.patch | 187 --------------------- .../libpciaccess/0002-Fix-quoting-issue.patch | 34 ---- ...nux_sysfs.c-Include-limits.h-for-PATH_MAX.patch | 32 ---- .../xorg-lib/libpciaccess_0.13.4.bb | 21 --- .../xorg-lib/libpciaccess_0.13.5.bb | 18 ++ 5 files changed, 18 insertions(+), 274 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb (limited to 'meta/recipes-graphics/xorg-lib') 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 deleted file mode 100644 index e92fc0d95d..0000000000 --- a/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch +++ /dev/null @@ -1,187 +0,0 @@ -From b14696a55796e739624bbda4f772427032efff2a Mon Sep 17 00:00:00 2001 -From: Julien Cristau -Date: Sun, 26 Apr 2015 15:20:57 +0200 -Subject: [PATCH 1/4] Include config.h before anything else in *.c - -Debian bug#749008 - -Reported-by: Michael Tautschnig -Signed-off-by: Julien Cristau -Reviewed-by: Alan Coopersmith ---- -Upstream-Status: Backport - - src/common_capability.c | 3 +++ - src/common_init.c | 3 +++ - src/common_interface.c | 3 +++ - src/common_io.c | 3 +++ - src/common_iterator.c | 3 +++ - src/common_map.c | 3 +++ - src/common_vgaarb_stub.c | 3 +++ - src/linux_devmem.c | 5 +++-- - src/openbsd_pci.c | 3 +++ - src/solx_devfs.c | 3 +++ - src/x86_pci.c | 4 +++- - 11 files changed, 33 insertions(+), 3 deletions(-) - -diff --git a/src/common_capability.c b/src/common_capability.c -index 488743d..15d395d 100644 ---- a/src/common_capability.c -+++ b/src/common_capability.c -@@ -31,6 +31,9 @@ - * - * \author Ian Romanick - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include - #include -diff --git a/src/common_init.c b/src/common_init.c -index b1c0c3e..f7b59bd 100644 ---- a/src/common_init.c -+++ b/src/common_init.c -@@ -28,6 +28,9 @@ - * - * \author Ian Romanick - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include - #include -diff --git a/src/common_interface.c b/src/common_interface.c -index 59778cf..cb95e90 100644 ---- a/src/common_interface.c -+++ b/src/common_interface.c -@@ -28,6 +28,9 @@ - * - * \author Ian Romanick - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include - #include -diff --git a/src/common_io.c b/src/common_io.c -index f5c9e45..e9586ad 100644 ---- a/src/common_io.c -+++ b/src/common_io.c -@@ -22,6 +22,9 @@ - * Author: - * Adam Jackson - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include - #include -diff --git a/src/common_iterator.c b/src/common_iterator.c -index ccf656d..2beb180 100644 ---- a/src/common_iterator.c -+++ b/src/common_iterator.c -@@ -28,6 +28,9 @@ - * - * \author Ian Romanick - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include - #include -diff --git a/src/common_map.c b/src/common_map.c -index 8757151..f1854bb 100644 ---- a/src/common_map.c -+++ b/src/common_map.c -@@ -21,6 +21,9 @@ - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include - #include -diff --git a/src/common_vgaarb_stub.c b/src/common_vgaarb_stub.c -index 9394273..c1708f6 100644 ---- a/src/common_vgaarb_stub.c -+++ b/src/common_vgaarb_stub.c -@@ -23,6 +23,9 @@ - * OTHER DEALINGS IN THE SOFTWARE. - * - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include - #include "pciaccess.h" -diff --git a/src/linux_devmem.c b/src/linux_devmem.c -index 10e3bde..0d0567c 100644 ---- a/src/linux_devmem.c -+++ b/src/linux_devmem.c -@@ -32,8 +32,9 @@ - * - * \author Ian Romanick - */ -- --#define _GNU_SOURCE -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include - #include -diff --git a/src/openbsd_pci.c b/src/openbsd_pci.c -index 4d1b5cd..b8ce318 100644 ---- a/src/openbsd_pci.c -+++ b/src/openbsd_pci.c -@@ -13,6 +13,9 @@ - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include - #include -diff --git a/src/solx_devfs.c b/src/solx_devfs.c -index f572393..cf96467 100644 ---- a/src/solx_devfs.c -+++ b/src/solx_devfs.c -@@ -25,6 +25,9 @@ - /* - * Solaris devfs interfaces - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include - #include -diff --git a/src/x86_pci.c b/src/x86_pci.c -index 49c1cab..32daa04 100644 ---- a/src/x86_pci.c -+++ b/src/x86_pci.c -@@ -18,8 +18,10 @@ - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - --#define _GNU_SOURCE - #include - #include - #include --- -2.1.4 - 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 deleted file mode 100644 index 16d69a82a4..0000000000 --- a/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 765e0a38cb8c40f8865af5cb356ffe6039ffb08f Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Sun, 22 Mar 2015 21:38:23 +0100 -Subject: [PATCH 2/4] Fix quoting issue. - -m4 has '[]' as quoting characters, so if we want '[]' to -end up in the configure script, we need to quote them again. - -Reported by Greg Troxel . - -Signed-off-by: Thomas Klausner -Reviewed-by: Alan Coopersmith ---- -Upstream-Status: Backport - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e67e9e1..888330b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,7 +76,7 @@ case $host_os in - ;; - *netbsd*) - case $host in -- *i[3-9]86*) -+ *i[[3-9]]86*) - PCIACCESS_LIBS="$PCIACCESS_LIBS -li386" - ;; - *x86_64*|*amd64*) --- -2.1.4 - 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 deleted file mode 100644 index f513c8e59c..0000000000 --- a/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6bd2f7f92eae713663f4e13f6e2cb23526607b8c Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Fri, 1 May 2015 16:36:50 +0200 -Subject: [PATCH 3/4] linux_sysfs.c: Include for PATH_MAX - -Fixes compilation with musl libc. - -Tested-by: Bernd Kuhls -Signed-off-by: Felix Janda -Reviewed-by: Alan Coopersmith -Signed-off-by: Alan Coopersmith ---- -Upstream-Status: Backport - - src/linux_sysfs.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c -index 50d94cf..3f95e53 100644 ---- a/src/linux_sysfs.c -+++ b/src/linux_sysfs.c -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.1.4 - diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb deleted file mode 100644 index ffa6a609f3..0000000000 --- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Generic PCI access library for X" - -DESCRIPTION = "libpciaccess provides functionality for X to access the \ -PCI bus and devices in a platform-independent way." - -require xorg-lib-common.inc - -SRC_URI += "\ - file://0001-Include-config.h-before-anything-else-in-.c.patch \ - file://0002-Fix-quoting-issue.patch \ - file://0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch \ - file://0004-Don-t-include-sys-io.h-on-arm.patch \ -" - -SRC_URI[md5sum] = "ace78aec799b1cf6dfaea55d3879ed9f" -SRC_URI[sha256sum] = "07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf" - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" - -REQUIRED_DISTRO_FEATURES = "" diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb new file mode 100644 index 0000000000..a3b682b09b --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb @@ -0,0 +1,18 @@ +SUMMARY = "Generic PCI access library for X" + +DESCRIPTION = "libpciaccess provides functionality for X to access the \ +PCI bus and devices in a platform-independent way." + +require xorg-lib-common.inc + +SRC_URI += "\ + file://0004-Don-t-include-sys-io.h-on-arm.patch \ +" + +SRC_URI[md5sum] = "d810ab17e24c1418dedf7207fb2841d4" +SRC_URI[sha256sum] = "752c54e9b3c311b4347cb50aea8566fa48eab274346ea8a06f7f15de3240b999" + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" + +REQUIRED_DISTRO_FEATURES = "" -- cgit v1.2.3-54-g00ecf