summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2024-03-06 07:42:11 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-03-07 17:25:02 +0000
commit00013601aad7826df6524b15356ce935234af3e4 (patch)
tree2d601d80f927e5c97447a6cf09c9528ef67adcc8
parenteee41d341d28687286e09af027471764bad48132 (diff)
downloadpoky-00013601aad7826df6524b15356ce935234af3e4.tar.gz
libpciaccess: upgrade 0.17 -> 0.18
License-Update: copyright years Convert to meson, drop xorg-lib-common include (it's too autotools-specific). (From OE-Core rev: 4acdea1f3b9d0e18e899171aaa133980c1c7382e) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess/0001-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versio.patch39
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess_0.17.bb17
-rw-r--r--meta/recipes-graphics/xorg-lib/libpciaccess_0.18.bb26
3 files changed, 26 insertions, 56 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0001-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versio.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0001-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versio.patch
deleted file mode 100644
index 512a473e20..0000000000
--- a/meta/recipes-graphics/xorg-lib/libpciaccess/0001-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versio.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From d20ff4f2e4feaafa6a6191b9cae3815b85617943 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 11 Nov 2022 11:15:58 -0800
4Subject: [PATCH] linux_sysfs: Use pwrite/pread instead of 64bit versions
5
6pread64/pwrite64 are aliased to pread/pwrite when largefile support is
7enabled e.g. using _FILE_OFFSET_BITS=64 macro
8
9Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/merge_requests/26]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/linux_sysfs.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
16index d62f48c..20c800e 100644
17--- a/src/linux_sysfs.c
18+++ b/src/linux_sysfs.c
19@@ -462,7 +462,7 @@ pci_device_linux_sysfs_read( struct pci_device * dev, void * data,
20
21
22 while ( temp_size > 0 ) {
23- const ssize_t bytes = pread64( fd, data_bytes, temp_size, offset );
24+ const ssize_t bytes = pread( fd, data_bytes, temp_size, offset );
25
26 /* If zero bytes were read, then we assume it's the end of the
27 * config file.
28@@ -522,7 +522,7 @@ pci_device_linux_sysfs_write( struct pci_device * dev, const void * data,
29
30
31 while ( temp_size > 0 ) {
32- const ssize_t bytes = pwrite64( fd, data_bytes, temp_size, offset );
33+ const ssize_t bytes = pwrite( fd, data_bytes, temp_size, offset );
34
35 /* If zero bytes were written, then we assume it's the end of the
36 * config file.
37--
382.38.1
39
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.17.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.17.bb
deleted file mode 100644
index 54bdb08976..0000000000
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.17.bb
+++ /dev/null
@@ -1,17 +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://0001-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versio.patch"
9
10SRC_URI[sha256sum] = "74283ba3c974913029e7a547496a29145b07ec51732bbb5b5c58d5025ad95b73"
11
12LICENSE = "MIT & MIT"
13LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"
14
15REQUIRED_DISTRO_FEATURES = ""
16
17BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.bb
new file mode 100644
index 0000000000..74b308c912
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.bb
@@ -0,0 +1,26 @@
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
6HOMEPAGE = "http://www.x.org"
7BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"
8
9SECTION = "x11/libs"
10LICENSE = "MIT"
11DEPENDS = "util-macros"
12
13SRC_URI = "${XORG_MIRROR}/individual/lib/${BP}.tar.xz"
14
15inherit features_check pkgconfig meson
16
17REQUIRED_DISTRO_FEATURES ?= "x11"
18
19SRC_URI[sha256sum] = "5461b0257d495254346f52a9c329b44b346262663675d3fecdb204a7e7c262a9"
20
21LICENSE = "MIT & MIT"
22LIC_FILES_CHKSUM = "file://COPYING;md5=54c978968e565218eea36cf03ef24352"
23
24REQUIRED_DISTRO_FEATURES = ""
25
26BBCLASSEXTEND = "native nativesdk"