diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-driver')
15 files changed, 50 insertions, 279 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb deleted file mode 100644 index 1896fff9f9..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- keyboard input driver" - -DESCRIPTION = "keyboard is an Xorg input driver for keyboards. The \ -driver supports the standard OS-provided keyboard interface. The driver \ -functions as a keyboard input device, and may be used as the X server's \ -core keyboard." - -LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10" - -SRC_URI[md5sum] = "a3a3f0dd32361dcdbd406e894dafe090" -SRC_URI[sha256sum] = "f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.28.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.28.2.bb deleted file mode 100644 index 19123e06c9..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.28.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "Generic input driver for the X.Org server based on libinput" -LIC_FILES_CHKSUM = "file://COPYING;md5=5e6b20ea2ef94a998145f0ea3f788ee0" - -DEPENDS += "libinput" - -SRC_URI[md5sum] = "b7548bc1d7e82d189205794ff86307af" -SRC_URI[sha256sum] = "b8b346962c6b62b8069928c29c0db83b6f544863bf2fc6830f324de841de2820" - -FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.4.0.bb new file mode 100644 index 0000000000..92272c3f2a --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.4.0.bb @@ -0,0 +1,12 @@ +require xorg-driver-input.inc + +SUMMARY = "Generic input driver for the X.Org server based on libinput" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=a22925127bd3c827c384cedd23ed2309" + +DEPENDS += "libinput" + +XORG_DRIVER_COMPRESSOR = ".tar.xz" +SRC_URI[sha256sum] = "3a3d14cd895dc75b59ae2783b888031956a0bac7a1eff16d240dbb9d5df3e398" + +FILES:${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.3.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.5.bb index c38dab505b..92e54d9701 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.3.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.5.bb @@ -8,7 +8,7 @@ functions as a pointer input device, and may be used as the X server's \ core pointer. Multiple mice are supported by multiple instances of this \ driver." -LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510" +LIC_FILES_CHKSUM = "file://COPYING;md5=d213a69053dffe9bcab94abf60013d33" -SRC_URI[md5sum] = "a2104693bbcfe1413397f7905eecd3dc" -SRC_URI[sha256sum] = "93ecb350604d05be98b7d4e5db3b8155a44890069a7d8d6b800c0bea79c85cc5" +SRC_URI[sha256sum] = "4fde8ae9b44352e2a208584c36528ee3ed13cf5fe4417208a9785daccefd9968" +XORG_DRIVER_COMPRESSOR = ".tar.xz" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.2.bb index dc31890f69..8e446290b2 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.2.bb @@ -10,7 +10,8 @@ advanced features of the touchpad to become available." LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" -SRC_URI[md5sum] = "cfb79d3c975151f9bbf30b727c260cb9" -SRC_URI[sha256sum] = "7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576" +SRC_URI[sha256sum] = "b8fa4aab913fc63754bbd6439e020658c412743a055201ddf212760593962c38" DEPENDS += "libxi mtdev libxtst libevdev" + +XORG_DRIVER_COMPRESSOR = ".tar.xz" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.2.0.bb index 92a1b25ebe..7567b1ef2b 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.2.0.bb @@ -6,16 +6,17 @@ protocol that is provided by VMware virtual machines to give absolute \ pointer positioning. The vmmouse driver is capable of falling back to the \ standard 'mouse' driver if a VMware virtual machine is not detected." -SRC_URI[md5sum] = "85e2e464b7219c495ad3a16465c226ed" -SRC_URI[sha256sum] = "0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319" +XORG_DRIVER_COMPRESSOR = ".tar.xz" -RDEPENDS_${PN} += "xf86-input-mouse" +SRC_URI[sha256sum] = "56f077580ab8f02e2f40358c5c46b0ae3e1828fc77744526b24adf1ceea339b8" + +RDEPENDS:${PN} += "xf86-input-mouse" LIC_FILES_CHKSUM = "file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -do_install_append () { +do_install:append () { # We don't care about hal rm -rf ${D}${datadir}/hal/ rm -rf ${D}${libdir}/hal/ @@ -23,4 +24,4 @@ do_install_append () { EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" -FILES_${PN} += "${datadir}/X11/xorg.conf.d" +FILES:${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.6.0.bb index c498477604..32eb8a4816 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.6.0.bb @@ -7,7 +7,8 @@ the driver is still useful." LIC_FILES_CHKSUM = "file://COPYING;md5=6ddc7ca860dc5fd014e7f160ea699295" -SRC_URI[md5sum] = "7d7dfd4cdc42aa8b6e923510fa00ad2b" -SRC_URI[sha256sum] = "edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab" +SRC_URI[sha256sum] = "0ef3fa0083de3d9a040f11b3af38598d8405f1165b908fdd6712c30038326401" DEPENDS += "libpciaccess" + +XORG_DRIVER_COMPRESSOR = ".tar.xz" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch deleted file mode 100644 index 52916f8b4a..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 6 Mar 2018 12:07:46 -0500 -Subject: [PATCH] Fix build on i686 - -Presumably this only matters for i686 because amd64 implies sse2, but: - -BUILDSTDERR: In file included from gen4_vertex.c:34: -BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex': -BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch -BUILDSTDERR: static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y) -BUILDSTDERR: ^~~~~~~~~~~~~~ -BUILDSTDERR: gen4_vertex.c:308:25: note: called from here -BUILDSTDERR: #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */ -BUILDSTDERR: ^~~~~~~~~~~~~~~~~~~~~~~~ -BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX' -BUILDSTDERR: OUT_VERTEX(dstX, dstY); -BUILDSTDERR: ^~~~~~~~~~ - -The bug here appears to be that emit_vertex() is declared 'sse2' but -vertex_emit_2s is merely always_inline. gcc8 decides that since you said -always_inline you need to have explicitly cloned it for every -permutation of targets. Merely saying inline seems to do the job of -cloning vertex_emit_2s as much as necessary. - -So to reiterate: if you say always-inline, it won't, but if you just say -maybe inline, it will. Thanks gcc, that's helpful. - -- ajax - -Patch taken from Fedora. - -Upstream-Status: Pending -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> - ---- - src/sna/compiler.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sna/compiler.h b/src/sna/compiler.h -index 3c176a16..bc447c7a 100644 ---- a/src/sna/compiler.h -+++ b/src/sna/compiler.h -@@ -32,7 +32,7 @@ - #define likely(expr) (__builtin_expect (!!(expr), 1)) - #define unlikely(expr) (__builtin_expect (!!(expr), 0)) - #define noinline __attribute__((noinline)) --#define force_inline inline __attribute__((always_inline)) -+#define force_inline inline - #define fastcall __attribute__((regparm(3))) - #define must_check __attribute__((warn_unused_result)) - #define constant __attribute__((const)) --- -2.16.2 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb index bf9009bda0..0a42bd9975 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb @@ -9,34 +9,29 @@ Infrastructure (DRI)." LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" -SRCREV = "33ee0c3b21ea279e08d0863fcb2e874f0974b00e" -PV = "2.99.917+git${SRCPV}" +SRCREV = "31486f40f8e8f8923ca0799aea84b58799754564" +PV = "2.99.917+git" S = "${WORKDIR}/git" -SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \ - " - -SRC_URI_append_qemux86 = "file://01_Fix-build-on-i686.patch" +SRC_URI = "git://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git;protocol=https;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" -DEPENDS += "virtual/libx11 drm libpciaccess pixman" +DEPENDS += "virtual/libx11 drm libpciaccess pixman cairo libpng libxcb libxcomposite libxdamage libxrender libxrandr libxext libxfixes" -PACKAGECONFIG ??= "sna xvmc uxa udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 dri3', '', d)}" +PACKAGECONFIG ??= "sna xvmc uxa udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri2 dri3', '', d)}" -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri" -PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1" PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2" PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3" PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa" PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc xcb-util" -PACKAGECONFIG[tools] = "--enable-tools,--disable-tools,libxinerama libxrandr libxdamage libxfixes libxcursor libxtst libxrender libxscrnsaver libxext libx11 pixman libxcb libxshmfence" +PACKAGECONFIG[tools] = "--enable-tools,--disable-tools,libxinerama libxcursor libxtst libxscrnsaver libxshmfence" # --enable-kms-only option is required by ROOTLESS_X EXTRA_OECONF += '${@oe.utils.conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -FILES_${PN} += "${datadir}/polkit-1" +FILES:${PN} += "${datadir}/polkit-1" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch deleted file mode 100644 index 9e01770667..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/0001-Refuse-to-run-on-UEFI-machines.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2645e0aa9c17c2c966a0533e52ad00510311483e Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 29 Aug 2018 11:04:23 -0400 -Subject: [PATCH] Refuse to run on UEFI machines - -No possible good can come of this. - -v2: Check for .../efi-framebuffer.0 ("is there an EFI framebuffer") -instead of /sys/firmware/efi ("is this an EFI machine"). Suggested by -Peter Jones. - -Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa] - -Reviewed-by: Peter Jones <pjones@redhat.com> -Signed-off-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> ---- - src/vesa.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/vesa.c b/src/vesa.c -index 9b65b9b..af750e2 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -43,7 +43,7 @@ - #endif - - #include <string.h> -- -+#include <unistd.h> - #include "vesa.h" - - /* All drivers initialising the SW cursor need this */ -@@ -450,7 +450,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, - intptr_t match_data) - { - ScrnInfoPtr pScrn; -- -+ -+#ifdef __linux__ -+ if (access("/sys/devices/platform/efi-framebuffer.0", F_OK) == 0) { -+ ErrorF("vesa: Refusing to run on UEFI\n"); -+ return FALSE; -+ } -+#endif -+ - pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, - NULL, NULL, NULL, NULL, NULL); - if (pScrn != NULL) { --- -2.20.1 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.6.0.bb index f6aa54456c..33c2035f6b 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.6.0.bb @@ -13,11 +13,8 @@ DEPENDS += "virtual/libx11 xorgproto libpciaccess" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" +RRECOMMENDS:${PN} += "xserver-xorg-module-libint10" -SRC_URI[md5sum] = "8134201beaf6f77150c7809c3cc802e6" -SRC_URI[sha256sum] = "bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c" +XORG_DRIVER_COMPRESSOR = ".tar.xz" +SRC_URI[sha256sum] = "10082771b1a8f659c60b3d9b70456a4b59948a75b3cade2dfa33b8b05e549bb1" -SRC_URI += " \ - file://0001-Refuse-to-run-on-UEFI-machines.patch \ - " diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch deleted file mode 100644 index 5bda720ce5..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch +++ /dev/null @@ -1,103 +0,0 @@ -From da6612659a279bcb02f70622b53a3894fbc11052 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Fri, 9 Dec 2016 14:35:45 +0200 -Subject: [PATCH] Add option for vmwgfx - -Upstream-Status:Submitted - -Signed-off-by: Ross Burton <ross.burton@intel.com> -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.ac | 51 +++++++++++++++++++++------------------------------ - 1 file changed, 21 insertions(+), 30 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9f259ce..f3fec57 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client, - [VMWARECTRL=$enableval], [VMWARECTRL=no]) - AM_CONDITIONAL(BUILD_VMWARECTRL, [test "x$VMWARECTRL" = xyes]) - -+# Define a configure option to build the vmwgfx driver -+AC_ARG_ENABLE(vmwgfx, -+ AS_HELP_STRING([--disable-vmwgfx], -+ [Disable vmwgfx driver (KMS/3D) (default: enabled)]), -+ [VMWGFX="$enableval"], [VMWGFX="yes"]) -+AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes) -+ - # Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) -@@ -85,11 +92,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99], - [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1, - [Has version 1.5.0 or greater of the Xserver])]) - --PKG_CHECK_EXISTS([xorg-server >= 1.7.0], -- [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1, -- [Has version 1.7.0 or greater of the Xserver]) -- BUILD_VMWGFX=yes],[BUILD_VMWGFX=no]) -- - PKG_CHECK_EXISTS([xorg-server >= 1.12.0], - [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1, - [Has version 1.12.0 or greater of the Xserver])]) -@@ -114,34 +116,22 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - - AC_SUBST([moduledir]) - --if test x$BUILD_VMWGFX = xyes; then -- PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) --fi --if test x$BUILD_VMWGFX = xyes; then --# --# Early versions of mesa 10 forgot to bump the XA major version number in --# the xa_tracker.h header --# -- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], -- [PKG_CHECK_EXISTS([xatracker = 2.0.0], -- [AC_DEFINE([HAVE_XA_2], 1, -- [Has version 2 of XA])])], -- [BUILD_VMWGFX=no]) --# --# Check for prime. --# -+AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) -+if test x$VMWGFX = xyes; then -+ AC_MSG_RESULT([yes]) -+ PKG_CHECK_MODULES([LIBDRM], [libdrm]) -+ # Check for prime. - PKG_CHECK_EXISTS([libdrm >= 2.4.38], - [AC_DEFINE([HAVE_LIBDRM_2_4_38], 1, - [Has version 2.4.38 or greater of libdrm])]) --fi - --DRIVER_NAME=vmware --AC_SUBST([DRIVER_NAME]) -- --AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D]) --if test x$BUILD_VMWGFX = xyes; then -- AC_MSG_RESULT([yes]) -- AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) -+ # Early versions of mesa 10 forgot to bump the XA major version number -+ # in the xa_tracker.h header -+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], -+ [PKG_CHECK_EXISTS([xatracker = 2.0.0], -+ [AC_DEFINE([HAVE_XA_2], 1, -+ [Has version 2 of XA])])]) -+ AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path]) - libudev_check=yes - AC_ARG_WITH([libudev], - [AS_HELP_STRING([--without-libudev], -@@ -158,7 +148,8 @@ else - AC_MSG_RESULT([no]) - fi - --AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes) -+DRIVER_NAME=vmware -+AC_SUBST([DRIVER_NAME]) - - AC_CONFIG_FILES([ - Makefile --- -2.1.4 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.3.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.4.0.bb index 41612b7f07..d7ba2b9e86 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.3.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.4.0.bb @@ -7,13 +7,8 @@ DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards." LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" DEPENDS += "virtual/libx11 xorgproto libpciaccess" +XORG_DRIVER_COMPRESSOR = ".tar.xz" -SRC_URI += "file://0002-add-option-for-vmwgfx.patch" - -SRC_URI[md5sum] = "08d66d062055080ff699ab4869726ea2" -SRC_URI[sha256sum] = "47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c" +SRC_URI[sha256sum] = "aed31ee5ed5ecc6e2226705383e7ad06f7602c1376a295305f376b17af3eb81a" COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' - -PACKAGECONFIG ?= "" -PACKAGECONFIG[vmwgfx] = "--enable-vmwgfx, --disable-vmwgfx, libdrm virtual/mesa" diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index e657c65b4c..c61cdd05b3 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -2,24 +2,27 @@ SUMMARY = "X driver" HOMEPAGE = "http://www.x.org" BUGTRACKER = "https://bugs.freedesktop.org" SECTION = "x11/drivers" -LICENSE = "MIT-X" +LICENSE = "MIT" PE = "2" -INC_PR = "r21" DEPENDS = "virtual/xserver xorgproto util-macros" -SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" +XORG_DRIVER_COMPRESSOR ?= ".tar.bz2" +SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}${XORG_DRIVER_COMPRESSOR}" -FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" +FILES:${PN} += " ${libdir}/xorg/modules/drivers/*.so" + +inherit pkgconfig features_check +XORGBUILDCLASS ??= "autotools" +inherit_defer ${XORGBUILDCLASS} -inherit autotools pkgconfig distro_features_check # depends on virtual/xserver REQUIRED_DISTRO_FEATURES = "x11" # FIXME: We don't want to include the libtool archives (*.la) from modules # directory, as they serve no useful purpose. Upstream should fix Makefile.am -do_install_append() { +do_install:append() { find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- } @@ -37,6 +40,6 @@ def _add_xorg_abi_depends(d, name): abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) pn = d.getVar("PN") - d.appendVar('RDEPENDS_' + pn, ' ' + abi) + d.appendVar('RDEPENDS:' + pn, ' ' + abi) SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc index 57912e70db..934c3d75c1 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc @@ -7,6 +7,6 @@ python add_xorg_abi_depends() { } PACKAGEFUNCS =+ "add_xorg_abi_depends" -FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \ +FILES:${PN} += " ${libdir}/xorg/modules/input/*.so \ ${datadir}/X11/xorg.conf.d \ " |