License-Update: copyright years Convert to meson, drop xorg-lib-common include (it's too autotools-specific).
Signed-off-by: Alexander Kanavin <a...@linutronix.de> --- ...pwrite-pread-instead-of-64bit-versio.patch | 39 ------------------- .../xorg-lib/libpciaccess_0.17.bb | 17 -------- .../xorg-lib/libpciaccess_0.18.bb | 26 +++++++++++++ 3 files changed, 26 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0001-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versio.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess_0.17.bb create mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess_0.18.bb 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 512a473e201..00000000000 --- a/meta/recipes-graphics/xorg-lib/libpciaccess/0001-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versio.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d20ff4f2e4feaafa6a6191b9cae3815b85617943 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Fri, 11 Nov 2022 11:15:58 -0800 -Subject: [PATCH] linux_sysfs: Use pwrite/pread instead of 64bit versions - -pread64/pwrite64 are aliased to pread/pwrite when largefile support is -enabled e.g. using _FILE_OFFSET_BITS=64 macro - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/merge_requests/26] -Signed-off-by: Khem Raj <raj.k...@gmail.com> ---- - src/linux_sysfs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c -index d62f48c..20c800e 100644 ---- a/src/linux_sysfs.c -+++ b/src/linux_sysfs.c -@@ -462,7 +462,7 @@ pci_device_linux_sysfs_read( struct pci_device * dev, void * data, - - - while ( temp_size > 0 ) { -- const ssize_t bytes = pread64( fd, data_bytes, temp_size, offset ); -+ const ssize_t bytes = pread( fd, data_bytes, temp_size, offset ); - - /* If zero bytes were read, then we assume it's the end of the - * config file. -@@ -522,7 +522,7 @@ pci_device_linux_sysfs_write( struct pci_device * dev, const void * data, - - - while ( temp_size > 0 ) { -- const ssize_t bytes = pwrite64( fd, data_bytes, temp_size, offset ); -+ const ssize_t bytes = pwrite( fd, data_bytes, temp_size, offset ); - - /* If zero bytes were written, then we assume it's the end of the - * config file. --- -2.38.1 - 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 54bdb089763..00000000000 --- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.17.bb +++ /dev/null @@ -1,17 +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-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versio.patch" - -SRC_URI[sha256sum] = "74283ba3c974913029e7a547496a29145b07ec51732bbb5b5c58d5025ad95b73" - -LICENSE = "MIT & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" - -REQUIRED_DISTRO_FEATURES = "" - -BBCLASSEXTEND = "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 00000000000..74b308c9121 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.bb @@ -0,0 +1,26 @@ +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." + +HOMEPAGE = "http://www.x.org"; +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"; + +SECTION = "x11/libs" +LICENSE = "MIT" +DEPENDS = "util-macros" + +SRC_URI = "${XORG_MIRROR}/individual/lib/${BP}.tar.xz" + +inherit features_check pkgconfig meson + +REQUIRED_DISTRO_FEATURES ?= "x11" + +SRC_URI[sha256sum] = "5461b0257d495254346f52a9c329b44b346262663675d3fecdb204a7e7c262a9" + +LICENSE = "MIT & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=54c978968e565218eea36cf03ef24352" + +REQUIRED_DISTRO_FEATURES = "" + +BBCLASSEXTEND = "native nativesdk" -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#196700): https://lists.openembedded.org/g/openembedded-core/message/196700 Mute This Topic: https://lists.openembedded.org/mt/104767958/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
