1 files changed, 63 insertions, 25 deletions

diff --git a/configure.ac b/configure.ac
index f729fd87..1da9d86b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-        [2.4.66],
+        [2.4.75],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
         [libdrm])
 
@@ -53,14 +53,15 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AC_FUNC_ALLOCA
 
-AC_CHECK_HEADERS([sys/mkdev.h sys/sysctl.h])
+AC_HEADER_MAJOR
+AC_CHECK_HEADERS([sys/sysctl.h sys/select.h])
 
 # Initialize libtool
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
 
-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
+
 AC_SUBST(PTHREADSTUBS_CFLAGS)
 AC_SUBST(PTHREADSTUBS_LIBS)
 
@@ -131,6 +132,16 @@ AC_ARG_ENABLE(rockchip-experimental-api,
               [Enable support for rockchip's experimental API (default: disabled)]),
               [ROCKCHIP=$enableval], [ROCKCHIP=no])
 
+AC_ARG_ENABLE(vc4,
+              AS_HELP_STRING([--disable-vc4],
+              [Enable support for vc4's API (default: auto, enabled on arm)]),
+              [VC4=$enableval], [VC4=auto])
+
+AC_ARG_ENABLE(etnaviv-experimental-api,
+              AS_HELP_STRING([--enable-etnaviv-experimental-api],
+              [Enable support for etnaviv's experimental API (default: disabled)]),
+              [ETNAVIV=$enableval], [ETNAVIV=no])
+
 AC_ARG_ENABLE(install-test-programs,
                   AS_HELP_STRING([--enable-install-test-programs],
                   [Install test programs (default: no)]),
@@ -179,7 +190,8 @@ MAYBE_WARN="-Wall -Wextra \
 -Wstrict-aliasing=2 -Winit-self \
 -Wdeclaration-after-statement -Wold-style-definition \
 -Wno-unused-parameter \
--Wno-attributes -Wno-long-long -Winline -Wshadow"
+-Wno-attributes -Wno-long-long -Winline -Wshadow \
+-Wno-missing-field-initializers"
 
 # invalidate cached value if MAYBE_WARN has changed
 if test "x$libdrm_cv_warn_maybe" != "x$MAYBE_WARN"; then
@@ -272,6 +284,9 @@ if test "x$drm_cv_atomic_primitives" = "xnone"; then
 
         LIBDRM_ATOMICS_NOT_FOUND_MSG($TEGRA, tegra, NVIDIA Tegra, tegra-experimental-api)
         TEGRA=no
+
+        LIBDRM_ATOMICS_NOT_FOUND_MSG($ETNAVIV, etnaviv, Vivante, etnaviv-experimental-api)
+        ETNAVIV=no
 else
         if test "x$INTEL" = xauto; then
                 case $host_cpu in
@@ -294,6 +309,12 @@ else
                         *)              FREEDRENO=no ;;
                 esac
         fi
+        if test "x$VC4" = xauto; then
+                case $host_cpu in
+                        arm*|aarch64)   VC4=yes ;;
+                        *)              VC4=no ;;
+                esac
+        fi
 fi
 
 if test "x$INTEL" != "xno"; then
@@ -364,19 +385,23 @@ if test "x$RADEON" = xyes; then
         AC_DEFINE(HAVE_RADEON, 1, [Have radeon support])
 fi
 
-# Detect cunit library
-PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
-# If pkg-config does not find cunit, check it using AC_CHECK_LIB.  We
-# do this because Debian (Ubuntu) lacks pkg-config file for cunit.
-# fixed in 2.1-2.dfsg-3: http://anonscm.debian.org/cgit/collab-maint/cunit.git/commit/?h=debian
-if test "x${have_cunit}" = "xno"; then
-        AC_CHECK_LIB([cunit], [CU_initialize_registry], [have_cunit=yes], [have_cunit=no])
-        if test "x${have_cunit}" = "xyes"; then
-                CUNIT_LIBS="-lcunit"
-                CUNIT_CFLAGS=""
-                AC_SUBST([CUNIT_LIBS])
-                AC_SUBST([CUNIT_CFLAGS])
+if test "x$AMDGPU" != xno; then
+        # Detect cunit library
+        PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
+        # If pkg-config does not find cunit, check it using AC_CHECK_LIB.  We
+        # do this because Debian (Ubuntu) lacks pkg-config file for cunit.
+        # fixed in 2.1-2.dfsg-3: http://anonscm.debian.org/cgit/collab-maint/cunit.git/commit/?h=debian
+        if test "x${have_cunit}" = "xno"; then
+                AC_CHECK_LIB([cunit], [CU_initialize_registry], [have_cunit=yes], [have_cunit=no])
+                if test "x${have_cunit}" = "xyes"; then
+                        CUNIT_LIBS="-lcunit"
+                        CUNIT_CFLAGS=""
+                        AC_SUBST([CUNIT_LIBS])
+                        AC_SUBST([CUNIT_CFLAGS])
+                fi
         fi
+else
+        have_cunit=no
 fi
 AM_CONDITIONAL(HAVE_CUNIT, [test "x$have_cunit" != "xno"])
 
@@ -399,6 +424,15 @@ fi
 AM_CONDITIONAL(HAVE_ROCKCHIP, [test "x$ROCKCHIP" = xyes])
 if test "x$ROCKCHIP" = xyes; then
         AC_DEFINE(HAVE_ROCKCHIP, 1, [Have ROCKCHIP support])
+
+AM_CONDITIONAL(HAVE_VC4, [test "x$VC4" = xyes])
+if test "x$VC4" = xyes; then
+        AC_DEFINE(HAVE_VC4, 1, [Have VC4 support])
+fi
+
+AM_CONDITIONAL(HAVE_ETNAVIV, [test "x$ETNAVIV" = xyes])
+if test "x$ETNAVIV" = xyes; then
+        AC_DEFINE(HAVE_ETNAVIV, 1, [Have etnaviv support])
 fi
 
 AM_CONDITIONAL(HAVE_INSTALL_TESTS, [test "x$INSTALL_TESTS" = xyes])
@@ -410,7 +444,9 @@ AC_ARG_ENABLE([cairo-tests],
               [AS_HELP_STRING([--enable-cairo-tests],
                               [Enable support for Cairo rendering in tests (default: auto)])],
               [CAIRO=$enableval], [CAIRO=auto])
-PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
+if test "x$CAIRO" != xno; then
+        PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
+fi
 AC_MSG_CHECKING([whether to enable Cairo tests])
 if test "x$CAIRO" = xauto; then
         CAIRO="$HAVE_CAIRO"
@@ -424,13 +460,6 @@ fi
 AC_MSG_RESULT([$CAIRO])
 AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes])
 
-# For enumerating devices in test case
-PKG_CHECK_MODULES(LIBUDEV, libudev, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
-if test "x$HAVE_LIBUDEV" = xyes; then
-        AC_DEFINE(HAVE_LIBUDEV, 1, [Have libudev support])
-fi
-AM_CONDITIONAL(HAVE_LIBUDEV, [test "x$HAVE_LIBUDEV" = xyes])
-
 # xsltproc for docbook manpages
 AC_ARG_ENABLE([manpages],
               AS_HELP_STRING([--enable-manpages], [enable manpages @<:@default=auto@:>@]),
@@ -455,7 +484,9 @@ AC_ARG_ENABLE(valgrind,
               [AS_HELP_STRING([--enable-valgrind],
                              [Build libdrm with  valgrind support (default: auto)])],
                              [VALGRIND=$enableval], [VALGRIND=auto])
-PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
+if test "x$VALGRIND" != xno; then
+        PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
+fi
 AC_MSG_CHECKING([whether to enable Valgrind support])
 if test "x$VALGRIND" = xauto; then
         VALGRIND="$have_valgrind"
@@ -508,6 +539,10 @@ AC_CONFIG_FILES([
         tegra/libdrm_tegra.pc
         rockchip/Makefile
         rockchip/libdrm_rockchip.pc
+        vc4/Makefile
+        vc4/libdrm_vc4.pc
+        etnaviv/Makefile
+        etnaviv/libdrm_etnaviv.pc
         tests/Makefile
         tests/modeprint/Makefile
         tests/modetest/Makefile
@@ -521,6 +556,7 @@ AC_CONFIG_FILES([
         tests/tegra/Makefile
         tests/nouveau/Makefile
         tests/planetest/Makefile
+        tests/etnaviv/Makefile
         tests/util/Makefile
         man/Makefile
         libdrm.pc])
@@ -540,4 +576,6 @@ echo "  EXYNOS API     $EXYNOS"
 echo "  Freedreno API  $FREEDRENO (kgsl: $FREEDRENO_KGSL)"
 echo "  Tegra API      $TEGRA"
 echo "  Rockchip API   $ROCKCHIP"
+echo "  VC4 API        $VC4"
+echo "  Etnaviv API    $ETNAVIV"
 echo ""