summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-driver
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-driver')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb6
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-common.inc6
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-input.inc2
6 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb
index 5688eb4767..3b5af3fae9 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb
@@ -8,4 +8,4 @@ DEPENDS += "libinput"
8 8
9SRC_URI[sha256sum] = "e11d2a41419124a6e9b148f1df181bf7819fc7398c8ee9a1b6390b0742c68d16" 9SRC_URI[sha256sum] = "e11d2a41419124a6e9b148f1df181bf7819fc7398c8ee9a1b6390b0742c68d16"
10 10
11FILES_${PN} += "${datadir}/X11/xorg.conf.d" 11FILES:${PN} += "${datadir}/X11/xorg.conf.d"
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.1.0.bb
index 92a1b25ebe..5e740037d9 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
@@ -9,13 +9,13 @@ standard 'mouse' driver if a VMware virtual machine is not detected."
9SRC_URI[md5sum] = "85e2e464b7219c495ad3a16465c226ed" 9SRC_URI[md5sum] = "85e2e464b7219c495ad3a16465c226ed"
10SRC_URI[sha256sum] = "0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319" 10SRC_URI[sha256sum] = "0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319"
11 11
12RDEPENDS_${PN} += "xf86-input-mouse" 12RDEPENDS:${PN} += "xf86-input-mouse"
13 13
14LIC_FILES_CHKSUM = "file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc" 14LIC_FILES_CHKSUM = "file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc"
15 15
16COMPATIBLE_HOST = '(i.86|x86_64).*-linux' 16COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
17 17
18do_install_append () { 18do_install:append () {
19 # We don't care about hal 19 # We don't care about hal
20 rm -rf ${D}${datadir}/hal/ 20 rm -rf ${D}${datadir}/hal/
21 rm -rf ${D}${libdir}/hal/ 21 rm -rf ${D}${libdir}/hal/
@@ -23,4 +23,4 @@ do_install_append () {
23 23
24EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" 24EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d"
25 25
26FILES_${PN} += "${datadir}/X11/xorg.conf.d" 26FILES:${PN} += "${datadir}/X11/xorg.conf.d"
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 161371b118..1d8077a600 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -39,4 +39,4 @@ EXTRA_OECONF += '${@oe.utils.conditional( "ROOTLESS_X", "1", " --enable-kms-only
39 39
40COMPATIBLE_HOST = '(i.86|x86_64).*-linux' 40COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
41 41
42FILES_${PN} += "${datadir}/polkit-1" 42FILES:${PN} += "${datadir}/polkit-1"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb
index d313c8c6a8..05bb905b35 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb
@@ -13,7 +13,7 @@ DEPENDS += "virtual/libx11 xorgproto libpciaccess"
13 13
14COMPATIBLE_HOST = '(i.86|x86_64).*-linux' 14COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
15 15
16RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" 16RRECOMMENDS:${PN} += "xserver-xorg-module-libint10"
17 17
18SRC_URI[sha256sum] = "1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659" 18SRC_URI[sha256sum] = "1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659"
19 19
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 493b90a298..65c5e3c48a 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -10,7 +10,7 @@ DEPENDS = "virtual/xserver xorgproto util-macros"
10 10
11SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" 11SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
12 12
13FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" 13FILES:${PN} += " ${libdir}/xorg/modules/drivers/*.so"
14 14
15XORGBUILDCLASS ??= "autotools" 15XORGBUILDCLASS ??= "autotools"
16inherit ${XORGBUILDCLASS} pkgconfig features_check 16inherit ${XORGBUILDCLASS} pkgconfig features_check
@@ -20,7 +20,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
20 20
21# FIXME: We don't want to include the libtool archives (*.la) from modules 21# FIXME: We don't want to include the libtool archives (*.la) from modules
22# directory, as they serve no useful purpose. Upstream should fix Makefile.am 22# directory, as they serve no useful purpose. Upstream should fix Makefile.am
23do_install_append() { 23do_install:append() {
24 find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- 24 find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
25} 25}
26 26
@@ -38,6 +38,6 @@ def _add_xorg_abi_depends(d, name):
38 abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) 38 abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0])
39 39
40 pn = d.getVar("PN") 40 pn = d.getVar("PN")
41 d.appendVar('RDEPENDS_' + pn, ' ' + abi) 41 d.appendVar('RDEPENDS:' + pn, ' ' + abi)
42 42
43SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" 43SECURITY_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() {
7} 7}
8PACKAGEFUNCS =+ "add_xorg_abi_depends" 8PACKAGEFUNCS =+ "add_xorg_abi_depends"
9 9
10FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \ 10FILES:${PN} += " ${libdir}/xorg/modules/input/*.so \
11 ${datadir}/X11/xorg.conf.d \ 11 ${datadir}/X11/xorg.conf.d \
12 " 12 "