[gentoo-commits] repo/gentoo:master commit in: x11-libs/libpciaccess/files/, x11-libs/libpciaccess/

[gentoo-commits] repo/gentoo:master commit in: x11-libs/libpciaccess/files/, x11-libs/libpciaccess/

[Sam James]

commit:     bb9b11b116b5029003c55716d733a4bc9886ad66
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 12:45:53 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  9 12:46:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb9b11b1

x11-libs/libpciaccess: fix build w/ musl-1.2.4

In theory these fixes can be okay without a revbump but it's best to be careful.

Closes: https://bugs.gentoo.org/905913
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libpciaccess-0.17-musl-lfs.patch         | 40 ++++++++++++++++++++++
 x11-libs/libpciaccess/libpciaccess-0.17-r1.ebuild  | 33 ++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.17-musl-lfs.patch b/x11-libs/libpciaccess/files/libpciaccess-0.17-musl-lfs.patch
new file mode 100644
index 000000000000..cfd7a1469b25
--- /dev/null
+++ b/x11-libs/libpciaccess/files/libpciaccess-0.17-musl-lfs.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/905913
+https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/833c86ce15cee2a84a37ae71015f236fd32615d9
+
+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>
+--- 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.
+-- 
+GitLab

diff --git a/x11-libs/libpciaccess/libpciaccess-0.17-r1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.17-r1.ebuild
new file mode 100644
index 000000000000..7191e10bbbb0
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.17-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3 meson-multilib
+
+DESCRIPTION="Library providing generic access to the PCI bus and devices"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+DEPEND="
+	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	sys-apps/hwdata"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-musl-lfs.patch
+)
+
+src_prepare() {
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpci-ids="${EPREFIX}"/usr/share/hwdata
+		$(meson_feature zlib)
+	)
+	meson_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/libpciaccess/files/, x11-libs/libpciaccess/

[Matt Turner]

commit:     2f3ffadd9984c80dd6e8438d4b8a7cffb3597db2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 14:50:07 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 14:51:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f3ffadd

x11-libs/libpciaccess: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-libs/libpciaccess/Manifest                     |  1 -
 .../files/libpciaccess-0.17-musl-lfs.patch         | 40 ----------------------
 x11-libs/libpciaccess/libpciaccess-0.17-r1.ebuild  | 33 ------------------
 3 files changed, 74 deletions(-)

diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index c9596090d890..93cf7ce466b5 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,2 +1 @@
-DIST libpciaccess-0.17.tar.xz 331768 BLAKE2B 41539b3d6385fe7c42b562c7602f87b07730bbbeea7d65d3cc8e5af974ed5f9985b0779d51891493dd241a36bb171a3744e3b1f3fd30bee8a19bb5bd785f4c5f SHA512 8484605c66ef18c8d8a3e029a6d33e26fcaa450c1263790d89ac8b0a160ffb2dfceaa6140ac9ad7d8087283ecbec8ac801f757e44890d547c3cbecd2c922ca47
 DIST libpciaccess-0.18.tar.xz 64452 BLAKE2B 06309f98aee985c92c2389344fdd0fcb4bebc6c69d71198e6bf5bc165dce85c7fd54aa1ff9454ee430264a8e1ff283976508285523d48d9948e242c53157761f SHA512 54dff9a493344586d072edf8c8eb8f7960c7dfd64aa5c51a8ec8d4e341f703fd39eb606ee41c4fdd9d5aad3372b7efe6e0fe96eadc575ea91de276320ebc3fbd

diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.17-musl-lfs.patch b/x11-libs/libpciaccess/files/libpciaccess-0.17-musl-lfs.patch
deleted file mode 100644
index cfd7a1469b25..000000000000
--- a/x11-libs/libpciaccess/files/libpciaccess-0.17-musl-lfs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/905913
-https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/833c86ce15cee2a84a37ae71015f236fd32615d9
-
-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>
---- 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.
--- 
-GitLab

diff --git a/x11-libs/libpciaccess/libpciaccess-0.17-r1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.17-r1.ebuild
deleted file mode 100644
index fae2b84d7825..000000000000
--- a/x11-libs/libpciaccess/libpciaccess-0.17-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_MULTILIB=yes
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3 meson-multilib
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="zlib"
-
-DEPEND="
-	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	sys-apps/hwdata"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl-lfs.patch
-)
-
-src_prepare() {
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dpci-ids="${EPREFIX}"/usr/share/hwdata
-		$(meson_feature zlib)
-	)
-	meson_src_configure
-}