summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-01-17 14:43:42 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-01-17 14:43:42 +0100
commitf288296cebdebb5b51431a808ecbf1b9ede0edec (patch)
tree516bf42e1dd768027677d70426b08064f892775e /patches
parent213f6682cf6456d237fa7a34d0203a83e70efe2b (diff)
downloadptxdist-f288296cebdebb5b51431a808ecbf1b9ede0edec.tar.gz
ptxdist-f288296cebdebb5b51431a808ecbf1b9ede0edec.tar.xz
[xorg-driver-video-intel] version bump 2.13.0 -> 2.14.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/xf86-video-intel-2.14.0/0001-restore-CPPFLAGS.patch34
l---------patches/xf86-video-intel-2.14.0/autogen.sh1
-rw-r--r--patches/xf86-video-intel-2.14.0/series3
3 files changed, 38 insertions, 0 deletions
diff --git a/patches/xf86-video-intel-2.14.0/0001-restore-CPPFLAGS.patch b/patches/xf86-video-intel-2.14.0/0001-restore-CPPFLAGS.patch
new file mode 100644
index 000000000..bc4d2fc46
--- /dev/null
+++ b/patches/xf86-video-intel-2.14.0/0001-restore-CPPFLAGS.patch
@@ -0,0 +1,34 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 17 Jan 2011 14:38:11 +0100
+Subject: [PATCH] restore CPPFLAGS
+
+Without this, CPPFLAGS defined when running configure are lost.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 529a294..179c084 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -99,6 +99,7 @@ PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
+ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
+
+ save_CFLAGS="$CFLAGS"
++save_CPPFLAGS="$CPPFLAGS"
+ CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
+ CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
+ AC_MSG_CHECKING([whether to include DRI support])
+@@ -122,6 +123,7 @@ if test x$DRI = xauto; then
+ fi
+ AC_MSG_RESULT([$DRI])
+ CFLAGS="$save_CFLAGS $DEBUGFLAGS"
++CPPFLAGS="$save_CPPFLAGS"
+
+ AM_CONDITIONAL(DRI, test x$DRI = xyes)
+ if test "$DRI" = yes; then
+--
+1.7.2.3
+
diff --git a/patches/xf86-video-intel-2.14.0/autogen.sh b/patches/xf86-video-intel-2.14.0/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/xf86-video-intel-2.14.0/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh \ No newline at end of file
diff --git a/patches/xf86-video-intel-2.14.0/series b/patches/xf86-video-intel-2.14.0/series
new file mode 100644
index 000000000..f634878b1
--- /dev/null
+++ b/patches/xf86-video-intel-2.14.0/series
@@ -0,0 +1,3 @@
+# generated by git-ptx-patches
+0001-restore-CPPFLAGS.patch
+# 77ddcfdf51ea40deac2f492dd96518f9 - git-ptx-patches magic