Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c7efba167170099d697920124268b10b96f9c9c7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c7efba167170099d697920124268b10b96f9c9c7)
  • Date: Mon, 4 Jan 2016 15:56:05 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

xorg-driver/xf86-video-intel/0001-fix-compile-error.patch | 25
++++++++++++++
xorg-driver/xf86-video-intel/HISTORY | 3 +
xorg-driver/xf86-video-intel/PRE_BUILD | 3 +
3 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit c7efba167170099d697920124268b10b96f9c9c7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-driver/xf86-video-intel: fix compile error

diff --git a/xorg-driver/xf86-video-intel/0001-fix-compile-error.patch
b/xorg-driver/xf86-video-intel/0001-fix-compile-error.patch
new file mode 100644
index 0000000..07da20d
--- /dev/null
+++ b/xorg-driver/xf86-video-intel/0001-fix-compile-error.patch
@@ -0,0 +1,25 @@
+From c520f8fc524ecc58844fe3a365bc5a96582c08bb Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 4 Jan 2016 16:48:33 +0100
+Subject: [PATCH] fix compile error
+
+---
+ src/uxa/intel_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
+index 2793da5..f936b18 100644
+--- a/src/uxa/intel_driver.c
++++ b/src/uxa/intel_driver.c
+@@ -642,7 +642,7 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr
dirty)
+ return;
+
+ PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
+- PixmapSyncDirtyHelper(dirty, &pixregion);
++ PixmapSyncDirtyHelper(dirty);
+ RegionUninit(&pixregion);
+
+ intel_flush(intel);
+--
+2.6.3
+
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index 3497251..17e9920 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,6 @@
+2016-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-compile-error.patch: fix compile error
+
2015-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* CONFIGURE: add option for activating dri3
* PRE_BUILD, xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch:
fix
diff --git a/xorg-driver/xf86-video-intel/PRE_BUILD
b/xorg-driver/xf86-video-intel/PRE_BUILD
index c632827..959bd01 100755
--- a/xorg-driver/xf86-video-intel/PRE_BUILD
+++ b/xorg-driver/xf86-video-intel/PRE_BUILD
@@ -3,5 +3,6 @@ cd ${SOURCE_DIRECTORY} &&
if [[ "$XF86_VIDEO_INTEL_BRANCH" == "scm" ]]; then
NOCONFIGURE=yes ./autogen.sh
else
- patch -p1 <
${SPELL_DIRECTORY}/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
+ patch -p1 <
${SPELL_DIRECTORY}/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch &&
+ patch -p1 < ${SPELL_DIRECTORY}/0001-fix-compile-error.patch
fi



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c7efba167170099d697920124268b10b96f9c9c7), Florian Franzmann, 01/04/2016

Archive powered by MHonArc 2.6.24.

Top of Page