forked from Lainports/freebsd-ports
189 lines
5.7 KiB
Text
189 lines
5.7 KiB
Text
--- configure.orig 2014-11-21 12:54:55.273970976 +0100
|
|
+++ configure 2014-11-21 12:55:25.070967392 +0100
|
|
@@ -853,6 +853,8 @@
|
|
GLPROTO_CFLAGS
|
|
XLIBGL_LIBS
|
|
XLIBGL_CFLAGS
|
|
+LIBDEVQ_LIBS
|
|
+LIBDEVQ_CFLAGS
|
|
LIBUDEV_LIBS
|
|
LIBUDEV_CFLAGS
|
|
LIBDRM_LIBS
|
|
@@ -1143,6 +1145,8 @@
|
|
LIBDRM_LIBS
|
|
LIBUDEV_CFLAGS
|
|
LIBUDEV_LIBS
|
|
+LIBDEVQ_CFLAGS
|
|
+LIBDEVQ_LIBS
|
|
XLIBGL_CFLAGS
|
|
XLIBGL_LIBS
|
|
GLPROTO_CFLAGS
|
|
@@ -1942,6 +1946,10 @@
|
|
C compiler flags for LIBUDEV, overriding pkg-config
|
|
LIBUDEV_LIBS
|
|
linker flags for LIBUDEV, overriding pkg-config
|
|
+ LIBDEVQ_CFLAGS
|
|
+ C compiler flags for LIBDEVQ, overriding pkg-config
|
|
+ LIBDEVQ_LIBS
|
|
+ linker flags for LIBDEVQ, overriding pkg-config
|
|
XLIBGL_CFLAGS
|
|
C compiler flags for XLIBGL, overriding pkg-config
|
|
XLIBGL_LIBS linker flags for XLIBGL, overriding pkg-config
|
|
@@ -5085,6 +5093,7 @@
|
|
DRI3PROTO_REQUIRED=1.0
|
|
PRESENTPROTO_REQUIRED=1.0
|
|
LIBUDEV_REQUIRED=151
|
|
+LIBDEVQ_REQUIRED=0.0.2
|
|
GLPROTO_REQUIRED=1.4.14
|
|
LIBOMXIL_BELLAGIO_REQUIRED=0.0
|
|
VDPAU_REQUIRED=0.4.1
|
|
@@ -6503,7 +6512,7 @@
|
|
fi
|
|
|
|
|
|
-for ac_prog in python2 python
|
|
+for ac_prog in python2.7 python2 python
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; ac_word=$2
|
|
@@ -20025,7 +20034,7 @@
|
|
|
|
|
|
case "$host_os" in
|
|
-linux*)
|
|
+linux*|freebsd*)
|
|
dri3_default=yes
|
|
;;
|
|
*)
|
|
@@ -20543,6 +20552,78 @@
|
|
have_libudev=yes
|
|
fi
|
|
|
|
+
|
|
+pkg_failed=no
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5
|
|
+$as_echo_n "checking for LIBDEVQ... " >&6; }
|
|
+
|
|
+if test -n "$LIBDEVQ_CFLAGS"; then
|
|
+ pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS"
|
|
+ elif test -n "$PKG_CONFIG"; then
|
|
+ if test -n "$PKG_CONFIG" && \
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
+ pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>/dev/null`
|
|
+ test "x$?" != "x0" && pkg_failed=yes
|
|
+else
|
|
+ pkg_failed=yes
|
|
+fi
|
|
+ else
|
|
+ pkg_failed=untried
|
|
+fi
|
|
+if test -n "$LIBDEVQ_LIBS"; then
|
|
+ pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS"
|
|
+ elif test -n "$PKG_CONFIG"; then
|
|
+ if test -n "$PKG_CONFIG" && \
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
+ pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>/dev/null`
|
|
+ test "x$?" != "x0" && pkg_failed=yes
|
|
+else
|
|
+ pkg_failed=yes
|
|
+fi
|
|
+ else
|
|
+ pkg_failed=untried
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
+if test $pkg_failed = yes; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+
|
|
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
+ _pkg_short_errors_supported=yes
|
|
+else
|
|
+ _pkg_short_errors_supported=no
|
|
+fi
|
|
+ if test $_pkg_short_errors_supported = yes; then
|
|
+ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>&1`
|
|
+ else
|
|
+ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>&1`
|
|
+ fi
|
|
+ # Put the nasty error message in config.log where it belongs
|
|
+ echo "$LIBDEVQ_PKG_ERRORS" >&5
|
|
+
|
|
+ have_libdevq=no
|
|
+elif test $pkg_failed = untried; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+ have_libdevq=no
|
|
+else
|
|
+ LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS
|
|
+ LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+ have_libdevq=yes
|
|
+fi
|
|
+
|
|
# Check whether --enable-sysfs was given.
|
|
if test "${enable_sysfs+set}" = set; then :
|
|
enableval=$enable_sysfs; have_sysfs="$enableval"
|
|
@@ -21258,6 +21339,10 @@
|
|
DEFINES="$DEFINES -DHAVE_LIBUDEV"
|
|
have_pci_id=yes
|
|
fi
|
|
+if test "$have_libdevq" = yes; then
|
|
+ DEFINES="$DEFINES -DHAVE_LIBDEVQ"
|
|
+ have_pci_id=yes
|
|
+fi
|
|
|
|
if test "$have_sysfs" = yes; then
|
|
DEFINES="$DEFINES -DHAVE_SYSFS"
|
|
@@ -21385,6 +21470,22 @@
|
|
;;
|
|
gnu*)
|
|
DEFINES="$DEFINES -DHAVE_ALIAS"
|
|
+ if test "x$enable_dri3" = xyes; then
|
|
+ DEFINES="$DEFINES -DHAVE_DRI3"
|
|
+ fi
|
|
+
|
|
+ if test "x$have_libdevq" != xyes; then
|
|
+ as_fn_error $? "libdevq required for building DRI" "$LINENO" 5
|
|
+ fi
|
|
+
|
|
+ case "$host_cpu" in
|
|
+ powerpc* | sparc*)
|
|
+ # Build only the drivers for cards that exist on PowerPC/sparc
|
|
+ if test "x$with_dri_drivers" = "xyes"; then
|
|
+ with_dri_drivers="r200 radeon swrast"
|
|
+ fi
|
|
+ ;;
|
|
+ esac
|
|
;;
|
|
cygwin*)
|
|
if test "x$with_dri_drivers" = "xyes"; then
|
|
@@ -22205,6 +22306,8 @@
|
|
|
|
if test "x$need_pci_id$have_libudev" = xyesyes; then
|
|
GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED"
|
|
+elif test "x$need_libdevq" = xyes; then
|
|
+ GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED"
|
|
else
|
|
GBM_PC_REQ_PRIV=""
|
|
fi
|
|
@@ -23628,9 +23731,6 @@
|
|
CLANG_LIBDIR=${LLVM_LIBDIR}
|
|
fi
|
|
CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
|
|
- if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
|
|
- as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5
|
|
-fi
|
|
fi
|
|
else
|
|
MESA_LLVM=0
|