From 7520c031806e13dcfcbc42c003e2ce3e87f5b84c Mon Sep 17 00:00:00 2001 From: piotrasd Date: Wed, 11 Jan 2017 19:24:53 +0000 Subject: [PATCH 1/3] xorg-server: add patch to match pci ids with mesa this patch match pci ids with latest mesa 13.0.3 --- ...xorg-server-1.19.0-sync_pci_ids_mesa.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 packages/x11/xserver/xorg-server/patches/xorg-server-1.19.0-sync_pci_ids_mesa.patch diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.19.0-sync_pci_ids_mesa.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.19.0-sync_pci_ids_mesa.patch new file mode 100644 index 0000000000..aa66790677 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/xorg-server-1.19.0-sync_pci_ids_mesa.patch @@ -0,0 +1,52 @@ +--- xorg-server-1.19.0/hw/xfree86/dri2/pci_ids/i965_pci_ids.h 2016-12-14 20:12:19.000000000 +0100 ++++ xorg-server-1.19.0/hw/xfree86/dri2/pci_ids/i965_pci_ids.h 2017-01-11 19:57:24.280070208 +0100 +@@ -109,6 +109,10 @@ + CHIPSET(0x162B, bdw_gt3, "Intel(R) Iris 6100 (Broadwell GT3)") + CHIPSET(0x162D, bdw_gt3, "Intel(R) Broadwell GT3") + CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3") ++CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherrytrail)") ++CHIPSET(0x22B1, chv, "Intel(R) HD Graphics XXX (Braswell)") /* Overridden in brw_get_renderer_string */ ++CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)") ++CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)") + CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)") + CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)") + CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1") +@@ -134,6 +138,11 @@ + CHIPSET(0x193A, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)") + CHIPSET(0x193B, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)") + CHIPSET(0x193D, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)") ++CHIPSET(0x0A84, bxt, "Intel(R) HD Graphics (Broxton)") ++CHIPSET(0x1A84, bxt, "Intel(R) HD Graphics (Broxton)") ++CHIPSET(0x1A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)") ++CHIPSET(0x5A84, bxt, "Intel(R) HD Graphics 505 (Broxton)") ++CHIPSET(0x5A85, bxt_2x6, "Intel(R) HD Graphics 500 (Broxton 2x6)") + CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1") + CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1") + CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1") +@@ -144,22 +153,15 @@ + CHIPSET(0x5915, kbl_gt1_5, "Intel(R) Kabylake GT1.5") + CHIPSET(0x5917, kbl_gt1_5, "Intel(R) Kabylake GT1.5") + CHIPSET(0x5912, kbl_gt2, "Intel(R) Kabylake GT2") +-CHIPSET(0x5916, kbl_gt2, "Intel(R) Kabylake GT2") ++CHIPSET(0x5916, kbl_gt2, "Intel(R) HD Graphics 620 (Kabylake GT2)") + CHIPSET(0x591A, kbl_gt2, "Intel(R) Kabylake GT2") + CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2") + CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2") +-CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2") ++CHIPSET(0x591E, kbl_gt2, "Intel(R) HD Graphics 615 (Kabylake GT2)") + CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F") + CHIPSET(0x5923, kbl_gt3, "Intel(R) Kabylake GT3") + CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3") + CHIPSET(0x5927, kbl_gt3, "Intel(R) Kabylake GT3") + CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4") +-CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherrytrail)") +-CHIPSET(0x22B1, chv, "Intel(R) HD Graphics XXX (Braswell)") /* Overridden in brw_get_renderer_string */ +-CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)") +-CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)") +-CHIPSET(0x0A84, bxt, "Intel(R) HD Graphics (Broxton)") +-CHIPSET(0x1A84, bxt, "Intel(R) HD Graphics (Broxton)") +-CHIPSET(0x1A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)") +-CHIPSET(0x5A84, bxt, "Intel(R) HD Graphics (Broxton)") +-CHIPSET(0x5A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)") ++CHIPSET(0x3184, glk, "Intel(R) HD Graphics (Geminilake)") ++CHIPSET(0x3185, glk_2x6, "Intel(R) HD Graphics (Geminilake 2x6)") From 9cf29498fb10b0aa02144121c2d20388f8ce0774 Mon Sep 17 00:00:00 2001 From: piotrasd Date: Thu, 12 Jan 2017 15:37:32 +0000 Subject: [PATCH 2/3] xorg-server: update to 1.19.1 --- packages/x11/xserver/xorg-server/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index 9bc06e7821..a296babe96 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xorg-server" -PKG_VERSION="1.19.0" +PKG_VERSION="1.19.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 5cb7c1ffa1c4b4e4333854de1de584820966857b Mon Sep 17 00:00:00 2001 From: piotrasd Date: Thu, 12 Jan 2017 15:45:53 +0000 Subject: [PATCH 3/3] xorg-server: clean up build script clean up "WARNING: unrecognized options: --disable-install-libxf86config, --enable-aiglx, --enable-glx-tls" --- packages/x11/xserver/xorg-server/package.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index a296babe96..fd8e56f9e0 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -54,10 +54,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ --enable-visibility \ --disable-unit-tests \ --disable-sparkle \ - --disable-install-libxf86config \ --disable-xselinux \ - --enable-aiglx \ - --enable-glx-tls \ $XORG_COMPOSITE \ --enable-mitshm \ --disable-xres \