libtool: compile: x86_64-pc-linux-gnu-gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917/src/uxa -I../.. -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -fvisibility=hidden -I/usr/include/xorg -I/usr/include/X11/dri -I/usr/include/libdrm -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/libdrm -I/usr/include/libdrm -I/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917/xvmc -I/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917/src -I/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917/src/render_program -I/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917/xvmc -march=native -O2 -fno-ident -frecord-gcc-switches -pipe -Wall -Wpointer-sign -c /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917/src/uxa/intel_driver.c -fPIC -DPIC -o .libs/intel_driver.o /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917/src/uxa/intel_driver.c: In function ‘redisplay_dirty’: /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917/src/uxa/intel_driver.c:645:2: error: too many arguments to function ‘PixmapSyncDirtyHelper’ PixmapSyncDirtyHelper(dirty, &pixregion); ^ In file included from /usr/include/xorg/gc.h:54:0, from /usr/include/xorg/dix.h:51, from /usr/include/xorg/privates.h:151, from /usr/include/xorg/cursor.h:53, from /usr/include/xorg/scrnintstr.h:53, from /usr/include/xorg/xf86str.h:39, from /usr/include/xorg/xf86.h:44, from /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917/src/uxa/intel_driver.c:49: /usr/include/xorg/pixmap.h:131:1: note: declared here PixmapSyncDirtyHelper(PixmapDirtyUpdatePtr dirty); ^ Makefile:538: recipe for target 'intel_driver.lo' failed make[3]: *** [intel_driver.lo] Error 1
Created attachment 423732 [details, diff] xf86-video-intel_dirty_tracking_api.patch Bug is similar to https://bugs.freedesktop.org/show_bug.cgi?id=91284 and https://bugs.freedesktop.org/show_bug.cgi?id=91276
This patch does not work for me. That patch.out file does not exist, BTW. * Package: x11-drivers/xf86-video-intel-2.99.917-r2 * Repository: gentoo * Maintainer: x11@gentoo.org * USE: abi_x86_64 amd64 dri elibc_glibc kernel_linux sna udev userland_GNU uxa xvmc * FEATURES: preserve-libs sandbox userpriv usersandbox adding portage/patches/x11-drivers/xf86-video-intel-2.99.917-r2/dirty_tracking_api.patch searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 3 changes to 3 files * Determining the location of the kernel source code * Found kernel source directory: * /usr/src/linux * Found kernel object directory: * /lib/modules/4.4.0-tuxonice/build * Found sources for kernel version: * 4.4.0-tuxonice >>> Unpacking source... >>> Unpacking xf86-video-intel-2.99.917.tar.bz2 to /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work >>> Source unpacked in /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work * Applying user patches from /etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2 ... * dirty_tracking_api.patch ... * Failed Patch: dirty_tracking_api.patch ! * ( /etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2/dirty_tracking_api.patch ) * * Include in your bugreport the contents of: * * /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/temp/dirty_tracking_api.patch.out * ERROR: x11-drivers/xf86-video-intel-2.99.917-r2::gentoo failed (prepare phase): * Failed Patch: dirty_tracking_api.patch! * * Call stack: * ebuild.sh, line 133: Called pre_src_prepare * bashrc, line 13: Called epatch_user * environment, line 2069: Called epatch * environment, line 2042: Called die * The specific snippet of code: * die "Failed Patch: ${patchname}!"; * * If you need support, post the output of `emerge --info '=x11-drivers/xf86-video-intel-2.99.917-r2::gentoo'`, * the complete build log and the output of `emerge -pqv '=x11-drivers/xf86-video-intel-2.99.917-r2::gentoo'`. * The complete build log is located at '/var/log/portage/x11-drivers:xf86-video-intel-2.99.917-r2:20160124-005553.log'. * The ebuild environment file is located at '/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/temp/environment'. * Working directory: '/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917' * S: '/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917'
(In reply to David from comment #2) > This patch does not work for me. That patch.out file does not exist, BTW. > > * Package: x11-drivers/xf86-video-intel-2.99.917-r2 > * Repository: gentoo > * Maintainer: x11@gentoo.org > * USE: abi_x86_64 amd64 dri elibc_glibc kernel_linux sna udev > userland_GNU uxa xvmc > * FEATURES: preserve-libs sandbox userpriv usersandbox > adding > portage/patches/x11-drivers/xf86-video-intel-2.99.917-r2/dirty_tracking_api. > patch > searching for changes > remote: adding changesets > remote: adding manifests > remote: adding file changes > remote: added 1 changesets with 3 changes to 3 files > * Determining the location of the kernel source code > * Found kernel source directory: > * /usr/src/linux > * Found kernel object directory: > * /lib/modules/4.4.0-tuxonice/build > * Found sources for kernel version: > * 4.4.0-tuxonice > >>> Unpacking source... > >>> Unpacking xf86-video-intel-2.99.917.tar.bz2 to /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work > >>> Source unpacked in /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work > * Applying user patches from > /etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2 ... > * dirty_tracking_api.patch ... > > * Failed Patch: dirty_tracking_api.patch ! > * ( > /etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2/ > dirty_tracking_api.patch ) > * > * Include in your bugreport the contents of: > * > * > /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/temp/ > dirty_tracking_api.patch.out > > * ERROR: x11-drivers/xf86-video-intel-2.99.917-r2::gentoo failed (prepare > phase): > * Failed Patch: dirty_tracking_api.patch! > * > * Call stack: > * ebuild.sh, line 133: Called pre_src_prepare > * bashrc, line 13: Called epatch_user > * environment, line 2069: Called epatch > * environment, line 2042: Called die > * The specific snippet of code: > * die "Failed Patch: ${patchname}!"; > * > * If you need support, post the output of `emerge --info > '=x11-drivers/xf86-video-intel-2.99.917-r2::gentoo'`, > * the complete build log and the output of `emerge -pqv > '=x11-drivers/xf86-video-intel-2.99.917-r2::gentoo'`. > * The complete build log is located at > '/var/log/portage/x11-drivers:xf86-video-intel-2.99.917-r2:20160124-005553. > log'. > * The ebuild environment file is located at > '/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/temp/environment'. > * Working directory: > '/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video- > intel-2.99.917' > * S: > '/var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video- > intel-2.99.917' Strange. It works on my end on the exact same ebuild. Your log shows no patches applied at all, even the ones already included in ${FILESDIR}. On my end: * Applying xf86-video-intel-2.99.917-sna-udev-fstat.patch ... [ ok ] * Applying xf86-video-intel-2.99.917-uxa-udev-fstat.patch ... [ ok ] * Applying xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch ... [ ok ] * Applying user patches from /etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2 ... It could be that the patch is dependent on the other patches being applied. If you're sure you aren't using a custom ebuild that omits the other patches, try syncing portage and trying again.
I had the portage fail-clean feature enabled, which is why the patch.out file was non-existent. I synced portage and tried again. It still fails. Here's the patch.out file: ***** dirty_tracking_api.patch ***** PWD: /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917 PATCH TOOL: patch -> /usr/bin/patch VERSION INFO: GNU patch 2.7.5 Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc. Copyright (C) 1988 Larry Wall License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Written by Larry Wall and Paul Eggert ==================================== PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch --dry-run -f < '/etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2/dirty_tracking_api.patch' ==================================== checking file src/uxa/intel_driver.c Hunk #1 FAILED at 642. 1 out of 1 hunk FAILED patch program exited with status 1 ==================================== PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch --dry-run -f < '/etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2/dirty_tracking_api.patch' ==================================== can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- src/uxa/intel_driver.c.old 2016-01-23 18:42:03.936511482 -0500 |+++ src/uxa/intel_driver.c 2016-01-23 18:45:36.790883488 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1 ==================================== PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch --dry-run -f < '/etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2/dirty_tracking_api.patch' ==================================== can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- src/uxa/intel_driver.c.old 2016-01-23 18:42:03.936511482 -0500 |+++ src/uxa/intel_driver.c 2016-01-23 18:45:36.790883488 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1 ==================================== PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch --dry-run -f < '/etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2/dirty_tracking_api.patch' ==================================== can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- src/uxa/intel_driver.c.old 2016-01-23 18:42:03.936511482 -0500 |+++ src/uxa/intel_driver.c 2016-01-23 18:45:36.790883488 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1 ==================================== PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch --dry-run -f < '/etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2/dirty_tracking_api.patch' ==================================== can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- src/uxa/intel_driver.c.old 2016-01-23 18:42:03.936511482 -0500 |+++ src/uxa/intel_driver.c 2016-01-23 18:45:36.790883488 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1
Here's a snippet from the last build log showing the application of the patches in ${FILESDIR}: >>> Preparing source in /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917 ... * Applying xf86-video-intel-2.99.917-sna-udev-fstat.patch ... [ ok ] * Applying xf86-video-intel-2.99.917-uxa-udev-fstat.patch ... [ ok ] * Applying xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch ... [ ok ] * Applying user patches from /etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2 ... * dirty_tracking_api.patch ... * Failed Patch: dirty_tracking_api.patch ! * ( /etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2/dirty_tracking_api.patch ) *
(In reply to David from comment #5) > Here's a snippet from the last build log showing the application of the > patches in ${FILESDIR}: > > >>> Preparing source in /var/tmp/portage/x11-drivers/xf86-video-intel-2.99.917-r2/work/xf86-video-intel-2.99.917 ... > * Applying xf86-video-intel-2.99.917-sna-udev-fstat.patch ... > [ ok ] > * Applying xf86-video-intel-2.99.917-uxa-udev-fstat.patch ... > [ ok ] > * Applying xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch ... > [ ok ] > * Applying user patches from > /etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2 ... > * dirty_tracking_api.patch ... > > * Failed Patch: dirty_tracking_api.patch ! > * ( > /etc/portage/patches//x11-drivers/xf86-video-intel-2.99.917-r2/ > dirty_tracking_api.patch ) > * I don't know why it's working for me but failing for you. I synced portage from git again just to see if I was was missing something and it still built fine. All I can suggest is that if you can read diff patches and know how to use diff to make a patch, take a look at what the patch does, apply the same changes after the "prepare" phase, and diff to make your own patch. Either way, I'll upload my "emerge --info".
Created attachment 423736 [details] emerge --info
(In reply to Peter Levine from comment #1) > Created attachment 423732 [details, diff] [details, diff] > xf86-video-intel_dirty_tracking_api.patch > > Bug is similar to https://bugs.freedesktop.org/show_bug.cgi?id=91284 and > https://bugs.freedesktop.org/show_bug.cgi?id=91276 This worked for me by simply copying the patch to /etc/portage/patches/x11-drivers/xf86-video-intel/
Patch worked fine here.
*** Bug 572760 has been marked as a duplicate of this bug. ***
commit ad81f74c5668f567ff61232b087bdc3034c8bc49 Author: Manuel Rüger <mrueg@gentoo.org> Date: Sun Jan 24 21:48:21 2016 +0100 x11-drivers/xf86-video-intel: Add new snapshot to support xorg-server-1.18 Gentoo-Bug: 568200 Gentoo-Bug: 572700 Package-Manager: portage-2.2.27
*** Bug 572874 has been marked as a duplicate of this bug. ***
