Merge tag libdrm-2.4.102 into q-x86

Conflicts:
	Android.common.mk
	include/drm/nouveau_drm.h
	xf86drm.c

diff --cc Android.bp
index 2932e31,0000000..423e13c
mode 100644,000000..100644
--- 1/Android.bp
--- /dev/null
+++ b/Android.bp
@@@ -1,68 -1,0 +1,71 @@@
 +//
 +// Copyright © 2011-2012 Intel Corporation
 +//
 +// Permission is hereby granted, free of charge, to any person obtaining a
 +// copy of this software and associated documentation files (the "Software"),
 +// to deal in the Software without restriction, including without limitation
 +// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 +// and/or sell copies of the Software, and to permit persons to whom the
 +// Software is furnished to do so, subject to the following conditions:
 +//
 +// The above copyright notice and this permission notice (including the next
 +// paragraph) shall be included in all copies or substantial portions of the
 +// Software.
 +//
 +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 +// IN THE SOFTWARE.
 +//
 +
 +subdirs = ["*"]
 +build = ["Android.sources.bp"]
 +
 +cc_defaults {
 +    name: "libdrm_defaults",
 +    cflags: [
 +        // XXX: Consider moving these to config.h analogous to autoconf.
 +        "-DMAJOR_IN_SYSMACROS=1",
++        "-DHAVE_ALLOCA_H=0",
++        "-DHAVE_SYS_SELECT_H=0",
++        "-DHAVE_SYS_SYSCTL_H=0",
 +        "-DHAVE_VISIBILITY=1",
 +        "-fvisibility=hidden",
 +        "-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1",
 +
 +        "-Wall",
 +        "-Werror",
 +        "-Wno-deprecated-declarations",
 +        "-Wno-format",
 +        "-Wno-gnu-variable-sized-type-not-at-end",
 +        "-Wno-pointer-arith",
 +        "-Wno-unused-parameter",
 +        "-Wno-unused-variable",
 +        "-Wno-missing-field-initializers",
 +    ],
 +    export_include_dirs: ["."],
 +}
 +
 +// Library for the device
 +cc_library {
 +    name: "libdrm",
 +    recovery_available: true,
 +    vendor_available: true,
 +    defaults: [
 +        "libdrm_defaults",
 +        "libdrm_sources",
 +    ],
 +
 +    export_include_dirs: ["include/drm", "android"],
 +
 +    cflags: [
 +        "-Wno-enum-conversion",
 +        "-Wno-pointer-arith",
 +        "-Wno-sign-compare",
 +        "-Wno-tautological-compare",
 +    ],
 +    shared_libs: ["liblog"],
 +}

diff --cc xf86drm.c
index be70085,b49d42f..d91bb9c
--- 1/xf86drm.c
--- 2/xf86drm.c
+++ b/xf86drm.c
@@@ -71,11 -79,7 +79,11 @@@
  
  #include "util_math.h"
  
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 +#ifdef __ANDROID__
 +#include <log/log.h>
 +#endif
 +
+ #ifdef __DragonFly__
  #define DRM_MAJOR 145
  #endif
  

diff --cc xf86drm.h
Simple merge