Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (b7e525d9a55d9d3f7580c4fc134f66b2ce968252)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (b7e525d9a55d9d3f7580c4fc134f66b2ce968252)
  • Date: Wed, 27 Sep 2017 08:45:51 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

xorg-driver/xf86-video-intel/0001-fix-compile-error.patch
| 25 ---
xorg-driver/xf86-video-intel/DETAILS
| 11 -
xorg-driver/xf86-video-intel/HISTORY
| 7 +
xorg-driver/xf86-video-intel/PRE_BUILD
| 6

xorg-driver/xf86-video-intel/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
| 65 ----------
5 files changed, 15 insertions(+), 99 deletions(-)

New commits:
commit b7e525d9a55d9d3f7580c4fc134f66b2ce968252
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xf86-video-intel: fix build by switching to a git snapshot

Others are considering dropping this driver in favour of modesetting
altogether. But that one does also fail to build ...

diff --git a/xorg-driver/xf86-video-intel/0001-fix-compile-error.patch
b/xorg-driver/xf86-video-intel/0001-fix-compile-error.patch
deleted file mode 100644
index 07da20d..0000000
--- a/xorg-driver/xf86-video-intel/0001-fix-compile-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/DETAILS
b/xorg-driver/xf86-video-intel/DETAILS
index 9e129cd..0c51187 100755
--- a/xorg-driver/xf86-video-intel/DETAILS
+++ b/xorg-driver/xf86-video-intel/DETAILS
@@ -8,11 +8,12 @@ if [[ "$XF86_VIDEO_INTEL_BRANCH" == "scm" ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
else
- VERSION=2.99.917
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/driver/$SOURCE
-
SOURCE_HASH=sha512:cbf4d46ad1ad5e5587c0f1f620ff534ef0645270517b60056b9f03e83d8216e2f456de46352a06c37c0c46963cc4ed20b71b815b20ec1bf680ff046e535f580f
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ COMMIT_ID=7e9e92c86b0fc4c848d164fe571798add5e1e36e
+ VERSION=2.99.917+$(cut -c 1-6 <<<$COMMIT_ID)
+ SOURCE=$SPELL-$VERSION.tar.xz
+
SOURCE_URL[0]=https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/$COMMIT_ID.tar.xz
+
SOURCE_HASH=sha512:c3cb91c9ce843fee4ba45c41fa2c69dae4d193ce778e0988ffb0ef3c77e4da40b8879cfc7333adb97084c179502cd4b5233181b5c825de619d839cc045181740
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$COMMIT_ID"
fi
LICENSE[0]=XCL
WEB_SITE=http://xorg.freedesktop.org/wiki
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index 35e32b8..da708e2 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,10 @@
+2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.99.917+7e9e92, switch to git snapshot to fix
build
+ * PRE_BUILD: no patching anymore, always on git
+ * 0001-fix-compile-error.patch: gone
+ * xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch: gone
+
+
2017-03-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Added mising FORCE_DOWNLOAD=on

diff --git a/xorg-driver/xf86-video-intel/PRE_BUILD
b/xorg-driver/xf86-video-intel/PRE_BUILD
index 959bd01..853c982 100755
--- a/xorg-driver/xf86-video-intel/PRE_BUILD
+++ b/xorg-driver/xf86-video-intel/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [[ "$XF86_VIDEO_INTEL_BRANCH" == "scm" ]]; then
+# While we are on git snapshot, always autogen.
+if true || [[ "$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}/0001-fix-compile-error.patch
fi
diff --git
a/xorg-driver/xf86-video-intel/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch

b/xorg-driver/xf86-video-intel/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
deleted file mode 100644
index ea3aa30..0000000
---
a/xorg-driver/xf86-video-intel/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris AT chris-wilson.co.uk>
-Date: Thu, 19 Mar 2015 23:14:17 +0000
-Subject: sna: Protect against ABI breakage in recent versions of libdrm
-
-Signed-off-by: Chris Wilson <chris AT chris-wilson.co.uk>
-
-diff --git a/src/sna/kgem.c b/src/sna/kgem.c
-index 11f0828..6f16cba 100644
---- a/src/sna/kgem.c
-+++ b/src/sna/kgem.c
-@@ -182,6 +182,15 @@ struct local_i915_gem_caching {
- #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE +
LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching)
- #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE +
LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching)
-
-+struct local_i915_gem_mmap {
-+ uint32_t handle;
-+ uint32_t pad;
-+ uint64_t offset;
-+ uint64_t size;
-+ uint64_t addr_ptr;
-+};
-+#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE +
DRM_I915_GEM_MMAP, struct local_i915_gem_mmap)
-+
- struct local_i915_gem_mmap2 {
- uint32_t handle;
- uint32_t pad;
-@@ -514,15 +523,15 @@ retry_wc:
-
- static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo)
- {
-- struct drm_i915_gem_mmap mmap_arg;
-+ struct local_i915_gem_mmap arg;
- int err;
-
- retry:
-- VG_CLEAR(mmap_arg);
-- mmap_arg.handle = bo->handle;
-- mmap_arg.offset = 0;
-- mmap_arg.size = bytes(bo);
-- if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) {
-+ VG_CLEAR(arg);
-+ arg.handle = bo->handle;
-+ arg.offset = 0;
-+ arg.size = bytes(bo);
-+ if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) {
- assert(err != EINVAL);
-
- if (__kgem_throttle_retire(kgem, 0))
-@@ -536,10 +545,10 @@ retry:
- return NULL;
- }
-
-- VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo)));
-+ VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo)));
-
- DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle));
-- return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr;
-+ return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr;
- }
-
- static int gem_write(int fd, uint32_t handle,
---
-cgit v0.10.2
-



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (b7e525d9a55d9d3f7580c4fc134f66b2ce968252), Thomas Orgis, 09/27/2017

Archive powered by MHonArc 2.6.24.

Top of Page