xorg: Bulk version upgrades

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

4 files changed, 76 insertions, 0 deletions

diff --git a/meta/packages/xorg-font/encodings_1.0.3.bb b/meta/packages/xorg-font/encodings_1.0.3.bb
new file mode 100644
index 0000000000..ecc3eed540
--- /dev/null
+++ b/meta/packages/xorg-font/encodings_1.0.3.bb
@@ -0,0 +1,5 @@
+require xorg-font-common.inc
+PE = "1"
+PR = "${INC_PR}.0"
+
+DEPENDS = "mkfontscale-native font-util-native"
diff --git a/meta/packages/xorg-font/font-alias_1.0.2.bb b/meta/packages/xorg-font/font-alias_1.0.2.bb
new file mode 100644
index 0000000000..5314cbc5db
--- /dev/null
+++ b/meta/packages/xorg-font/font-alias_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "X font aliases."
+
+DEPENDS = "virtual/xserver font-util"
+RDEPENDS = "encodings font-util"
+
+PE = "1"
+PR = "${INC_PR}.0"
diff --git a/meta/packages/xorg-font/font-util_1.1.1.bb b/meta/packages/xorg-font/font-util_1.1.1.bb
new file mode 100644
index 0000000000..b7819d1244
--- /dev/null
+++ b/meta/packages/xorg-font/font-util_1.1.1.bb
@@ -0,0 +1,17 @@
+require xorg-font-common.inc
+
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
+
+DESCRIPTION = "X font utils."
+
+DEPENDS = "encodings util-macros"
+DEPENDS_virtclass-native = "util-macros-native"
+RDEPENDS = "mkfontdir mkfontscale encodings"
+
+PR = "${INC_PR}.1"
+
+do_configure_prepend() {
+        sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in
+}
+
+BBCLASSEXTEND = "native"
\ No newline at end of file
diff --git a/meta/packages/xorg-font/xorg-font-common.inc b/meta/packages/xorg-font/xorg-font-common.inc
new file mode 100644
index 0000000000..52dc2208df
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-font-common.inc
@@ -0,0 +1,45 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/fonts"
+LICENSE = "MIT-X"
+
+DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
+RDEPENDS = "encodings font-util font-alias"
+
+XORG_PN = "${BPN}"
+INC_PR = "r1"
+
+SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OEMAKE += "FCCACHE=/bin/true"
+
+do_configure_prepend() {
+        if [ -f "${S}"/configure.ac ] ; then
+                sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac
+        fi
+}
+
+do_install_append() {
+        find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f
+        find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f
+        find ${D}${datadir}/fonts/X11 -type f -name fonts.dir | xargs rm -f
+        find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f   
+}
+
+PACKAGE_ARCH = "all"
+
+FILES_${PN} += " ${libdir}/X11/fonts ${datadir}"
+
+pkg_postinst_${PN} () {
+        set -x
+        for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
+                mkfontdir $fontdir
+                mkfontscale $fontdir
+        done
+        for fontdir in `find $D/usr/share/fonts/X11 -type d`; do
+                mkfontdir $fontdir
+                mkfontscale $fontdir
+        done
+}