drm: Branch 'master' - 3 commits

[email protected] (GitLab Mirror) Thu, 4 Oct 2018 14:50:58 +0000 (UTC)
Newsgroups	gmane.comp.video.dri.patches
Message-ID	<[email protected]>
 intel/Makefile.sources |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4f1c76539692253247fd2022111873601e50b1d9
Author: Emil Velikov <[email protected]>
Date:   Thu Oct 4 15:08:17 2018 +0100

    Bump to version 2.4.95
    
    Signed-off-by: Emil Velikov <[email protected]>

diff --git a/configure.ac b/configure.ac
index 7c8093b2..0156d8b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-        [2.4.94],
+        [2.4.95],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
         [libdrm])
 
diff --git a/meson.build b/meson.build
index 80d50188..be50753b 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@
 project(
   'libdrm',
   ['c'],
-  version : '2.4.94',
+  version : '2.4.95',
   license : 'MIT',
   meson_version : '>= 0.43',
   default_options : ['buildtype=debugoptimized', 'c_std=gnu99'],
commit 86326a2c536c95f1c990845e163c7d24c70dc1de
Author: Emil Velikov <[email protected]>
Date:   Thu Oct 4 15:16:22 2018 +0100

    intel: include i915_pciids.h in the tarball
    
    Fixes: 4e81d4f9c9b ("intel: add generic functions to check PCI ID")
    Cc: Lucas De Marchi <[email protected]>
    Signed-off-by: Emil Velikov <[email protected]>

diff --git a/intel/Makefile.sources b/intel/Makefile.sources
index 61f43aeb..aa27e273 100644
--- a/intel/Makefile.sources
+++ b/intel/Makefile.sources
@@ -1,4 +1,5 @@
 LIBDRM_INTEL_FILES := \
+	i915_pciids.h \
 	intel_bufmgr.c \
 	intel_bufmgr_priv.h \
 	intel_bufmgr_fake.c \
commit 7dea956d388f10bec7dc31be4baf683fb6fb6cde
Author: Emil Velikov <[email protected]>
Date:   Thu Oct 4 15:22:18 2018 +0100

    Revert "Bump to version 2.4.95"
    
    This reverts commit 6e50a309afb340088d7da762f4434d409216caf2.

diff --git a/configure.ac b/configure.ac
index 0156d8b9..7c8093b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-        [2.4.95],
+        [2.4.94],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
         [libdrm])
 
diff --git a/meson.build b/meson.build
index be50753b..80d50188 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@
 project(
   'libdrm',
   ['c'],
-  version : '2.4.95',
+  version : '2.4.94',
   license : 'MIT',
   meson_version : '>= 0.43',
   default_options : ['buildtype=debugoptimized', 'c_std=gnu99'],


--