mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
xserver-xf86: Use PACKAGECONFIG for udev/hal choice and default to udev
(From OE-Core rev: 55fe7a29e059a3e09e04896b18bb751da3cd8530) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -35,3 +35,8 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
|
||||
SRC_URI += "file://macro_tweak.patch"
|
||||
|
||||
EXTRA_OECONF = "--with-fop=no"
|
||||
|
||||
PACKAGECONFIG ??= "udev"
|
||||
PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
|
||||
PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm
|
||||
|
||||
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
|
||||
|
||||
RDEPENDS_${PN} += "hal xorg-minimal-fonts"
|
||||
RDEPENDS_${PN} += "xorg-minimal-fonts"
|
||||
|
||||
FILES_${PN} += "${bindir}/Xorg "
|
||||
|
||||
@@ -34,4 +34,3 @@ EXTRA_OECONF += "--disable-static \
|
||||
|
||||
# Due to mesa-dri
|
||||
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ PROTO_DEPS += "xf86driproto dri2proto"
|
||||
DEPENDS += "font-util"
|
||||
|
||||
PE = "1"
|
||||
PR = "r1"
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI += "file://crosscompile.patch"
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
|
||||
|
||||
SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
|
||||
PE = "1"
|
||||
PR = "r1"
|
||||
PR = "r3"
|
||||
PV = "1.10+git${SRCPV}"
|
||||
|
||||
PROTO_DEPS += "xf86driproto dri2proto"
|
||||
|
||||
@@ -8,7 +8,7 @@ LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile lib
|
||||
|
||||
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
|
||||
|
||||
RDEPENDS_${PN} += "hal xorg-minimal-fonts"
|
||||
RDEPENDS_${PN} += "xorg-minimal-fonts"
|
||||
|
||||
FILES_${PN} += "${bindir}/Xorg "
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ require xserver-xf86-lite.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
|
||||
|
||||
PR = "r1"
|
||||
PR = "r3"
|
||||
|
||||
DEPENDS += "font-util"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user