From 59b0aa7a7ee327688a77dd5d01d0b2032f6535a2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Mar 2009 14:59:14 +0000 Subject: x11r7: update to 7.4 Patch by Dan Lykowski , closes #181. Minor fixups for kdrive by me. --- package/x11r7/xlib_libpciaccess/Config.in | 5 +++++ .../xlib_libpciaccess-0.10.3-fix_mtrr_check.patch | 20 ++++++++++++++++++++ package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk | 15 +++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 package/x11r7/xlib_libpciaccess/Config.in create mode 100644 package/x11r7/xlib_libpciaccess/xlib_libpciaccess-0.10.3-fix_mtrr_check.patch create mode 100644 package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk (limited to 'package/x11r7/xlib_libpciaccess') diff --git a/package/x11r7/xlib_libpciaccess/Config.in b/package/x11r7/xlib_libpciaccess/Config.in new file mode 100644 index 000000000..5b52e0fcb --- /dev/null +++ b/package/x11r7/xlib_libpciaccess/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_XLIB_LIBPCIACCESS + bool "libpciaccess" + help + libpciaccess 0.10.3 + X.Org libpciaccess diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess-0.10.3-fix_mtrr_check.patch b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess-0.10.3-fix_mtrr_check.patch new file mode 100644 index 000000000..6608d0dbb --- /dev/null +++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess-0.10.3-fix_mtrr_check.patch @@ -0,0 +1,20 @@ +diff -uNr xlib_libpciaccess-0.10.3.orig/configure.ac xlib_libpciaccess-0.10.3/configure.ac +--- xlib_libpciaccess-0.10.3.orig/configure.ac 2009-02-09 18:35:50.000000000 -0800 ++++ xlib_libpciaccess-0.10.3/configure.ac 2009-02-09 18:38:56.000000000 -0800 +@@ -91,10 +91,12 @@ + AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes]) + AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes]) + +-AC_CHECK_FILE([/usr/include/asm/mtrr.h], +- [have_mtrr_h="yes"], [have_mtrr_h="no"]) +-if test "x$have_mtrr_h" = xyes; then +- AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings]) ++if test "$cross_compiling" != yes; then ++AC_CHECK_FILE([/usr/include/asm/mtrr.h], ++ [have_mtrr_h="yes"], [have_mtrr_h="no"]) ++if test "x$have_mtrr_h" = xyes; then ++ AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings]) ++fi + fi + + AC_SUBST(PCIACCESS_CFLAGS) diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk new file mode 100644 index 000000000..94c52f194 --- /dev/null +++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# xlib_libpciaccess -- X.Org pciaccess library +# +################################################################################ + +XLIB_LIBPCIACCESS_VERSION = 0.10.3 +XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2 +XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBPCIACCESS_AUTORECONF = YES +XLIB_LIBPCIACCESS_INSTALL_STAGING = YES +XLIB_LIBPCIACCESS_DEPENDENCIES = +XLIB_LIBPCIACCESS_CONF_OPT = --enable-shared --disable-static + +$(eval $(call AUTOTARGETS,package/x11r7,xlib_libpciaccess)) -- cgit v1.2.3