xf86-video-intel: 4 commits - configure.ac libobj/ignore.c libobj/Makefile.am Makefile.am NEWS src/intel_module.c src/sna/Makefile.am src/sna/sna_dri2.c

[Chris Wilson]

 Makefile.am         |    2 +-
 NEWS                |    7 +++++++
 configure.ac        |    3 ++-
 libobj/Makefile.am  |    3 +++
 libobj/ignore.c     |    6 ++++++
 src/intel_module.c  |    4 ++++
 src/sna/Makefile.am |    2 +-
 src/sna/sna_dri2.c  |    2 ++
 8 files changed, 26 insertions(+), 3 deletions(-)

New commits:
commit 8d95e90b7b4bf5d6bae5443f92d77d30f4443f24
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 23 15:45:31 2014 +0100

    2.99.914 snapshot

diff --git a/NEWS b/NEWS
index 72fe0bb..f5e8317 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Snapshot 2.99.914 (2014-07-23)
+==============================
+And a brown paper bag to hide the rebuilding from the tarball with
+'autoreconf -fi' error that arose from not distributing the libobj/
+directory.
+
+
 Snapshot 2.99.913 (2014-07-23)
 ==============================
 This should be it... A few fixes from testing the new code, we should be
diff --git a/configure.ac b/configure.ac
index fd997fb..5c3dd20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-        [2.99.913],
+        [2.99.914],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])
commit 57f0e65d5186412835f282af59141626e4a87a00
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 23 16:42:46 2014 +0100

    sna/dri2: Compile fix for old xorg/dri2
    
    We have to do conditional compilation as we touch structure members that
    may not exist in older Xserver headers.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index e4f1c84..9388992 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -3253,11 +3253,13 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
 	driverNames[1] = info.driverName;
 #endif
 
+#if DRI2INFOREC_VERSION >= 6
 	if (xorg_can_triple_buffer(sna)) {
 		info.version = 6;
 		info.SwapLimitValidate = sna_dri2_swap_limit_validate;
 		info.ReuseBufferNotify = sna_dri2_reuse_buffer;
 	}
+#endif
 
 #if USE_ASYNC_SWAP
 	info.version = 10;
commit 4ed0937640b54246440421114b697f75d1b8c835
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 23 15:41:29 2014 +0100

    Add automake magic required for libobj/
    
    So libobj/ wasn't included in the tarball, and nor was the compatability
    functions being added to the driver when they were needed. The oddity is
    that using the ./configure script (and thus make distcheck) succeeds. It
    was only when 'autoreconf -fi' was run was the first error encoutered.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    Reported-by: Tobias Klausmann

diff --git a/Makefile.am b/Makefile.am
index 6bb4854..418fdc9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
 
-SUBDIRS = man xvmc src tools
+SUBDIRS = man libobj xvmc src tools
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index 280bfc9..fd997fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -839,6 +839,7 @@ AC_DEFINE_DIR([LIBEXEC_PATH], libexecdir, [libexec directory])
 AC_CONFIG_FILES([
                 Makefile
                 man/Makefile
+		libobj/Makefile
                 src/Makefile
                 src/legacy/Makefile
                 src/legacy/i810/Makefile
diff --git a/libobj/Makefile.am b/libobj/Makefile.am
new file mode 100644
index 0000000..92c9ac5
--- /dev/null
+++ b/libobj/Makefile.am
@@ -0,0 +1,3 @@
+noinst_LTLIBRARIES = libcompat.la
+libcompat_la_SOURCES = ignore.c # for portability, always build something
+libcompat_la_LIBADD = $(LIBOBJS) $(ALLOCA)
diff --git a/libobj/ignore.c b/libobj/ignore.c
new file mode 100644
index 0000000..3c56f2f
--- /dev/null
+++ b/libobj/ignore.c
@@ -0,0 +1,6 @@
+extern void ignore(void);
+
+void ignore(void)
+{
+	/* libcompat.a cannot be empty therefore I exist */
+}
diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index a299ea2..7ec1c36 100644
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -35,7 +35,7 @@ endif
 
 noinst_LTLIBRARIES = libsna.la
 libsna_la_LDFLAGS = -pthread
-libsna_la_LIBADD = $(UDEV_LIBS) -lm $(DRM_LIBS) brw/libbrw.la fb/libfb.la
+libsna_la_LIBADD = $(UDEV_LIBS) -lm $(DRM_LIBS) brw/libbrw.la fb/libfb.la ../../libobj/libcompat.la
 
 libsna_la_SOURCES = \
 	atomic.h \
commit dcf9ce4a9f16c01f58797e4f899d51e23506aa6c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 23 14:19:44 2014 +0000

    Fix compile failure on old Xorg with XF86_ALLOCATE_GPU_SCREEN
    
    Sigh, a late fix was not compile checked against xorg-1.7.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_module.c b/src/intel_module.c
index 969f2a7..d6a0d3c 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -50,6 +50,10 @@
 #include <xf86platformBus.h>
 #endif
 
+#ifndef XF86_ALLOCATE_GPU_SCREEN
+#define XF86_ALLOCATE_GPU_SCREEN 0
+#endif
+
 static const struct intel_device_info intel_generic_info = {
 	.gen = -1,
 };