From 4f8d7b2d8eeeb394872249ccc895fd64a1ddca38 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 31 Oct 2019 18:19:51 -0700 Subject: [PATCH] libpciaccess: Update to 0.16 Add PKG_LICENSE_FILES. Small Makefile rearrangements for consistency. Signed-off-by: Rosen Penev --- libs/libpciaccess/Makefile | 17 +++++------ .../0004-Don-t-include-sys-io.h-on-arm.patch | 28 ------------------- 2 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 libs/libpciaccess/patches/0004-Don-t-include-sys-io.h-on-arm.patch diff --git a/libs/libpciaccess/Makefile b/libs/libpciaccess/Makefile index df351e90e..7cae04bcc 100644 --- a/libs/libpciaccess/Makefile +++ b/libs/libpciaccess/Makefile @@ -6,17 +6,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpciaccess -PKG_VERSION:=0.14 +PKG_VERSION:=0.16 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://www.x.org/releases/individual/lib/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4 - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 +PKG_HASH:=214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489 PKG_MAINTAINER:= Lucian Cristian +PKG_LICENSE_FILES:=COPYING + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -27,10 +28,10 @@ define Package/libpciaccess URL:=https://xorg.freedesktop.org/ endef -TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed - CONFIGURE_ARGS += \ - --prefix=/usr + --prefix=/usr + +TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed define Build/InstallDev $(INSTALL_DIR) \ diff --git a/libs/libpciaccess/patches/0004-Don-t-include-sys-io.h-on-arm.patch b/libs/libpciaccess/patches/0004-Don-t-include-sys-io.h-on-arm.patch deleted file mode 100644 index f53285824..000000000 --- a/libs/libpciaccess/patches/0004-Don-t-include-sys-io.h-on-arm.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b6df5202306bd71158b482f25ca2e6919645d4dd Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 4 Jun 2015 20:55:06 -0700 -Subject: [PATCH 4/4] Don't include sys/io.h on arm - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - src/linux_sysfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c -index 3f95e53..1e3aad3 100644 ---- a/src/linux_sysfs.c -+++ b/src/linux_sysfs.c -@@ -50,7 +50,7 @@ - #include - #include - --#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) -+#if defined(__i386__) || defined(__x86_64__) - #include - #else - #define inb(x) -1 --- -2.1.4 -