From ff533176a875663be797058bc35fa8ff3f9f8147 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Fri, 27 Apr 2012 14:34:24 +0800 Subject: xorg-app: Use ${libdir} and ${datadir} for packaging. Used ${libdir} and ${datadir} instead of hard coded direcotries for packaging. Also included INC_PR in PR. Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | 2 +- meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb | 2 ++ meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb | 2 +- meta/recipes-graphics/xorg-app/xauth_1.0.6.bb | 2 +- meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb | 2 +- meta/recipes-graphics/xorg-app/xhost_1.0.4.bb | 2 +- meta/recipes-graphics/xorg-app/xinit_1.3.2.bb | 2 +- meta/recipes-graphics/xorg-app/xinput_1.5.3.bb | 2 +- meta/recipes-graphics/xorg-app/xkbcomp_1.2.3.bb | 2 ++ meta/recipes-graphics/xorg-app/xmodmap_1.0.5.bb | 2 +- meta/recipes-graphics/xorg-app/xorg-app-common.inc | 4 ++-- meta/recipes-graphics/xorg-app/xprop_1.2.1.bb | 2 +- meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb | 2 +- meta/recipes-graphics/xorg-app/xset_1.2.2.bb | 2 +- meta/recipes-graphics/xorg-app/xvinfo_1.1.1.bb | 1 + meta/recipes-graphics/xorg-app/xwininfo_1.1.2.bb | 2 +- 16 files changed, 19 insertions(+), 14 deletions(-) (limited to 'meta') diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb index db6d2b4037..6637326131 100644 --- a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb +++ b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb @@ -9,7 +9,7 @@ The X server and font server use these files to find the available font \ files." PE = "1" -PR = "r0" +PR = "${INC_PR}.0" RDEPENDS_${PN} += "mkfontscale" RDEPENDS_${PN}_virtclass-native += "mkfontscale-native" diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb index 49706e5a44..d98057badf 100644 --- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb @@ -10,6 +10,8 @@ is used by the mkfontdir program." DEPENDS += " zlib libfontenc freetype virtual/libx11" +PR = "${INC_PR}.0" + BBCLASSEXTEND = "native" LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f" diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb b/meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb index 15fa3148ea..cc0b323a88 100644 --- a/meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb +++ b/meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb @@ -11,7 +11,7 @@ DEPENDS += "libxmu libxrender libxft libxext fontconfig" LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \ file://x11perf.h;endline=24;md5=29555066baf406a105ff917ac25b2d01" -PR = "r0" +PR = "${INC_PR}.0" PE = "1" FILES_${PN} += "${libdir}/X11/x11perfcomp/*" diff --git a/meta/recipes-graphics/xorg-app/xauth_1.0.6.bb b/meta/recipes-graphics/xorg-app/xauth_1.0.6.bb index f00d30a72e..c43d0eb4eb 100644 --- a/meta/recipes-graphics/xorg-app/xauth_1.0.6.bb +++ b/meta/recipes-graphics/xorg-app/xauth_1.0.6.bb @@ -6,7 +6,7 @@ information used in connecting to the X server." LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" DEPENDS += "libxau libxext libxmu" -PR = "r0" +PR = "${INC_PR}.0" PE = "1" SRC_URI[md5sum] = "105f5b00bb9293b3db36f7e500d4f950" diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb index a118d0d635..ae3cc8cbc1 100644 --- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb +++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb @@ -10,7 +10,7 @@ that are available." LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau" -PR = "r0" +PR = "${INC_PR}.0" PE = "1" SRC_URI += "file://disable-xkb.patch" diff --git a/meta/recipes-graphics/xorg-app/xhost_1.0.4.bb b/meta/recipes-graphics/xorg-app/xhost_1.0.4.bb index 9330228a15..7a78f8020c 100644 --- a/meta/recipes-graphics/xorg-app/xhost_1.0.4.bb +++ b/meta/recipes-graphics/xorg-app/xhost_1.0.4.bb @@ -11,7 +11,7 @@ protocol for passing other authentication data to the server." LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199" DEPENDS += "libxmu libxau" -PR = "r0" +PR = "${INC_PR}.0" PE = "1" SRC_URI[md5sum] = "2be663a0afbcc0856c1591477d5bf32a" diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.2.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.2.bb index cb3e02826d..2008e796ea 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.3.2.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.3.2.bb @@ -10,7 +10,7 @@ then terminate." LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407" -PR = "r0" +PR = "${INC_PR}.0" PE = "1" SRC_URI[md5sum] = "9c0943cbd83e489ad1b05221b97efd44" diff --git a/meta/recipes-graphics/xorg-app/xinput_1.5.3.bb b/meta/recipes-graphics/xorg-app/xinput_1.5.3.bb index 8f17e9a5bb..6790f60dad 100644 --- a/meta/recipes-graphics/xorg-app/xinput_1.5.3.bb +++ b/meta/recipes-graphics/xorg-app/xinput_1.5.3.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=22c34ea36136407a77702a8b784f9bd0" DEPENDS += " libxi" -PR = "r7" +PR = "${INC_PR}.7" SRC_URI[md5sum] = "1e2f0ad4f3fa833b65c568907f171d28" SRC_URI[sha256sum] = "6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76" diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.3.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.3.bb index d8b3e7a01e..f5f0870a7b 100644 --- a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.3.bb +++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.3.bb @@ -9,6 +9,8 @@ be read directly by XKB-capable X servers or utilities." LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a" +PR = "${INC_PR}.0" + DEPENDS += "libxkbfile" SRC_URI[md5sum] = "35622a497894c1cff9182d42696c3e27" diff --git a/meta/recipes-graphics/xorg-app/xmodmap_1.0.5.bb b/meta/recipes-graphics/xorg-app/xmodmap_1.0.5.bb index e98ed4fdfa..2c9ecde7e6 100644 --- a/meta/recipes-graphics/xorg-app/xmodmap_1.0.5.bb +++ b/meta/recipes-graphics/xorg-app/xmodmap_1.0.5.bb @@ -11,7 +11,7 @@ according to personal tastes." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=eef098b27f09d0ac39268df0cc2c00b5" -PR = "r0" +PR = "${INC_PR}.0" PE = "1" SRC_URI[md5sum] = "b18850d373f3717dca569377c449d091" diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc index 890648b356..40508ffedf 100644 --- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc +++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc @@ -5,7 +5,7 @@ SECTION = "x11/apps" LICENSE = "MIT-X" DEPENDS = "util-macros-native virtual/libx11" -INC_PR = "r7" +INC_PR = "r8" SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" @@ -13,4 +13,4 @@ S = "${WORKDIR}/${BPN}-${PV}" inherit autotools pkgconfig -FILES_${PN} += " /usr/lib/X11/${BPN} /usr/share/X11/app-defaults/" +FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" diff --git a/meta/recipes-graphics/xorg-app/xprop_1.2.1.bb b/meta/recipes-graphics/xorg-app/xprop_1.2.1.bb index 6c072305b0..c74beb4708 100644 --- a/meta/recipes-graphics/xorg-app/xprop_1.2.1.bb +++ b/meta/recipes-graphics/xorg-app/xprop_1.2.1.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" DEPENDS += " libxmu virtual/libx11" -PR = "r0" +PR = "${INC_PR}.0" PE = "1" SRC_URI[md5sum] = "d5529dc8d811efabd136ca2d8e857deb" diff --git a/meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb b/meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb index 4410865ec9..da83e8f097 100644 --- a/meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb +++ b/meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb @@ -10,7 +10,7 @@ LICENSE= "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" DEPENDS += "libxrandr libxrender" PE = "1" -PR = "r1" +PR = "${INC_PR}.1" SRC_URI[md5sum] = "9735173a84dca9b05e06fd4686196b07" SRC_URI[sha256sum] = "1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e" diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.2.bb b/meta/recipes-graphics/xorg-app/xset_1.2.2.bb index 7d5ac49605..0430f8c544 100644 --- a/meta/recipes-graphics/xorg-app/xset_1.2.2.bb +++ b/meta/recipes-graphics/xorg-app/xset_1.2.2.bb @@ -8,7 +8,7 @@ preference options of the display." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" -PR = "r0" +PR = "${INC_PR}.0" PE = "1" SRC_URI += "file://disable-xkb.patch" diff --git a/meta/recipes-graphics/xorg-app/xvinfo_1.1.1.bb b/meta/recipes-graphics/xorg-app/xvinfo_1.1.1.bb index 7a0b822aa9..66d2561470 100644 --- a/meta/recipes-graphics/xorg-app/xvinfo_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/xvinfo_1.1.1.bb @@ -9,6 +9,7 @@ extension." LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68" DEPENDS += " libxv" PE = "1" +PR = "${INC_PR}.0" SRC_URI[md5sum] = "c88feb501083951a8f47a21aaeb1529d" SRC_URI[sha256sum] = "60c74aa190bcf1e244f6f1576dc43869018a8ed5ba319703a5c198d3466a3985" diff --git a/meta/recipes-graphics/xorg-app/xwininfo_1.1.2.bb b/meta/recipes-graphics/xorg-app/xwininfo_1.1.2.bb index cbc458745b..c033e2bcd3 100644 --- a/meta/recipes-graphics/xorg-app/xwininfo_1.1.2.bb +++ b/meta/recipes-graphics/xorg-app/xwininfo_1.1.2.bb @@ -9,7 +9,7 @@ and a number of other items." LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e" DEPENDS += "libxext libxmu" -PR = "r0" +PR = "${INC_PR}.0" PE = "0" SRC_URI[md5sum] = "9e8b58c8aa6172e87ab4f9cf3612fedd" -- cgit 1.2.3-korg