sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (0050307cb2cb01ab8f244eac95e00758c33a8ea1)
- 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 (0050307cb2cb01ab8f244eac95e00758c33a8ea1)
- Date: Wed, 9 Sep 2015 17:50:40 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
graphics-libs/libva-intel-driver/DETAILS
| 4
graphics-libs/libva-intel-driver/HISTORY
| 3
kernels/lirc/BUILD
| 5
kernels/lirc/CONFIGURE
| 17 -
kernels/lirc/HISTORY
| 3
kernels/lirc/drivers
| 107 ----------
xorg-driver/xf86-video-intel/CONFIGURE
| 5
xorg-driver/xf86-video-intel/DEPENDS
| 7
xorg-driver/xf86-video-intel/DETAILS
| 8
xorg-driver/xf86-video-intel/HISTORY
| 8
xorg-driver/xf86-video-intel/PREPARE
| 2
xorg-driver/xf86-video-intel/PRE_BUILD
| 7
xorg-driver/xf86-video-intel/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
| 65 ++++++
13 files changed, 108 insertions(+), 133 deletions(-)
New commits:
commit 0050307cb2cb01ab8f244eac95e00758c33a8ea1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics-libs/libva-intel-driver: version 1.6.0
commit dc0ac2838a989dc49422877dffd4a201c6268e78
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 nullpointer dereference on broadwell-u
commit e05d9f894753721ac78441e9b6e81a73f4ae3736
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: add option for activating dri3
commit 340002a5c22fff535087003db4b92412ffb22436
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
kernels/lirc: remove obsolete configuration option
commit e50cf27113888de48e0789b362ade00eb670c780
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: add option to build scm version
diff --git a/graphics-libs/libva-intel-driver/DETAILS
b/graphics-libs/libva-intel-driver/DETAILS
index 62f2bd9..b2345c4 100755
--- a/graphics-libs/libva-intel-driver/DETAILS
+++ b/graphics-libs/libva-intel-driver/DETAILS
@@ -1,8 +1,8 @@
SPELL=libva-intel-driver
- VERSION=1.5.1
+ VERSION=1.6.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://www.freedesktop.org/software/vaapi/releases/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:cb1298ffffbf43a42fca3a030ed2baecdb30468c8d2a8b1e5f2bb2849c3ce9956cb21a5da0a6482a2fba1b8a09358363237f8325e48d184e4ad49557546e7e25
+
SOURCE_HASH=sha512:8920d6a53bc13df519facdc3e8f2546ac2d27d7f512219f9f949c93563ff637af0abdb7487a26209b79d23db990ecbc4ba6b14f15d4fc0f65f264699509b9b74
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://cgit.freedesktop.org/vaapi/intel-driver";
LICENSE[0]=MIT
diff --git a/graphics-libs/libva-intel-driver/HISTORY
b/graphics-libs/libva-intel-driver/HISTORY
index f90d2ca..1c67367 100644
--- a/graphics-libs/libva-intel-driver/HISTORY
+++ b/graphics-libs/libva-intel-driver/HISTORY
@@ -1,3 +1,6 @@
+2015-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.0
+
2015-03-22 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 1.5.1
* PRE_BUILD: still needed, what a disappointment
diff --git a/kernels/lirc/BUILD b/kernels/lirc/BUILD
index a7a91e7..c0616d0 100755
--- a/kernels/lirc/BUILD
+++ b/kernels/lirc/BUILD
@@ -1,8 +1,3 @@
# Remove their CFLAGS, but make sure only literal CFLAGS definition is gone.
sedit 's|^CFLAGS="[^$]*"$|#\0|g' configure &&
-if [[ "$LIRC_ALL" == y ]]; then
- OPTS="$OPTS --with-driver=all"
-else
- OPTS="$OPTS --with-driver=$LIRC_DRIVER"
-fi &&
default_build
diff --git a/kernels/lirc/CONFIGURE b/kernels/lirc/CONFIGURE
deleted file mode 100755
index 753185c..0000000
--- a/kernels/lirc/CONFIGURE
+++ /dev/null
@@ -1,17 +0,0 @@
-config_query LIRC_ALL "Compile all drivers instead of selecting from list
(some may well not build)?" n &&
-if [[ "$LIRC_ALL" == n ]]; then
- local drivers=$(<"$SCRIPT_DIRECTORY/drivers") &&
- while true
- do
- message "${MESSAGE_COLOR}So, choose some drivers from this
list:$DEFAULT_COLOR" &&
- message $drivers &&
- config_query_string LIRC_DRIVER "Your selection of _one_ entry:" serial
&&
- if list_find "$drivers" "$LIRC_DRIVER"; then
- message "${MESSAGE_COLOR}OK, seems to be one of the
options...$DEFAULT_COLOR"
- break
- else
- message "${MESSAGE_COLOR}Hey, please select something from the
list!$DEFAULT_COLOR"
- persistent_remove LIRC_DRIVER
- fi
- done
-fi
diff --git a/kernels/lirc/HISTORY b/kernels/lirc/HISTORY
index 01e5338..656516d 100644
--- a/kernels/lirc/HISTORY
+++ b/kernels/lirc/HISTORY
@@ -1,3 +1,6 @@
+2015-09-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, drivers: remove obsolete configuration option
+
2015-06-06 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.9.2a
* DEPENDS: depends on Python 3 to build
diff --git a/kernels/lirc/drivers b/kernels/lirc/drivers
deleted file mode 100644
index 59e642a..0000000
--- a/kernels/lirc/drivers
+++ /dev/null
@@ -1,107 +0,0 @@
-all
-none
-userspace
-accent
-act200l
-act220l
-adaptec
-alsa_usb
-animax
-asusdh
-atilibusb
-atiusb
-atwf83
-audio
-audio_alsa
-avermedia
-avermedia_vdomate
-avermedia98
-awlibusb
-bestbuy
-bestbuy2
-breakoutbox
-bte
-bw6130
-caraca
-chronos
-commandir
-comX
-cph06x
-creative
-creative_infracd
-devinput
-dfclibusb
-digimatrix
-dsp
-dvico
-ea65
-exaudio
-flyvideo
-ftdi
-gvbctv5pci
-hauppauge
-hauppauge_dvb
-hercules_smarttv_stereo
-i2cuser
-igorplugusb
-iguanaIR
-imon
-imon_24g
-imon_knob
-imon_lcd
-imon_pad
-imon_rsc
-irdeo
-irdeo_remote
-irlink
-irman
-irreal
-knc_one
-kworld
-leadtek_0007
-leadtek_0010
-leadtek_pvr2000
-livedrive_midi
-livedrive_seq
-logitech
-lptX
-macmini
-mediafocusI
-mouseremote
-mouseremote_ps2
-mp3anywhere
-mplay
-nslu2
-packard_bell
-parallel
-pcmak
-pcmak_usb
-pctv
-pixelview_bt878
-pixelview_pak
-pixelview_pro
-provideo
-realmagic
-remotemaster
-sa1100
-samsung
-sasem
-sb0540
-serial
-silitek
-sir
-slinke
-srm7500libusb
-tekram
-tekram_bt829
-tira
-tira_raw
-ttusbir
-tuxbox
-tvbox
-udp
-uirt2
-uirt2_raw
-usb_uirt_raw
-usbx
-wpc8769l
diff --git a/xorg-driver/xf86-video-intel/CONFIGURE
b/xorg-driver/xf86-video-intel/CONFIGURE
index 049a831..7b28f9d 100755
--- a/xorg-driver/xf86-video-intel/CONFIGURE
+++ b/xorg-driver/xf86-video-intel/CONFIGURE
@@ -4,4 +4,7 @@ config_query_option XF86_VIDEO_INTEL_OPTS "Assume only KMS
support?" n \
config_query_option XF86_VIDEO_INTEL_OPTS "Assume only UMS (no KMS)
support?" n \
"--enable-ums-only" \
- "--disable-ums-only"
+ "--disable-ums-only" &&
+config_query_option XF86_VIDEO_INTEL_OPTS "Enable DRI3?" n \
+ "--enable-dri3" \
+ "--disable-dri3"
diff --git a/xorg-driver/xf86-video-intel/DEPENDS
b/xorg-driver/xf86-video-intel/DEPENDS
index 1807f89..ba4ff3d 100755
--- a/xorg-driver/xf86-video-intel/DEPENDS
+++ b/xorg-driver/xf86-video-intel/DEPENDS
@@ -34,4 +34,9 @@ fi &&
optional_depends DEVICE-MANAGER \
"--enable-udev" \
"--disable-udev" \
- "for udev-based monitor hotplug detection support"
+ "for udev-based monitor hotplug detection support" &&
+
+if [[ "$XF86_VIDEO_INTEL_BRANCH" == "scm" ]]; then
+ depends autoconf &&
+ depends automake
+fi
diff --git a/xorg-driver/xf86-video-intel/DETAILS
b/xorg-driver/xf86-video-intel/DETAILS
index 50a94b9..ef6ffc0 100755
--- a/xorg-driver/xf86-video-intel/DETAILS
+++ b/xorg-driver/xf86-video-intel/DETAILS
@@ -1,9 +1,17 @@
SPELL=xf86-video-intel
+if [[ "$XF86_VIDEO_INTEL_BRANCH" == "scm" ]]; then
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
+ 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"
+fi
LICENSE[0]=XCL
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20070922
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index 0302373..3497251 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,11 @@
+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
+ nullpointer dereference on broadwell-u
+
+2015-09-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS, PREPARE, PRE_BUILD: add option to build scm
version
+
2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: bump to 2.99.917 (fixes build with recent changes)
diff --git a/xorg-driver/xf86-video-intel/PREPARE
b/xorg-driver/xf86-video-intel/PREPARE
new file mode 100755
index 0000000..53a4552
--- /dev/null
+++ b/xorg-driver/xf86-video-intel/PREPARE
@@ -0,0 +1,2 @@
+. "$GRIMOIRE"/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/xorg-driver/xf86-video-intel/PRE_BUILD
b/xorg-driver/xf86-video-intel/PRE_BUILD
new file mode 100755
index 0000000..c632827
--- /dev/null
+++ b/xorg-driver/xf86-video-intel/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+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
+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
new file mode 100644
index 0000000..ea3aa30
--- /dev/null
+++
b/xorg-driver/xf86-video-intel/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
@@ -0,0 +1,65 @@
+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 Florian Franzmann (0050307cb2cb01ab8f244eac95e00758c33a8ea1), Florian Franzmann, 09/10/2015
Archive powered by MHonArc 2.6.24.