xserver: Branch 'master' - 3 commits

[Keith Packard]

 configure.ac                        |    7 ++++---
 hw/xfree86/Makefile.am              |    2 +-
 hw/xfree86/dri2/Makefile.am         |    2 ++
 hw/xfree86/dri2/pci_ids/Makefile.am |   11 +++++++++++
 4 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit e9db7682028bb0464c211c1f7bb6983fcfb6f37b
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Oct 28 21:32:24 2014 -0700

    Update to version 1.16.99.901
    
    1.17 RC1
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index bf385b3..140e33e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.16.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2014-07-17"
-RELEASE_NAME="Baba Ghanouj"
+AC_INIT([xorg-server], 1.16.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2014-10-28"
+RELEASE_NAME="Chanterelle"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 5ff74d68b0cce85e041251efdc76595eac3c89e4
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Oct 28 21:31:40 2014 -0700

    xfree86: Include 'drivers' directory with distribution
    
    Even if we don't build it locally, make sure it gets included with the release.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 30f7c8f..d46bf0a 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -43,7 +43,7 @@ SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \
 DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
                parser ramdac shadowfb vbe vgahw \
                loader dixmods dri dri2 exa modes \
-	       utils doc man glamor_egl
+	       utils doc man glamor_egl drivers
 
 bin_PROGRAMS = Xorg
 nodist_Xorg_SOURCES = sdksyms.c
commit f36f16f0551aa091c1ff154875aebe3d29cf51e7
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Oct 28 21:30:23 2014 -0700

    dri2: Distribute new pci_ids headers
    
    Create hw/xfree86/dri2/pci_ids/Makefile.am which includes all of the new
    pci id files in the tarballs. Build that from configure.ac, and run it
    from dri2/Makefile.am
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index fee048e..bf385b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2556,6 +2556,7 @@ hw/xfree86/dixmods/Makefile
 hw/xfree86/doc/Makefile
 hw/xfree86/dri/Makefile
 hw/xfree86/dri2/Makefile
+hw/xfree86/dri2/pci_ids/Makefile
 hw/xfree86/drivers/Makefile
 hw/xfree86/drivers/modesetting/Makefile
 hw/xfree86/exa/Makefile
diff --git a/hw/xfree86/dri2/Makefile.am b/hw/xfree86/dri2/Makefile.am
index 502a2ee..78e507b 100644
--- a/hw/xfree86/dri2/Makefile.am
+++ b/hw/xfree86/dri2/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=pci_ids
+
 noinst_LTLIBRARIES = libdri2.la
 AM_CFLAGS = \
 	-DHAVE_XORG_CONFIG_H \
diff --git a/hw/xfree86/dri2/pci_ids/Makefile.am b/hw/xfree86/dri2/pci_ids/Makefile.am
new file mode 100644
index 0000000..c511108
--- /dev/null
+++ b/hw/xfree86/dri2/pci_ids/Makefile.am
@@ -0,0 +1,11 @@
+EXTRA_DIST = \
+	pci_id_driver_map.h \
+	i810_pci_ids.h \
+	i915_pci_ids.h \
+	i965_pci_ids.h \
+	r200_pci_ids.h \
+	r300_pci_ids.h \
+	r600_pci_ids.h \
+	radeon_pci_ids.h \
+	radeonsi_pci_ids.h \
+	vmwgfx_pci_ids.h