diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-10-01 21:50:30 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-10-01 21:50:42 +0200 |
| commit | c968ab2e1a5b456d92461f7a471d750602552cf3 (patch) | |
| tree | 1cd5399869347c0d5edd975dec0590cf2ad9a0c7 | |
| parent | ff8ba82d4284289449850016ef2e094ea3dfeb26 (diff) | |
| download | ptxdist-c968ab2e1a5b456d92461f7a471d750602552cf3.tar.gz ptxdist-c968ab2e1a5b456d92461f7a471d750602552cf3.tar.xz | |
xorg-driver-video-intel: version bump 2.21.15 -> 2.99.917-892-gc6cb1b199598
Use the latest git version. There has been no release for several years and
the latest release fails to build with the current xorg-server version.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
5 files changed, 13 insertions, 54 deletions
diff --git a/patches/xf86-video-intel-2.21.15/0001-fix-building-with-newer-glibc.patch b/patches/xf86-video-intel-2.21.15/0001-fix-building-with-newer-glibc.patch deleted file mode 100644 index 933df60ba..000000000 --- a/patches/xf86-video-intel-2.21.15/0001-fix-building-with-newer-glibc.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Thu, 5 Feb 2015 17:06:35 +0100 -Subject: [PATCH] fix building with newer glibc - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/intel_device.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/intel_device.c b/src/intel_device.c -index d9ff8bccfd6d..94f8cc69d80b 100644 ---- a/src/intel_device.c -+++ b/src/intel_device.c -@@ -34,6 +34,8 @@ - #include <sys/ioctl.h> - - #include <pciaccess.h> -+ -+#include <xorg-server.h> - #include <xf86.h> - #include <xf86drm.h> - #include <xf86drmMode.h> diff --git a/patches/xf86-video-intel-2.21.15/0002-fix-building-with-latest-udev.patch b/patches/xf86-video-intel-2.21.15/0002-fix-building-with-latest-udev.patch deleted file mode 100644 index ec7d5348b..000000000 --- a/patches/xf86-video-intel-2.21.15/0002-fix-building-with-latest-udev.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 29 May 2015 13:39:27 +0200 -Subject: [PATCH] fix building with latest udev - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/uxa/intel_driver.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c -index 675408da6a8f..6940b1055404 100644 ---- a/src/uxa/intel_driver.c -+++ b/src/uxa/intel_driver.c -@@ -44,6 +44,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - #include <stdlib.h> - #include <stdio.h> - #include <errno.h> -+#include <sys/stat.h> - - #include "xf86.h" - #include "xf86_OSproc.h" diff --git a/patches/xf86-video-intel-2.21.15/series b/patches/xf86-video-intel-2.21.15/series deleted file mode 100644 index 86b39665a..000000000 --- a/patches/xf86-video-intel-2.21.15/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-fix-building-with-newer-glibc.patch -0002-fix-building-with-latest-udev.patch -# 1814a941f373d7b79a1de5fe294db757 - git-ptx-patches magic diff --git a/patches/xf86-video-intel-2.99.917-892-gc6cb1b199598/autogen.sh b/patches/xf86-video-intel-2.99.917-892-gc6cb1b199598/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/xf86-video-intel-2.99.917-892-gc6cb1b199598/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/rules/xorg-driver-video-intel.make b/rules/xorg-driver-video-intel.make index 7cfcad314..9f03102b1 100644 --- a/rules/xorg-driver-video-intel.make +++ b/rules/xorg-driver-video-intel.make @@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_XORG_DRIVER_VIDEO_INTEL) += xorg-driver-v # # Paths and names # -XORG_DRIVER_VIDEO_INTEL_VERSION := 2.21.15 -XORG_DRIVER_VIDEO_INTEL_MD5 := 8b646d257ace8197d6ab4e5ddeb8efb2 +XORG_DRIVER_VIDEO_INTEL_VERSION := 2.99.917-892-gc6cb1b199598 +XORG_DRIVER_VIDEO_INTEL_MD5 := 671973850a065968455910e904704fec XORG_DRIVER_VIDEO_INTEL := xf86-video-intel-$(XORG_DRIVER_VIDEO_INTEL_VERSION) XORG_DRIVER_VIDEO_INTEL_SUFFIX := tar.bz2 -XORG_DRIVER_VIDEO_INTEL_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_VIDEO_INTEL).$(XORG_DRIVER_VIDEO_INTEL_SUFFIX)) +XORG_DRIVER_VIDEO_INTEL_URL := https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/$(XORG_DRIVER_VIDEO_INTEL_VERSION)/$(XORG_DRIVER_VIDEO_INTEL).$(XORG_DRIVER_VIDEO_INTEL_SUFFIX) XORG_DRIVER_VIDEO_INTEL_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_INTEL).$(XORG_DRIVER_VIDEO_INTEL_SUFFIX) XORG_DRIVER_VIDEO_INTEL_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_INTEL) @@ -34,21 +34,27 @@ XORG_DRIVER_VIDEO_INTEL_CONF_TOOL := autoconf XORG_DRIVER_VIDEO_INTEL_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ + --disable-backlight \ + --disable-backlight-helper \ --disable-gen4asm \ --enable-udev \ + --disable-tools \ --$(call ptx/endis, PTXCONF_XORG_DRIVER_VIDEO_INTEL_DRI)-dri \ + --$(call ptx/endis, PTXCONF_XORG_DRIVER_VIDEO_INTEL_DRI)-dri1 \ + --$(call ptx/endis, PTXCONF_XORG_DRIVER_VIDEO_INTEL_DRI)-dri2 \ + --$(call ptx/endis, PTXCONF_XORG_DRIVER_VIDEO_INTEL_DRI)-dri3 \ --$(call ptx/endis, PTXCONF_XORG_DRIVER_VIDEO_INTEL_XVMC)-xvmc \ + --enable-kms \ + --disable-ums \ --enable-kms-only \ --disable-ums-only \ --disable-sna \ --enable-uxa \ - --disable-glamor \ --disable-xaa \ --disable-dga \ + --disable-tear-free \ --disable-create2 \ - --disable-userptr \ --disable-async-swap \ - --disable-wt \ --disable-debug \ --disable-valgrind |