Wed Jan 28 11:17:50 2015 UTC ()
Sync xsrc/external/mit/libdrm/dist with HEAD, requested by snj in ticket #463:

	external/mit/libdrm/dist/include/drm/tegra_drm.h up to 1.1.1.1
	external/mit/libdrm/dist/tests/proptest/Makefile.am up to 1.1.1.1
	external/mit/libdrm/dist/tests/proptest/Makefile.in up to 1.1.1.1
	external/mit/libdrm/dist/tests/proptest/proptest.c up to 1.1.1.1
	external/mit/libdrm/dist/tests/tegra/Makefile.am up to 1.1.1.1
	external/mit/libdrm/dist/tests/tegra/Makefile.in up to 1.1.1.1
	external/mit/libdrm/dist/tests/tegra/openclose.c up to 1.1.1.1
	external/mit/libdrm/dist/build-aux/compile      up to 1.1.1.1
	external/mit/libdrm/dist/tegra/Makefile.am      up to 1.1.1.1
	external/mit/libdrm/dist/tegra/Makefile.in      up to 1.1.1.1
	external/mit/libdrm/dist/tegra/libdrm_tegra.pc.in up to 1.1.1.1
	external/mit/libdrm/dist/tegra/private.h        up to 1.1.1.1
	external/mit/libdrm/dist/tegra/tegra.c          up to 1.1.1.1
	external/mit/libdrm/dist/tegra/tegra.h          up to 1.1.1.1
	external/mit/libdrm/dist/Makefile.am            up to 1.1.1.6
	external/mit/libdrm/dist/Makefile.in            up to 1.1.1.8
	external/mit/libdrm/dist/Makefile.sources       up to 1.1.1.2
	external/mit/libdrm/dist/aclocal.m4             up to 1.1.1.10
	external/mit/libdrm/dist/config.h.in            up to 1.1.1.5
	external/mit/libdrm/dist/configure              up to 1.1.1.10
	external/mit/libdrm/dist/configure.ac           up to 1.1.1.10
	external/mit/libdrm/dist/xf86drmMode.h          up to 1.4
	external/mit/libdrm/dist/build-aux/config.guess up to 1.1.1.4
	external/mit/libdrm/dist/build-aux/config.sub   up to 1.1.1.4
	external/mit/libdrm/dist/build-aux/ltmain.sh    up to 1.1.1.2
	external/mit/libdrm/dist/build-aux/missing      up to 1.1.1.2
	external/mit/libdrm/dist/build-aux/test-driver  up to 1.1.1.2
	external/mit/libdrm/dist/exynos/Makefile.in     up to 1.1.1.3
	external/mit/libdrm/dist/freedreno/Makefile.am  up to 1.1.1.3
	external/mit/libdrm/dist/freedreno/Makefile.in  up to 1.1.1.3
	external/mit/libdrm/dist/freedreno/Makefile.sources up to 1.1.1.2
	external/mit/libdrm/dist/freedreno/freedreno_bo.c up to 1.1.1.3
	external/mit/libdrm/dist/freedreno/freedreno_device.c up to 1.1.1.4
	external/mit/libdrm/dist/include/drm/drm_mode.h up to 1.1.1.5
	external/mit/libdrm/dist/intel/Makefile.in      up to 1.1.1.7
	external/mit/libdrm/dist/intel/intel_bufmgr_gem.c up to 1.10
	external/mit/libdrm/dist/intel/intel_chipset.h  up to 1.1.1.4
	external/mit/libdrm/dist/intel/intel_decode.c   up to 1.1.1.4
	external/mit/libdrm/dist/libkms/Makefile.in     up to 1.1.1.7
	external/mit/libdrm/dist/m4/libtool.m4          up to 1.1.1.4
	external/mit/libdrm/dist/man/Makefile.in        up to 1.1.1.3
	external/mit/libdrm/dist/nouveau/Makefile.in    up to 1.1.1.7
	external/mit/libdrm/dist/omap/Makefile.in       up to 1.1.1.3
	external/mit/libdrm/dist/radeon/Makefile.in     up to 1.1.1.7
	external/mit/libdrm/dist/radeon/radeon_surface.c up to 1.6
	external/mit/libdrm/dist/tests/Makefile.am      up to 1.1.1.5
	external/mit/libdrm/dist/tests/Makefile.in      up to 1.1.1.8
	external/mit/libdrm/dist/tests/exynos/Makefile.in up to 1.1.1.3
	external/mit/libdrm/dist/tests/kmstest/Makefile.in up to 1.1.1.7
	external/mit/libdrm/dist/tests/modeprint/Makefile.in up to 1.1.1.8
	external/mit/libdrm/dist/tests/modetest/Android.mk up to 1.1.1.2
	external/mit/libdrm/dist/tests/modetest/Makefile.am up to 1.1.1.6
	external/mit/libdrm/dist/tests/modetest/Makefile.in up to 1.1.1.9
	external/mit/libdrm/dist/tests/modetest/buffers.c up to 1.1.1.3
	external/mit/libdrm/dist/tests/modetest/buffers.h up to 1.1.1.2
	external/mit/libdrm/dist/tests/modetest/cursor.c up to 1.1.1.3
	external/mit/libdrm/dist/tests/modetest/modetest.c up to 1.6
	external/mit/libdrm/dist/tests/radeon/Makefile.in up to 1.1.1.3
	external/mit/libdrm/dist/tests/vbltest/Makefile.in up to 1.1.1.6
	external/mit/libdrm/dist/tests/vbltest/vbltest.c up to 1.1.1.4

Update to 2.4.59.


(martin)
diff -r1.1.1.4.2.1 -r1.1.1.4.2.2 xsrc/external/mit/libdrm/dist/Makefile.am
diff -r1.1.1.6.2.1 -r1.1.1.6.2.2 xsrc/external/mit/libdrm/dist/Makefile.in
diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 xsrc/external/mit/libdrm/dist/Makefile.sources
diff -r1.1.1.8.2.1 -r1.1.1.8.2.2 xsrc/external/mit/libdrm/dist/aclocal.m4
diff -r1.1.1.8.2.1 -r1.1.1.8.2.2 xsrc/external/mit/libdrm/dist/configure
diff -r1.1.1.8.2.1 -r1.1.1.8.2.2 xsrc/external/mit/libdrm/dist/configure.ac
diff -r1.1.1.3.2.1 -r1.1.1.3.2.2 xsrc/external/mit/libdrm/dist/config.h.in
diff -r1.2.2.1 -r1.2.2.2 xsrc/external/mit/libdrm/dist/xf86drmMode.h
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/build-aux/compile
diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/build-aux/config.guess
diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/build-aux/config.sub
diff -r1.1.1.1 -r1.1.1.1.2.1 xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh
diff -r1.1.1.1 -r1.1.1.1.2.1 xsrc/external/mit/libdrm/dist/build-aux/missing
diff -r1.1.1.1 -r1.1.1.1.2.1 xsrc/external/mit/libdrm/dist/build-aux/test-driver
diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/exynos/Makefile.in
diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/freedreno/Makefile.am
diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/freedreno/Makefile.in
diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c
diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources
diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c
diff -r1.1.1.4 -r1.1.1.4.2.1 xsrc/external/mit/libdrm/dist/include/drm/drm_mode.h
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/include/drm/tegra_drm.h
diff -r1.1.1.5.2.1 -r1.1.1.5.2.2 xsrc/external/mit/libdrm/dist/intel/Makefile.in
diff -r1.8.2.1 -r1.8.2.2 xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
diff -r1.1.1.3 -r1.1.1.3.2.1 xsrc/external/mit/libdrm/dist/intel/intel_chipset.h
diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/intel/intel_decode.c
diff -r1.1.1.5.2.1 -r1.1.1.5.2.2 xsrc/external/mit/libdrm/dist/libkms/Makefile.in
diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/m4/libtool.m4
diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/man/Makefile.in
diff -r1.1.1.5.2.1 -r1.1.1.5.2.2 xsrc/external/mit/libdrm/dist/nouveau/Makefile.in
diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/omap/Makefile.in
diff -r1.1.1.5.2.1 -r1.1.1.5.2.2 xsrc/external/mit/libdrm/dist/radeon/Makefile.in
diff -r1.4.2.1 -r1.4.2.2 xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tegra/Makefile.am
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tegra/Makefile.in
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tegra/libdrm_tegra.pc.in
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tegra/private.h
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tegra/tegra.c
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tegra/tegra.h
diff -r1.1.1.4 -r1.1.1.4.2.1 xsrc/external/mit/libdrm/dist/tests/Makefile.am
diff -r1.1.1.6.2.1 -r1.1.1.6.2.2 xsrc/external/mit/libdrm/dist/tests/Makefile.in
diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/exynos/Makefile.in
diff -r1.1.1.5.2.1 -r1.1.1.5.2.2 xsrc/external/mit/libdrm/dist/tests/kmstest/Makefile.in
diff -r1.1.1.6.2.1 -r1.1.1.6.2.2 xsrc/external/mit/libdrm/dist/tests/modeprint/Makefile.in
diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 xsrc/external/mit/libdrm/dist/tests/modetest/Android.mk
diff -r1.1.1.4.2.1 -r1.1.1.4.2.2 xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.am
diff -r1.1.1.7.2.1 -r1.1.1.7.2.2 xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.in
diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/modetest/buffers.c
diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/modetest/cursor.c
diff -r1.1.1.1 -r1.1.1.1.2.1 xsrc/external/mit/libdrm/dist/tests/modetest/buffers.h
diff -r1.4.2.1 -r1.4.2.2 xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/proptest/Makefile.am
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/proptest/Makefile.in
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/proptest/proptest.c
diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/radeon/Makefile.in
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/tegra/Makefile.am
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/tegra/Makefile.in
diff -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/tegra/openclose.c
diff -r1.1.1.4.2.1 -r1.1.1.4.2.2 xsrc/external/mit/libdrm/dist/tests/vbltest/Makefile.in
diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/tests/vbltest/vbltest.c
cvs diff -r1.1.1.4.2.1 -r1.1.1.4.2.2 xsrc/external/mit/libdrm/dist/Attic/Makefile.am (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/Attic/Makefile.am 2014/12/23 01:16:56 1.1.1.4.2.1
+++ xsrc/external/mit/libdrm/dist/Attic/Makefile.am 2015/01/28 11:17:48 1.1.1.4.2.2
@@ -43,27 +43,31 @@ endif @@ -43,27 +43,31 @@ endif
43 43
44if HAVE_OMAP 44if HAVE_OMAP
45OMAP_SUBDIR = omap 45OMAP_SUBDIR = omap
46endif 46endif
47 47
48if HAVE_EXYNOS 48if HAVE_EXYNOS
49EXYNOS_SUBDIR = exynos 49EXYNOS_SUBDIR = exynos
50endif 50endif
51 51
52if HAVE_FREEDRENO 52if HAVE_FREEDRENO
53FREEDRENO_SUBDIR = freedreno 53FREEDRENO_SUBDIR = freedreno
54endif 54endif
55 55
56SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(FREEDRENO_SUBDIR) tests man 56if HAVE_TEGRA
 57TEGRA_SUBDIR = tegra
 58endif
 59
 60SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(FREEDRENO_SUBDIR) $(TEGRA_SUBDIR) tests man
57 61
58libdrm_la_LTLIBRARIES = libdrm.la 62libdrm_la_LTLIBRARIES = libdrm.la
59libdrm_ladir = $(libdir) 63libdrm_ladir = $(libdir)
60libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined 64libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
61libdrm_la_LIBADD = @CLOCK_LIB@ 65libdrm_la_LIBADD = @CLOCK_LIB@
62 66
63libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm 67libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
64AM_CFLAGS = \ 68AM_CFLAGS = \
65 $(VALGRIND_CFLAGS) 69 $(VALGRIND_CFLAGS)
66 70
67libdrm_la_SOURCES = $(LIBDRM_FILES) 71libdrm_la_SOURCES = $(LIBDRM_FILES)
68 72
69libdrmincludedir = ${includedir} 73libdrmincludedir = ${includedir}
cvs diff -r1.1.1.6.2.1 -r1.1.1.6.2.2 xsrc/external/mit/libdrm/dist/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/Attic/Makefile.in 2014/12/23 01:16:56 1.1.1.6.2.1
+++ xsrc/external/mit/libdrm/dist/Attic/Makefile.in 2015/01/28 11:17:48 1.1.1.6.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -95,29 +95,31 @@ transform = $(program_transform_name) @@ -95,29 +95,31 @@ transform = $(program_transform_name)
95NORMAL_INSTALL = : 95NORMAL_INSTALL = :
96PRE_INSTALL = : 96PRE_INSTALL = :
97POST_INSTALL = : 97POST_INSTALL = :
98NORMAL_UNINSTALL = : 98NORMAL_UNINSTALL = :
99PRE_UNINSTALL = : 99PRE_UNINSTALL = :
100POST_UNINSTALL = : 100POST_UNINSTALL = :
101build_triplet = @build@ 101build_triplet = @build@
102host_triplet = @host@ 102host_triplet = @host@
103DIST_COMMON = $(srcdir)/Makefile.sources $(srcdir)/Makefile.in \ 103DIST_COMMON = $(srcdir)/Makefile.sources $(srcdir)/Makefile.in \
104 $(srcdir)/Makefile.am $(top_srcdir)/configure \ 104 $(srcdir)/Makefile.am $(top_srcdir)/configure \
105 $(am__configure_deps) $(srcdir)/config.h.in \ 105 $(am__configure_deps) $(srcdir)/config.h.in \
106 $(srcdir)/libdrm.pc.in $(top_srcdir)/build-aux/depcomp \ 106 $(srcdir)/libdrm.pc.in $(top_srcdir)/build-aux/depcomp \
107 $(am__klibdrminclude_HEADERS_DIST) $(libdrminclude_HEADERS) \ 107 $(am__klibdrminclude_HEADERS_DIST) $(libdrminclude_HEADERS) \
108 README build-aux/config.guess build-aux/config.sub \ 108 README build-aux/compile build-aux/config.guess \
109 build-aux/depcomp build-aux/install-sh build-aux/missing \ 109 build-aux/config.sub build-aux/depcomp build-aux/install-sh \
110 build-aux/ltmain.sh $(top_srcdir)/build-aux/config.guess \ 110 build-aux/missing build-aux/ltmain.sh \
 111 $(top_srcdir)/build-aux/compile \
 112 $(top_srcdir)/build-aux/config.guess \
111 $(top_srcdir)/build-aux/config.sub \ 113 $(top_srcdir)/build-aux/config.sub \
112 $(top_srcdir)/build-aux/install-sh \ 114 $(top_srcdir)/build-aux/install-sh \
113 $(top_srcdir)/build-aux/ltmain.sh \ 115 $(top_srcdir)/build-aux/ltmain.sh \
114 $(top_srcdir)/build-aux/missing 116 $(top_srcdir)/build-aux/missing
115@HAVE_VMWGFX_TRUE@am__append_1 = $(LIBDRM_INCLUDE_VMWGFX_H_FILES) 117@HAVE_VMWGFX_TRUE@am__append_1 = $(LIBDRM_INCLUDE_VMWGFX_H_FILES)
116subdir = . 118subdir = .
117ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 119ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
118am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ 120am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
119 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 121 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
120 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ 122 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
121 $(top_srcdir)/configure.ac 123 $(top_srcdir)/configure.ac
122am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 124am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
123 $(ACLOCAL_M4) 125 $(ACLOCAL_M4)
@@ -218,27 +220,28 @@ RECURSIVE_TARGETS = all-recursive check- @@ -218,27 +220,28 @@ RECURSIVE_TARGETS = all-recursive check-
218am__can_run_installinfo = \ 220am__can_run_installinfo = \
219 case $$AM_UPDATE_INFO_DIR in \ 221 case $$AM_UPDATE_INFO_DIR in \
220 n|no|NO) false;; \ 222 n|no|NO) false;; \
221 *) (install-info --version) >/dev/null 2>&1;; \ 223 *) (install-info --version) >/dev/null 2>&1;; \
222 esac 224 esac
223DATA = $(pkgconfig_DATA) 225DATA = $(pkgconfig_DATA)
224am__klibdrminclude_HEADERS_DIST = include/drm/drm.h \ 226am__klibdrminclude_HEADERS_DIST = include/drm/drm.h \
225 include/drm/drm_fourcc.h include/drm/drm_mode.h \ 227 include/drm/drm_fourcc.h include/drm/drm_mode.h \
226 include/drm/drm_sarea.h include/drm/i915_drm.h \ 228 include/drm/drm_sarea.h include/drm/i915_drm.h \
227 include/drm/mach64_drm.h include/drm/mga_drm.h \ 229 include/drm/mach64_drm.h include/drm/mga_drm.h \
228 include/drm/nouveau_drm.h include/drm/qxl_drm.h \ 230 include/drm/nouveau_drm.h include/drm/qxl_drm.h \
229 include/drm/r128_drm.h include/drm/radeon_drm.h \ 231 include/drm/r128_drm.h include/drm/radeon_drm.h \
230 include/drm/savage_drm.h include/drm/sis_drm.h \ 232 include/drm/savage_drm.h include/drm/sis_drm.h \
231 include/drm/via_drm.h include/drm/vmwgfx_drm.h 233 include/drm/tegra_drm.h include/drm/via_drm.h \
 234 include/drm/vmwgfx_drm.h
232HEADERS = $(klibdrminclude_HEADERS) $(libdrminclude_HEADERS) 235HEADERS = $(klibdrminclude_HEADERS) $(libdrminclude_HEADERS)
233RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ 236RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
234 distclean-recursive maintainer-clean-recursive 237 distclean-recursive maintainer-clean-recursive
235am__recursive_targets = \ 238am__recursive_targets = \
236 $(RECURSIVE_TARGETS) \ 239 $(RECURSIVE_TARGETS) \
237 $(RECURSIVE_CLEAN_TARGETS) \ 240 $(RECURSIVE_CLEAN_TARGETS) \
238 $(am__extra_recursive_targets) 241 $(am__extra_recursive_targets)
239AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ 242AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
240 cscope distdir dist dist-all distcheck 243 cscope distdir dist dist-all distcheck
241am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ 244am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
242 $(LISP)config.h.in 245 $(LISP)config.h.in
243# Read a list of newline-separated strings from the standard input, 246# Read a list of newline-separated strings from the standard input,
244# and print each of them once, without duplicates. Input order is 247# and print each of them once, without duplicates. Input order is
@@ -250,27 +253,27 @@ am__uniquify_input = $(AWK) '\ @@ -250,27 +253,27 @@ am__uniquify_input = $(AWK) '\
250' 253'
251# Make sure the list of sources is unique. This is necessary because, 254# Make sure the list of sources is unique. This is necessary because,
252# e.g., the same source file might be shared among _SOURCES variables 255# e.g., the same source file might be shared among _SOURCES variables
253# for different programs/libraries. 256# for different programs/libraries.
254am__define_uniq_tagged_files = \ 257am__define_uniq_tagged_files = \
255 list='$(am__tagged_files)'; \ 258 list='$(am__tagged_files)'; \
256 unique=`for i in $$list; do \ 259 unique=`for i in $$list; do \
257 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 260 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
258 done | $(am__uniquify_input)` 261 done | $(am__uniquify_input)`
259ETAGS = etags 262ETAGS = etags
260CTAGS = ctags 263CTAGS = ctags
261CSCOPE = cscope 264CSCOPE = cscope
262DIST_SUBDIRS = . libkms intel nouveau radeon omap exynos freedreno \ 265DIST_SUBDIRS = . libkms intel nouveau radeon omap exynos freedreno \
263 tests man 266 tegra tests man
264DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 267DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
265distdir = $(PACKAGE)-$(VERSION) 268distdir = $(PACKAGE)-$(VERSION)
266top_distdir = $(distdir) 269top_distdir = $(distdir)
267am__remove_distdir = \ 270am__remove_distdir = \
268 if test -d "$(distdir)"; then \ 271 if test -d "$(distdir)"; then \
269 find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ 272 find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
270 && rm -rf "$(distdir)" \ 273 && rm -rf "$(distdir)" \
271 || { sleep 5 && rm -rf "$(distdir)"; }; \ 274 || { sleep 5 && rm -rf "$(distdir)"; }; \
272 else :; fi 275 else :; fi
273am__post_remove_distdir = $(am__remove_distdir) 276am__post_remove_distdir = $(am__remove_distdir)
274am__relativize = \ 277am__relativize = \
275 dir0=`pwd`; \ 278 dir0=`pwd`; \
276 sed_first='s,^\([^/]*\)/.*$$,\1,'; \ 279 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -457,41 +460,43 @@ LIBDRM_INCLUDE_H_FILES := \ @@ -457,41 +460,43 @@ LIBDRM_INCLUDE_H_FILES := \
457 include/drm/drm.h \ 460 include/drm/drm.h \
458 include/drm/drm_fourcc.h \ 461 include/drm/drm_fourcc.h \
459 include/drm/drm_mode.h \ 462 include/drm/drm_mode.h \
460 include/drm/drm_sarea.h \ 463 include/drm/drm_sarea.h \
461 include/drm/i915_drm.h \ 464 include/drm/i915_drm.h \
462 include/drm/mach64_drm.h \ 465 include/drm/mach64_drm.h \
463 include/drm/mga_drm.h \ 466 include/drm/mga_drm.h \
464 include/drm/nouveau_drm.h \ 467 include/drm/nouveau_drm.h \
465 include/drm/qxl_drm.h \ 468 include/drm/qxl_drm.h \
466 include/drm/r128_drm.h \ 469 include/drm/r128_drm.h \
467 include/drm/radeon_drm.h \ 470 include/drm/radeon_drm.h \
468 include/drm/savage_drm.h \ 471 include/drm/savage_drm.h \
469 include/drm/sis_drm.h \ 472 include/drm/sis_drm.h \
 473 include/drm/tegra_drm.h \
470 include/drm/via_drm.h 474 include/drm/via_drm.h
471 475
472LIBDRM_INCLUDE_VMWGFX_H_FILES := \ 476LIBDRM_INCLUDE_VMWGFX_H_FILES := \
473 include/drm/vmwgfx_drm.h 477 include/drm/vmwgfx_drm.h
474 478
475ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} 479ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
476pkgconfig_DATA = libdrm.pc 480pkgconfig_DATA = libdrm.pc
477@HAVE_LIBKMS_TRUE@LIBKMS_SUBDIR = libkms 481@HAVE_LIBKMS_TRUE@LIBKMS_SUBDIR = libkms
478@HAVE_INTEL_TRUE@INTEL_SUBDIR = intel 482@HAVE_INTEL_TRUE@INTEL_SUBDIR = intel
479@HAVE_NOUVEAU_TRUE@NOUVEAU_SUBDIR = nouveau 483@HAVE_NOUVEAU_TRUE@NOUVEAU_SUBDIR = nouveau
480@HAVE_RADEON_TRUE@RADEON_SUBDIR = radeon 484@HAVE_RADEON_TRUE@RADEON_SUBDIR = radeon
481@HAVE_OMAP_TRUE@OMAP_SUBDIR = omap 485@HAVE_OMAP_TRUE@OMAP_SUBDIR = omap
482@HAVE_EXYNOS_TRUE@EXYNOS_SUBDIR = exynos 486@HAVE_EXYNOS_TRUE@EXYNOS_SUBDIR = exynos
483@HAVE_FREEDRENO_TRUE@FREEDRENO_SUBDIR = freedreno 487@HAVE_FREEDRENO_TRUE@FREEDRENO_SUBDIR = freedreno
484SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(FREEDRENO_SUBDIR) tests man 488@HAVE_TEGRA_TRUE@TEGRA_SUBDIR = tegra
 489SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(FREEDRENO_SUBDIR) $(TEGRA_SUBDIR) tests man
485libdrm_la_LTLIBRARIES = libdrm.la 490libdrm_la_LTLIBRARIES = libdrm.la
486libdrm_ladir = $(libdir) 491libdrm_ladir = $(libdir)
487libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined 492libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
488libdrm_la_LIBADD = @CLOCK_LIB@ 493libdrm_la_LIBADD = @CLOCK_LIB@
489libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm 494libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
490AM_CFLAGS = \ 495AM_CFLAGS = \
491 $(VALGRIND_CFLAGS) 496 $(VALGRIND_CFLAGS)
492 497
493libdrm_la_SOURCES = $(LIBDRM_FILES) 498libdrm_la_SOURCES = $(LIBDRM_FILES)
494libdrmincludedir = ${includedir} 499libdrmincludedir = ${includedir}
495libdrminclude_HEADERS = $(LIBDRM_H_FILES) 500libdrminclude_HEADERS = $(LIBDRM_H_FILES)
496EXTRA_DIST = Android.mk 501EXTRA_DIST = Android.mk
497klibdrmincludedir = ${includedir}/libdrm 502klibdrmincludedir = ${includedir}/libdrm
@@ -528,28 +533,28 @@ Makefile: $(srcdir)/Makefile.in $(top_bu @@ -528,28 +533,28 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
528 esac; 533 esac;
529$(srcdir)/Makefile.sources: 534$(srcdir)/Makefile.sources:
530 535
531$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) 536$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
532 $(SHELL) ./config.status --recheck 537 $(SHELL) ./config.status --recheck
533 538
534$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 539$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
535 $(am__cd) $(srcdir) && $(AUTOCONF) 540 $(am__cd) $(srcdir) && $(AUTOCONF)
536$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) 541$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
537 $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) 542 $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
538$(am__aclocal_m4_deps): 543$(am__aclocal_m4_deps):
539 544
540config.h: stamp-h1 545config.h: stamp-h1
541 @if test ! -f $@; then rm -f stamp-h1; else :; fi 546 @test -f $@ || rm -f stamp-h1
542 @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi 547 @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
543 548
544stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status 549stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
545 @rm -f stamp-h1 550 @rm -f stamp-h1
546 cd $(top_builddir) && $(SHELL) ./config.status config.h 551 cd $(top_builddir) && $(SHELL) ./config.status config.h
547$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)  552$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
548 ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) 553 ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
549 rm -f stamp-h1 554 rm -f stamp-h1
550 touch $@ 555 touch $@
551 556
552distclean-hdr: 557distclean-hdr:
553 -rm -f config.h stamp-h1 558 -rm -f config.h stamp-h1
554libdrm.pc: $(top_builddir)/config.status $(srcdir)/libdrm.pc.in 559libdrm.pc: $(top_builddir)/config.status $(srcdir)/libdrm.pc.in
555 cd $(top_builddir) && $(SHELL) ./config.status $@ 560 cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -599,34 +604,34 @@ distclean-compile: @@ -599,34 +604,34 @@ distclean-compile:
599 -rm -f *.tab.c 604 -rm -f *.tab.c
600 605
601@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrm_la-xf86drm.Plo@am__quote@ 606@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrm_la-xf86drm.Plo@am__quote@
602@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrm_la-xf86drmHash.Plo@am__quote@ 607@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrm_la-xf86drmHash.Plo@am__quote@
603@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrm_la-xf86drmMode.Plo@am__quote@ 608@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrm_la-xf86drmMode.Plo@am__quote@
604@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrm_la-xf86drmRandom.Plo@am__quote@ 609@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrm_la-xf86drmRandom.Plo@am__quote@
605@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrm_la-xf86drmSL.Plo@am__quote@ 610@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrm_la-xf86drmSL.Plo@am__quote@
606 611
607.c.o: 612.c.o:
608@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 613@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
609@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 614@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
610@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 615@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
611@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 616@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
612@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 617@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
613 618
614.c.obj: 619.c.obj:
615@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 620@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
616@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 621@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
617@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 622@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
618@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 623@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
619@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 624@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
620 625
621.c.lo: 626.c.lo:
622@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 627@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
623@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 628@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
624@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 629@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
625@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 630@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
626@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 631@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
627 632
628libdrm_la-xf86drm.lo: xf86drm.c 633libdrm_la-xf86drm.lo: xf86drm.c
629@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdrm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdrm_la-xf86drm.lo -MD -MP -MF $(DEPDIR)/libdrm_la-xf86drm.Tpo -c -o libdrm_la-xf86drm.lo `test -f 'xf86drm.c' || echo '$(srcdir)/'`xf86drm.c 634@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdrm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libdrm_la-xf86drm.lo -MD -MP -MF $(DEPDIR)/libdrm_la-xf86drm.Tpo -c -o libdrm_la-xf86drm.lo `test -f 'xf86drm.c' || echo '$(srcdir)/'`xf86drm.c
630@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdrm_la-xf86drm.Tpo $(DEPDIR)/libdrm_la-xf86drm.Plo 635@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdrm_la-xf86drm.Tpo $(DEPDIR)/libdrm_la-xf86drm.Plo
631@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xf86drm.c' object='libdrm_la-xf86drm.lo' libtool=yes @AMDEPBACKSLASH@ 636@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xf86drm.c' object='libdrm_la-xf86drm.lo' libtool=yes @AMDEPBACKSLASH@
632@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 637@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -908,30 +913,36 @@ dist-gzip: distdir @@ -908,30 +913,36 @@ dist-gzip: distdir
908dist-bzip2: distdir 913dist-bzip2: distdir
909 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 914 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
910 $(am__post_remove_distdir) 915 $(am__post_remove_distdir)
911 916
912dist-lzip: distdir 917dist-lzip: distdir
913 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz 918 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
914 $(am__post_remove_distdir) 919 $(am__post_remove_distdir)
915 920
916dist-xz: distdir 921dist-xz: distdir
917 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz 922 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
918 $(am__post_remove_distdir) 923 $(am__post_remove_distdir)
919 924
920dist-tarZ: distdir 925dist-tarZ: distdir
 926 @echo WARNING: "Support for shar distribution archives is" \
 927 "deprecated." >&2
 928 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
921 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z 929 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
922 $(am__post_remove_distdir) 930 $(am__post_remove_distdir)
923 931
924dist-shar: distdir 932dist-shar: distdir
 933 @echo WARNING: "Support for distribution archives compressed with" \
 934 "legacy program 'compress' is deprecated." >&2
 935 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
925 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz 936 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
926 $(am__post_remove_distdir) 937 $(am__post_remove_distdir)
927 938
928dist-zip: distdir 939dist-zip: distdir
929 -rm -f $(distdir).zip 940 -rm -f $(distdir).zip
930 zip -rq $(distdir).zip $(distdir) 941 zip -rq $(distdir).zip $(distdir)
931 $(am__post_remove_distdir) 942 $(am__post_remove_distdir)
932 943
933dist dist-all: 944dist dist-all:
934 $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' 945 $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
935 $(am__post_remove_distdir) 946 $(am__post_remove_distdir)
936 947
937# This target untars the dist file and tries a VPATH configuration. Then 948# This target untars the dist file and tries a VPATH configuration. Then
@@ -953,29 +964,30 @@ distcheck: dist @@ -953,29 +964,30 @@ distcheck: dist
953 GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ 964 GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
954 *.zip*) \ 965 *.zip*) \
955 unzip $(distdir).zip ;;\ 966 unzip $(distdir).zip ;;\
956 esac 967 esac
957 chmod -R a-w $(distdir) 968 chmod -R a-w $(distdir)
958 chmod u+w $(distdir) 969 chmod u+w $(distdir)
959 mkdir $(distdir)/_build $(distdir)/_inst 970 mkdir $(distdir)/_build $(distdir)/_inst
960 chmod a-w $(distdir) 971 chmod a-w $(distdir)
961 test -d $(distdir)/_build || exit 0; \ 972 test -d $(distdir)/_build || exit 0; \
962 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ 973 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
963 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ 974 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
964 && am__cwd=`pwd` \ 975 && am__cwd=`pwd` \
965 && $(am__cd) $(distdir)/_build \ 976 && $(am__cd) $(distdir)/_build \
966 && ../configure --srcdir=.. --prefix="$$dc_install_base" \ 977 && ../configure \
967 $(AM_DISTCHECK_CONFIGURE_FLAGS) \ 978 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
968 $(DISTCHECK_CONFIGURE_FLAGS) \ 979 $(DISTCHECK_CONFIGURE_FLAGS) \
 980 --srcdir=.. --prefix="$$dc_install_base" \
969 && $(MAKE) $(AM_MAKEFLAGS) \ 981 && $(MAKE) $(AM_MAKEFLAGS) \
970 && $(MAKE) $(AM_MAKEFLAGS) dvi \ 982 && $(MAKE) $(AM_MAKEFLAGS) dvi \
971 && $(MAKE) $(AM_MAKEFLAGS) check \ 983 && $(MAKE) $(AM_MAKEFLAGS) check \
972 && $(MAKE) $(AM_MAKEFLAGS) install \ 984 && $(MAKE) $(AM_MAKEFLAGS) install \
973 && $(MAKE) $(AM_MAKEFLAGS) installcheck \ 985 && $(MAKE) $(AM_MAKEFLAGS) installcheck \
974 && $(MAKE) $(AM_MAKEFLAGS) uninstall \ 986 && $(MAKE) $(AM_MAKEFLAGS) uninstall \
975 && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ 987 && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
976 distuninstallcheck \ 988 distuninstallcheck \
977 && chmod -R a-w "$$dc_install_base" \ 989 && chmod -R a-w "$$dc_install_base" \
978 && ({ \ 990 && ({ \
979 (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ 991 (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
980 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ 992 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
981 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ 993 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
cvs diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 xsrc/external/mit/libdrm/dist/Makefile.sources (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/Makefile.sources 2014/12/23 01:16:56 1.1.1.1.2.2
+++ xsrc/external/mit/libdrm/dist/Makefile.sources 2015/01/28 11:17:48 1.1.1.1.2.3
@@ -16,17 +16,18 @@ LIBDRM_INCLUDE_H_FILES := \ @@ -16,17 +16,18 @@ LIBDRM_INCLUDE_H_FILES := \
16 include/drm/drm.h \ 16 include/drm/drm.h \
17 include/drm/drm_fourcc.h \ 17 include/drm/drm_fourcc.h \
18 include/drm/drm_mode.h \ 18 include/drm/drm_mode.h \
19 include/drm/drm_sarea.h \ 19 include/drm/drm_sarea.h \
20 include/drm/i915_drm.h \ 20 include/drm/i915_drm.h \
21 include/drm/mach64_drm.h \ 21 include/drm/mach64_drm.h \
22 include/drm/mga_drm.h \ 22 include/drm/mga_drm.h \
23 include/drm/nouveau_drm.h \ 23 include/drm/nouveau_drm.h \
24 include/drm/qxl_drm.h \ 24 include/drm/qxl_drm.h \
25 include/drm/r128_drm.h \ 25 include/drm/r128_drm.h \
26 include/drm/radeon_drm.h \ 26 include/drm/radeon_drm.h \
27 include/drm/savage_drm.h \ 27 include/drm/savage_drm.h \
28 include/drm/sis_drm.h \ 28 include/drm/sis_drm.h \
 29 include/drm/tegra_drm.h \
29 include/drm/via_drm.h 30 include/drm/via_drm.h
30 31
31LIBDRM_INCLUDE_VMWGFX_H_FILES := \ 32LIBDRM_INCLUDE_VMWGFX_H_FILES := \
32 include/drm/vmwgfx_drm.h 33 include/drm/vmwgfx_drm.h
cvs diff -r1.1.1.8.2.1 -r1.1.1.8.2.2 xsrc/external/mit/libdrm/dist/Attic/aclocal.m4 (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/Attic/aclocal.m4 2014/12/23 01:16:56 1.1.1.8.2.1
+++ xsrc/external/mit/libdrm/dist/Attic/aclocal.m4 2015/01/28 11:17:48 1.1.1.8.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# generated automatically by aclocal 1.13.4 -*- Autoconf -*- 1# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
2 2
3# Copyright (C) 1996-2013 Free Software Foundation, Inc. 3# Copyright (C) 1996-2013 Free Software Foundation, Inc.
4 4
5# This file is free software; the Free Software Foundation 5# This file is free software; the Free Software Foundation
6# gives unlimited permission to copy and/or distribute it, 6# gives unlimited permission to copy and/or distribute it,
7# with or without modifications, as long as this notice is preserved. 7# with or without modifications, as long as this notice is preserved.
8 8
9# This program is distributed in the hope that it will be useful, 9# This program is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 10# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
11# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 11# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12# PARTICULAR PURPOSE. 12# PARTICULAR PURPOSE.
13 13
14m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) 14m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
@@ -170,113 +170,58 @@ path to pkg-config. @@ -170,113 +170,58 @@ path to pkg-config.
170 170
171_PKG_TEXT 171_PKG_TEXT
172 172
173To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl 173To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
174 ]) 174 ])
175else 175else
176 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS 176 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
177 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS 177 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
178 AC_MSG_RESULT([yes]) 178 AC_MSG_RESULT([yes])
179 $3 179 $3
180fi[]dnl 180fi[]dnl
181])# PKG_CHECK_MODULES 181])# PKG_CHECK_MODULES
182 182
183 
184# PKG_INSTALLDIR(DIRECTORY) 
185# ------------------------- 
186# Substitutes the variable pkgconfigdir as the location where a module 
187# should install pkg-config .pc files. By default the directory is 
188# $libdir/pkgconfig, but the default can be changed by passing 
189# DIRECTORY. The user can override through the --with-pkgconfigdir 
190# parameter. 
191AC_DEFUN([PKG_INSTALLDIR], 
192[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) 
193m4_pushdef([pkg_description], 
194 [pkg-config installation directory @<:@]pkg_default[@:>@]) 
195AC_ARG_WITH([pkgconfigdir], 
196 [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, 
197 [with_pkgconfigdir=]pkg_default) 
198AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) 
199m4_popdef([pkg_default]) 
200m4_popdef([pkg_description]) 
201]) dnl PKG_INSTALLDIR 
202 
203 
204# PKG_NOARCH_INSTALLDIR(DIRECTORY) 
205# ------------------------- 
206# Substitutes the variable noarch_pkgconfigdir as the location where a 
207# module should install arch-independent pkg-config .pc files. By 
208# default the directory is $datadir/pkgconfig, but the default can be 
209# changed by passing DIRECTORY. The user can override through the 
210# --with-noarch-pkgconfigdir parameter. 
211AC_DEFUN([PKG_NOARCH_INSTALLDIR], 
212[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) 
213m4_pushdef([pkg_description], 
214 [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) 
215AC_ARG_WITH([noarch-pkgconfigdir], 
216 [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, 
217 [with_noarch_pkgconfigdir=]pkg_default) 
218AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) 
219m4_popdef([pkg_default]) 
220m4_popdef([pkg_description]) 
221]) dnl PKG_NOARCH_INSTALLDIR 
222 
223 
224# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, 
225# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 
226# ------------------------------------------- 
227# Retrieves the value of the pkg-config variable for the given module. 
228AC_DEFUN([PKG_CHECK_VAR], 
229[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 
230AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl 
231 
232_PKG_CONFIG([$1], [variable="][$3]["], [$2]) 
233AS_VAR_COPY([$1], [pkg_cv_][$1]) 
234 
235AS_VAR_IF([$1], [""], [$5], [$4])dnl 
236])# PKG_CHECK_VAR 
237 
238# Copyright (C) 2002-2013 Free Software Foundation, Inc. 183# Copyright (C) 2002-2013 Free Software Foundation, Inc.
239# 184#
240# This file is free software; the Free Software Foundation 185# This file is free software; the Free Software Foundation
241# gives unlimited permission to copy and/or distribute it, 186# gives unlimited permission to copy and/or distribute it,
242# with or without modifications, as long as this notice is preserved. 187# with or without modifications, as long as this notice is preserved.
243 188
244# AM_AUTOMAKE_VERSION(VERSION) 189# AM_AUTOMAKE_VERSION(VERSION)
245# ---------------------------- 190# ----------------------------
246# Automake X.Y traces this macro to ensure aclocal.m4 has been 191# Automake X.Y traces this macro to ensure aclocal.m4 has been
247# generated from the m4 files accompanying Automake X.Y. 192# generated from the m4 files accompanying Automake X.Y.
248# (This private macro should not be called outside this file.) 193# (This private macro should not be called outside this file.)
249AC_DEFUN([AM_AUTOMAKE_VERSION], 194AC_DEFUN([AM_AUTOMAKE_VERSION],
250[am__api_version='1.13' 195[am__api_version='1.14'
251dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 196dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
252dnl require some minimum version. Point them to the right macro. 197dnl require some minimum version. Point them to the right macro.
253m4_if([$1], [1.13.4], [], 198m4_if([$1], [1.14.1], [],
254 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 199 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
255]) 200])
256 201
257# _AM_AUTOCONF_VERSION(VERSION) 202# _AM_AUTOCONF_VERSION(VERSION)
258# ----------------------------- 203# -----------------------------
259# aclocal traces this macro to find the Autoconf version. 204# aclocal traces this macro to find the Autoconf version.
260# This is a private macro too. Using m4_define simplifies 205# This is a private macro too. Using m4_define simplifies
261# the logic in aclocal, which can simply ignore this definition. 206# the logic in aclocal, which can simply ignore this definition.
262m4_define([_AM_AUTOCONF_VERSION], []) 207m4_define([_AM_AUTOCONF_VERSION], [])
263 208
264# AM_SET_CURRENT_AUTOMAKE_VERSION 209# AM_SET_CURRENT_AUTOMAKE_VERSION
265# ------------------------------- 210# -------------------------------
266# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. 211# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
267# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. 212# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
268AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 213AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
269[AM_AUTOMAKE_VERSION([1.13.4])dnl 214[AM_AUTOMAKE_VERSION([1.14.1])dnl
270m4_ifndef([AC_AUTOCONF_VERSION], 215m4_ifndef([AC_AUTOCONF_VERSION],
271 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 216 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
272_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) 217_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
273 218
274# AM_AUX_DIR_EXPAND -*- Autoconf -*- 219# AM_AUX_DIR_EXPAND -*- Autoconf -*-
275 220
276# Copyright (C) 2001-2013 Free Software Foundation, Inc. 221# Copyright (C) 2001-2013 Free Software Foundation, Inc.
277# 222#
278# This file is free software; the Free Software Foundation 223# This file is free software; the Free Software Foundation
279# gives unlimited permission to copy and/or distribute it, 224# gives unlimited permission to copy and/or distribute it,
280# with or without modifications, as long as this notice is preserved. 225# with or without modifications, as long as this notice is preserved.
281 226
282# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets 227# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
@@ -623,26 +568,32 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS] @@ -623,26 +568,32 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
623]) 568])
624 569
625# Do all the work for Automake. -*- Autoconf -*- 570# Do all the work for Automake. -*- Autoconf -*-
626 571
627# Copyright (C) 1996-2013 Free Software Foundation, Inc. 572# Copyright (C) 1996-2013 Free Software Foundation, Inc.
628# 573#
629# This file is free software; the Free Software Foundation 574# This file is free software; the Free Software Foundation
630# gives unlimited permission to copy and/or distribute it, 575# gives unlimited permission to copy and/or distribute it,
631# with or without modifications, as long as this notice is preserved. 576# with or without modifications, as long as this notice is preserved.
632 577
633# This macro actually does too much. Some checks are only needed if 578# This macro actually does too much. Some checks are only needed if
634# your package does certain things. But this isn't really a big deal. 579# your package does certain things. But this isn't really a big deal.
635 580
 581dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
 582m4_define([AC_PROG_CC],
 583m4_defn([AC_PROG_CC])
 584[_AM_PROG_CC_C_O
 585])
 586
636# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) 587# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
637# AM_INIT_AUTOMAKE([OPTIONS]) 588# AM_INIT_AUTOMAKE([OPTIONS])
638# ----------------------------------------------- 589# -----------------------------------------------
639# The call with PACKAGE and VERSION arguments is the old style 590# The call with PACKAGE and VERSION arguments is the old style
640# call (pre autoconf-2.50), which is being phased out. PACKAGE 591# call (pre autoconf-2.50), which is being phased out. PACKAGE
641# and VERSION should now be passed to AC_INIT and removed from 592# and VERSION should now be passed to AC_INIT and removed from
642# the call to AM_INIT_AUTOMAKE. 593# the call to AM_INIT_AUTOMAKE.
643# We support both call styles for the transition. After 594# We support both call styles for the transition. After
644# the next Automake release, Autoconf can make the AC_INIT 595# the next Automake release, Autoconf can make the AC_INIT
645# arguments mandatory, and then we can depend on a new Autoconf 596# arguments mandatory, and then we can depend on a new Autoconf
646# release and drop the old call support. 597# release and drop the old call support.
647AC_DEFUN([AM_INIT_AUTOMAKE], 598AC_DEFUN([AM_INIT_AUTOMAKE],
648[AC_PREREQ([2.65])dnl 599[AC_PREREQ([2.65])dnl
@@ -731,35 +682,75 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], @@ -731,35 +682,75 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
731 m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl 682 m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
732AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], 683AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
733 [_AM_DEPENDENCIES([OBJCXX])], 684 [_AM_DEPENDENCIES([OBJCXX])],
734 [m4_define([AC_PROG_OBJCXX], 685 [m4_define([AC_PROG_OBJCXX],
735 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl 686 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
736]) 687])
737AC_REQUIRE([AM_SILENT_RULES])dnl 688AC_REQUIRE([AM_SILENT_RULES])dnl
738dnl The testsuite driver may need to know about EXEEXT, so add the 689dnl The testsuite driver may need to know about EXEEXT, so add the
739dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This 690dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
740dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. 691dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
741AC_CONFIG_COMMANDS_PRE(dnl 692AC_CONFIG_COMMANDS_PRE(dnl
742[m4_provide_if([_AM_COMPILER_EXEEXT], 693[m4_provide_if([_AM_COMPILER_EXEEXT],
743 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl 694 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
744]) 695
 696# POSIX will say in a future version that running "rm -f" with no argument
 697# is OK; and we want to be able to make that assumption in our Makefile
 698# recipes. So use an aggressive probe to check that the usage we want is
 699# actually supported "in the wild" to an acceptable degree.
 700# See automake bug#10828.
 701# To make any issue more visible, cause the running configure to be aborted
 702# by default if the 'rm' program in use doesn't match our expectations; the
 703# user can still override this though.
 704if rm -f && rm -fr && rm -rf; then : OK; else
 705 cat >&2 <<'END'
 706Oops!
 707
 708Your 'rm' program seems unable to run without file operands specified
 709on the command line, even when the '-f' option is present. This is contrary
 710to the behaviour of most rm programs out there, and not conforming with
 711the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 712
 713Please tell bug-automake@gnu.org about your system, including the value
 714of your $PATH and any error possibly output before this message. This
 715can help us improve future automake versions.
 716
 717END
 718 if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
 719 echo 'Configuration will proceed anyway, since you have set the' >&2
 720 echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
 721 echo >&2
 722 else
 723 cat >&2 <<'END'
 724Aborting the configuration process, to ensure you take notice of the issue.
 725
 726You can download and install GNU coreutils to get an 'rm' implementation
 727that behaves properly: <http://www.gnu.org/software/coreutils/>.
 728
 729If you want to complete the configuration process using your problematic
 730'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
 731to "yes", and re-run configure.
 732
 733END
 734 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
 735 fi
 736fi])
745 737
746dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not 738dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
747dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further 739dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
748dnl mangled by Autoconf and run in a shell conditional statement. 740dnl mangled by Autoconf and run in a shell conditional statement.
749m4_define([_AC_COMPILER_EXEEXT], 741m4_define([_AC_COMPILER_EXEEXT],
750m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) 742m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
751 743
752 
753# When config.status generates a header, we must update the stamp-h file. 744# When config.status generates a header, we must update the stamp-h file.
754# This file resides in the same directory as the config header 745# This file resides in the same directory as the config header
755# that is generated. The stamp files are numbered to have different names. 746# that is generated. The stamp files are numbered to have different names.
756 747
757# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the 748# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
758# loop where config.status creates the headers, so we can generate 749# loop where config.status creates the headers, so we can generate
759# our stamp files there. 750# our stamp files there.
760AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], 751AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
761[# Compute $1's index in $config_headers. 752[# Compute $1's index in $config_headers.
762_am_arg=$1 753_am_arg=$1
763_am_stamp_count=1 754_am_stamp_count=1
764for _am_header in $config_headers :; do 755for _am_header in $config_headers :; do
765 case $_am_header in 756 case $_am_header in
@@ -957,26 +948,90 @@ AC_DEFUN([_AM_SET_OPTION], @@ -957,26 +948,90 @@ AC_DEFUN([_AM_SET_OPTION],
957 948
958# _AM_SET_OPTIONS(OPTIONS) 949# _AM_SET_OPTIONS(OPTIONS)
959# ------------------------ 950# ------------------------
960# OPTIONS is a space-separated list of Automake options. 951# OPTIONS is a space-separated list of Automake options.
961AC_DEFUN([_AM_SET_OPTIONS], 952AC_DEFUN([_AM_SET_OPTIONS],
962[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) 953[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
963 954
964# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) 955# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
965# ------------------------------------------- 956# -------------------------------------------
966# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. 957# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
967AC_DEFUN([_AM_IF_OPTION], 958AC_DEFUN([_AM_IF_OPTION],
968[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) 959[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
969 960
 961# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 962#
 963# This file is free software; the Free Software Foundation
 964# gives unlimited permission to copy and/or distribute it,
 965# with or without modifications, as long as this notice is preserved.
 966
 967# _AM_PROG_CC_C_O
 968# ---------------
 969# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
 970# to automatically call this.
 971AC_DEFUN([_AM_PROG_CC_C_O],
 972[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 973AC_REQUIRE_AUX_FILE([compile])dnl
 974AC_LANG_PUSH([C])dnl
 975AC_CACHE_CHECK(
 976 [whether $CC understands -c and -o together],
 977 [am_cv_prog_cc_c_o],
 978 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
 979 # Make sure it works both with $CC and with simple cc.
 980 # Following AC_PROG_CC_C_O, we do the test twice because some
 981 # compilers refuse to overwrite an existing .o file with -o,
 982 # though they will create one.
 983 am_cv_prog_cc_c_o=yes
 984 for am_i in 1 2; do
 985 if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
 986 && test -f conftest2.$ac_objext; then
 987 : OK
 988 else
 989 am_cv_prog_cc_c_o=no
 990 break
 991 fi
 992 done
 993 rm -f core conftest*
 994 unset am_i])
 995if test "$am_cv_prog_cc_c_o" != yes; then
 996 # Losing compiler, so override with the script.
 997 # FIXME: It is wrong to rewrite CC.
 998 # But if we don't then we get into trouble of one sort or another.
 999 # A longer-term fix would be to have automake use am__CC in this case,
 1000 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
 1001 CC="$am_aux_dir/compile $CC"
 1002fi
 1003AC_LANG_POP([C])])
 1004
 1005# For backward compatibility.
 1006AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 1007
 1008# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 1009#
 1010# This file is free software; the Free Software Foundation
 1011# gives unlimited permission to copy and/or distribute it,
 1012# with or without modifications, as long as this notice is preserved.
 1013
 1014# AM_RUN_LOG(COMMAND)
 1015# -------------------
 1016# Run COMMAND, save the exit status in ac_status, and log it.
 1017# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
 1018AC_DEFUN([AM_RUN_LOG],
 1019[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
 1020 ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
 1021 ac_status=$?
 1022 echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 1023 (exit $ac_status); }])
 1024
970# Check to make sure that the build environment is sane. -*- Autoconf -*- 1025# Check to make sure that the build environment is sane. -*- Autoconf -*-
971 1026
972# Copyright (C) 1996-2013 Free Software Foundation, Inc. 1027# Copyright (C) 1996-2013 Free Software Foundation, Inc.
973# 1028#
974# This file is free software; the Free Software Foundation 1029# This file is free software; the Free Software Foundation
975# gives unlimited permission to copy and/or distribute it, 1030# gives unlimited permission to copy and/or distribute it,
976# with or without modifications, as long as this notice is preserved. 1031# with or without modifications, as long as this notice is preserved.
977 1032
978# AM_SANITY_CHECK 1033# AM_SANITY_CHECK
979# --------------- 1034# ---------------
980AC_DEFUN([AM_SANITY_CHECK], 1035AC_DEFUN([AM_SANITY_CHECK],
981[AC_MSG_CHECKING([whether build environment is sane]) 1036[AC_MSG_CHECKING([whether build environment is sane])
982# Reject unsafe characters in $srcdir or the absolute working directory 1037# Reject unsafe characters in $srcdir or the absolute working directory
cvs diff -r1.1.1.8.2.1 -r1.1.1.8.2.2 xsrc/external/mit/libdrm/dist/configure (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/configure 2014/12/23 01:16:56 1.1.1.8.2.1
+++ xsrc/external/mit/libdrm/dist/configure 2015/01/28 11:17:48 1.1.1.8.2.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles. 2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.69 for libdrm 2.4.58. 3# Generated by GNU Autoconf 2.69 for libdrm 2.4.59.
4# 4#
5# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=DRI>. 5# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=DRI>.
6# 6#
7# 7#
8# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. 8# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
9# 9#
10# 10#
11# This configure script is free software; the Free Software Foundation 11# This configure script is free software; the Free Software Foundation
12# gives unlimited permission to copy, distribute and modify it. 12# gives unlimited permission to copy, distribute and modify it.
13## -------------------- ## 13## -------------------- ##
14## M4sh Initialization. ## 14## M4sh Initialization. ##
15## -------------------- ## 15## -------------------- ##
16 16
@@ -581,28 +581,28 @@ ac_hostname=`(hostname || uname -n) 2>/d @@ -581,28 +581,28 @@ ac_hostname=`(hostname || uname -n) 2>/d
581# 581#
582ac_default_prefix=/usr/local 582ac_default_prefix=/usr/local
583ac_clean_files= 583ac_clean_files=
584ac_config_libobj_dir=. 584ac_config_libobj_dir=.
585LIBOBJS= 585LIBOBJS=
586cross_compiling=no 586cross_compiling=no
587subdirs= 587subdirs=
588MFLAGS= 588MFLAGS=
589MAKEFLAGS= 589MAKEFLAGS=
590 590
591# Identity of this package. 591# Identity of this package.
592PACKAGE_NAME='libdrm' 592PACKAGE_NAME='libdrm'
593PACKAGE_TARNAME='libdrm' 593PACKAGE_TARNAME='libdrm'
594PACKAGE_VERSION='2.4.58' 594PACKAGE_VERSION='2.4.59'
595PACKAGE_STRING='libdrm 2.4.58' 595PACKAGE_STRING='libdrm 2.4.59'
596PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=DRI' 596PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=DRI'
597PACKAGE_URL='' 597PACKAGE_URL=''
598 598
599ac_unique_file="Makefile.am" 599ac_unique_file="Makefile.am"
600# Factoring default headers for most tests. 600# Factoring default headers for most tests.
601ac_includes_default="\ 601ac_includes_default="\
602#include <stdio.h> 602#include <stdio.h>
603#ifdef HAVE_SYS_TYPES_H 603#ifdef HAVE_SYS_TYPES_H
604# include <sys/types.h> 604# include <sys/types.h>
605#endif 605#endif
606#ifdef HAVE_SYS_STAT_H 606#ifdef HAVE_SYS_STAT_H
607# include <sys/stat.h> 607# include <sys/stat.h>
608#endif 608#endif
@@ -648,28 +648,32 @@ MANPAGES_STYLESHEET @@ -648,28 +648,32 @@ MANPAGES_STYLESHEET
648BUILD_MANPAGES_FALSE 648BUILD_MANPAGES_FALSE
649BUILD_MANPAGES_TRUE 649BUILD_MANPAGES_TRUE
650XSLTPROC 650XSLTPROC
651HAVE_LIBUDEV_FALSE 651HAVE_LIBUDEV_FALSE
652HAVE_LIBUDEV_TRUE 652HAVE_LIBUDEV_TRUE
653LIBUDEV_LIBS 653LIBUDEV_LIBS
654LIBUDEV_CFLAGS 654LIBUDEV_CFLAGS
655HAVE_CAIRO_FALSE 655HAVE_CAIRO_FALSE
656HAVE_CAIRO_TRUE 656HAVE_CAIRO_TRUE
657CAIRO_LIBS 657CAIRO_LIBS
658CAIRO_CFLAGS 658CAIRO_CFLAGS
659HAVE_INSTALL_TESTS_FALSE 659HAVE_INSTALL_TESTS_FALSE
660HAVE_INSTALL_TESTS_TRUE 660HAVE_INSTALL_TESTS_TRUE
 661HAVE_TEGRA_FALSE
 662HAVE_TEGRA_TRUE
661HAVE_RADEON_FALSE 663HAVE_RADEON_FALSE
662HAVE_RADEON_TRUE 664HAVE_RADEON_TRUE
 665HAVE_FREEDRENO_KGSL_FALSE
 666HAVE_FREEDRENO_KGSL_TRUE
663HAVE_FREEDRENO_FALSE 667HAVE_FREEDRENO_FALSE
664HAVE_FREEDRENO_TRUE 668HAVE_FREEDRENO_TRUE
665HAVE_EXYNOS_FALSE 669HAVE_EXYNOS_FALSE
666HAVE_EXYNOS_TRUE 670HAVE_EXYNOS_TRUE
667HAVE_OMAP_FALSE 671HAVE_OMAP_FALSE
668HAVE_OMAP_TRUE 672HAVE_OMAP_TRUE
669HAVE_NOUVEAU_FALSE 673HAVE_NOUVEAU_FALSE
670HAVE_NOUVEAU_TRUE 674HAVE_NOUVEAU_TRUE
671HAVE_VMWGFX_FALSE 675HAVE_VMWGFX_FALSE
672HAVE_VMWGFX_TRUE 676HAVE_VMWGFX_TRUE
673HAVE_INTEL_FALSE 677HAVE_INTEL_FALSE
674HAVE_INTEL_TRUE 678HAVE_INTEL_TRUE
675HAVE_LIBKMS_FALSE 679HAVE_LIBKMS_FALSE
@@ -811,27 +815,29 @@ enable_shared @@ -811,27 +815,29 @@ enable_shared
811with_pic 815with_pic
812enable_fast_install 816enable_fast_install
813with_gnu_ld 817with_gnu_ld
814with_sysroot 818with_sysroot
815enable_libtool_lock 819enable_libtool_lock
816enable_udev 820enable_udev
817enable_libkms 821enable_libkms
818enable_intel 822enable_intel
819enable_radeon 823enable_radeon
820enable_nouveau 824enable_nouveau
821enable_vmwgfx 825enable_vmwgfx
822enable_omap_experimental_api 826enable_omap_experimental_api
823enable_exynos_experimental_api 827enable_exynos_experimental_api
824enable_freedreno_experimental_api 828enable_freedreno
 829enable_freedreno_kgsl
 830enable_tegra_experimental_api
825enable_install_test_programs 831enable_install_test_programs
826enable_cairo_tests 832enable_cairo_tests
827enable_manpages 833enable_manpages
828with_kernel_source 834with_kernel_source
829' 835'
830 ac_precious_vars='build_alias 836 ac_precious_vars='build_alias
831host_alias 837host_alias
832target_alias 838target_alias
833CC 839CC
834CFLAGS 840CFLAGS
835LDFLAGS 841LDFLAGS
836LIBS 842LIBS
837CPPFLAGS 843CPPFLAGS
@@ -1379,27 +1385,27 @@ for ac_var in $ac_precious_vars; do @@ -1379,27 +1385,27 @@ for ac_var in $ac_precious_vars; do
1379 eval ac_env_${ac_var}_set=\${${ac_var}+set} 1385 eval ac_env_${ac_var}_set=\${${ac_var}+set}
1380 eval ac_env_${ac_var}_value=\$${ac_var} 1386 eval ac_env_${ac_var}_value=\$${ac_var}
1381 eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} 1387 eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
1382 eval ac_cv_env_${ac_var}_value=\$${ac_var} 1388 eval ac_cv_env_${ac_var}_value=\$${ac_var}
1383done 1389done
1384 1390
1385# 1391#
1386# Report the --help message. 1392# Report the --help message.
1387# 1393#
1388if test "$ac_init_help" = "long"; then 1394if test "$ac_init_help" = "long"; then
1389 # Omit some internal or obsolete options to make the list less imposing. 1395 # Omit some internal or obsolete options to make the list less imposing.
1390 # This message is too long to be a string in the A/UX 3.1 sh. 1396 # This message is too long to be a string in the A/UX 3.1 sh.
1391 cat <<_ACEOF 1397 cat <<_ACEOF
1392\`configure' configures libdrm 2.4.58 to adapt to many kinds of systems. 1398\`configure' configures libdrm 2.4.59 to adapt to many kinds of systems.
1393 1399
1394Usage: $0 [OPTION]... [VAR=VALUE]... 1400Usage: $0 [OPTION]... [VAR=VALUE]...
1395 1401
1396To assign environment variables (e.g., CC, CFLAGS...), specify them as 1402To assign environment variables (e.g., CC, CFLAGS...), specify them as
1397VAR=VALUE. See below for descriptions of some of the useful variables. 1403VAR=VALUE. See below for descriptions of some of the useful variables.
1398 1404
1399Defaults for the options are specified in brackets. 1405Defaults for the options are specified in brackets.
1400 1406
1401Configuration: 1407Configuration:
1402 -h, --help display this help and exit 1408 -h, --help display this help and exit
1403 --help=short display options specific to this package 1409 --help=short display options specific to this package
1404 --help=recursive display the short help of all the included packages 1410 --help=recursive display the short help of all the included packages
1405 -V, --version display version information and exit 1411 -V, --version display version information and exit
@@ -1449,27 +1455,27 @@ _ACEOF @@ -1449,27 +1455,27 @@ _ACEOF
1449Program names: 1455Program names:
1450 --program-prefix=PREFIX prepend PREFIX to installed program names 1456 --program-prefix=PREFIX prepend PREFIX to installed program names
1451 --program-suffix=SUFFIX append SUFFIX to installed program names 1457 --program-suffix=SUFFIX append SUFFIX to installed program names
1452 --program-transform-name=PROGRAM run sed PROGRAM on installed program names 1458 --program-transform-name=PROGRAM run sed PROGRAM on installed program names
1453 1459
1454System types: 1460System types:
1455 --build=BUILD configure for building on BUILD [guessed] 1461 --build=BUILD configure for building on BUILD [guessed]
1456 --host=HOST cross-compile to build programs to run on HOST [BUILD] 1462 --host=HOST cross-compile to build programs to run on HOST [BUILD]
1457_ACEOF 1463_ACEOF
1458fi 1464fi
1459 1465
1460if test -n "$ac_init_help"; then 1466if test -n "$ac_init_help"; then
1461 case $ac_init_help in 1467 case $ac_init_help in
1462 short | recursive ) echo "Configuration of libdrm 2.4.58:";; 1468 short | recursive ) echo "Configuration of libdrm 2.4.59:";;
1463 esac 1469 esac
1464 cat <<\_ACEOF 1470 cat <<\_ACEOF
1465 1471
1466Optional Features: 1472Optional Features:
1467 --disable-option-checking ignore unrecognized --enable/--with options 1473 --disable-option-checking ignore unrecognized --enable/--with options
1468 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) 1474 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1469 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 1475 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1470 --enable-silent-rules less verbose build output (undo: "make V=1") 1476 --enable-silent-rules less verbose build output (undo: "make V=1")
1471 --disable-silent-rules verbose build output (undo: "make V=0") 1477 --disable-silent-rules verbose build output (undo: "make V=0")
1472 --disable-maintainer-mode 1478 --disable-maintainer-mode
1473 disable make rules and dependencies not useful (and 1479 disable make rules and dependencies not useful (and
1474 sometimes confusing) to the casual installer 1480 sometimes confusing) to the casual installer
1475 --enable-dependency-tracking 1481 --enable-dependency-tracking
@@ -1485,28 +1491,32 @@ Optional Features: @@ -1485,28 +1491,32 @@ Optional Features:
1485 --enable-udev Enable support for using udev instead of mknod 1491 --enable-udev Enable support for using udev instead of mknod
1486 (default: disabled) 1492 (default: disabled)
1487 --disable-libkms Disable KMS mm abstraction library (default: auto) 1493 --disable-libkms Disable KMS mm abstraction library (default: auto)
1488 --disable-intel Enable support for intel's KMS API (default: auto) 1494 --disable-intel Enable support for intel's KMS API (default: auto)
1489 --disable-radeon Enable support for radeon's KMS API (default: auto) 1495 --disable-radeon Enable support for radeon's KMS API (default: auto)
1490 --disable-nouveau Enable support for nouveau's KMS API (default: auto) 1496 --disable-nouveau Enable support for nouveau's KMS API (default: auto)
1491 --disable-vmwgfx Enable support for vmwgfx's KMS API (default: yes) 1497 --disable-vmwgfx Enable support for vmwgfx's KMS API (default: yes)
1492 --enable-omap-experimental-api 1498 --enable-omap-experimental-api
1493 Enable support for OMAP's experimental API (default: 1499 Enable support for OMAP's experimental API (default:
1494 disabled) 1500 disabled)
1495 --enable-exynos-experimental-api 1501 --enable-exynos-experimental-api
1496 Enable support for EXYNOS's experimental API 1502 Enable support for EXYNOS's experimental API
1497 (default: disabled) 1503 (default: disabled)
1498 --enable-freedreno-experimental-api 1504 --disable-freedreno Enable support for freedreno's KMS API (default:
1499 Enable support for freedreno's experimental API 1505 enabled on arm)
 1506 --enable-freedreno-kgsl Enable support for freedreno's to use downstream
 1507 android kernel API (default: disabled)
 1508 --enable-tegra-experimental-api
 1509 Enable support for Tegra's experimental API
1500 (default: disabled) 1510 (default: disabled)
1501 --enable-install-test-programs 1511 --enable-install-test-programs
1502 Install test programs (default: no) 1512 Install test programs (default: no)
1503 --enable-cairo-tests Enable support for Cairo rendering in tests 1513 --enable-cairo-tests Enable support for Cairo rendering in tests
1504 (default: auto) 1514 (default: auto)
1505 --disable-manpages disable manpages [default=enabled] 1515 --disable-manpages disable manpages [default=enabled]
1506 1516
1507Optional Packages: 1517Optional Packages:
1508 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 1518 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1509 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 1519 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1510 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use 1520 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
1511 both] 1521 both]
1512 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 1522 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -1604,27 +1614,27 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ @@ -1604,27 +1614,27 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
1604 elif test -f "$ac_srcdir/configure"; then 1614 elif test -f "$ac_srcdir/configure"; then
1605 echo && 1615 echo &&
1606 $SHELL "$ac_srcdir/configure" --help=recursive 1616 $SHELL "$ac_srcdir/configure" --help=recursive
1607 else 1617 else
1608 $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 1618 $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1609 fi || ac_status=$? 1619 fi || ac_status=$?
1610 cd "$ac_pwd" || { ac_status=$?; break; } 1620 cd "$ac_pwd" || { ac_status=$?; break; }
1611 done 1621 done
1612fi 1622fi
1613 1623
1614test -n "$ac_init_help" && exit $ac_status 1624test -n "$ac_init_help" && exit $ac_status
1615if $ac_init_version; then 1625if $ac_init_version; then
1616 cat <<\_ACEOF 1626 cat <<\_ACEOF
1617libdrm configure 2.4.58 1627libdrm configure 2.4.59
1618generated by GNU Autoconf 2.69 1628generated by GNU Autoconf 2.69
1619 1629
1620Copyright (C) 2012 Free Software Foundation, Inc. 1630Copyright (C) 2012 Free Software Foundation, Inc.
1621This configure script is free software; the Free Software Foundation 1631This configure script is free software; the Free Software Foundation
1622gives unlimited permission to copy, distribute and modify it. 1632gives unlimited permission to copy, distribute and modify it.
1623_ACEOF 1633_ACEOF
1624 exit 1634 exit
1625fi 1635fi
1626 1636
1627## ------------------------ ## 1637## ------------------------ ##
1628## Autoconf initialization. ## 1638## Autoconf initialization. ##
1629## ------------------------ ## 1639## ------------------------ ##
1630 1640
@@ -2027,27 +2037,27 @@ fi @@ -2027,27 +2037,27 @@ fi
2027rm -f core conftest.err conftest.$ac_objext \ 2037rm -f core conftest.err conftest.$ac_objext \
2028 conftest$ac_exeext conftest.$ac_ext 2038 conftest$ac_exeext conftest.$ac_ext
2029fi 2039fi
2030eval ac_res=\$$3 2040eval ac_res=\$$3
2031 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2041 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2032$as_echo "$ac_res" >&6; } 2042$as_echo "$ac_res" >&6; }
2033 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2043 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2034 2044
2035} # ac_fn_c_check_func 2045} # ac_fn_c_check_func
2036cat >config.log <<_ACEOF 2046cat >config.log <<_ACEOF
2037This file contains any messages produced by compilers while 2047This file contains any messages produced by compilers while
2038running configure, to aid debugging if configure makes a mistake. 2048running configure, to aid debugging if configure makes a mistake.
2039 2049
2040It was created by libdrm $as_me 2.4.58, which was 2050It was created by libdrm $as_me 2.4.59, which was
2041generated by GNU Autoconf 2.69. Invocation command line was 2051generated by GNU Autoconf 2.69. Invocation command line was
2042 2052
2043 $ $0 $@ 2053 $ $0 $@
2044 2054
2045_ACEOF 2055_ACEOF
2046exec 5>>config.log 2056exec 5>>config.log
2047{ 2057{
2048cat <<_ASUNAME 2058cat <<_ASUNAME
2049## --------- ## 2059## --------- ##
2050## Platform. ## 2060## Platform. ##
2051## --------- ## 2061## --------- ##
2052 2062
2053hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` 2063hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -2410,27 +2420,27 @@ if test -z "$ac_aux_dir"; then @@ -2410,27 +2420,27 @@ if test -z "$ac_aux_dir"; then
2410 as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5 2420 as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
2411fi 2421fi
2412 2422
2413# These three variables are undocumented and unsupported, 2423# These three variables are undocumented and unsupported,
2414# and are intended to be withdrawn in a future Autoconf release. 2424# and are intended to be withdrawn in a future Autoconf release.
2415# They can cause serious problems if a builder's source tree is in a directory 2425# They can cause serious problems if a builder's source tree is in a directory
2416# whose full name contains unusual characters. 2426# whose full name contains unusual characters.
2417ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. 2427ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
2418ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. 2428ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
2419ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. 2429ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
2420 2430
2421 2431
2422 2432
2423am__api_version='1.13' 2433am__api_version='1.14'
2424 2434
2425# Find a good install program. We prefer a C program (faster), 2435# Find a good install program. We prefer a C program (faster),
2426# so one script is as good as another. But avoid the broken or 2436# so one script is as good as another. But avoid the broken or
2427# incompatible versions: 2437# incompatible versions:
2428# SysV /etc/install, /usr/sbin/install 2438# SysV /etc/install, /usr/sbin/install
2429# SunOS /usr/etc/install 2439# SunOS /usr/etc/install
2430# IRIX /sbin/install 2440# IRIX /sbin/install
2431# AIX /bin/install 2441# AIX /bin/install
2432# AmigaOS /C/install, which installs bootblocks on floppy discs 2442# AmigaOS /C/install, which installs bootblocks on floppy discs
2433# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag 2443# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
2434# AFS /usr/afsws/bin/install, which mishandles nonexistent args 2444# AFS /usr/afsws/bin/install, which mishandles nonexistent args
2435# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" 2445# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
2436# OS/2's system install, which has a completely different semantic 2446# OS/2's system install, which has a completely different semantic
@@ -2896,27 +2906,27 @@ fi @@ -2896,27 +2906,27 @@ fi
2896 2906
2897# test whether we have cygpath 2907# test whether we have cygpath
2898if test -z "$CYGPATH_W"; then 2908if test -z "$CYGPATH_W"; then
2899 if (cygpath --version) >/dev/null 2>/dev/null; then 2909 if (cygpath --version) >/dev/null 2>/dev/null; then
2900 CYGPATH_W='cygpath -w' 2910 CYGPATH_W='cygpath -w'
2901 else 2911 else
2902 CYGPATH_W=echo 2912 CYGPATH_W=echo
2903 fi 2913 fi
2904fi 2914fi
2905 2915
2906 2916
2907# Define the identity of the package. 2917# Define the identity of the package.
2908 PACKAGE='libdrm' 2918 PACKAGE='libdrm'
2909 VERSION='2.4.58' 2919 VERSION='2.4.59'
2910 2920
2911 2921
2912cat >>confdefs.h <<_ACEOF 2922cat >>confdefs.h <<_ACEOF
2913#define PACKAGE "$PACKAGE" 2923#define PACKAGE "$PACKAGE"
2914_ACEOF 2924_ACEOF
2915 2925
2916 2926
2917cat >>confdefs.h <<_ACEOF 2927cat >>confdefs.h <<_ACEOF
2918#define VERSION "$VERSION" 2928#define VERSION "$VERSION"
2919_ACEOF 2929_ACEOF
2920 2930
2921# Some tools Automake needs. 2931# Some tools Automake needs.
2922 2932
@@ -2947,26 +2957,67 @@ mkdir_p='$(MKDIR_P)' @@ -2947,26 +2957,67 @@ mkdir_p='$(MKDIR_P)'
2947AMTAR='$${TAR-tar}' 2957AMTAR='$${TAR-tar}'
2948 2958
2949 2959
2950# We'll loop over all known methods to create a tar archive until one works. 2960# We'll loop over all known methods to create a tar archive until one works.
2951_am_tools='gnutar pax cpio none' 2961_am_tools='gnutar pax cpio none'
2952 2962
2953am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' 2963am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
2954 2964
2955 2965
2956 2966
2957 2967
2958 2968
2959 2969
 2970# POSIX will say in a future version that running "rm -f" with no argument
 2971# is OK; and we want to be able to make that assumption in our Makefile
 2972# recipes. So use an aggressive probe to check that the usage we want is
 2973# actually supported "in the wild" to an acceptable degree.
 2974# See automake bug#10828.
 2975# To make any issue more visible, cause the running configure to be aborted
 2976# by default if the 'rm' program in use doesn't match our expectations; the
 2977# user can still override this though.
 2978if rm -f && rm -fr && rm -rf; then : OK; else
 2979 cat >&2 <<'END'
 2980Oops!
 2981
 2982Your 'rm' program seems unable to run without file operands specified
 2983on the command line, even when the '-f' option is present. This is contrary
 2984to the behaviour of most rm programs out there, and not conforming with
 2985the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 2986
 2987Please tell bug-automake@gnu.org about your system, including the value
 2988of your $PATH and any error possibly output before this message. This
 2989can help us improve future automake versions.
 2990
 2991END
 2992 if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
 2993 echo 'Configuration will proceed anyway, since you have set the' >&2
 2994 echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
 2995 echo >&2
 2996 else
 2997 cat >&2 <<'END'
 2998Aborting the configuration process, to ensure you take notice of the issue.
 2999
 3000You can download and install GNU coreutils to get an 'rm' implementation
 3001that behaves properly: <http://www.gnu.org/software/coreutils/>.
 3002
 3003If you want to complete the configuration process using your problematic
 3004'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
 3005to "yes", and re-run configure.
 3006
 3007END
 3008 as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
 3009 fi
 3010fi
2960 3011
2961{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 3012{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
2962$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } 3013$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
2963 # Check whether --enable-maintainer-mode was given. 3014 # Check whether --enable-maintainer-mode was given.
2964if test "${enable_maintainer_mode+set}" = set; then : 3015if test "${enable_maintainer_mode+set}" = set; then :
2965 enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval 3016 enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
2966else 3017else
2967 USE_MAINTAINER_MODE=yes 3018 USE_MAINTAINER_MODE=yes
2968fi 3019fi
2969 3020
2970 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 3021 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
2971$as_echo "$USE_MAINTAINER_MODE" >&6; } 3022$as_echo "$USE_MAINTAINER_MODE" >&6; }
2972 if test $USE_MAINTAINER_MODE = yes; then 3023 if test $USE_MAINTAINER_MODE = yes; then
@@ -3801,26 +3852,85 @@ $as_echo "unsupported" >&6; } ;; @@ -3801,26 +3852,85 @@ $as_echo "unsupported" >&6; } ;;
3801 CC="$CC $ac_cv_prog_cc_c89" 3852 CC="$CC $ac_cv_prog_cc_c89"
3802 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 3853 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
3803$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; 3854$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
3804esac 3855esac
3805if test "x$ac_cv_prog_cc_c89" != xno; then : 3856if test "x$ac_cv_prog_cc_c89" != xno; then :
3806 3857
3807fi 3858fi
3808 3859
3809ac_ext=c 3860ac_ext=c
3810ac_cpp='$CPP $CPPFLAGS' 3861ac_cpp='$CPP $CPPFLAGS'
3811ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 3862ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3812ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 3863ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3813ac_compiler_gnu=$ac_cv_c_compiler_gnu 3864ac_compiler_gnu=$ac_cv_c_compiler_gnu
 3865
 3866ac_ext=c
 3867ac_cpp='$CPP $CPPFLAGS'
 3868ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 3869ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 3870ac_compiler_gnu=$ac_cv_c_compiler_gnu
 3871{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
 3872$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
 3873if ${am_cv_prog_cc_c_o+:} false; then :
 3874 $as_echo_n "(cached) " >&6
 3875else
 3876 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 3877/* end confdefs.h. */
 3878
 3879int
 3880main ()
 3881{
 3882
 3883 ;
 3884 return 0;
 3885}
 3886_ACEOF
 3887 # Make sure it works both with $CC and with simple cc.
 3888 # Following AC_PROG_CC_C_O, we do the test twice because some
 3889 # compilers refuse to overwrite an existing .o file with -o,
 3890 # though they will create one.
 3891 am_cv_prog_cc_c_o=yes
 3892 for am_i in 1 2; do
 3893 if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
 3894 ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
 3895 ac_status=$?
 3896 echo "$as_me:$LINENO: \$? = $ac_status" >&5
 3897 (exit $ac_status); } \
 3898 && test -f conftest2.$ac_objext; then
 3899 : OK
 3900 else
 3901 am_cv_prog_cc_c_o=no
 3902 break
 3903 fi
 3904 done
 3905 rm -f core conftest*
 3906 unset am_i
 3907fi
 3908{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
 3909$as_echo "$am_cv_prog_cc_c_o" >&6; }
 3910if test "$am_cv_prog_cc_c_o" != yes; then
 3911 # Losing compiler, so override with the script.
 3912 # FIXME: It is wrong to rewrite CC.
 3913 # But if we don't then we get into trouble of one sort or another.
 3914 # A longer-term fix would be to have automake use am__CC in this case,
 3915 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
 3916 CC="$am_aux_dir/compile $CC"
 3917fi
 3918ac_ext=c
 3919ac_cpp='$CPP $CPPFLAGS'
 3920ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 3921ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 3922ac_compiler_gnu=$ac_cv_c_compiler_gnu
 3923
3814DEPDIR="${am__leading_dot}deps" 3924DEPDIR="${am__leading_dot}deps"
3815 3925
3816ac_config_commands="$ac_config_commands depfiles" 3926ac_config_commands="$ac_config_commands depfiles"
3817 3927
3818 3928
3819am_make=${MAKE-make} 3929am_make=${MAKE-make}
3820cat > confinc << 'END' 3930cat > confinc << 'END'
3821am__doit: 3931am__doit:
3822 @echo this is the am__doit target 3932 @echo this is the am__doit target
3823.PHONY: am__doit 3933.PHONY: am__doit
3824END 3934END
3825# If we don't find an include directive, just comment out the code. 3935# If we don't find an include directive, just comment out the code.
3826{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 3936{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
@@ -4478,27 +4588,27 @@ else @@ -4478,27 +4588,27 @@ else
4478 ac_cv_sys_largefile_CC=no 4588 ac_cv_sys_largefile_CC=no
4479 if test "$GCC" != yes; then 4589 if test "$GCC" != yes; then
4480 ac_save_CC=$CC 4590 ac_save_CC=$CC
4481 while :; do 4591 while :; do
4482 # IRIX 6.2 and later do not support large files by default, 4592 # IRIX 6.2 and later do not support large files by default,
4483 # so use the C compiler's -n32 option if that helps. 4593 # so use the C compiler's -n32 option if that helps.
4484 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4594 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4485/* end confdefs.h. */ 4595/* end confdefs.h. */
4486#include <sys/types.h> 4596#include <sys/types.h>
4487 /* Check that off_t can represent 2**63 - 1 correctly. 4597 /* Check that off_t can represent 2**63 - 1 correctly.
4488 We can't simply define LARGE_OFF_T to be 9223372036854775807, 4598 We can't simply define LARGE_OFF_T to be 9223372036854775807,
4489 since some C++ compilers masquerading as C compilers 4599 since some C++ compilers masquerading as C compilers
4490 incorrectly reject 9223372036854775807. */ 4600 incorrectly reject 9223372036854775807. */
4491#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) 4601#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
4492 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 4602 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
4493 && LARGE_OFF_T % 2147483647 == 1) 4603 && LARGE_OFF_T % 2147483647 == 1)
4494 ? 1 : -1]; 4604 ? 1 : -1];
4495int 4605int
4496main () 4606main ()
4497{ 4607{
4498 4608
4499 ; 4609 ;
4500 return 0; 4610 return 0;
4501} 4611}
4502_ACEOF 4612_ACEOF
4503 if ac_fn_c_try_compile "$LINENO"; then : 4613 if ac_fn_c_try_compile "$LINENO"; then :
4504 break 4614 break
@@ -4524,51 +4634,51 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6;  @@ -4524,51 +4634,51 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6;
4524 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 4634 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
4525$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } 4635$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
4526if ${ac_cv_sys_file_offset_bits+:} false; then : 4636if ${ac_cv_sys_file_offset_bits+:} false; then :
4527 $as_echo_n "(cached) " >&6 4637 $as_echo_n "(cached) " >&6
4528else 4638else
4529 while :; do 4639 while :; do
4530 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4640 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4531/* end confdefs.h. */ 4641/* end confdefs.h. */
4532#include <sys/types.h> 4642#include <sys/types.h>
4533 /* Check that off_t can represent 2**63 - 1 correctly. 4643 /* Check that off_t can represent 2**63 - 1 correctly.
4534 We can't simply define LARGE_OFF_T to be 9223372036854775807, 4644 We can't simply define LARGE_OFF_T to be 9223372036854775807,
4535 since some C++ compilers masquerading as C compilers 4645 since some C++ compilers masquerading as C compilers
4536 incorrectly reject 9223372036854775807. */ 4646 incorrectly reject 9223372036854775807. */
4537#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) 4647#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
4538 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 4648 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
4539 && LARGE_OFF_T % 2147483647 == 1) 4649 && LARGE_OFF_T % 2147483647 == 1)
4540 ? 1 : -1]; 4650 ? 1 : -1];
4541int 4651int
4542main () 4652main ()
4543{ 4653{
4544 4654
4545 ; 4655 ;
4546 return 0; 4656 return 0;
4547} 4657}
4548_ACEOF 4658_ACEOF
4549if ac_fn_c_try_compile "$LINENO"; then : 4659if ac_fn_c_try_compile "$LINENO"; then :
4550 ac_cv_sys_file_offset_bits=no; break 4660 ac_cv_sys_file_offset_bits=no; break
4551fi 4661fi
4552rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4662rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4553 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4663 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4554/* end confdefs.h. */ 4664/* end confdefs.h. */
4555#define _FILE_OFFSET_BITS 64 4665#define _FILE_OFFSET_BITS 64
4556#include <sys/types.h> 4666#include <sys/types.h>
4557 /* Check that off_t can represent 2**63 - 1 correctly. 4667 /* Check that off_t can represent 2**63 - 1 correctly.
4558 We can't simply define LARGE_OFF_T to be 9223372036854775807, 4668 We can't simply define LARGE_OFF_T to be 9223372036854775807,
4559 since some C++ compilers masquerading as C compilers 4669 since some C++ compilers masquerading as C compilers
4560 incorrectly reject 9223372036854775807. */ 4670 incorrectly reject 9223372036854775807. */
4561#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) 4671#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
4562 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 4672 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
4563 && LARGE_OFF_T % 2147483647 == 1) 4673 && LARGE_OFF_T % 2147483647 == 1)
4564 ? 1 : -1]; 4674 ? 1 : -1];
4565int 4675int
4566main () 4676main ()
4567{ 4677{
4568 4678
4569 ; 4679 ;
4570 return 0; 4680 return 0;
4571} 4681}
4572_ACEOF 4682_ACEOF
4573if ac_fn_c_try_compile "$LINENO"; then : 4683if ac_fn_c_try_compile "$LINENO"; then :
4574 ac_cv_sys_file_offset_bits=64; break 4684 ac_cv_sys_file_offset_bits=64; break
@@ -4593,51 +4703,51 @@ rm -rf conftest* @@ -4593,51 +4703,51 @@ rm -rf conftest*
4593 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 4703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
4594$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } 4704$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
4595if ${ac_cv_sys_large_files+:} false; then : 4705if ${ac_cv_sys_large_files+:} false; then :
4596 $as_echo_n "(cached) " >&6 4706 $as_echo_n "(cached) " >&6
4597else 4707else
4598 while :; do 4708 while :; do
4599 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4709 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4600/* end confdefs.h. */ 4710/* end confdefs.h. */
4601#include <sys/types.h> 4711#include <sys/types.h>
4602 /* Check that off_t can represent 2**63 - 1 correctly. 4712 /* Check that off_t can represent 2**63 - 1 correctly.
4603 We can't simply define LARGE_OFF_T to be 9223372036854775807, 4713 We can't simply define LARGE_OFF_T to be 9223372036854775807,
4604 since some C++ compilers masquerading as C compilers 4714 since some C++ compilers masquerading as C compilers
4605 incorrectly reject 9223372036854775807. */ 4715 incorrectly reject 9223372036854775807. */
4606#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) 4716#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
4607 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 4717 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
4608 && LARGE_OFF_T % 2147483647 == 1) 4718 && LARGE_OFF_T % 2147483647 == 1)
4609 ? 1 : -1]; 4719 ? 1 : -1];
4610int 4720int
4611main () 4721main ()
4612{ 4722{
4613 4723
4614 ; 4724 ;
4615 return 0; 4725 return 0;
4616} 4726}
4617_ACEOF 4727_ACEOF
4618if ac_fn_c_try_compile "$LINENO"; then : 4728if ac_fn_c_try_compile "$LINENO"; then :
4619 ac_cv_sys_large_files=no; break 4729 ac_cv_sys_large_files=no; break
4620fi 4730fi
4621rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4731rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4622 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4732 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4623/* end confdefs.h. */ 4733/* end confdefs.h. */
4624#define _LARGE_FILES 1 4734#define _LARGE_FILES 1
4625#include <sys/types.h> 4735#include <sys/types.h>
4626 /* Check that off_t can represent 2**63 - 1 correctly. 4736 /* Check that off_t can represent 2**63 - 1 correctly.
4627 We can't simply define LARGE_OFF_T to be 9223372036854775807, 4737 We can't simply define LARGE_OFF_T to be 9223372036854775807,
4628 since some C++ compilers masquerading as C compilers 4738 since some C++ compilers masquerading as C compilers
4629 incorrectly reject 9223372036854775807. */ 4739 incorrectly reject 9223372036854775807. */
4630#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) 4740#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
4631 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 4741 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
4632 && LARGE_OFF_T % 2147483647 == 1) 4742 && LARGE_OFF_T % 2147483647 == 1)
4633 ? 1 : -1]; 4743 ? 1 : -1];
4634int 4744int
4635main () 4745main ()
4636{ 4746{
4637 4747
4638 ; 4748 ;
4639 return 0; 4749 return 0;
4640} 4750}
4641_ACEOF 4751_ACEOF
4642if ac_fn_c_try_compile "$LINENO"; then : 4752if ac_fn_c_try_compile "$LINENO"; then :
4643 ac_cv_sys_large_files=1; break 4753 ac_cv_sys_large_files=1; break
@@ -5608,27 +5718,28 @@ else @@ -5608,27 +5718,28 @@ else
5608 sco3.2v5*) 5718 sco3.2v5*)
5609 lt_cv_sys_max_cmd_len=102400 5719 lt_cv_sys_max_cmd_len=102400
5610 ;; 5720 ;;
5611 sysv5* | sco5v6* | sysv4.2uw2*) 5721 sysv5* | sco5v6* | sysv4.2uw2*)
5612 kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` 5722 kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
5613 if test -n "$kargmax"; then 5723 if test -n "$kargmax"; then
5614 lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` 5724 lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
5615 else 5725 else
5616 lt_cv_sys_max_cmd_len=32768 5726 lt_cv_sys_max_cmd_len=32768
5617 fi 5727 fi
5618 ;; 5728 ;;
5619 *) 5729 *)
5620 lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` 5730 lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
5621 if test -n "$lt_cv_sys_max_cmd_len"; then 5731 if test -n "$lt_cv_sys_max_cmd_len" && \
 5732 test undefined != "$lt_cv_sys_max_cmd_len"; then
5622 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` 5733 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
5623 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` 5734 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
5624 else 5735 else
5625 # Make teststring a little bigger before we do anything with it. 5736 # Make teststring a little bigger before we do anything with it.
5626 # a 1K string should be a reasonable start. 5737 # a 1K string should be a reasonable start.
5627 for i in 1 2 3 4 5 6 7 8 ; do 5738 for i in 1 2 3 4 5 6 7 8 ; do
5628 teststring=$teststring$teststring 5739 teststring=$teststring$teststring
5629 done 5740 done
5630 SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} 5741 SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
5631 # If test is not a shell built-in, we'll probably end up computing a 5742 # If test is not a shell built-in, we'll probably end up computing a
5632 # maximum length that is only half of the actual maximum length, but 5743 # maximum length that is only half of the actual maximum length, but
5633 # we can't tell. 5744 # we can't tell.
5634 while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ 5745 while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
@@ -6009,30 +6120,26 @@ freebsd* | dragonfly*) @@ -6009,30 +6120,26 @@ freebsd* | dragonfly*)
6009 i*86 ) 6120 i*86 )
6010 # Not sure whether the presence of OpenBSD here was a mistake. 6121 # Not sure whether the presence of OpenBSD here was a mistake.
6011 # Let's accept both of them until this is cleared up. 6122 # Let's accept both of them until this is cleared up.
6012 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' 6123 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
6013 lt_cv_file_magic_cmd=/usr/bin/file 6124 lt_cv_file_magic_cmd=/usr/bin/file
6014 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` 6125 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
6015 ;; 6126 ;;
6016 esac 6127 esac
6017 else 6128 else
6018 lt_cv_deplibs_check_method=pass_all 6129 lt_cv_deplibs_check_method=pass_all
6019 fi 6130 fi
6020 ;; 6131 ;;
6021 6132
6022gnu*) 
6023 lt_cv_deplibs_check_method=pass_all 
6024 ;; 
6025 
6026haiku*) 6133haiku*)
6027 lt_cv_deplibs_check_method=pass_all 6134 lt_cv_deplibs_check_method=pass_all
6028 ;; 6135 ;;
6029 6136
6030hpux10.20* | hpux11*) 6137hpux10.20* | hpux11*)
6031 lt_cv_file_magic_cmd=/usr/bin/file 6138 lt_cv_file_magic_cmd=/usr/bin/file
6032 case $host_cpu in 6139 case $host_cpu in
6033 ia64*) 6140 ia64*)
6034 lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' 6141 lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
6035 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so 6142 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
6036 ;; 6143 ;;
6037 hppa*64*) 6144 hppa*64*)
6038 lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' 6145 lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
@@ -6051,31 +6158,31 @@ interix[3-9]*) @@ -6051,31 +6158,31 @@ interix[3-9]*)
6051 ;; 6158 ;;
6052 6159
6053irix5* | irix6* | nonstopux*) 6160irix5* | irix6* | nonstopux*)
6054 case $LD in 6161 case $LD in
6055 *-32|*"-32 ") libmagic=32-bit;; 6162 *-32|*"-32 ") libmagic=32-bit;;
6056 *-n32|*"-n32 ") libmagic=N32;; 6163 *-n32|*"-n32 ") libmagic=N32;;
6057 *-64|*"-64 ") libmagic=64-bit;; 6164 *-64|*"-64 ") libmagic=64-bit;;
6058 *) libmagic=never-match;; 6165 *) libmagic=never-match;;
6059 esac 6166 esac
6060 lt_cv_deplibs_check_method=pass_all 6167 lt_cv_deplibs_check_method=pass_all
6061 ;; 6168 ;;
6062 6169
6063# This must be glibc/ELF. 6170# This must be glibc/ELF.
6064linux* | k*bsd*-gnu | kopensolaris*-gnu) 6171linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
6065 lt_cv_deplibs_check_method=pass_all 6172 lt_cv_deplibs_check_method=pass_all
6066 ;; 6173 ;;
6067 6174
6068netbsd*) 6175netbsd* | netbsdelf*-gnu)
6069 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then 6176 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
6070 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' 6177 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
6071 else 6178 else
6072 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' 6179 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
6073 fi 6180 fi
6074 ;; 6181 ;;
6075 6182
6076newos6*) 6183newos6*)
6077 lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' 6184 lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
6078 lt_cv_file_magic_cmd=/usr/bin/file 6185 lt_cv_file_magic_cmd=/usr/bin/file
6079 lt_cv_file_magic_test_file=/usr/lib/libnls.so 6186 lt_cv_file_magic_test_file=/usr/lib/libnls.so
6080 ;; 6187 ;;
6081 6188
@@ -7148,54 +7255,61 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* @@ -7148,54 +7255,61 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
7148 echo 'int i;' > conftest.$ac_ext 7255 echo 'int i;' > conftest.$ac_ext
7149 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 7256 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
7150 (eval $ac_compile) 2>&5 7257 (eval $ac_compile) 2>&5
7151 ac_status=$? 7258 ac_status=$?
7152 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 7259 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7153 test $ac_status = 0; }; then 7260 test $ac_status = 0; }; then
7154 case `/usr/bin/file conftest.o` in 7261 case `/usr/bin/file conftest.o` in
7155 *32-bit*) 7262 *32-bit*)
7156 case $host in 7263 case $host in
7157 x86_64-*kfreebsd*-gnu) 7264 x86_64-*kfreebsd*-gnu)
7158 LD="${LD-ld} -m elf_i386_fbsd" 7265 LD="${LD-ld} -m elf_i386_fbsd"
7159 ;; 7266 ;;
7160 x86_64-*linux*) 7267 x86_64-*linux*)
7161 LD="${LD-ld} -m elf_i386" 7268 case `/usr/bin/file conftest.o` in
 7269 *x86-64*)
 7270 LD="${LD-ld} -m elf32_x86_64"
 7271 ;;
 7272 *)
 7273 LD="${LD-ld} -m elf_i386"
 7274 ;;
 7275 esac
7162 ;; 7276 ;;
7163 powerpc64le-*linux*) 7277 powerpc64le-*)
7164 LD="${LD-ld} -m elf32lppclinux" 7278 LD="${LD-ld} -m elf32lppclinux"
7165 ;; 7279 ;;
7166 powerpc64-*linux*) 7280 powerpc64-*)
7167 LD="${LD-ld} -m elf32ppclinux" 7281 LD="${LD-ld} -m elf32ppclinux"
7168 ;; 7282 ;;
7169 s390x-*linux*) 7283 s390x-*linux*)
7170 LD="${LD-ld} -m elf_s390" 7284 LD="${LD-ld} -m elf_s390"
7171 ;; 7285 ;;
7172 sparc64-*linux*) 7286 sparc64-*linux*)
7173 LD="${LD-ld} -m elf32_sparc" 7287 LD="${LD-ld} -m elf32_sparc"
7174 ;; 7288 ;;
7175 esac 7289 esac
7176 ;; 7290 ;;
7177 *64-bit*) 7291 *64-bit*)
7178 case $host in 7292 case $host in
7179 x86_64-*kfreebsd*-gnu) 7293 x86_64-*kfreebsd*-gnu)
7180 LD="${LD-ld} -m elf_x86_64_fbsd" 7294 LD="${LD-ld} -m elf_x86_64_fbsd"
7181 ;; 7295 ;;
7182 x86_64-*linux*) 7296 x86_64-*linux*)
7183 LD="${LD-ld} -m elf_x86_64" 7297 LD="${LD-ld} -m elf_x86_64"
7184 ;; 7298 ;;
7185 powerpcle-*linux*) 7299 powerpcle-*)
7186 LD="${LD-ld} -m elf64lppc" 7300 LD="${LD-ld} -m elf64lppc"
7187 ;; 7301 ;;
7188 powerpc-*linux*) 7302 powerpc-*)
7189 LD="${LD-ld} -m elf64ppc" 7303 LD="${LD-ld} -m elf64ppc"
7190 ;; 7304 ;;
7191 s390*-*linux*|s390*-*tpf*) 7305 s390*-*linux*|s390*-*tpf*)
7192 LD="${LD-ld} -m elf64_s390" 7306 LD="${LD-ld} -m elf64_s390"
7193 ;; 7307 ;;
7194 sparc*-*linux*) 7308 sparc*-*linux*)
7195 LD="${LD-ld} -m elf64_sparc" 7309 LD="${LD-ld} -m elf64_sparc"
7196 ;; 7310 ;;
7197 esac 7311 esac
7198 ;; 7312 ;;
7199 esac 7313 esac
7200 fi 7314 fi
7201 rm -rf conftest* 7315 rm -rf conftest*
@@ -8715,27 +8829,27 @@ lt_prog_compiler_static= @@ -8715,27 +8829,27 @@ lt_prog_compiler_static=
8715 lt_prog_compiler_pic='+Z' 8829 lt_prog_compiler_pic='+Z'
8716 ;; 8830 ;;
8717 esac 8831 esac
8718 # Is there a better lt_prog_compiler_static that works with the bundled CC? 8832 # Is there a better lt_prog_compiler_static that works with the bundled CC?
8719 lt_prog_compiler_static='${wl}-a ${wl}archive' 8833 lt_prog_compiler_static='${wl}-a ${wl}archive'
8720 ;; 8834 ;;
8721 8835
8722 irix5* | irix6* | nonstopux*) 8836 irix5* | irix6* | nonstopux*)
8723 lt_prog_compiler_wl='-Wl,' 8837 lt_prog_compiler_wl='-Wl,'
8724 # PIC (with -KPIC) is the default. 8838 # PIC (with -KPIC) is the default.
8725 lt_prog_compiler_static='-non_shared' 8839 lt_prog_compiler_static='-non_shared'
8726 ;; 8840 ;;
8727 8841
8728 linux* | k*bsd*-gnu | kopensolaris*-gnu) 8842 linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
8729 case $cc_basename in 8843 case $cc_basename in
8730 # old Intel for x86_64 which still supported -KPIC. 8844 # old Intel for x86_64 which still supported -KPIC.
8731 ecc*) 8845 ecc*)
8732 lt_prog_compiler_wl='-Wl,' 8846 lt_prog_compiler_wl='-Wl,'
8733 lt_prog_compiler_pic='-KPIC' 8847 lt_prog_compiler_pic='-KPIC'
8734 lt_prog_compiler_static='-static' 8848 lt_prog_compiler_static='-static'
8735 ;; 8849 ;;
8736 # icc used to be incompatible with GCC. 8850 # icc used to be incompatible with GCC.
8737 # ICC 10 doesn't accept -KPIC any more. 8851 # ICC 10 doesn't accept -KPIC any more.
8738 icc* | ifort*) 8852 icc* | ifort*)
8739 lt_prog_compiler_wl='-Wl,' 8853 lt_prog_compiler_wl='-Wl,'
8740 lt_prog_compiler_pic='-fPIC' 8854 lt_prog_compiler_pic='-fPIC'
8741 lt_prog_compiler_static='-static' 8855 lt_prog_compiler_static='-static'
@@ -9193,26 +9307,29 @@ $as_echo_n "checking whether the $compil @@ -9193,26 +9307,29 @@ $as_echo_n "checking whether the $compil
9193 # When not using gcc, we currently assume that we are using 9307 # When not using gcc, we currently assume that we are using
9194 # Microsoft Visual C++. 9308 # Microsoft Visual C++.
9195 if test "$GCC" != yes; then 9309 if test "$GCC" != yes; then
9196 with_gnu_ld=no 9310 with_gnu_ld=no
9197 fi 9311 fi
9198 ;; 9312 ;;
9199 interix*) 9313 interix*)
9200 # we just hope/assume this is gcc and not c89 (= MSVC++) 9314 # we just hope/assume this is gcc and not c89 (= MSVC++)
9201 with_gnu_ld=yes 9315 with_gnu_ld=yes
9202 ;; 9316 ;;
9203 openbsd*) 9317 openbsd*)
9204 with_gnu_ld=no 9318 with_gnu_ld=no
9205 ;; 9319 ;;
 9320 linux* | k*bsd*-gnu | gnu*)
 9321 link_all_deplibs=no
 9322 ;;
9206 esac 9323 esac
9207 9324
9208 ld_shlibs=yes 9325 ld_shlibs=yes
9209 9326
9210 # On some targets, GNU ld is compatible enough with the native linker 9327 # On some targets, GNU ld is compatible enough with the native linker
9211 # that we're better off using the native interface for both. 9328 # that we're better off using the native interface for both.
9212 lt_use_gnu_ld_interface=no 9329 lt_use_gnu_ld_interface=no
9213 if test "$with_gnu_ld" = yes; then 9330 if test "$with_gnu_ld" = yes; then
9214 case $host_os in 9331 case $host_os in
9215 aix*) 9332 aix*)
9216 # The AIX port of GNU ld has always aspired to compatibility 9333 # The AIX port of GNU ld has always aspired to compatibility
9217 # with the native linker. However, as the warning in the GNU ld 9334 # with the native linker. However, as the warning in the GNU ld
9218 # block says, versions before 2.19.5* couldn't really create working 9335 # block says, versions before 2.19.5* couldn't really create working
@@ -9414,27 +9531,27 @@ _LT_EOF @@ -9414,27 +9531,27 @@ _LT_EOF
9414 if test "x$supports_anon_versioning" = xyes; then 9531 if test "x$supports_anon_versioning" = xyes; then
9415 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 9532 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
9416 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 9533 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
9417 echo "local: *; };" >> $output_objdir/$libname.ver~ 9534 echo "local: *; };" >> $output_objdir/$libname.ver~
9418 $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 9535 $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
9419 fi 9536 fi
9420 ;; 9537 ;;
9421 esac 9538 esac
9422 else 9539 else
9423 ld_shlibs=no 9540 ld_shlibs=no
9424 fi 9541 fi
9425 ;; 9542 ;;
9426 9543
9427 netbsd*) 9544 netbsd* | netbsdelf*-gnu)
9428 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 9545 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
9429 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 9546 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
9430 wlarc= 9547 wlarc=
9431 else 9548 else
9432 archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 9549 archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
9433 archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 9550 archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
9434 fi 9551 fi
9435 ;; 9552 ;;
9436 9553
9437 solaris*) 9554 solaris*)
9438 if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then 9555 if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
9439 ld_shlibs=no 9556 ld_shlibs=no
9440 cat <<_LT_EOF 1>&2 9557 cat <<_LT_EOF 1>&2
@@ -9591,26 +9708,27 @@ _LT_EOF @@ -9591,26 +9708,27 @@ _LT_EOF
9591 # It fails to find uninstalled libraries when the uninstalled 9708 # It fails to find uninstalled libraries when the uninstalled
9592 # path is not listed in the libpath. Setting hardcode_minus_L 9709 # path is not listed in the libpath. Setting hardcode_minus_L
9593 # to unsupported forces relinking 9710 # to unsupported forces relinking
9594 hardcode_minus_L=yes 9711 hardcode_minus_L=yes
9595 hardcode_libdir_flag_spec='-L$libdir' 9712 hardcode_libdir_flag_spec='-L$libdir'
9596 hardcode_libdir_separator= 9713 hardcode_libdir_separator=
9597 fi 9714 fi
9598 ;; 9715 ;;
9599 esac 9716 esac
9600 shared_flag='-shared' 9717 shared_flag='-shared'
9601 if test "$aix_use_runtimelinking" = yes; then 9718 if test "$aix_use_runtimelinking" = yes; then
9602 shared_flag="$shared_flag "'${wl}-G' 9719 shared_flag="$shared_flag "'${wl}-G'
9603 fi 9720 fi
 9721 link_all_deplibs=no
9604 else 9722 else
9605 # not using gcc 9723 # not using gcc
9606 if test "$host_cpu" = ia64; then 9724 if test "$host_cpu" = ia64; then
9607 # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release 9725 # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
9608 # chokes on -Wl,-G. The following line is correct: 9726 # chokes on -Wl,-G. The following line is correct:
9609 shared_flag='-G' 9727 shared_flag='-G'
9610 else 9728 else
9611 if test "$aix_use_runtimelinking" = yes; then 9729 if test "$aix_use_runtimelinking" = yes; then
9612 shared_flag='${wl}-G' 9730 shared_flag='${wl}-G'
9613 else 9731 else
9614 shared_flag='${wl}-bM:SRE' 9732 shared_flag='${wl}-bM:SRE'
9615 fi 9733 fi
9616 fi 9734 fi
@@ -10044,27 +10162,27 @@ $as_echo "$lt_cv_irix_exported_symbol" > @@ -10044,27 +10162,27 @@ $as_echo "$lt_cv_irix_exported_symbol" >
10044 archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' 10162 archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
10045 fi 10163 fi
10046 else 10164 else
10047 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 10165 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
10048 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 10166 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
10049 fi 10167 fi
10050 archive_cmds_need_lc='no' 10168 archive_cmds_need_lc='no'
10051 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 10169 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
10052 hardcode_libdir_separator=: 10170 hardcode_libdir_separator=:
10053 inherit_rpath=yes 10171 inherit_rpath=yes
10054 link_all_deplibs=yes 10172 link_all_deplibs=yes
10055 ;; 10173 ;;
10056 10174
10057 netbsd*) 10175 netbsd* | netbsdelf*-gnu)
10058 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 10176 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
10059 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 10177 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
10060 else 10178 else
10061 archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF 10179 archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
10062 fi 10180 fi
10063 hardcode_libdir_flag_spec='-R$libdir' 10181 hardcode_libdir_flag_spec='-R$libdir'
10064 hardcode_direct=yes 10182 hardcode_direct=yes
10065 hardcode_shlibpath_var=no 10183 hardcode_shlibpath_var=no
10066 ;; 10184 ;;
10067 10185
10068 newsos6) 10186 newsos6)
10069 archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' 10187 archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
10070 hardcode_direct=yes 10188 hardcode_direct=yes
@@ -10881,37 +10999,26 @@ freebsd* | dragonfly*) @@ -10881,37 +10999,26 @@ freebsd* | dragonfly*)
10881 ;; 10999 ;;
10882 freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ 11000 freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
10883 freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) 11001 freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
10884 shlibpath_overrides_runpath=no 11002 shlibpath_overrides_runpath=no
10885 hardcode_into_libs=yes 11003 hardcode_into_libs=yes
10886 ;; 11004 ;;
10887 *) # from 4.6 on, and DragonFly 11005 *) # from 4.6 on, and DragonFly
10888 shlibpath_overrides_runpath=yes 11006 shlibpath_overrides_runpath=yes
10889 hardcode_into_libs=yes 11007 hardcode_into_libs=yes
10890 ;; 11008 ;;
10891 esac 11009 esac
10892 ;; 11010 ;;
10893 11011
10894gnu*) 
10895 version_type=linux # correct to gnu/linux during the next big refactor 
10896 need_lib_prefix=no 
10897 need_version=no 
10898 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' 
10899 soname_spec='${libname}${release}${shared_ext}$major' 
10900 shlibpath_var=LD_LIBRARY_PATH 
10901 shlibpath_overrides_runpath=no 
10902 hardcode_into_libs=yes 
10903 ;; 
10904 
10905haiku*) 11012haiku*)
10906 version_type=linux # correct to gnu/linux during the next big refactor 11013 version_type=linux # correct to gnu/linux during the next big refactor
10907 need_lib_prefix=no 11014 need_lib_prefix=no
10908 need_version=no 11015 need_version=no
10909 dynamic_linker="$host_os runtime_loader" 11016 dynamic_linker="$host_os runtime_loader"
10910 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' 11017 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
10911 soname_spec='${libname}${release}${shared_ext}$major' 11018 soname_spec='${libname}${release}${shared_ext}$major'
10912 shlibpath_var=LIBRARY_PATH 11019 shlibpath_var=LIBRARY_PATH
10913 shlibpath_overrides_runpath=yes 11020 shlibpath_overrides_runpath=yes
10914 sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' 11021 sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
10915 hardcode_into_libs=yes 11022 hardcode_into_libs=yes
10916 ;; 11023 ;;
10917 11024
@@ -11008,27 +11115,27 @@ irix5* | irix6* | nonstopux*) @@ -11008,27 +11115,27 @@ irix5* | irix6* | nonstopux*)
11008 shlibpath_var=LD_LIBRARY${shlibsuff}_PATH 11115 shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
11009 shlibpath_overrides_runpath=no 11116 shlibpath_overrides_runpath=no
11010 sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" 11117 sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
11011 sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" 11118 sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
11012 hardcode_into_libs=yes 11119 hardcode_into_libs=yes
11013 ;; 11120 ;;
11014 11121
11015# No shared lib support for Linux oldld, aout, or coff. 11122# No shared lib support for Linux oldld, aout, or coff.
11016linux*oldld* | linux*aout* | linux*coff*) 11123linux*oldld* | linux*aout* | linux*coff*)
11017 dynamic_linker=no 11124 dynamic_linker=no
11018 ;; 11125 ;;
11019 11126
11020# This must be glibc/ELF. 11127# This must be glibc/ELF.
11021linux* | k*bsd*-gnu | kopensolaris*-gnu) 11128linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
11022 version_type=linux # correct to gnu/linux during the next big refactor 11129 version_type=linux # correct to gnu/linux during the next big refactor
11023 need_lib_prefix=no 11130 need_lib_prefix=no
11024 need_version=no 11131 need_version=no
11025 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 11132 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
11026 soname_spec='${libname}${release}${shared_ext}$major' 11133 soname_spec='${libname}${release}${shared_ext}$major'
11027 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' 11134 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
11028 shlibpath_var=LD_LIBRARY_PATH 11135 shlibpath_var=LD_LIBRARY_PATH
11029 shlibpath_overrides_runpath=no 11136 shlibpath_overrides_runpath=no
11030 11137
11031 # Some binutils ld are patched to set DT_RUNPATH 11138 # Some binutils ld are patched to set DT_RUNPATH
11032 if ${lt_cv_shlibpath_overrides_runpath+:} false; then : 11139 if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
11033 $as_echo_n "(cached) " >&6 11140 $as_echo_n "(cached) " >&6
11034else 11141else
@@ -11057,45 +11164,53 @@ rm -f core conftest.err conftest.$ac_obj @@ -11057,45 +11164,53 @@ rm -f core conftest.err conftest.$ac_obj
11057 conftest$ac_exeext conftest.$ac_ext 11164 conftest$ac_exeext conftest.$ac_ext
11058 LDFLAGS=$save_LDFLAGS 11165 LDFLAGS=$save_LDFLAGS
11059 libdir=$save_libdir 11166 libdir=$save_libdir
11060 11167
11061fi 11168fi
11062 11169
11063 shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath 11170 shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
11064 11171
11065 # This implies no fast_install, which is unacceptable. 11172 # This implies no fast_install, which is unacceptable.
11066 # Some rework will be needed to allow for fast_install 11173 # Some rework will be needed to allow for fast_install
11067 # before this can be enabled. 11174 # before this can be enabled.
11068 hardcode_into_libs=yes 11175 hardcode_into_libs=yes
11069 11176
11070 # Add ABI-specific directories to the system library path. 
11071 sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" 
11072 
11073 # Append ld.so.conf contents to the search path 11177 # Append ld.so.conf contents to the search path
11074 if test -f /etc/ld.so.conf; then 11178 if test -f /etc/ld.so.conf; then
11075 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` 11179 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
11076 sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" 11180 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
11077 
11078 fi 11181 fi
11079 11182
11080 # We used to test for /lib/ld.so.1 and disable shared libraries on 11183 # We used to test for /lib/ld.so.1 and disable shared libraries on
11081 # powerpc, because MkLinux only supported shared libraries with the 11184 # powerpc, because MkLinux only supported shared libraries with the
11082 # GNU dynamic linker. Since this was broken with cross compilers, 11185 # GNU dynamic linker. Since this was broken with cross compilers,
11083 # most powerpc-linux boxes support dynamic linking these days and 11186 # most powerpc-linux boxes support dynamic linking these days and
11084 # people can always --disable-shared, the test was removed, and we 11187 # people can always --disable-shared, the test was removed, and we
11085 # assume the GNU/Linux dynamic linker is in use. 11188 # assume the GNU/Linux dynamic linker is in use.
11086 dynamic_linker='GNU/Linux ld.so' 11189 dynamic_linker='GNU/Linux ld.so'
11087 ;; 11190 ;;
11088 11191
 11192netbsdelf*-gnu)
 11193 version_type=linux
 11194 need_lib_prefix=no
 11195 need_version=no
 11196 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 11197 soname_spec='${libname}${release}${shared_ext}$major'
 11198 shlibpath_var=LD_LIBRARY_PATH
 11199 shlibpath_overrides_runpath=no
 11200 hardcode_into_libs=yes
 11201 dynamic_linker='NetBSD ld.elf_so'
 11202 ;;
 11203
11089netbsd*) 11204netbsd*)
11090 version_type=sunos 11205 version_type=sunos
11091 need_lib_prefix=no 11206 need_lib_prefix=no
11092 need_version=no 11207 need_version=no
11093 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 11208 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
11094 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 11209 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
11095 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 11210 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
11096 dynamic_linker='NetBSD (a.out) ld.so' 11211 dynamic_linker='NetBSD (a.out) ld.so'
11097 else 11212 else
11098 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 11213 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
11099 soname_spec='${libname}${release}${shared_ext}$major' 11214 soname_spec='${libname}${release}${shared_ext}$major'
11100 dynamic_linker='NetBSD ld.elf_so' 11215 dynamic_linker='NetBSD ld.elf_so'
11101 fi 11216 fi
@@ -12328,31 +12443,47 @@ if test "${enable_omap_experimental_api+ @@ -12328,31 +12443,47 @@ if test "${enable_omap_experimental_api+
12328else 12443else
12329 OMAP=no 12444 OMAP=no
12330fi 12445fi
12331 12446
12332 12447
12333# Check whether --enable-exynos-experimental-api was given. 12448# Check whether --enable-exynos-experimental-api was given.
12334if test "${enable_exynos_experimental_api+set}" = set; then : 12449if test "${enable_exynos_experimental_api+set}" = set; then :
12335 enableval=$enable_exynos_experimental_api; EXYNOS=$enableval 12450 enableval=$enable_exynos_experimental_api; EXYNOS=$enableval
12336else 12451else
12337 EXYNOS=no 12452 EXYNOS=no
12338fi 12453fi
12339 12454
12340 12455
12341# Check whether --enable-freedreno-experimental-api was given. 12456# Check whether --enable-freedreno was given.
12342if test "${enable_freedreno_experimental_api+set}" = set; then : 12457if test "${enable_freedreno+set}" = set; then :
12343 enableval=$enable_freedreno_experimental_api; FREEDRENO=$enableval 12458 enableval=$enable_freedreno; FREEDRENO=$enableval
 12459else
 12460 FREEDRENO=auto
 12461fi
 12462
 12463
 12464# Check whether --enable-freedreno-kgsl was given.
 12465if test "${enable_freedreno_kgsl+set}" = set; then :
 12466 enableval=$enable_freedreno_kgsl; FREEDRENO_KGSL=$enableval
 12467else
 12468 FREEDRENO_KGSL=no
 12469fi
 12470
 12471
 12472# Check whether --enable-tegra-experimental-api was given.
 12473if test "${enable_tegra_experimental_api+set}" = set; then :
 12474 enableval=$enable_tegra_experimental_api; TEGRA=$enableval
12344else 12475else
12345 FREEDRENO=no 12476 TEGRA=no
12346fi 12477fi
12347 12478
12348 12479
12349# Check whether --enable-install-test-programs was given. 12480# Check whether --enable-install-test-programs was given.
12350if test "${enable_install_test_programs+set}" = set; then : 12481if test "${enable_install_test_programs+set}" = set; then :
12351 enableval=$enable_install_test_programs; INSTALL_TESTS=$enableval 12482 enableval=$enable_install_test_programs; INSTALL_TESTS=$enableval
12352else 12483else
12353 INSTALL_TESTS=no 12484 INSTALL_TESTS=no
12354fi 12485fi
12355 12486
12356 12487
12357 12488
12358 12489
@@ -12711,26 +12842,33 @@ $as_echo "#define UDEV 1" >>confdefs.h @@ -12711,26 +12842,33 @@ $as_echo "#define UDEV 1" >>confdefs.h
12711fi 12842fi
12712 12843
12713 12844
12714if test "x$LIBKMS" = xauto ; then 12845if test "x$LIBKMS" = xauto ; then
12715 case $host_os in 12846 case $host_os in
12716 linux*) LIBKMS="yes" ;; 12847 linux*) LIBKMS="yes" ;;
12717 freebsd* | kfreebsd*-gnu) 12848 freebsd* | kfreebsd*-gnu)
12718 LIBKMS="yes" ;; 12849 LIBKMS="yes" ;;
12719 dragonfly*) LIBKMS="yes" ;; 12850 dragonfly*) LIBKMS="yes" ;;
12720 *) LIBKMS="no" ;; 12851 *) LIBKMS="no" ;;
12721 esac 12852 esac
12722fi 12853fi
12723 12854
 12855if test "x$FREEDRENO" = xauto ; then
 12856 case $host_cpu in
 12857 arm*|aarch64) FREEDRENO="yes" ;;
 12858 *) FREEDRENO="no" ;;
 12859 esac
 12860fi
 12861
12724 if test "x$LIBKMS" = xyes; then 12862 if test "x$LIBKMS" = xyes; then
12725 HAVE_LIBKMS_TRUE= 12863 HAVE_LIBKMS_TRUE=
12726 HAVE_LIBKMS_FALSE='#' 12864 HAVE_LIBKMS_FALSE='#'
12727else 12865else
12728 HAVE_LIBKMS_TRUE='#' 12866 HAVE_LIBKMS_TRUE='#'
12729 HAVE_LIBKMS_FALSE= 12867 HAVE_LIBKMS_FALSE=
12730fi 12868fi
12731 12869
12732 12870
12733 if test "x$INTEL" = xyes; then 12871 if test "x$INTEL" = xyes; then
12734 HAVE_INTEL_TRUE= 12872 HAVE_INTEL_TRUE=
12735 HAVE_INTEL_FALSE='#' 12873 HAVE_INTEL_FALSE='#'
12736else 12874else
@@ -12804,40 +12942,68 @@ fi @@ -12804,40 +12942,68 @@ fi
12804 HAVE_FREEDRENO_TRUE= 12942 HAVE_FREEDRENO_TRUE=
12805 HAVE_FREEDRENO_FALSE='#' 12943 HAVE_FREEDRENO_FALSE='#'
12806else 12944else
12807 HAVE_FREEDRENO_TRUE='#' 12945 HAVE_FREEDRENO_TRUE='#'
12808 HAVE_FREEDRENO_FALSE= 12946 HAVE_FREEDRENO_FALSE=
12809fi 12947fi
12810 12948
12811if test "x$FREEDRENO" = xyes; then 12949if test "x$FREEDRENO" = xyes; then
12812 12950
12813$as_echo "#define HAVE_FREEDRENO 1" >>confdefs.h 12951$as_echo "#define HAVE_FREEDRENO 1" >>confdefs.h
12814 12952
12815fi 12953fi
12816 12954
 12955 if test "x$FREEDRENO_KGSL" = xyes; then
 12956 HAVE_FREEDRENO_KGSL_TRUE=
 12957 HAVE_FREEDRENO_KGSL_FALSE='#'
 12958else
 12959 HAVE_FREEDRENO_KGSL_TRUE='#'
 12960 HAVE_FREEDRENO_KGSL_FALSE=
 12961fi
 12962
 12963if test "x$FREEDRENO_KGSL" = xyes; then
 12964
 12965$as_echo "#define HAVE_FREEDRENO_KGSL 1" >>confdefs.h
 12966
 12967fi
 12968
12817 if test "x$RADEON" = xyes; then 12969 if test "x$RADEON" = xyes; then
12818 HAVE_RADEON_TRUE= 12970 HAVE_RADEON_TRUE=
12819 HAVE_RADEON_FALSE='#' 12971 HAVE_RADEON_FALSE='#'
12820else 12972else
12821 HAVE_RADEON_TRUE='#' 12973 HAVE_RADEON_TRUE='#'
12822 HAVE_RADEON_FALSE= 12974 HAVE_RADEON_FALSE=
12823fi 12975fi
12824 12976
12825if test "x$RADEON" = xyes; then 12977if test "x$RADEON" = xyes; then
12826 12978
12827$as_echo "#define HAVE_RADEON 1" >>confdefs.h 12979$as_echo "#define HAVE_RADEON 1" >>confdefs.h
12828 12980
12829fi 12981fi
12830 12982
 12983 if test "x$TEGRA" = xyes; then
 12984 HAVE_TEGRA_TRUE=
 12985 HAVE_TEGRA_FALSE='#'
 12986else
 12987 HAVE_TEGRA_TRUE='#'
 12988 HAVE_TEGRA_FALSE=
 12989fi
 12990
 12991if test "x$TEGRA" = xyes; then
 12992
 12993$as_echo "#define HAVE_TEGRA 1" >>confdefs.h
 12994
 12995fi
 12996
12831 if test "x$INSTALL_TESTS" = xyes; then 12997 if test "x$INSTALL_TESTS" = xyes; then
12832 HAVE_INSTALL_TESTS_TRUE= 12998 HAVE_INSTALL_TESTS_TRUE=
12833 HAVE_INSTALL_TESTS_FALSE='#' 12999 HAVE_INSTALL_TESTS_FALSE='#'
12834else 13000else
12835 HAVE_INSTALL_TESTS_TRUE='#' 13001 HAVE_INSTALL_TESTS_TRUE='#'
12836 HAVE_INSTALL_TESTS_FALSE= 13002 HAVE_INSTALL_TESTS_FALSE=
12837fi 13003fi
12838 13004
12839if test "x$INSTALL_TESTS" = xyes; then 13005if test "x$INSTALL_TESTS" = xyes; then
12840 13006
12841$as_echo "#define HAVE_INSTALL_TESTS 1" >>confdefs.h 13007$as_echo "#define HAVE_INSTALL_TESTS 1" >>confdefs.h
12842 13008
12843fi 13009fi
@@ -13251,27 +13417,27 @@ rm -f core conftest.err conftest.$ac_obj @@ -13251,27 +13417,27 @@ rm -f core conftest.err conftest.$ac_obj
13251 # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed. 13417 # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.
13252 CFLAGS=$save_CFLAGS 13418 CFLAGS=$save_CFLAGS
13253 13419
13254 if test "x$VISIBILITY_CFLAGS" != x; then 13420 if test "x$VISIBILITY_CFLAGS" != x; then
13255 13421
13256$as_echo "#define HAVE_VISIBILITY 1" >>confdefs.h 13422$as_echo "#define HAVE_VISIBILITY 1" >>confdefs.h
13257 13423
13258 fi 13424 fi
13259 13425
13260 13426
13261fi 13427fi
13262 13428
13263 13429
13264ac_config_files="$ac_config_files Makefile libkms/Makefile libkms/libkms.pc intel/Makefile intel/libdrm_intel.pc radeon/Makefile radeon/libdrm_radeon.pc nouveau/Makefile nouveau/libdrm_nouveau.pc omap/Makefile omap/libdrm_omap.pc exynos/Makefile exynos/libdrm_exynos.pc freedreno/Makefile freedreno/libdrm_freedreno.pc tests/Makefile tests/modeprint/Makefile tests/modetest/Makefile tests/kmstest/Makefile tests/radeon/Makefile tests/vbltest/Makefile tests/exynos/Makefile man/Makefile libdrm.pc" 13430ac_config_files="$ac_config_files Makefile libkms/Makefile libkms/libkms.pc intel/Makefile intel/libdrm_intel.pc radeon/Makefile radeon/libdrm_radeon.pc nouveau/Makefile nouveau/libdrm_nouveau.pc omap/Makefile omap/libdrm_omap.pc exynos/Makefile exynos/libdrm_exynos.pc freedreno/Makefile freedreno/libdrm_freedreno.pc tegra/Makefile tegra/libdrm_tegra.pc tests/Makefile tests/modeprint/Makefile tests/modetest/Makefile tests/kmstest/Makefile tests/proptest/Makefile tests/radeon/Makefile tests/vbltest/Makefile tests/exynos/Makefile tests/tegra/Makefile man/Makefile libdrm.pc"
13265 13431
13266cat >confcache <<\_ACEOF 13432cat >confcache <<\_ACEOF
13267# This file is a shell script that caches the results of configure 13433# This file is a shell script that caches the results of configure
13268# tests run on this system so they can be shared between configure 13434# tests run on this system so they can be shared between configure
13269# scripts and configure runs, see configure's option --config-cache. 13435# scripts and configure runs, see configure's option --config-cache.
13270# It is not useful on other systems. If it contains results you don't 13436# It is not useful on other systems. If it contains results you don't
13271# want to keep, you may remove or edit it. 13437# want to keep, you may remove or edit it.
13272# 13438#
13273# config.status only pays attention to the cache file if you give it 13439# config.status only pays attention to the cache file if you give it
13274# the --recheck option to rerun configure. 13440# the --recheck option to rerun configure.
13275# 13441#
13276# `ac_cv_env_foo' variables (set or unset) will be overridden when 13442# `ac_cv_env_foo' variables (set or unset) will be overridden when
13277# loading this file, other *unset* `ac_cv_foo' will be assigned the 13443# loading this file, other *unset* `ac_cv_foo' will be assigned the
@@ -13418,30 +13584,38 @@ Usually this means the macro was only in @@ -13418,30 +13584,38 @@ Usually this means the macro was only in
13418fi 13584fi
13419if test -z "${HAVE_OMAP_TRUE}" && test -z "${HAVE_OMAP_FALSE}"; then 13585if test -z "${HAVE_OMAP_TRUE}" && test -z "${HAVE_OMAP_FALSE}"; then
13420 as_fn_error $? "conditional \"HAVE_OMAP\" was never defined. 13586 as_fn_error $? "conditional \"HAVE_OMAP\" was never defined.
13421Usually this means the macro was only invoked conditionally." "$LINENO" 5 13587Usually this means the macro was only invoked conditionally." "$LINENO" 5
13422fi 13588fi
13423if test -z "${HAVE_EXYNOS_TRUE}" && test -z "${HAVE_EXYNOS_FALSE}"; then 13589if test -z "${HAVE_EXYNOS_TRUE}" && test -z "${HAVE_EXYNOS_FALSE}"; then
13424 as_fn_error $? "conditional \"HAVE_EXYNOS\" was never defined. 13590 as_fn_error $? "conditional \"HAVE_EXYNOS\" was never defined.
13425Usually this means the macro was only invoked conditionally." "$LINENO" 5 13591Usually this means the macro was only invoked conditionally." "$LINENO" 5
13426fi 13592fi
13427if test -z "${HAVE_FREEDRENO_TRUE}" && test -z "${HAVE_FREEDRENO_FALSE}"; then 13593if test -z "${HAVE_FREEDRENO_TRUE}" && test -z "${HAVE_FREEDRENO_FALSE}"; then
13428 as_fn_error $? "conditional \"HAVE_FREEDRENO\" was never defined. 13594 as_fn_error $? "conditional \"HAVE_FREEDRENO\" was never defined.
13429Usually this means the macro was only invoked conditionally." "$LINENO" 5 13595Usually this means the macro was only invoked conditionally." "$LINENO" 5
13430fi 13596fi
 13597if test -z "${HAVE_FREEDRENO_KGSL_TRUE}" && test -z "${HAVE_FREEDRENO_KGSL_FALSE}"; then
 13598 as_fn_error $? "conditional \"HAVE_FREEDRENO_KGSL\" was never defined.
 13599Usually this means the macro was only invoked conditionally." "$LINENO" 5
 13600fi
13431if test -z "${HAVE_RADEON_TRUE}" && test -z "${HAVE_RADEON_FALSE}"; then 13601if test -z "${HAVE_RADEON_TRUE}" && test -z "${HAVE_RADEON_FALSE}"; then
13432 as_fn_error $? "conditional \"HAVE_RADEON\" was never defined. 13602 as_fn_error $? "conditional \"HAVE_RADEON\" was never defined.
13433Usually this means the macro was only invoked conditionally." "$LINENO" 5 13603Usually this means the macro was only invoked conditionally." "$LINENO" 5
13434fi 13604fi
 13605if test -z "${HAVE_TEGRA_TRUE}" && test -z "${HAVE_TEGRA_FALSE}"; then
 13606 as_fn_error $? "conditional \"HAVE_TEGRA\" was never defined.
 13607Usually this means the macro was only invoked conditionally." "$LINENO" 5
 13608fi
13435if test -z "${HAVE_INSTALL_TESTS_TRUE}" && test -z "${HAVE_INSTALL_TESTS_FALSE}"; then 13609if test -z "${HAVE_INSTALL_TESTS_TRUE}" && test -z "${HAVE_INSTALL_TESTS_FALSE}"; then
13436 as_fn_error $? "conditional \"HAVE_INSTALL_TESTS\" was never defined. 13610 as_fn_error $? "conditional \"HAVE_INSTALL_TESTS\" was never defined.
13437Usually this means the macro was only invoked conditionally." "$LINENO" 5 13611Usually this means the macro was only invoked conditionally." "$LINENO" 5
13438fi 13612fi
13439if test -z "${HAVE_CAIRO_TRUE}" && test -z "${HAVE_CAIRO_FALSE}"; then 13613if test -z "${HAVE_CAIRO_TRUE}" && test -z "${HAVE_CAIRO_FALSE}"; then
13440 as_fn_error $? "conditional \"HAVE_CAIRO\" was never defined. 13614 as_fn_error $? "conditional \"HAVE_CAIRO\" was never defined.
13441Usually this means the macro was only invoked conditionally." "$LINENO" 5 13615Usually this means the macro was only invoked conditionally." "$LINENO" 5
13442fi 13616fi
13443if test -z "${HAVE_LIBUDEV_TRUE}" && test -z "${HAVE_LIBUDEV_FALSE}"; then 13617if test -z "${HAVE_LIBUDEV_TRUE}" && test -z "${HAVE_LIBUDEV_FALSE}"; then
13444 as_fn_error $? "conditional \"HAVE_LIBUDEV\" was never defined. 13618 as_fn_error $? "conditional \"HAVE_LIBUDEV\" was never defined.
13445Usually this means the macro was only invoked conditionally." "$LINENO" 5 13619Usually this means the macro was only invoked conditionally." "$LINENO" 5
13446fi 13620fi
13447if test -z "${BUILD_MANPAGES_TRUE}" && test -z "${BUILD_MANPAGES_FALSE}"; then 13621if test -z "${BUILD_MANPAGES_TRUE}" && test -z "${BUILD_MANPAGES_FALSE}"; then
@@ -13839,27 +14013,27 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr @@ -13839,27 +14013,27 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
13839 14013
13840exec 6>&1 14014exec 6>&1
13841## ----------------------------------- ## 14015## ----------------------------------- ##
13842## Main body of $CONFIG_STATUS script. ## 14016## Main body of $CONFIG_STATUS script. ##
13843## ----------------------------------- ## 14017## ----------------------------------- ##
13844_ASEOF 14018_ASEOF
13845test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 14019test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
13846 14020
13847cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 14021cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
13848# Save the log message, to keep $0 and so on meaningful, and to 14022# Save the log message, to keep $0 and so on meaningful, and to
13849# report actual input values of CONFIG_FILES etc. instead of their 14023# report actual input values of CONFIG_FILES etc. instead of their
13850# values after options handling. 14024# values after options handling.
13851ac_log=" 14025ac_log="
13852This file was extended by libdrm $as_me 2.4.58, which was 14026This file was extended by libdrm $as_me 2.4.59, which was
13853generated by GNU Autoconf 2.69. Invocation command line was 14027generated by GNU Autoconf 2.69. Invocation command line was
13854 14028
13855 CONFIG_FILES = $CONFIG_FILES 14029 CONFIG_FILES = $CONFIG_FILES
13856 CONFIG_HEADERS = $CONFIG_HEADERS 14030 CONFIG_HEADERS = $CONFIG_HEADERS
13857 CONFIG_LINKS = $CONFIG_LINKS 14031 CONFIG_LINKS = $CONFIG_LINKS
13858 CONFIG_COMMANDS = $CONFIG_COMMANDS 14032 CONFIG_COMMANDS = $CONFIG_COMMANDS
13859 $ $0 $@ 14033 $ $0 $@
13860 14034
13861on `(hostname || uname -n) 2>/dev/null | sed 1q` 14035on `(hostname || uname -n) 2>/dev/null | sed 1q`
13862" 14036"
13863 14037
13864_ACEOF 14038_ACEOF
13865 14039
@@ -13905,27 +14079,27 @@ $config_files @@ -13905,27 +14079,27 @@ $config_files
13905 14079
13906Configuration headers: 14080Configuration headers:
13907$config_headers 14081$config_headers
13908 14082
13909Configuration commands: 14083Configuration commands:
13910$config_commands 14084$config_commands
13911 14085
13912Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=DRI>." 14086Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=DRI>."
13913 14087
13914_ACEOF 14088_ACEOF
13915cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 14089cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
13916ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 14090ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
13917ac_cs_version="\\ 14091ac_cs_version="\\
13918libdrm config.status 2.4.58 14092libdrm config.status 2.4.59
13919configured by $0, generated by GNU Autoconf 2.69, 14093configured by $0, generated by GNU Autoconf 2.69,
13920 with options \\"\$ac_cs_config\\" 14094 with options \\"\$ac_cs_config\\"
13921 14095
13922Copyright (C) 2012 Free Software Foundation, Inc. 14096Copyright (C) 2012 Free Software Foundation, Inc.
13923This config.status script is free software; the Free Software Foundation 14097This config.status script is free software; the Free Software Foundation
13924gives unlimited permission to copy, distribute and modify it." 14098gives unlimited permission to copy, distribute and modify it."
13925 14099
13926ac_pwd='$ac_pwd' 14100ac_pwd='$ac_pwd'
13927srcdir='$srcdir' 14101srcdir='$srcdir'
13928INSTALL='$INSTALL' 14102INSTALL='$INSTALL'
13929MKDIR_P='$MKDIR_P' 14103MKDIR_P='$MKDIR_P'
13930AWK='$AWK' 14104AWK='$AWK'
13931test -n "\$AWK" || AWK=awk 14105test -n "\$AWK" || AWK=awk
@@ -14329,33 +14503,37 @@ do @@ -14329,33 +14503,37 @@ do
14329 "libkms/libkms.pc") CONFIG_FILES="$CONFIG_FILES libkms/libkms.pc" ;; 14503 "libkms/libkms.pc") CONFIG_FILES="$CONFIG_FILES libkms/libkms.pc" ;;
14330 "intel/Makefile") CONFIG_FILES="$CONFIG_FILES intel/Makefile" ;; 14504 "intel/Makefile") CONFIG_FILES="$CONFIG_FILES intel/Makefile" ;;
14331 "intel/libdrm_intel.pc") CONFIG_FILES="$CONFIG_FILES intel/libdrm_intel.pc" ;; 14505 "intel/libdrm_intel.pc") CONFIG_FILES="$CONFIG_FILES intel/libdrm_intel.pc" ;;
14332 "radeon/Makefile") CONFIG_FILES="$CONFIG_FILES radeon/Makefile" ;; 14506 "radeon/Makefile") CONFIG_FILES="$CONFIG_FILES radeon/Makefile" ;;
14333 "radeon/libdrm_radeon.pc") CONFIG_FILES="$CONFIG_FILES radeon/libdrm_radeon.pc" ;; 14507 "radeon/libdrm_radeon.pc") CONFIG_FILES="$CONFIG_FILES radeon/libdrm_radeon.pc" ;;
14334 "nouveau/Makefile") CONFIG_FILES="$CONFIG_FILES nouveau/Makefile" ;; 14508 "nouveau/Makefile") CONFIG_FILES="$CONFIG_FILES nouveau/Makefile" ;;
14335 "nouveau/libdrm_nouveau.pc") CONFIG_FILES="$CONFIG_FILES nouveau/libdrm_nouveau.pc" ;; 14509 "nouveau/libdrm_nouveau.pc") CONFIG_FILES="$CONFIG_FILES nouveau/libdrm_nouveau.pc" ;;
14336 "omap/Makefile") CONFIG_FILES="$CONFIG_FILES omap/Makefile" ;; 14510 "omap/Makefile") CONFIG_FILES="$CONFIG_FILES omap/Makefile" ;;
14337 "omap/libdrm_omap.pc") CONFIG_FILES="$CONFIG_FILES omap/libdrm_omap.pc" ;; 14511 "omap/libdrm_omap.pc") CONFIG_FILES="$CONFIG_FILES omap/libdrm_omap.pc" ;;
14338 "exynos/Makefile") CONFIG_FILES="$CONFIG_FILES exynos/Makefile" ;; 14512 "exynos/Makefile") CONFIG_FILES="$CONFIG_FILES exynos/Makefile" ;;
14339 "exynos/libdrm_exynos.pc") CONFIG_FILES="$CONFIG_FILES exynos/libdrm_exynos.pc" ;; 14513 "exynos/libdrm_exynos.pc") CONFIG_FILES="$CONFIG_FILES exynos/libdrm_exynos.pc" ;;
14340 "freedreno/Makefile") CONFIG_FILES="$CONFIG_FILES freedreno/Makefile" ;; 14514 "freedreno/Makefile") CONFIG_FILES="$CONFIG_FILES freedreno/Makefile" ;;
14341 "freedreno/libdrm_freedreno.pc") CONFIG_FILES="$CONFIG_FILES freedreno/libdrm_freedreno.pc" ;; 14515 "freedreno/libdrm_freedreno.pc") CONFIG_FILES="$CONFIG_FILES freedreno/libdrm_freedreno.pc" ;;
 14516 "tegra/Makefile") CONFIG_FILES="$CONFIG_FILES tegra/Makefile" ;;
 14517 "tegra/libdrm_tegra.pc") CONFIG_FILES="$CONFIG_FILES tegra/libdrm_tegra.pc" ;;
14342 "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; 14518 "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
14343 "tests/modeprint/Makefile") CONFIG_FILES="$CONFIG_FILES tests/modeprint/Makefile" ;; 14519 "tests/modeprint/Makefile") CONFIG_FILES="$CONFIG_FILES tests/modeprint/Makefile" ;;
14344 "tests/modetest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/modetest/Makefile" ;; 14520 "tests/modetest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/modetest/Makefile" ;;
14345 "tests/kmstest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/kmstest/Makefile" ;; 14521 "tests/kmstest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/kmstest/Makefile" ;;
 14522 "tests/proptest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/proptest/Makefile" ;;
14346 "tests/radeon/Makefile") CONFIG_FILES="$CONFIG_FILES tests/radeon/Makefile" ;; 14523 "tests/radeon/Makefile") CONFIG_FILES="$CONFIG_FILES tests/radeon/Makefile" ;;
14347 "tests/vbltest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/vbltest/Makefile" ;; 14524 "tests/vbltest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/vbltest/Makefile" ;;
14348 "tests/exynos/Makefile") CONFIG_FILES="$CONFIG_FILES tests/exynos/Makefile" ;; 14525 "tests/exynos/Makefile") CONFIG_FILES="$CONFIG_FILES tests/exynos/Makefile" ;;
 14526 "tests/tegra/Makefile") CONFIG_FILES="$CONFIG_FILES tests/tegra/Makefile" ;;
14349 "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; 14527 "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
14350 "libdrm.pc") CONFIG_FILES="$CONFIG_FILES libdrm.pc" ;; 14528 "libdrm.pc") CONFIG_FILES="$CONFIG_FILES libdrm.pc" ;;
14351 14529
14352 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 14530 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
14353 esac 14531 esac
14354done 14532done
14355 14533
14356 14534
14357# If the user did not use the arguments to specify the items to instantiate, 14535# If the user did not use the arguments to specify the items to instantiate,
14358# then the envvar interface is used. Set only those that are not. 14536# then the envvar interface is used. Set only those that are not.
14359# We use the long form for the default assignment because of an extremely 14537# We use the long form for the default assignment because of an extremely
14360# bizarre bug on SunOS 4.1.3. 14538# bizarre bug on SunOS 4.1.3.
14361if $ac_need_defaults; then 14539if $ac_need_defaults; then
@@ -15705,15 +15883,16 @@ $as_echo "$as_me: WARNING: unrecognized  @@ -15705,15 +15883,16 @@ $as_echo "$as_me: WARNING: unrecognized
15705fi 15883fi
15706 15884
15707 15885
15708echo "" 15886echo ""
15709echo "$PACKAGE_STRING will be compiled with:" 15887echo "$PACKAGE_STRING will be compiled with:"
15710echo "" 15888echo ""
15711echo " libkms $LIBKMS" 15889echo " libkms $LIBKMS"
15712echo " Intel API $INTEL" 15890echo " Intel API $INTEL"
15713echo " vmwgfx API $VMWGFX" 15891echo " vmwgfx API $VMWGFX"
15714echo " Radeon API $RADEON" 15892echo " Radeon API $RADEON"
15715echo " Nouveau API $NOUVEAU" 15893echo " Nouveau API $NOUVEAU"
15716echo " OMAP API $OMAP" 15894echo " OMAP API $OMAP"
15717echo " EXYNOS API $EXYNOS" 15895echo " EXYNOS API $EXYNOS"
15718echo " Freedreno API $FREEDRENO" 15896echo " Freedreno API $FREEDRENO (kgsl: $FREEDRENO_KGSL)"
 15897echo " Tegra API $TEGRA"
15719echo "" 15898echo ""
cvs diff -r1.1.1.8.2.1 -r1.1.1.8.2.2 xsrc/external/mit/libdrm/dist/Attic/configure.ac (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/Attic/configure.ac 2014/12/23 01:16:57 1.1.1.8.2.1
+++ xsrc/external/mit/libdrm/dist/Attic/configure.ac 2015/01/28 11:17:48 1.1.1.8.2.2
@@ -10,27 +10,27 @@ @@ -10,27 +10,27 @@
10# The above copyright notice and this permission notice (including the next 10# The above copyright notice and this permission notice (including the next
11# paragraph) shall be included in all copies or substantial portions of the 11# paragraph) shall be included in all copies or substantial portions of the
12# Software. 12# Software.
13# 13#
14# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 14# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 15# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL 16# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
17# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 17# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
18# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 18# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
19# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 19# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20 20
21AC_PREREQ([2.63]) 21AC_PREREQ([2.63])
22AC_INIT([libdrm], 22AC_INIT([libdrm],
23 [2.4.58], 23 [2.4.59],
24 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], 24 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
25 [libdrm]) 25 [libdrm])
26 26
27AC_CONFIG_HEADERS([config.h]) 27AC_CONFIG_HEADERS([config.h])
28AC_CONFIG_SRCDIR([Makefile.am]) 28AC_CONFIG_SRCDIR([Makefile.am])
29AC_CONFIG_MACRO_DIR([m4]) 29AC_CONFIG_MACRO_DIR([m4])
30AC_CONFIG_AUX_DIR([build-aux]) 30AC_CONFIG_AUX_DIR([build-aux])
31 31
32AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2]) 32AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2])
33AM_MAINTAINER_MODE([enable]) 33AM_MAINTAINER_MODE([enable])
34 34
35# Enable quiet compiles on automake 1.11. 35# Enable quiet compiles on automake 1.11.
36m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 36m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -83,30 +83,40 @@ AC_ARG_ENABLE(vmwgfx, @@ -83,30 +83,40 @@ AC_ARG_ENABLE(vmwgfx,
83 [Enable support for vmwgfx's KMS API (default: yes)]), 83 [Enable support for vmwgfx's KMS API (default: yes)]),
84 [VMWGFX=$enableval], [VMWGFX=yes]) 84 [VMWGFX=$enableval], [VMWGFX=yes])
85 85
86AC_ARG_ENABLE(omap-experimental-api, 86AC_ARG_ENABLE(omap-experimental-api,
87 AS_HELP_STRING([--enable-omap-experimental-api], 87 AS_HELP_STRING([--enable-omap-experimental-api],
88 [Enable support for OMAP's experimental API (default: disabled)]), 88 [Enable support for OMAP's experimental API (default: disabled)]),
89 [OMAP=$enableval], [OMAP=no]) 89 [OMAP=$enableval], [OMAP=no])
90 90
91AC_ARG_ENABLE(exynos-experimental-api, 91AC_ARG_ENABLE(exynos-experimental-api,
92 AS_HELP_STRING([--enable-exynos-experimental-api], 92 AS_HELP_STRING([--enable-exynos-experimental-api],
93 [Enable support for EXYNOS's experimental API (default: disabled)]), 93 [Enable support for EXYNOS's experimental API (default: disabled)]),
94 [EXYNOS=$enableval], [EXYNOS=no]) 94 [EXYNOS=$enableval], [EXYNOS=no])
95 95
96AC_ARG_ENABLE(freedreno-experimental-api, 96AC_ARG_ENABLE(freedreno,
97 AS_HELP_STRING([--enable-freedreno-experimental-api], 97 AS_HELP_STRING([--disable-freedreno],
98 [Enable support for freedreno's experimental API (default: disabled)]), 98 [Enable support for freedreno's KMS API (default: enabled on arm)]),
99 [FREEDRENO=$enableval], [FREEDRENO=no]) 99 [FREEDRENO=$enableval], [FREEDRENO=auto])
 100
 101AC_ARG_ENABLE(freedreno-kgsl,
 102 AS_HELP_STRING([--enable-freedreno-kgsl],
 103 [Enable support for freedreno's to use downstream android kernel API (default: disabled)]),
 104 [FREEDRENO_KGSL=$enableval], [FREEDRENO_KGSL=no])
 105
 106AC_ARG_ENABLE(tegra-experimental-api,
 107 AS_HELP_STRING([--enable-tegra-experimental-api],
 108 [Enable support for Tegra's experimental API (default: disabled)]),
 109 [TEGRA=$enableval], [TEGRA=no])
100 110
101AC_ARG_ENABLE(install-test-programs, 111AC_ARG_ENABLE(install-test-programs,
102 AS_HELP_STRING([--enable-install-test-programs], 112 AS_HELP_STRING([--enable-install-test-programs],
103 [Install test programs (default: no)]), 113 [Install test programs (default: no)]),
104 [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no]) 114 [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no])
105 115
106dnl =========================================================================== 116dnl ===========================================================================
107dnl check compiler flags 117dnl check compiler flags
108AC_DEFUN([LIBDRM_CC_TRY_FLAG], [ 118AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
109 AC_MSG_CHECKING([whether $CC supports $1]) 119 AC_MSG_CHECKING([whether $CC supports $1])
110 120
111 libdrm_save_CFLAGS="$CFLAGS" 121 libdrm_save_CFLAGS="$CFLAGS"
112 CFLAGS="$CFLAGS $1" 122 CFLAGS="$CFLAGS $1"
@@ -257,26 +267,33 @@ if test "x$UDEV" = xyes; then @@ -257,26 +267,33 @@ if test "x$UDEV" = xyes; then
257fi 267fi
258 268
259AC_CANONICAL_HOST 269AC_CANONICAL_HOST
260if test "x$LIBKMS" = xauto ; then 270if test "x$LIBKMS" = xauto ; then
261 case $host_os in 271 case $host_os in
262 linux*) LIBKMS="yes" ;; 272 linux*) LIBKMS="yes" ;;
263 freebsd* | kfreebsd*-gnu) 273 freebsd* | kfreebsd*-gnu)
264 LIBKMS="yes" ;; 274 LIBKMS="yes" ;;
265 dragonfly*) LIBKMS="yes" ;; 275 dragonfly*) LIBKMS="yes" ;;
266 *) LIBKMS="no" ;; 276 *) LIBKMS="no" ;;
267 esac 277 esac
268fi 278fi
269 279
 280if test "x$FREEDRENO" = xauto ; then
 281 case $host_cpu in
 282 arm*|aarch64) FREEDRENO="yes" ;;
 283 *) FREEDRENO="no" ;;
 284 esac
 285fi
 286
270AM_CONDITIONAL(HAVE_LIBKMS, [test "x$LIBKMS" = xyes]) 287AM_CONDITIONAL(HAVE_LIBKMS, [test "x$LIBKMS" = xyes])
271 288
272AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" = xyes]) 289AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" = xyes])
273if test "x$INTEL" = xyes; then 290if test "x$INTEL" = xyes; then
274 AC_DEFINE(HAVE_INTEL, 1, [Have intel support]) 291 AC_DEFINE(HAVE_INTEL, 1, [Have intel support])
275fi 292fi
276 293
277AM_CONDITIONAL(HAVE_VMWGFX, [test "x$VMWGFX" = xyes]) 294AM_CONDITIONAL(HAVE_VMWGFX, [test "x$VMWGFX" = xyes])
278if test "x$VMWGFX" = xyes; then 295if test "x$VMWGFX" = xyes; then
279 AC_DEFINE(HAVE_VMWGFX, 1, [Have vmwgfx kernel headers]) 296 AC_DEFINE(HAVE_VMWGFX, 1, [Have vmwgfx kernel headers])
280fi 297fi
281 298
282AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes]) 299AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
@@ -289,31 +306,41 @@ if test "x$OMAP" = xyes; then @@ -289,31 +306,41 @@ if test "x$OMAP" = xyes; then
289 AC_DEFINE(HAVE_OMAP, 1, [Have OMAP support]) 306 AC_DEFINE(HAVE_OMAP, 1, [Have OMAP support])
290fi 307fi
291 308
292AM_CONDITIONAL(HAVE_EXYNOS, [test "x$EXYNOS" = xyes]) 309AM_CONDITIONAL(HAVE_EXYNOS, [test "x$EXYNOS" = xyes])
293if test "x$EXYNOS" = xyes; then 310if test "x$EXYNOS" = xyes; then
294 AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support]) 311 AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
295fi 312fi
296 313
297AM_CONDITIONAL(HAVE_FREEDRENO, [test "x$FREEDRENO" = xyes]) 314AM_CONDITIONAL(HAVE_FREEDRENO, [test "x$FREEDRENO" = xyes])
298if test "x$FREEDRENO" = xyes; then 315if test "x$FREEDRENO" = xyes; then
299 AC_DEFINE(HAVE_FREEDRENO, 1, [Have freedreno support]) 316 AC_DEFINE(HAVE_FREEDRENO, 1, [Have freedreno support])
300fi 317fi
301 318
 319AM_CONDITIONAL(HAVE_FREEDRENO_KGSL, [test "x$FREEDRENO_KGSL" = xyes])
 320if test "x$FREEDRENO_KGSL" = xyes; then
 321 AC_DEFINE(HAVE_FREEDRENO_KGSL, 1, [Have freedreno support for KGSL kernel interface])
 322fi
 323
302AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes]) 324AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" = xyes])
303if test "x$RADEON" = xyes; then 325if test "x$RADEON" = xyes; then
304 AC_DEFINE(HAVE_RADEON, 1, [Have radeon support]) 326 AC_DEFINE(HAVE_RADEON, 1, [Have radeon support])
305fi 327fi
306 328
 329AM_CONDITIONAL(HAVE_TEGRA, [test "x$TEGRA" = xyes])
 330if test "x$TEGRA" = xyes; then
 331 AC_DEFINE(HAVE_TEGRA, 1, [Have Tegra support])
 332fi
 333
307AM_CONDITIONAL(HAVE_INSTALL_TESTS, [test "x$INSTALL_TESTS" = xyes]) 334AM_CONDITIONAL(HAVE_INSTALL_TESTS, [test "x$INSTALL_TESTS" = xyes])
308if test "x$INSTALL_TESTS" = xyes; then 335if test "x$INSTALL_TESTS" = xyes; then
309 AC_DEFINE(HAVE_INSTALL_TESTS, 1, [Install test programs]) 336 AC_DEFINE(HAVE_INSTALL_TESTS, 1, [Install test programs])
310fi 337fi
311 338
312AC_ARG_ENABLE([cairo-tests], 339AC_ARG_ENABLE([cairo-tests],
313 [AS_HELP_STRING([--enable-cairo-tests], 340 [AS_HELP_STRING([--enable-cairo-tests],
314 [Enable support for Cairo rendering in tests (default: auto)])], 341 [Enable support for Cairo rendering in tests (default: auto)])],
315 [CAIRO=$enableval], [CAIRO=auto]) 342 [CAIRO=$enableval], [CAIRO=auto])
316PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no]) 343PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
317AC_MSG_CHECKING([whether to enable Cairo tests]) 344AC_MSG_CHECKING([whether to enable Cairo tests])
318if test "x$CAIRO" = xauto; then 345if test "x$CAIRO" = xauto; then
319 CAIRO="$HAVE_CAIRO" 346 CAIRO="$HAVE_CAIRO"
@@ -393,36 +420,41 @@ AC_CONFIG_FILES([ @@ -393,36 +420,41 @@ AC_CONFIG_FILES([
393 libkms/libkms.pc 420 libkms/libkms.pc
394 intel/Makefile 421 intel/Makefile
395 intel/libdrm_intel.pc 422 intel/libdrm_intel.pc
396 radeon/Makefile 423 radeon/Makefile
397 radeon/libdrm_radeon.pc 424 radeon/libdrm_radeon.pc
398 nouveau/Makefile 425 nouveau/Makefile
399 nouveau/libdrm_nouveau.pc 426 nouveau/libdrm_nouveau.pc
400 omap/Makefile 427 omap/Makefile
401 omap/libdrm_omap.pc 428 omap/libdrm_omap.pc
402 exynos/Makefile 429 exynos/Makefile
403 exynos/libdrm_exynos.pc 430 exynos/libdrm_exynos.pc
404 freedreno/Makefile 431 freedreno/Makefile
405 freedreno/libdrm_freedreno.pc 432 freedreno/libdrm_freedreno.pc
 433 tegra/Makefile
 434 tegra/libdrm_tegra.pc
406 tests/Makefile 435 tests/Makefile
407 tests/modeprint/Makefile 436 tests/modeprint/Makefile
408 tests/modetest/Makefile 437 tests/modetest/Makefile
409 tests/kmstest/Makefile 438 tests/kmstest/Makefile
 439 tests/proptest/Makefile
410 tests/radeon/Makefile 440 tests/radeon/Makefile
411 tests/vbltest/Makefile 441 tests/vbltest/Makefile
412 tests/exynos/Makefile 442 tests/exynos/Makefile
 443 tests/tegra/Makefile
413 man/Makefile 444 man/Makefile
414 libdrm.pc]) 445 libdrm.pc])
415AC_OUTPUT 446AC_OUTPUT
416 447
417echo "" 448echo ""
418echo "$PACKAGE_STRING will be compiled with:" 449echo "$PACKAGE_STRING will be compiled with:"
419echo "" 450echo ""
420echo " libkms $LIBKMS" 451echo " libkms $LIBKMS"
421echo " Intel API $INTEL" 452echo " Intel API $INTEL"
422echo " vmwgfx API $VMWGFX" 453echo " vmwgfx API $VMWGFX"
423echo " Radeon API $RADEON" 454echo " Radeon API $RADEON"
424echo " Nouveau API $NOUVEAU" 455echo " Nouveau API $NOUVEAU"
425echo " OMAP API $OMAP" 456echo " OMAP API $OMAP"
426echo " EXYNOS API $EXYNOS" 457echo " EXYNOS API $EXYNOS"
427echo " Freedreno API $FREEDRENO" 458echo " Freedreno API $FREEDRENO (kgsl: $FREEDRENO_KGSL)"
 459echo " Tegra API $TEGRA"
428echo "" 460echo ""
cvs diff -r1.1.1.3.2.1 -r1.1.1.3.2.2 xsrc/external/mit/libdrm/dist/Attic/config.h.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/Attic/config.h.in 2014/12/23 01:16:56 1.1.1.3.2.1
+++ xsrc/external/mit/libdrm/dist/Attic/config.h.in 2015/01/28 11:17:48 1.1.1.3.2.2
@@ -20,26 +20,29 @@ @@ -20,26 +20,29 @@
20 20
21/* Define to 1 if you have the `clock_gettime' function. */ 21/* Define to 1 if you have the `clock_gettime' function. */
22#undef HAVE_CLOCK_GETTIME 22#undef HAVE_CLOCK_GETTIME
23 23
24/* Define to 1 if you have the <dlfcn.h> header file. */ 24/* Define to 1 if you have the <dlfcn.h> header file. */
25#undef HAVE_DLFCN_H 25#undef HAVE_DLFCN_H
26 26
27/* Have EXYNOS support */ 27/* Have EXYNOS support */
28#undef HAVE_EXYNOS 28#undef HAVE_EXYNOS
29 29
30/* Have freedreno support */ 30/* Have freedreno support */
31#undef HAVE_FREEDRENO 31#undef HAVE_FREEDRENO
32 32
 33/* Have freedreno support for KGSL kernel interface */
 34#undef HAVE_FREEDRENO_KGSL
 35
33/* Install test programs */ 36/* Install test programs */
34#undef HAVE_INSTALL_TESTS 37#undef HAVE_INSTALL_TESTS
35 38
36/* Have intel support */ 39/* Have intel support */
37#undef HAVE_INTEL 40#undef HAVE_INTEL
38 41
39/* Define to 1 if you have the <inttypes.h> header file. */ 42/* Define to 1 if you have the <inttypes.h> header file. */
40#undef HAVE_INTTYPES_H 43#undef HAVE_INTTYPES_H
41 44
42/* Enable if your compiler supports the Intel __sync_* atomic primitives */ 45/* Enable if your compiler supports the Intel __sync_* atomic primitives */
43#undef HAVE_LIBDRM_ATOMIC_PRIMITIVES 46#undef HAVE_LIBDRM_ATOMIC_PRIMITIVES
44 47
45/* Have libudev support */ 48/* Have libudev support */
@@ -71,26 +74,29 @@ @@ -71,26 +74,29 @@
71 74
72/* Define to 1 if you have the <strings.h> header file. */ 75/* Define to 1 if you have the <strings.h> header file. */
73#undef HAVE_STRINGS_H 76#undef HAVE_STRINGS_H
74 77
75/* Define to 1 if you have the <string.h> header file. */ 78/* Define to 1 if you have the <string.h> header file. */
76#undef HAVE_STRING_H 79#undef HAVE_STRING_H
77 80
78/* Define to 1 if you have the <sys/stat.h> header file. */ 81/* Define to 1 if you have the <sys/stat.h> header file. */
79#undef HAVE_SYS_STAT_H 82#undef HAVE_SYS_STAT_H
80 83
81/* Define to 1 if you have the <sys/types.h> header file. */ 84/* Define to 1 if you have the <sys/types.h> header file. */
82#undef HAVE_SYS_TYPES_H 85#undef HAVE_SYS_TYPES_H
83 86
 87/* Have Tegra support */
 88#undef HAVE_TEGRA
 89
84/* Define to 1 if you have the <unistd.h> header file. */ 90/* Define to 1 if you have the <unistd.h> header file. */
85#undef HAVE_UNISTD_H 91#undef HAVE_UNISTD_H
86 92
87/* Use valgrind intrinsics to suppress false warnings */ 93/* Use valgrind intrinsics to suppress false warnings */
88#undef HAVE_VALGRIND 94#undef HAVE_VALGRIND
89 95
90/* Compiler has -fvisibility support */ 96/* Compiler has -fvisibility support */
91#undef HAVE_VISIBILITY 97#undef HAVE_VISIBILITY
92 98
93/* Have vmwgfx kernel headers */ 99/* Have vmwgfx kernel headers */
94#undef HAVE_VMWGFX 100#undef HAVE_VMWGFX
95 101
96/* Define to the sub-directory in which libtool stores uninstalled libraries. 102/* Define to the sub-directory in which libtool stores uninstalled libraries.
cvs diff -r1.2.2.1 -r1.2.2.2 xsrc/external/mit/libdrm/dist/xf86drmMode.h (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/xf86drmMode.h 2014/12/23 01:16:57 1.2.2.1
+++ xsrc/external/mit/libdrm/dist/xf86drmMode.h 2015/01/28 11:17:48 1.2.2.2
@@ -230,26 +230,35 @@ typedef struct _drmModePropertyBlob { @@ -230,26 +230,35 @@ typedef struct _drmModePropertyBlob {
230 230
231typedef struct _drmModeProperty { 231typedef struct _drmModeProperty {
232 uint32_t prop_id; 232 uint32_t prop_id;
233 uint32_t flags; 233 uint32_t flags;
234 char name[DRM_PROP_NAME_LEN]; 234 char name[DRM_PROP_NAME_LEN];
235 int count_values; 235 int count_values;
236 uint64_t *values; /* store the blob lengths */ 236 uint64_t *values; /* store the blob lengths */
237 int count_enums; 237 int count_enums;
238 struct drm_mode_property_enum *enums; 238 struct drm_mode_property_enum *enums;
239 int count_blobs; 239 int count_blobs;
240 uint32_t *blob_ids; /* store the blob IDs */ 240 uint32_t *blob_ids; /* store the blob IDs */
241} drmModePropertyRes, *drmModePropertyPtr; 241} drmModePropertyRes, *drmModePropertyPtr;
242 242
 243static inline int drm_property_type_is(drmModePropertyPtr property,
 244 uint32_t type)
 245{
 246 /* instanceof for props.. handles extended type vs original types: */
 247 if (property->flags & DRM_MODE_PROP_EXTENDED_TYPE)
 248 return (property->flags & DRM_MODE_PROP_EXTENDED_TYPE) == type;
 249 return property->flags & type;
 250}
 251
243typedef struct _drmModeCrtc { 252typedef struct _drmModeCrtc {
244 uint32_t crtc_id; 253 uint32_t crtc_id;
245 uint32_t buffer_id; /**< FB id to connect to 0 = disconnect */ 254 uint32_t buffer_id; /**< FB id to connect to 0 = disconnect */
246 255
247 uint32_t x, y; /**< Position on the framebuffer */ 256 uint32_t x, y; /**< Position on the framebuffer */
248 uint32_t width, height; 257 uint32_t width, height;
249 int mode_valid; 258 int mode_valid;
250 drmModeModeInfo mode; 259 drmModeModeInfo mode;
251 260
252 int gamma_size; /**< Number of gamma stops */ 261 int gamma_size; /**< Number of gamma stops */
253 262
254} drmModeCrtc, *drmModeCrtcPtr; 263} drmModeCrtc, *drmModeCrtcPtr;
255 264
File Added: xsrc/external/mit/libdrm/dist/build-aux/Attic/compile
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.

scriptversion=2012-10-14.11; # UTC

# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program.  If not, see <http://www.gnu.org/licenses/>.

# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.

# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.

nl='
'

# We need space, tab and new line, in precisely that order.  Quoting is
# there to prevent tools from complaining about whitespace usage.
IFS=" ""	$nl"

file_conv=

# func_file_conv build_file lazy
# Convert a $build file to $host form and store it in $file
# Currently only supports Windows hosts. If the determined conversion
# type is listed in (the comma separated) LAZY, no conversion will
# take place.
func_file_conv ()
{
  file=$1
  case $file in
    / | /[!/]*) # absolute file, and not a UNC file
      if test -z "$file_conv"; then
	# lazily determine how to convert abs files
	case `uname -s` in
	  MINGW*)
	    file_conv=mingw
	    ;;
	  CYGWIN*)
	    file_conv=cygwin
	    ;;
	  *)
	    file_conv=wine
	    ;;
	esac
      fi
      case $file_conv/,$2, in
	*,$file_conv,*)
	  ;;
	mingw/*)
	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
	  ;;
	cygwin/*)
	  file=`cygpath -m "$file" || echo "$file"`
	  ;;
	wine/*)
	  file=`winepath -w "$file" || echo "$file"`
	  ;;
      esac
      ;;
  esac
}

# func_cl_dashL linkdir
# Make cl look for libraries in LINKDIR
func_cl_dashL ()
{
  func_file_conv "$1"
  if test -z "$lib_path"; then
    lib_path=$file
  else
    lib_path="$lib_path;$file"
  fi
  linker_opts="$linker_opts -LIBPATH:$file"
}

# func_cl_dashl library
# Do a library search-path lookup for cl
func_cl_dashl ()
{
  lib=$1
  found=no
  save_IFS=$IFS
  IFS=';'
  for dir in $lib_path $LIB
  do
    IFS=$save_IFS
    if $shared && test -f "$dir/$lib.dll.lib"; then
      found=yes
      lib=$dir/$lib.dll.lib
      break
    fi
    if test -f "$dir/$lib.lib"; then
      found=yes
      lib=$dir/$lib.lib
      break
    fi
    if test -f "$dir/lib$lib.a"; then
      found=yes
      lib=$dir/lib$lib.a
      break
    fi
  done
  IFS=$save_IFS

  if test "$found" != yes; then
    lib=$lib.lib
  fi
}

# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
{
  # Assume a capable shell
  lib_path=
  shared=:
  linker_opts=
  for arg
  do
    if test -n "$eat"; then
      eat=
    else
      case $1 in
	-o)
	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
	  eat=1
	  case $2 in
	    *.o | *.[oO][bB][jJ])
	      func_file_conv "$2"
	      set x "$@" -Fo"$file"
	      shift
	      ;;
	    *)
	      func_file_conv "$2"
	      set x "$@" -Fe"$file"
	      shift
	      ;;
	  esac
	  ;;
	-I)
	  eat=1
	  func_file_conv "$2" mingw
	  set x "$@" -I"$file"
	  shift
	  ;;
	-I*)
	  func_file_conv "${1#-I}" mingw
	  set x "$@" -I"$file"
	  shift
	  ;;
	-l)
	  eat=1
	  func_cl_dashl "$2"
	  set x "$@" "$lib"
	  shift
	  ;;
	-l*)
	  func_cl_dashl "${1#-l}"
	  set x "$@" "$lib"
	  shift
	  ;;
	-L)
	  eat=1
	  func_cl_dashL "$2"
	  ;;
	-L*)
	  func_cl_dashL "${1#-L}"
	  ;;
	-static)
	  shared=false
	  ;;
	-Wl,*)
	  arg=${1#-Wl,}
	  save_ifs="$IFS"; IFS=','
	  for flag in $arg; do
	    IFS="$save_ifs"
	    linker_opts="$linker_opts $flag"
	  done
	  IFS="$save_ifs"
	  ;;
	-Xlinker)
	  eat=1
	  linker_opts="$linker_opts $2"
	  ;;
	-*)
	  set x "$@" "$1"
	  shift
	  ;;
	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
	  func_file_conv "$1"
	  set x "$@" -Tp"$file"
	  shift
	  ;;
	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
	  func_file_conv "$1" mingw
	  set x "$@" "$file"
	  shift
	  ;;
	*)
	  set x "$@" "$1"
	  shift
	  ;;
      esac
    fi
    shift
  done
  if test -n "$linker_opts"; then
    linker_opts="-link$linker_opts"
  fi
  exec "$@" $linker_opts
  exit 1
}

eat=

case $1 in
  '')
     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
     exit 1;
     ;;
  -h | --h*)
    cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]

Wrapper for compilers which do not understand '-c -o'.
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.

If you are trying to build a whole package this is not the
right script to run: please start by reading the file 'INSTALL'.

Report bugs to <bug-automake@gnu.org>.
EOF
    exit $?
    ;;
  -v | --v*)
    echo "compile $scriptversion"
    exit $?
    ;;
  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
    func_cl_wrapper "$@"      # Doesn't return...
    ;;
esac

ofile=
cfile=

for arg
do
  if test -n "$eat"; then
    eat=
  else
    case $1 in
      -o)
	# configure might choose to run compile as 'compile cc -o foo foo.c'.
	# So we strip '-o arg' only if arg is an object.
	eat=1
	case $2 in
	  *.o | *.obj)
	    ofile=$2
	    ;;
	  *)
	    set x "$@" -o "$2"
	    shift
	    ;;
	esac
	;;
      *.c)
	cfile=$1
	set x "$@" "$1"
	shift
	;;
      *)
	set x "$@" "$1"
	shift
	;;
    esac
  fi
  shift
done

if test -z "$ofile" || test -z "$cfile"; then
  # If no '-o' option was seen then we might have been invoked from a
  # pattern rule where we don't need one.  That is ok -- this is a
  # normal compilation that the losing compiler can handle.  If no
  # '.c' file was seen then we are probably linking.  That is also
  # ok.
  exec "$@"
fi

# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`

# Create the lock directory.
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file.  Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
while true; do
  if mkdir "$lockdir" >/dev/null 2>&1; then
    break
  fi
  sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15

# Run the compile.
"$@"
ret=$?

if test -f "$cofile"; then
  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi

rmdir "$lockdir"
exit $ret

# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
cvs diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/build-aux/Attic/config.guess (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/build-aux/Attic/config.guess 2014/12/23 01:16:57 1.1.1.2.2.1
+++ xsrc/external/mit/libdrm/dist/build-aux/Attic/config.guess 2015/01/28 11:17:48 1.1.1.2.2.2
@@ -1,70 +1,66 @@ @@ -1,70 +1,66 @@
1#! /bin/sh 1#! /bin/sh
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright 1992-2013 Free Software Foundation, Inc.
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 
5# 2011, 2012, 2013 Free Software Foundation, Inc. 
6 4
7timestamp='2012-12-29' 5timestamp='2013-06-10'
8 6
9# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
10# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
11# the Free Software Foundation; either version 3 of the License, or 9# the Free Software Foundation; either version 3 of the License, or
12# (at your option) any later version. 10# (at your option) any later version.
13# 11#
14# This program is distributed in the hope that it will be useful, but 12# This program is distributed in the hope that it will be useful, but
15# WITHOUT ANY WARRANTY; without even the implied warranty of 13# WITHOUT ANY WARRANTY; without even the implied warranty of
16# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17# General Public License for more details. 15# General Public License for more details.
18# 16#
19# You should have received a copy of the GNU General Public License 17# You should have received a copy of the GNU General Public License
20# along with this program; if not, see <http://www.gnu.org/licenses/>. 18# along with this program; if not, see <http://www.gnu.org/licenses/>.
21# 19#
22# As a special exception to the GNU General Public License, if you 20# As a special exception to the GNU General Public License, if you
23# distribute this file as part of a program that contains a 21# distribute this file as part of a program that contains a
24# configuration script generated by Autoconf, you may include it under 22# configuration script generated by Autoconf, you may include it under
25# the same distribution terms that you use for the rest of that 23# the same distribution terms that you use for the rest of that
26# program. This Exception is an additional permission under section 7 24# program. This Exception is an additional permission under section 7
27# of the GNU General Public License, version 3 ("GPLv3"). 25# of the GNU General Public License, version 3 ("GPLv3").
28# 26#
29# Originally written by Per Bothner.  27# Originally written by Per Bothner.
30# 28#
31# You can get the latest version of this script from: 29# You can get the latest version of this script from:
32# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 30# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
33# 31#
34# Please send patches with a ChangeLog entry to config-patches@gnu.org. 32# Please send patches with a ChangeLog entry to config-patches@gnu.org.
35 33
36 34
37me=`echo "$0" | sed -e 's,.*/,,'` 35me=`echo "$0" | sed -e 's,.*/,,'`
38 36
39usage="\ 37usage="\
40Usage: $0 [OPTION] 38Usage: $0 [OPTION]
41 39
42Output the configuration name of the system \`$me' is run on. 40Output the configuration name of the system \`$me' is run on.
43 41
44Operation modes: 42Operation modes:
45 -h, --help print this help, then exit 43 -h, --help print this help, then exit
46 -t, --time-stamp print date of last modification, then exit 44 -t, --time-stamp print date of last modification, then exit
47 -v, --version print version number, then exit 45 -v, --version print version number, then exit
48 46
49Report bugs and patches to <config-patches@gnu.org>." 47Report bugs and patches to <config-patches@gnu.org>."
50 48
51version="\ 49version="\
52GNU config.guess ($timestamp) 50GNU config.guess ($timestamp)
53 51
54Originally written by Per Bothner. 52Originally written by Per Bothner.
55Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 53Copyright 1992-2013 Free Software Foundation, Inc.
562001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 
572012, 2013 Free Software Foundation, Inc. 
58 54
59This is free software; see the source for copying conditions. There is NO 55This is free software; see the source for copying conditions. There is NO
60warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 56warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
61 57
62help=" 58help="
63Try \`$me --help' for more information." 59Try \`$me --help' for more information."
64 60
65# Parse command line 61# Parse command line
66while test $# -gt 0 ; do 62while test $# -gt 0 ; do
67 case $1 in 63 case $1 in
68 --time-stamp | --time* | -t ) 64 --time-stamp | --time* | -t )
69 echo "$timestamp" ; exit ;; 65 echo "$timestamp" ; exit ;;
70 --version | -v ) 66 --version | -v )
@@ -126,26 +122,47 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in @@ -126,26 +122,47 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
126esac ; set_cc_for_build= ;' 122esac ; set_cc_for_build= ;'
127 123
128# This is needed to find uname on a Pyramid OSx when run in the BSD universe. 124# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
129# (ghazi@noc.rutgers.edu 1994-08-24) 125# (ghazi@noc.rutgers.edu 1994-08-24)
130if (test -f /.attbin/uname) >/dev/null 2>&1 ; then 126if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
131 PATH=$PATH:/.attbin ; export PATH 127 PATH=$PATH:/.attbin ; export PATH
132fi 128fi
133 129
134UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown 130UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
135UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown 131UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
136UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown 132UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
137UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown 133UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
138 134
 135case "${UNAME_SYSTEM}" in
 136Linux|GNU|GNU/*)
 137 # If the system lacks a compiler, then just pick glibc.
 138 # We could probably try harder.
 139 LIBC=gnu
 140
 141 eval $set_cc_for_build
 142 cat <<-EOF > $dummy.c
 143 #include <features.h>
 144 #if defined(__UCLIBC__)
 145 LIBC=uclibc
 146 #elif defined(__dietlibc__)
 147 LIBC=dietlibc
 148 #else
 149 LIBC=gnu
 150 #endif
 151 EOF
 152 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
 153 ;;
 154esac
 155
139# Note: order is significant - the case branches are not exclusive. 156# Note: order is significant - the case branches are not exclusive.
140 157
141case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in 158case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
142 *:NetBSD:*:*) 159 *:NetBSD:*:*)
143 # NetBSD (nbsd) targets should (where applicable) match one or 160 # NetBSD (nbsd) targets should (where applicable) match one or
144 # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, 161 # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
145 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently 162 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
146 # switched to ELF, *-*-netbsd* would select the old 163 # switched to ELF, *-*-netbsd* would select the old
147 # object file format. This provides both forward 164 # object file format. This provides both forward
148 # compatibility and a consistent mechanism for selecting the 165 # compatibility and a consistent mechanism for selecting the
149 # object file format. 166 # object file format.
150 # 167 #
151 # Note: NetBSD doesn't particularly care about the vendor 168 # Note: NetBSD doesn't particularly care about the vendor
@@ -847,172 +864,176 @@ EOF @@ -847,172 +864,176 @@ EOF
847 echo ${UNAME_MACHINE}-pc-uwin 864 echo ${UNAME_MACHINE}-pc-uwin
848 exit ;; 865 exit ;;
849 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) 866 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
850 echo x86_64-unknown-cygwin 867 echo x86_64-unknown-cygwin
851 exit ;; 868 exit ;;
852 p*:CYGWIN*:*) 869 p*:CYGWIN*:*)
853 echo powerpcle-unknown-cygwin 870 echo powerpcle-unknown-cygwin
854 exit ;; 871 exit ;;
855 prep*:SunOS:5.*:*) 872 prep*:SunOS:5.*:*)
856 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 873 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
857 exit ;; 874 exit ;;
858 *:GNU:*:*) 875 *:GNU:*:*)
859 # the GNU system 876 # the GNU system
860 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` 877 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
861 exit ;; 878 exit ;;
862 *:GNU/*:*:*) 879 *:GNU/*:*:*)
863 # other systems with GNU libc and userland 880 # other systems with GNU libc and userland
864 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu 881 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
865 exit ;; 882 exit ;;
866 i*86:Minix:*:*) 883 i*86:Minix:*:*)
867 echo ${UNAME_MACHINE}-pc-minix 884 echo ${UNAME_MACHINE}-pc-minix
868 exit ;; 885 exit ;;
869 aarch64:Linux:*:*) 886 aarch64:Linux:*:*)
870 echo ${UNAME_MACHINE}-unknown-linux-gnu 887 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
871 exit ;; 888 exit ;;
872 aarch64_be:Linux:*:*) 889 aarch64_be:Linux:*:*)
873 UNAME_MACHINE=aarch64_be 890 UNAME_MACHINE=aarch64_be
874 echo ${UNAME_MACHINE}-unknown-linux-gnu 891 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
875 exit ;; 892 exit ;;
876 alpha:Linux:*:*) 893 alpha:Linux:*:*)
877 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in 894 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
878 EV5) UNAME_MACHINE=alphaev5 ;; 895 EV5) UNAME_MACHINE=alphaev5 ;;
879 EV56) UNAME_MACHINE=alphaev56 ;; 896 EV56) UNAME_MACHINE=alphaev56 ;;
880 PCA56) UNAME_MACHINE=alphapca56 ;; 897 PCA56) UNAME_MACHINE=alphapca56 ;;
881 PCA57) UNAME_MACHINE=alphapca56 ;; 898 PCA57) UNAME_MACHINE=alphapca56 ;;
882 EV6) UNAME_MACHINE=alphaev6 ;; 899 EV6) UNAME_MACHINE=alphaev6 ;;
883 EV67) UNAME_MACHINE=alphaev67 ;; 900 EV67) UNAME_MACHINE=alphaev67 ;;
884 EV68*) UNAME_MACHINE=alphaev68 ;; 901 EV68*) UNAME_MACHINE=alphaev68 ;;
885 esac 902 esac
886 objdump --private-headers /bin/sh | grep -q ld.so.1 903 objdump --private-headers /bin/sh | grep -q ld.so.1
887 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 904 if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
888 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 905 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 906 exit ;;
 907 arc:Linux:*:* | arceb:Linux:*:*)
 908 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
889 exit ;; 909 exit ;;
890 arm*:Linux:*:*) 910 arm*:Linux:*:*)
891 eval $set_cc_for_build 911 eval $set_cc_for_build
892 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ 912 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
893 | grep -q __ARM_EABI__ 913 | grep -q __ARM_EABI__
894 then 914 then
895 echo ${UNAME_MACHINE}-unknown-linux-gnu 915 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
896 else 916 else
897 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ 917 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
898 | grep -q __ARM_PCS_VFP 918 | grep -q __ARM_PCS_VFP
899 then 919 then
900 echo ${UNAME_MACHINE}-unknown-linux-gnueabi 920 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
901 else 921 else
902 echo ${UNAME_MACHINE}-unknown-linux-gnueabihf 922 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
903 fi 923 fi
904 fi 924 fi
905 exit ;; 925 exit ;;
906 avr32*:Linux:*:*) 926 avr32*:Linux:*:*)
907 echo ${UNAME_MACHINE}-unknown-linux-gnu 927 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
908 exit ;; 928 exit ;;
909 cris:Linux:*:*) 929 cris:Linux:*:*)
910 echo ${UNAME_MACHINE}-axis-linux-gnu 930 echo ${UNAME_MACHINE}-axis-linux-${LIBC}
911 exit ;; 931 exit ;;
912 crisv32:Linux:*:*) 932 crisv32:Linux:*:*)
913 echo ${UNAME_MACHINE}-axis-linux-gnu 933 echo ${UNAME_MACHINE}-axis-linux-${LIBC}
914 exit ;; 934 exit ;;
915 frv:Linux:*:*) 935 frv:Linux:*:*)
916 echo ${UNAME_MACHINE}-unknown-linux-gnu 936 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
917 exit ;; 937 exit ;;
918 hexagon:Linux:*:*) 938 hexagon:Linux:*:*)
919 echo ${UNAME_MACHINE}-unknown-linux-gnu 939 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
920 exit ;; 940 exit ;;
921 i*86:Linux:*:*) 941 i*86:Linux:*:*)
922 LIBC=gnu 942 echo ${UNAME_MACHINE}-pc-linux-${LIBC}
923 eval $set_cc_for_build 
924 sed 's/^ //' << EOF >$dummy.c 
925 #ifdef __dietlibc__ 
926 LIBC=dietlibc 
927 #endif 
928EOF 
929 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` 
930 echo "${UNAME_MACHINE}-pc-linux-${LIBC}" 
931 exit ;; 943 exit ;;
932 ia64:Linux:*:*) 944 ia64:Linux:*:*)
933 echo ${UNAME_MACHINE}-unknown-linux-gnu 945 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
934 exit ;; 946 exit ;;
935 m32r*:Linux:*:*) 947 m32r*:Linux:*:*)
936 echo ${UNAME_MACHINE}-unknown-linux-gnu 948 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
937 exit ;; 949 exit ;;
938 m68*:Linux:*:*) 950 m68*:Linux:*:*)
939 echo ${UNAME_MACHINE}-unknown-linux-gnu 951 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
940 exit ;; 952 exit ;;
941 mips:Linux:*:* | mips64:Linux:*:*) 953 mips:Linux:*:* | mips64:Linux:*:*)
942 eval $set_cc_for_build 954 eval $set_cc_for_build
943 sed 's/^ //' << EOF >$dummy.c 955 sed 's/^ //' << EOF >$dummy.c
944 #undef CPU 956 #undef CPU
945 #undef ${UNAME_MACHINE} 957 #undef ${UNAME_MACHINE}
946 #undef ${UNAME_MACHINE}el 958 #undef ${UNAME_MACHINE}el
947 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 959 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
948 CPU=${UNAME_MACHINE}el 960 CPU=${UNAME_MACHINE}el
949 #else 961 #else
950 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 962 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
951 CPU=${UNAME_MACHINE} 963 CPU=${UNAME_MACHINE}
952 #else 964 #else
953 CPU= 965 CPU=
954 #endif 966 #endif
955 #endif 967 #endif
956EOF 968EOF
957 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` 969 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
958 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 970 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
959 ;; 971 ;;
 972 or1k:Linux:*:*)
 973 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 974 exit ;;
960 or32:Linux:*:*) 975 or32:Linux:*:*)
961 echo ${UNAME_MACHINE}-unknown-linux-gnu 976 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
962 exit ;; 977 exit ;;
963 padre:Linux:*:*) 978 padre:Linux:*:*)
964 echo sparc-unknown-linux-gnu 979 echo sparc-unknown-linux-${LIBC}
965 exit ;; 980 exit ;;
966 parisc64:Linux:*:* | hppa64:Linux:*:*) 981 parisc64:Linux:*:* | hppa64:Linux:*:*)
967 echo hppa64-unknown-linux-gnu 982 echo hppa64-unknown-linux-${LIBC}
968 exit ;; 983 exit ;;
969 parisc:Linux:*:* | hppa:Linux:*:*) 984 parisc:Linux:*:* | hppa:Linux:*:*)
970 # Look for CPU level 985 # Look for CPU level
971 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in 986 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
972 PA7*) echo hppa1.1-unknown-linux-gnu ;; 987 PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
973 PA8*) echo hppa2.0-unknown-linux-gnu ;; 988 PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
974 *) echo hppa-unknown-linux-gnu ;; 989 *) echo hppa-unknown-linux-${LIBC} ;;
975 esac 990 esac
976 exit ;; 991 exit ;;
977 ppc64:Linux:*:*) 992 ppc64:Linux:*:*)
978 echo powerpc64-unknown-linux-gnu 993 echo powerpc64-unknown-linux-${LIBC}
979 exit ;; 994 exit ;;
980 ppc:Linux:*:*) 995 ppc:Linux:*:*)
981 echo powerpc-unknown-linux-gnu 996 echo powerpc-unknown-linux-${LIBC}
 997 exit ;;
 998 ppc64le:Linux:*:*)
 999 echo powerpc64le-unknown-linux-${LIBC}
 1000 exit ;;
 1001 ppcle:Linux:*:*)
 1002 echo powerpcle-unknown-linux-${LIBC}
982 exit ;; 1003 exit ;;
983 s390:Linux:*:* | s390x:Linux:*:*) 1004 s390:Linux:*:* | s390x:Linux:*:*)
984 echo ${UNAME_MACHINE}-ibm-linux 1005 echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
985 exit ;; 1006 exit ;;
986 sh64*:Linux:*:*) 1007 sh64*:Linux:*:*)
987 echo ${UNAME_MACHINE}-unknown-linux-gnu 1008 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
988 exit ;; 1009 exit ;;
989 sh*:Linux:*:*) 1010 sh*:Linux:*:*)
990 echo ${UNAME_MACHINE}-unknown-linux-gnu 1011 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
991 exit ;; 1012 exit ;;
992 sparc:Linux:*:* | sparc64:Linux:*:*) 1013 sparc:Linux:*:* | sparc64:Linux:*:*)
993 echo ${UNAME_MACHINE}-unknown-linux-gnu 1014 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
994 exit ;; 1015 exit ;;
995 tile*:Linux:*:*) 1016 tile*:Linux:*:*)
996 echo ${UNAME_MACHINE}-unknown-linux-gnu 1017 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
997 exit ;; 1018 exit ;;
998 vax:Linux:*:*) 1019 vax:Linux:*:*)
999 echo ${UNAME_MACHINE}-dec-linux-gnu 1020 echo ${UNAME_MACHINE}-dec-linux-${LIBC}
1000 exit ;; 1021 exit ;;
1001 x86_64:Linux:*:*) 1022 x86_64:Linux:*:*)
1002 echo ${UNAME_MACHINE}-unknown-linux-gnu 1023 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1003 exit ;; 1024 exit ;;
1004 xtensa*:Linux:*:*) 1025 xtensa*:Linux:*:*)
1005 echo ${UNAME_MACHINE}-unknown-linux-gnu 1026 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1006 exit ;; 1027 exit ;;
1007 i*86:DYNIX/ptx:4*:*) 1028 i*86:DYNIX/ptx:4*:*)
1008 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. 1029 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1009 # earlier versions are messed up and put the nodename in both 1030 # earlier versions are messed up and put the nodename in both
1010 # sysname and nodename. 1031 # sysname and nodename.
1011 echo i386-sequent-sysv4 1032 echo i386-sequent-sysv4
1012 exit ;; 1033 exit ;;
1013 i*86:UNIX_SV:4.2MP:2.*) 1034 i*86:UNIX_SV:4.2MP:2.*)
1014 # Unixware is an offshoot of SVR4, but it has its own version 1035 # Unixware is an offshoot of SVR4, but it has its own version
1015 # number series starting with 2... 1036 # number series starting with 2...
1016 # I am not positive that other SVR4 systems won't match this, 1037 # I am not positive that other SVR4 systems won't match this,
1017 # I just have to hope. -- rms. 1038 # I just have to hope. -- rms.
1018 # Use sysv4.2uw... so that sysv4* matches it. 1039 # Use sysv4.2uw... so that sysv4* matches it.
@@ -1225,39 +1246,41 @@ EOF @@ -1225,39 +1246,41 @@ EOF
1225 echo sx8-nec-superux${UNAME_RELEASE} 1246 echo sx8-nec-superux${UNAME_RELEASE}
1226 exit ;; 1247 exit ;;
1227 SX-8R:SUPER-UX:*:*) 1248 SX-8R:SUPER-UX:*:*)
1228 echo sx8r-nec-superux${UNAME_RELEASE} 1249 echo sx8r-nec-superux${UNAME_RELEASE}
1229 exit ;; 1250 exit ;;
1230 Power*:Rhapsody:*:*) 1251 Power*:Rhapsody:*:*)
1231 echo powerpc-apple-rhapsody${UNAME_RELEASE} 1252 echo powerpc-apple-rhapsody${UNAME_RELEASE}
1232 exit ;; 1253 exit ;;
1233 *:Rhapsody:*:*) 1254 *:Rhapsody:*:*)
1234 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} 1255 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1235 exit ;; 1256 exit ;;
1236 *:Darwin:*:*) 1257 *:Darwin:*:*)
1237 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 1258 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1238 case $UNAME_PROCESSOR in 1259 eval $set_cc_for_build
1239 i386) 1260 if test "$UNAME_PROCESSOR" = unknown ; then
1240 eval $set_cc_for_build 1261 UNAME_PROCESSOR=powerpc
1241 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 1262 fi
1242 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ 1263 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1243 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 1264 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1244 grep IS_64BIT_ARCH >/dev/null 1265 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1245 then 1266 grep IS_64BIT_ARCH >/dev/null
1246 UNAME_PROCESSOR="x86_64" 1267 then
1247 fi 1268 case $UNAME_PROCESSOR in
1248 fi ;; 1269 i386) UNAME_PROCESSOR=x86_64 ;;
1249 unknown) UNAME_PROCESSOR=powerpc ;; 1270 powerpc) UNAME_PROCESSOR=powerpc64 ;;
1250 esac 1271 esac
 1272 fi
 1273 fi
1251 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1274 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1252 exit ;; 1275 exit ;;
1253 *:procnto*:*:* | *:QNX:[0123456789]*:*) 1276 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1254 UNAME_PROCESSOR=`uname -p` 1277 UNAME_PROCESSOR=`uname -p`
1255 if test "$UNAME_PROCESSOR" = "x86"; then 1278 if test "$UNAME_PROCESSOR" = "x86"; then
1256 UNAME_PROCESSOR=i386 1279 UNAME_PROCESSOR=i386
1257 UNAME_MACHINE=pc 1280 UNAME_MACHINE=pc
1258 fi 1281 fi
1259 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} 1282 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1260 exit ;; 1283 exit ;;
1261 *:QNX:*:4*) 1284 *:QNX:*:4*)
1262 echo i386-pc-qnx 1285 echo i386-pc-qnx
1263 exit ;; 1286 exit ;;
cvs diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/build-aux/Attic/config.sub (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/build-aux/Attic/config.sub 2014/12/23 01:16:57 1.1.1.2.2.1
+++ xsrc/external/mit/libdrm/dist/build-aux/Attic/config.sub 2015/01/28 11:17:49 1.1.1.2.2.2
@@ -1,20 +1,18 @@ @@ -1,20 +1,18 @@
1#! /bin/sh 1#! /bin/sh
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright 1992-2013 Free Software Foundation, Inc.
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 
5# 2011, 2012, 2013 Free Software Foundation, Inc. 
6 4
7timestamp='2012-12-29' 5timestamp='2013-08-10'
8 6
9# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
10# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
11# the Free Software Foundation; either version 3 of the License, or 9# the Free Software Foundation; either version 3 of the License, or
12# (at your option) any later version. 10# (at your option) any later version.
13# 11#
14# This program is distributed in the hope that it will be useful, but 12# This program is distributed in the hope that it will be useful, but
15# WITHOUT ANY WARRANTY; without even the implied warranty of 13# WITHOUT ANY WARRANTY; without even the implied warranty of
16# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17# General Public License for more details. 15# General Public License for more details.
18# 16#
19# You should have received a copy of the GNU General Public License 17# You should have received a copy of the GNU General Public License
20# along with this program; if not, see <http://www.gnu.org/licenses/>. 18# along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -60,29 +58,27 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS @@ -60,29 +58,27 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS
60 58
61Canonicalize a configuration name. 59Canonicalize a configuration name.
62 60
63Operation modes: 61Operation modes:
64 -h, --help print this help, then exit 62 -h, --help print this help, then exit
65 -t, --time-stamp print date of last modification, then exit 63 -t, --time-stamp print date of last modification, then exit
66 -v, --version print version number, then exit 64 -v, --version print version number, then exit
67 65
68Report bugs and patches to <config-patches@gnu.org>." 66Report bugs and patches to <config-patches@gnu.org>."
69 67
70version="\ 68version="\
71GNU config.sub ($timestamp) 69GNU config.sub ($timestamp)
72 70
73Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 71Copyright 1992-2013 Free Software Foundation, Inc.
742001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 
752012, 2013 Free Software Foundation, Inc. 
76 72
77This is free software; see the source for copying conditions. There is NO 73This is free software; see the source for copying conditions. There is NO
78warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 74warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
79 75
80help=" 76help="
81Try \`$me --help' for more information." 77Try \`$me --help' for more information."
82 78
83# Parse command line 79# Parse command line
84while test $# -gt 0 ; do 80while test $# -gt 0 ; do
85 case $1 in 81 case $1 in
86 --time-stamp | --time* | -t ) 82 --time-stamp | --time* | -t )
87 echo "$timestamp" ; exit ;; 83 echo "$timestamp" ; exit ;;
88 --version | -v ) 84 --version | -v )
@@ -246,32 +242,32 @@ case $os in @@ -246,32 +242,32 @@ case $os in
246 ;; 242 ;;
247esac 243esac
248 244
249# Decode aliases for certain CPU-COMPANY combinations. 245# Decode aliases for certain CPU-COMPANY combinations.
250case $basic_machine in 246case $basic_machine in
251 # Recognize the basic CPU types without company name. 247 # Recognize the basic CPU types without company name.
252 # Some are omitted here because they have special meanings below. 248 # Some are omitted here because they have special meanings below.
253 1750a | 580 \ 249 1750a | 580 \
254 | a29k \ 250 | a29k \
255 | aarch64 | aarch64_be \ 251 | aarch64 | aarch64_be \
256 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ 252 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
257 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ 253 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
258 | am33_2.0 \ 254 | am33_2.0 \
259 | arc \ 255 | arc | arceb \
260 | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ 256 | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
261 | avr | avr32 \ 257 | avr | avr32 \
262 | be32 | be64 \ 258 | be32 | be64 \
263 | bfin \ 259 | bfin \
264 | c4x | clipper \ 260 | c4x | c8051 | clipper \
265 | d10v | d30v | dlx | dsp16xx \ 261 | d10v | d30v | dlx | dsp16xx \
266 | epiphany \ 262 | epiphany \
267 | fido | fr30 | frv \ 263 | fido | fr30 | frv \
268 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ 264 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
269 | hexagon \ 265 | hexagon \
270 | i370 | i860 | i960 | ia64 \ 266 | i370 | i860 | i960 | ia64 \
271 | ip2k | iq2000 \ 267 | ip2k | iq2000 \
272 | le32 | le64 \ 268 | le32 | le64 \
273 | lm32 \ 269 | lm32 \
274 | m32c | m32r | m32rle | m68000 | m68k | m88k \ 270 | m32c | m32r | m32rle | m68000 | m68k | m88k \
275 | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ 271 | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
276 | mips | mipsbe | mipseb | mipsel | mipsle \ 272 | mips | mipsbe | mipseb | mipsel | mipsle \
277 | mips16 \ 273 | mips16 \
@@ -280,36 +276,37 @@ case $basic_machine in @@ -280,36 +276,37 @@ case $basic_machine in
280 | mips64orion | mips64orionel \ 276 | mips64orion | mips64orionel \
281 | mips64r5900 | mips64r5900el \ 277 | mips64r5900 | mips64r5900el \
282 | mips64vr | mips64vrel \ 278 | mips64vr | mips64vrel \
283 | mips64vr4100 | mips64vr4100el \ 279 | mips64vr4100 | mips64vr4100el \
284 | mips64vr4300 | mips64vr4300el \ 280 | mips64vr4300 | mips64vr4300el \
285 | mips64vr5000 | mips64vr5000el \ 281 | mips64vr5000 | mips64vr5000el \
286 | mips64vr5900 | mips64vr5900el \ 282 | mips64vr5900 | mips64vr5900el \
287 | mipsisa32 | mipsisa32el \ 283 | mipsisa32 | mipsisa32el \
288 | mipsisa32r2 | mipsisa32r2el \ 284 | mipsisa32r2 | mipsisa32r2el \
289 | mipsisa64 | mipsisa64el \ 285 | mipsisa64 | mipsisa64el \
290 | mipsisa64r2 | mipsisa64r2el \ 286 | mipsisa64r2 | mipsisa64r2el \
291 | mipsisa64sb1 | mipsisa64sb1el \ 287 | mipsisa64sb1 | mipsisa64sb1el \
292 | mipsisa64sr71k | mipsisa64sr71kel \ 288 | mipsisa64sr71k | mipsisa64sr71kel \
 289 | mipsr5900 | mipsr5900el \
293 | mipstx39 | mipstx39el \ 290 | mipstx39 | mipstx39el \
294 | mn10200 | mn10300 \ 291 | mn10200 | mn10300 \
295 | moxie \ 292 | moxie \
296 | mt \ 293 | mt \
297 | msp430 \ 294 | msp430 \
298 | nds32 | nds32le | nds32be \ 295 | nds32 | nds32le | nds32be \
299 | nios | nios2 \ 296 | nios | nios2 | nios2eb | nios2el \
300 | ns16k | ns32k \ 297 | ns16k | ns32k \
301 | open8 \ 298 | open8 \
302 | or32 \ 299 | or1k | or32 \
303 | pdp10 | pdp11 | pj | pjl \ 300 | pdp10 | pdp11 | pj | pjl \
304 | powerpc | powerpc64 | powerpc64le | powerpcle \ 301 | powerpc | powerpc64 | powerpc64le | powerpcle \
305 | pyramid \ 302 | pyramid \
306 | rl78 | rx \ 303 | rl78 | rx \
307 | score \ 304 | score \
308 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ 305 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
309 | sh64 | sh64le \ 306 | sh64 | sh64le \
310 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ 307 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
311 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ 308 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
312 | spu \ 309 | spu \
313 | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ 310 | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
314 | ubicom32 \ 311 | ubicom32 \
315 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ 312 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
@@ -359,33 +356,33 @@ case $basic_machine in @@ -359,33 +356,33 @@ case $basic_machine in
359 basic_machine=$basic_machine-pc 356 basic_machine=$basic_machine-pc
360 ;; 357 ;;
361 # Object if more than one company name word. 358 # Object if more than one company name word.
362 *-*-*) 359 *-*-*)
363 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 360 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
364 exit 1 361 exit 1
365 ;; 362 ;;
366 # Recognize the basic CPU types with company name. 363 # Recognize the basic CPU types with company name.
367 580-* \ 364 580-* \
368 | a29k-* \ 365 | a29k-* \
369 | aarch64-* | aarch64_be-* \ 366 | aarch64-* | aarch64_be-* \
370 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ 367 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
371 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ 368 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
372 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ 369 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
373 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ 370 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
374 | avr-* | avr32-* \ 371 | avr-* | avr32-* \
375 | be32-* | be64-* \ 372 | be32-* | be64-* \
376 | bfin-* | bs2000-* \ 373 | bfin-* | bs2000-* \
377 | c[123]* | c30-* | [cjt]90-* | c4x-* \ 374 | c[123]* | c30-* | [cjt]90-* | c4x-* \
378 | clipper-* | craynv-* | cydra-* \ 375 | c8051-* | clipper-* | craynv-* | cydra-* \
379 | d10v-* | d30v-* | dlx-* \ 376 | d10v-* | d30v-* | dlx-* \
380 | elxsi-* \ 377 | elxsi-* \
381 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ 378 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
382 | h8300-* | h8500-* \ 379 | h8300-* | h8500-* \
383 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ 380 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
384 | hexagon-* \ 381 | hexagon-* \
385 | i*86-* | i860-* | i960-* | ia64-* \ 382 | i*86-* | i860-* | i960-* | ia64-* \
386 | ip2k-* | iq2000-* \ 383 | ip2k-* | iq2000-* \
387 | le32-* | le64-* \ 384 | le32-* | le64-* \
388 | lm32-* \ 385 | lm32-* \
389 | m32c-* | m32r-* | m32rle-* \ 386 | m32c-* | m32r-* | m32rle-* \
390 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 387 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
391 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ 388 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
@@ -397,32 +394,33 @@ case $basic_machine in @@ -397,32 +394,33 @@ case $basic_machine in
397 | mips64orion-* | mips64orionel-* \ 394 | mips64orion-* | mips64orionel-* \
398 | mips64r5900-* | mips64r5900el-* \ 395 | mips64r5900-* | mips64r5900el-* \
399 | mips64vr-* | mips64vrel-* \ 396 | mips64vr-* | mips64vrel-* \
400 | mips64vr4100-* | mips64vr4100el-* \ 397 | mips64vr4100-* | mips64vr4100el-* \
401 | mips64vr4300-* | mips64vr4300el-* \ 398 | mips64vr4300-* | mips64vr4300el-* \
402 | mips64vr5000-* | mips64vr5000el-* \ 399 | mips64vr5000-* | mips64vr5000el-* \
403 | mips64vr5900-* | mips64vr5900el-* \ 400 | mips64vr5900-* | mips64vr5900el-* \
404 | mipsisa32-* | mipsisa32el-* \ 401 | mipsisa32-* | mipsisa32el-* \
405 | mipsisa32r2-* | mipsisa32r2el-* \ 402 | mipsisa32r2-* | mipsisa32r2el-* \
406 | mipsisa64-* | mipsisa64el-* \ 403 | mipsisa64-* | mipsisa64el-* \
407 | mipsisa64r2-* | mipsisa64r2el-* \ 404 | mipsisa64r2-* | mipsisa64r2el-* \
408 | mipsisa64sb1-* | mipsisa64sb1el-* \ 405 | mipsisa64sb1-* | mipsisa64sb1el-* \
409 | mipsisa64sr71k-* | mipsisa64sr71kel-* \ 406 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
 407 | mipsr5900-* | mipsr5900el-* \
410 | mipstx39-* | mipstx39el-* \ 408 | mipstx39-* | mipstx39el-* \
411 | mmix-* \ 409 | mmix-* \
412 | mt-* \ 410 | mt-* \
413 | msp430-* \ 411 | msp430-* \
414 | nds32-* | nds32le-* | nds32be-* \ 412 | nds32-* | nds32le-* | nds32be-* \
415 | nios-* | nios2-* \ 413 | nios-* | nios2-* | nios2eb-* | nios2el-* \
416 | none-* | np1-* | ns16k-* | ns32k-* \ 414 | none-* | np1-* | ns16k-* | ns32k-* \
417 | open8-* \ 415 | open8-* \
418 | orion-* \ 416 | orion-* \
419 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ 417 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
420 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ 418 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
421 | pyramid-* \ 419 | pyramid-* \
422 | rl78-* | romp-* | rs6000-* | rx-* \ 420 | rl78-* | romp-* | rs6000-* | rx-* \
423 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ 421 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
424 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 422 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
425 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ 423 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
426 | sparclite-* \ 424 | sparclite-* \
427 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ 425 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
428 | tahoe-* \ 426 | tahoe-* \
@@ -786,27 +784,27 @@ case $basic_machine in @@ -786,27 +784,27 @@ case $basic_machine in
786 ;; 784 ;;
787 merlin) 785 merlin)
788 basic_machine=ns32k-utek 786 basic_machine=ns32k-utek
789 os=-sysv 787 os=-sysv
790 ;; 788 ;;
791 microblaze*) 789 microblaze*)
792 basic_machine=microblaze-xilinx 790 basic_machine=microblaze-xilinx
793 ;; 791 ;;
794 mingw64) 792 mingw64)
795 basic_machine=x86_64-pc 793 basic_machine=x86_64-pc
796 os=-mingw64 794 os=-mingw64
797 ;; 795 ;;
798 mingw32) 796 mingw32)
799 basic_machine=i386-pc 797 basic_machine=i686-pc
800 os=-mingw32 798 os=-mingw32
801 ;; 799 ;;
802 mingw32ce) 800 mingw32ce)
803 basic_machine=arm-unknown 801 basic_machine=arm-unknown
804 os=-mingw32ce 802 os=-mingw32ce
805 ;; 803 ;;
806 miniframe) 804 miniframe)
807 basic_machine=m68000-convergent 805 basic_machine=m68000-convergent
808 ;; 806 ;;
809 *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) 807 *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
810 basic_machine=m68k-atari 808 basic_machine=m68k-atari
811 os=-mint 809 os=-mint
812 ;; 810 ;;
@@ -822,27 +820,27 @@ case $basic_machine in @@ -822,27 +820,27 @@ case $basic_machine in
822 ;; 820 ;;
823 morphos) 821 morphos)
824 basic_machine=powerpc-unknown 822 basic_machine=powerpc-unknown
825 os=-morphos 823 os=-morphos
826 ;; 824 ;;
827 msdos) 825 msdos)
828 basic_machine=i386-pc 826 basic_machine=i386-pc
829 os=-msdos 827 os=-msdos
830 ;; 828 ;;
831 ms1-*) 829 ms1-*)
832 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` 830 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
833 ;; 831 ;;
834 msys) 832 msys)
835 basic_machine=i386-pc 833 basic_machine=i686-pc
836 os=-msys 834 os=-msys
837 ;; 835 ;;
838 mvs) 836 mvs)
839 basic_machine=i370-ibm 837 basic_machine=i370-ibm
840 os=-mvs 838 os=-mvs
841 ;; 839 ;;
842 nacl) 840 nacl)
843 basic_machine=le32-unknown 841 basic_machine=le32-unknown
844 os=-nacl 842 os=-nacl
845 ;; 843 ;;
846 ncr3000) 844 ncr3000)
847 basic_machine=i486-ncr 845 basic_machine=i486-ncr
848 os=-sysv4 846 os=-sysv4
@@ -998,27 +996,27 @@ case $basic_machine in @@ -998,27 +996,27 @@ case $basic_machine in
998 ppc | ppcbe) basic_machine=powerpc-unknown 996 ppc | ppcbe) basic_machine=powerpc-unknown
999 ;; 997 ;;
1000 ppc-* | ppcbe-*) 998 ppc-* | ppcbe-*)
1001 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` 999 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1002 ;; 1000 ;;
1003 ppcle | powerpclittle | ppc-le | powerpc-little) 1001 ppcle | powerpclittle | ppc-le | powerpc-little)
1004 basic_machine=powerpcle-unknown 1002 basic_machine=powerpcle-unknown
1005 ;; 1003 ;;
1006 ppcle-* | powerpclittle-*) 1004 ppcle-* | powerpclittle-*)
1007 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` 1005 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
1008 ;; 1006 ;;
1009 ppc64) basic_machine=powerpc64-unknown 1007 ppc64) basic_machine=powerpc64-unknown
1010 ;; 1008 ;;
1011 ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` 1009 ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1012 ;; 1010 ;;
1013 ppc64le | powerpc64little | ppc64-le | powerpc64-little) 1011 ppc64le | powerpc64little | ppc64-le | powerpc64-little)
1014 basic_machine=powerpc64le-unknown 1012 basic_machine=powerpc64le-unknown
1015 ;; 1013 ;;
1016 ppc64le-* | powerpc64little-*) 1014 ppc64le-* | powerpc64little-*)
1017 basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` 1015 basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
1018 ;; 1016 ;;
1019 ps2) 1017 ps2)
1020 basic_machine=i386-ibm 1018 basic_machine=i386-ibm
1021 ;; 1019 ;;
1022 pw32) 1020 pw32)
1023 basic_machine=i586-unknown 1021 basic_machine=i586-unknown
1024 os=-pw32 1022 os=-pw32
@@ -1344,27 +1342,27 @@ case $os in @@ -1344,27 +1342,27 @@ case $os in
1344 -unixware*) 1342 -unixware*)
1345 os=-sysv4.2uw 1343 os=-sysv4.2uw
1346 ;; 1344 ;;
1347 -gnu/linux*) 1345 -gnu/linux*)
1348 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` 1346 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
1349 ;; 1347 ;;
1350 # First accept the basic system types. 1348 # First accept the basic system types.
1351 # The portable systems comes first. 1349 # The portable systems comes first.
1352 # Each alternative MUST END IN A *, to match a version number. 1350 # Each alternative MUST END IN A *, to match a version number.
1353 # -sysv* is not here because it comes later, after sysvr4. 1351 # -sysv* is not here because it comes later, after sysvr4.
1354 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ 1352 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1355 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ 1353 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1356 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ 1354 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1357 | -sym* | -kopensolaris* \ 1355 | -sym* | -kopensolaris* | -plan9* \
1358 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ 1356 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1359 | -aos* | -aros* \ 1357 | -aos* | -aros* \
1360 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1358 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1361 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 1359 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1362 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ 1360 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1363 | -bitrig* | -openbsd* | -solidbsd* \ 1361 | -bitrig* | -openbsd* | -solidbsd* \
1364 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ 1362 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1365 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 1363 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1366 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ 1364 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1367 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ 1365 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1368 | -chorusos* | -chorusrdb* | -cegcc* \ 1366 | -chorusos* | -chorusrdb* | -cegcc* \
1369 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ 1367 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1370 | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ 1368 | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
@@ -1490,29 +1488,26 @@ case $os in @@ -1490,29 +1488,26 @@ case $os in
1490 ;; 1488 ;;
1491 -es1800*) 1489 -es1800*)
1492 os=-ose 1490 os=-ose
1493 ;; 1491 ;;
1494 -xenix) 1492 -xenix)
1495 os=-xenix 1493 os=-xenix
1496 ;; 1494 ;;
1497 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) 1495 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1498 os=-mint 1496 os=-mint
1499 ;; 1497 ;;
1500 -aros*) 1498 -aros*)
1501 os=-aros 1499 os=-aros
1502 ;; 1500 ;;
1503 -kaos*) 
1504 os=-kaos 
1505 ;; 
1506 -zvmoe) 1501 -zvmoe)
1507 os=-zvmoe 1502 os=-zvmoe
1508 ;; 1503 ;;
1509 -dicos*) 1504 -dicos*)
1510 os=-dicos 1505 os=-dicos
1511 ;; 1506 ;;
1512 -nacl*) 1507 -nacl*)
1513 ;; 1508 ;;
1514 -none) 1509 -none)
1515 ;; 1510 ;;
1516 *) 1511 *)
1517 # Get rid of the `-' at the beginning of $os. 1512 # Get rid of the `-' at the beginning of $os.
1518 os=`echo $os | sed 's/[^-]*-//'` 1513 os=`echo $os | sed 's/[^-]*-//'`
@@ -1541,26 +1536,29 @@ case $basic_machine in @@ -1541,26 +1536,29 @@ case $basic_machine in
1541 ;; 1536 ;;
1542 *-acorn) 1537 *-acorn)
1543 os=-riscix1.2 1538 os=-riscix1.2
1544 ;; 1539 ;;
1545 arm*-rebel) 1540 arm*-rebel)
1546 os=-linux 1541 os=-linux
1547 ;; 1542 ;;
1548 arm*-semi) 1543 arm*-semi)
1549 os=-aout 1544 os=-aout
1550 ;; 1545 ;;
1551 c4x-* | tic4x-*) 1546 c4x-* | tic4x-*)
1552 os=-coff 1547 os=-coff
1553 ;; 1548 ;;
 1549 c8051-*)
 1550 os=-elf
 1551 ;;
1554 hexagon-*) 1552 hexagon-*)
1555 os=-elf 1553 os=-elf
1556 ;; 1554 ;;
1557 tic54x-*) 1555 tic54x-*)
1558 os=-coff 1556 os=-coff
1559 ;; 1557 ;;
1560 tic55x-*) 1558 tic55x-*)
1561 os=-coff 1559 os=-coff
1562 ;; 1560 ;;
1563 tic6x-*) 1561 tic6x-*)
1564 os=-coff 1562 os=-coff
1565 ;; 1563 ;;
1566 # This must come before the *-dec entry. 1564 # This must come before the *-dec entry.
@@ -1584,26 +1582,29 @@ case $basic_machine in @@ -1584,26 +1582,29 @@ case $basic_machine in
1584 ;; 1582 ;;
1585 m68*-cisco) 1583 m68*-cisco)
1586 os=-aout 1584 os=-aout
1587 ;; 1585 ;;
1588 mep-*) 1586 mep-*)
1589 os=-elf 1587 os=-elf
1590 ;; 1588 ;;
1591 mips*-cisco) 1589 mips*-cisco)
1592 os=-elf 1590 os=-elf
1593 ;; 1591 ;;
1594 mips*-*) 1592 mips*-*)
1595 os=-elf 1593 os=-elf
1596 ;; 1594 ;;
 1595 or1k-*)
 1596 os=-elf
 1597 ;;
1597 or32-*) 1598 or32-*)
1598 os=-coff 1599 os=-coff
1599 ;; 1600 ;;
1600 *-tti) # must be before sparc entry or we get the wrong os. 1601 *-tti) # must be before sparc entry or we get the wrong os.
1601 os=-sysv3 1602 os=-sysv3
1602 ;; 1603 ;;
1603 sparc-* | *-sun) 1604 sparc-* | *-sun)
1604 os=-sunos4.1.1 1605 os=-sunos4.1.1
1605 ;; 1606 ;;
1606 *-be) 1607 *-be)
1607 os=-beos 1608 os=-beos
1608 ;; 1609 ;;
1609 *-haiku) 1610 *-haiku)
cvs diff -r1.1.1.1 -r1.1.1.1.2.1 xsrc/external/mit/libdrm/dist/build-aux/Attic/ltmain.sh (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/build-aux/Attic/ltmain.sh 2014/03/17 07:51:42 1.1.1.1
+++ xsrc/external/mit/libdrm/dist/build-aux/Attic/ltmain.sh 2015/01/28 11:17:49 1.1.1.1.2.1
@@ -60,37 +60,37 @@ @@ -60,37 +60,37 @@
60# 60#
61# MODE-ARGS vary depending on the MODE. When passed as first option, 61# MODE-ARGS vary depending on the MODE. When passed as first option,
62# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. 62# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
63# Try `$progname --help --mode=MODE' for a more detailed description of MODE. 63# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
64# 64#
65# When reporting a bug, please describe a test case to reproduce it and 65# When reporting a bug, please describe a test case to reproduce it and
66# include the following information: 66# include the following information:
67# 67#
68# host-triplet: $host 68# host-triplet: $host
69# shell: $SHELL 69# shell: $SHELL
70# compiler: $LTCC 70# compiler: $LTCC
71# compiler flags: $LTCFLAGS 71# compiler flags: $LTCFLAGS
72# linker: $LD (gnu? $with_gnu_ld) 72# linker: $LD (gnu? $with_gnu_ld)
73# $progname: (GNU libtool) 2.4.2 73# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
74# automake: $automake_version 74# automake: $automake_version
75# autoconf: $autoconf_version 75# autoconf: $autoconf_version
76# 76#
77# Report bugs to <bug-libtool@gnu.org>. 77# Report bugs to <bug-libtool@gnu.org>.
78# GNU libtool home page: <http://www.gnu.org/software/libtool/>. 78# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
79# General help using GNU software: <http://www.gnu.org/gethelp/>. 79# General help using GNU software: <http://www.gnu.org/gethelp/>.
80 80
81PROGRAM=libtool 81PROGRAM=libtool
82PACKAGE=libtool 82PACKAGE=libtool
83VERSION=2.4.2 83VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
84TIMESTAMP="" 84TIMESTAMP=""
85package_revision=1.3337 85package_revision=1.3337
86 86
87# Be Bourne compatible 87# Be Bourne compatible
88if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 88if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
89 emulate sh 89 emulate sh
90 NULLCMD=: 90 NULLCMD=:
91 # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which 91 # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
92 # is contrary to our usage. Disable this feature. 92 # is contrary to our usage. Disable this feature.
93 alias -g '${1+"$@"}'='"$@"' 93 alias -g '${1+"$@"}'='"$@"'
94 setopt NO_GLOB_SUBST 94 setopt NO_GLOB_SUBST
95else 95else
96 case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac 96 case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
@@ -6114,27 +6114,30 @@ func_mode_link () @@ -6114,27 +6114,30 @@ func_mode_link ()
6114 done 6114 done
6115 deplibs="$tmp_deplibs" 6115 deplibs="$tmp_deplibs"
6116 fi 6116 fi
6117 6117
6118 if test "$linkmode,$pass" = "lib,link" || 6118 if test "$linkmode,$pass" = "lib,link" ||
6119 test "$linkmode,$pass" = "prog,scan"; then 6119 test "$linkmode,$pass" = "prog,scan"; then
6120 libs="$deplibs" 6120 libs="$deplibs"
6121 deplibs= 6121 deplibs=
6122 fi 6122 fi
6123 if test "$linkmode" = prog; then 6123 if test "$linkmode" = prog; then
6124 case $pass in 6124 case $pass in
6125 dlopen) libs="$dlfiles" ;; 6125 dlopen) libs="$dlfiles" ;;
6126 dlpreopen) libs="$dlprefiles" ;; 6126 dlpreopen) libs="$dlprefiles" ;;
6127 link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; 6127 link)
 6128 libs="$deplibs %DEPLIBS%"
 6129 test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
 6130 ;;
6128 esac 6131 esac
6129 fi 6132 fi
6130 if test "$linkmode,$pass" = "lib,dlpreopen"; then 6133 if test "$linkmode,$pass" = "lib,dlpreopen"; then
6131 # Collect and forward deplibs of preopened libtool libs 6134 # Collect and forward deplibs of preopened libtool libs
6132 for lib in $dlprefiles; do 6135 for lib in $dlprefiles; do
6133 # Ignore non-libtool-libs 6136 # Ignore non-libtool-libs
6134 dependency_libs= 6137 dependency_libs=
6135 func_resolve_sysroot "$lib" 6138 func_resolve_sysroot "$lib"
6136 case $lib in 6139 case $lib in
6137 *.la) func_source "$func_resolve_sysroot_result" ;; 6140 *.la) func_source "$func_resolve_sysroot_result" ;;
6138 esac 6141 esac
6139 6142
6140 # Collect preopened libtool deplibs, except any this library 6143 # Collect preopened libtool deplibs, except any this library
@@ -6434,39 +6437,39 @@ func_mode_link () @@ -6434,39 +6437,39 @@ func_mode_link ()
6434 test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" 6437 test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
6435 fi 6438 fi
6436 6439
6437 if test "$pass" = conv; then 6440 if test "$pass" = conv; then
6438 # Only check for convenience libraries 6441 # Only check for convenience libraries
6439 deplibs="$lib $deplibs" 6442 deplibs="$lib $deplibs"
6440 if test -z "$libdir"; then 6443 if test -z "$libdir"; then
6441 if test -z "$old_library"; then 6444 if test -z "$old_library"; then
6442 func_fatal_error "cannot find name of link library for \`$lib'" 6445 func_fatal_error "cannot find name of link library for \`$lib'"
6443 fi 6446 fi
6444 # It is a libtool convenience library, so add in its objects. 6447 # It is a libtool convenience library, so add in its objects.
6445 func_append convenience " $ladir/$objdir/$old_library" 6448 func_append convenience " $ladir/$objdir/$old_library"
6446 func_append old_convenience " $ladir/$objdir/$old_library" 6449 func_append old_convenience " $ladir/$objdir/$old_library"
 6450 tmp_libs=
 6451 for deplib in $dependency_libs; do
 6452 deplibs="$deplib $deplibs"
 6453 if $opt_preserve_dup_deps ; then
 6454 case "$tmp_libs " in
 6455 *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 6456 esac
 6457 fi
 6458 func_append tmp_libs " $deplib"
 6459 done
6447 elif test "$linkmode" != prog && test "$linkmode" != lib; then 6460 elif test "$linkmode" != prog && test "$linkmode" != lib; then
6448 func_fatal_error "\`$lib' is not a convenience library" 6461 func_fatal_error "\`$lib' is not a convenience library"
6449 fi 6462 fi
6450 tmp_libs= 
6451 for deplib in $dependency_libs; do 
6452 deplibs="$deplib $deplibs" 
6453 if $opt_preserve_dup_deps ; then 
6454 case "$tmp_libs " in 
6455 *" $deplib "*) func_append specialdeplibs " $deplib" ;; 
6456 esac 
6457 fi 
6458 func_append tmp_libs " $deplib" 
6459 done 
6460 continue 6463 continue
6461 fi # $pass = conv 6464 fi # $pass = conv
6462 6465
6463 6466
6464 # Get the name of the library we link against. 6467 # Get the name of the library we link against.
6465 linklib= 6468 linklib=
6466 if test -n "$old_library" && 6469 if test -n "$old_library" &&
6467 { test "$prefer_static_libs" = yes || 6470 { test "$prefer_static_libs" = yes ||
6468 test "$prefer_static_libs,$installed" = "built,no"; }; then 6471 test "$prefer_static_libs,$installed" = "built,no"; }; then
6469 linklib=$old_library 6472 linklib=$old_library
6470 else 6473 else
6471 for l in $old_library $library_names; do 6474 for l in $old_library $library_names; do
6472 linklib="$l" 6475 linklib="$l"
@@ -7339,26 +7342,29 @@ func_mode_link () @@ -7339,26 +7342,29 @@ func_mode_link ()
7339 ;; 7342 ;;
7340 freebsd-aout|freebsd-elf|qnx|sunos) 7343 freebsd-aout|freebsd-elf|qnx|sunos)
7341 current="$number_major" 7344 current="$number_major"
7342 revision="$number_minor" 7345 revision="$number_minor"
7343 age="0" 7346 age="0"
7344 ;; 7347 ;;
7345 irix|nonstopux) 7348 irix|nonstopux)
7346 func_arith $number_major + $number_minor 7349 func_arith $number_major + $number_minor
7347 current=$func_arith_result 7350 current=$func_arith_result
7348 age="$number_minor" 7351 age="$number_minor"
7349 revision="$number_minor" 7352 revision="$number_minor"
7350 lt_irix_increment=no 7353 lt_irix_increment=no
7351 ;; 7354 ;;
 7355 *)
 7356 func_fatal_configuration "$modename: unknown library version type \`$version_type'"
 7357 ;;
7352 esac 7358 esac
7353 ;; 7359 ;;
7354 no) 7360 no)
7355 current="$1" 7361 current="$1"
7356 revision="$2" 7362 revision="$2"
7357 age="$3" 7363 age="$3"
7358 ;; 7364 ;;
7359 esac 7365 esac
7360 7366
7361 # Check that each of the things are valid numbers. 7367 # Check that each of the things are valid numbers.
7362 case $current in 7368 case $current in
7363 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; 7369 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
7364 *) 7370 *)
cvs diff -r1.1.1.1 -r1.1.1.1.2.1 xsrc/external/mit/libdrm/dist/build-aux/Attic/missing (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/build-aux/Attic/missing 2014/03/17 07:51:42 1.1.1.1
+++ xsrc/external/mit/libdrm/dist/build-aux/Attic/missing 2015/01/28 11:17:49 1.1.1.1.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1#! /bin/sh 1#! /bin/sh
2# Common wrapper for a few potentially missing GNU programs. 2# Common wrapper for a few potentially missing GNU programs.
3 3
4scriptversion=2012-06-26.16; # UTC 4scriptversion=2013-10-28.13; # UTC
5 5
6# Copyright (C) 1996-2013 Free Software Foundation, Inc. 6# Copyright (C) 1996-2013 Free Software Foundation, Inc.
7# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. 7# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8 8
9# This program is free software; you can redistribute it and/or modify 9# This program is free software; you can redistribute it and/or modify
10# it under the terms of the GNU General Public License as published by 10# it under the terms of the GNU General Public License as published by
11# the Free Software Foundation; either version 2, or (at your option) 11# the Free Software Foundation; either version 2, or (at your option)
12# any later version. 12# any later version.
13 13
14# This program is distributed in the hope that it will be useful, 14# This program is distributed in the hope that it will be useful,
15# but WITHOUT ANY WARRANTY; without even the implied warranty of 15# but WITHOUT ANY WARRANTY; without even the implied warranty of
16# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17# GNU General Public License for more details. 17# GNU General Public License for more details.
@@ -150,27 +150,27 @@ give_advice () @@ -150,27 +150,27 @@ give_advice ()
150 ;; 150 ;;
151 automake*) 151 automake*)
152 echo "You should only need it if you modified 'Makefile.am' or" 152 echo "You should only need it if you modified 'Makefile.am' or"
153 echo "$configure_deps." 153 echo "$configure_deps."
154 program_details 'automake' 154 program_details 'automake'
155 ;; 155 ;;
156 aclocal*) 156 aclocal*)
157 echo "You should only need it if you modified 'acinclude.m4' or" 157 echo "You should only need it if you modified 'acinclude.m4' or"
158 echo "$configure_deps." 158 echo "$configure_deps."
159 program_details 'aclocal' 159 program_details 'aclocal'
160 ;; 160 ;;
161 autom4te*) 161 autom4te*)
162 echo "You might have modified some maintainer files that require" 162 echo "You might have modified some maintainer files that require"
163 echo "the 'automa4te' program to be rebuilt." 163 echo "the 'autom4te' program to be rebuilt."
164 program_details 'autom4te' 164 program_details 'autom4te'
165 ;; 165 ;;
166 bison*|yacc*) 166 bison*|yacc*)
167 echo "You should only need it if you modified a '.y' file." 167 echo "You should only need it if you modified a '.y' file."
168 echo "You may want to install the GNU Bison package:" 168 echo "You may want to install the GNU Bison package:"
169 echo "<$gnu_software_URL/bison/>" 169 echo "<$gnu_software_URL/bison/>"
170 ;; 170 ;;
171 lex*|flex*) 171 lex*|flex*)
172 echo "You should only need it if you modified a '.l' file." 172 echo "You should only need it if you modified a '.l' file."
173 echo "You may want to install the Fast Lexical Analyzer package:" 173 echo "You may want to install the Fast Lexical Analyzer package:"
174 echo "<$flex_URL>" 174 echo "<$flex_URL>"
175 ;; 175 ;;
176 help2man*) 176 help2man*)
cvs diff -r1.1.1.1 -r1.1.1.1.2.1 xsrc/external/mit/libdrm/dist/build-aux/Attic/test-driver (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/build-aux/Attic/test-driver 2014/03/17 07:51:42 1.1.1.1
+++ xsrc/external/mit/libdrm/dist/build-aux/Attic/test-driver 2015/01/28 11:17:49 1.1.1.1.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1#! /bin/sh 1#! /bin/sh
2# test-driver - basic testsuite driver script. 2# test-driver - basic testsuite driver script.
3 3
4scriptversion=2012-06-27.10; # UTC 4scriptversion=2013-07-13.22; # UTC
5 5
6# Copyright (C) 2011-2013 Free Software Foundation, Inc. 6# Copyright (C) 2011-2013 Free Software Foundation, Inc.
7# 7#
8# This program is free software; you can redistribute it and/or modify 8# This program is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2, or (at your option) 10# the Free Software Foundation; either version 2, or (at your option)
11# any later version. 11# any later version.
12# 12#
13# This program is distributed in the hope that it will be useful, 13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of 14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details. 16# GNU General Public License for more details.
17# 17#
@@ -34,55 +34,67 @@ set -u @@ -34,55 +34,67 @@ set -u
34usage_error () 34usage_error ()
35{ 35{
36 echo "$0: $*" >&2 36 echo "$0: $*" >&2
37 print_usage >&2 37 print_usage >&2
38 exit 2 38 exit 2
39} 39}
40 40
41print_usage () 41print_usage ()
42{ 42{
43 cat <<END 43 cat <<END
44Usage: 44Usage:
45 test-driver --test-name=NAME --log-file=PATH --trs-file=PATH 45 test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
46 [--expect-failure={yes|no}] [--color-tests={yes|no}] 46 [--expect-failure={yes|no}] [--color-tests={yes|no}]
47 [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT 47 [--enable-hard-errors={yes|no}] [--]
 48 TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
48The '--test-name', '--log-file' and '--trs-file' options are mandatory. 49The '--test-name', '--log-file' and '--trs-file' options are mandatory.
49END 50END
50} 51}
51 52
52# TODO: better error handling in option parsing (in particular, ensure 
53# TODO: $log_file, $trs_file and $test_name are defined). 
54test_name= # Used for reporting. 53test_name= # Used for reporting.
55log_file= # Where to save the output of the test script. 54log_file= # Where to save the output of the test script.
56trs_file= # Where to save the metadata of the test run. 55trs_file= # Where to save the metadata of the test run.
57expect_failure=no 56expect_failure=no
58color_tests=no 57color_tests=no
59enable_hard_errors=yes 58enable_hard_errors=yes
60while test $# -gt 0; do 59while test $# -gt 0; do
61 case $1 in 60 case $1 in
62 --help) print_usage; exit $?;; 61 --help) print_usage; exit $?;;
63 --version) echo "test-driver $scriptversion"; exit $?;; 62 --version) echo "test-driver $scriptversion"; exit $?;;
64 --test-name) test_name=$2; shift;; 63 --test-name) test_name=$2; shift;;
65 --log-file) log_file=$2; shift;; 64 --log-file) log_file=$2; shift;;
66 --trs-file) trs_file=$2; shift;; 65 --trs-file) trs_file=$2; shift;;
67 --color-tests) color_tests=$2; shift;; 66 --color-tests) color_tests=$2; shift;;
68 --expect-failure) expect_failure=$2; shift;; 67 --expect-failure) expect_failure=$2; shift;;
69 --enable-hard-errors) enable_hard_errors=$2; shift;; 68 --enable-hard-errors) enable_hard_errors=$2; shift;;
70 --) shift; break;; 69 --) shift; break;;
71 -*) usage_error "invalid option: '$1'";; 70 -*) usage_error "invalid option: '$1'";;
 71 *) break;;
72 esac 72 esac
73 shift 73 shift
74done 74done
75 75
 76missing_opts=
 77test x"$test_name" = x && missing_opts="$missing_opts --test-name"
 78test x"$log_file" = x && missing_opts="$missing_opts --log-file"
 79test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
 80if test x"$missing_opts" != x; then
 81 usage_error "the following mandatory options are missing:$missing_opts"
 82fi
 83
 84if test $# -eq 0; then
 85 usage_error "missing argument"
 86fi
 87
76if test $color_tests = yes; then 88if test $color_tests = yes; then
77 # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. 89 # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
78 red='' # Red. 90 red='' # Red.
79 grn='' # Green. 91 grn='' # Green.
80 lgn='' # Light green. 92 lgn='' # Light green.
81 blu='' # Blue. 93 blu='' # Blue.
82 mgn='' # Magenta. 94 mgn='' # Magenta.
83 std='' # No color. 95 std='' # No color.
84else 96else
85 red= grn= lgn= blu= mgn= std= 97 red= grn= lgn= blu= mgn= std=
86fi 98fi
87 99
88do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' 100do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
cvs diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/exynos/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/exynos/Attic/Makefile.in 2014/12/23 01:16:57 1.1.1.1.2.1
+++ xsrc/external/mit/libdrm/dist/exynos/Attic/Makefile.in 2015/01/28 11:17:49 1.1.1.1.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -441,34 +441,34 @@ mostlyclean-compile: @@ -441,34 +441,34 @@ mostlyclean-compile:
441 -rm -f *.$(OBJEXT) 441 -rm -f *.$(OBJEXT)
442 442
443distclean-compile: 443distclean-compile:
444 -rm -f *.tab.c 444 -rm -f *.tab.c
445 445
446@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exynos_drm.Plo@am__quote@ 446@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exynos_drm.Plo@am__quote@
447@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exynos_fimg2d.Plo@am__quote@ 447@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exynos_fimg2d.Plo@am__quote@
448 448
449.c.o: 449.c.o:
450@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 450@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
451@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 451@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
452@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 452@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
453@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 453@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
454@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 454@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
455 455
456.c.obj: 456.c.obj:
457@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 457@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
458@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 458@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
459@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 459@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
460@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 460@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
461@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 461@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
462 462
463.c.lo: 463.c.lo:
464@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 464@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
465@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 465@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
466@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 466@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
467@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 467@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
468@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 468@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
469 469
470mostlyclean-libtool: 470mostlyclean-libtool:
471 -rm -f *.lo 471 -rm -f *.lo
472 472
473clean-libtool: 473clean-libtool:
474 -rm -rf .libs _libs 474 -rm -rf .libs _libs
cvs diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/freedreno/Attic/Makefile.am (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/freedreno/Attic/Makefile.am 2014/12/23 01:16:57 1.1.1.1.2.1
+++ xsrc/external/mit/libdrm/dist/freedreno/Attic/Makefile.am 2015/01/28 11:17:49 1.1.1.1.2.2
@@ -5,21 +5,24 @@ AM_CFLAGS = \ @@ -5,21 +5,24 @@ AM_CFLAGS = \
5 $(WARN_CFLAGS) \ 5 $(WARN_CFLAGS) \
6 $(VISIBILITY_CFLAGS) \ 6 $(VISIBILITY_CFLAGS) \
7 -I$(top_srcdir) \ 7 -I$(top_srcdir) \
8 -I$(top_srcdir)/freedreno \ 8 -I$(top_srcdir)/freedreno \
9 $(PTHREADSTUBS_CFLAGS) \ 9 $(PTHREADSTUBS_CFLAGS) \
10 -I$(top_srcdir)/include/drm 10 -I$(top_srcdir)/include/drm
11 11
12libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la 12libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la
13libdrm_freedreno_ladir = $(libdir) 13libdrm_freedreno_ladir = $(libdir)
14libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined 14libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined
15libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ 15libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
16 16
17libdrm_freedreno_la_SOURCES = $(LIBDRM_FREEDRENO_FILES) 17libdrm_freedreno_la_SOURCES = $(LIBDRM_FREEDRENO_FILES)
 18if HAVE_FREEDRENO_KGSL
 19libdrm_freedreno_la_SOURCES += $(LIBDRM_FREEDRENO_KGSL_FILES)
 20endif
18 21
19libdrm_freedrenocommonincludedir = ${includedir}/freedreno 22libdrm_freedrenocommonincludedir = ${includedir}/freedreno
20libdrm_freedrenocommoninclude_HEADERS = $(LIBDRM_FREEDRENO_H_FILES) 23libdrm_freedrenocommoninclude_HEADERS = $(LIBDRM_FREEDRENO_H_FILES)
21 24
22pkgconfigdir = @pkgconfigdir@ 25pkgconfigdir = @pkgconfigdir@
23pkgconfig_DATA = libdrm_freedreno.pc 26pkgconfig_DATA = libdrm_freedreno.pc
24 27
25EXTRA_DIST = Android.mk 28EXTRA_DIST = Android.mk
cvs diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/freedreno/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/freedreno/Attic/Makefile.in 2014/12/23 01:16:57 1.1.1.1.2.1
+++ xsrc/external/mit/libdrm/dist/freedreno/Attic/Makefile.in 2015/01/28 11:17:49 1.1.1.1.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -74,26 +74,27 @@ INSTALL_HEADER = $(INSTALL_DATA) @@ -74,26 +74,27 @@ INSTALL_HEADER = $(INSTALL_DATA)
74transform = $(program_transform_name) 74transform = $(program_transform_name)
75NORMAL_INSTALL = : 75NORMAL_INSTALL = :
76PRE_INSTALL = : 76PRE_INSTALL = :
77POST_INSTALL = : 77POST_INSTALL = :
78NORMAL_UNINSTALL = : 78NORMAL_UNINSTALL = :
79PRE_UNINSTALL = : 79PRE_UNINSTALL = :
80POST_UNINSTALL = : 80POST_UNINSTALL = :
81build_triplet = @build@ 81build_triplet = @build@
82host_triplet = @host@ 82host_triplet = @host@
83DIST_COMMON = $(srcdir)/Makefile.sources $(srcdir)/Makefile.in \ 83DIST_COMMON = $(srcdir)/Makefile.sources $(srcdir)/Makefile.in \
84 $(srcdir)/Makefile.am $(srcdir)/libdrm_freedreno.pc.in \ 84 $(srcdir)/Makefile.am $(srcdir)/libdrm_freedreno.pc.in \
85 $(top_srcdir)/build-aux/depcomp \ 85 $(top_srcdir)/build-aux/depcomp \
86 $(libdrm_freedrenocommoninclude_HEADERS) README 86 $(libdrm_freedrenocommoninclude_HEADERS) README
 87@HAVE_FREEDRENO_KGSL_TRUE@am__append_1 = $(LIBDRM_FREEDRENO_KGSL_FILES)
87subdir = freedreno 88subdir = freedreno
88ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 89ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
89am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ 90am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
90 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 91 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
91 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ 92 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
92 $(top_srcdir)/configure.ac 93 $(top_srcdir)/configure.ac
93am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 94am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
94 $(ACLOCAL_M4) 95 $(ACLOCAL_M4)
95mkinstalldirs = $(install_sh) -d 96mkinstalldirs = $(install_sh) -d
96CONFIG_HEADER = $(top_builddir)/config.h 97CONFIG_HEADER = $(top_builddir)/config.h
97CONFIG_CLEAN_FILES = libdrm_freedreno.pc 98CONFIG_CLEAN_FILES = libdrm_freedreno.pc
98CONFIG_CLEAN_VPATH_FILES = 99CONFIG_CLEAN_VPATH_FILES =
99am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 100am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -118,33 +119,41 @@ am__base_list = \ @@ -118,33 +119,41 @@ am__base_list = \
118 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ 119 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
119 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' 120 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
120am__uninstall_files_from_dir = { \ 121am__uninstall_files_from_dir = { \
121 test -z "$$files" \ 122 test -z "$$files" \
122 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ 123 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
123 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ 124 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
124 $(am__cd) "$$dir" && rm -f $$files; }; \ 125 $(am__cd) "$$dir" && rm -f $$files; }; \
125 } 126 }
126am__installdirs = "$(DESTDIR)$(libdrm_freedreno_ladir)" \ 127am__installdirs = "$(DESTDIR)$(libdrm_freedreno_ladir)" \
127 "$(DESTDIR)$(pkgconfigdir)" \ 128 "$(DESTDIR)$(pkgconfigdir)" \
128 "$(DESTDIR)$(libdrm_freedrenocommonincludedir)" 129 "$(DESTDIR)$(libdrm_freedrenocommonincludedir)"
129LTLIBRARIES = $(libdrm_freedreno_la_LTLIBRARIES) 130LTLIBRARIES = $(libdrm_freedreno_la_LTLIBRARIES)
130libdrm_freedreno_la_DEPENDENCIES = ../libdrm.la 131libdrm_freedreno_la_DEPENDENCIES = ../libdrm.la
 132am__libdrm_freedreno_la_SOURCES_DIST = freedreno_device.c \
 133 freedreno_pipe.c freedreno_priv.h freedreno_ringbuffer.c \
 134 freedreno_bo.c msm/msm_bo.c msm/msm_device.c msm/msm_drm.h \
 135 msm/msm_pipe.c msm/msm_priv.h msm/msm_ringbuffer.c list.h \
 136 kgsl/kgsl_bo.c kgsl/kgsl_device.c kgsl/kgsl_drm.h \
 137 kgsl/kgsl_pipe.c kgsl/kgsl_priv.h kgsl/kgsl_ringbuffer.c \
 138 kgsl/msm_kgsl.h
131am__dirstamp = $(am__leading_dot)dirstamp 139am__dirstamp = $(am__leading_dot)dirstamp
132am__objects_1 = freedreno_device.lo freedreno_pipe.lo \ 140am__objects_1 = freedreno_device.lo freedreno_pipe.lo \
133 freedreno_ringbuffer.lo freedreno_bo.lo kgsl/kgsl_bo.lo \ 141 freedreno_ringbuffer.lo freedreno_bo.lo msm/msm_bo.lo \
134 kgsl/kgsl_device.lo kgsl/kgsl_pipe.lo kgsl/kgsl_ringbuffer.lo \ 142 msm/msm_device.lo msm/msm_pipe.lo msm/msm_ringbuffer.lo
135 msm/msm_bo.lo msm/msm_device.lo msm/msm_pipe.lo \ 143am__objects_2 = kgsl/kgsl_bo.lo kgsl/kgsl_device.lo kgsl/kgsl_pipe.lo \
136 msm/msm_ringbuffer.lo 144 kgsl/kgsl_ringbuffer.lo
137am_libdrm_freedreno_la_OBJECTS = $(am__objects_1) 145@HAVE_FREEDRENO_KGSL_TRUE@am__objects_3 = $(am__objects_2)
 146am_libdrm_freedreno_la_OBJECTS = $(am__objects_1) $(am__objects_3)
138libdrm_freedreno_la_OBJECTS = $(am_libdrm_freedreno_la_OBJECTS) 147libdrm_freedreno_la_OBJECTS = $(am_libdrm_freedreno_la_OBJECTS)
139AM_V_lt = $(am__v_lt_@AM_V@) 148AM_V_lt = $(am__v_lt_@AM_V@)
140am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) 149am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
141am__v_lt_0 = --silent 150am__v_lt_0 = --silent
142am__v_lt_1 =  151am__v_lt_1 =
143libdrm_freedreno_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ 152libdrm_freedreno_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
144 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ 153 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
145 $(AM_CFLAGS) $(CFLAGS) $(libdrm_freedreno_la_LDFLAGS) \ 154 $(AM_CFLAGS) $(CFLAGS) $(libdrm_freedreno_la_LDFLAGS) \
146 $(LDFLAGS) -o $@ 155 $(LDFLAGS) -o $@
147AM_V_P = $(am__v_P_@AM_V@) 156AM_V_P = $(am__v_P_@AM_V@)
148am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) 157am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
149am__v_P_0 = false 158am__v_P_0 = false
150am__v_P_1 = : 159am__v_P_1 = :
@@ -169,27 +178,27 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag= @@ -169,27 +178,27 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=
169AM_V_CC = $(am__v_CC_@AM_V@) 178AM_V_CC = $(am__v_CC_@AM_V@)
170am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) 179am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
171am__v_CC_0 = @echo " CC " $@; 180am__v_CC_0 = @echo " CC " $@;
172am__v_CC_1 =  181am__v_CC_1 =
173CCLD = $(CC) 182CCLD = $(CC)
174LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ 183LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
175 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 184 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
176 $(AM_LDFLAGS) $(LDFLAGS) -o $@ 185 $(AM_LDFLAGS) $(LDFLAGS) -o $@
177AM_V_CCLD = $(am__v_CCLD_@AM_V@) 186AM_V_CCLD = $(am__v_CCLD_@AM_V@)
178am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) 187am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
179am__v_CCLD_0 = @echo " CCLD " $@; 188am__v_CCLD_0 = @echo " CCLD " $@;
180am__v_CCLD_1 =  189am__v_CCLD_1 =
181SOURCES = $(libdrm_freedreno_la_SOURCES) 190SOURCES = $(libdrm_freedreno_la_SOURCES)
182DIST_SOURCES = $(libdrm_freedreno_la_SOURCES) 191DIST_SOURCES = $(am__libdrm_freedreno_la_SOURCES_DIST)
183am__can_run_installinfo = \ 192am__can_run_installinfo = \
184 case $$AM_UPDATE_INFO_DIR in \ 193 case $$AM_UPDATE_INFO_DIR in \
185 n|no|NO) false;; \ 194 n|no|NO) false;; \
186 *) (install-info --version) >/dev/null 2>&1;; \ 195 *) (install-info --version) >/dev/null 2>&1;; \
187 esac 196 esac
188DATA = $(pkgconfig_DATA) 197DATA = $(pkgconfig_DATA)
189HEADERS = $(libdrm_freedrenocommoninclude_HEADERS) 198HEADERS = $(libdrm_freedrenocommoninclude_HEADERS)
190am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) 199am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
191# Read a list of newline-separated strings from the standard input, 200# Read a list of newline-separated strings from the standard input,
192# and print each of them once, without duplicates. Input order is 201# and print each of them once, without duplicates. Input order is
193# *not* preserved. 202# *not* preserved.
194am__uniquify_input = $(AWK) '\ 203am__uniquify_input = $(AWK) '\
195 BEGIN { nonempty = 0; } \ 204 BEGIN { nonempty = 0; } \
@@ -340,58 +349,61 @@ sharedstatedir = @sharedstatedir@ @@ -340,58 +349,61 @@ sharedstatedir = @sharedstatedir@
340srcdir = @srcdir@ 349srcdir = @srcdir@
341sysconfdir = @sysconfdir@ 350sysconfdir = @sysconfdir@
342target_alias = @target_alias@ 351target_alias = @target_alias@
343top_build_prefix = @top_build_prefix@ 352top_build_prefix = @top_build_prefix@
344top_builddir = @top_builddir@ 353top_builddir = @top_builddir@
345top_srcdir = @top_srcdir@ 354top_srcdir = @top_srcdir@
346AUTOMAKE_OPTIONS = subdir-objects 355AUTOMAKE_OPTIONS = subdir-objects
347LIBDRM_FREEDRENO_FILES := \ 356LIBDRM_FREEDRENO_FILES := \
348 freedreno_device.c \ 357 freedreno_device.c \
349 freedreno_pipe.c \ 358 freedreno_pipe.c \
350 freedreno_priv.h \ 359 freedreno_priv.h \
351 freedreno_ringbuffer.c \ 360 freedreno_ringbuffer.c \
352 freedreno_bo.c \ 361 freedreno_bo.c \
353 kgsl/kgsl_bo.c \ 
354 kgsl/kgsl_device.c \ 
355 kgsl/kgsl_drm.h \ 
356 kgsl/kgsl_pipe.c \ 
357 kgsl/kgsl_priv.h \ 
358 kgsl/kgsl_ringbuffer.c \ 
359 kgsl/msm_kgsl.h \ 
360 msm/msm_bo.c \ 362 msm/msm_bo.c \
361 msm/msm_device.c \ 363 msm/msm_device.c \
362 msm/msm_drm.h \ 364 msm/msm_drm.h \
363 msm/msm_pipe.c \ 365 msm/msm_pipe.c \
364 msm/msm_priv.h \ 366 msm/msm_priv.h \
365 msm/msm_ringbuffer.c \ 367 msm/msm_ringbuffer.c \
366 list.h 368 list.h
367 369
 370LIBDRM_FREEDRENO_KGSL_FILES := \
 371 kgsl/kgsl_bo.c \
 372 kgsl/kgsl_device.c \
 373 kgsl/kgsl_drm.h \
 374 kgsl/kgsl_pipe.c \
 375 kgsl/kgsl_priv.h \
 376 kgsl/kgsl_ringbuffer.c \
 377 kgsl/msm_kgsl.h
 378
368LIBDRM_FREEDRENO_H_FILES := \ 379LIBDRM_FREEDRENO_H_FILES := \
369 freedreno_drmif.h \ 380 freedreno_drmif.h \
370 freedreno_ringbuffer.h 381 freedreno_ringbuffer.h
371 382
372AM_CFLAGS = \ 383AM_CFLAGS = \
373 $(WARN_CFLAGS) \ 384 $(WARN_CFLAGS) \
374 $(VISIBILITY_CFLAGS) \ 385 $(VISIBILITY_CFLAGS) \
375 -I$(top_srcdir) \ 386 -I$(top_srcdir) \
376 -I$(top_srcdir)/freedreno \ 387 -I$(top_srcdir)/freedreno \
377 $(PTHREADSTUBS_CFLAGS) \ 388 $(PTHREADSTUBS_CFLAGS) \
378 -I$(top_srcdir)/include/drm 389 -I$(top_srcdir)/include/drm
379 390
380libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la 391libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la
381libdrm_freedreno_ladir = $(libdir) 392libdrm_freedreno_ladir = $(libdir)
382libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined 393libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined
383libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ 394libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
384libdrm_freedreno_la_SOURCES = $(LIBDRM_FREEDRENO_FILES) 395libdrm_freedreno_la_SOURCES = $(LIBDRM_FREEDRENO_FILES) \
 396 $(am__append_1)
385libdrm_freedrenocommonincludedir = ${includedir}/freedreno 397libdrm_freedrenocommonincludedir = ${includedir}/freedreno
386libdrm_freedrenocommoninclude_HEADERS = $(LIBDRM_FREEDRENO_H_FILES) 398libdrm_freedrenocommoninclude_HEADERS = $(LIBDRM_FREEDRENO_H_FILES)
387pkgconfig_DATA = libdrm_freedreno.pc 399pkgconfig_DATA = libdrm_freedreno.pc
388EXTRA_DIST = Android.mk 400EXTRA_DIST = Android.mk
389all: all-am 401all: all-am
390 402
391.SUFFIXES: 403.SUFFIXES:
392.SUFFIXES: .c .lo .o .obj 404.SUFFIXES: .c .lo .o .obj
393$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.sources $(am__configure_deps) 405$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.sources $(am__configure_deps)
394 @for dep in $?; do \ 406 @for dep in $?; do \
395 case '$(am__configure_deps)' in \ 407 case '$(am__configure_deps)' in \
396 *$$dep*) \ 408 *$$dep*) \
397 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ 409 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
@@ -448,49 +460,49 @@ uninstall-libdrm_freedreno_laLTLIBRARIES @@ -448,49 +460,49 @@ uninstall-libdrm_freedreno_laLTLIBRARIES
448 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdrm_freedreno_ladir)/$$f"; \ 460 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdrm_freedreno_ladir)/$$f"; \
449 done 461 done
450 462
451clean-libdrm_freedreno_laLTLIBRARIES: 463clean-libdrm_freedreno_laLTLIBRARIES:
452 -test -z "$(libdrm_freedreno_la_LTLIBRARIES)" || rm -f $(libdrm_freedreno_la_LTLIBRARIES) 464 -test -z "$(libdrm_freedreno_la_LTLIBRARIES)" || rm -f $(libdrm_freedreno_la_LTLIBRARIES)
453 @list='$(libdrm_freedreno_la_LTLIBRARIES)'; \ 465 @list='$(libdrm_freedreno_la_LTLIBRARIES)'; \
454 locs=`for p in $$list; do echo $$p; done | \ 466 locs=`for p in $$list; do echo $$p; done | \
455 sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ 467 sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
456 sort -u`; \ 468 sort -u`; \
457 test -z "$$locs" || { \ 469 test -z "$$locs" || { \
458 echo rm -f $${locs}; \ 470 echo rm -f $${locs}; \
459 rm -f $${locs}; \ 471 rm -f $${locs}; \
460 } 472 }
 473msm/$(am__dirstamp):
 474 @$(MKDIR_P) msm
 475 @: > msm/$(am__dirstamp)
 476msm/$(DEPDIR)/$(am__dirstamp):
 477 @$(MKDIR_P) msm/$(DEPDIR)
 478 @: > msm/$(DEPDIR)/$(am__dirstamp)
 479msm/msm_bo.lo: msm/$(am__dirstamp) msm/$(DEPDIR)/$(am__dirstamp)
 480msm/msm_device.lo: msm/$(am__dirstamp) msm/$(DEPDIR)/$(am__dirstamp)
 481msm/msm_pipe.lo: msm/$(am__dirstamp) msm/$(DEPDIR)/$(am__dirstamp)
 482msm/msm_ringbuffer.lo: msm/$(am__dirstamp) \
 483 msm/$(DEPDIR)/$(am__dirstamp)
461kgsl/$(am__dirstamp): 484kgsl/$(am__dirstamp):
462 @$(MKDIR_P) kgsl 485 @$(MKDIR_P) kgsl
463 @: > kgsl/$(am__dirstamp) 486 @: > kgsl/$(am__dirstamp)
464kgsl/$(DEPDIR)/$(am__dirstamp): 487kgsl/$(DEPDIR)/$(am__dirstamp):
465 @$(MKDIR_P) kgsl/$(DEPDIR) 488 @$(MKDIR_P) kgsl/$(DEPDIR)
466 @: > kgsl/$(DEPDIR)/$(am__dirstamp) 489 @: > kgsl/$(DEPDIR)/$(am__dirstamp)
467kgsl/kgsl_bo.lo: kgsl/$(am__dirstamp) kgsl/$(DEPDIR)/$(am__dirstamp) 490kgsl/kgsl_bo.lo: kgsl/$(am__dirstamp) kgsl/$(DEPDIR)/$(am__dirstamp)
468kgsl/kgsl_device.lo: kgsl/$(am__dirstamp) \ 491kgsl/kgsl_device.lo: kgsl/$(am__dirstamp) \
469 kgsl/$(DEPDIR)/$(am__dirstamp) 492 kgsl/$(DEPDIR)/$(am__dirstamp)
470kgsl/kgsl_pipe.lo: kgsl/$(am__dirstamp) kgsl/$(DEPDIR)/$(am__dirstamp) 493kgsl/kgsl_pipe.lo: kgsl/$(am__dirstamp) kgsl/$(DEPDIR)/$(am__dirstamp)
471kgsl/kgsl_ringbuffer.lo: kgsl/$(am__dirstamp) \ 494kgsl/kgsl_ringbuffer.lo: kgsl/$(am__dirstamp) \
472 kgsl/$(DEPDIR)/$(am__dirstamp) 495 kgsl/$(DEPDIR)/$(am__dirstamp)
473msm/$(am__dirstamp): 
474 @$(MKDIR_P) msm 
475 @: > msm/$(am__dirstamp) 
476msm/$(DEPDIR)/$(am__dirstamp): 
477 @$(MKDIR_P) msm/$(DEPDIR) 
478 @: > msm/$(DEPDIR)/$(am__dirstamp) 
479msm/msm_bo.lo: msm/$(am__dirstamp) msm/$(DEPDIR)/$(am__dirstamp) 
480msm/msm_device.lo: msm/$(am__dirstamp) msm/$(DEPDIR)/$(am__dirstamp) 
481msm/msm_pipe.lo: msm/$(am__dirstamp) msm/$(DEPDIR)/$(am__dirstamp) 
482msm/msm_ringbuffer.lo: msm/$(am__dirstamp) \ 
483 msm/$(DEPDIR)/$(am__dirstamp) 
484 496
485libdrm_freedreno.la: $(libdrm_freedreno_la_OBJECTS) $(libdrm_freedreno_la_DEPENDENCIES) $(EXTRA_libdrm_freedreno_la_DEPENDENCIES)  497libdrm_freedreno.la: $(libdrm_freedreno_la_OBJECTS) $(libdrm_freedreno_la_DEPENDENCIES) $(EXTRA_libdrm_freedreno_la_DEPENDENCIES)
486 $(AM_V_CCLD)$(libdrm_freedreno_la_LINK) -rpath $(libdrm_freedreno_ladir) $(libdrm_freedreno_la_OBJECTS) $(libdrm_freedreno_la_LIBADD) $(LIBS) 498 $(AM_V_CCLD)$(libdrm_freedreno_la_LINK) -rpath $(libdrm_freedreno_ladir) $(libdrm_freedreno_la_OBJECTS) $(libdrm_freedreno_la_LIBADD) $(LIBS)
487 499
488mostlyclean-compile: 500mostlyclean-compile:
489 -rm -f *.$(OBJEXT) 501 -rm -f *.$(OBJEXT)
490 -rm -f kgsl/*.$(OBJEXT) 502 -rm -f kgsl/*.$(OBJEXT)
491 -rm -f kgsl/*.lo 503 -rm -f kgsl/*.lo
492 -rm -f msm/*.$(OBJEXT) 504 -rm -f msm/*.$(OBJEXT)
493 -rm -f msm/*.lo 505 -rm -f msm/*.lo
494 506
495distclean-compile: 507distclean-compile:
496 -rm -f *.tab.c 508 -rm -f *.tab.c
cvs diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c 2014/12/23 01:16:57 1.1.1.1.2.1
+++ xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c 2015/01/28 11:17:49 1.1.1.1.2.2
@@ -197,27 +197,34 @@ fd_bo_new(struct fd_device *dev, uint32_ @@ -197,27 +197,34 @@ fd_bo_new(struct fd_device *dev, uint32_
197 bo = bo_from_handle(dev, size, handle); 197 bo = bo_from_handle(dev, size, handle);
198 bo->bo_reuse = 1; 198 bo->bo_reuse = 1;
199 pthread_mutex_unlock(&table_lock); 199 pthread_mutex_unlock(&table_lock);
200 200
201 return bo; 201 return bo;
202} 202}
203 203
204drm_public struct fd_bo * 204drm_public struct fd_bo *
205fd_bo_from_handle(struct fd_device *dev, uint32_t handle, uint32_t size) 205fd_bo_from_handle(struct fd_device *dev, uint32_t handle, uint32_t size)
206{ 206{
207 struct fd_bo *bo = NULL; 207 struct fd_bo *bo = NULL;
208 208
209 pthread_mutex_lock(&table_lock); 209 pthread_mutex_lock(&table_lock);
 210
 211 bo = lookup_bo(dev->handle_table, handle);
 212 if (bo)
 213 goto out_unlock;
 214
210 bo = bo_from_handle(dev, size, handle); 215 bo = bo_from_handle(dev, size, handle);
 216
 217out_unlock:
211 pthread_mutex_unlock(&table_lock); 218 pthread_mutex_unlock(&table_lock);
212 219
213 return bo; 220 return bo;
214} 221}
215 222
216drm_public struct fd_bo * 223drm_public struct fd_bo *
217fd_bo_from_dmabuf(struct fd_device *dev, int fd) 224fd_bo_from_dmabuf(struct fd_device *dev, int fd)
218{ 225{
219 struct drm_prime_handle req = { 226 struct drm_prime_handle req = {
220 .fd = fd, 227 .fd = fd,
221 }; 228 };
222 int ret, size; 229 int ret, size;
223 230
cvs diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources 2014/12/23 01:16:57 1.1.1.1.2.2
+++ xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources 2015/01/28 11:17:49 1.1.1.1.2.3
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1LIBDRM_FREEDRENO_FILES := \ 1LIBDRM_FREEDRENO_FILES := \
2 freedreno_device.c \ 2 freedreno_device.c \
3 freedreno_pipe.c \ 3 freedreno_pipe.c \
4 freedreno_priv.h \ 4 freedreno_priv.h \
5 freedreno_ringbuffer.c \ 5 freedreno_ringbuffer.c \
6 freedreno_bo.c \ 6 freedreno_bo.c \
7 kgsl/kgsl_bo.c \ 
8 kgsl/kgsl_device.c \ 
9 kgsl/kgsl_drm.h \ 
10 kgsl/kgsl_pipe.c \ 
11 kgsl/kgsl_priv.h \ 
12 kgsl/kgsl_ringbuffer.c \ 
13 kgsl/msm_kgsl.h \ 
14 msm/msm_bo.c \ 7 msm/msm_bo.c \
15 msm/msm_device.c \ 8 msm/msm_device.c \
16 msm/msm_drm.h \ 9 msm/msm_drm.h \
17 msm/msm_pipe.c \ 10 msm/msm_pipe.c \
18 msm/msm_priv.h \ 11 msm/msm_priv.h \
19 msm/msm_ringbuffer.c \ 12 msm/msm_ringbuffer.c \
20 list.h 13 list.h
21 14
 15LIBDRM_FREEDRENO_KGSL_FILES := \
 16 kgsl/kgsl_bo.c \
 17 kgsl/kgsl_device.c \
 18 kgsl/kgsl_drm.h \
 19 kgsl/kgsl_pipe.c \
 20 kgsl/kgsl_priv.h \
 21 kgsl/kgsl_ringbuffer.c \
 22 kgsl/msm_kgsl.h
 23
22LIBDRM_FREEDRENO_H_FILES := \ 24LIBDRM_FREEDRENO_H_FILES := \
23 freedreno_drmif.h \ 25 freedreno_drmif.h \
24 freedreno_ringbuffer.h 26 freedreno_ringbuffer.h
cvs diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c 2014/12/23 01:16:57 1.1.1.2.2.1
+++ xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c 2015/01/28 11:17:49 1.1.1.2.2.2
@@ -82,32 +82,34 @@ init_cache_buckets(struct fd_device *dev @@ -82,32 +82,34 @@ init_cache_buckets(struct fd_device *dev
82 82
83drm_public struct fd_device * fd_device_new(int fd) 83drm_public struct fd_device * fd_device_new(int fd)
84{ 84{
85 struct fd_device *dev; 85 struct fd_device *dev;
86 drmVersionPtr version; 86 drmVersionPtr version;
87 87
88 /* figure out if we are kgsl or msm drm driver: */ 88 /* figure out if we are kgsl or msm drm driver: */
89 version = drmGetVersion(fd); 89 version = drmGetVersion(fd);
90 if (!version) { 90 if (!version) {
91 ERROR_MSG("cannot get version: %s", strerror(errno)); 91 ERROR_MSG("cannot get version: %s", strerror(errno));
92 return NULL; 92 return NULL;
93 } 93 }
94 94
95 if (!strcmp(version->name, "kgsl")) { 95 if (!strcmp(version->name, "msm")) {
96 DEBUG_MSG("kgsl DRM device"); 
97 dev = kgsl_device_new(fd); 
98 } else if (!strcmp(version->name, "msm")) { 
99 DEBUG_MSG("msm DRM device"); 96 DEBUG_MSG("msm DRM device");
100 dev = msm_device_new(fd); 97 dev = msm_device_new(fd);
 98#ifdef HAVE_FREEDRENO_KGSL
 99 } else if (!strcmp(version->name, "kgsl")) {
 100 DEBUG_MSG("kgsl DRM device");
 101 dev = kgsl_device_new(fd);
 102#endif
101 } else { 103 } else {
102 ERROR_MSG("unknown device: %s", version->name); 104 ERROR_MSG("unknown device: %s", version->name);
103 dev = NULL; 105 dev = NULL;
104 } 106 }
105 drmFreeVersion(version); 107 drmFreeVersion(version);
106 108
107 if (!dev) 109 if (!dev)
108 return NULL; 110 return NULL;
109 111
110 atomic_set(&dev->refcnt, 1); 112 atomic_set(&dev->refcnt, 1);
111 dev->fd = fd; 113 dev->fd = fd;
112 dev->handle_table = drmHashCreate(); 114 dev->handle_table = drmHashCreate();
113 dev->name_table = drmHashCreate(); 115 dev->name_table = drmHashCreate();
cvs diff -r1.1.1.4 -r1.1.1.4.2.1 xsrc/external/mit/libdrm/dist/include/drm/drm_mode.h (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/include/drm/drm_mode.h 2014/03/17 07:51:43 1.1.1.4
+++ xsrc/external/mit/libdrm/dist/include/drm/drm_mode.h 2015/01/28 11:17:49 1.1.1.4.2.1
@@ -163,26 +163,29 @@ struct drm_mode_get_plane { @@ -163,26 +163,29 @@ struct drm_mode_get_plane {
163 __u64 format_type_ptr; 163 __u64 format_type_ptr;
164}; 164};
165 165
166struct drm_mode_get_plane_res { 166struct drm_mode_get_plane_res {
167 __u64 plane_id_ptr; 167 __u64 plane_id_ptr;
168 __u32 count_planes; 168 __u32 count_planes;
169}; 169};
170 170
171#define DRM_MODE_ENCODER_NONE 0 171#define DRM_MODE_ENCODER_NONE 0
172#define DRM_MODE_ENCODER_DAC 1 172#define DRM_MODE_ENCODER_DAC 1
173#define DRM_MODE_ENCODER_TMDS 2 173#define DRM_MODE_ENCODER_TMDS 2
174#define DRM_MODE_ENCODER_LVDS 3 174#define DRM_MODE_ENCODER_LVDS 3
175#define DRM_MODE_ENCODER_TVDAC 4 175#define DRM_MODE_ENCODER_TVDAC 4
 176#define DRM_MODE_ENCODER_VIRTUAL 5
 177#define DRM_MODE_ENCODER_DSI 6
 178#define DRM_MODE_ENCODER_DPMST 7
176 179
177struct drm_mode_get_encoder { 180struct drm_mode_get_encoder {
178 __u32 encoder_id; 181 __u32 encoder_id;
179 __u32 encoder_type; 182 __u32 encoder_type;
180 183
181 __u32 crtc_id; /**< Id of crtc */ 184 __u32 crtc_id; /**< Id of crtc */
182 185
183 __u32 possible_crtcs; 186 __u32 possible_crtcs;
184 __u32 possible_clones; 187 __u32 possible_clones;
185}; 188};
186 189
187/* This is for connectors with multiple signal types. */ 190/* This is for connectors with multiple signal types. */
188/* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */ 191/* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */
@@ -200,26 +203,28 @@ struct drm_mode_get_encoder { @@ -200,26 +203,28 @@ struct drm_mode_get_encoder {
200#define DRM_MODE_CONNECTOR_DVII 2 203#define DRM_MODE_CONNECTOR_DVII 2
201#define DRM_MODE_CONNECTOR_DVID 3 204#define DRM_MODE_CONNECTOR_DVID 3
202#define DRM_MODE_CONNECTOR_DVIA 4 205#define DRM_MODE_CONNECTOR_DVIA 4
203#define DRM_MODE_CONNECTOR_Composite 5 206#define DRM_MODE_CONNECTOR_Composite 5
204#define DRM_MODE_CONNECTOR_SVIDEO 6 207#define DRM_MODE_CONNECTOR_SVIDEO 6
205#define DRM_MODE_CONNECTOR_LVDS 7 208#define DRM_MODE_CONNECTOR_LVDS 7
206#define DRM_MODE_CONNECTOR_Component 8 209#define DRM_MODE_CONNECTOR_Component 8
207#define DRM_MODE_CONNECTOR_9PinDIN 9 210#define DRM_MODE_CONNECTOR_9PinDIN 9
208#define DRM_MODE_CONNECTOR_DisplayPort 10 211#define DRM_MODE_CONNECTOR_DisplayPort 10
209#define DRM_MODE_CONNECTOR_HDMIA 11 212#define DRM_MODE_CONNECTOR_HDMIA 11
210#define DRM_MODE_CONNECTOR_HDMIB 12 213#define DRM_MODE_CONNECTOR_HDMIB 12
211#define DRM_MODE_CONNECTOR_TV 13 214#define DRM_MODE_CONNECTOR_TV 13
212#define DRM_MODE_CONNECTOR_eDP 14 215#define DRM_MODE_CONNECTOR_eDP 14
 216#define DRM_MODE_CONNECTOR_VIRTUAL 15
 217#define DRM_MODE_CONNECTOR_DSI 16
213 218
214struct drm_mode_get_connector { 219struct drm_mode_get_connector {
215 220
216 __u64 encoders_ptr; 221 __u64 encoders_ptr;
217 __u64 modes_ptr; 222 __u64 modes_ptr;
218 __u64 props_ptr; 223 __u64 props_ptr;
219 __u64 prop_values_ptr; 224 __u64 prop_values_ptr;
220 225
221 __u32 count_modes; 226 __u32 count_modes;
222 __u32 count_props; 227 __u32 count_props;
223 __u32 count_encoders; 228 __u32 count_encoders;
224 229
225 __u32 encoder_id; /**< Current Encoder */ 230 __u32 encoder_id; /**< Current Encoder */
@@ -229,26 +234,41 @@ struct drm_mode_get_connector { @@ -229,26 +234,41 @@ struct drm_mode_get_connector {
229 234
230 __u32 connection; 235 __u32 connection;
231 __u32 mm_width, mm_height; /**< HxW in millimeters */ 236 __u32 mm_width, mm_height; /**< HxW in millimeters */
232 __u32 subpixel; 237 __u32 subpixel;
233}; 238};
234 239
235#define DRM_MODE_PROP_PENDING (1<<0) 240#define DRM_MODE_PROP_PENDING (1<<0)
236#define DRM_MODE_PROP_RANGE (1<<1) 241#define DRM_MODE_PROP_RANGE (1<<1)
237#define DRM_MODE_PROP_IMMUTABLE (1<<2) 242#define DRM_MODE_PROP_IMMUTABLE (1<<2)
238#define DRM_MODE_PROP_ENUM (1<<3) /* enumerated type with text strings */ 243#define DRM_MODE_PROP_ENUM (1<<3) /* enumerated type with text strings */
239#define DRM_MODE_PROP_BLOB (1<<4) 244#define DRM_MODE_PROP_BLOB (1<<4)
240#define DRM_MODE_PROP_BITMASK (1<<5) /* bitmask of enumerated types */ 245#define DRM_MODE_PROP_BITMASK (1<<5) /* bitmask of enumerated types */
241 246
 247/* non-extended types: legacy bitmask, one bit per type: */
 248#define DRM_MODE_PROP_LEGACY_TYPE ( \
 249 DRM_MODE_PROP_RANGE | \
 250 DRM_MODE_PROP_ENUM | \
 251 DRM_MODE_PROP_BLOB | \
 252 DRM_MODE_PROP_BITMASK)
 253
 254/* extended-types: rather than continue to consume a bit per type,
 255 * grab a chunk of the bits to use as integer type id.
 256 */
 257#define DRM_MODE_PROP_EXTENDED_TYPE 0x0000ffc0
 258#define DRM_MODE_PROP_TYPE(n) ((n) << 6)
 259#define DRM_MODE_PROP_OBJECT DRM_MODE_PROP_TYPE(1)
 260#define DRM_MODE_PROP_SIGNED_RANGE DRM_MODE_PROP_TYPE(2)
 261
242struct drm_mode_property_enum { 262struct drm_mode_property_enum {
243 __u64 value; 263 __u64 value;
244 char name[DRM_PROP_NAME_LEN]; 264 char name[DRM_PROP_NAME_LEN];
245}; 265};
246 266
247struct drm_mode_get_property { 267struct drm_mode_get_property {
248 __u64 values_ptr; /* values and blob lengths */ 268 __u64 values_ptr; /* values and blob lengths */
249 __u64 enum_blob_ptr; /* enum and blob id ptrs */ 269 __u64 enum_blob_ptr; /* enum and blob id ptrs */
250 270
251 __u32 prop_id; 271 __u32 prop_id;
252 __u32 flags; 272 __u32 flags;
253 char name[DRM_PROP_NAME_LEN]; 273 char name[DRM_PROP_NAME_LEN];
254 274
File Added: xsrc/external/mit/libdrm/dist/include/drm/tegra_drm.h
/*
 * Copyright (c) 2012-2013, NVIDIA CORPORATION.  All rights reserved.
 *
 * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
 */

#ifndef _UAPI_TEGRA_DRM_H_
#define _UAPI_TEGRA_DRM_H_

#include <drm.h>

#define DRM_TEGRA_GEM_CREATE_TILED     (1 << 0)
#define DRM_TEGRA_GEM_CREATE_BOTTOM_UP (1 << 1)

struct drm_tegra_gem_create {
	__u64 size;
	__u32 flags;
	__u32 handle;
};

struct drm_tegra_gem_mmap {
	__u32 handle;
	__u32 offset;
};

struct drm_tegra_syncpt_read {
	__u32 id;
	__u32 value;
};

struct drm_tegra_syncpt_incr {
	__u32 id;
	__u32 pad;
};

struct drm_tegra_syncpt_wait {
	__u32 id;
	__u32 thresh;
	__u32 timeout;
	__u32 value;
};

#define DRM_TEGRA_NO_TIMEOUT	(0xffffffff)

struct drm_tegra_open_channel {
	__u32 client;
	__u32 pad;
	__u64 context;
};

struct drm_tegra_close_channel {
	__u64 context;
};

struct drm_tegra_get_syncpt {
	__u64 context;
	__u32 index;
	__u32 id;
};

struct drm_tegra_get_syncpt_base {
	__u64 context;
	__u32 syncpt;
	__u32 id;
};

struct drm_tegra_syncpt {
	__u32 id;
	__u32 incrs;
};

struct drm_tegra_cmdbuf {
	__u32 handle;
	__u32 offset;
	__u32 words;
	__u32 pad;
};

struct drm_tegra_reloc {
	struct {
		__u32 handle;
		__u32 offset;
	} cmdbuf;
	struct {
		__u32 handle;
		__u32 offset;
	} target;
	__u32 shift;
	__u32 pad;
};

struct drm_tegra_waitchk {
	__u32 handle;
	__u32 offset;
	__u32 syncpt;
	__u32 thresh;
};

struct drm_tegra_submit {
	__u64 context;
	__u32 num_syncpts;
	__u32 num_cmdbufs;
	__u32 num_relocs;
	__u32 num_waitchks;
	__u32 waitchk_mask;
	__u32 timeout;
	__u64 syncpts;
	__u64 cmdbufs;
	__u64 relocs;
	__u64 waitchks;
	__u32 fence;		/* Return value */

	__u32 reserved[5];	/* future expansion */
};

#define DRM_TEGRA_GEM_TILING_MODE_PITCH 0
#define DRM_TEGRA_GEM_TILING_MODE_TILED 1
#define DRM_TEGRA_GEM_TILING_MODE_BLOCK 2

struct drm_tegra_gem_set_tiling {
	/* input */
	__u32 handle;
	__u32 mode;
	__u32 value;
	__u32 pad;
};

struct drm_tegra_gem_get_tiling {
	/* input */
	__u32 handle;
	/* output */
	__u32 mode;
	__u32 value;
	__u32 pad;
};

#define DRM_TEGRA_GEM_BOTTOM_UP		(1 << 0)
#define DRM_TEGRA_GEM_FLAGS		(DRM_TEGRA_GEM_BOTTOM_UP)

struct drm_tegra_gem_set_flags {
	/* input */
	__u32 handle;
	/* output */
	__u32 flags;
};

struct drm_tegra_gem_get_flags {
	/* input */
	__u32 handle;
	/* output */
	__u32 flags;
};

#define DRM_TEGRA_GEM_CREATE		0x00
#define DRM_TEGRA_GEM_MMAP		0x01
#define DRM_TEGRA_SYNCPT_READ		0x02
#define DRM_TEGRA_SYNCPT_INCR		0x03
#define DRM_TEGRA_SYNCPT_WAIT		0x04
#define DRM_TEGRA_OPEN_CHANNEL		0x05
#define DRM_TEGRA_CLOSE_CHANNEL		0x06
#define DRM_TEGRA_GET_SYNCPT		0x07
#define DRM_TEGRA_SUBMIT		0x08
#define DRM_TEGRA_GET_SYNCPT_BASE	0x09
#define DRM_TEGRA_GEM_SET_TILING	0x0a
#define DRM_TEGRA_GEM_GET_TILING	0x0b
#define DRM_TEGRA_GEM_SET_FLAGS		0x0c
#define DRM_TEGRA_GEM_GET_FLAGS		0x0d

#define DRM_IOCTL_TEGRA_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_CREATE, struct drm_tegra_gem_create)
#define DRM_IOCTL_TEGRA_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_MMAP, struct drm_tegra_gem_mmap)
#define DRM_IOCTL_TEGRA_SYNCPT_READ DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SYNCPT_READ, struct drm_tegra_syncpt_read)
#define DRM_IOCTL_TEGRA_SYNCPT_INCR DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SYNCPT_INCR, struct drm_tegra_syncpt_incr)
#define DRM_IOCTL_TEGRA_SYNCPT_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SYNCPT_WAIT, struct drm_tegra_syncpt_wait)
#define DRM_IOCTL_TEGRA_OPEN_CHANNEL DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_OPEN_CHANNEL, struct drm_tegra_open_channel)
#define DRM_IOCTL_TEGRA_CLOSE_CHANNEL DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_CLOSE_CHANNEL, struct drm_tegra_open_channel)
#define DRM_IOCTL_TEGRA_GET_SYNCPT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GET_SYNCPT, struct drm_tegra_get_syncpt)
#define DRM_IOCTL_TEGRA_SUBMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SUBMIT, struct drm_tegra_submit)
#define DRM_IOCTL_TEGRA_GET_SYNCPT_BASE DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GET_SYNCPT_BASE, struct drm_tegra_get_syncpt_base)
#define DRM_IOCTL_TEGRA_GEM_SET_TILING DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_SET_TILING, struct drm_tegra_gem_set_tiling)
#define DRM_IOCTL_TEGRA_GEM_GET_TILING DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_GET_TILING, struct drm_tegra_gem_get_tiling)
#define DRM_IOCTL_TEGRA_GEM_SET_FLAGS DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_SET_FLAGS, struct drm_tegra_gem_set_flags)
#define DRM_IOCTL_TEGRA_GEM_GET_FLAGS DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_GET_FLAGS, struct drm_tegra_gem_get_flags)

#endif
cvs diff -r1.1.1.5.2.1 -r1.1.1.5.2.2 xsrc/external/mit/libdrm/dist/intel/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/intel/Attic/Makefile.in 2014/12/23 01:16:57 1.1.1.5.2.1
+++ xsrc/external/mit/libdrm/dist/intel/Attic/Makefile.in 2015/01/28 11:17:49 1.1.1.5.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -702,34 +702,34 @@ distclean-compile: @@ -702,34 +702,34 @@ distclean-compile:
702 702
703@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_bufmgr.Plo@am__quote@ 703@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_bufmgr.Plo@am__quote@
704@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_bufmgr_fake.Plo@am__quote@ 704@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_bufmgr_fake.Plo@am__quote@
705@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_bufmgr_gem.Plo@am__quote@ 705@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_bufmgr_gem.Plo@am__quote@
706@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_decode.Plo@am__quote@ 706@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_decode.Plo@am__quote@
707@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mm.Plo@am__quote@ 707@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mm.Plo@am__quote@
708@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_decode.Po@am__quote@ 708@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_decode.Po@am__quote@
709 709
710.c.o: 710.c.o:
711@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 711@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
712@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 712@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
713@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 713@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
714@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 714@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
715@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 715@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
716 716
717.c.obj: 717.c.obj:
718@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 718@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
719@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 719@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
720@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 720@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
721@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 721@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
722@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 722@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
723 723
724.c.lo: 724.c.lo:
725@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 725@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
726@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 726@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
727@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 727@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
728@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 728@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
729@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 729@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
730 730
731mostlyclean-libtool: 731mostlyclean-libtool:
732 -rm -f *.lo 732 -rm -f *.lo
733 733
734clean-libtool: 734clean-libtool:
735 -rm -rf .libs _libs 735 -rm -rf .libs _libs
cvs diff -r1.8.2.1 -r1.8.2.2 xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c 2014/12/23 01:16:57 1.8.2.1
+++ xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c 2015/01/28 11:17:49 1.8.2.2
@@ -750,35 +750,36 @@ retry: @@ -750,35 +750,36 @@ retry:
750 &create); 750 &create);
751 bo_gem->gem_handle = create.handle; 751 bo_gem->gem_handle = create.handle;
752 bo_gem->bo.handle = bo_gem->gem_handle; 752 bo_gem->bo.handle = bo_gem->gem_handle;
753 if (ret != 0) { 753 if (ret != 0) {
754 free(bo_gem); 754 free(bo_gem);
755 return NULL; 755 return NULL;
756 } 756 }
757 bo_gem->bo.bufmgr = bufmgr; 757 bo_gem->bo.bufmgr = bufmgr;
758 758
759 bo_gem->tiling_mode = I915_TILING_NONE; 759 bo_gem->tiling_mode = I915_TILING_NONE;
760 bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE; 760 bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
761 bo_gem->stride = 0; 761 bo_gem->stride = 0;
762 762
 763 /* drm_intel_gem_bo_free calls DRMLISTDEL() for an uninitialized
 764 list (vma_list), so better set the list head here */
 765 DRMINITLISTHEAD(&bo_gem->name_list);
 766 DRMINITLISTHEAD(&bo_gem->vma_list);
763 if (drm_intel_gem_bo_set_tiling_internal(&bo_gem->bo, 767 if (drm_intel_gem_bo_set_tiling_internal(&bo_gem->bo,
764 tiling_mode, 768 tiling_mode,
765 stride)) { 769 stride)) {
766 drm_intel_gem_bo_free(&bo_gem->bo); 770 drm_intel_gem_bo_free(&bo_gem->bo);
767 return NULL; 771 return NULL;
768 } 772 }
769 
770 DRMINITLISTHEAD(&bo_gem->name_list); 
771 DRMINITLISTHEAD(&bo_gem->vma_list); 
772 } 773 }
773 774
774 bo_gem->name = name; 775 bo_gem->name = name;
775 atomic_set(&bo_gem->refcount, 1); 776 atomic_set(&bo_gem->refcount, 1);
776 bo_gem->validate_index = -1; 777 bo_gem->validate_index = -1;
777 bo_gem->reloc_tree_fences = 0; 778 bo_gem->reloc_tree_fences = 0;
778 bo_gem->used_as_reloc_target = false; 779 bo_gem->used_as_reloc_target = false;
779 bo_gem->has_error = false; 780 bo_gem->has_error = false;
780 bo_gem->reusable = true; 781 bo_gem->reusable = true;
781 bo_gem->aub_annotations = NULL; 782 bo_gem->aub_annotations = NULL;
782 bo_gem->aub_annotation_count = 0; 783 bo_gem->aub_annotation_count = 0;
783 784
784 drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); 785 drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
@@ -1800,40 +1801,43 @@ do_bo_emit_reloc(drm_intel_bo *bo, uint3 @@ -1800,40 +1801,43 @@ do_bo_emit_reloc(drm_intel_bo *bo, uint3
1800 need_fence = false; 1801 need_fence = false;
1801 1802
1802 /* Create a new relocation list if needed */ 1803 /* Create a new relocation list if needed */
1803 if (bo_gem->relocs == NULL && drm_intel_setup_reloc_list(bo)) 1804 if (bo_gem->relocs == NULL && drm_intel_setup_reloc_list(bo))
1804 return -ENOMEM; 1805 return -ENOMEM;
1805 1806
1806 /* Check overflow */ 1807 /* Check overflow */
1807 assert(bo_gem->reloc_count < bufmgr_gem->max_relocs); 1808 assert(bo_gem->reloc_count < bufmgr_gem->max_relocs);
1808 1809
1809 /* Check args */ 1810 /* Check args */
1810 assert(offset <= bo->size - 4); 1811 assert(offset <= bo->size - 4);
1811 assert((write_domain & (write_domain - 1)) == 0); 1812 assert((write_domain & (write_domain - 1)) == 0);
1812 1813
 1814 /* An object needing a fence is a tiled buffer, so it won't have
 1815 * relocs to other buffers.
 1816 */
 1817 if (need_fence) {
 1818 assert(target_bo_gem->reloc_count == 0);
 1819 target_bo_gem->reloc_tree_fences = 1;
 1820 }
 1821
1813 /* Make sure that we're not adding a reloc to something whose size has 1822 /* Make sure that we're not adding a reloc to something whose size has
1814 * already been accounted for. 1823 * already been accounted for.
1815 */ 1824 */
1816 assert(!bo_gem->used_as_reloc_target); 1825 assert(!bo_gem->used_as_reloc_target);
1817 if (target_bo_gem != bo_gem) { 1826 if (target_bo_gem != bo_gem) {
1818 target_bo_gem->used_as_reloc_target = true; 1827 target_bo_gem->used_as_reloc_target = true;
1819 bo_gem->reloc_tree_size += target_bo_gem->reloc_tree_size; 1828 bo_gem->reloc_tree_size += target_bo_gem->reloc_tree_size;
 1829 bo_gem->reloc_tree_fences += target_bo_gem->reloc_tree_fences;
1820 } 1830 }
1821 /* An object needing a fence is a tiled buffer, so it won't have 
1822 * relocs to other buffers. 
1823 */ 
1824 if (need_fence) 
1825 target_bo_gem->reloc_tree_fences = 1; 
1826 bo_gem->reloc_tree_fences += target_bo_gem->reloc_tree_fences; 
1827 1831
1828 bo_gem->relocs[bo_gem->reloc_count].offset = offset; 1832 bo_gem->relocs[bo_gem->reloc_count].offset = offset;
1829 bo_gem->relocs[bo_gem->reloc_count].delta = target_offset; 1833 bo_gem->relocs[bo_gem->reloc_count].delta = target_offset;
1830 bo_gem->relocs[bo_gem->reloc_count].target_handle = 1834 bo_gem->relocs[bo_gem->reloc_count].target_handle =
1831 target_bo_gem->gem_handle; 1835 target_bo_gem->gem_handle;
1832 bo_gem->relocs[bo_gem->reloc_count].read_domains = read_domains; 1836 bo_gem->relocs[bo_gem->reloc_count].read_domains = read_domains;
1833 bo_gem->relocs[bo_gem->reloc_count].write_domain = write_domain; 1837 bo_gem->relocs[bo_gem->reloc_count].write_domain = write_domain;
1834 bo_gem->relocs[bo_gem->reloc_count].presumed_offset = target_bo->offset64; 1838 bo_gem->relocs[bo_gem->reloc_count].presumed_offset = target_bo->offset64;
1835 1839
1836 bo_gem->reloc_target_info[bo_gem->reloc_count].bo = target_bo; 1840 bo_gem->reloc_target_info[bo_gem->reloc_count].bo = target_bo;
1837 if (target_bo != bo) 1841 if (target_bo != bo)
1838 drm_intel_gem_bo_reference(target_bo); 1842 drm_intel_gem_bo_reference(target_bo);
1839 if (fenced_command) 1843 if (fenced_command)
@@ -3167,27 +3171,28 @@ drm_intel_bufmgr_gem_set_aub_dump(drm_in @@ -3167,27 +3171,28 @@ drm_intel_bufmgr_gem_set_aub_dump(drm_in
3167 aub_out(bufmgr_gem, CMD_AUB_HEADER | (13 - 2)); 3171 aub_out(bufmgr_gem, CMD_AUB_HEADER | (13 - 2));
3168 aub_out(bufmgr_gem, 3172 aub_out(bufmgr_gem,
3169 (4 << AUB_HEADER_MAJOR_SHIFT) | 3173 (4 << AUB_HEADER_MAJOR_SHIFT) |
3170 (0 << AUB_HEADER_MINOR_SHIFT)); 3174 (0 << AUB_HEADER_MINOR_SHIFT));
3171 for (i = 0; i < 8; i++) { 3175 for (i = 0; i < 8; i++) {
3172 aub_out(bufmgr_gem, 0); /* app name */ 3176 aub_out(bufmgr_gem, 0); /* app name */
3173 } 3177 }
3174 aub_out(bufmgr_gem, 0); /* timestamp */ 3178 aub_out(bufmgr_gem, 0); /* timestamp */
3175 aub_out(bufmgr_gem, 0); /* timestamp */ 3179 aub_out(bufmgr_gem, 0); /* timestamp */
3176 aub_out(bufmgr_gem, 0); /* comment len */ 3180 aub_out(bufmgr_gem, 0); /* comment len */
3177 3181
3178 /* Set up the GTT. The max we can handle is 256M */ 3182 /* Set up the GTT. The max we can handle is 256M */
3179 aub_out(bufmgr_gem, CMD_AUB_TRACE_HEADER_BLOCK | ((bufmgr_gem->gen >= 8 ? 6 : 5) - 2)); 3183 aub_out(bufmgr_gem, CMD_AUB_TRACE_HEADER_BLOCK | ((bufmgr_gem->gen >= 8 ? 6 : 5) - 2));
3180 aub_out(bufmgr_gem, AUB_TRACE_MEMTYPE_NONLOCAL | 0 | AUB_TRACE_OP_DATA_WRITE); 3184 /* Need to use GTT_ENTRY type for recent emulator */
 3185 aub_out(bufmgr_gem, AUB_TRACE_MEMTYPE_GTT_ENTRY | 0 | AUB_TRACE_OP_DATA_WRITE);
3181 aub_out(bufmgr_gem, 0); /* subtype */ 3186 aub_out(bufmgr_gem, 0); /* subtype */
3182 aub_out(bufmgr_gem, 0); /* offset */ 3187 aub_out(bufmgr_gem, 0); /* offset */
3183 aub_out(bufmgr_gem, gtt_size); /* size */ 3188 aub_out(bufmgr_gem, gtt_size); /* size */
3184 if (bufmgr_gem->gen >= 8) 3189 if (bufmgr_gem->gen >= 8)
3185 aub_out(bufmgr_gem, 0); 3190 aub_out(bufmgr_gem, 0);
3186 for (i = 0x000; i < gtt_size; i += 4, entry += 0x1000) { 3191 for (i = 0x000; i < gtt_size; i += 4, entry += 0x1000) {
3187 aub_out(bufmgr_gem, entry); 3192 aub_out(bufmgr_gem, entry);
3188 } 3193 }
3189} 3194}
3190 3195
3191drm_public drm_intel_context * 3196drm_public drm_intel_context *
3192drm_intel_gem_context_create(drm_intel_bufmgr *bufmgr) 3197drm_intel_gem_context_create(drm_intel_bufmgr *bufmgr)
3193{ 3198{
@@ -3469,26 +3474,28 @@ drm_intel_bufmgr_gem_init(int fd, int ba @@ -3469,26 +3474,28 @@ drm_intel_bufmgr_gem_init(int fd, int ba
3469 bufmgr_gem->gen = 2; 3474 bufmgr_gem->gen = 2;
3470 else if (IS_GEN3(bufmgr_gem->pci_device)) 3475 else if (IS_GEN3(bufmgr_gem->pci_device))
3471 bufmgr_gem->gen = 3; 3476 bufmgr_gem->gen = 3;
3472 else if (IS_GEN4(bufmgr_gem->pci_device)) 3477 else if (IS_GEN4(bufmgr_gem->pci_device))
3473 bufmgr_gem->gen = 4; 3478 bufmgr_gem->gen = 4;
3474 else if (IS_GEN5(bufmgr_gem->pci_device)) 3479 else if (IS_GEN5(bufmgr_gem->pci_device))
3475 bufmgr_gem->gen = 5; 3480 bufmgr_gem->gen = 5;
3476 else if (IS_GEN6(bufmgr_gem->pci_device)) 3481 else if (IS_GEN6(bufmgr_gem->pci_device))
3477 bufmgr_gem->gen = 6; 3482 bufmgr_gem->gen = 6;
3478 else if (IS_GEN7(bufmgr_gem->pci_device)) 3483 else if (IS_GEN7(bufmgr_gem->pci_device))
3479 bufmgr_gem->gen = 7; 3484 bufmgr_gem->gen = 7;
3480 else if (IS_GEN8(bufmgr_gem->pci_device)) 3485 else if (IS_GEN8(bufmgr_gem->pci_device))
3481 bufmgr_gem->gen = 8; 3486 bufmgr_gem->gen = 8;
 3487 else if (IS_GEN9(bufmgr_gem->pci_device))
 3488 bufmgr_gem->gen = 9;
3482 else { 3489 else {
3483 free(bufmgr_gem); 3490 free(bufmgr_gem);
3484 bufmgr_gem = NULL; 3491 bufmgr_gem = NULL;
3485 goto exit; 3492 goto exit;
3486 } 3493 }
3487 3494
3488 if (IS_GEN3(bufmgr_gem->pci_device) && 3495 if (IS_GEN3(bufmgr_gem->pci_device) &&
3489 bufmgr_gem->gtt_size > 256*1024*1024) { 3496 bufmgr_gem->gtt_size > 256*1024*1024) {
3490 /* The unmappable part of gtt on gen 3 (i.e. above 256MB) can't 3497 /* The unmappable part of gtt on gen 3 (i.e. above 256MB) can't
3491 * be used for tiled blits. To simplify the accounting, just 3498 * be used for tiled blits. To simplify the accounting, just
3492 * substract the unmappable part (fixed to 256MB on all known 3499 * substract the unmappable part (fixed to 256MB on all known
3493 * gen3 devices) if the kernel advertises it. */ 3500 * gen3 devices) if the kernel advertises it. */
3494 bufmgr_gem->gtt_size -= 256*1024*1024; 3501 bufmgr_gem->gtt_size -= 256*1024*1024;
cvs diff -r1.1.1.3 -r1.1.1.3.2.1 xsrc/external/mit/libdrm/dist/intel/intel_chipset.h (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/intel/intel_chipset.h 2014/07/11 19:51:38 1.1.1.3
+++ xsrc/external/mit/libdrm/dist/intel/intel_chipset.h 2015/01/28 11:17:49 1.1.1.3.2.1
@@ -155,26 +155,42 @@ @@ -155,26 +155,42 @@
155#define BDW_WORKSTATION 0xd 155#define BDW_WORKSTATION 0xd
156#define BDW_ULX 0xe 156#define BDW_ULX 0xe
157 157
158#define PCI_CHIP_VALLEYVIEW_PO 0x0f30 /* VLV PO board */ 158#define PCI_CHIP_VALLEYVIEW_PO 0x0f30 /* VLV PO board */
159#define PCI_CHIP_VALLEYVIEW_1 0x0f31 159#define PCI_CHIP_VALLEYVIEW_1 0x0f31
160#define PCI_CHIP_VALLEYVIEW_2 0x0f32 160#define PCI_CHIP_VALLEYVIEW_2 0x0f32
161#define PCI_CHIP_VALLEYVIEW_3 0x0f33 161#define PCI_CHIP_VALLEYVIEW_3 0x0f33
162 162
163#define PCI_CHIP_CHERRYVIEW_0 0x22b0 163#define PCI_CHIP_CHERRYVIEW_0 0x22b0
164#define PCI_CHIP_CHERRYVIEW_1 0x22b1 164#define PCI_CHIP_CHERRYVIEW_1 0x22b1
165#define PCI_CHIP_CHERRYVIEW_2 0x22b2 165#define PCI_CHIP_CHERRYVIEW_2 0x22b2
166#define PCI_CHIP_CHERRYVIEW_3 0x22b3 166#define PCI_CHIP_CHERRYVIEW_3 0x22b3
167 167
 168#define PCI_CHIP_SKYLAKE_ULT_GT2 0x1916
 169#define PCI_CHIP_SKYLAKE_ULT_GT1 0x1906
 170#define PCI_CHIP_SKYLAKE_ULT_GT3 0x1926
 171#define PCI_CHIP_SKYLAKE_ULT_GT2F 0x1921
 172#define PCI_CHIP_SKYLAKE_ULX_GT1 0x190E
 173#define PCI_CHIP_SKYLAKE_ULX_GT2 0x191E
 174#define PCI_CHIP_SKYLAKE_DT_GT2 0x1912
 175#define PCI_CHIP_SKYLAKE_DT_GT1 0x1902
 176#define PCI_CHIP_SKYLAKE_HALO_GT2 0x191B
 177#define PCI_CHIP_SKYLAKE_HALO_GT3 0x192B
 178#define PCI_CHIP_SKYLAKE_HALO_GT1 0x190B
 179#define PCI_CHIP_SKYLAKE_SRV_GT2 0x191A
 180#define PCI_CHIP_SKYLAKE_SRV_GT3 0x192A
 181#define PCI_CHIP_SKYLAKE_SRV_GT1 0x190A
 182#define PCI_CHIP_SKYLAKE_WKS_GT2 0x191D
 183
168#define IS_MOBILE(devid) ((devid) == PCI_CHIP_I855_GM || \ 184#define IS_MOBILE(devid) ((devid) == PCI_CHIP_I855_GM || \
169 (devid) == PCI_CHIP_I915_GM || \ 185 (devid) == PCI_CHIP_I915_GM || \
170 (devid) == PCI_CHIP_I945_GM || \ 186 (devid) == PCI_CHIP_I945_GM || \
171 (devid) == PCI_CHIP_I945_GME || \ 187 (devid) == PCI_CHIP_I945_GME || \
172 (devid) == PCI_CHIP_I965_GM || \ 188 (devid) == PCI_CHIP_I965_GM || \
173 (devid) == PCI_CHIP_I965_GME || \ 189 (devid) == PCI_CHIP_I965_GME || \
174 (devid) == PCI_CHIP_GM45_GM || IS_IGD(devid) || \ 190 (devid) == PCI_CHIP_GM45_GM || IS_IGD(devid) || \
175 (devid) == PCI_CHIP_IVYBRIDGE_M_GT1 || \ 191 (devid) == PCI_CHIP_IVYBRIDGE_M_GT1 || \
176 (devid) == PCI_CHIP_IVYBRIDGE_M_GT2) 192 (devid) == PCI_CHIP_IVYBRIDGE_M_GT2)
177 193
178#define IS_G45(devid) ((devid) == PCI_CHIP_IGD_E_G || \ 194#define IS_G45(devid) ((devid) == PCI_CHIP_IGD_E_G || \
179 (devid) == PCI_CHIP_Q45_G || \ 195 (devid) == PCI_CHIP_Q45_G || \
180 (devid) == PCI_CHIP_G45_G || \ 196 (devid) == PCI_CHIP_G45_G || \
@@ -314,22 +330,47 @@ @@ -314,22 +330,47 @@
314 ((devid & 0x000f) == BDW_IRIS) ? 1 : \ 330 ((devid & 0x000f) == BDW_IRIS) ? 1 : \
315 ((devid & 0x000f) == BDW_SERVER) ? 1 : \ 331 ((devid & 0x000f) == BDW_SERVER) ? 1 : \
316 ((devid & 0x000f) == BDW_WORKSTATION) ? 1 : \ 332 ((devid & 0x000f) == BDW_WORKSTATION) ? 1 : \
317 ((devid & 0x000f) == BDW_ULX) ? 1 : 0) 333 ((devid & 0x000f) == BDW_ULX) ? 1 : 0)
318 334
319#define IS_CHERRYVIEW(devid) ((devid) == PCI_CHIP_CHERRYVIEW_0 || \ 335#define IS_CHERRYVIEW(devid) ((devid) == PCI_CHIP_CHERRYVIEW_0 || \
320 (devid) == PCI_CHIP_CHERRYVIEW_1 || \ 336 (devid) == PCI_CHIP_CHERRYVIEW_1 || \
321 (devid) == PCI_CHIP_CHERRYVIEW_2 || \ 337 (devid) == PCI_CHIP_CHERRYVIEW_2 || \
322 (devid) == PCI_CHIP_CHERRYVIEW_3) 338 (devid) == PCI_CHIP_CHERRYVIEW_3)
323 339
324#define IS_GEN8(devid) (IS_BROADWELL(devid) || \ 340#define IS_GEN8(devid) (IS_BROADWELL(devid) || \
325 IS_CHERRYVIEW(devid)) 341 IS_CHERRYVIEW(devid))
326 342
 343#define IS_SKL_GT1(devid) ((devid) == PCI_CHIP_SKYLAKE_ULT_GT1 || \
 344 (devid) == PCI_CHIP_SKYLAKE_ULX_GT1 || \
 345 (devid) == PCI_CHIP_SKYLAKE_DT_GT1 || \
 346 (devid) == PCI_CHIP_SKYLAKE_HALO_GT1 || \
 347 (devid) == PCI_CHIP_SKYLAKE_SRV_GT1)
 348
 349#define IS_SKL_GT2(devid) ((devid) == PCI_CHIP_SKYLAKE_ULT_GT2 || \
 350 (devid) == PCI_CHIP_SKYLAKE_ULT_GT2F || \
 351 (devid) == PCI_CHIP_SKYLAKE_ULX_GT2 || \
 352 (devid) == PCI_CHIP_SKYLAKE_DT_GT2 || \
 353 (devid) == PCI_CHIP_SKYLAKE_HALO_GT2 || \
 354 (devid) == PCI_CHIP_SKYLAKE_SRV_GT2 || \
 355 (devid) == PCI_CHIP_SKYLAKE_WKS_GT2)
 356
 357#define IS_SKL_GT3(devid) ((devid) == PCI_CHIP_SKYLAKE_ULT_GT3 || \
 358 (devid) == PCI_CHIP_SKYLAKE_HALO_GT3 || \
 359 (devid) == PCI_CHIP_SKYLAKE_SRV_GT3)
 360
 361#define IS_SKYLAKE(devid) (IS_SKL_GT1(devid) || \
 362 IS_SKL_GT2(devid) || \
 363 IS_SKL_GT3(devid))
 364
 365#define IS_GEN9(devid) IS_SKYLAKE(devid)
 366
327#define IS_9XX(dev) (IS_GEN3(dev) || \ 367#define IS_9XX(dev) (IS_GEN3(dev) || \
328 IS_GEN4(dev) || \ 368 IS_GEN4(dev) || \
329 IS_GEN5(dev) || \ 369 IS_GEN5(dev) || \
330 IS_GEN6(dev) || \ 370 IS_GEN6(dev) || \
331 IS_GEN7(dev) || \ 371 IS_GEN7(dev) || \
332 IS_GEN8(dev)) 372 IS_GEN8(dev) || \
 373 IS_GEN9(dev))
333 374
334 375
335#endif /* _INTEL_CHIPSET_H */ 376#endif /* _INTEL_CHIPSET_H */
cvs diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/intel/intel_decode.c (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/intel/intel_decode.c 2014/12/23 01:16:57 1.1.1.2.2.1
+++ xsrc/external/mit/libdrm/dist/intel/intel_decode.c 2015/01/28 11:17:49 1.1.1.2.2.2
@@ -3819,27 +3819,29 @@ decode_3d_i830(struct drm_intel_decode * @@ -3819,27 +3819,29 @@ decode_3d_i830(struct drm_intel_decode *
3819 3819
3820drm_public struct drm_intel_decode * 3820drm_public struct drm_intel_decode *
3821drm_intel_decode_context_alloc(uint32_t devid) 3821drm_intel_decode_context_alloc(uint32_t devid)
3822{ 3822{
3823 struct drm_intel_decode *ctx; 3823 struct drm_intel_decode *ctx;
3824 3824
3825 ctx = calloc(1, sizeof(struct drm_intel_decode)); 3825 ctx = calloc(1, sizeof(struct drm_intel_decode));
3826 if (!ctx) 3826 if (!ctx)
3827 return NULL; 3827 return NULL;
3828 3828
3829 ctx->devid = devid; 3829 ctx->devid = devid;
3830 ctx->out = stdout; 3830 ctx->out = stdout;
3831 3831
3832 if (IS_GEN8(devid)) 3832 if (IS_GEN9(devid))
 3833 ctx->gen = 9;
 3834 else if (IS_GEN8(devid))
3833 ctx->gen = 8; 3835 ctx->gen = 8;
3834 else if (IS_GEN7(devid)) 3836 else if (IS_GEN7(devid))
3835 ctx->gen = 7; 3837 ctx->gen = 7;
3836 else if (IS_GEN6(devid)) 3838 else if (IS_GEN6(devid))
3837 ctx->gen = 6; 3839 ctx->gen = 6;
3838 else if (IS_GEN5(devid)) 3840 else if (IS_GEN5(devid))
3839 ctx->gen = 5; 3841 ctx->gen = 5;
3840 else if (IS_GEN4(devid)) 3842 else if (IS_GEN4(devid))
3841 ctx->gen = 4; 3843 ctx->gen = 4;
3842 else if (IS_9XX(devid)) 3844 else if (IS_9XX(devid))
3843 ctx->gen = 3; 3845 ctx->gen = 3;
3844 else { 3846 else {
3845 assert(IS_GEN2(devid)); 3847 assert(IS_GEN2(devid));
cvs diff -r1.1.1.5.2.1 -r1.1.1.5.2.2 xsrc/external/mit/libdrm/dist/libkms/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/libkms/Attic/Makefile.in 2014/12/23 01:16:58 1.1.1.5.2.1
+++ xsrc/external/mit/libdrm/dist/libkms/Attic/Makefile.in 2015/01/28 11:17:49 1.1.1.5.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -481,34 +481,34 @@ distclean-compile: @@ -481,34 +481,34 @@ distclean-compile:
481@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dumb.Plo@am__quote@ 481@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dumb.Plo@am__quote@
482@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exynos.Plo@am__quote@ 482@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exynos.Plo@am__quote@
483@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel.Plo@am__quote@ 483@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel.Plo@am__quote@
484@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux.Plo@am__quote@ 484@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux.Plo@am__quote@
485@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nouveau.Plo@am__quote@ 485@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nouveau.Plo@am__quote@
486@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon.Plo@am__quote@ 486@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon.Plo@am__quote@
487@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmwgfx.Plo@am__quote@ 487@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmwgfx.Plo@am__quote@
488 488
489.c.o: 489.c.o:
490@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 490@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
491@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 491@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
492@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 492@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
493@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 493@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
494@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 494@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
495 495
496.c.obj: 496.c.obj:
497@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 497@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
498@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 498@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
499@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 499@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
500@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 500@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
501@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 501@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
502 502
503.c.lo: 503.c.lo:
504@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 504@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
505@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 505@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
506@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 506@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
507@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 507@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
508@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 508@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
509 509
510mostlyclean-libtool: 510mostlyclean-libtool:
511 -rm -f *.lo 511 -rm -f *.lo
512 512
513clean-libtool: 513clean-libtool:
514 -rm -rf .libs _libs 514 -rm -rf .libs _libs
cvs diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/m4/Attic/libtool.m4 (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/m4/Attic/libtool.m4 2014/12/23 01:16:58 1.1.1.2.2.1
+++ xsrc/external/mit/libdrm/dist/m4/Attic/libtool.m4 2015/01/28 11:17:49 1.1.1.2.2.2
@@ -1314,54 +1314,61 @@ ia64-*-hpux*) @@ -1314,54 +1314,61 @@ ia64-*-hpux*)
1314 1314
1315x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ 1315x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
1316s390*-*linux*|s390*-*tpf*|sparc*-*linux*) 1316s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1317 # Find out which ABI we are using. 1317 # Find out which ABI we are using.
1318 echo 'int i;' > conftest.$ac_ext 1318 echo 'int i;' > conftest.$ac_ext
1319 if AC_TRY_EVAL(ac_compile); then 1319 if AC_TRY_EVAL(ac_compile); then
1320 case `/usr/bin/file conftest.o` in 1320 case `/usr/bin/file conftest.o` in
1321 *32-bit*) 1321 *32-bit*)
1322 case $host in 1322 case $host in
1323 x86_64-*kfreebsd*-gnu) 1323 x86_64-*kfreebsd*-gnu)
1324 LD="${LD-ld} -m elf_i386_fbsd" 1324 LD="${LD-ld} -m elf_i386_fbsd"
1325 ;; 1325 ;;
1326 x86_64-*linux*) 1326 x86_64-*linux*)
1327 LD="${LD-ld} -m elf_i386" 1327 case `/usr/bin/file conftest.o` in
 1328 *x86-64*)
 1329 LD="${LD-ld} -m elf32_x86_64"
 1330 ;;
 1331 *)
 1332 LD="${LD-ld} -m elf_i386"
 1333 ;;
 1334 esac
1328 ;; 1335 ;;
1329 powerpc64le-*linux*) 1336 powerpc64le-*)
1330 LD="${LD-ld} -m elf32lppclinux" 1337 LD="${LD-ld} -m elf32lppclinux"
1331 ;; 1338 ;;
1332 powerpc64-*linux*) 1339 powerpc64-*)
1333 LD="${LD-ld} -m elf32ppclinux" 1340 LD="${LD-ld} -m elf32ppclinux"
1334 ;; 1341 ;;
1335 s390x-*linux*) 1342 s390x-*linux*)
1336 LD="${LD-ld} -m elf_s390" 1343 LD="${LD-ld} -m elf_s390"
1337 ;; 1344 ;;
1338 sparc64-*linux*) 1345 sparc64-*linux*)
1339 LD="${LD-ld} -m elf32_sparc" 1346 LD="${LD-ld} -m elf32_sparc"
1340 ;; 1347 ;;
1341 esac 1348 esac
1342 ;; 1349 ;;
1343 *64-bit*) 1350 *64-bit*)
1344 case $host in 1351 case $host in
1345 x86_64-*kfreebsd*-gnu) 1352 x86_64-*kfreebsd*-gnu)
1346 LD="${LD-ld} -m elf_x86_64_fbsd" 1353 LD="${LD-ld} -m elf_x86_64_fbsd"
1347 ;; 1354 ;;
1348 x86_64-*linux*) 1355 x86_64-*linux*)
1349 LD="${LD-ld} -m elf_x86_64" 1356 LD="${LD-ld} -m elf_x86_64"
1350 ;; 1357 ;;
1351 powerpcle-*linux*) 1358 powerpcle-*)
1352 LD="${LD-ld} -m elf64lppc" 1359 LD="${LD-ld} -m elf64lppc"
1353 ;; 1360 ;;
1354 powerpc-*linux*) 1361 powerpc-*)
1355 LD="${LD-ld} -m elf64ppc" 1362 LD="${LD-ld} -m elf64ppc"
1356 ;; 1363 ;;
1357 s390*-*linux*|s390*-*tpf*) 1364 s390*-*linux*|s390*-*tpf*)
1358 LD="${LD-ld} -m elf64_s390" 1365 LD="${LD-ld} -m elf64_s390"
1359 ;; 1366 ;;
1360 sparc*-*linux*) 1367 sparc*-*linux*)
1361 LD="${LD-ld} -m elf64_sparc" 1368 LD="${LD-ld} -m elf64_sparc"
1362 ;; 1369 ;;
1363 esac 1370 esac
1364 ;; 1371 ;;
1365 esac 1372 esac
1366 fi 1373 fi
1367 rm -rf conftest* 1374 rm -rf conftest*
@@ -1684,27 +1691,28 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d @@ -1684,27 +1691,28 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
1684 sco3.2v5*) 1691 sco3.2v5*)
1685 lt_cv_sys_max_cmd_len=102400 1692 lt_cv_sys_max_cmd_len=102400
1686 ;; 1693 ;;
1687 sysv5* | sco5v6* | sysv4.2uw2*) 1694 sysv5* | sco5v6* | sysv4.2uw2*)
1688 kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` 1695 kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
1689 if test -n "$kargmax"; then 1696 if test -n "$kargmax"; then
1690 lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` 1697 lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
1691 else 1698 else
1692 lt_cv_sys_max_cmd_len=32768 1699 lt_cv_sys_max_cmd_len=32768
1693 fi 1700 fi
1694 ;; 1701 ;;
1695 *) 1702 *)
1696 lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` 1703 lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
1697 if test -n "$lt_cv_sys_max_cmd_len"; then 1704 if test -n "$lt_cv_sys_max_cmd_len" && \
 1705 test undefined != "$lt_cv_sys_max_cmd_len"; then
1698 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` 1706 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
1699 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` 1707 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
1700 else 1708 else
1701 # Make teststring a little bigger before we do anything with it. 1709 # Make teststring a little bigger before we do anything with it.
1702 # a 1K string should be a reasonable start. 1710 # a 1K string should be a reasonable start.
1703 for i in 1 2 3 4 5 6 7 8 ; do 1711 for i in 1 2 3 4 5 6 7 8 ; do
1704 teststring=$teststring$teststring 1712 teststring=$teststring$teststring
1705 done 1713 done
1706 SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} 1714 SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
1707 # If test is not a shell built-in, we'll probably end up computing a 1715 # If test is not a shell built-in, we'll probably end up computing a
1708 # maximum length that is only half of the actual maximum length, but 1716 # maximum length that is only half of the actual maximum length, but
1709 # we can't tell. 1717 # we can't tell.
1710 while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ 1718 while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
@@ -2508,37 +2516,26 @@ freebsd* | dragonfly*) @@ -2508,37 +2516,26 @@ freebsd* | dragonfly*)
2508 ;; 2516 ;;
2509 freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ 2517 freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
2510 freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) 2518 freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
2511 shlibpath_overrides_runpath=no 2519 shlibpath_overrides_runpath=no
2512 hardcode_into_libs=yes 2520 hardcode_into_libs=yes
2513 ;; 2521 ;;
2514 *) # from 4.6 on, and DragonFly 2522 *) # from 4.6 on, and DragonFly
2515 shlibpath_overrides_runpath=yes 2523 shlibpath_overrides_runpath=yes
2516 hardcode_into_libs=yes 2524 hardcode_into_libs=yes
2517 ;; 2525 ;;
2518 esac 2526 esac
2519 ;; 2527 ;;
2520 2528
2521gnu*) 
2522 version_type=linux # correct to gnu/linux during the next big refactor 
2523 need_lib_prefix=no 
2524 need_version=no 
2525 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' 
2526 soname_spec='${libname}${release}${shared_ext}$major' 
2527 shlibpath_var=LD_LIBRARY_PATH 
2528 shlibpath_overrides_runpath=no 
2529 hardcode_into_libs=yes 
2530 ;; 
2531 
2532haiku*) 2529haiku*)
2533 version_type=linux # correct to gnu/linux during the next big refactor 2530 version_type=linux # correct to gnu/linux during the next big refactor
2534 need_lib_prefix=no 2531 need_lib_prefix=no
2535 need_version=no 2532 need_version=no
2536 dynamic_linker="$host_os runtime_loader" 2533 dynamic_linker="$host_os runtime_loader"
2537 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' 2534 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
2538 soname_spec='${libname}${release}${shared_ext}$major' 2535 soname_spec='${libname}${release}${shared_ext}$major'
2539 shlibpath_var=LIBRARY_PATH 2536 shlibpath_var=LIBRARY_PATH
2540 shlibpath_overrides_runpath=yes 2537 shlibpath_overrides_runpath=yes
2541 sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' 2538 sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
2542 hardcode_into_libs=yes 2539 hardcode_into_libs=yes
2543 ;; 2540 ;;
2544 2541
@@ -2635,27 +2632,27 @@ irix5* | irix6* | nonstopux*) @@ -2635,27 +2632,27 @@ irix5* | irix6* | nonstopux*)
2635 shlibpath_var=LD_LIBRARY${shlibsuff}_PATH 2632 shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
2636 shlibpath_overrides_runpath=no 2633 shlibpath_overrides_runpath=no
2637 sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" 2634 sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
2638 sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" 2635 sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
2639 hardcode_into_libs=yes 2636 hardcode_into_libs=yes
2640 ;; 2637 ;;
2641 2638
2642# No shared lib support for Linux oldld, aout, or coff. 2639# No shared lib support for Linux oldld, aout, or coff.
2643linux*oldld* | linux*aout* | linux*coff*) 2640linux*oldld* | linux*aout* | linux*coff*)
2644 dynamic_linker=no 2641 dynamic_linker=no
2645 ;; 2642 ;;
2646 2643
2647# This must be glibc/ELF. 2644# This must be glibc/ELF.
2648linux* | k*bsd*-gnu | kopensolaris*-gnu) 2645linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2649 version_type=linux # correct to gnu/linux during the next big refactor 2646 version_type=linux # correct to gnu/linux during the next big refactor
2650 need_lib_prefix=no 2647 need_lib_prefix=no
2651 need_version=no 2648 need_version=no
2652 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 2649 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2653 soname_spec='${libname}${release}${shared_ext}$major' 2650 soname_spec='${libname}${release}${shared_ext}$major'
2654 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' 2651 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
2655 shlibpath_var=LD_LIBRARY_PATH 2652 shlibpath_var=LD_LIBRARY_PATH
2656 shlibpath_overrides_runpath=no 2653 shlibpath_overrides_runpath=no
2657 2654
2658 # Some binutils ld are patched to set DT_RUNPATH 2655 # Some binutils ld are patched to set DT_RUNPATH
2659 AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], 2656 AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
2660 [lt_cv_shlibpath_overrides_runpath=no 2657 [lt_cv_shlibpath_overrides_runpath=no
2661 save_LDFLAGS=$LDFLAGS 2658 save_LDFLAGS=$LDFLAGS
@@ -2665,45 +2662,53 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) @@ -2665,45 +2662,53 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2665 AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], 2662 AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
2666 [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], 2663 [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
2667 [lt_cv_shlibpath_overrides_runpath=yes])]) 2664 [lt_cv_shlibpath_overrides_runpath=yes])])
2668 LDFLAGS=$save_LDFLAGS 2665 LDFLAGS=$save_LDFLAGS
2669 libdir=$save_libdir 2666 libdir=$save_libdir
2670 ]) 2667 ])
2671 shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath 2668 shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
2672 2669
2673 # This implies no fast_install, which is unacceptable. 2670 # This implies no fast_install, which is unacceptable.
2674 # Some rework will be needed to allow for fast_install 2671 # Some rework will be needed to allow for fast_install
2675 # before this can be enabled. 2672 # before this can be enabled.
2676 hardcode_into_libs=yes 2673 hardcode_into_libs=yes
2677 2674
2678 # Add ABI-specific directories to the system library path. 
2679 sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" 
2680 
2681 # Append ld.so.conf contents to the search path 2675 # Append ld.so.conf contents to the search path
2682 if test -f /etc/ld.so.conf; then 2676 if test -f /etc/ld.so.conf; then
2683 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` 2677 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
2684 sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" 2678 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
2685 
2686 fi 2679 fi
2687 2680
2688 # We used to test for /lib/ld.so.1 and disable shared libraries on 2681 # We used to test for /lib/ld.so.1 and disable shared libraries on
2689 # powerpc, because MkLinux only supported shared libraries with the 2682 # powerpc, because MkLinux only supported shared libraries with the
2690 # GNU dynamic linker. Since this was broken with cross compilers, 2683 # GNU dynamic linker. Since this was broken with cross compilers,
2691 # most powerpc-linux boxes support dynamic linking these days and 2684 # most powerpc-linux boxes support dynamic linking these days and
2692 # people can always --disable-shared, the test was removed, and we 2685 # people can always --disable-shared, the test was removed, and we
2693 # assume the GNU/Linux dynamic linker is in use. 2686 # assume the GNU/Linux dynamic linker is in use.
2694 dynamic_linker='GNU/Linux ld.so' 2687 dynamic_linker='GNU/Linux ld.so'
2695 ;; 2688 ;;
2696 2689
 2690netbsdelf*-gnu)
 2691 version_type=linux
 2692 need_lib_prefix=no
 2693 need_version=no
 2694 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 2695 soname_spec='${libname}${release}${shared_ext}$major'
 2696 shlibpath_var=LD_LIBRARY_PATH
 2697 shlibpath_overrides_runpath=no
 2698 hardcode_into_libs=yes
 2699 dynamic_linker='NetBSD ld.elf_so'
 2700 ;;
 2701
2697netbsd*) 2702netbsd*)
2698 version_type=sunos 2703 version_type=sunos
2699 need_lib_prefix=no 2704 need_lib_prefix=no
2700 need_version=no 2705 need_version=no
2701 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 2706 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
2702 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 2707 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
2703 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 2708 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
2704 dynamic_linker='NetBSD (a.out) ld.so' 2709 dynamic_linker='NetBSD (a.out) ld.so'
2705 else 2710 else
2706 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 2711 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2707 soname_spec='${libname}${release}${shared_ext}$major' 2712 soname_spec='${libname}${release}${shared_ext}$major'
2708 dynamic_linker='NetBSD ld.elf_so' 2713 dynamic_linker='NetBSD ld.elf_so'
2709 fi 2714 fi
@@ -3243,30 +3248,26 @@ freebsd* | dragonfly*) @@ -3243,30 +3248,26 @@ freebsd* | dragonfly*)
3243 i*86 ) 3248 i*86 )
3244 # Not sure whether the presence of OpenBSD here was a mistake. 3249 # Not sure whether the presence of OpenBSD here was a mistake.
3245 # Let's accept both of them until this is cleared up. 3250 # Let's accept both of them until this is cleared up.
3246 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' 3251 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
3247 lt_cv_file_magic_cmd=/usr/bin/file 3252 lt_cv_file_magic_cmd=/usr/bin/file
3248 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` 3253 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
3249 ;; 3254 ;;
3250 esac 3255 esac
3251 else 3256 else
3252 lt_cv_deplibs_check_method=pass_all 3257 lt_cv_deplibs_check_method=pass_all
3253 fi 3258 fi
3254 ;; 3259 ;;
3255 3260
3256gnu*) 
3257 lt_cv_deplibs_check_method=pass_all 
3258 ;; 
3259 
3260haiku*) 3261haiku*)
3261 lt_cv_deplibs_check_method=pass_all 3262 lt_cv_deplibs_check_method=pass_all
3262 ;; 3263 ;;
3263 3264
3264hpux10.20* | hpux11*) 3265hpux10.20* | hpux11*)
3265 lt_cv_file_magic_cmd=/usr/bin/file 3266 lt_cv_file_magic_cmd=/usr/bin/file
3266 case $host_cpu in 3267 case $host_cpu in
3267 ia64*) 3268 ia64*)
3268 lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' 3269 lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
3269 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so 3270 lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
3270 ;; 3271 ;;
3271 hppa*64*) 3272 hppa*64*)
3272 [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] 3273 [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
@@ -3285,31 +3286,31 @@ interix[[3-9]]*) @@ -3285,31 +3286,31 @@ interix[[3-9]]*)
3285 ;; 3286 ;;
3286 3287
3287irix5* | irix6* | nonstopux*) 3288irix5* | irix6* | nonstopux*)
3288 case $LD in 3289 case $LD in
3289 *-32|*"-32 ") libmagic=32-bit;; 3290 *-32|*"-32 ") libmagic=32-bit;;
3290 *-n32|*"-n32 ") libmagic=N32;; 3291 *-n32|*"-n32 ") libmagic=N32;;
3291 *-64|*"-64 ") libmagic=64-bit;; 3292 *-64|*"-64 ") libmagic=64-bit;;
3292 *) libmagic=never-match;; 3293 *) libmagic=never-match;;
3293 esac 3294 esac
3294 lt_cv_deplibs_check_method=pass_all 3295 lt_cv_deplibs_check_method=pass_all
3295 ;; 3296 ;;
3296 3297
3297# This must be glibc/ELF. 3298# This must be glibc/ELF.
3298linux* | k*bsd*-gnu | kopensolaris*-gnu) 3299linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
3299 lt_cv_deplibs_check_method=pass_all 3300 lt_cv_deplibs_check_method=pass_all
3300 ;; 3301 ;;
3301 3302
3302netbsd*) 3303netbsd* | netbsdelf*-gnu)
3303 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then 3304 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
3304 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' 3305 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
3305 else 3306 else
3306 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' 3307 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
3307 fi 3308 fi
3308 ;; 3309 ;;
3309 3310
3310newos6*) 3311newos6*)
3311 lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' 3312 lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
3312 lt_cv_file_magic_cmd=/usr/bin/file 3313 lt_cv_file_magic_cmd=/usr/bin/file
3313 lt_cv_file_magic_test_file=/usr/lib/libnls.so 3314 lt_cv_file_magic_test_file=/usr/lib/libnls.so
3314 ;; 3315 ;;
3315 3316
@@ -4037,27 +4038,27 @@ m4_if([$1], [CXX], [ @@ -4037,27 +4038,27 @@ m4_if([$1], [CXX], [
4037 # Anyone wants to do a port? 4038 # Anyone wants to do a port?
4038 ;; 4039 ;;
4039 irix5* | irix6* | nonstopux*) 4040 irix5* | irix6* | nonstopux*)
4040 case $cc_basename in 4041 case $cc_basename in
4041 CC*) 4042 CC*)
4042 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4043 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4043 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' 4044 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
4044 # CC pic flag -KPIC is the default. 4045 # CC pic flag -KPIC is the default.
4045 ;; 4046 ;;
4046 *) 4047 *)
4047 ;; 4048 ;;
4048 esac 4049 esac
4049 ;; 4050 ;;
4050 linux* | k*bsd*-gnu | kopensolaris*-gnu) 4051 linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
4051 case $cc_basename in 4052 case $cc_basename in
4052 KCC*) 4053 KCC*)
4053 # KAI C++ Compiler 4054 # KAI C++ Compiler
4054 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' 4055 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
4055 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 4056 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4056 ;; 4057 ;;
4057 ecpc* ) 4058 ecpc* )
4058 # old Intel C++ for x86_64 which still supported -KPIC. 4059 # old Intel C++ for x86_64 which still supported -KPIC.
4059 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4060 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4060 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 4061 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4061 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' 4062 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4062 ;; 4063 ;;
4063 icpc* ) 4064 icpc* )
@@ -4101,27 +4102,27 @@ m4_if([$1], [CXX], [ @@ -4101,27 +4102,27 @@ m4_if([$1], [CXX], [
4101 lynxos*) 4102 lynxos*)
4102 ;; 4103 ;;
4103 m88k*) 4104 m88k*)
4104 ;; 4105 ;;
4105 mvs*) 4106 mvs*)
4106 case $cc_basename in 4107 case $cc_basename in
4107 cxx*) 4108 cxx*)
4108 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' 4109 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
4109 ;; 4110 ;;
4110 *) 4111 *)
4111 ;; 4112 ;;
4112 esac 4113 esac
4113 ;; 4114 ;;
4114 netbsd*) 4115 netbsd* | netbsdelf*-gnu)
4115 ;; 4116 ;;
4116 *qnx* | *nto*) 4117 *qnx* | *nto*)
4117 # QNX uses GNU C++, but need to define -shared option too, otherwise 4118 # QNX uses GNU C++, but need to define -shared option too, otherwise
4118 # it will coredump. 4119 # it will coredump.
4119 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' 4120 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
4120 ;; 4121 ;;
4121 osf3* | osf4* | osf5*) 4122 osf3* | osf4* | osf5*)
4122 case $cc_basename in 4123 case $cc_basename in
4123 KCC*) 4124 KCC*)
4124 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' 4125 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
4125 ;; 4126 ;;
4126 RCC*) 4127 RCC*)
4127 # Rational C++ 2.4.1 4128 # Rational C++ 2.4.1
@@ -4336,27 +4337,27 @@ m4_if([$1], [CXX], [ @@ -4336,27 +4337,27 @@ m4_if([$1], [CXX], [
4336 _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' 4337 _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
4337 ;; 4338 ;;
4338 esac 4339 esac
4339 # Is there a better lt_prog_compiler_static that works with the bundled CC? 4340 # Is there a better lt_prog_compiler_static that works with the bundled CC?
4340 _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' 4341 _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
4341 ;; 4342 ;;
4342 4343
4343 irix5* | irix6* | nonstopux*) 4344 irix5* | irix6* | nonstopux*)
4344 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4345 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4345 # PIC (with -KPIC) is the default. 4346 # PIC (with -KPIC) is the default.
4346 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' 4347 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
4347 ;; 4348 ;;
4348 4349
4349 linux* | k*bsd*-gnu | kopensolaris*-gnu) 4350 linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
4350 case $cc_basename in 4351 case $cc_basename in
4351 # old Intel for x86_64 which still supported -KPIC. 4352 # old Intel for x86_64 which still supported -KPIC.
4352 ecc*) 4353 ecc*)
4353 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4354 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4354 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 4355 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4355 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' 4356 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4356 ;; 4357 ;;
4357 # icc used to be incompatible with GCC. 4358 # icc used to be incompatible with GCC.
4358 # ICC 10 doesn't accept -KPIC any more. 4359 # ICC 10 doesn't accept -KPIC any more.
4359 icc* | ifort*) 4360 icc* | ifort*)
4360 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 4361 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4361 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 4362 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4362 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' 4363 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -4578,26 +4579,29 @@ m4_if([$1], [CXX], [ @@ -4578,26 +4579,29 @@ m4_if([$1], [CXX], [
4578 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 4579 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
4579 ;; 4580 ;;
4580 cygwin* | mingw* | cegcc*) 4581 cygwin* | mingw* | cegcc*)
4581 case $cc_basename in 4582 case $cc_basename in
4582 cl*) 4583 cl*)
4583 _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' 4584 _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
4584 ;; 4585 ;;
4585 *) 4586 *)
4586 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' 4587 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
4587 _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] 4588 _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
4588 ;; 4589 ;;
4589 esac 4590 esac
4590 ;; 4591 ;;
 4592 linux* | k*bsd*-gnu | gnu*)
 4593 _LT_TAGVAR(link_all_deplibs, $1)=no
 4594 ;;
4591 *) 4595 *)
4592 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 4596 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4593 ;; 4597 ;;
4594 esac 4598 esac
4595], [ 4599], [
4596 runpath_var= 4600 runpath_var=
4597 _LT_TAGVAR(allow_undefined_flag, $1)= 4601 _LT_TAGVAR(allow_undefined_flag, $1)=
4598 _LT_TAGVAR(always_export_symbols, $1)=no 4602 _LT_TAGVAR(always_export_symbols, $1)=no
4599 _LT_TAGVAR(archive_cmds, $1)= 4603 _LT_TAGVAR(archive_cmds, $1)=
4600 _LT_TAGVAR(archive_expsym_cmds, $1)= 4604 _LT_TAGVAR(archive_expsym_cmds, $1)=
4601 _LT_TAGVAR(compiler_needs_object, $1)=no 4605 _LT_TAGVAR(compiler_needs_object, $1)=no
4602 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no 4606 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
4603 _LT_TAGVAR(export_dynamic_flag_spec, $1)= 4607 _LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4640,26 +4644,29 @@ dnl Note also adjust exclude_expsyms for @@ -4640,26 +4644,29 @@ dnl Note also adjust exclude_expsyms for
4640 # When not using gcc, we currently assume that we are using 4644 # When not using gcc, we currently assume that we are using
4641 # Microsoft Visual C++. 4645 # Microsoft Visual C++.
4642 if test "$GCC" != yes; then 4646 if test "$GCC" != yes; then
4643 with_gnu_ld=no 4647 with_gnu_ld=no
4644 fi 4648 fi
4645 ;; 4649 ;;
4646 interix*) 4650 interix*)
4647 # we just hope/assume this is gcc and not c89 (= MSVC++) 4651 # we just hope/assume this is gcc and not c89 (= MSVC++)
4648 with_gnu_ld=yes 4652 with_gnu_ld=yes
4649 ;; 4653 ;;
4650 openbsd*) 4654 openbsd*)
4651 with_gnu_ld=no 4655 with_gnu_ld=no
4652 ;; 4656 ;;
 4657 linux* | k*bsd*-gnu | gnu*)
 4658 _LT_TAGVAR(link_all_deplibs, $1)=no
 4659 ;;
4653 esac 4660 esac
4654 4661
4655 _LT_TAGVAR(ld_shlibs, $1)=yes 4662 _LT_TAGVAR(ld_shlibs, $1)=yes
4656 4663
4657 # On some targets, GNU ld is compatible enough with the native linker 4664 # On some targets, GNU ld is compatible enough with the native linker
4658 # that we're better off using the native interface for both. 4665 # that we're better off using the native interface for both.
4659 lt_use_gnu_ld_interface=no 4666 lt_use_gnu_ld_interface=no
4660 if test "$with_gnu_ld" = yes; then 4667 if test "$with_gnu_ld" = yes; then
4661 case $host_os in 4668 case $host_os in
4662 aix*) 4669 aix*)
4663 # The AIX port of GNU ld has always aspired to compatibility 4670 # The AIX port of GNU ld has always aspired to compatibility
4664 # with the native linker. However, as the warning in the GNU ld 4671 # with the native linker. However, as the warning in the GNU ld
4665 # block says, versions before 2.19.5* couldn't really create working 4672 # block says, versions before 2.19.5* couldn't really create working
@@ -4861,27 +4868,27 @@ _LT_EOF @@ -4861,27 +4868,27 @@ _LT_EOF
4861 if test "x$supports_anon_versioning" = xyes; then 4868 if test "x$supports_anon_versioning" = xyes; then
4862 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ 4869 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
4863 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 4870 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
4864 echo "local: *; };" >> $output_objdir/$libname.ver~ 4871 echo "local: *; };" >> $output_objdir/$libname.ver~
4865 $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' 4872 $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
4866 fi 4873 fi
4867 ;; 4874 ;;
4868 esac 4875 esac
4869 else 4876 else
4870 _LT_TAGVAR(ld_shlibs, $1)=no 4877 _LT_TAGVAR(ld_shlibs, $1)=no
4871 fi 4878 fi
4872 ;; 4879 ;;
4873 4880
4874 netbsd*) 4881 netbsd* | netbsdelf*-gnu)
4875 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 4882 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
4876 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 4883 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4877 wlarc= 4884 wlarc=
4878 else 4885 else
4879 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 4886 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4880 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 4887 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
4881 fi 4888 fi
4882 ;; 4889 ;;
4883 4890
4884 solaris*) 4891 solaris*)
4885 if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then 4892 if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
4886 _LT_TAGVAR(ld_shlibs, $1)=no 4893 _LT_TAGVAR(ld_shlibs, $1)=no
4887 cat <<_LT_EOF 1>&2 4894 cat <<_LT_EOF 1>&2
@@ -5038,26 +5045,27 @@ _LT_EOF @@ -5038,26 +5045,27 @@ _LT_EOF
5038 # It fails to find uninstalled libraries when the uninstalled 5045 # It fails to find uninstalled libraries when the uninstalled
5039 # path is not listed in the libpath. Setting hardcode_minus_L 5046 # path is not listed in the libpath. Setting hardcode_minus_L
5040 # to unsupported forces relinking 5047 # to unsupported forces relinking
5041 _LT_TAGVAR(hardcode_minus_L, $1)=yes 5048 _LT_TAGVAR(hardcode_minus_L, $1)=yes
5042 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 5049 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
5043 _LT_TAGVAR(hardcode_libdir_separator, $1)= 5050 _LT_TAGVAR(hardcode_libdir_separator, $1)=
5044 fi 5051 fi
5045 ;; 5052 ;;
5046 esac 5053 esac
5047 shared_flag='-shared' 5054 shared_flag='-shared'
5048 if test "$aix_use_runtimelinking" = yes; then 5055 if test "$aix_use_runtimelinking" = yes; then
5049 shared_flag="$shared_flag "'${wl}-G' 5056 shared_flag="$shared_flag "'${wl}-G'
5050 fi 5057 fi
 5058 _LT_TAGVAR(link_all_deplibs, $1)=no
5051 else 5059 else
5052 # not using gcc 5060 # not using gcc
5053 if test "$host_cpu" = ia64; then 5061 if test "$host_cpu" = ia64; then
5054 # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release 5062 # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
5055 # chokes on -Wl,-G. The following line is correct: 5063 # chokes on -Wl,-G. The following line is correct:
5056 shared_flag='-G' 5064 shared_flag='-G'
5057 else 5065 else
5058 if test "$aix_use_runtimelinking" = yes; then 5066 if test "$aix_use_runtimelinking" = yes; then
5059 shared_flag='${wl}-G' 5067 shared_flag='${wl}-G'
5060 else 5068 else
5061 shared_flag='${wl}-bM:SRE' 5069 shared_flag='${wl}-bM:SRE'
5062 fi 5070 fi
5063 fi 5071 fi
@@ -5342,27 +5350,27 @@ _LT_EOF @@ -5342,27 +5350,27 @@ _LT_EOF
5342 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' 5350 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
5343 fi 5351 fi
5344 else 5352 else
5345 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' 5353 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
5346 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' 5354 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
5347 fi 5355 fi
5348 _LT_TAGVAR(archive_cmds_need_lc, $1)='no' 5356 _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
5349 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 5357 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5350 _LT_TAGVAR(hardcode_libdir_separator, $1)=: 5358 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
5351 _LT_TAGVAR(inherit_rpath, $1)=yes 5359 _LT_TAGVAR(inherit_rpath, $1)=yes
5352 _LT_TAGVAR(link_all_deplibs, $1)=yes 5360 _LT_TAGVAR(link_all_deplibs, $1)=yes
5353 ;; 5361 ;;
5354 5362
5355 netbsd*) 5363 netbsd* | netbsdelf*-gnu)
5356 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 5364 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
5357 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 5365 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
5358 else 5366 else
5359 _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF 5367 _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
5360 fi 5368 fi
5361 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 5369 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5362 _LT_TAGVAR(hardcode_direct, $1)=yes 5370 _LT_TAGVAR(hardcode_direct, $1)=yes
5363 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 5371 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
5364 ;; 5372 ;;
5365 5373
5366 newsos6) 5374 newsos6)
5367 _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' 5375 _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
5368 _LT_TAGVAR(hardcode_direct, $1)=yes 5376 _LT_TAGVAR(hardcode_direct, $1)=yes
@@ -6222,29 +6230,26 @@ if test "$_lt_caught_CXX_error" != yes;  @@ -6222,29 +6230,26 @@ if test "$_lt_caught_CXX_error" != yes;
6222 _LT_TAGVAR(ld_shlibs, $1)=no 6230 _LT_TAGVAR(ld_shlibs, $1)=no
6223 ;; 6231 ;;
6224 6232
6225 freebsd-elf*) 6233 freebsd-elf*)
6226 _LT_TAGVAR(archive_cmds_need_lc, $1)=no 6234 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
6227 ;; 6235 ;;
6228 6236
6229 freebsd* | dragonfly*) 6237 freebsd* | dragonfly*)
6230 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF 6238 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
6231 # conventions 6239 # conventions
6232 _LT_TAGVAR(ld_shlibs, $1)=yes 6240 _LT_TAGVAR(ld_shlibs, $1)=yes
6233 ;; 6241 ;;
6234 6242
6235 gnu*) 
6236 ;; 
6237 
6238 haiku*) 6243 haiku*)
6239 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 6244 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
6240 _LT_TAGVAR(link_all_deplibs, $1)=yes 6245 _LT_TAGVAR(link_all_deplibs, $1)=yes
6241 ;; 6246 ;;
6242 6247
6243 hpux9*) 6248 hpux9*)
6244 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' 6249 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
6245 _LT_TAGVAR(hardcode_libdir_separator, $1)=: 6250 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
6246 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' 6251 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
6247 _LT_TAGVAR(hardcode_direct, $1)=yes 6252 _LT_TAGVAR(hardcode_direct, $1)=yes
6248 _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, 6253 _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
6249 # but as the default 6254 # but as the default
6250 # location of the library. 6255 # location of the library.
@@ -6386,27 +6391,27 @@ if test "$_lt_caught_CXX_error" != yes;  @@ -6386,27 +6391,27 @@ if test "$_lt_caught_CXX_error" != yes;
6386 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' 6391 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6387 else 6392 else
6388 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' 6393 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
6389 fi 6394 fi
6390 fi 6395 fi
6391 _LT_TAGVAR(link_all_deplibs, $1)=yes 6396 _LT_TAGVAR(link_all_deplibs, $1)=yes
6392 ;; 6397 ;;
6393 esac 6398 esac
6394 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 6399 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
6395 _LT_TAGVAR(hardcode_libdir_separator, $1)=: 6400 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
6396 _LT_TAGVAR(inherit_rpath, $1)=yes 6401 _LT_TAGVAR(inherit_rpath, $1)=yes
6397 ;; 6402 ;;
6398 6403
6399 linux* | k*bsd*-gnu | kopensolaris*-gnu) 6404 linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
6400 case $cc_basename in 6405 case $cc_basename in
6401 KCC*) 6406 KCC*)
6402 # Kuck and Associates, Inc. (KAI) C++ Compiler 6407 # Kuck and Associates, Inc. (KAI) C++ Compiler
6403 6408
6404 # KCC will only create a shared library if the output file 6409 # KCC will only create a shared library if the output file
6405 # ends with ".so" (or ".sl" for HP-UX), so rename the library 6410 # ends with ".so" (or ".sl" for HP-UX), so rename the library
6406 # to its proper name (with version) after linking. 6411 # to its proper name (with version) after linking.
6407 _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' 6412 _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
6408 _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' 6413 _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
6409 # Commands to make compiler produce verbose output that lists 6414 # Commands to make compiler produce verbose output that lists
6410 # what "hidden" libraries, object files and flags are used when 6415 # what "hidden" libraries, object files and flags are used when
6411 # linking a shared library. 6416 # linking a shared library.
6412 # 6417 #
cvs diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/man/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/man/Attic/Makefile.in 2014/12/23 01:16:58 1.1.1.1.2.1
+++ xsrc/external/mit/libdrm/dist/man/Attic/Makefile.in 2015/01/28 11:17:49 1.1.1.1.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
cvs diff -r1.1.1.5.2.1 -r1.1.1.5.2.2 xsrc/external/mit/libdrm/dist/nouveau/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/nouveau/Attic/Makefile.in 2014/12/23 01:16:58 1.1.1.5.2.1
+++ xsrc/external/mit/libdrm/dist/nouveau/Attic/Makefile.in 2015/01/28 11:17:49 1.1.1.5.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -448,34 +448,34 @@ mostlyclean-compile: @@ -448,34 +448,34 @@ mostlyclean-compile:
448distclean-compile: 448distclean-compile:
449 -rm -f *.tab.c 449 -rm -f *.tab.c
450 450
451@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abi16.Plo@am__quote@ 451@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abi16.Plo@am__quote@
452@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bufctx.Plo@am__quote@ 452@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bufctx.Plo@am__quote@
453@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nouveau.Plo@am__quote@ 453@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nouveau.Plo@am__quote@
454@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pushbuf.Plo@am__quote@ 454@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pushbuf.Plo@am__quote@
455 455
456.c.o: 456.c.o:
457@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 457@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
458@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 458@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
459@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 459@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
460@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 460@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
461@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 461@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
462 462
463.c.obj: 463.c.obj:
464@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 464@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
465@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 465@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
466@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 466@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
467@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 467@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
468@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 468@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
469 469
470.c.lo: 470.c.lo:
471@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 471@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
472@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 472@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
473@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 473@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
474@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 474@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
475@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 475@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
476 476
477mostlyclean-libtool: 477mostlyclean-libtool:
478 -rm -f *.lo 478 -rm -f *.lo
479 479
480clean-libtool: 480clean-libtool:
481 -rm -rf .libs _libs 481 -rm -rf .libs _libs
cvs diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/omap/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/omap/Attic/Makefile.in 2014/12/23 01:16:58 1.1.1.1.2.1
+++ xsrc/external/mit/libdrm/dist/omap/Attic/Makefile.in 2015/01/28 11:17:49 1.1.1.1.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -435,34 +435,34 @@ libdrm_omap.la: $(libdrm_omap_la_OBJECTS @@ -435,34 +435,34 @@ libdrm_omap.la: $(libdrm_omap_la_OBJECTS
435mostlyclean-compile: 435mostlyclean-compile:
436 -rm -f *.$(OBJEXT) 436 -rm -f *.$(OBJEXT)
437 437
438distclean-compile: 438distclean-compile:
439 -rm -f *.tab.c 439 -rm -f *.tab.c
440 440
441@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omap_drm.Plo@am__quote@ 441@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omap_drm.Plo@am__quote@
442 442
443.c.o: 443.c.o:
444@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 444@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
445@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 445@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
446@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 446@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
447@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 447@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
448@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 448@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
449 449
450.c.obj: 450.c.obj:
451@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 451@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
452@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 452@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
453@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 453@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
454@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 454@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
455@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 455@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
456 456
457.c.lo: 457.c.lo:
458@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 458@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
459@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 459@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
460@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 460@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
461@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 461@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
462@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 462@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
463 463
464mostlyclean-libtool: 464mostlyclean-libtool:
465 -rm -f *.lo 465 -rm -f *.lo
466 466
467clean-libtool: 467clean-libtool:
468 -rm -rf .libs _libs 468 -rm -rf .libs _libs
cvs diff -r1.1.1.5.2.1 -r1.1.1.5.2.2 xsrc/external/mit/libdrm/dist/radeon/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/radeon/Attic/Makefile.in 2014/12/23 01:16:58 1.1.1.5.2.1
+++ xsrc/external/mit/libdrm/dist/radeon/Attic/Makefile.in 2015/01/28 11:17:49 1.1.1.5.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -485,34 +485,34 @@ distclean-compile: @@ -485,34 +485,34 @@ distclean-compile:
485@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bof.Plo@am__quote@ 485@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bof.Plo@am__quote@
486@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_bo.Plo@am__quote@ 486@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_bo.Plo@am__quote@
487@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_bo_gem.Plo@am__quote@ 487@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_bo_gem.Plo@am__quote@
488@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_cs.Plo@am__quote@ 488@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_cs.Plo@am__quote@
489@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_cs_gem.Plo@am__quote@ 489@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_cs_gem.Plo@am__quote@
490@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_cs_space.Plo@am__quote@ 490@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_cs_space.Plo@am__quote@
491@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_surface.Plo@am__quote@ 491@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_surface.Plo@am__quote@
492 492
493.c.o: 493.c.o:
494@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 494@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
495@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 495@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
496@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 496@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
497@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 497@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
498@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 498@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
499 499
500.c.obj: 500.c.obj:
501@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 501@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
502@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 502@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
503@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 503@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
504@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 504@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
505@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 505@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
506 506
507.c.lo: 507.c.lo:
508@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 508@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
509@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 509@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
510@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 510@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
511@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 511@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
512@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 512@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
513 513
514mostlyclean-libtool: 514mostlyclean-libtool:
515 -rm -f *.lo 515 -rm -f *.lo
516 516
517clean-libtool: 517clean-libtool:
518 -rm -rf .libs _libs 518 -rm -rf .libs _libs
cvs diff -r1.4.2.1 -r1.4.2.2 xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c 2014/12/23 01:16:58 1.4.2.1
+++ xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c 2015/01/28 11:17:49 1.4.2.2
@@ -356,26 +356,28 @@ static int r6_surface_init_1d(struct rad @@ -356,26 +356,28 @@ static int r6_surface_init_1d(struct rad
356static int r6_surface_init_2d(struct radeon_surface_manager *surf_man, 356static int r6_surface_init_2d(struct radeon_surface_manager *surf_man,
357 struct radeon_surface *surf, 357 struct radeon_surface *surf,
358 uint64_t offset, unsigned start_level) 358 uint64_t offset, unsigned start_level)
359{ 359{
360 uint32_t xalign, yalign, zalign, tilew; 360 uint32_t xalign, yalign, zalign, tilew;
361 unsigned i; 361 unsigned i;
362 362
363 /* compute alignment */ 363 /* compute alignment */
364 tilew = 8; 364 tilew = 8;
365 zalign = 1; 365 zalign = 1;
366 xalign = (surf_man->hw_info.group_bytes * surf_man->hw_info.num_banks) / 366 xalign = (surf_man->hw_info.group_bytes * surf_man->hw_info.num_banks) /
367 (tilew * surf->bpe * surf->nsamples); 367 (tilew * surf->bpe * surf->nsamples);
368 xalign = MAX2(tilew * surf_man->hw_info.num_banks, xalign); 368 xalign = MAX2(tilew * surf_man->hw_info.num_banks, xalign);
 369 if (surf->flags & RADEON_SURF_FMASK)
 370 xalign = MAX2(128, xalign);
369 yalign = tilew * surf_man->hw_info.num_pipes; 371 yalign = tilew * surf_man->hw_info.num_pipes;
370 if (surf->flags & RADEON_SURF_SCANOUT) { 372 if (surf->flags & RADEON_SURF_SCANOUT) {
371 xalign = MAX2((surf->bpe == 1) ? 64 : 32, xalign); 373 xalign = MAX2((surf->bpe == 1) ? 64 : 32, xalign);
372 } 374 }
373 if (!start_level) { 375 if (!start_level) {
374 surf->bo_alignment = 376 surf->bo_alignment =
375 MAX2(surf_man->hw_info.num_pipes * 377 MAX2(surf_man->hw_info.num_pipes *
376 surf_man->hw_info.num_banks * 378 surf_man->hw_info.num_banks *
377 surf->nsamples * surf->bpe * 64, 379 surf->nsamples * surf->bpe * 64,
378 xalign * yalign * surf->nsamples * surf->bpe); 380 xalign * yalign * surf->nsamples * surf->bpe);
379 } 381 }
380 382
381 /* build mipmap tree */ 383 /* build mipmap tree */
@@ -585,27 +587,27 @@ static void eg_surf_minify(struct radeon @@ -585,27 +587,27 @@ static void eg_surf_minify(struct radeon
585 return; 587 return;
586 } 588 }
587 } 589 }
588 surflevel->nblk_x = ALIGN(surflevel->nblk_x, mtilew); 590 surflevel->nblk_x = ALIGN(surflevel->nblk_x, mtilew);
589 surflevel->nblk_y = ALIGN(surflevel->nblk_y, mtileh); 591 surflevel->nblk_y = ALIGN(surflevel->nblk_y, mtileh);
590 surflevel->nblk_z = ALIGN(surflevel->nblk_z, 1); 592 surflevel->nblk_z = ALIGN(surflevel->nblk_z, 1);
591 593
592 /* macro tile per row */ 594 /* macro tile per row */
593 mtile_pr = surflevel->nblk_x / mtilew; 595 mtile_pr = surflevel->nblk_x / mtilew;
594 /* macro tile per slice */ 596 /* macro tile per slice */
595 mtile_ps = (mtile_pr * surflevel->nblk_y) / mtileh; 597 mtile_ps = (mtile_pr * surflevel->nblk_y) / mtileh;
596 598
597 surflevel->offset = offset; 599 surflevel->offset = offset;
598 surflevel->pitch_bytes = surflevel->nblk_x * bpe * slice_pt; 600 surflevel->pitch_bytes = surflevel->nblk_x * bpe * surf->nsamples;
599 surflevel->slice_size = mtile_ps * mtileb * slice_pt; 601 surflevel->slice_size = mtile_ps * mtileb * slice_pt;
600 602
601 surf->bo_size = offset + surflevel->slice_size * surflevel->nblk_z * surf->array_size; 603 surf->bo_size = offset + surflevel->slice_size * surflevel->nblk_z * surf->array_size;
602} 604}
603 605
604static int eg_surface_init_1d(struct radeon_surface_manager *surf_man, 606static int eg_surface_init_1d(struct radeon_surface_manager *surf_man,
605 struct radeon_surface *surf, 607 struct radeon_surface *surf,
606 struct radeon_surface_level *level, 608 struct radeon_surface_level *level,
607 unsigned bpe, 609 unsigned bpe,
608 uint64_t offset, unsigned start_level) 610 uint64_t offset, unsigned start_level)
609{ 611{
610 uint32_t xalign, yalign, zalign, tilew; 612 uint32_t xalign, yalign, zalign, tilew;
611 unsigned i; 613 unsigned i;
@@ -1488,27 +1490,27 @@ static void si_surf_minify_2d(struct rad @@ -1488,27 +1490,27 @@ static void si_surf_minify_2d(struct rad
1488 surflevel->mode = RADEON_SURF_MODE_1D; 1490 surflevel->mode = RADEON_SURF_MODE_1D;
1489 return; 1491 return;
1490 } 1492 }
1491 } 1493 }
1492 surflevel->nblk_x = ALIGN(surflevel->nblk_x, xalign); 1494 surflevel->nblk_x = ALIGN(surflevel->nblk_x, xalign);
1493 surflevel->nblk_y = ALIGN(surflevel->nblk_y, yalign); 1495 surflevel->nblk_y = ALIGN(surflevel->nblk_y, yalign);
1494 surflevel->nblk_z = ALIGN(surflevel->nblk_z, zalign); 1496 surflevel->nblk_z = ALIGN(surflevel->nblk_z, zalign);
1495 1497
1496 /* macro tile per row */ 1498 /* macro tile per row */
1497 mtile_pr = surflevel->nblk_x / xalign; 1499 mtile_pr = surflevel->nblk_x / xalign;
1498 /* macro tile per slice */ 1500 /* macro tile per slice */
1499 mtile_ps = (mtile_pr * surflevel->nblk_y) / yalign; 1501 mtile_ps = (mtile_pr * surflevel->nblk_y) / yalign;
1500 surflevel->offset = offset; 1502 surflevel->offset = offset;
1501 surflevel->pitch_bytes = surflevel->nblk_x * bpe * slice_pt; 1503 surflevel->pitch_bytes = surflevel->nblk_x * bpe * surf->nsamples;
1502 surflevel->slice_size = mtile_ps * mtileb * slice_pt; 1504 surflevel->slice_size = mtile_ps * mtileb * slice_pt;
1503 1505
1504 surf->bo_size = offset + surflevel->slice_size * surflevel->nblk_z * surf->array_size; 1506 surf->bo_size = offset + surflevel->slice_size * surflevel->nblk_z * surf->array_size;
1505} 1507}
1506 1508
1507static int si_surface_init_linear_aligned(struct radeon_surface_manager *surf_man, 1509static int si_surface_init_linear_aligned(struct radeon_surface_manager *surf_man,
1508 struct radeon_surface *surf, 1510 struct radeon_surface *surf,
1509 unsigned tile_mode, 1511 unsigned tile_mode,
1510 uint64_t offset, unsigned start_level) 1512 uint64_t offset, unsigned start_level)
1511{ 1513{
1512 uint32_t xalign, yalign, zalign, slice_align; 1514 uint32_t xalign, yalign, zalign, slice_align;
1513 unsigned i; 1515 unsigned i;
1514 1516
File Added: xsrc/external/mit/libdrm/dist/tegra/Attic/Makefile.am
AM_CPPFLAGS = \
	-I$(top_srcdir) \
	-I$(top_srcdir)/include/drm

AM_CFLAGS = \
	@PTHREADSTUBS_CFLAGS@ \
	$(VISIBILITY_CFLAGS) \
	$(WARN_CFLAGS)

libdrm_tegra_ladir = $(libdir)
libdrm_tegra_la_LTLIBRARIES = libdrm_tegra.la
libdrm_tegra_la_LDFLAGS = -version-number 0:0:0 -no-undefined
libdrm_tegra_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@

libdrm_tegra_la_SOURCES = \
	private.h \
	tegra.c

libdrm_tegraincludedir = ${includedir}/libdrm
libdrm_tegrainclude_HEADERS = tegra.h

pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm_tegra.pc
File Added: xsrc/external/mit/libdrm/dist/tegra/Attic/Makefile.in
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2013 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.

@SET_MAKE@



VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
      *) echo "am__make_running_with_option: internal error: invalid" \
              "target option '$${target_option-}' specified" >&2; \
         exit 1;; \
  esac; \
  has_opt=no; \
  sane_makeflags=$$MAKEFLAGS; \
  if $(am__is_gnu_make); then \
    sane_makeflags=$$MFLAGS; \
  else \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
        bs=\\; \
        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    esac; \
  fi; \
  skip_next=no; \
  strip_trailopt () \
  { \
    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
  }; \
  for flg in $$sane_makeflags; do \
    test $$skip_next = yes && { skip_next=no; continue; }; \
    case $$flg in \
      *=*|--*) continue;; \
        -*I) strip_trailopt 'I'; skip_next=yes;; \
      -*I?*) strip_trailopt 'I';; \
        -*O) strip_trailopt 'O'; skip_next=yes;; \
      -*O?*) strip_trailopt 'O';; \
        -*l) strip_trailopt 'l'; skip_next=yes;; \
      -*l?*) strip_trailopt 'l';; \
      -[dEDm]) skip_next=yes;; \
      -[JT]) skip_next=yes;; \
    esac; \
    case $$flg in \
      *$$target_option*) has_opt=yes; break;; \
    esac; \
  done; \
  test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = tegra
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
	$(srcdir)/libdrm_tegra.pc.in $(top_srcdir)/build-aux/depcomp \
	$(libdrm_tegrainclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
	$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
	$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = libdrm_tegra.pc
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    *) f=$$p;; \
  esac;
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
am__install_max = 40
am__nobase_strip_setup = \
  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
am__nobase_strip = \
  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
am__nobase_list = $(am__nobase_strip_setup); \
  for p in $$list; do echo "$$p $$p"; done | \
  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
    if (++n[$$2] == $(am__install_max)) \
      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
    END { for (dir in files) print dir, files[dir] }'
am__base_list = \
  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
  test -z "$$files" \
    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
         $(am__cd) "$$dir" && rm -f $$files; }; \
  }
am__installdirs = "$(DESTDIR)$(libdrm_tegra_ladir)" \
	"$(DESTDIR)$(pkgconfigdir)" \
	"$(DESTDIR)$(libdrm_tegraincludedir)"
LTLIBRARIES = $(libdrm_tegra_la_LTLIBRARIES)
libdrm_tegra_la_DEPENDENCIES = ../libdrm.la
am_libdrm_tegra_la_OBJECTS = tegra.lo
libdrm_tegra_la_OBJECTS = $(am_libdrm_tegra_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 = 
libdrm_tegra_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
	$(AM_CFLAGS) $(CFLAGS) $(libdrm_tegra_la_LDFLAGS) $(LDFLAGS) \
	-o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo "  GEN     " $@;
am__v_GEN_1 = 
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 = 
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
	$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo "  CC      " $@;
am__v_CC_1 = 
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
	$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo "  CCLD    " $@;
am__v_CCLD_1 = 
SOURCES = $(libdrm_tegra_la_SOURCES)
DIST_SOURCES = $(libdrm_tegra_la_SOURCES)
am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
DATA = $(pkgconfig_DATA)
HEADERS = $(libdrm_tegrainclude_HEADERS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates.  Input order is
# *not* preserved.
am__uniquify_input = $(AWK) '\
  BEGIN { nonempty = 0; } \
  { items[$$0] = 1; nonempty = 1; } \
  END { if (nonempty) { for (i in items) print i; }; } \
'
# Make sure the list of sources is unique.  This is necessary because,
# e.g., the same source file might be shared among _SOURCES variables
# for different programs/libraries.
am__define_uniq_tagged_files = \
  list='$(am__tagged_files)'; \
  unique=`for i in $$list; do \
    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLOCK_LIB = @CLOCK_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
LIBUDEV_LIBS = @LIBUDEV_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MANPAGES_STYLESHEET = @MANPAGES_STYLESHEET@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PTHREADSTUBS_CFLAGS = @PTHREADSTUBS_CFLAGS@
PTHREADSTUBS_LIBS = @PTHREADSTUBS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VERSION = @VERSION@
VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARN_CFLAGS = @WARN_CFLAGS@
XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
kernel_source = @kernel_source@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = \
	-I$(top_srcdir) \
	-I$(top_srcdir)/include/drm

AM_CFLAGS = \
	@PTHREADSTUBS_CFLAGS@ \
	$(VISIBILITY_CFLAGS) \
	$(WARN_CFLAGS)

libdrm_tegra_ladir = $(libdir)
libdrm_tegra_la_LTLIBRARIES = libdrm_tegra.la
libdrm_tegra_la_LDFLAGS = -version-number 0:0:0 -no-undefined
libdrm_tegra_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_tegra_la_SOURCES = \
	private.h \
	tegra.c

libdrm_tegraincludedir = ${includedir}/libdrm
libdrm_tegrainclude_HEADERS = tegra.h
pkgconfig_DATA = libdrm_tegra.pc
all: all-am

.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
	@for dep in $?; do \
	  case '$(am__configure_deps)' in \
	    *$$dep*) \
	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
	        && { if test -f $@; then exit 0; else break; fi; }; \
	      exit 1;; \
	  esac; \
	done; \
	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tegra/Makefile'; \
	$(am__cd) $(top_srcdir) && \
	  $(AUTOMAKE) --foreign tegra/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
	@case '$?' in \
	  *config.status*) \
	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
	  *) \
	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
	esac;

$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
libdrm_tegra.pc: $(top_builddir)/config.status $(srcdir)/libdrm_tegra.pc.in
	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

install-libdrm_tegra_laLTLIBRARIES: $(libdrm_tegra_la_LTLIBRARIES)
	@$(NORMAL_INSTALL)
	@list='$(libdrm_tegra_la_LTLIBRARIES)'; test -n "$(libdrm_tegra_ladir)" || list=; \
	list2=; for p in $$list; do \
	  if test -f $$p; then \
	    list2="$$list2 $$p"; \
	  else :; fi; \
	done; \
	test -z "$$list2" || { \
	  echo " $(MKDIR_P) '$(DESTDIR)$(libdrm_tegra_ladir)'"; \
	  $(MKDIR_P) "$(DESTDIR)$(libdrm_tegra_ladir)" || exit 1; \
	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdrm_tegra_ladir)'"; \
	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdrm_tegra_ladir)"; \
	}

uninstall-libdrm_tegra_laLTLIBRARIES:
	@$(NORMAL_UNINSTALL)
	@list='$(libdrm_tegra_la_LTLIBRARIES)'; test -n "$(libdrm_tegra_ladir)" || list=; \
	for p in $$list; do \
	  $(am__strip_dir) \
	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdrm_tegra_ladir)/$$f'"; \
	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdrm_tegra_ladir)/$$f"; \
	done

clean-libdrm_tegra_laLTLIBRARIES:
	-test -z "$(libdrm_tegra_la_LTLIBRARIES)" || rm -f $(libdrm_tegra_la_LTLIBRARIES)
	@list='$(libdrm_tegra_la_LTLIBRARIES)'; \
	locs=`for p in $$list; do echo $$p; done | \
	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
	      sort -u`; \
	test -z "$$locs" || { \
	  echo rm -f $${locs}; \
	  rm -f $${locs}; \
	}

libdrm_tegra.la: $(libdrm_tegra_la_OBJECTS) $(libdrm_tegra_la_DEPENDENCIES) $(EXTRA_libdrm_tegra_la_DEPENDENCIES) 
	$(AM_V_CCLD)$(libdrm_tegra_la_LINK) -rpath $(libdrm_tegra_ladir) $(libdrm_tegra_la_OBJECTS) $(libdrm_tegra_la_LIBADD) $(LIBS)

mostlyclean-compile:
	-rm -f *.$(OBJEXT)

distclean-compile:
	-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tegra.Plo@am__quote@

.c.o:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<

.c.obj:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

.c.lo:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<

mostlyclean-libtool:
	-rm -f *.lo

clean-libtool:
	-rm -rf .libs _libs
install-pkgconfigDATA: $(pkgconfig_DATA)
	@$(NORMAL_INSTALL)
	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
	if test -n "$$list"; then \
	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
	fi; \
	for p in $$list; do \
	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
	  echo "$$d$$p"; \
	done | $(am__base_list) | \
	while read files; do \
	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
	done

uninstall-pkgconfigDATA:
	@$(NORMAL_UNINSTALL)
	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
install-libdrm_tegraincludeHEADERS: $(libdrm_tegrainclude_HEADERS)
	@$(NORMAL_INSTALL)
	@list='$(libdrm_tegrainclude_HEADERS)'; test -n "$(libdrm_tegraincludedir)" || list=; \
	if test -n "$$list"; then \
	  echo " $(MKDIR_P) '$(DESTDIR)$(libdrm_tegraincludedir)'"; \
	  $(MKDIR_P) "$(DESTDIR)$(libdrm_tegraincludedir)" || exit 1; \
	fi; \
	for p in $$list; do \
	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
	  echo "$$d$$p"; \
	done | $(am__base_list) | \
	while read files; do \
	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libdrm_tegraincludedir)'"; \
	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libdrm_tegraincludedir)" || exit $$?; \
	done

uninstall-libdrm_tegraincludeHEADERS:
	@$(NORMAL_UNINSTALL)
	@list='$(libdrm_tegrainclude_HEADERS)'; test -n "$(libdrm_tegraincludedir)" || list=; \
	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
	dir='$(DESTDIR)$(libdrm_tegraincludedir)'; $(am__uninstall_files_from_dir)

ID: $(am__tagged_files)
	$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-am
TAGS: tags

tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
	set x; \
	here=`pwd`; \
	$(am__define_uniq_tagged_files); \
	shift; \
	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
	  test -n "$$unique" || unique=$$empty_fix; \
	  if test $$# -gt 0; then \
	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
	      "$$@" $$unique; \
	  else \
	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
	      $$unique; \
	  fi; \
	fi
ctags: ctags-am

CTAGS: ctags
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
	$(am__define_uniq_tagged_files); \
	test -z "$(CTAGS_ARGS)$$unique" \
	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
	     $$unique

GTAGS:
	here=`$(am__cd) $(top_builddir) && pwd` \
	  && $(am__cd) $(top_srcdir) \
	  && gtags -i $(GTAGS_ARGS) "$$here"
cscopelist: cscopelist-am

cscopelist-am: $(am__tagged_files)
	list='$(am__tagged_files)'; \
	case "$(srcdir)" in \
	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
	  *) sdir=$(subdir)/$(srcdir) ;; \
	esac; \
	for i in $$list; do \
	  if test -f "$$i"; then \
	    echo "$(subdir)/$$i"; \
	  else \
	    echo "$$sdir/$$i"; \
	  fi; \
	done >> $(top_builddir)/cscope.files

distclean-tags:
	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

distdir: $(DISTFILES)
	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
	list='$(DISTFILES)'; \
	  dist_files=`for file in $$list; do echo $$file; done | \
	  sed -e "s|^$$srcdirstrip/||;t" \
	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
	case $$dist_files in \
	  */*) $(MKDIR_P) `echo "$$dist_files" | \
			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
			   sort -u` ;; \
	esac; \
	for file in $$dist_files; do \
	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
	  if test -d $$d/$$file; then \
	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
	    if test -d "$(distdir)/$$file"; then \
	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
	    fi; \
	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
	    fi; \
	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
	  else \
	    test -f "$(distdir)/$$file" \
	    || cp -p $$d/$$file "$(distdir)/$$file" \
	    || exit 1; \
	  fi; \
	done
check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs:
	for dir in "$(DESTDIR)$(libdrm_tegra_ladir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libdrm_tegraincludedir)"; do \
	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
	done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am

install-am: all-am
	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

installcheck: installcheck-am
install-strip:
	if test -z '$(STRIP)'; then \
	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	      install; \
	else \
	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
	fi
mostlyclean-generic:

clean-generic:

distclean-generic:
	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

maintainer-clean-generic:
	@echo "This command is intended for maintainers to use"
	@echo "it deletes files that may require special tools to rebuild."
clean: clean-am

clean-am: clean-generic clean-libdrm_tegra_laLTLIBRARIES clean-libtool \
	mostlyclean-am

distclean: distclean-am
	-rm -rf ./$(DEPDIR)
	-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
	distclean-tags

dvi: dvi-am

dvi-am:

html: html-am

html-am:

info: info-am

info-am:

install-data-am: install-libdrm_tegra_laLTLIBRARIES \
	install-libdrm_tegraincludeHEADERS install-pkgconfigDATA

install-dvi: install-dvi-am

install-dvi-am:

install-exec-am:

install-html: install-html-am

install-html-am:

install-info: install-info-am

install-info-am:

install-man:

install-pdf: install-pdf-am

install-pdf-am:

install-ps: install-ps-am

install-ps-am:

installcheck-am:

maintainer-clean: maintainer-clean-am
	-rm -rf ./$(DEPDIR)
	-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic

mostlyclean: mostlyclean-am

mostlyclean-am: mostlyclean-compile mostlyclean-generic \
	mostlyclean-libtool

pdf: pdf-am

pdf-am:

ps: ps-am

ps-am:

uninstall-am: uninstall-libdrm_tegra_laLTLIBRARIES \
	uninstall-libdrm_tegraincludeHEADERS uninstall-pkgconfigDATA

.MAKE: install-am install-strip

.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
	clean-libdrm_tegra_laLTLIBRARIES clean-libtool cscopelist-am \
	ctags ctags-am distclean distclean-compile distclean-generic \
	distclean-libtool distclean-tags distdir dvi dvi-am html \
	html-am info info-am install install-am install-data \
	install-data-am install-dvi install-dvi-am install-exec \
	install-exec-am install-html install-html-am install-info \
	install-info-am install-libdrm_tegra_laLTLIBRARIES \
	install-libdrm_tegraincludeHEADERS install-man install-pdf \
	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
	install-strip installcheck installcheck-am installdirs \
	maintainer-clean maintainer-clean-generic mostlyclean \
	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
	uninstall-libdrm_tegra_laLTLIBRARIES \
	uninstall-libdrm_tegraincludeHEADERS uninstall-pkgconfigDATA


# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
File Added: xsrc/external/mit/libdrm/dist/tegra/libdrm_tegra.pc.in
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: libdrm_tegra
Description: Userspace interface to Tegra kernel DRM services
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -ldrm_tegra
Cflags: -I${includedir} -I${includedir}/libdrm
Requires.private: libdrm
File Added: xsrc/external/mit/libdrm/dist/tegra/private.h
/*
 * Copyright © 2012, 2013 Thierry Reding
 * Copyright © 2013 Erik Faye-Lund
 * Copyright © 2014 NVIDIA 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
 */

#ifndef __DRM_TEGRA_PRIVATE_H__
#define __DRM_TEGRA_PRIVATE_H__ 1

#include <stdbool.h>
#include <stdint.h>

#include <libdrm.h>
#include <xf86atomic.h>

#include "tegra.h"

struct drm_tegra {
	bool close;
	int fd;
};

struct drm_tegra_bo {
	struct drm_tegra *drm;
	uint32_t handle;
	uint32_t offset;
	uint32_t flags;
	uint32_t size;
	atomic_t ref;
	void *map;
};

#endif /* __DRM_TEGRA_PRIVATE_H__ */
File Added: xsrc/external/mit/libdrm/dist/tegra/tegra.c
/*
 * Copyright © 2012, 2013 Thierry Reding
 * Copyright © 2013 Erik Faye-Lund
 * Copyright © 2014 NVIDIA 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
 */

#ifdef HAVE_CONFIG_H
#  include "config.h"
#endif

#include <errno.h>
#include <fcntl.h>
#include <string.h>
#include <unistd.h>

#include <sys/mman.h>

#include <xf86drm.h>

#include <tegra_drm.h>

#include "private.h"

static void drm_tegra_bo_free(struct drm_tegra_bo *bo)
{
	struct drm_tegra *drm = bo->drm;
	struct drm_gem_close args;

	if (bo->map)
		munmap(bo->map, bo->size);

	memset(&args, 0, sizeof(args));
	args.handle = bo->handle;

	drmIoctl(drm->fd, DRM_IOCTL_GEM_CLOSE, &args);

	free(bo);
}

static int drm_tegra_wrap(struct drm_tegra **drmp, int fd, bool close)
{
	struct drm_tegra *drm;

	if (fd < 0 || !drmp)
		return -EINVAL;

	drm = calloc(1, sizeof(*drm));
	if (!drm)
		return -ENOMEM;

	drm->close = close;
	drm->fd = fd;

	*drmp = drm;

	return 0;
}

drm_public
int drm_tegra_new(struct drm_tegra **drmp, int fd)
{
	bool supported = false;
	drmVersionPtr version;

	version = drmGetVersion(fd);
	if (!version)
		return -ENOMEM;

	if (!strncmp(version->name, "tegra", version->name_len))
		supported = true;

	drmFreeVersion(version);

	if (!supported)
		return -ENOTSUP;

	return drm_tegra_wrap(drmp, fd, false);
}

drm_public
void drm_tegra_close(struct drm_tegra *drm)
{
	if (!drm)
		return;

	if (drm->close)
		close(drm->fd);

	free(drm);
}

drm_public
int drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm,
		     uint32_t flags, uint32_t size)
{
	struct drm_tegra_gem_create args;
	struct drm_tegra_bo *bo;
	int err;

	if (!drm || size == 0 || !bop)
		return -EINVAL;

	bo = calloc(1, sizeof(*bo));
	if (!bo)
		return -ENOMEM;

	atomic_set(&bo->ref, 1);
	bo->flags = flags;
	bo->size = size;
	bo->drm = drm;

	memset(&args, 0, sizeof(args));
	args.flags = flags;
	args.size = size;

	err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_CREATE, &args,
				  sizeof(args));
	if (err < 0) {
		err = -errno;
		free(bo);
		return err;
	}

	bo->handle = args.handle;

	*bop = bo;

	return 0;
}

drm_public
int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm,
		      uint32_t handle, uint32_t flags, uint32_t size)
{
	struct drm_tegra_bo *bo;

	if (!drm || !bop)
		return -EINVAL;

	bo = calloc(1, sizeof(*bo));
	if (!bo)
		return -ENOMEM;

	atomic_set(&bo->ref, 1);
	bo->handle = handle;
	bo->flags = flags;
	bo->size = size;
	bo->drm = drm;

	*bop = bo;

	return 0;
}

drm_public
struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo)
{
	if (bo)
		atomic_inc(&bo->ref);

	return bo;
}

drm_public
void drm_tegra_bo_unref(struct drm_tegra_bo *bo)
{
	if (bo && atomic_dec_and_test(&bo->ref))
		drm_tegra_bo_free(bo);
}

drm_public
int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle)
{
	if (!bo || !handle)
		return -EINVAL;

	*handle = bo->handle;

	return 0;
}

drm_public
int drm_tegra_bo_map(struct drm_tegra_bo *bo, void **ptr)
{
	struct drm_tegra *drm = bo->drm;

	if (!bo->map) {
		struct drm_tegra_gem_mmap args;
		int err;

		memset(&args, 0, sizeof(args));
		args.handle = bo->handle;

		err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_MMAP, &args,
					  sizeof(args));
		if (err < 0)
			return -errno;

		bo->offset = args.offset;

		bo->map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
			       drm->fd, bo->offset);
		if (bo->map == MAP_FAILED) {
			bo->map = NULL;
			return -errno;
		}
	}

	if (ptr)
		*ptr = bo->map;

	return 0;
}

drm_public
int drm_tegra_bo_unmap(struct drm_tegra_bo *bo)
{
	if (!bo)
		return -EINVAL;

	if (!bo->map)
		return 0;

	if (munmap(bo->map, bo->size))
		return -errno;

	bo->map = NULL;

	return 0;
}

drm_public
int drm_tegra_bo_get_flags(struct drm_tegra_bo *bo, uint32_t *flags)
{
	struct drm_tegra_gem_get_flags args;
	struct drm_tegra *drm = bo->drm;
	int err;

	if (!bo)
		return -EINVAL;

	memset(&args, 0, sizeof(args));
	args.handle = bo->handle;

	err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_GET_FLAGS, &args,
				  sizeof(args));
	if (err < 0)
		return -errno;

	if (flags)
		*flags = args.flags;

	return 0;
}

drm_public
int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags)
{
	struct drm_tegra_gem_get_flags args;
	struct drm_tegra *drm = bo->drm;
	int err;

	if (!bo)
		return -EINVAL;

	memset(&args, 0, sizeof(args));
	args.handle = bo->handle;
	args.flags = flags;

	err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_SET_FLAGS, &args,
				  sizeof(args));
	if (err < 0)
		return -errno;

	return 0;
}

drm_public
int drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo,
			    struct drm_tegra_bo_tiling *tiling)
{
	struct drm_tegra_gem_get_tiling args;
	struct drm_tegra *drm = bo->drm;
	int err;

	if (!bo)
		return -EINVAL;

	memset(&args, 0, sizeof(args));
	args.handle = bo->handle;

	err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_GET_TILING, &args,
				  sizeof(args));
	if (err < 0)
		return -errno;

	if (tiling) {
		tiling->mode = args.mode;
		tiling->value = args.value;
	}

	return 0;
}

drm_public
int drm_tegra_bo_set_tiling(struct drm_tegra_bo *bo,
			    const struct drm_tegra_bo_tiling *tiling)
{
	struct drm_tegra_gem_set_tiling args;
	struct drm_tegra *drm = bo->drm;
	int err;

	if (!bo)
		return -EINVAL;

	memset(&args, 0, sizeof(args));
	args.handle = bo->handle;
	args.mode = tiling->mode;
	args.value = tiling->value;

	err = drmCommandWriteRead(drm->fd, DRM_TEGRA_GEM_SET_TILING, &args,
				  sizeof(args));
	if (err < 0)
		return -errno;

	return 0;
}
File Added: xsrc/external/mit/libdrm/dist/tegra/tegra.h
/*
 * Copyright © 2012, 2013 Thierry Reding
 * Copyright © 2013 Erik Faye-Lund
 * Copyright © 2014 NVIDIA 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
 */

#ifndef __DRM_TEGRA_H__
#define __DRM_TEGRA_H__ 1

#include <stdint.h>
#include <stdlib.h>

struct drm_tegra_bo;
struct drm_tegra;

int drm_tegra_new(struct drm_tegra **drmp, int fd);
void drm_tegra_close(struct drm_tegra *drm);

int drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm,
		     uint32_t flags, uint32_t size);
int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm,
		      uint32_t handle, uint32_t flags, uint32_t size);
struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo);
void drm_tegra_bo_unref(struct drm_tegra_bo *bo);
int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle);
int drm_tegra_bo_map(struct drm_tegra_bo *bo, void **ptr);
int drm_tegra_bo_unmap(struct drm_tegra_bo *bo);

int drm_tegra_bo_get_flags(struct drm_tegra_bo *bo, uint32_t *flags);
int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags);

struct drm_tegra_bo_tiling {
	uint32_t mode;
	uint32_t value;
};

int drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo,
			    struct drm_tegra_bo_tiling *tiling);
int drm_tegra_bo_set_tiling(struct drm_tegra_bo *bo,
			    const struct drm_tegra_bo_tiling *tiling);

#endif /* __DRM_TEGRA_H__ */
cvs diff -r1.1.1.4 -r1.1.1.4.2.1 xsrc/external/mit/libdrm/dist/tests/Attic/Makefile.am (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/Attic/Makefile.am 2014/03/17 07:51:42 1.1.1.4
+++ xsrc/external/mit/libdrm/dist/tests/Attic/Makefile.am 2015/01/28 11:17:50 1.1.1.4.2.1
@@ -1,39 +1,43 @@ @@ -1,39 +1,43 @@
1NULL:=# 1NULL:=#
2 2
3AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
4 -I $(top_srcdir)/include/drm \ 4 -I $(top_srcdir)/include/drm \
5 -I $(top_srcdir) 5 -I $(top_srcdir)
6 6
7LDADD = $(top_builddir)/libdrm.la 7LDADD = $(top_builddir)/libdrm.la
8 8
9check_PROGRAMS = \ 9check_PROGRAMS = \
10 dristat \ 10 dristat \
11 drmstat 11 drmstat
12 12
13SUBDIRS = modeprint 13SUBDIRS = modeprint proptest
14 14
15if HAVE_LIBKMS 15if HAVE_LIBKMS
16SUBDIRS += kmstest modetest 16SUBDIRS += kmstest modetest
17endif 17endif
18 18
19if HAVE_RADEON 19if HAVE_RADEON
20SUBDIRS += radeon 20SUBDIRS += radeon
21endif 21endif
22 22
23if HAVE_EXYNOS 23if HAVE_EXYNOS
24SUBDIRS += exynos 24SUBDIRS += exynos
25endif 25endif
26 26
 27if HAVE_TEGRA
 28SUBDIRS += tegra
 29endif
 30
27if HAVE_LIBUDEV 31if HAVE_LIBUDEV
28 32
29check_LTLIBRARIES = libdrmtest.la 33check_LTLIBRARIES = libdrmtest.la
30 34
31libdrmtest_la_SOURCES = \ 35libdrmtest_la_SOURCES = \
32 drmtest.c \ 36 drmtest.c \
33 drmtest.h 37 drmtest.h
34 38
35libdrmtest_la_LIBADD = \ 39libdrmtest_la_LIBADD = \
36 $(top_builddir)/libdrm.la \ 40 $(top_builddir)/libdrm.la \
37 $(LIBUDEV_LIBS) 41 $(LIBUDEV_LIBS)
38 42
39LDADD += libdrmtest.la 43LDADD += libdrmtest.la
cvs diff -r1.1.1.6.2.1 -r1.1.1.6.2.2 xsrc/external/mit/libdrm/dist/tests/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/Attic/Makefile.in 2014/12/23 01:16:58 1.1.1.6.2.1
+++ xsrc/external/mit/libdrm/dist/tests/Attic/Makefile.in 2015/01/28 11:17:50 1.1.1.6.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -71,41 +71,42 @@ INSTALL_HEADER = $(INSTALL_DATA) @@ -71,41 +71,42 @@ INSTALL_HEADER = $(INSTALL_DATA)
71transform = $(program_transform_name) 71transform = $(program_transform_name)
72NORMAL_INSTALL = : 72NORMAL_INSTALL = :
73PRE_INSTALL = : 73PRE_INSTALL = :
74POST_INSTALL = : 74POST_INSTALL = :
75NORMAL_UNINSTALL = : 75NORMAL_UNINSTALL = :
76PRE_UNINSTALL = : 76PRE_UNINSTALL = :
77POST_UNINSTALL = : 77POST_UNINSTALL = :
78build_triplet = @build@ 78build_triplet = @build@
79host_triplet = @host@ 79host_triplet = @host@
80check_PROGRAMS = dristat$(EXEEXT) drmstat$(EXEEXT) $(am__EXEEXT_4) 80check_PROGRAMS = dristat$(EXEEXT) drmstat$(EXEEXT) $(am__EXEEXT_4)
81@HAVE_LIBKMS_TRUE@am__append_1 = kmstest modetest 81@HAVE_LIBKMS_TRUE@am__append_1 = kmstest modetest
82@HAVE_RADEON_TRUE@am__append_2 = radeon 82@HAVE_RADEON_TRUE@am__append_2 = radeon
83@HAVE_EXYNOS_TRUE@am__append_3 = exynos 83@HAVE_EXYNOS_TRUE@am__append_3 = exynos
84@HAVE_LIBUDEV_TRUE@am__append_4 = libdrmtest.la 84@HAVE_TEGRA_TRUE@am__append_4 = tegra
 85@HAVE_LIBUDEV_TRUE@am__append_5 = libdrmtest.la
85@HAVE_LIBUDEV_TRUE@TESTS = openclose$(EXEEXT) getversion$(EXEEXT) \ 86@HAVE_LIBUDEV_TRUE@TESTS = openclose$(EXEEXT) getversion$(EXEEXT) \
86@HAVE_LIBUDEV_TRUE@ getclient$(EXEEXT) getstats$(EXEEXT) \ 87@HAVE_LIBUDEV_TRUE@ getclient$(EXEEXT) getstats$(EXEEXT) \
87@HAVE_LIBUDEV_TRUE@ setversion$(EXEEXT) updatedraw$(EXEEXT) \ 88@HAVE_LIBUDEV_TRUE@ setversion$(EXEEXT) updatedraw$(EXEEXT) \
88@HAVE_LIBUDEV_TRUE@ name_from_fd$(EXEEXT) $(am__EXEEXT_1) \ 89@HAVE_LIBUDEV_TRUE@ name_from_fd$(EXEEXT) $(am__EXEEXT_1) \
89@HAVE_LIBUDEV_TRUE@ $(am__EXEEXT_2) 90@HAVE_LIBUDEV_TRUE@ $(am__EXEEXT_2)
90@HAVE_LIBUDEV_TRUE@am__append_5 = vbltest $(NULL) 91@HAVE_LIBUDEV_TRUE@am__append_6 = vbltest $(NULL)
91@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@am__append_6 = \ 92@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@am__append_7 = \
92@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_basic \ 93@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_basic \
93@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_flink \ 94@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_flink \
94@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_readwrite \ 95@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_readwrite \
95@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_mmap \ 96@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_mmap \
96@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ $(NULL) 97@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ $(NULL)
97 98
98@HAVE_LIBUDEV_TRUE@am__append_7 = $(TESTS) 99@HAVE_LIBUDEV_TRUE@am__append_8 = $(TESTS)
99subdir = tests 100subdir = tests
100DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ 101DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
101 $(top_srcdir)/build-aux/depcomp \ 102 $(top_srcdir)/build-aux/depcomp \
102 $(top_srcdir)/build-aux/test-driver 103 $(top_srcdir)/build-aux/test-driver
103ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 104ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
104am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ 105am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
105 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 106 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
106 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ 107 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
107 $(top_srcdir)/configure.ac 108 $(top_srcdir)/configure.ac
108am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 109am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
109 $(ACLOCAL_M4) 110 $(ACLOCAL_M4)
110mkinstalldirs = $(install_sh) -d 111mkinstalldirs = $(install_sh) -d
111CONFIG_HEADER = $(top_builddir)/config.h 112CONFIG_HEADER = $(top_builddir)/config.h
@@ -128,75 +129,75 @@ am__EXEEXT_1 = @@ -128,75 +129,75 @@ am__EXEEXT_1 =
128@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_flink$(EXEEXT) \ 129@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_flink$(EXEEXT) \
129@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_readwrite$(EXEEXT) \ 130@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_readwrite$(EXEEXT) \
130@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_mmap$(EXEEXT) \ 131@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ gem_mmap$(EXEEXT) \
131@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ $(am__EXEEXT_1) 132@HAVE_INTEL_TRUE@@HAVE_LIBUDEV_TRUE@ $(am__EXEEXT_1)
132@HAVE_LIBUDEV_TRUE@am__EXEEXT_3 = openclose$(EXEEXT) \ 133@HAVE_LIBUDEV_TRUE@am__EXEEXT_3 = openclose$(EXEEXT) \
133@HAVE_LIBUDEV_TRUE@ getversion$(EXEEXT) getclient$(EXEEXT) \ 134@HAVE_LIBUDEV_TRUE@ getversion$(EXEEXT) getclient$(EXEEXT) \
134@HAVE_LIBUDEV_TRUE@ getstats$(EXEEXT) setversion$(EXEEXT) \ 135@HAVE_LIBUDEV_TRUE@ getstats$(EXEEXT) setversion$(EXEEXT) \
135@HAVE_LIBUDEV_TRUE@ updatedraw$(EXEEXT) name_from_fd$(EXEEXT) \ 136@HAVE_LIBUDEV_TRUE@ updatedraw$(EXEEXT) name_from_fd$(EXEEXT) \
136@HAVE_LIBUDEV_TRUE@ $(am__EXEEXT_1) $(am__EXEEXT_2) 137@HAVE_LIBUDEV_TRUE@ $(am__EXEEXT_1) $(am__EXEEXT_2)
137@HAVE_LIBUDEV_TRUE@am__EXEEXT_4 = $(am__EXEEXT_3) 138@HAVE_LIBUDEV_TRUE@am__EXEEXT_4 = $(am__EXEEXT_3)
138dristat_SOURCES = dristat.c 139dristat_SOURCES = dristat.c
139dristat_OBJECTS = dristat.$(OBJEXT) 140dristat_OBJECTS = dristat.$(OBJEXT)
140dristat_LDADD = $(LDADD) 141dristat_LDADD = $(LDADD)
141dristat_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 142dristat_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
142drmstat_SOURCES = drmstat.c 143drmstat_SOURCES = drmstat.c
143drmstat_OBJECTS = drmstat.$(OBJEXT) 144drmstat_OBJECTS = drmstat.$(OBJEXT)
144drmstat_LDADD = $(LDADD) 145drmstat_LDADD = $(LDADD)
145drmstat_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 146drmstat_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
146gem_basic_SOURCES = gem_basic.c 147gem_basic_SOURCES = gem_basic.c
147gem_basic_OBJECTS = gem_basic.$(OBJEXT) 148gem_basic_OBJECTS = gem_basic.$(OBJEXT)
148gem_basic_LDADD = $(LDADD) 149gem_basic_LDADD = $(LDADD)
149gem_basic_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 150gem_basic_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
150gem_flink_SOURCES = gem_flink.c 151gem_flink_SOURCES = gem_flink.c
151gem_flink_OBJECTS = gem_flink.$(OBJEXT) 152gem_flink_OBJECTS = gem_flink.$(OBJEXT)
152gem_flink_LDADD = $(LDADD) 153gem_flink_LDADD = $(LDADD)
153gem_flink_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 154gem_flink_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
154gem_mmap_SOURCES = gem_mmap.c 155gem_mmap_SOURCES = gem_mmap.c
155gem_mmap_OBJECTS = gem_mmap.$(OBJEXT) 156gem_mmap_OBJECTS = gem_mmap.$(OBJEXT)
156gem_mmap_LDADD = $(LDADD) 157gem_mmap_LDADD = $(LDADD)
157gem_mmap_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 158gem_mmap_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
158gem_readwrite_SOURCES = gem_readwrite.c 159gem_readwrite_SOURCES = gem_readwrite.c
159gem_readwrite_OBJECTS = gem_readwrite.$(OBJEXT) 160gem_readwrite_OBJECTS = gem_readwrite.$(OBJEXT)
160gem_readwrite_LDADD = $(LDADD) 161gem_readwrite_LDADD = $(LDADD)
161gem_readwrite_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 162gem_readwrite_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
162getclient_SOURCES = getclient.c 163getclient_SOURCES = getclient.c
163getclient_OBJECTS = getclient.$(OBJEXT) 164getclient_OBJECTS = getclient.$(OBJEXT)
164getclient_LDADD = $(LDADD) 165getclient_LDADD = $(LDADD)
165getclient_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 166getclient_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
166getstats_SOURCES = getstats.c 167getstats_SOURCES = getstats.c
167getstats_OBJECTS = getstats.$(OBJEXT) 168getstats_OBJECTS = getstats.$(OBJEXT)
168getstats_LDADD = $(LDADD) 169getstats_LDADD = $(LDADD)
169getstats_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 170getstats_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
170getversion_SOURCES = getversion.c 171getversion_SOURCES = getversion.c
171getversion_OBJECTS = getversion.$(OBJEXT) 172getversion_OBJECTS = getversion.$(OBJEXT)
172getversion_LDADD = $(LDADD) 173getversion_LDADD = $(LDADD)
173getversion_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 174getversion_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
174name_from_fd_SOURCES = name_from_fd.c 175name_from_fd_SOURCES = name_from_fd.c
175name_from_fd_OBJECTS = name_from_fd.$(OBJEXT) 176name_from_fd_OBJECTS = name_from_fd.$(OBJEXT)
176name_from_fd_LDADD = $(LDADD) 177name_from_fd_LDADD = $(LDADD)
177name_from_fd_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 178name_from_fd_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
178openclose_SOURCES = openclose.c 179openclose_SOURCES = openclose.c
179openclose_OBJECTS = openclose.$(OBJEXT) 180openclose_OBJECTS = openclose.$(OBJEXT)
180openclose_LDADD = $(LDADD) 181openclose_LDADD = $(LDADD)
181openclose_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 182openclose_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
182setversion_SOURCES = setversion.c 183setversion_SOURCES = setversion.c
183setversion_OBJECTS = setversion.$(OBJEXT) 184setversion_OBJECTS = setversion.$(OBJEXT)
184setversion_LDADD = $(LDADD) 185setversion_LDADD = $(LDADD)
185setversion_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 186setversion_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
186updatedraw_SOURCES = updatedraw.c 187updatedraw_SOURCES = updatedraw.c
187updatedraw_OBJECTS = updatedraw.$(OBJEXT) 188updatedraw_OBJECTS = updatedraw.$(OBJEXT)
188updatedraw_LDADD = $(LDADD) 189updatedraw_LDADD = $(LDADD)
189updatedraw_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_4) 190updatedraw_DEPENDENCIES = $(top_builddir)/libdrm.la $(am__append_5)
190AM_V_P = $(am__v_P_@AM_V@) 191AM_V_P = $(am__v_P_@AM_V@)
191am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) 192am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
192am__v_P_0 = false 193am__v_P_0 = false
193am__v_P_1 = : 194am__v_P_1 = :
194AM_V_GEN = $(am__v_GEN_@AM_V@) 195AM_V_GEN = $(am__v_GEN_@AM_V@)
195am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) 196am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
196am__v_GEN_0 = @echo " GEN " $@; 197am__v_GEN_0 = @echo " GEN " $@;
197am__v_GEN_1 =  198am__v_GEN_1 =
198AM_V_at = $(am__v_at_@AM_V@) 199AM_V_at = $(am__v_at_@AM_V@)
199am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 200am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
200am__v_at_0 = @ 201am__v_at_0 = @
201am__v_at_1 =  202am__v_at_1 =
202DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) 203DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -462,27 +463,28 @@ am__set_b = \ @@ -462,27 +463,28 @@ am__set_b = \
462 case '$*' in \ 463 case '$*' in \
463 */*) b='$*';; \ 464 */*) b='$*';; \
464 *) b=`echo '$@' | sed 's/\.log$$//'`; \ 465 *) b=`echo '$@' | sed 's/\.log$$//'`; \
465 esac;; \ 466 esac;; \
466 *) \ 467 *) \
467 b='$*';; \ 468 b='$*';; \
468 esac 469 esac
469am__test_logs1 = $(TESTS:=.log) 470am__test_logs1 = $(TESTS:=.log)
470am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) 471am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
471TEST_LOGS = $(am__test_logs2:.test.log=.log) 472TEST_LOGS = $(am__test_logs2:.test.log=.log)
472TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver 473TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
473TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ 474TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
474 $(TEST_LOG_FLAGS) 475 $(TEST_LOG_FLAGS)
475DIST_SUBDIRS = modeprint kmstest modetest radeon exynos vbltest 476DIST_SUBDIRS = modeprint proptest kmstest modetest radeon exynos tegra \
 477 vbltest
476DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 478DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
477am__relativize = \ 479am__relativize = \
478 dir0=`pwd`; \ 480 dir0=`pwd`; \
479 sed_first='s,^\([^/]*\)/.*$$,\1,'; \ 481 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
480 sed_rest='s,^[^/]*/*,,'; \ 482 sed_rest='s,^[^/]*/*,,'; \
481 sed_last='s,^.*/\([^/]*\)$$,\1,'; \ 483 sed_last='s,^.*/\([^/]*\)$$,\1,'; \
482 sed_butlast='s,/*[^/]*$$,,'; \ 484 sed_butlast='s,/*[^/]*$$,,'; \
483 while test -n "$$dir1"; do \ 485 while test -n "$$dir1"; do \
484 first=`echo "$$dir1" | sed -e "$$sed_first"`; \ 486 first=`echo "$$dir1" | sed -e "$$sed_first"`; \
485 if test "$$first" != "."; then \ 487 if test "$$first" != "."; then \
486 if test "$$first" = ".."; then \ 488 if test "$$first" = ".."; then \
487 dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ 489 dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
488 dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ 490 dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
@@ -630,29 +632,29 @@ psdir = @psdir@ @@ -630,29 +632,29 @@ psdir = @psdir@
630sbindir = @sbindir@ 632sbindir = @sbindir@
631sharedstatedir = @sharedstatedir@ 633sharedstatedir = @sharedstatedir@
632srcdir = @srcdir@ 634srcdir = @srcdir@
633sysconfdir = @sysconfdir@ 635sysconfdir = @sysconfdir@
634target_alias = @target_alias@ 636target_alias = @target_alias@
635top_build_prefix = @top_build_prefix@ 637top_build_prefix = @top_build_prefix@
636top_builddir = @top_builddir@ 638top_builddir = @top_builddir@
637top_srcdir = @top_srcdir@ 639top_srcdir = @top_srcdir@
638NULL := # 640NULL := #
639AM_CPPFLAGS = \ 641AM_CPPFLAGS = \
640 -I $(top_srcdir)/include/drm \ 642 -I $(top_srcdir)/include/drm \
641 -I $(top_srcdir) 643 -I $(top_srcdir)
642 644
643LDADD = $(top_builddir)/libdrm.la $(am__append_4) 645LDADD = $(top_builddir)/libdrm.la $(am__append_5)
644SUBDIRS = modeprint $(am__append_1) $(am__append_2) $(am__append_3) \ 646SUBDIRS = modeprint proptest $(am__append_1) $(am__append_2) \
645 $(am__append_5) 647 $(am__append_3) $(am__append_4) $(am__append_6)
646@HAVE_LIBUDEV_TRUE@check_LTLIBRARIES = libdrmtest.la 648@HAVE_LIBUDEV_TRUE@check_LTLIBRARIES = libdrmtest.la
647@HAVE_LIBUDEV_TRUE@libdrmtest_la_SOURCES = \ 649@HAVE_LIBUDEV_TRUE@libdrmtest_la_SOURCES = \
648@HAVE_LIBUDEV_TRUE@ drmtest.c \ 650@HAVE_LIBUDEV_TRUE@ drmtest.c \
649@HAVE_LIBUDEV_TRUE@ drmtest.h 651@HAVE_LIBUDEV_TRUE@ drmtest.h
650 652
651@HAVE_LIBUDEV_TRUE@libdrmtest_la_LIBADD = \ 653@HAVE_LIBUDEV_TRUE@libdrmtest_la_LIBADD = \
652@HAVE_LIBUDEV_TRUE@ $(top_builddir)/libdrm.la \ 654@HAVE_LIBUDEV_TRUE@ $(top_builddir)/libdrm.la \
653@HAVE_LIBUDEV_TRUE@ $(LIBUDEV_LIBS) 655@HAVE_LIBUDEV_TRUE@ $(LIBUDEV_LIBS)
654 656
655@HAVE_LIBUDEV_TRUE@XFAIL_TESTS = \ 657@HAVE_LIBUDEV_TRUE@XFAIL_TESTS = \
656@HAVE_LIBUDEV_TRUE@ auth \ 658@HAVE_LIBUDEV_TRUE@ auth \
657@HAVE_LIBUDEV_TRUE@ lock 659@HAVE_LIBUDEV_TRUE@ lock
658 660
@@ -782,34 +784,34 @@ distclean-compile: @@ -782,34 +784,34 @@ distclean-compile:
782@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getclient.Po@am__quote@ 784@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getclient.Po@am__quote@
783@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getstats.Po@am__quote@ 785@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getstats.Po@am__quote@
784@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getversion.Po@am__quote@ 786@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getversion.Po@am__quote@
785@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/name_from_fd.Po@am__quote@ 787@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/name_from_fd.Po@am__quote@
786@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openclose.Po@am__quote@ 788@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openclose.Po@am__quote@
787@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setversion.Po@am__quote@ 789@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setversion.Po@am__quote@
788@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updatedraw.Po@am__quote@ 790@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updatedraw.Po@am__quote@
789 791
790.c.o: 792.c.o:
791@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 793@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
792@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 794@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
793@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 795@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
794@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 796@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
795@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 797@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
796 798
797.c.obj: 799.c.obj:
798@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 800@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
799@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 801@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
800@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 802@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
801@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 803@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
802@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 804@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
803 805
804.c.lo: 806.c.lo:
805@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 807@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
806@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 808@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
807@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 809@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
808@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 810@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
809@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 811@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
810 812
811mostlyclean-libtool: 813mostlyclean-libtool:
812 -rm -f *.lo 814 -rm -f *.lo
813 815
814clean-libtool: 816clean-libtool:
815 -rm -rf .libs _libs 817 -rm -rf .libs _libs
cvs diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/exynos/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/exynos/Attic/Makefile.in 2014/12/23 01:16:58 1.1.1.1.2.1
+++ xsrc/external/mit/libdrm/dist/tests/exynos/Attic/Makefile.in 2015/01/28 11:17:50 1.1.1.1.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -416,34 +416,34 @@ exynos_fimg2d_test$(EXEEXT): $(exynos_fi @@ -416,34 +416,34 @@ exynos_fimg2d_test$(EXEEXT): $(exynos_fi
416mostlyclean-compile: 416mostlyclean-compile:
417 -rm -f *.$(OBJEXT) 417 -rm -f *.$(OBJEXT)
418 418
419distclean-compile: 419distclean-compile:
420 -rm -f *.tab.c 420 -rm -f *.tab.c
421 421
422@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exynos_fimg2d_test.Po@am__quote@ 422@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exynos_fimg2d_test.Po@am__quote@
423 423
424.c.o: 424.c.o:
425@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 425@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
426@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 426@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
427@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 427@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
428@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 428@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
429@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 429@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
430 430
431.c.obj: 431.c.obj:
432@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 432@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
433@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 433@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
434@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 434@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
435@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 435@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
436@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 436@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
437 437
438.c.lo: 438.c.lo:
439@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 439@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
440@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 440@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
441@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 441@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
442@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 442@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
443@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 443@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
444 444
445mostlyclean-libtool: 445mostlyclean-libtool:
446 -rm -f *.lo 446 -rm -f *.lo
447 447
448clean-libtool: 448clean-libtool:
449 -rm -rf .libs _libs 449 -rm -rf .libs _libs
cvs diff -r1.1.1.5.2.1 -r1.1.1.5.2.2 xsrc/external/mit/libdrm/dist/tests/kmstest/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/kmstest/Attic/Makefile.in 2014/12/23 01:16:58 1.1.1.5.2.1
+++ xsrc/external/mit/libdrm/dist/tests/kmstest/Attic/Makefile.in 2015/01/28 11:17:50 1.1.1.5.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -413,34 +413,34 @@ kmstest$(EXEEXT): $(kmstest_OBJECTS) $(k @@ -413,34 +413,34 @@ kmstest$(EXEEXT): $(kmstest_OBJECTS) $(k
413mostlyclean-compile: 413mostlyclean-compile:
414 -rm -f *.$(OBJEXT) 414 -rm -f *.$(OBJEXT)
415 415
416distclean-compile: 416distclean-compile:
417 -rm -f *.tab.c 417 -rm -f *.tab.c
418 418
419@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ 419@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
420 420
421.c.o: 421.c.o:
422@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 422@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
423@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 423@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
424@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 424@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
425@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 425@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
426@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 426@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
427 427
428.c.obj: 428.c.obj:
429@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 429@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
430@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 430@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
431@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 431@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
432@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 432@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
433@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 433@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
434 434
435.c.lo: 435.c.lo:
436@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 436@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
437@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 437@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
438@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 438@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
439@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 439@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
440@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 440@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
441 441
442mostlyclean-libtool: 442mostlyclean-libtool:
443 -rm -f *.lo 443 -rm -f *.lo
444 444
445clean-libtool: 445clean-libtool:
446 -rm -rf .libs _libs 446 -rm -rf .libs _libs
cvs diff -r1.1.1.6.2.1 -r1.1.1.6.2.2 xsrc/external/mit/libdrm/dist/tests/modeprint/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/modeprint/Attic/Makefile.in 2014/12/23 01:16:58 1.1.1.6.2.1
+++ xsrc/external/mit/libdrm/dist/tests/modeprint/Attic/Makefile.in 2015/01/28 11:17:50 1.1.1.6.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -410,34 +410,34 @@ modeprint$(EXEEXT): $(modeprint_OBJECTS) @@ -410,34 +410,34 @@ modeprint$(EXEEXT): $(modeprint_OBJECTS)
410mostlyclean-compile: 410mostlyclean-compile:
411 -rm -f *.$(OBJEXT) 411 -rm -f *.$(OBJEXT)
412 412
413distclean-compile: 413distclean-compile:
414 -rm -f *.tab.c 414 -rm -f *.tab.c
415 415
416@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modeprint.Po@am__quote@ 416@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modeprint.Po@am__quote@
417 417
418.c.o: 418.c.o:
419@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 419@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
420@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 420@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
421@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 421@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
422@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 422@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
423@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 423@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
424 424
425.c.obj: 425.c.obj:
426@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 426@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
427@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 427@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
428@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 428@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
429@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 429@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
430@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 430@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
431 431
432.c.lo: 432.c.lo:
433@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 433@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
434@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 434@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
435@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 435@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
436@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 436@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
437@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 437@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
438 438
439mostlyclean-libtool: 439mostlyclean-libtool:
440 -rm -f *.lo 440 -rm -f *.lo
441 441
442clean-libtool: 442clean-libtool:
443 -rm -rf .libs _libs 443 -rm -rf .libs _libs
cvs diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 xsrc/external/mit/libdrm/dist/tests/modetest/Android.mk (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/modetest/Android.mk 2014/12/23 01:16:58 1.1.1.1.2.2
+++ xsrc/external/mit/libdrm/dist/tests/modetest/Android.mk 2015/01/28 11:17:50 1.1.1.1.2.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1LOCAL_PATH := $(call my-dir) 1LOCAL_PATH := $(call my-dir)
2 2
3include $(CLEAR_VARS) 3include $(CLEAR_VARS)
4include $(LOCAL_PATH)/Makefile.sources 4include $(LOCAL_PATH)/Makefile.sources
5 5
6LOCAL_SRC_FILES := $(MODETEST_FILES) 6LOCAL_SRC_FILES := $(MODETEST_FILES)
7 7
8LOCAL_MODULE := modetest 8LOCAL_MODULE := modetest
9 9
10LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm 10LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
11 11
12LOCAL_SHARED_LIBRARIES := libdrm libkms 12LOCAL_SHARED_LIBRARIES := libdrm
13 13
14include $(BUILD_EXECUTABLE) 14include $(BUILD_EXECUTABLE)
cvs diff -r1.1.1.4.2.1 -r1.1.1.4.2.2 xsrc/external/mit/libdrm/dist/tests/modetest/Attic/Makefile.am (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/modetest/Attic/Makefile.am 2014/12/23 01:16:58 1.1.1.4.2.1
+++ xsrc/external/mit/libdrm/dist/tests/modetest/Attic/Makefile.am 2015/01/28 11:17:50 1.1.1.4.2.2
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1include Makefile.sources 1include Makefile.sources
2 2
3AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) 3AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS))
4 4
5AM_CFLAGS += \ 5AM_CFLAGS += \
6 -I$(top_srcdir)/include/drm \ 6 -I$(top_srcdir)/include/drm \
7 -I$(top_srcdir)/libkms/ \ 
8 -I$(top_srcdir) 7 -I$(top_srcdir)
9 8
10if HAVE_INSTALL_TESTS 9if HAVE_INSTALL_TESTS
11bin_PROGRAMS = \ 10bin_PROGRAMS = \
12 modetest 11 modetest
13else 12else
14noinst_PROGRAMS = \ 13noinst_PROGRAMS = \
15 modetest 14 modetest
16endif 15endif
17 16
18modetest_SOURCES = $(MODETEST_FILES) 17modetest_SOURCES = $(MODETEST_FILES)
19 18
20modetest_LDADD = \ 19modetest_LDADD = \
21 $(top_builddir)/libdrm.la \ 20 $(top_builddir)/libdrm.la \
22 $(top_builddir)/libkms/libkms.la 21 -lpthread
23 22
24if HAVE_CAIRO 23if HAVE_CAIRO
25AM_CFLAGS += $(CAIRO_CFLAGS) 24AM_CFLAGS += $(CAIRO_CFLAGS)
26modetest_LDADD += $(CAIRO_LIBS) 25modetest_LDADD += $(CAIRO_LIBS)
27endif 26endif
28 27
29EXTRA_DIST = Android.mk 28EXTRA_DIST = Android.mk
cvs diff -r1.1.1.7.2.1 -r1.1.1.7.2.2 xsrc/external/mit/libdrm/dist/tests/modetest/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/modetest/Attic/Makefile.in 2014/12/23 01:16:58 1.1.1.7.2.1
+++ xsrc/external/mit/libdrm/dist/tests/modetest/Attic/Makefile.in 2015/01/28 11:17:50 1.1.1.7.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -94,27 +94,27 @@ am__configure_deps = $(am__aclocal_m4_de @@ -94,27 +94,27 @@ am__configure_deps = $(am__aclocal_m4_de
94 $(ACLOCAL_M4) 94 $(ACLOCAL_M4)
95mkinstalldirs = $(install_sh) -d 95mkinstalldirs = $(install_sh) -d
96CONFIG_HEADER = $(top_builddir)/config.h 96CONFIG_HEADER = $(top_builddir)/config.h
97CONFIG_CLEAN_FILES = 97CONFIG_CLEAN_FILES =
98CONFIG_CLEAN_VPATH_FILES = 98CONFIG_CLEAN_VPATH_FILES =
99am__installdirs = "$(DESTDIR)$(bindir)" 99am__installdirs = "$(DESTDIR)$(bindir)"
100PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) 100PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
101am__objects_1 = buffers.$(OBJEXT) cursor.$(OBJEXT) modetest.$(OBJEXT) 101am__objects_1 = buffers.$(OBJEXT) cursor.$(OBJEXT) modetest.$(OBJEXT)
102am_modetest_OBJECTS = $(am__objects_1) 102am_modetest_OBJECTS = $(am__objects_1)
103modetest_OBJECTS = $(am_modetest_OBJECTS) 103modetest_OBJECTS = $(am_modetest_OBJECTS)
104am__DEPENDENCIES_1 = 104am__DEPENDENCIES_1 =
105@HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) 105@HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
106modetest_DEPENDENCIES = $(top_builddir)/libdrm.la \ 106modetest_DEPENDENCIES = $(top_builddir)/libdrm.la \
107 $(top_builddir)/libkms/libkms.la $(am__DEPENDENCIES_2) 107 $(am__DEPENDENCIES_2)
108AM_V_lt = $(am__v_lt_@AM_V@) 108AM_V_lt = $(am__v_lt_@AM_V@)
109am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) 109am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
110am__v_lt_0 = --silent 110am__v_lt_0 = --silent
111am__v_lt_1 =  111am__v_lt_1 =
112AM_V_P = $(am__v_P_@AM_V@) 112AM_V_P = $(am__v_P_@AM_V@)
113am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) 113am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
114am__v_P_0 = false 114am__v_P_0 = false
115am__v_P_1 = : 115am__v_P_1 = :
116AM_V_GEN = $(am__v_GEN_@AM_V@) 116AM_V_GEN = $(am__v_GEN_@AM_V@)
117am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) 117am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
118am__v_GEN_0 = @echo " GEN " $@; 118am__v_GEN_0 = @echo " GEN " $@;
119am__v_GEN_1 =  119am__v_GEN_1 =
120AM_V_at = $(am__v_at_@AM_V@) 120AM_V_at = $(am__v_at_@AM_V@)
@@ -304,31 +304,29 @@ srcdir = @srcdir@ @@ -304,31 +304,29 @@ srcdir = @srcdir@
304sysconfdir = @sysconfdir@ 304sysconfdir = @sysconfdir@
305target_alias = @target_alias@ 305target_alias = @target_alias@
306top_build_prefix = @top_build_prefix@ 306top_build_prefix = @top_build_prefix@
307top_builddir = @top_builddir@ 307top_builddir = @top_builddir@
308top_srcdir = @top_srcdir@ 308top_srcdir = @top_srcdir@
309MODETEST_FILES := \ 309MODETEST_FILES := \
310 buffers.c \ 310 buffers.c \
311 buffers.h \ 311 buffers.h \
312 cursor.c \ 312 cursor.c \
313 cursor.h \ 313 cursor.h \
314 modetest.c 314 modetest.c
315 315
316AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) \ 316AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) \
317 -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \ 317 -I$(top_srcdir)/include/drm -I$(top_srcdir) $(am__append_1)
318 -I$(top_srcdir) $(am__append_1) 
319modetest_SOURCES = $(MODETEST_FILES) 318modetest_SOURCES = $(MODETEST_FILES)
320modetest_LDADD = $(top_builddir)/libdrm.la \ 319modetest_LDADD = $(top_builddir)/libdrm.la -lpthread $(am__append_2)
321 $(top_builddir)/libkms/libkms.la $(am__append_2) 
322EXTRA_DIST = Android.mk 320EXTRA_DIST = Android.mk
323all: all-am 321all: all-am
324 322
325.SUFFIXES: 323.SUFFIXES:
326.SUFFIXES: .c .lo .o .obj 324.SUFFIXES: .c .lo .o .obj
327$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.sources $(am__configure_deps) 325$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.sources $(am__configure_deps)
328 @for dep in $?; do \ 326 @for dep in $?; do \
329 case '$(am__configure_deps)' in \ 327 case '$(am__configure_deps)' in \
330 *$$dep*) \ 328 *$$dep*) \
331 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ 329 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
332 && { if test -f $@; then exit 0; else break; fi; }; \ 330 && { if test -f $@; then exit 0; else break; fi; }; \
333 exit 1;; \ 331 exit 1;; \
334 esac; \ 332 esac; \
@@ -423,34 +421,34 @@ mostlyclean-compile: @@ -423,34 +421,34 @@ mostlyclean-compile:
423 421
424distclean-compile: 422distclean-compile:
425 -rm -f *.tab.c 423 -rm -f *.tab.c
426 424
427@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@ 425@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@
428@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor.Po@am__quote@ 426@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor.Po@am__quote@
429@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@ 427@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@
430 428
431.c.o: 429.c.o:
432@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 430@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
433@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 431@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
434@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 432@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
435@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 433@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
436@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 434@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
437 435
438.c.obj: 436.c.obj:
439@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 437@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
440@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 438@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
441@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 439@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
442@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 440@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
443@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 441@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
444 442
445.c.lo: 443.c.lo:
446@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 444@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
447@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 445@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
448@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 446@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
449@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 447@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
450@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 448@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
451 449
452mostlyclean-libtool: 450mostlyclean-libtool:
453 -rm -f *.lo 451 -rm -f *.lo
454 452
455clean-libtool: 453clean-libtool:
456 -rm -rf .libs _libs 454 -rm -rf .libs _libs
cvs diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/modetest/buffers.c (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/modetest/buffers.c 2014/12/23 01:16:58 1.1.1.1.2.1
+++ xsrc/external/mit/libdrm/dist/tests/modetest/buffers.c 2015/01/28 11:17:50 1.1.1.1.2.2
@@ -24,39 +24,53 @@ @@ -24,39 +24,53 @@
24 * IN THE SOFTWARE. 24 * IN THE SOFTWARE.
25 */ 25 */
26 26
27#ifdef HAVE_CONFIG_H 27#ifdef HAVE_CONFIG_H
28#include "config.h" 28#include "config.h"
29#endif 29#endif
30 30
31#include <assert.h> 31#include <assert.h>
32#include <errno.h> 32#include <errno.h>
33#include <stdio.h> 33#include <stdio.h>
34#include <stdlib.h> 34#include <stdlib.h>
35#include <stdint.h> 35#include <stdint.h>
36#include <string.h> 36#include <string.h>
 37#include <sys/ioctl.h>
37 38
 39#include "drm.h"
38#include "drm_fourcc.h" 40#include "drm_fourcc.h"
39#include "libkms.h" 41
 42#include "libdrm.h"
 43#include "xf86drm.h"
40 44
41#include "buffers.h" 45#include "buffers.h"
42 46
43#ifdef HAVE_CAIRO 47#ifdef HAVE_CAIRO
44#include <math.h> 48#include <math.h>
45#include <cairo.h> 49#include <cairo.h>
46#endif 50#endif
47 51
48#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) 52#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
49 53
 54struct bo
 55{
 56 int fd;
 57 void *ptr;
 58 size_t size;
 59 size_t offset;
 60 size_t pitch;
 61 unsigned handle;
 62};
 63
50/* ----------------------------------------------------------------------------- 64/* -----------------------------------------------------------------------------
51 * Formats 65 * Formats
52 */ 66 */
53 67
54struct color_component { 68struct color_component {
55 unsigned int length; 69 unsigned int length;
56 unsigned int offset; 70 unsigned int offset;
57}; 71};
58 72
59struct rgb_info { 73struct rgb_info {
60 struct color_component red; 74 struct color_component red;
61 struct color_component green; 75 struct color_component green;
62 struct color_component blue; 76 struct color_component blue;
@@ -844,30 +858,31 @@ fill_tiles_rgb24(const struct format_inf @@ -844,30 +858,31 @@ fill_tiles_rgb24(const struct format_inf
844static void 858static void
845fill_tiles_rgb32(const struct format_info *info, unsigned char *mem, 859fill_tiles_rgb32(const struct format_info *info, unsigned char *mem,
846 unsigned int width, unsigned int height, unsigned int stride) 860 unsigned int width, unsigned int height, unsigned int stride)
847{ 861{
848 const struct rgb_info *rgb = &info->rgb; 862 const struct rgb_info *rgb = &info->rgb;
849 unsigned char *mem_base = mem; 863 unsigned char *mem_base = mem;
850 unsigned int x, y; 864 unsigned int x, y;
851 865
852 for (y = 0; y < height; ++y) { 866 for (y = 0; y < height; ++y) {
853 for (x = 0; x < width; ++x) { 867 for (x = 0; x < width; ++x) {
854 div_t d = div(x+y, width); 868 div_t d = div(x+y, width);
855 uint32_t rgb32 = 0x00130502 * (d.quot >> 6) 869 uint32_t rgb32 = 0x00130502 * (d.quot >> 6)
856 + 0x000a1120 * (d.rem >> 6); 870 + 0x000a1120 * (d.rem >> 6);
 871 uint32_t alpha = ((y < height/2) && (x < width/2)) ? 127 : 255;
857 uint32_t color = 872 uint32_t color =
858 MAKE_RGBA(rgb, (rgb32 >> 16) & 0xff, 873 MAKE_RGBA(rgb, (rgb32 >> 16) & 0xff,
859 (rgb32 >> 8) & 0xff, rgb32 & 0xff, 874 (rgb32 >> 8) & 0xff, rgb32 & 0xff,
860 255); 875 alpha);
861 876
862 ((uint32_t *)mem)[x] = color; 877 ((uint32_t *)mem)[x] = color;
863 } 878 }
864 mem += stride; 879 mem += stride;
865 } 880 }
866 881
867 make_pwetty(mem_base, width, height, stride, info->format); 882 make_pwetty(mem_base, width, height, stride, info->format);
868} 883}
869 884
870static void 885static void
871fill_tiles(const struct format_info *info, void *planes[3], unsigned int width, 886fill_tiles(const struct format_info *info, void *planes[3], unsigned int width,
872 unsigned int height, unsigned int stride) 887 unsigned int height, unsigned int stride)
873{ 888{
@@ -990,141 +1005,239 @@ fill_pattern(unsigned int format, enum f @@ -990,141 +1005,239 @@ fill_pattern(unsigned int format, enum f
990 case PATTERN_PLAIN: 1005 case PATTERN_PLAIN:
991 return fill_plain(info, planes, width, height, stride); 1006 return fill_plain(info, planes, width, height, stride);
992 1007
993 default: 1008 default:
994 printf("Error: unsupported test pattern %u.\n", pattern); 1009 printf("Error: unsupported test pattern %u.\n", pattern);
995 break; 1010 break;
996 } 1011 }
997} 1012}
998 1013
999/* ----------------------------------------------------------------------------- 1014/* -----------------------------------------------------------------------------
1000 * Buffers management 1015 * Buffers management
1001 */ 1016 */
1002 1017
1003static struct kms_bo * 1018static struct bo *
1004allocate_buffer(struct kms_driver *kms, unsigned int width, unsigned int height, 1019bo_create_dumb(int fd, unsigned int width, unsigned int height, unsigned int bpp)
1005 unsigned int *stride) 1020{
1006{ 1021 struct drm_mode_create_dumb arg;
1007 struct kms_bo *bo; 1022 struct bo *bo;
1008 unsigned bo_attribs[] = { 
1009 KMS_WIDTH, 0, 
1010 KMS_HEIGHT, 0, 
1011 KMS_BO_TYPE, KMS_BO_TYPE_SCANOUT_X8R8G8B8, 
1012 KMS_TERMINATE_PROP_LIST 
1013 }; 
1014 int ret; 1023 int ret;
1015 1024
1016 bo_attribs[1] = width; 1025 bo = malloc(sizeof(*bo));
1017 bo_attribs[3] = height; 1026 if (bo == NULL) {
1018 1027 fprintf(stderr, "failed to allocate buffer object\n");
1019 ret = kms_bo_create(kms, bo_attribs, &bo); 
1020 if (ret) { 
1021 fprintf(stderr, "failed to alloc buffer: %s\n", 
1022 strerror(-ret)); 
1023 return NULL; 1028 return NULL;
1024 } 1029 }
1025 1030
1026 ret = kms_bo_get_prop(bo, KMS_PITCH, stride); 1031 memset(&arg, 0, sizeof(arg));
 1032 arg.bpp = bpp;
 1033 arg.width = width;
 1034 arg.height = height;
 1035
 1036 ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg);
1027 if (ret) { 1037 if (ret) {
1028 fprintf(stderr, "failed to retreive buffer stride: %s\n", 1038 fprintf(stderr, "failed to create dumb buffer: %s\n",
1029 strerror(-ret)); 1039 strerror(errno));
1030 kms_bo_destroy(&bo); 1040 free(bo);
1031 return NULL; 1041 return NULL;
1032 } 1042 }
1033 1043
 1044 bo->fd = fd;
 1045 bo->handle = arg.handle;
 1046 bo->size = arg.size;
 1047 bo->pitch = arg.pitch;
 1048
1034 return bo; 1049 return bo;
1035} 1050}
1036 1051
1037struct kms_bo * 1052static int bo_map(struct bo *bo, void **out)
1038create_test_buffer(struct kms_driver *kms, unsigned int format, 1053{
1039 unsigned int width, unsigned int height, 1054 struct drm_mode_map_dumb arg;
1040 unsigned int handles[4], unsigned int pitches[4], 1055 void *map;
1041 unsigned int offsets[4], enum fill_pattern pattern) 1056 int ret;
 1057
 1058 memset(&arg, 0, sizeof(arg));
 1059 arg.handle = bo->handle;
 1060
 1061 ret = drmIoctl(bo->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
 1062 if (ret)
 1063 return ret;
 1064
 1065 map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
 1066 bo->fd, arg.offset);
 1067 if (map == MAP_FAILED)
 1068 return -EINVAL;
 1069
 1070 bo->ptr = map;
 1071 *out = map;
 1072
 1073 return 0;
 1074}
 1075
 1076static void bo_unmap(struct bo *bo)
 1077{
 1078 if (!bo->ptr)
 1079 return;
 1080
 1081 drm_munmap(bo->ptr, bo->size);
 1082 bo->ptr = NULL;
 1083}
 1084
 1085struct bo *
 1086bo_create(int fd, unsigned int format,
 1087 unsigned int width, unsigned int height,
 1088 unsigned int handles[4], unsigned int pitches[4],
 1089 unsigned int offsets[4], enum fill_pattern pattern)
1042{ 1090{
1043 unsigned int virtual_height; 1091 unsigned int virtual_height;
1044 struct kms_bo *bo; 1092 struct bo *bo;
 1093 unsigned int bpp;
1045 void *planes[3] = { 0, }; 1094 void *planes[3] = { 0, };
1046 void *virtual; 1095 void *virtual;
1047 int ret; 1096 int ret;
1048 1097
1049 switch (format) { 1098 switch (format) {
1050 case DRM_FORMAT_NV12: 1099 case DRM_FORMAT_NV12:
1051 case DRM_FORMAT_NV21: 1100 case DRM_FORMAT_NV21:
 1101 case DRM_FORMAT_NV16:
 1102 case DRM_FORMAT_NV61:
 1103 case DRM_FORMAT_YUV420:
 1104 case DRM_FORMAT_YVU420:
 1105 bpp = 8;
 1106 break;
 1107
 1108 case DRM_FORMAT_ARGB4444:
 1109 case DRM_FORMAT_XRGB4444:
 1110 case DRM_FORMAT_ABGR4444:
 1111 case DRM_FORMAT_XBGR4444:
 1112 case DRM_FORMAT_RGBA4444:
 1113 case DRM_FORMAT_RGBX4444:
 1114 case DRM_FORMAT_BGRA4444:
 1115 case DRM_FORMAT_BGRX4444:
 1116 case DRM_FORMAT_ARGB1555:
 1117 case DRM_FORMAT_XRGB1555:
 1118 case DRM_FORMAT_ABGR1555:
 1119 case DRM_FORMAT_XBGR1555:
 1120 case DRM_FORMAT_RGBA5551:
 1121 case DRM_FORMAT_RGBX5551:
 1122 case DRM_FORMAT_BGRA5551:
 1123 case DRM_FORMAT_BGRX5551:
 1124 case DRM_FORMAT_RGB565:
 1125 case DRM_FORMAT_BGR565:
 1126 case DRM_FORMAT_UYVY:
 1127 case DRM_FORMAT_VYUY:
 1128 case DRM_FORMAT_YUYV:
 1129 case DRM_FORMAT_YVYU:
 1130 bpp = 16;
 1131 break;
 1132
 1133 case DRM_FORMAT_BGR888:
 1134 case DRM_FORMAT_RGB888:
 1135 bpp = 24;
 1136 break;
 1137
 1138 case DRM_FORMAT_ARGB8888:
 1139 case DRM_FORMAT_XRGB8888:
 1140 case DRM_FORMAT_ABGR8888:
 1141 case DRM_FORMAT_XBGR8888:
 1142 case DRM_FORMAT_RGBA8888:
 1143 case DRM_FORMAT_RGBX8888:
 1144 case DRM_FORMAT_BGRA8888:
 1145 case DRM_FORMAT_BGRX8888:
 1146 case DRM_FORMAT_ARGB2101010:
 1147 case DRM_FORMAT_XRGB2101010:
 1148 case DRM_FORMAT_ABGR2101010:
 1149 case DRM_FORMAT_XBGR2101010:
 1150 case DRM_FORMAT_RGBA1010102:
 1151 case DRM_FORMAT_RGBX1010102:
 1152 case DRM_FORMAT_BGRA1010102:
 1153 case DRM_FORMAT_BGRX1010102:
 1154 bpp = 32;
 1155 break;
 1156
 1157 default:
 1158 fprintf(stderr, "unsupported format 0x%08x\n", format);
 1159 return NULL;
 1160 }
 1161
 1162 switch (format) {
 1163 case DRM_FORMAT_NV12:
 1164 case DRM_FORMAT_NV21:
1052 virtual_height = height * 3 / 2; 1165 virtual_height = height * 3 / 2;
1053 break; 1166 break;
1054 1167
1055 case DRM_FORMAT_NV16: 1168 case DRM_FORMAT_NV16:
1056 case DRM_FORMAT_NV61: 1169 case DRM_FORMAT_NV61:
1057 virtual_height = height * 2; 1170 virtual_height = height * 2;
1058 break; 1171 break;
1059 1172
1060 default: 1173 default:
1061 virtual_height = height; 1174 virtual_height = height;
1062 break; 1175 break;
1063 } 1176 }
1064 1177
1065 bo = allocate_buffer(kms, width, virtual_height, &pitches[0]); 1178 bo = bo_create_dumb(fd, width, virtual_height, bpp);
1066 if (!bo) 1179 if (!bo)
1067 return NULL; 1180 return NULL;
1068 1181
1069 ret = kms_bo_map(bo, &virtual); 1182 ret = bo_map(bo, &virtual);
1070 if (ret) { 1183 if (ret) {
1071 fprintf(stderr, "failed to map buffer: %s\n", 1184 fprintf(stderr, "failed to map buffer: %s\n",
1072 strerror(-ret)); 1185 strerror(-errno));
1073 kms_bo_destroy(&bo); 1186 bo_destroy(bo);
1074 return NULL; 1187 return NULL;
1075 } 1188 }
1076 1189
1077 /* just testing a limited # of formats to test single 1190 /* just testing a limited # of formats to test single
1078 * and multi-planar path.. would be nice to add more.. 1191 * and multi-planar path.. would be nice to add more..
1079 */ 1192 */
1080 switch (format) { 1193 switch (format) {
1081 case DRM_FORMAT_UYVY: 1194 case DRM_FORMAT_UYVY:
1082 case DRM_FORMAT_VYUY: 1195 case DRM_FORMAT_VYUY:
1083 case DRM_FORMAT_YUYV: 1196 case DRM_FORMAT_YUYV:
1084 case DRM_FORMAT_YVYU: 1197 case DRM_FORMAT_YVYU:
1085 offsets[0] = 0; 1198 offsets[0] = 0;
1086 kms_bo_get_prop(bo, KMS_HANDLE, &handles[0]); 1199 handles[0] = bo->handle;
1087 kms_bo_get_prop(bo, KMS_PITCH, &pitches[0]); 1200 pitches[0] = bo->pitch;
1088 1201
1089 planes[0] = virtual; 1202 planes[0] = virtual;
1090 break; 1203 break;
1091 1204
1092 case DRM_FORMAT_NV12: 1205 case DRM_FORMAT_NV12:
1093 case DRM_FORMAT_NV21: 1206 case DRM_FORMAT_NV21:
1094 case DRM_FORMAT_NV16: 1207 case DRM_FORMAT_NV16:
1095 case DRM_FORMAT_NV61: 1208 case DRM_FORMAT_NV61:
1096 offsets[0] = 0; 1209 offsets[0] = 0;
1097 kms_bo_get_prop(bo, KMS_HANDLE, &handles[0]); 1210 handles[0] = bo->handle;
1098 kms_bo_get_prop(bo, KMS_PITCH, &pitches[0]); 1211 pitches[0] = bo->pitch;
1099 pitches[1] = pitches[0]; 1212 pitches[1] = pitches[0];
1100 offsets[1] = pitches[0] * height; 1213 offsets[1] = pitches[0] * height;
1101 kms_bo_get_prop(bo, KMS_HANDLE, &handles[1]); 1214 handles[1] = bo->handle;
1102 1215
1103 planes[0] = virtual; 1216 planes[0] = virtual;
1104 planes[1] = virtual + offsets[1]; 1217 planes[1] = virtual + offsets[1];
1105 break; 1218 break;
1106 1219
1107 case DRM_FORMAT_YUV420: 1220 case DRM_FORMAT_YUV420:
1108 case DRM_FORMAT_YVU420: 1221 case DRM_FORMAT_YVU420:
1109 offsets[0] = 0; 1222 offsets[0] = 0;
1110 kms_bo_get_prop(bo, KMS_HANDLE, &handles[0]); 1223 handles[0] = bo->handle;
1111 kms_bo_get_prop(bo, KMS_PITCH, &pitches[0]); 1224 pitches[0] = bo->pitch;
1112 pitches[1] = pitches[0] / 2; 1225 pitches[1] = pitches[0] / 2;
1113 offsets[1] = pitches[0] * height; 1226 offsets[1] = pitches[0] * height;
1114 kms_bo_get_prop(bo, KMS_HANDLE, &handles[1]); 1227 handles[1] = bo->handle;
1115 pitches[2] = pitches[1]; 1228 pitches[2] = pitches[1];
1116 offsets[2] = offsets[1] + pitches[1] * height / 2; 1229 offsets[2] = offsets[1] + pitches[1] * height / 2;
1117 kms_bo_get_prop(bo, KMS_HANDLE, &handles[2]); 1230 handles[2] = bo->handle;
1118 1231
1119 planes[0] = virtual; 1232 planes[0] = virtual;
1120 planes[1] = virtual + offsets[1]; 1233 planes[1] = virtual + offsets[1];
1121 planes[2] = virtual + offsets[2]; 1234 planes[2] = virtual + offsets[2];
1122 break; 1235 break;
1123 1236
1124 case DRM_FORMAT_ARGB4444: 1237 case DRM_FORMAT_ARGB4444:
1125 case DRM_FORMAT_XRGB4444: 1238 case DRM_FORMAT_XRGB4444:
1126 case DRM_FORMAT_ABGR4444: 1239 case DRM_FORMAT_ABGR4444:
1127 case DRM_FORMAT_XBGR4444: 1240 case DRM_FORMAT_XBGR4444:
1128 case DRM_FORMAT_RGBA4444: 1241 case DRM_FORMAT_RGBA4444:
1129 case DRM_FORMAT_RGBX4444: 1242 case DRM_FORMAT_RGBX4444:
1130 case DRM_FORMAT_BGRA4444: 1243 case DRM_FORMAT_BGRA4444:
@@ -1148,25 +1261,41 @@ create_test_buffer(struct kms_driver *km @@ -1148,25 +1261,41 @@ create_test_buffer(struct kms_driver *km
1148 case DRM_FORMAT_RGBA8888: 1261 case DRM_FORMAT_RGBA8888:
1149 case DRM_FORMAT_RGBX8888: 1262 case DRM_FORMAT_RGBX8888:
1150 case DRM_FORMAT_BGRA8888: 1263 case DRM_FORMAT_BGRA8888:
1151 case DRM_FORMAT_BGRX8888: 1264 case DRM_FORMAT_BGRX8888:
1152 case DRM_FORMAT_ARGB2101010: 1265 case DRM_FORMAT_ARGB2101010:
1153 case DRM_FORMAT_XRGB2101010: 1266 case DRM_FORMAT_XRGB2101010:
1154 case DRM_FORMAT_ABGR2101010: 1267 case DRM_FORMAT_ABGR2101010:
1155 case DRM_FORMAT_XBGR2101010: 1268 case DRM_FORMAT_XBGR2101010:
1156 case DRM_FORMAT_RGBA1010102: 1269 case DRM_FORMAT_RGBA1010102:
1157 case DRM_FORMAT_RGBX1010102: 1270 case DRM_FORMAT_RGBX1010102:
1158 case DRM_FORMAT_BGRA1010102: 1271 case DRM_FORMAT_BGRA1010102:
1159 case DRM_FORMAT_BGRX1010102: 1272 case DRM_FORMAT_BGRX1010102:
1160 offsets[0] = 0; 1273 offsets[0] = 0;
1161 kms_bo_get_prop(bo, KMS_HANDLE, &handles[0]); 1274 handles[0] = bo->handle;
1162 kms_bo_get_prop(bo, KMS_PITCH, &pitches[0]); 1275 pitches[0] = bo->pitch;
1163 1276
1164 planes[0] = virtual; 1277 planes[0] = virtual;
1165 break; 1278 break;
1166 } 1279 }
1167 1280
1168 fill_pattern(format, pattern, planes, width, height, pitches[0]); 1281 fill_pattern(format, pattern, planes, width, height, pitches[0]);
1169 kms_bo_unmap(bo); 1282 bo_unmap(bo);
1170 1283
1171 return bo; 1284 return bo;
1172} 1285}
 1286
 1287void bo_destroy(struct bo *bo)
 1288{
 1289 struct drm_mode_destroy_dumb arg;
 1290 int ret;
 1291
 1292 memset(&arg, 0, sizeof(arg));
 1293 arg.handle = bo->handle;
 1294
 1295 ret = drmIoctl(bo->fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
 1296 if (ret)
 1297 fprintf(stderr, "failed to destroy dumb buffer: %s\n",
 1298 strerror(errno));
 1299
 1300 free(bo);
 1301}
cvs diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/modetest/cursor.c (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/modetest/cursor.c 2014/12/23 01:16:58 1.1.1.1.2.1
+++ xsrc/external/mit/libdrm/dist/tests/modetest/cursor.c 2015/01/28 11:17:50 1.1.1.1.2.2
@@ -24,51 +24,56 @@ @@ -24,51 +24,56 @@
24 24
25#ifdef HAVE_CONFIG_H 25#ifdef HAVE_CONFIG_H
26#include "config.h" 26#include "config.h"
27#endif 27#endif
28 28
29#include <assert.h> 29#include <assert.h>
30#include <errno.h> 30#include <errno.h>
31#include <stdio.h> 31#include <stdio.h>
32#include <stdlib.h> 32#include <stdlib.h>
33#include <stdint.h> 33#include <stdint.h>
34#include <string.h> 34#include <string.h>
35#include <signal.h> 35#include <signal.h>
36#include <sys/time.h> 36#include <sys/time.h>
 37#include <pthread.h>
 38#include <unistd.h>
37 39
38#include "xf86drm.h" 40#include "xf86drm.h"
39#include "xf86drmMode.h" 41#include "xf86drmMode.h"
40 42
41#include "buffers.h" 43#include "buffers.h"
42#include "cursor.h" 44#include "cursor.h"
43 45
44#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) 46#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
45 47
46struct cursor { 48struct cursor {
47 int fd; 49 int fd;
48 uint32_t bo_handle; 50 uint32_t bo_handle;
49 uint32_t crtc_id; 51 uint32_t crtc_id;
50 uint32_t crtc_w, crtc_h; 52 uint32_t crtc_w, crtc_h;
51 uint32_t w, h; 53 uint32_t w, h;
52 54
53 /* current state */ 55 /* current state */
54 uint32_t enabled, x, y; 56 uint32_t enabled, x, y;
55 int32_t dx, dy; 57 int32_t dx, dy;
56}; 58};
57 59
58#define MAX_CURSORS 8 60#define MAX_CURSORS 8
59static struct cursor cursors[MAX_CURSORS]; 61static struct cursor cursors[MAX_CURSORS];
60static int ncursors; 62static int ncursors;
61 63
 64static pthread_t cursor_thread;
 65static int cursor_running;
 66
62/* 67/*
63 * Timer driven program loops through these steps to move/enable/disable 68 * Timer driven program loops through these steps to move/enable/disable
64 * the cursor 69 * the cursor
65 */ 70 */
66 71
67struct cursor_step { 72struct cursor_step {
68 void (*run)(struct cursor *cursor, struct cursor_step *step); 73 void (*run)(struct cursor *cursor, struct cursor_step *step);
69 uint32_t msec; 74 uint32_t msec;
70 uint32_t repeat; 75 uint32_t repeat;
71 int arg; 76 int arg;
72}; 77};
73 78
74static uint32_t indx, count; 79static uint32_t indx, count;
@@ -127,53 +132,49 @@ static struct cursor_step steps[] = { @@ -127,53 +132,49 @@ static struct cursor_step steps[] = {
127 { move_cursor, 1, 10, 10 }, 132 { move_cursor, 1, 10, 10 },
128 { set_cursor, 1, 100, 0 }, /* disable/enable loop */ 133 { set_cursor, 1, 100, 0 }, /* disable/enable loop */
129 { move_cursor, 1, 10, 10 }, 134 { move_cursor, 1, 10, 10 },
130 { move_cursor, 9, 100, 1 }, 135 { move_cursor, 9, 100, 1 },
131 { move_cursor, 11, 100, 5 }, 136 { move_cursor, 11, 100, 5 },
132 { set_cursor, 17, 10, 0 }, /* disable/enable loop */ 137 { set_cursor, 17, 10, 0 }, /* disable/enable loop */
133 { move_cursor, 9, 100, 1 }, 138 { move_cursor, 9, 100, 1 },
134 { set_cursor, 13, 10, 0 }, /* disable/enable loop */ 139 { set_cursor, 13, 10, 0 }, /* disable/enable loop */
135 { move_cursor, 9, 100, 1 }, 140 { move_cursor, 9, 100, 1 },
136 { set_cursor, 13, 10, 0 }, /* disable/enable loop */ 141 { set_cursor, 13, 10, 0 }, /* disable/enable loop */
137 { set_cursor, 10, 0, 0 }, /* disable */ 142 { set_cursor, 10, 0, 0 }, /* disable */
138}; 143};
139 144
140/* 145static void *cursor_thread_func(void *data)
141 * Cursor API: 
142 */ 
143 
144static void run_step(int sig) 
145{ 146{
146 struct cursor_step *step = &steps[indx % ARRAY_SIZE(steps)]; 147 while (cursor_running) {
147 struct itimerval itimer = { 148 struct cursor_step *step = &steps[indx % ARRAY_SIZE(steps)];
148 .it_value.tv_usec = 1000 * step->msec, 149 int i;
149 }; 150
150 int i; 151 for (i = 0; i < ncursors; i++) {
151 152 struct cursor *cursor = &cursors[i];
152 for (i = 0; i < ncursors; i++) { 153 step->run(cursor, step);
153 struct cursor *cursor = &cursors[i]; 154 }
154 step->run(cursor, step); 155
155 } 156 /* iterate to next count/step: */
 157 if (count < step->repeat) {
 158 count++;
 159 } else {
 160 count = 0;
 161 indx++;
 162 }
156 163
157 /* iterate to next count/step: */ 164 usleep(1000 * step->msec);
158 if (count < step->repeat) { 
159 count++; 
160 } else { 
161 count = 0; 
162 indx++; 
163 } 165 }
164 166
165 /* and lastly, setup timer for next step */ 167 return NULL;
166 setitimer(ITIMER_REAL, &itimer, NULL); 
167} 168}
168 169
169int cursor_init(int fd, uint32_t bo_handle, uint32_t crtc_id, 170int cursor_init(int fd, uint32_t bo_handle, uint32_t crtc_id,
170 uint32_t crtc_w, uint32_t crtc_h, uint32_t w, uint32_t h) 171 uint32_t crtc_w, uint32_t crtc_h, uint32_t w, uint32_t h)
171{ 172{
172 struct cursor *cursor = &cursors[ncursors]; 173 struct cursor *cursor = &cursors[ncursors];
173 174
174 assert(ncursors < MAX_CURSORS); 175 assert(ncursors < MAX_CURSORS);
175 176
176 cursor->fd = fd; 177 cursor->fd = fd;
177 cursor->bo_handle = bo_handle; 178 cursor->bo_handle = bo_handle;
178 cursor->crtc_id = crtc_id; 179 cursor->crtc_id = crtc_id;
179 cursor->crtc_w = crtc_w; 180 cursor->crtc_w = crtc_w;
@@ -184,26 +185,26 @@ int cursor_init(int fd, uint32_t bo_hand @@ -184,26 +185,26 @@ int cursor_init(int fd, uint32_t bo_hand
184 cursor->enabled = 0; 185 cursor->enabled = 0;
185 cursor->x = w/2; 186 cursor->x = w/2;
186 cursor->y = h/2; 187 cursor->y = h/2;
187 cursor->dx = 1; 188 cursor->dx = 1;
188 cursor->dy = 1; 189 cursor->dy = 1;
189 190
190 ncursors++; 191 ncursors++;
191 192
192 return 0; 193 return 0;
193} 194}
194 195
195int cursor_start(void) 196int cursor_start(void)
196{ 197{
197 /* setup signal handler to update cursor: */ 198 cursor_running = 1;
198 signal(SIGALRM, run_step); 199 pthread_create(&cursor_thread, NULL, cursor_thread_func, NULL);
199 printf("starting cursor\n"); 200 printf("starting cursor\n");
200 run_step(SIGALRM); 
201 return 0; 201 return 0;
202} 202}
203 203
204int cursor_stop(void) 204int cursor_stop(void)
205{ 205{
206 signal(SIGALRM, NULL); 206 cursor_running = 0;
 207 pthread_join(cursor_thread, NULL);
207 printf("cursor stopped\n"); 208 printf("cursor stopped\n");
208 return 0; 209 return 0;
209} 210}
cvs diff -r1.1.1.1 -r1.1.1.1.2.1 xsrc/external/mit/libdrm/dist/tests/modetest/buffers.h (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/modetest/buffers.h 2014/03/17 07:51:43 1.1.1.1
+++ xsrc/external/mit/libdrm/dist/tests/modetest/buffers.h 2015/01/28 11:17:50 1.1.1.1.2.1
@@ -17,30 +17,30 @@ @@ -17,30 +17,30 @@
17 * 17 *
18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 20 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 21 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 22 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 23 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24 * IN THE SOFTWARE. 24 * IN THE SOFTWARE.
25 */ 25 */
26 26
27#ifndef __BUFFERS_H__ 27#ifndef __BUFFERS_H__
28#define __BUFFERS_H__ 28#define __BUFFERS_H__
29 29
30struct kms_bo; 30struct bo;
31struct kms_driver; 
32 31
33enum fill_pattern { 32enum fill_pattern {
34 PATTERN_TILES = 0, 33 PATTERN_TILES = 0,
35 PATTERN_PLAIN = 1, 34 PATTERN_PLAIN = 1,
36 PATTERN_SMPTE = 2, 35 PATTERN_SMPTE = 2,
37}; 36};
38 37
39struct kms_bo *create_test_buffer(struct kms_driver *kms, unsigned int format, 38struct bo *bo_create(int fd, unsigned int format,
40 unsigned int width, unsigned int height, 39 unsigned int width, unsigned int height,
41 unsigned int handles[4], unsigned int pitches[4], 40 unsigned int handles[4], unsigned int pitches[4],
42 unsigned int offsets[4], enum fill_pattern pattern); 41 unsigned int offsets[4], enum fill_pattern pattern);
 42void bo_destroy(struct bo *bo);
43 43
44unsigned int format_fourcc(const char *name); 44unsigned int format_fourcc(const char *name);
45 45
46#endif 46#endif
cvs diff -r1.4.2.1 -r1.4.2.2 xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c 2014/12/23 01:16:58 1.4.2.1
+++ xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c 2015/01/28 11:17:50 1.4.2.2
@@ -47,27 +47,26 @@ @@ -47,27 +47,26 @@
47#include <stdio.h> 47#include <stdio.h>
48#include <stdlib.h> 48#include <stdlib.h>
49#include <stdint.h> 49#include <stdint.h>
50#include <inttypes.h> 50#include <inttypes.h>
51#include <unistd.h> 51#include <unistd.h>
52#include <string.h> 52#include <string.h>
53#include <errno.h> 53#include <errno.h>
54#include <sys/poll.h> 54#include <sys/poll.h>
55#include <sys/time.h> 55#include <sys/time.h>
56 56
57#include "xf86drm.h" 57#include "xf86drm.h"
58#include "xf86drmMode.h" 58#include "xf86drmMode.h"
59#include "drm_fourcc.h" 59#include "drm_fourcc.h"
60#include "libkms.h" 
61 60
62#include "buffers.h" 61#include "buffers.h"
63#include "cursor.h" 62#include "cursor.h"
64 63
65struct crtc { 64struct crtc {
66 drmModeCrtc *crtc; 65 drmModeCrtc *crtc;
67 drmModeObjectProperties *props; 66 drmModeObjectProperties *props;
68 drmModePropertyRes **props_info; 67 drmModePropertyRes **props_info;
69 drmModeModeInfo *mode; 68 drmModeModeInfo *mode;
70}; 69};
71 70
72struct encoder { 71struct encoder {
73 drmModeEncoder *encoder; 72 drmModeEncoder *encoder;
@@ -94,38 +93,41 @@ struct resources { @@ -94,38 +93,41 @@ struct resources {
94 drmModePlaneRes *plane_res; 93 drmModePlaneRes *plane_res;
95 94
96 struct crtc *crtcs; 95 struct crtc *crtcs;
97 struct encoder *encoders; 96 struct encoder *encoders;
98 struct connector *connectors; 97 struct connector *connectors;
99 struct fb *fbs; 98 struct fb *fbs;
100 struct plane *planes; 99 struct plane *planes;
101}; 100};
102 101
103struct device { 102struct device {
104 int fd; 103 int fd;
105 104
106 struct resources *resources; 105 struct resources *resources;
107 struct kms_driver *kms; 
108 106
109 struct { 107 struct {
110 unsigned int width; 108 unsigned int width;
111 unsigned int height; 109 unsigned int height;
112 110
113 unsigned int fb_id; 111 unsigned int fb_id;
114 struct kms_bo *bo; 112 struct bo *bo;
115 } mode; 113 } mode;
116}; 114};
117 115
118#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) 116#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 117static inline int64_t U642I64(uint64_t val)
 118{
 119 return (int64_t)*((int64_t *)&val);
 120}
119 121
120struct type_name { 122struct type_name {
121 int type; 123 int type;
122 const char *name; 124 const char *name;
123}; 125};
124 126
125#define type_name_fn(res) \ 127#define type_name_fn(res) \
126const char * res##_str(int type) { \ 128const char * res##_str(int type) { \
127 unsigned int i; \ 129 unsigned int i; \
128 for (i = 0; i < ARRAY_SIZE(res##_names); i++) { \ 130 for (i = 0; i < ARRAY_SIZE(res##_names); i++) { \
129 if (res##_names[i].type == type) \ 131 if (res##_names[i].type == type) \
130 return res##_names[i].name; \ 132 return res##_names[i].name; \
131 } \ 133 } \
@@ -254,28 +256,30 @@ static void dump_mode(drmModeModeInfo *m @@ -254,28 +256,30 @@ static void dump_mode(drmModeModeInfo *m
254 mode_flag_str(mode->flags); 256 mode_flag_str(mode->flags);
255 printf("; type: "); 257 printf("; type: ");
256 mode_type_str(mode->type); 258 mode_type_str(mode->type);
257 printf("\n"); 259 printf("\n");
258} 260}
259 261
260static void dump_blob(struct device *dev, uint32_t blob_id) 262static void dump_blob(struct device *dev, uint32_t blob_id)
261{ 263{
262 uint32_t i; 264 uint32_t i;
263 unsigned char *blob_data; 265 unsigned char *blob_data;
264 drmModePropertyBlobPtr blob; 266 drmModePropertyBlobPtr blob;
265 267
266 blob = drmModeGetPropertyBlob(dev->fd, blob_id); 268 blob = drmModeGetPropertyBlob(dev->fd, blob_id);
267 if (!blob) 269 if (!blob) {
 270 printf("\n");
268 return; 271 return;
 272 }
269 273
270 blob_data = blob->data; 274 blob_data = blob->data;
271 275
272 for (i = 0; i < blob->length; i++) { 276 for (i = 0; i < blob->length; i++) {
273 if (i % 16 == 0) 277 if (i % 16 == 0)
274 printf("\n\t\t\t"); 278 printf("\n\t\t\t");
275 printf("%.2hhx", blob_data[i]); 279 printf("%.2hhx", blob_data[i]);
276 } 280 }
277 printf("\n"); 281 printf("\n");
278 282
279 drmModeFreePropertyBlob(blob); 283 drmModeFreePropertyBlob(blob);
280} 284}
281 285
@@ -284,72 +288,83 @@ static void dump_prop(struct device *dev @@ -284,72 +288,83 @@ static void dump_prop(struct device *dev
284{ 288{
285 int i; 289 int i;
286 printf("\t%d", prop_id); 290 printf("\t%d", prop_id);
287 if (!prop) { 291 if (!prop) {
288 printf("\n"); 292 printf("\n");
289 return; 293 return;
290 } 294 }
291 295
292 printf(" %s:\n", prop->name); 296 printf(" %s:\n", prop->name);
293 297
294 printf("\t\tflags:"); 298 printf("\t\tflags:");
295 if (prop->flags & DRM_MODE_PROP_PENDING) 299 if (prop->flags & DRM_MODE_PROP_PENDING)
296 printf(" pending"); 300 printf(" pending");
297 if (prop->flags & DRM_MODE_PROP_RANGE) 
298 printf(" range"); 
299 if (prop->flags & DRM_MODE_PROP_IMMUTABLE) 301 if (prop->flags & DRM_MODE_PROP_IMMUTABLE)
300 printf(" immutable"); 302 printf(" immutable");
301 if (prop->flags & DRM_MODE_PROP_ENUM) 303 if (drm_property_type_is(prop, DRM_MODE_PROP_SIGNED_RANGE))
 304 printf(" signed range");
 305 if (drm_property_type_is(prop, DRM_MODE_PROP_RANGE))
 306 printf(" range");
 307 if (drm_property_type_is(prop, DRM_MODE_PROP_ENUM))
302 printf(" enum"); 308 printf(" enum");
303 if (prop->flags & DRM_MODE_PROP_BITMASK) 309 if (drm_property_type_is(prop, DRM_MODE_PROP_BITMASK))
304 printf(" bitmask"); 310 printf(" bitmask");
305 if (prop->flags & DRM_MODE_PROP_BLOB) 311 if (drm_property_type_is(prop, DRM_MODE_PROP_BLOB))
306 printf(" blob"); 312 printf(" blob");
 313 if (drm_property_type_is(prop, DRM_MODE_PROP_OBJECT))
 314 printf(" object");
307 printf("\n"); 315 printf("\n");
308 316
309 if (prop->flags & DRM_MODE_PROP_RANGE) { 317 if (drm_property_type_is(prop, DRM_MODE_PROP_SIGNED_RANGE)) {
 318 printf("\t\tvalues:");
 319 for (i = 0; i < prop->count_values; i++)
 320 printf(" %"PRId64, U642I64(prop->values[i]));
 321 printf("\n");
 322 }
 323
 324 if (drm_property_type_is(prop, DRM_MODE_PROP_RANGE)) {
310 printf("\t\tvalues:"); 325 printf("\t\tvalues:");
311 for (i = 0; i < prop->count_values; i++) 326 for (i = 0; i < prop->count_values; i++)
312 printf(" %"PRIu64, prop->values[i]); 327 printf(" %"PRIu64, prop->values[i]);
313 printf("\n"); 328 printf("\n");
314 } 329 }
315 330
316 if (prop->flags & DRM_MODE_PROP_ENUM) { 331 if (drm_property_type_is(prop, DRM_MODE_PROP_ENUM)) {
317 printf("\t\tenums:"); 332 printf("\t\tenums:");
318 for (i = 0; i < prop->count_enums; i++) 333 for (i = 0; i < prop->count_enums; i++)
319 printf(" %s=%llu", prop->enums[i].name, 334 printf(" %s=%llu", prop->enums[i].name,
320 prop->enums[i].value); 335 prop->enums[i].value);
321 printf("\n"); 336 printf("\n");
322 } else if (prop->flags & DRM_MODE_PROP_BITMASK) { 337 } else if (drm_property_type_is(prop, DRM_MODE_PROP_BITMASK)) {
323 printf("\t\tvalues:"); 338 printf("\t\tvalues:");
324 for (i = 0; i < prop->count_enums; i++) 339 for (i = 0; i < prop->count_enums; i++)
325 printf(" %s=0x%llx", prop->enums[i].name, 340 printf(" %s=0x%llx", prop->enums[i].name,
326 (1LL << prop->enums[i].value)); 341 (1LL << prop->enums[i].value));
327 printf("\n"); 342 printf("\n");
328 } else { 343 } else {
329 assert(prop->count_enums == 0); 344 assert(prop->count_enums == 0);
330 } 345 }
331 346
332 if (prop->flags & DRM_MODE_PROP_BLOB) { 347 if (drm_property_type_is(prop, DRM_MODE_PROP_BLOB)) {
333 printf("\t\tblobs:\n"); 348 printf("\t\tblobs:\n");
334 for (i = 0; i < prop->count_blobs; i++) 349 for (i = 0; i < prop->count_blobs; i++)
335 dump_blob(dev, prop->blob_ids[i]); 350 dump_blob(dev, prop->blob_ids[i]);
336 printf("\n"); 351 printf("\n");
337 } else { 352 } else {
338 assert(prop->count_blobs == 0); 353 assert(prop->count_blobs == 0);
339 } 354 }
340 355
341 printf("\t\tvalue:"); 356 printf("\t\tvalue:");
342 if (prop->flags & DRM_MODE_PROP_BLOB) 357 if (drm_property_type_is(prop, DRM_MODE_PROP_BLOB))
343 dump_blob(dev, value); 358 dump_blob(dev, value);
344 else 359 else
345 printf(" %"PRIu64"\n", value); 360 printf(" %"PRIu64"\n", value);
346} 361}
347 362
348static void dump_connectors(struct device *dev) 363static void dump_connectors(struct device *dev)
349{ 364{
350 int i, j; 365 int i, j;
351 366
352 printf("Connectors:\n"); 367 printf("Connectors:\n");
353 printf("id\tencoder\tstatus\t\ttype\tsize (mm)\tmodes\tencoders\n"); 368 printf("id\tencoder\tstatus\t\ttype\tsize (mm)\tmodes\tencoders\n");
354 for (i = 0; i < dev->resources->res->count_connectors; i++) { 369 for (i = 0; i < dev->resources->res->count_connectors; i++) {
355 struct connector *_connector = &dev->resources->connectors[i]; 370 struct connector *_connector = &dev->resources->connectors[i];
@@ -535,26 +550,28 @@ static void free_resources(struct resour @@ -535,26 +550,28 @@ static void free_resources(struct resour
535} 550}
536 551
537static struct resources *get_resources(struct device *dev) 552static struct resources *get_resources(struct device *dev)
538{ 553{
539 struct resources *res; 554 struct resources *res;
540 int i; 555 int i;
541 556
542 res = malloc(sizeof *res); 557 res = malloc(sizeof *res);
543 if (res == 0) 558 if (res == 0)
544 return NULL; 559 return NULL;
545 560
546 memset(res, 0, sizeof *res); 561 memset(res, 0, sizeof *res);
547 562
 563 drmSetClientCap(dev->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
 564
548 res->res = drmModeGetResources(dev->fd); 565 res->res = drmModeGetResources(dev->fd);
549 if (!res->res) { 566 if (!res->res) {
550 fprintf(stderr, "drmModeGetResources failed: %s\n", 567 fprintf(stderr, "drmModeGetResources failed: %s\n",
551 strerror(errno)); 568 strerror(errno));
552 goto error; 569 goto error;
553 } 570 }
554 571
555 res->crtcs = malloc(res->res->count_crtcs * sizeof *res->crtcs); 572 res->crtcs = malloc(res->res->count_crtcs * sizeof *res->crtcs);
556 res->encoders = malloc(res->res->count_encoders * sizeof *res->encoders); 573 res->encoders = malloc(res->res->count_encoders * sizeof *res->encoders);
557 res->connectors = malloc(res->res->count_connectors * sizeof *res->connectors); 574 res->connectors = malloc(res->res->count_connectors * sizeof *res->connectors);
558 res->fbs = malloc(res->res->count_fbs * sizeof *res->fbs); 575 res->fbs = malloc(res->res->count_fbs * sizeof *res->fbs);
559 576
560 if (!res->crtcs || !res->encoders || !res->connectors || !res->fbs) 577 if (!res->crtcs || !res->encoders || !res->connectors || !res->fbs)
@@ -939,27 +956,27 @@ page_flip_handler(int fd, unsigned int f @@ -939,27 +956,27 @@ page_flip_handler(int fd, unsigned int f
939 t = end.tv_sec + end.tv_usec * 1e-6 - 956 t = end.tv_sec + end.tv_usec * 1e-6 -
940 (pipe->start.tv_sec + pipe->start.tv_usec * 1e-6); 957 (pipe->start.tv_sec + pipe->start.tv_usec * 1e-6);
941 fprintf(stderr, "freq: %.02fHz\n", pipe->swap_count / t); 958 fprintf(stderr, "freq: %.02fHz\n", pipe->swap_count / t);
942 pipe->swap_count = 0; 959 pipe->swap_count = 0;
943 pipe->start = end; 960 pipe->start = end;
944 } 961 }
945} 962}
946 963
947static int set_plane(struct device *dev, struct plane_arg *p) 964static int set_plane(struct device *dev, struct plane_arg *p)
948{ 965{
949 drmModePlane *ovr; 966 drmModePlane *ovr;
950 uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */ 967 uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */
951 uint32_t plane_id = 0; 968 uint32_t plane_id = 0;
952 struct kms_bo *plane_bo; 969 struct bo *plane_bo;
953 uint32_t plane_flags = 0; 970 uint32_t plane_flags = 0;
954 int crtc_x, crtc_y, crtc_w, crtc_h; 971 int crtc_x, crtc_y, crtc_w, crtc_h;
955 struct crtc *crtc = NULL; 972 struct crtc *crtc = NULL;
956 unsigned int pipe; 973 unsigned int pipe;
957 unsigned int i; 974 unsigned int i;
958 975
959 /* Find an unused plane which can be connected to our CRTC. Find the 976 /* Find an unused plane which can be connected to our CRTC. Find the
960 * CRTC index first, then iterate over available planes. 977 * CRTC index first, then iterate over available planes.
961 */ 978 */
962 for (i = 0; i < (unsigned int)dev->resources->res->count_crtcs; i++) { 979 for (i = 0; i < (unsigned int)dev->resources->res->count_crtcs; i++) {
963 if (p->crtc_id == dev->resources->res->crtcs[i]) { 980 if (p->crtc_id == dev->resources->res->crtcs[i]) {
964 crtc = &dev->resources->crtcs[i]; 981 crtc = &dev->resources->crtcs[i];
965 pipe = i; 982 pipe = i;
@@ -980,28 +997,28 @@ static int set_plane(struct device *dev, @@ -980,28 +997,28 @@ static int set_plane(struct device *dev,
980 if ((ovr->possible_crtcs & (1 << pipe)) && !ovr->crtc_id) 997 if ((ovr->possible_crtcs & (1 << pipe)) && !ovr->crtc_id)
981 plane_id = ovr->plane_id; 998 plane_id = ovr->plane_id;
982 } 999 }
983 1000
984 if (!plane_id) { 1001 if (!plane_id) {
985 fprintf(stderr, "no unused plane available for CRTC %u\n", 1002 fprintf(stderr, "no unused plane available for CRTC %u\n",
986 crtc->crtc->crtc_id); 1003 crtc->crtc->crtc_id);
987 return -1; 1004 return -1;
988 } 1005 }
989 1006
990 fprintf(stderr, "testing %dx%d@%s overlay plane %u\n", 1007 fprintf(stderr, "testing %dx%d@%s overlay plane %u\n",
991 p->w, p->h, p->format_str, plane_id); 1008 p->w, p->h, p->format_str, plane_id);
992 1009
993 plane_bo = create_test_buffer(dev->kms, p->fourcc, p->w, p->h, handles, 1010 plane_bo = bo_create(dev->fd, p->fourcc, p->w, p->h, handles,
994 pitches, offsets, PATTERN_TILES); 1011 pitches, offsets, PATTERN_TILES);
995 if (plane_bo == NULL) 1012 if (plane_bo == NULL)
996 return -1; 1013 return -1;
997 1014
998 /* just use single plane format for now.. */ 1015 /* just use single plane format for now.. */
999 if (drmModeAddFB2(dev->fd, p->w, p->h, p->fourcc, 1016 if (drmModeAddFB2(dev->fd, p->w, p->h, p->fourcc,
1000 handles, pitches, offsets, &p->fb_id, plane_flags)) { 1017 handles, pitches, offsets, &p->fb_id, plane_flags)) {
1001 fprintf(stderr, "failed to add fb: %s\n", strerror(errno)); 1018 fprintf(stderr, "failed to add fb: %s\n", strerror(errno));
1002 return -1; 1019 return -1;
1003 } 1020 }
1004 1021
1005 crtc_w = p->w * p->scale; 1022 crtc_w = p->w * p->scale;
1006 crtc_h = p->h * p->scale; 1023 crtc_h = p->h * p->scale;
1007 if (!p->has_position) { 1024 if (!p->has_position) {
@@ -1021,49 +1038,48 @@ static int set_plane(struct device *dev, @@ -1021,49 +1038,48 @@ static int set_plane(struct device *dev,
1021 strerror(errno)); 1038 strerror(errno));
1022 return -1; 1039 return -1;
1023 } 1040 }
1024 1041
1025 ovr->crtc_id = crtc->crtc->crtc_id; 1042 ovr->crtc_id = crtc->crtc->crtc_id;
1026 1043
1027 return 0; 1044 return 0;
1028} 1045}
1029 1046
1030static void set_mode(struct device *dev, struct pipe_arg *pipes, unsigned int count) 1047static void set_mode(struct device *dev, struct pipe_arg *pipes, unsigned int count)
1031{ 1048{
1032 uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */ 1049 uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */
1033 unsigned int fb_id; 1050 unsigned int fb_id;
1034 struct kms_bo *bo; 1051 struct bo *bo;
1035 unsigned int i; 1052 unsigned int i;
1036 unsigned int j; 1053 unsigned int j;
1037 int ret, x; 1054 int ret, x;
1038 1055
1039 dev->mode.width = 0; 1056 dev->mode.width = 0;
1040 dev->mode.height = 0; 1057 dev->mode.height = 0;
1041 1058
1042 for (i = 0; i < count; i++) { 1059 for (i = 0; i < count; i++) {
1043 struct pipe_arg *pipe = &pipes[i]; 1060 struct pipe_arg *pipe = &pipes[i];
1044 1061
1045 ret = pipe_find_crtc_and_mode(dev, pipe); 1062 ret = pipe_find_crtc_and_mode(dev, pipe);
1046 if (ret < 0) 1063 if (ret < 0)
1047 continue; 1064 continue;
1048 1065
1049 dev->mode.width += pipe->mode->hdisplay; 1066 dev->mode.width += pipe->mode->hdisplay;
1050 if (dev->mode.height < pipe->mode->vdisplay) 1067 if (dev->mode.height < pipe->mode->vdisplay)
1051 dev->mode.height = pipe->mode->vdisplay; 1068 dev->mode.height = pipe->mode->vdisplay;
1052 } 1069 }
1053 1070
1054 bo = create_test_buffer(dev->kms, pipes[0].fourcc, 1071 bo = bo_create(dev->fd, pipes[0].fourcc, dev->mode.width, dev->mode.height,
1055 dev->mode.width, dev->mode.height, 1072 handles, pitches, offsets, PATTERN_SMPTE);
1056 handles, pitches, offsets, PATTERN_SMPTE); 
1057 if (bo == NULL) 1073 if (bo == NULL)
1058 return; 1074 return;
1059 1075
1060 ret = drmModeAddFB2(dev->fd, dev->mode.width, dev->mode.height, 1076 ret = drmModeAddFB2(dev->fd, dev->mode.width, dev->mode.height,
1061 pipes[0].fourcc, handles, pitches, offsets, &fb_id, 0); 1077 pipes[0].fourcc, handles, pitches, offsets, &fb_id, 0);
1062 if (ret) { 1078 if (ret) {
1063 fprintf(stderr, "failed to add fb (%ux%u): %s\n", 1079 fprintf(stderr, "failed to add fb (%ux%u): %s\n",
1064 dev->mode.width, dev->mode.height, strerror(errno)); 1080 dev->mode.width, dev->mode.height, strerror(errno));
1065 return; 1081 return;
1066 } 1082 }
1067 1083
1068 x = 0; 1084 x = 0;
1069 for (i = 0; i < count; i++) { 1085 for (i = 0; i < count; i++) {
@@ -1100,39 +1116,39 @@ static void set_mode(struct device *dev, @@ -1100,39 +1116,39 @@ static void set_mode(struct device *dev,
1100static void set_planes(struct device *dev, struct plane_arg *p, unsigned int count) 1116static void set_planes(struct device *dev, struct plane_arg *p, unsigned int count)
1101{ 1117{
1102 unsigned int i; 1118 unsigned int i;
1103 1119
1104 /* set up planes/overlays */ 1120 /* set up planes/overlays */
1105 for (i = 0; i < count; i++) 1121 for (i = 0; i < count; i++)
1106 if (set_plane(dev, &p[i])) 1122 if (set_plane(dev, &p[i]))
1107 return; 1123 return;
1108} 1124}
1109 1125
1110static void set_cursors(struct device *dev, struct pipe_arg *pipes, unsigned int count) 1126static void set_cursors(struct device *dev, struct pipe_arg *pipes, unsigned int count)
1111{ 1127{
1112 uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */ 1128 uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */
1113 struct kms_bo *bo; 1129 struct bo *bo;
1114 unsigned int i; 1130 unsigned int i;
1115 int ret; 1131 int ret;
1116 1132
1117 /* maybe make cursor width/height configurable some day */ 1133 /* maybe make cursor width/height configurable some day */
1118 uint32_t cw = 64; 1134 uint32_t cw = 64;
1119 uint32_t ch = 64; 1135 uint32_t ch = 64;
1120 1136
1121 /* create cursor bo.. just using PATTERN_PLAIN as it has 1137 /* create cursor bo.. just using PATTERN_PLAIN as it has
1122 * translucent alpha 1138 * translucent alpha
1123 */ 1139 */
1124 bo = create_test_buffer(dev->kms, DRM_FORMAT_ARGB8888, 1140 bo = bo_create(dev->fd, DRM_FORMAT_ARGB8888, cw, ch, handles, pitches,
1125 cw, ch, handles, pitches, offsets, PATTERN_PLAIN); 1141 offsets, PATTERN_PLAIN);
1126 if (bo == NULL) 1142 if (bo == NULL)
1127 return; 1143 return;
1128 1144
1129 for (i = 0; i < count; i++) { 1145 for (i = 0; i < count; i++) {
1130 struct pipe_arg *pipe = &pipes[i]; 1146 struct pipe_arg *pipe = &pipes[i];
1131 ret = cursor_init(dev->fd, handles[0], 1147 ret = cursor_init(dev->fd, handles[0],
1132 pipe->crtc->crtc->crtc_id, 1148 pipe->crtc->crtc->crtc_id,
1133 pipe->mode->hdisplay, pipe->mode->vdisplay, 1149 pipe->mode->hdisplay, pipe->mode->vdisplay,
1134 cw, ch); 1150 cw, ch);
1135 if (ret) { 1151 if (ret) {
1136 fprintf(stderr, "failed to init cursor for CRTC[%u]\n", 1152 fprintf(stderr, "failed to init cursor for CRTC[%u]\n",
1137 pipe->crtc_id); 1153 pipe->crtc_id);
1138 return; 1154 return;
@@ -1141,34 +1157,34 @@ static void set_cursors(struct device *d @@ -1141,34 +1157,34 @@ static void set_cursors(struct device *d
1141 1157
1142 cursor_start(); 1158 cursor_start();
1143} 1159}
1144 1160
1145static void clear_cursors(struct device *dev) 1161static void clear_cursors(struct device *dev)
1146{ 1162{
1147 cursor_stop(); 1163 cursor_stop();
1148} 1164}
1149 1165
1150static void test_page_flip(struct device *dev, struct pipe_arg *pipes, unsigned int count) 1166static void test_page_flip(struct device *dev, struct pipe_arg *pipes, unsigned int count)
1151{ 1167{
1152 uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */ 1168 uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */
1153 unsigned int other_fb_id; 1169 unsigned int other_fb_id;
1154 struct kms_bo *other_bo; 1170 struct bo *other_bo;
1155 drmEventContext evctx; 1171 drmEventContext evctx;
1156 unsigned int i; 1172 unsigned int i;
1157 int ret; 1173 int ret;
1158 1174
1159 other_bo = create_test_buffer(dev->kms, pipes[0].fourcc, 1175 other_bo = bo_create(dev->fd, pipes[0].fourcc,
1160 dev->mode.width, dev->mode.height, 1176 dev->mode.width, dev->mode.height,
1161 handles, pitches, offsets, PATTERN_PLAIN); 1177 handles, pitches, offsets, PATTERN_PLAIN);
1162 if (other_bo == NULL) 1178 if (other_bo == NULL)
1163 return; 1179 return;
1164 1180
1165 ret = drmModeAddFB2(dev->fd, dev->mode.width, dev->mode.height, 1181 ret = drmModeAddFB2(dev->fd, dev->mode.width, dev->mode.height,
1166 pipes[0].fourcc, handles, pitches, offsets, 1182 pipes[0].fourcc, handles, pitches, offsets,
1167 &other_fb_id, 0); 1183 &other_fb_id, 0);
1168 if (ret) { 1184 if (ret) {
1169 fprintf(stderr, "failed to add fb: %s\n", strerror(errno)); 1185 fprintf(stderr, "failed to add fb: %s\n", strerror(errno));
1170 return; 1186 return;
1171 } 1187 }
1172 1188
1173 for (i = 0; i < count; i++) { 1189 for (i = 0; i < count; i++) {
1174 struct pipe_arg *pipe = &pipes[i]; 1190 struct pipe_arg *pipe = &pipes[i];
@@ -1223,27 +1239,27 @@ static void test_page_flip(struct device @@ -1223,27 +1239,27 @@ static void test_page_flip(struct device
1223 1239
1224 if (ret <= 0) { 1240 if (ret <= 0) {
1225 fprintf(stderr, "select timed out or error (ret %d)\n", 1241 fprintf(stderr, "select timed out or error (ret %d)\n",
1226 ret); 1242 ret);
1227 continue; 1243 continue;
1228 } else if (FD_ISSET(0, &fds)) { 1244 } else if (FD_ISSET(0, &fds)) {
1229 break; 1245 break;
1230 } 1246 }
1231#endif 1247#endif
1232 1248
1233 drmHandleEvent(dev->fd, &evctx); 1249 drmHandleEvent(dev->fd, &evctx);
1234 } 1250 }
1235 1251
1236 kms_bo_destroy(&other_bo); 1252 bo_destroy(other_bo);
1237} 1253}
1238 1254
1239#define min(a, b) ((a) < (b) ? (a) : (b)) 1255#define min(a, b) ((a) < (b) ? (a) : (b))
1240 1256
1241static int parse_connector(struct pipe_arg *pipe, const char *arg) 1257static int parse_connector(struct pipe_arg *pipe, const char *arg)
1242{ 1258{
1243 unsigned int len; 1259 unsigned int len;
1244 unsigned int i; 1260 unsigned int i;
1245 const char *p; 1261 const char *p;
1246 char *endp; 1262 char *endp;
1247 1263
1248 pipe->vrefresh = 0; 1264 pipe->vrefresh = 0;
1249 pipe->crtc_id = (uint32_t)-1; 1265 pipe->crtc_id = (uint32_t)-1;
@@ -1427,27 +1443,27 @@ static int cursor_supported(void) @@ -1427,27 +1443,27 @@ static int cursor_supported(void)
1427} 1443}
1428 1444
1429static char optstr[] = "cdD:efM:P:ps:Cvw:"; 1445static char optstr[] = "cdD:efM:P:ps:Cvw:";
1430 1446
1431int main(int argc, char **argv) 1447int main(int argc, char **argv)
1432{ 1448{
1433 struct device dev; 1449 struct device dev;
1434 1450
1435 int c; 1451 int c;
1436 int encoders = 0, connectors = 0, crtcs = 0, planes = 0, framebuffers = 0; 1452 int encoders = 0, connectors = 0, crtcs = 0, planes = 0, framebuffers = 0;
1437 int drop_master = 0; 1453 int drop_master = 0;
1438 int test_vsync = 0; 1454 int test_vsync = 0;
1439 int test_cursor = 0; 1455 int test_cursor = 0;
1440 const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "exynos", "tilcdc", "msm", "sti" }; 1456 const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "exynos", "tilcdc", "msm", "sti", "tegra" };
1441 char *device = NULL; 1457 char *device = NULL;
1442 char *module = NULL; 1458 char *module = NULL;
1443 unsigned int i; 1459 unsigned int i;
1444 int count = 0, plane_count = 0; 1460 int count = 0, plane_count = 0;
1445 unsigned int prop_count = 0; 1461 unsigned int prop_count = 0;
1446 struct pipe_arg *pipe_args = NULL; 1462 struct pipe_arg *pipe_args = NULL;
1447 struct plane_arg *plane_args = NULL; 1463 struct plane_arg *plane_args = NULL;
1448 struct property_arg *prop_args = NULL; 1464 struct property_arg *prop_args = NULL;
1449 unsigned int args = 0; 1465 unsigned int args = 0;
1450 int ret; 1466 int ret;
1451 1467
1452 memset(&dev, 0, sizeof dev); 1468 memset(&dev, 0, sizeof dev);
1453 1469
@@ -1582,48 +1598,48 @@ int main(int argc, char **argv) @@ -1582,48 +1598,48 @@ int main(int argc, char **argv)
1582 1598
1583#define dump_resource(dev, res) if (res) dump_##res(dev) 1599#define dump_resource(dev, res) if (res) dump_##res(dev)
1584 1600
1585 dump_resource(&dev, encoders); 1601 dump_resource(&dev, encoders);
1586 dump_resource(&dev, connectors); 1602 dump_resource(&dev, connectors);
1587 dump_resource(&dev, crtcs); 1603 dump_resource(&dev, crtcs);
1588 dump_resource(&dev, planes); 1604 dump_resource(&dev, planes);
1589 dump_resource(&dev, framebuffers); 1605 dump_resource(&dev, framebuffers);
1590 1606
1591 for (i = 0; i < prop_count; ++i) 1607 for (i = 0; i < prop_count; ++i)
1592 set_property(&dev, &prop_args[i]); 1608 set_property(&dev, &prop_args[i]);
1593 1609
1594 if (count || plane_count) { 1610 if (count || plane_count) {
1595 ret = kms_create(dev.fd, &dev.kms); 1611 uint64_t cap = 0;
1596 if (ret) { 1612
1597 fprintf(stderr, "failed to create kms driver: %s\n", 1613 ret = drmGetCap(dev.fd, DRM_CAP_DUMB_BUFFER, &cap);
1598 strerror(-ret)); 1614 if (ret || cap == 0) {
 1615 fprintf(stderr, "driver doesn't support the dumb buffer API\n");
1599 return 1; 1616 return 1;
1600 } 1617 }
1601 1618
1602 if (count) 1619 if (count)
1603 set_mode(&dev, pipe_args, count); 1620 set_mode(&dev, pipe_args, count);
1604 1621
1605 if (plane_count) 1622 if (plane_count)
1606 set_planes(&dev, plane_args, plane_count); 1623 set_planes(&dev, plane_args, plane_count);
1607 1624
1608 if (test_cursor) 1625 if (test_cursor)
1609 set_cursors(&dev, pipe_args, count); 1626 set_cursors(&dev, pipe_args, count);
1610 1627
1611 if (test_vsync) 1628 if (test_vsync)
1612 test_page_flip(&dev, pipe_args, count); 1629 test_page_flip(&dev, pipe_args, count);
1613 1630
1614 if (drop_master) 1631 if (drop_master)
1615 drmDropMaster(dev.fd); 1632 drmDropMaster(dev.fd);
1616 1633
1617 getchar(); 1634 getchar();
1618 1635
1619 if (test_cursor) 1636 if (test_cursor)
1620 clear_cursors(&dev); 1637 clear_cursors(&dev);
1621 1638
1622 kms_bo_destroy(&dev.mode.bo); 1639 bo_destroy(dev.mode.bo);
1623 kms_destroy(&dev.kms); 
1624 } 1640 }
1625 1641
1626 free_resources(dev.resources); 1642 free_resources(dev.resources);
1627 1643
1628 return 0; 1644 return 0;
1629} 1645}
File Added: xsrc/external/mit/libdrm/dist/tests/proptest/Attic/Makefile.am
AM_CFLAGS = \
	-I$(top_srcdir)/include/drm \
	-I$(top_srcdir)

noinst_PROGRAMS = \
	proptest

proptest_SOURCES = \
	proptest.c
proptest_LDADD = \
	$(top_builddir)/libdrm.la
File Added: xsrc/external/mit/libdrm/dist/tests/proptest/Attic/Makefile.in
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2013 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.

@SET_MAKE@

VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
      *) echo "am__make_running_with_option: internal error: invalid" \
              "target option '$${target_option-}' specified" >&2; \
         exit 1;; \
  esac; \
  has_opt=no; \
  sane_makeflags=$$MAKEFLAGS; \
  if $(am__is_gnu_make); then \
    sane_makeflags=$$MFLAGS; \
  else \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
        bs=\\; \
        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    esac; \
  fi; \
  skip_next=no; \
  strip_trailopt () \
  { \
    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
  }; \
  for flg in $$sane_makeflags; do \
    test $$skip_next = yes && { skip_next=no; continue; }; \
    case $$flg in \
      *=*|--*) continue;; \
        -*I) strip_trailopt 'I'; skip_next=yes;; \
      -*I?*) strip_trailopt 'I';; \
        -*O) strip_trailopt 'O'; skip_next=yes;; \
      -*O?*) strip_trailopt 'O';; \
        -*l) strip_trailopt 'l'; skip_next=yes;; \
      -*l?*) strip_trailopt 'l';; \
      -[dEDm]) skip_next=yes;; \
      -[JT]) skip_next=yes;; \
    esac; \
    case $$flg in \
      *$$target_option*) has_opt=yes; break;; \
    esac; \
  done; \
  test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
noinst_PROGRAMS = proptest$(EXEEXT)
subdir = tests/proptest
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
	$(top_srcdir)/build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
	$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
	$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
am_proptest_OBJECTS = proptest.$(OBJEXT)
proptest_OBJECTS = $(am_proptest_OBJECTS)
proptest_DEPENDENCIES = $(top_builddir)/libdrm.la
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 = 
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo "  GEN     " $@;
am__v_GEN_1 = 
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 = 
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
	$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo "  CC      " $@;
am__v_CC_1 = 
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
	$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo "  CCLD    " $@;
am__v_CCLD_1 = 
SOURCES = $(proptest_SOURCES)
DIST_SOURCES = $(proptest_SOURCES)
am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates.  Input order is
# *not* preserved.
am__uniquify_input = $(AWK) '\
  BEGIN { nonempty = 0; } \
  { items[$$0] = 1; nonempty = 1; } \
  END { if (nonempty) { for (i in items) print i; }; } \
'
# Make sure the list of sources is unique.  This is necessary because,
# e.g., the same source file might be shared among _SOURCES variables
# for different programs/libraries.
am__define_uniq_tagged_files = \
  list='$(am__tagged_files)'; \
  unique=`for i in $$list; do \
    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLOCK_LIB = @CLOCK_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
LIBUDEV_LIBS = @LIBUDEV_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MANPAGES_STYLESHEET = @MANPAGES_STYLESHEET@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PTHREADSTUBS_CFLAGS = @PTHREADSTUBS_CFLAGS@
PTHREADSTUBS_LIBS = @PTHREADSTUBS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VERSION = @VERSION@
VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARN_CFLAGS = @WARN_CFLAGS@
XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
kernel_source = @kernel_source@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CFLAGS = \
	-I$(top_srcdir)/include/drm \
	-I$(top_srcdir)

proptest_SOURCES = \
	proptest.c

proptest_LDADD = \
	$(top_builddir)/libdrm.la

all: all-am

.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
	@for dep in $?; do \
	  case '$(am__configure_deps)' in \
	    *$$dep*) \
	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
	        && { if test -f $@; then exit 0; else break; fi; }; \
	      exit 1;; \
	  esac; \
	done; \
	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/proptest/Makefile'; \
	$(am__cd) $(top_srcdir) && \
	  $(AUTOMAKE) --foreign tests/proptest/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
	@case '$?' in \
	  *config.status*) \
	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
	  *) \
	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
	esac;

$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):

clean-noinstPROGRAMS:
	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
	echo " rm -f" $$list; \
	rm -f $$list || exit $$?; \
	test -n "$(EXEEXT)" || exit 0; \
	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
	echo " rm -f" $$list; \
	rm -f $$list

proptest$(EXEEXT): $(proptest_OBJECTS) $(proptest_DEPENDENCIES) $(EXTRA_proptest_DEPENDENCIES) 
	@rm -f proptest$(EXEEXT)
	$(AM_V_CCLD)$(LINK) $(proptest_OBJECTS) $(proptest_LDADD) $(LIBS)

mostlyclean-compile:
	-rm -f *.$(OBJEXT)

distclean-compile:
	-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proptest.Po@am__quote@

.c.o:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<

.c.obj:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

.c.lo:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<

mostlyclean-libtool:
	-rm -f *.lo

clean-libtool:
	-rm -rf .libs _libs

ID: $(am__tagged_files)
	$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-am
TAGS: tags

tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
	set x; \
	here=`pwd`; \
	$(am__define_uniq_tagged_files); \
	shift; \
	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
	  test -n "$$unique" || unique=$$empty_fix; \
	  if test $$# -gt 0; then \
	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
	      "$$@" $$unique; \
	  else \
	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
	      $$unique; \
	  fi; \
	fi
ctags: ctags-am

CTAGS: ctags
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
	$(am__define_uniq_tagged_files); \
	test -z "$(CTAGS_ARGS)$$unique" \
	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
	     $$unique

GTAGS:
	here=`$(am__cd) $(top_builddir) && pwd` \
	  && $(am__cd) $(top_srcdir) \
	  && gtags -i $(GTAGS_ARGS) "$$here"
cscopelist: cscopelist-am

cscopelist-am: $(am__tagged_files)
	list='$(am__tagged_files)'; \
	case "$(srcdir)" in \
	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
	  *) sdir=$(subdir)/$(srcdir) ;; \
	esac; \
	for i in $$list; do \
	  if test -f "$$i"; then \
	    echo "$(subdir)/$$i"; \
	  else \
	    echo "$$sdir/$$i"; \
	  fi; \
	done >> $(top_builddir)/cscope.files

distclean-tags:
	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

distdir: $(DISTFILES)
	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
	list='$(DISTFILES)'; \
	  dist_files=`for file in $$list; do echo $$file; done | \
	  sed -e "s|^$$srcdirstrip/||;t" \
	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
	case $$dist_files in \
	  */*) $(MKDIR_P) `echo "$$dist_files" | \
			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
			   sort -u` ;; \
	esac; \
	for file in $$dist_files; do \
	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
	  if test -d $$d/$$file; then \
	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
	    if test -d "$(distdir)/$$file"; then \
	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
	    fi; \
	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
	    fi; \
	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
	  else \
	    test -f "$(distdir)/$$file" \
	    || cp -p $$d/$$file "$(distdir)/$$file" \
	    || exit 1; \
	  fi; \
	done
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am

install-am: all-am
	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

installcheck: installcheck-am
install-strip:
	if test -z '$(STRIP)'; then \
	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	      install; \
	else \
	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
	fi
mostlyclean-generic:

clean-generic:

distclean-generic:
	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

maintainer-clean-generic:
	@echo "This command is intended for maintainers to use"
	@echo "it deletes files that may require special tools to rebuild."
clean: clean-am

clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
	mostlyclean-am

distclean: distclean-am
	-rm -rf ./$(DEPDIR)
	-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
	distclean-tags

dvi: dvi-am

dvi-am:

html: html-am

html-am:

info: info-am

info-am:

install-data-am:

install-dvi: install-dvi-am

install-dvi-am:

install-exec-am:

install-html: install-html-am

install-html-am:

install-info: install-info-am

install-info-am:

install-man:

install-pdf: install-pdf-am

install-pdf-am:

install-ps: install-ps-am

install-ps-am:

installcheck-am:

maintainer-clean: maintainer-clean-am
	-rm -rf ./$(DEPDIR)
	-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic

mostlyclean: mostlyclean-am

mostlyclean-am: mostlyclean-compile mostlyclean-generic \
	mostlyclean-libtool

pdf: pdf-am

pdf-am:

ps: ps-am

ps-am:

uninstall-am:

.MAKE: install-am install-strip

.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
	ctags-am distclean distclean-compile distclean-generic \
	distclean-libtool distclean-tags distdir dvi dvi-am html \
	html-am info info-am install install-am install-data \
	install-data-am install-dvi install-dvi-am install-exec \
	install-exec-am install-html install-html-am install-info \
	install-info-am install-man install-pdf install-pdf-am \
	install-ps install-ps-am install-strip installcheck \
	installcheck-am installdirs maintainer-clean \
	maintainer-clean-generic mostlyclean mostlyclean-compile \
	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
	tags tags-am uninstall uninstall-am


# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
File Added: xsrc/external/mit/libdrm/dist/tests/proptest/proptest.c
/*
 * Copyright © 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.
 *
 * Authors:
 *    Paulo Zanoni <paulo.r.zanoni@intel.com>
 *
 */

#include <assert.h>
#include <errno.h>
#include <inttypes.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

#include "xf86drm.h"
#include "xf86drmMode.h"

#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
static inline int64_t U642I64(uint64_t val)
{
	return (int64_t)*((int64_t *)&val);
}

int fd;
drmModeResPtr res = NULL;

const char *connector_type_str(uint32_t type)
{
	switch (type) {
	case DRM_MODE_CONNECTOR_Unknown:
		return "Unknown";
	case DRM_MODE_CONNECTOR_VGA:
		return "VGA";
	case DRM_MODE_CONNECTOR_DVII:
		return "DVI-I";
	case DRM_MODE_CONNECTOR_DVID:
		return "DVI-D";
	case DRM_MODE_CONNECTOR_DVIA:
		return "DVI-A";
	case DRM_MODE_CONNECTOR_Composite:
		return "Composite";
	case DRM_MODE_CONNECTOR_SVIDEO:
		return "SVIDEO";
	case DRM_MODE_CONNECTOR_LVDS:
		return "LVDS";
	case DRM_MODE_CONNECTOR_Component:
		return "Component";
	case DRM_MODE_CONNECTOR_9PinDIN:
		return "9PinDin";
	case DRM_MODE_CONNECTOR_DisplayPort:
		return "DisplayPort";
	case DRM_MODE_CONNECTOR_HDMIA:
		return "HDMI-A";
	case DRM_MODE_CONNECTOR_HDMIB:
		return "HDMI-B";
	case DRM_MODE_CONNECTOR_TV:
		return "TV";
	case DRM_MODE_CONNECTOR_eDP:
		return "eDP";
	default:
		return "Invalid";
	}
}

/* dump_blob and dump_prop shamelessly copied from ../modetest/modetest.c */
static void
dump_blob(uint32_t blob_id)
{
	uint32_t i;
	unsigned char *blob_data;
	drmModePropertyBlobPtr blob;

	blob = drmModeGetPropertyBlob(fd, blob_id);
	if (!blob) {
		printf("\n");
		return;
	}

	blob_data = blob->data;

	for (i = 0; i < blob->length; i++) {
		if (i % 16 == 0)
			printf("\n\t\t\t");
		printf("%.2hhx", blob_data[i]);
	}
	printf("\n");

	drmModeFreePropertyBlob(blob);
}

static void
dump_prop(uint32_t prop_id, uint64_t value)
{
	int i;
	drmModePropertyPtr prop;

	prop = drmModeGetProperty(fd, prop_id);

	printf("\t%d", prop_id);
	if (!prop) {
		printf("\n");
		return;
	}

	printf(" %s:\n", prop->name);

	printf("\t\tflags:");
	if (prop->flags & DRM_MODE_PROP_PENDING)
		printf(" pending");
	if (prop->flags & DRM_MODE_PROP_IMMUTABLE)
		printf(" immutable");
	if (drm_property_type_is(prop, DRM_MODE_PROP_SIGNED_RANGE))
		printf(" signed range");
	if (drm_property_type_is(prop, DRM_MODE_PROP_RANGE))
		printf(" range");
	if (drm_property_type_is(prop, DRM_MODE_PROP_ENUM))
		printf(" enum");
	if (drm_property_type_is(prop, DRM_MODE_PROP_BITMASK))
		printf(" bitmask");
	if (drm_property_type_is(prop, DRM_MODE_PROP_BLOB))
		printf(" blob");
	if (drm_property_type_is(prop, DRM_MODE_PROP_OBJECT))
		printf(" object");
	printf("\n");


	if (drm_property_type_is(prop, DRM_MODE_PROP_SIGNED_RANGE)) {
		printf("\t\tvalues:");
		for (i = 0; i < prop->count_values; i++)
			printf(" %"PRId64, U642I64(prop->values[i]));
		printf("\n");
	}

	if (drm_property_type_is(prop, DRM_MODE_PROP_RANGE)) {
		printf("\t\tvalues:");
		for (i = 0; i < prop->count_values; i++)
			printf(" %"PRIu64, prop->values[i]);
		printf("\n");
	}

	if (drm_property_type_is(prop, DRM_MODE_PROP_ENUM)) {
		printf("\t\tenums:");
		for (i = 0; i < prop->count_enums; i++)
			printf(" %s=%llu", prop->enums[i].name,
			       prop->enums[i].value);
		printf("\n");
	} else if (drm_property_type_is(prop, DRM_MODE_PROP_BITMASK)) {
		printf("\t\tvalues:");
		for (i = 0; i < prop->count_enums; i++)
			printf(" %s=0x%llx", prop->enums[i].name,
			       (1LL << prop->enums[i].value));
		printf("\n");
	} else {
		assert(prop->count_enums == 0);
	}

	if (drm_property_type_is(prop, DRM_MODE_PROP_BLOB)) {
		printf("\t\tblobs:\n");
		for (i = 0; i < prop->count_blobs; i++)
			dump_blob(prop->blob_ids[i]);
		printf("\n");
	} else {
		assert(prop->count_blobs == 0);
	}

	printf("\t\tvalue:");
	if (drm_property_type_is(prop, DRM_MODE_PROP_BLOB))
		dump_blob(value);
	else
		printf(" %"PRIu64"\n", value);

	drmModeFreeProperty(prop);
}

static void listObjectProperties(uint32_t id, uint32_t type)
{
	unsigned int i;
	drmModeObjectPropertiesPtr props;

	props = drmModeObjectGetProperties(fd, id, type);

	if (!props) {
		printf("\tNo properties: %s.\n", strerror(errno));
		return;
	}

	for (i = 0; i < props->count_props; i++)
		dump_prop(props->props[i], props->prop_values[i]);

	drmModeFreeObjectProperties(props);
}

static void listConnectorProperties(void)
{
	int i;
	drmModeConnectorPtr c;

	for (i = 0; i < res->count_connectors; i++) {
		c = drmModeGetConnector(fd, res->connectors[i]);

		if (!c) {
			fprintf(stderr, "Could not get connector %u: %s\n",
				res->connectors[i], strerror(errno));
			continue;
		}

		printf("Connector %u (%s-%u)\n", c->connector_id,
		       connector_type_str(c->connector_type),
		       c->connector_type_id);

		listObjectProperties(c->connector_id,
				     DRM_MODE_OBJECT_CONNECTOR);

		drmModeFreeConnector(c);
	}
}

static void listCrtcProperties(void)
{
	int i;
	drmModeCrtcPtr c;

	for (i = 0; i < res->count_crtcs; i++) {
		c = drmModeGetCrtc(fd, res->crtcs[i]);

		if (!c) {
			fprintf(stderr, "Could not get crtc %u: %s\n",
				res->crtcs[i], strerror(errno));
			continue;
		}

		printf("CRTC %u\n", c->crtc_id);

		listObjectProperties(c->crtc_id, DRM_MODE_OBJECT_CRTC);

		drmModeFreeCrtc(c);
	}
}

static void listAllProperties(void)
{
	listConnectorProperties();
	listCrtcProperties();
}

static int setProperty(char *argv[])
{
	uint32_t obj_id, obj_type, prop_id;
	uint64_t value;

	obj_id = atoi(argv[1]);

	if (!strcmp(argv[2], "connector")) {
		obj_type = DRM_MODE_OBJECT_CONNECTOR;
	} else if (!strcmp(argv[2], "crtc")) {
		obj_type = DRM_MODE_OBJECT_CRTC;
	} else {
		fprintf(stderr, "Invalid object type.\n");
		return 1;
	}

	prop_id = atoi(argv[3]);
	value = atoll(argv[4]);

	return drmModeObjectSetProperty(fd, obj_id, obj_type, prop_id, value);
}

static void printUsage(void)
{
	printf("Usage:\n"
"  proptest\n"
"  proptest [obj id] [obj type] [prop id] [value]\n"
"\n"
"The first form just prints all the existing properties. The second one is\n"
"used to set the value of a specified property. The object type can be one of\n"
"the following strings:\n"
"  connector crtc\n"
"\n"
"Example:\n"
"  proptest 7 connector 2 1\n"
"will set property 2 of connector 7 to 1\n");
}

int main(int argc, char *argv[])
{
	char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "msm" };
	unsigned int i, ret = 0;

	for (i = 0; i < ARRAY_SIZE(modules); i++){
		fd = drmOpen(modules[i], NULL);
		if (fd >= 0) {
			printf("Module %s loaded.\n", modules[i]);
			break;
		}
	}

	if (i == ARRAY_SIZE(modules)) {
		fprintf(stderr, "Failed to load drm modules.\n");
		return 1;
	}

	res = drmModeGetResources(fd);
	if (!res) {
		fprintf(stderr, "Failed to get resources: %s\n",
			strerror(errno));
		ret = 1;
		goto done;
	}

	if (argc < 2) {
		listAllProperties();
	} else if (argc == 5) {
		ret = setProperty(argv);
	} else {
		printUsage();
		ret = 1;
	}

	drmModeFreeResources(res);
done:
	drmClose(fd);
	return ret;
}
cvs diff -r1.1.1.1.2.1 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/tests/radeon/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/radeon/Attic/Makefile.in 2014/12/23 01:16:59 1.1.1.1.2.1
+++ xsrc/external/mit/libdrm/dist/tests/radeon/Attic/Makefile.in 2015/01/28 11:17:50 1.1.1.1.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -362,34 +362,34 @@ mostlyclean-compile: @@ -362,34 +362,34 @@ mostlyclean-compile:
362 -rm -f *.$(OBJEXT) 362 -rm -f *.$(OBJEXT)
363 363
364distclean-compile: 364distclean-compile:
365 -rm -f *.tab.c 365 -rm -f *.tab.c
366 366
367@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_ttm.Po@am__quote@ 367@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_ttm.Po@am__quote@
368@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rbo.Po@am__quote@ 368@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rbo.Po@am__quote@
369 369
370.c.o: 370.c.o:
371@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 371@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
372@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 372@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
373@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 373@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
374@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 374@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
375@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 375@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
376 376
377.c.obj: 377.c.obj:
378@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 378@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
379@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 379@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
380@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 380@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
381@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 381@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
382@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 382@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
383 383
384.c.lo: 384.c.lo:
385@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 385@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
386@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 386@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
387@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 387@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
388@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 388@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
389@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 389@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
390 390
391mostlyclean-libtool: 391mostlyclean-libtool:
392 -rm -f *.lo 392 -rm -f *.lo
393 393
394clean-libtool: 394clean-libtool:
395 -rm -rf .libs _libs 395 -rm -rf .libs _libs
File Added: xsrc/external/mit/libdrm/dist/tests/tegra/Attic/Makefile.am
AM_CPPFLAGS = \
	-I$(top_srcdir)/include/drm \
	-I$(top_srcdir)/tegra \
	-I$(top_srcdir)

AM_CFLAGS = -Wall -Werror

LDADD = \
	../../tegra/libdrm_tegra.la \
	../../libdrm.la

noinst_PROGRAMS = \
	openclose
File Added: xsrc/external/mit/libdrm/dist/tests/tegra/Attic/Makefile.in
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2013 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.

@SET_MAKE@

VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
      *) echo "am__make_running_with_option: internal error: invalid" \
              "target option '$${target_option-}' specified" >&2; \
         exit 1;; \
  esac; \
  has_opt=no; \
  sane_makeflags=$$MAKEFLAGS; \
  if $(am__is_gnu_make); then \
    sane_makeflags=$$MFLAGS; \
  else \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
        bs=\\; \
        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    esac; \
  fi; \
  skip_next=no; \
  strip_trailopt () \
  { \
    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
  }; \
  for flg in $$sane_makeflags; do \
    test $$skip_next = yes && { skip_next=no; continue; }; \
    case $$flg in \
      *=*|--*) continue;; \
        -*I) strip_trailopt 'I'; skip_next=yes;; \
      -*I?*) strip_trailopt 'I';; \
        -*O) strip_trailopt 'O'; skip_next=yes;; \
      -*O?*) strip_trailopt 'O';; \
        -*l) strip_trailopt 'l'; skip_next=yes;; \
      -*l?*) strip_trailopt 'l';; \
      -[dEDm]) skip_next=yes;; \
      -[JT]) skip_next=yes;; \
    esac; \
    case $$flg in \
      *$$target_option*) has_opt=yes; break;; \
    esac; \
  done; \
  test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
noinst_PROGRAMS = openclose$(EXEEXT)
subdir = tests/tegra
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
	$(top_srcdir)/build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
	$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
	$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
openclose_SOURCES = openclose.c
openclose_OBJECTS = openclose.$(OBJEXT)
openclose_LDADD = $(LDADD)
openclose_DEPENDENCIES = ../../tegra/libdrm_tegra.la ../../libdrm.la
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 = 
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo "  GEN     " $@;
am__v_GEN_1 = 
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 = 
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
	$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo "  CC      " $@;
am__v_CC_1 = 
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
	$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo "  CCLD    " $@;
am__v_CCLD_1 = 
SOURCES = openclose.c
DIST_SOURCES = openclose.c
am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates.  Input order is
# *not* preserved.
am__uniquify_input = $(AWK) '\
  BEGIN { nonempty = 0; } \
  { items[$$0] = 1; nonempty = 1; } \
  END { if (nonempty) { for (i in items) print i; }; } \
'
# Make sure the list of sources is unique.  This is necessary because,
# e.g., the same source file might be shared among _SOURCES variables
# for different programs/libraries.
am__define_uniq_tagged_files = \
  list='$(am__tagged_files)'; \
  unique=`for i in $$list; do \
    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLOCK_LIB = @CLOCK_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
LIBUDEV_LIBS = @LIBUDEV_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MANPAGES_STYLESHEET = @MANPAGES_STYLESHEET@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PTHREADSTUBS_CFLAGS = @PTHREADSTUBS_CFLAGS@
PTHREADSTUBS_LIBS = @PTHREADSTUBS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VERSION = @VERSION@
VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARN_CFLAGS = @WARN_CFLAGS@
XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
kernel_source = @kernel_source@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = \
	-I$(top_srcdir)/include/drm \
	-I$(top_srcdir)/tegra \
	-I$(top_srcdir)

AM_CFLAGS = -Wall -Werror
LDADD = \
	../../tegra/libdrm_tegra.la \
	../../libdrm.la

all: all-am

.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
	@for dep in $?; do \
	  case '$(am__configure_deps)' in \
	    *$$dep*) \
	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
	        && { if test -f $@; then exit 0; else break; fi; }; \
	      exit 1;; \
	  esac; \
	done; \
	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/tegra/Makefile'; \
	$(am__cd) $(top_srcdir) && \
	  $(AUTOMAKE) --foreign tests/tegra/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
	@case '$?' in \
	  *config.status*) \
	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
	  *) \
	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
	esac;

$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):

clean-noinstPROGRAMS:
	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
	echo " rm -f" $$list; \
	rm -f $$list || exit $$?; \
	test -n "$(EXEEXT)" || exit 0; \
	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
	echo " rm -f" $$list; \
	rm -f $$list

openclose$(EXEEXT): $(openclose_OBJECTS) $(openclose_DEPENDENCIES) $(EXTRA_openclose_DEPENDENCIES) 
	@rm -f openclose$(EXEEXT)
	$(AM_V_CCLD)$(LINK) $(openclose_OBJECTS) $(openclose_LDADD) $(LIBS)

mostlyclean-compile:
	-rm -f *.$(OBJEXT)

distclean-compile:
	-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openclose.Po@am__quote@

.c.o:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<

.c.obj:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

.c.lo:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<

mostlyclean-libtool:
	-rm -f *.lo

clean-libtool:
	-rm -rf .libs _libs

ID: $(am__tagged_files)
	$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-am
TAGS: tags

tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
	set x; \
	here=`pwd`; \
	$(am__define_uniq_tagged_files); \
	shift; \
	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
	  test -n "$$unique" || unique=$$empty_fix; \
	  if test $$# -gt 0; then \
	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
	      "$$@" $$unique; \
	  else \
	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
	      $$unique; \
	  fi; \
	fi
ctags: ctags-am

CTAGS: ctags
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
	$(am__define_uniq_tagged_files); \
	test -z "$(CTAGS_ARGS)$$unique" \
	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
	     $$unique

GTAGS:
	here=`$(am__cd) $(top_builddir) && pwd` \
	  && $(am__cd) $(top_srcdir) \
	  && gtags -i $(GTAGS_ARGS) "$$here"
cscopelist: cscopelist-am

cscopelist-am: $(am__tagged_files)
	list='$(am__tagged_files)'; \
	case "$(srcdir)" in \
	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
	  *) sdir=$(subdir)/$(srcdir) ;; \
	esac; \
	for i in $$list; do \
	  if test -f "$$i"; then \
	    echo "$(subdir)/$$i"; \
	  else \
	    echo "$$sdir/$$i"; \
	  fi; \
	done >> $(top_builddir)/cscope.files

distclean-tags:
	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

distdir: $(DISTFILES)
	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
	list='$(DISTFILES)'; \
	  dist_files=`for file in $$list; do echo $$file; done | \
	  sed -e "s|^$$srcdirstrip/||;t" \
	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
	case $$dist_files in \
	  */*) $(MKDIR_P) `echo "$$dist_files" | \
			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
			   sort -u` ;; \
	esac; \
	for file in $$dist_files; do \
	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
	  if test -d $$d/$$file; then \
	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
	    if test -d "$(distdir)/$$file"; then \
	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
	    fi; \
	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
	    fi; \
	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
	  else \
	    test -f "$(distdir)/$$file" \
	    || cp -p $$d/$$file "$(distdir)/$$file" \
	    || exit 1; \
	  fi; \
	done
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am

install-am: all-am
	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

installcheck: installcheck-am
install-strip:
	if test -z '$(STRIP)'; then \
	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	      install; \
	else \
	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
	fi
mostlyclean-generic:

clean-generic:

distclean-generic:
	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

maintainer-clean-generic:
	@echo "This command is intended for maintainers to use"
	@echo "it deletes files that may require special tools to rebuild."
clean: clean-am

clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
	mostlyclean-am

distclean: distclean-am
	-rm -rf ./$(DEPDIR)
	-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
	distclean-tags

dvi: dvi-am

dvi-am:

html: html-am

html-am:

info: info-am

info-am:

install-data-am:

install-dvi: install-dvi-am

install-dvi-am:

install-exec-am:

install-html: install-html-am

install-html-am:

install-info: install-info-am

install-info-am:

install-man:

install-pdf: install-pdf-am

install-pdf-am:

install-ps: install-ps-am

install-ps-am:

installcheck-am:

maintainer-clean: maintainer-clean-am
	-rm -rf ./$(DEPDIR)
	-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic

mostlyclean: mostlyclean-am

mostlyclean-am: mostlyclean-compile mostlyclean-generic \
	mostlyclean-libtool

pdf: pdf-am

pdf-am:

ps: ps-am

ps-am:

uninstall-am:

.MAKE: install-am install-strip

.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
	ctags-am distclean distclean-compile distclean-generic \
	distclean-libtool distclean-tags distdir dvi dvi-am html \
	html-am info info-am install install-am install-data \
	install-data-am install-dvi install-dvi-am install-exec \
	install-exec-am install-html install-html-am install-info \
	install-info-am install-man install-pdf install-pdf-am \
	install-ps install-ps-am install-strip installcheck \
	installcheck-am installdirs maintainer-clean \
	maintainer-clean-generic mostlyclean mostlyclean-compile \
	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
	tags tags-am uninstall uninstall-am


# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
File Added: xsrc/external/mit/libdrm/dist/tests/tegra/openclose.c
/*
 * Copyright © 2014 NVIDIA 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
 */

#ifdef HAVE_CONFIG_H
#  include "config.h"
#endif

#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>

#include "xf86drm.h"
#include "tegra.h"

static const char default_device[] = "/dev/dri/card0";

int main(int argc, char *argv[])
{
	struct drm_tegra *tegra;
	drmVersionPtr version;
	const char *device;
	int err, fd;

	if (argc < 2)
		device = default_device;
	else
		device = argv[1];

	fd = open(device, O_RDWR);
	if (fd < 0)
		return 1;

	version = drmGetVersion(fd);
	if (version) {
		printf("Version: %d.%d.%d\n", version->version_major,
		       version->version_minor, version->version_patchlevel);
		printf("  Name: %s\n", version->name);
		printf("  Date: %s\n", version->date);
		printf("  Description: %s\n", version->desc);

		drmFreeVersion(version);
	}

	err = drm_tegra_new(&tegra, fd);
	if (err < 0)
		return 1;

	drm_tegra_close(tegra);
	close(fd);

	return 0;
}
cvs diff -r1.1.1.4.2.1 -r1.1.1.4.2.2 xsrc/external/mit/libdrm/dist/tests/vbltest/Attic/Makefile.in (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/vbltest/Attic/Makefile.in 2014/12/23 01:16:59 1.1.1.4.2.1
+++ xsrc/external/mit/libdrm/dist/tests/vbltest/Attic/Makefile.in 2015/01/28 11:17:50 1.1.1.4.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# Makefile.in generated by automake 1.13.4 from Makefile.am. 1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc. 4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5 5
6# This Makefile.in is free software; the Free Software Foundation 6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10# This program is distributed in the hope that it will be useful, 10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without 11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A 12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE. 13# PARTICULAR PURPOSE.
14 14
@@ -410,34 +410,34 @@ vbltest$(EXEEXT): $(vbltest_OBJECTS) $(v @@ -410,34 +410,34 @@ vbltest$(EXEEXT): $(vbltest_OBJECTS) $(v
410mostlyclean-compile: 410mostlyclean-compile:
411 -rm -f *.$(OBJEXT) 411 -rm -f *.$(OBJEXT)
412 412
413distclean-compile: 413distclean-compile:
414 -rm -f *.tab.c 414 -rm -f *.tab.c
415 415
416@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vbltest.Po@am__quote@ 416@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vbltest.Po@am__quote@
417 417
418.c.o: 418.c.o:
419@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 419@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
420@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 420@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
421@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 421@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
422@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 422@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
423@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< 423@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
424 424
425.c.obj: 425.c.obj:
426@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 426@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
427@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 427@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
428@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 428@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
429@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 429@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
430@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` 430@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
431 431
432.c.lo: 432.c.lo:
433@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 433@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
434@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 434@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
435@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 435@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
436@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 436@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
437@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 437@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
438 438
439mostlyclean-libtool: 439mostlyclean-libtool:
440 -rm -f *.lo 440 -rm -f *.lo
441 441
442clean-libtool: 442clean-libtool:
443 -rm -rf .libs _libs 443 -rm -rf .libs _libs
cvs diff -r1.1.1.2.2.1 -r1.1.1.2.2.2 xsrc/external/mit/libdrm/dist/tests/vbltest/vbltest.c (expand / switch to unified diff)

--- xsrc/external/mit/libdrm/dist/tests/vbltest/vbltest.c 2014/12/23 01:16:59 1.1.1.2.2.1
+++ xsrc/external/mit/libdrm/dist/tests/vbltest/vbltest.c 2015/01/28 11:17:50 1.1.1.2.2.2
@@ -95,27 +95,27 @@ static void vblank_handler(int fd, unsig @@ -95,27 +95,27 @@ static void vblank_handler(int fd, unsig
95 } 95 }
96} 96}
97 97
98static void usage(char *name) 98static void usage(char *name)
99{ 99{
100 fprintf(stderr, "usage: %s [-s]\n", name); 100 fprintf(stderr, "usage: %s [-s]\n", name);
101 fprintf(stderr, "\t-s\tuse secondary pipe\n"); 101 fprintf(stderr, "\t-s\tuse secondary pipe\n");
102 exit(0); 102 exit(0);
103} 103}
104 104
105int main(int argc, char **argv) 105int main(int argc, char **argv)
106{ 106{
107 int i, c, fd, ret; 107 int i, c, fd, ret;
108 char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm" }; 108 char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm", "tegra" };
109 drmVBlank vbl; 109 drmVBlank vbl;
110 drmEventContext evctx; 110 drmEventContext evctx;
111 struct vbl_info handler_info; 111 struct vbl_info handler_info;
112 112
113 opterr = 0; 113 opterr = 0;
114 while ((c = getopt(argc, argv, optstr)) != -1) { 114 while ((c = getopt(argc, argv, optstr)) != -1) {
115 switch (c) { 115 switch (c) {
116 case 's': 116 case 's':
117 secondary = 1; 117 secondary = 1;
118 break; 118 break;
119 default: 119 default:
120 usage(argv[0]); 120 usage(argv[0]);
121 break; 121 break;