diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
| commit | 3937c88166a493900a694ea8fe53b860f4099d83 (patch) | |
| tree | 57597245b6efd4cf27c1f4c9ff21c0515e530c15 /recipes/xorg-util | |
| parent | df2ace6d59e22b42e50bcf4e8a9c92b580602c2e (diff) | |
| parent | 3510d2ed15a4b477aa7af802a839e11a87b981ed (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/xorg-util')
26 files changed, 72 insertions, 125 deletions
diff --git a/recipes/xorg-util/gccmakedep_1.0.2.bb b/recipes/xorg-util/gccmakedep_1.0.2.bb index 3abfa037a2..1abaec582c 100644 --- a/recipes/xorg-util/gccmakedep_1.0.2.bb +++ b/recipes/xorg-util/gccmakedep_1.0.2.bb @@ -3,5 +3,7 @@ require xorg-util-common.inc DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" RDEPENDS = "gcc" -PR = "r2" +PR = "r3" PE = "1" +SRC_URI[archive.md5sum] = "fc49f45251c1336fe1dad5dba1c83fcd" +SRC_URI[archive.sha256sum] = "fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92" diff --git a/recipes/xorg-util/imake_1.0.2.bb b/recipes/xorg-util/imake_1.0.2.bb index deeb4477a1..4d3efd6d33 100644 --- a/recipes/xorg-util/imake_1.0.2.bb +++ b/recipes/xorg-util/imake_1.0.2.bb @@ -3,5 +3,7 @@ require xorg-util-common.inc DESCRIPTION = "C preprocessor interface to the make utility" RDEPENDS = "perl xproto" -PR = "r1" +PR = "r2" PE = "1" +SRC_URI[archive.md5sum] = "b5c3a719d60a14ca2378dc1259ee60df" +SRC_URI[archive.sha256sum] = "8008b4366ab96abfdac2c91808b79ec2cc5649966b41cfb07b14b6fbd798651c" diff --git a/recipes/xorg-util/lndir_1.0.1.bb b/recipes/xorg-util/lndir_1.0.1.bb index 34309a6487..05125179b3 100644 --- a/recipes/xorg-util/lndir_1.0.1.bb +++ b/recipes/xorg-util/lndir_1.0.1.bb @@ -1,5 +1,7 @@ require xorg-util-common.inc DESCRIPTION = "create a shadow directory of symbolic links to another directory tree" -PR = "r1" +PR = "r2" PE = "1" +SRC_URI[archive.md5sum] = "1a53ddd7e1804abe8f3d9799a88b6aa8" +SRC_URI[archive.sha256sum] = "89bff89702ebf2e5cc2268d79d5a27c62190c5a85ab080935d4425d3e309bc57" diff --git a/recipes/xorg-util/makedepend-native_1.0.1.bb b/recipes/xorg-util/makedepend-native_1.0.1.bb deleted file mode 100644 index 9facfc69fa..0000000000 --- a/recipes/xorg-util/makedepend-native_1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-util-common.inc -inherit native - -DESCRIPTION = "create dependencies in makefiles" -DEPENDS = "xproto-native util-macros-native" -PR = "r2" -PE = "1" - -XORG_PN = "makedepend" diff --git a/recipes/xorg-util/makedepend-native_1.0.2.bb b/recipes/xorg-util/makedepend-native_1.0.2.bb deleted file mode 100644 index 9facfc69fa..0000000000 --- a/recipes/xorg-util/makedepend-native_1.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-util-common.inc -inherit native - -DESCRIPTION = "create dependencies in makefiles" -DEPENDS = "xproto-native util-macros-native" -PR = "r2" -PE = "1" - -XORG_PN = "makedepend" diff --git a/recipes/xorg-util/makedepend.inc b/recipes/xorg-util/makedepend.inc new file mode 100644 index 0000000000..b1a27c69e0 --- /dev/null +++ b/recipes/xorg-util/makedepend.inc @@ -0,0 +1,8 @@ +require xorg-util-common.inc +DESCRIPTION = "create dependencies in makefiles" +DEPENDS = "xproto util-macros" + +PE = "1" +INC_PR = "r4" + +BBCLASSEXTEND = "native" diff --git a/recipes/xorg-util/makedepend_1.0.1.bb b/recipes/xorg-util/makedepend_1.0.1.bb index e998bba1b0..05cc5e63c7 100644 --- a/recipes/xorg-util/makedepend_1.0.1.bb +++ b/recipes/xorg-util/makedepend_1.0.1.bb @@ -1,6 +1,4 @@ -require xorg-util-common.inc - -DESCRIPTION = "create dependencies in makefiles" -DEPENDS = "xproto util-macros" -PR = "r2" -PE = "1" +require makedepend.inc +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "90f5f3b987497a481b94d49372f17dce" +SRC_URI[archive.sha256sum] = "0a4a0d4e2613b0cd4321e55fd4741788b728736fc8a517996e2015fa49862e61" diff --git a/recipes/xorg-util/makedepend_1.0.2.bb b/recipes/xorg-util/makedepend_1.0.2.bb index e998bba1b0..2f7850de6d 100644 --- a/recipes/xorg-util/makedepend_1.0.2.bb +++ b/recipes/xorg-util/makedepend_1.0.2.bb @@ -1,6 +1,4 @@ -require xorg-util-common.inc - -DESCRIPTION = "create dependencies in makefiles" -DEPENDS = "xproto util-macros" -PR = "r2" -PE = "1" +require makedepend.inc +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "905bfeb1a59929d950e5d638fbadcf39" +SRC_URI[archive.sha256sum] = "008e6e117372e04cdc9a72ffc7dfae2e2d6617c9b399e052ae12dc2a1a03079a" diff --git a/recipes/xorg-util/util-macros-native_1.1.5.bb b/recipes/xorg-util/util-macros-native_1.1.5.bb deleted file mode 100644 index c327f3f54e..0000000000 --- a/recipes/xorg-util/util-macros-native_1.1.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -PR = "r1" - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-1.1.5" diff --git a/recipes/xorg-util/util-macros-native_1.1.6.bb b/recipes/xorg-util/util-macros-native_1.1.6.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.1.6.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros-native_1.2.1.bb b/recipes/xorg-util/util-macros-native_1.2.1.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros-native_1.3.0.bb b/recipes/xorg-util/util-macros-native_1.3.0.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.3.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros-native_1.4.1.bb b/recipes/xorg-util/util-macros-native_1.4.1.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.4.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros-native_1.5.0.bb b/recipes/xorg-util/util-macros-native_1.5.0.bb deleted file mode 100644 index 618e78f116..0000000000 --- a/recipes/xorg-util/util-macros-native_1.5.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require util-macros_${PV}.bb - -inherit native - -XORG_PN = "util-macros" - -S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros.inc b/recipes/xorg-util/util-macros.inc new file mode 100644 index 0000000000..9af52172f3 --- /dev/null +++ b/recipes/xorg-util/util-macros.inc @@ -0,0 +1,8 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" +INC_PR = "r2" +PE = "1" + +ALLOW_EMPTY = "1" +BBCLASSEXTEND = "native" diff --git a/recipes/xorg-util/util-macros_1.1.5.bb b/recipes/xorg-util/util-macros_1.1.5.bb index 46fc0a8d19..f8d0b14c16 100644 --- a/recipes/xorg-util/util-macros_1.1.5.bb +++ b/recipes/xorg-util/util-macros_1.1.5.bb @@ -1,9 +1,5 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PR = "r1" -PE = "1" - -ALLOW_EMPTY = "1" - +require util-macros.inc SRC_URI += "file://unbreak_cross_compile.patch;patch=1" +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "d168aa001b946b58d9aab6088c09d256" +SRC_URI[archive.sha256sum] = "4f2a8a19e90ad82bc2da4eb52799a299a1c94bf5143bc2711e9e5d4cc5a7cdb4" diff --git a/recipes/xorg-util/util-macros_1.1.6.bb b/recipes/xorg-util/util-macros_1.1.6.bb index 4775fc6901..39ba8fab21 100644 --- a/recipes/xorg-util/util-macros_1.1.6.bb +++ b/recipes/xorg-util/util-macros_1.1.6.bb @@ -1,6 +1,4 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PE = "1" - -ALLOW_EMPTY = "1" +require util-macros.inc +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "ea2d9cd33ca6fd05923f007bd74d7c37" +SRC_URI[archive.sha256sum] = "97748154c41a1cd12635a79aee0c2846fd48ecb555fc8b54e3e5baec174e6e74" diff --git a/recipes/xorg-util/util-macros_1.2.1.bb b/recipes/xorg-util/util-macros_1.2.1.bb index ddf8874a3b..4cc3b25019 100644 --- a/recipes/xorg-util/util-macros_1.2.1.bb +++ b/recipes/xorg-util/util-macros_1.2.1.bb @@ -1,12 +1,10 @@ -require xorg-util-common.inc +require util-macros.inc # Version 1.2.1 uses plain `gcc' for checking the compiler version. # Instead, the cross compiler must be used. Whenever upgrading to # a new version, please recheck for this problem, otherwise it breaks # builds with older gcc versions! SRC_URI += " file://cross-compiler-for-checking.patch;patch=1" - -DESCRIPTION = "X autotools macros" -PE = "1" - -ALLOW_EMPTY = "1" +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "81b9746d6202ccf0b4a498cfd0731e71" +SRC_URI[archive.sha256sum] = "f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401" diff --git a/recipes/xorg-util/util-macros_1.3.0.bb b/recipes/xorg-util/util-macros_1.3.0.bb index 4775fc6901..1663b7ca36 100644 --- a/recipes/xorg-util/util-macros_1.3.0.bb +++ b/recipes/xorg-util/util-macros_1.3.0.bb @@ -1,6 +1,4 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PE = "1" - -ALLOW_EMPTY = "1" +require util-macros.inc +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "51bb54c08415ee3c3000b7df9e9b07c5" +SRC_URI[archive.sha256sum] = "57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67" diff --git a/recipes/xorg-util/util-macros_1.4.1.bb b/recipes/xorg-util/util-macros_1.4.1.bb index 7e0b7d5cc9..12e6b1e2cb 100644 --- a/recipes/xorg-util/util-macros_1.4.1.bb +++ b/recipes/xorg-util/util-macros_1.4.1.bb @@ -1,8 +1,5 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PE = "1" - +require util-macros.inc SRC_URI += " file://malloc_zero_returns_null.patch;patch=1" - -ALLOW_EMPTY = "1" +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "8ac38951e753f250aaefbd4ba0afda94" +SRC_URI[archive.sha256sum] = "d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986" diff --git a/recipes/xorg-util/util-macros_1.5.0.bb b/recipes/xorg-util/util-macros_1.5.0.bb index 4775fc6901..ff3b6f4bdc 100644 --- a/recipes/xorg-util/util-macros_1.5.0.bb +++ b/recipes/xorg-util/util-macros_1.5.0.bb @@ -1,6 +1,4 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" -PE = "1" - -ALLOW_EMPTY = "1" +require util-macros.inc +PR = "${INC_PR}.0" +SRC_URI[archive.md5sum] = "ffef78135535c60c2b68d0a2a4ecae9b" +SRC_URI[archive.sha256sum] = "d47116ce5df198859a6082af7a72505575d1685b8c82bb4ef6fbedfa3316617e" diff --git a/recipes/xorg-util/util-macros_1.6.0.bb b/recipes/xorg-util/util-macros_1.6.0.bb new file mode 100644 index 0000000000..c5a715f7be --- /dev/null +++ b/recipes/xorg-util/util-macros_1.6.0.bb @@ -0,0 +1,4 @@ +require util-macros.inc +SRC_URI[archive.md5sum] = "eb991c709781f811fbfcdbd43f9edd16" +SRC_URI[archive.sha256sum] = "12c7a8819f2df62ff7fca20152438d6b4e93ac581d7de211e31149739aa37ce9" +PR = "${INC_PR}.0" diff --git a/recipes/xorg-util/util-macros_1.6.1.bb b/recipes/xorg-util/util-macros_1.6.1.bb new file mode 100644 index 0000000000..80c59713ed --- /dev/null +++ b/recipes/xorg-util/util-macros_1.6.1.bb @@ -0,0 +1,4 @@ +require util-macros.inc +SRC_URI[archive.md5sum] = "a4bef59dd4a2e3450c07c77c6b45a79f" +SRC_URI[archive.sha256sum] = "ba91652d78f2a63d69253fb80af2f0a76c2e1b081c64521f90fac3866ee893d7" +PR = "${INC_PR}.0" diff --git a/recipes/xorg-util/xorg-cf-files_1.0.2.bb b/recipes/xorg-util/xorg-cf-files_1.0.2.bb index 7c3fb8d7e9..dcf1f1798d 100644 --- a/recipes/xorg-util/xorg-cf-files_1.0.2.bb +++ b/recipes/xorg-util/xorg-cf-files_1.0.2.bb @@ -6,3 +6,5 @@ PR = "r1" PE = "1" FILES_${PN} += " /usr/lib/X11/config" +SRC_URI[archive.md5sum] = "f96f44b87132afd2fff677a8c89166dd" +SRC_URI[archive.sha256sum] = "4edcaf61ad8b4bef65169af2b98d3992be07260f90cca65128dc523d6935bdd8" diff --git a/recipes/xorg-util/xorg-cf-files_1.0.3.bb b/recipes/xorg-util/xorg-cf-files_1.0.3.bb index 7c3fb8d7e9..222b23923a 100644 --- a/recipes/xorg-util/xorg-cf-files_1.0.3.bb +++ b/recipes/xorg-util/xorg-cf-files_1.0.3.bb @@ -2,7 +2,9 @@ require xorg-util-common.inc DESCRIPTION = "X Window System CF files" -PR = "r1" +PR = "r2" PE = "1" FILES_${PN} += " /usr/lib/X11/config" +SRC_URI[archive.md5sum] = "bca2403beb209952d66dc57be5a2f789" +SRC_URI[archive.sha256sum] = "9a5e3533a4156a0e308ced437bde722cb291becc2276bdd0952e30b3b5060e92" diff --git a/recipes/xorg-util/xorg-util-common.inc b/recipes/xorg-util/xorg-util-common.inc index 56aae30725..b169d9ef58 100644 --- a/recipes/xorg-util/xorg-util-common.inc +++ b/recipes/xorg-util/xorg-util-common.inc @@ -2,14 +2,8 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/utils" LICENSE = "MIT-X" -XORG_PN = "${PN}" +SRC_URI = "${XORG_MIRROR}/individual/util/${BPN}-${PV}.tar.gz;name=archive" -SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz" - -S = "${WORKDIR}/${XORG_PN}-${PV}" +S = "${WORKDIR}/${BPN}-${PV}" inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} |