Some minor bugfixes and a dropped autotools build system.
* Convert to meson.
* Remove MTRR overrides. Don't think there are x86s without
MTRR/PATs this side of the millenia. It should be automatically
detected just fine.
* Explicitly enable HWDATA dependency.
Signed-off-by: Christian Melki <christian.me...@t2data.com>
---
rules/libpciaccess.in | 16 ++--------------
rules/libpciaccess.make | 27 ++++++++-------------------
2 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/rules/libpciaccess.in b/rules/libpciaccess.in
index b6f3e7340..efbd52913 100644
--- a/rules/libpciaccess.in
+++ b/rules/libpciaccess.in
@@ -3,20 +3,8 @@
menuconfig LIBPCIACCESS
tristate
prompt "libpciaccess "
+ select HOST_MESON
+ select HWDATA
help
libpciaccess contains low level access functions to be used by
the xorg servers and video drivers.
-
-if LIBPCIACCESS
-
-config LIBPCIACCESS_MTRR
- bool
- prompt "MTRR support"
- help
- You should carefully check if your x86 target CPU supports MTRRs,
- and if so enable this menuentry.
- BTW: MTRR stands for "memory type range registers" and its used to
- optimize accesses to various memory types, like main memory
- or memory accessible via buses like video memory on PCI cards.
-
-endif
diff --git a/rules/libpciaccess.make b/rules/libpciaccess.make
index fb0b46a8e..7ab035ab5 100644
--- a/rules/libpciaccess.make
+++ b/rules/libpciaccess.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCIACCESS) += libpciaccess
#
# Paths and names
#
-LIBPCIACCESS_VERSION := 0.17
-LIBPCIACCESS_MD5 := 1466cf950c914ad2db1dbb76c9a724db
+LIBPCIACCESS_VERSION := 0.18
+LIBPCIACCESS_MD5 := 54f48367e37666f9e0f12571d1ee3620
LIBPCIACCESS := libpciaccess-$(LIBPCIACCESS_VERSION)
LIBPCIACCESS_SUFFIX := tar.xz
LIBPCIACCESS_URL := $(call ptx/mirror, XORG,
individual/lib/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX))
@@ -27,26 +27,15 @@ LIBPCIACCESS_LICENSE := MIT
# Prepare
# ----------------------------------------------------------------------------
-LIBPCIACCESS_CONF_ENV := $(CROSS_ENV)
-
-ifdef PTXCONF_LIBPCIACCESS_MTRR
-LIBPCIACCESS_CONF_ENV += ac_cv_file__usr_include_asm_mtrr_h=yes
-else
-LIBPCIACCESS_CONF_ENV += ac_cv_file__usr_include_asm_mtrr_h=no
-endif
-
#
-# autoconf
+# meson
#
-LIBPCIACCESS_CONF_TOOL := autoconf
+LIBPCIACCESS_CONF_TOOL := meson
LIBPCIACCESS_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-selective-werror \
- --disable-strict-compilation \
- --disable-linux-rom-fallback \
- $(GLOBAL_LARGE_FILE_OPTION) \
- --with-pciids-path=/usr/share \
- --without-zlib
+ $(CROSS_MESON_USR) \
+ -Dlinux-rom-fallback=false \
+ -Dpci-ids=/usr/share \
+ -Dzlib=disabled
# ----------------------------------------------------------------------------
# Target-Install
--
2.34.1
