mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
xorg: Remove unneeded XORG_PN settings and replace some native/sdk recipes with BBCLASSEXTEND
This commit is contained in:
@@ -1,11 +0,0 @@
|
||||
DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
|
||||
|
||||
SECTION = "x11/applications"
|
||||
LICENSE = "MIT-X"
|
||||
S="${WORKDIR}/xkbcomp-${PV}"
|
||||
|
||||
DEPENDS = "libx11-native libxkbfile-native"
|
||||
|
||||
SRC_URI = "${XORG_MIRROR}/individual/app/xkbcomp-${PV}.tar.bz2"
|
||||
|
||||
inherit native autotools pkgconfig
|
||||
@@ -2,4 +2,6 @@ require xorg-app-common.inc
|
||||
|
||||
DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
|
||||
|
||||
DEPENDS += " virtual/libx11 libxkbfile"
|
||||
DEPENDS += "libxkbfile"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
@@ -4,7 +4,7 @@ SECTION = "x11/apps"
|
||||
LICENSE = "MIT-X"
|
||||
DEPENDS = "util-macros-native virtual/libx11"
|
||||
|
||||
XORG_PN = "${PN}"
|
||||
XORG_PN = "${BPN}"
|
||||
|
||||
SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
require libx11_${PV}.bb
|
||||
|
||||
DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
|
||||
PROVIDES = ""
|
||||
PROVIDES = "virtual/libx11-native"
|
||||
|
||||
inherit native
|
||||
|
||||
@@ -7,6 +7,4 @@ PR = "r0"
|
||||
|
||||
RDEPENDS_${PN}-dev = ""
|
||||
|
||||
XORG_PN = "xtrans"
|
||||
|
||||
BBCLASSEXTEND = "native sdk"
|
||||
|
||||
@@ -3,6 +3,4 @@ require xorg-proto-common.inc
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "bigreqsproto"
|
||||
|
||||
BBCLASSEXTEND = "native sdk"
|
||||
|
||||
@@ -2,5 +2,3 @@ require xorg-proto-common.inc
|
||||
|
||||
CONFLICTS = "compositeext"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "compositeproto"
|
||||
|
||||
@@ -3,5 +3,3 @@ require xorg-proto-common.inc
|
||||
CONFLICTS = "damageext"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "damageproto"
|
||||
|
||||
@@ -3,5 +3,3 @@ require xorg-proto-common.inc
|
||||
CONFLICTS = "fixesext"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "fixesproto"
|
||||
|
||||
@@ -7,6 +7,4 @@ PV = "1.9.99.5+git${SRCREV}"
|
||||
SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto;protocol=git"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
XORG_PN = "inputproto"
|
||||
|
||||
BBCLASSEXTEND = "native sdk"
|
||||
|
||||
@@ -3,6 +3,4 @@ require xorg-proto-common.inc
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "kbproto"
|
||||
|
||||
BBCLASSEXTEND = "native sdk"
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
require randrproto_${PV}.bb
|
||||
|
||||
inherit sdk
|
||||
@@ -4,4 +4,4 @@ CONFLICTS = "randrext"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "randrproto"
|
||||
BBCLASSEXTEND = "sdk"
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
require renderproto_${PV}.bb
|
||||
|
||||
inherit sdk
|
||||
@@ -4,4 +4,4 @@ CONFLICTS = "renderext"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "renderproto"
|
||||
BBCLASSEXTEND = "sdk"
|
||||
|
||||
@@ -3,6 +3,4 @@ require xorg-proto-common.inc
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "xcmiscproto"
|
||||
|
||||
BBCLASSEXTEND = "native sdk"
|
||||
|
||||
@@ -3,6 +3,4 @@ require xorg-proto-common.inc
|
||||
PR = "r2"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "xextproto"
|
||||
|
||||
BBCLASSEXTEND = "native sdk"
|
||||
|
||||
@@ -3,6 +3,4 @@ require xorg-proto-common.inc
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "xf86bigfontproto"
|
||||
|
||||
BBCLASSEXTEND = "native sdk"
|
||||
|
||||
@@ -3,7 +3,4 @@ require xorg-proto-common.inc
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
XORG_PN = "xproto"
|
||||
|
||||
BBCLASSEXTEND = "native sdk"
|
||||
|
||||
|
||||
@@ -6,8 +6,6 @@ PE = "1"
|
||||
|
||||
SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
|
||||
|
||||
XORG_PN = "util-macros"
|
||||
|
||||
# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
|
||||
RDEPENDS_${PN}-dev = ""
|
||||
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
|
||||
|
||||
Reference in New Issue
Block a user