diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-driver/xorg-driver-common.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index 493b90a298..c61cdd05b3 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | |||
@@ -2,25 +2,27 @@ SUMMARY = "X driver" | |||
2 | HOMEPAGE = "http://www.x.org" | 2 | HOMEPAGE = "http://www.x.org" |
3 | BUGTRACKER = "https://bugs.freedesktop.org" | 3 | BUGTRACKER = "https://bugs.freedesktop.org" |
4 | SECTION = "x11/drivers" | 4 | SECTION = "x11/drivers" |
5 | LICENSE = "MIT-X" | 5 | LICENSE = "MIT" |
6 | 6 | ||
7 | PE = "2" | 7 | PE = "2" |
8 | 8 | ||
9 | DEPENDS = "virtual/xserver xorgproto util-macros" | 9 | DEPENDS = "virtual/xserver xorgproto util-macros" |
10 | 10 | ||
11 | SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" | 11 | XORG_DRIVER_COMPRESSOR ?= ".tar.bz2" |
12 | SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}${XORG_DRIVER_COMPRESSOR}" | ||
12 | 13 | ||
13 | FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" | 14 | FILES:${PN} += " ${libdir}/xorg/modules/drivers/*.so" |
14 | 15 | ||
16 | inherit pkgconfig features_check | ||
15 | XORGBUILDCLASS ??= "autotools" | 17 | XORGBUILDCLASS ??= "autotools" |
16 | inherit ${XORGBUILDCLASS} pkgconfig features_check | 18 | inherit_defer ${XORGBUILDCLASS} |
17 | 19 | ||
18 | # depends on virtual/xserver | 20 | # depends on virtual/xserver |
19 | REQUIRED_DISTRO_FEATURES = "x11" | 21 | REQUIRED_DISTRO_FEATURES = "x11" |
20 | 22 | ||
21 | # FIXME: We don't want to include the libtool archives (*.la) from modules | 23 | # 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 | 24 | # directory, as they serve no useful purpose. Upstream should fix Makefile.am |
23 | do_install_append() { | 25 | do_install:append() { |
24 | find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- | 26 | find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- |
25 | } | 27 | } |
26 | 28 | ||
@@ -38,6 +40,6 @@ def _add_xorg_abi_depends(d, name): | |||
38 | abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) | 40 | abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) |
39 | 41 | ||
40 | pn = d.getVar("PN") | 42 | pn = d.getVar("PN") |
41 | d.appendVar('RDEPENDS_' + pn, ' ' + abi) | 43 | d.appendVar('RDEPENDS:' + pn, ' ' + abi) |
42 | 44 | ||
43 | SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" | 45 | SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" |