From: krant <aleksey.vasilenko@gmail.com>
Date: Wed, 10 Apr 2024 08:46:08 +0000 (+0300)
Subject: libpciaccess: update to 0.18.1
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3903d93d961874693e30dd07dd5c039d4e4987d1;p=feed%2Fpackages.git

libpciaccess: update to 0.18.1

- Use Meson build system
- Drop upstreamed patch
- Update project URL

Signed-off-by: krant <aleksey.vasilenko@gmail.com>
---

diff --git a/libs/libpciaccess/Makefile b/libs/libpciaccess/Makefile
index f62c16b17e..a651b08055 100644
--- a/libs/libpciaccess/Makefile
+++ b/libs/libpciaccess/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpciaccess
-PKG_VERSION:=0.17
+PKG_VERSION:=0.18.1
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://www.x.org/releases/individual/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=74283ba3c974913029e7a547496a29145b07ec51732bbb5b5c58d5025ad95b73
+PKG_HASH:=4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76
 
 PKG_MAINTAINER:= Lucian Cristian <lucian.cristian@gmail.com>
 PKG_LICENSE:=MIT
@@ -21,18 +21,16 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/meson.mk
 
 define Package/libpciaccess
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Generic PCI access library
-  URL:=https://xorg.freedesktop.org/
+  URL:=https://gitlab.freedesktop.org/xorg/lib/libpciaccess
 endef
 
-CONFIGURE_ARGS += \
-	--prefix=/usr
-
-TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
+MESON_ARGS += -Dzlib=disabled
 
 define Build/InstallDev
 	$(INSTALL_DIR) \
diff --git a/libs/libpciaccess/patches/010-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versions.patch b/libs/libpciaccess/patches/010-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versions.patch
deleted file mode 100644
index 254dafc522..0000000000
--- a/libs/libpciaccess/patches/010-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versions.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 833c86ce15cee2a84a37ae71015f236fd32615d9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@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
-
-This helps it compile on latest musl C library based systems where these
-functions are put under _LARGEFILE64_SOURCE which is to be removed once
-all packages start using 64bit off_t, it works with glibc becuase
-_GNU_SOURCE feature macro also defines _LARGEFILE64_SOURCE, thats not
-the case with musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/linux_sysfs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/linux_sysfs.c
-+++ b/src/linux_sysfs.c
-@@ -462,7 +462,7 @@ pci_device_linux_sysfs_read( struct pci_
- 
- 
-     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
- 
- 
-     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.