xorg: Add packages accidently dropped in 778aeb6e918d6ec53d4abbfa67d0d3832c8d717e, updated to match current version scheme (thanks to pb_ for spotting)

38 files changed, 135 insertions, 2 deletions

diff --git a/packages/xorg-font/font-adobe-100dpi_1.0.0.bb b/packages/xorg-font/font-adobe-100dpi_1.0.0.bb
new file mode 100644
index 0000000000..e1bdcb5e7a
--- /dev/null
+++ b/packages/xorg-font/font-adobe-100dpi_1.0.0.bb
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+PE = "1"
+
diff --git a/packages/xorg-font/font-adobe-75dpi_1.0.0.bb b/packages/xorg-font/font-adobe-75dpi_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-adobe-75dpi_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb b/packages/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
new file mode 100644
index 0000000000..0799b8a97e
--- /dev/null
+++ b/packages/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
@@ -0,0 +1,5 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+PE = "1"
diff --git a/packages/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb b/packages/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
new file mode 100644
index 0000000000..6e20eb97d8
--- /dev/null
+++ b/packages/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+PE = "1"
+
diff --git a/packages/xorg-font/font-adobe-utopia-type1_1.0.1.bb b/packages/xorg-font/font-adobe-utopia-type1_1.0.1.bb
new file mode 100644
index 0000000000..6e20eb97d8
--- /dev/null
+++ b/packages/xorg-font/font-adobe-utopia-type1_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+PE = "1"
+
diff --git a/packages/xorg-font/font-alias_1.0.1.bb b/packages/xorg-font/font-alias_1.0.1.bb
new file mode 100644
index 0000000000..90eec26a57
--- /dev/null
+++ b/packages/xorg-font/font-alias_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "X font aliases."
+
+DEPENDS = "virtual/xserver font-util"
+RDEPENDS = "encodings font-util"
+
+PE = "1"
\ No newline at end of file
diff --git a/packages/xorg-font/font-arabic-misc_1.0.0.bb b/packages/xorg-font/font-arabic-misc_1.0.0.bb
new file mode 100644
index 0000000000..6171333d6a
--- /dev/null
+++ b/packages/xorg-font/font-arabic-misc_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "100dpi, 24 point (approximately) font to minimally support (almost) all \
+of the Arabic characters available in Unicode."
+
+PE = "1"
+
diff --git a/packages/xorg-font/font-bh-100dpi_1.0.0.bb b/packages/xorg-font/font-bh-100dpi_1.0.0.bb
new file mode 100644
index 0000000000..f8fe553c62
--- /dev/null
+++ b/packages/xorg-font/font-bh-100dpi_1.0.0.bb
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+
+PE = "1"
diff --git a/packages/xorg-font/font-bh-75dpi_1.0.0.bb b/packages/xorg-font/font-bh-75dpi_1.0.0.bb
new file mode 100644
index 0000000000..f8fe553c62
--- /dev/null
+++ b/packages/xorg-font/font-bh-75dpi_1.0.0.bb
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+
+PE = "1"
diff --git a/packages/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
new file mode 100644
index 0000000000..f8fe553c62
--- /dev/null
+++ b/packages/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+
+PE = "1"
diff --git a/packages/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
new file mode 100644
index 0000000000..f8fe553c62
--- /dev/null
+++ b/packages/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+
+PE = "1"
diff --git a/packages/xorg-font/font-bh-ttf_1.0.0.bb b/packages/xorg-font/font-bh-ttf_1.0.0.bb
new file mode 100644
index 0000000000..f8fe553c62
--- /dev/null
+++ b/packages/xorg-font/font-bh-ttf_1.0.0.bb
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+
+PE = "1"
diff --git a/packages/xorg-font/font-bh-type1_1.0.0.bb b/packages/xorg-font/font-bh-type1_1.0.0.bb
new file mode 100644
index 0000000000..f8fe553c62
--- /dev/null
+++ b/packages/xorg-font/font-bh-type1_1.0.0.bb
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+
+PE = "1"
diff --git a/packages/xorg-font/font-bitstream-100dpi_1.0.0.bb b/packages/xorg-font/font-bitstream-100dpi_1.0.0.bb
new file mode 100644
index 0000000000..f8fe553c62
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-100dpi_1.0.0.bb
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+
+PE = "1"
diff --git a/packages/xorg-font/font-bitstream-75dpi_1.0.0.bb b/packages/xorg-font/font-bitstream-75dpi_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-75dpi_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-bitstream-speedo_1.0.0.bb b/packages/xorg-font/font-bitstream-speedo_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-speedo_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-bitstream-type1_1.0.0.bb b/packages/xorg-font/font-bitstream-type1_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-type1_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-cronyx-cyrillic_1.0.0.bb b/packages/xorg-font/font-cronyx-cyrillic_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-cronyx-cyrillic_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-cursor-misc_1.0.0.bb b/packages/xorg-font/font-cursor-misc_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-cursor-misc_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-daewoo-misc_1.0.0.bb b/packages/xorg-font/font-daewoo-misc_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-daewoo-misc_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-dec-misc_1.0.0.bb b/packages/xorg-font/font-dec-misc_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-dec-misc_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-ibm-type1_1.0.0.bb b/packages/xorg-font/font-ibm-type1_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-ibm-type1_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-isas-misc_1.0.0.bb b/packages/xorg-font/font-isas-misc_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-isas-misc_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-jis-misc_1.0.0.bb b/packages/xorg-font/font-jis-misc_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-jis-misc_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-micro-misc_1.0.0.bb b/packages/xorg-font/font-micro-misc_1.0.0.bb
new file mode 100644
index 0000000000..383d16c799
--- /dev/null
+++ b/packages/xorg-font/font-micro-misc_1.0.0.bb
@@ -0,0 +1,4 @@
+require xorg-font-common.inc
+PE = "1"
+
+EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r"
diff --git a/packages/xorg-font/font-misc-cyrillic_1.0.0.bb b/packages/xorg-font/font-misc-cyrillic_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-misc-cyrillic_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-misc-ethiopic_1.0.0.bb b/packages/xorg-font/font-misc-ethiopic_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-misc-ethiopic_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-misc-meltho_1.0.0.bb b/packages/xorg-font/font-misc-meltho_1.0.0.bb
new file mode 100644
index 0000000000..719a443b51
--- /dev/null
+++ b/packages/xorg-font/font-misc-meltho_1.0.0.bb
@@ -0,0 +1,5 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "These fonts are designed for the display of Syriac text."
+PE = "1"
+
diff --git a/packages/xorg-font/font-mutt-misc_1.0.0.bb b/packages/xorg-font/font-mutt-misc_1.0.0.bb
new file mode 100644
index 0000000000..a5ded3d3cc
--- /dev/null
+++ b/packages/xorg-font/font-mutt-misc_1.0.0.bb
@@ -0,0 +1,7 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "Provides a 12pt, 100dpi proportional font with many of \
+the glyphs needed for Unicode text."
+
+PE = "1"
+
diff --git a/packages/xorg-font/font-schumacher-misc_1.0.0.bb b/packages/xorg-font/font-schumacher-misc_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-schumacher-misc_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-screen-cyrillic_1.0.0.bb b/packages/xorg-font/font-screen-cyrillic_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-screen-cyrillic_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-sony-misc_1.0.0.bb b/packages/xorg-font/font-sony-misc_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-sony-misc_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-sun-misc_1.0.0.bb b/packages/xorg-font/font-sun-misc_1.0.0.bb
new file mode 100644
index 0000000000..60ef06fba0
--- /dev/null
+++ b/packages/xorg-font/font-sun-misc_1.0.0.bb
@@ -0,0 +1,2 @@
+require xorg-font-common.inc
+PE = "1"
diff --git a/packages/xorg-font/font-util-native_1.0.1.bb b/packages/xorg-font/font-util-native_1.0.1.bb
new file mode 100644
index 0000000000..8db0b71898
--- /dev/null
+++ b/packages/xorg-font/font-util-native_1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X font utils."
+SECTION = "x11/fonts"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/font-util-${PV}"
+
+DEPENDS = "bdftopcf-native"
+
+PE = "1"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-font/font-util_1.0.1.bb b/packages/xorg-font/font-util_1.0.1.bb
new file mode 100644
index 0000000000..915c40cd5c
--- /dev/null
+++ b/packages/xorg-font/font-util_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-font-common.inc
+
+DESCRIPTION = "X font utils."
+
+DEPENDS = "encodings"
+RDEPENDS = "mkfontdir mkfontscale encodings"
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-font/font-winitzki-cyrillic_1.0.0.bb b/packages/xorg-font/font-winitzki-cyrillic_1.0.0.bb
new file mode 100644
index 0000000000..f8fe553c62
--- /dev/null
+++ b/packages/xorg-font/font-winitzki-cyrillic_1.0.0.bb
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+
+PE = "1"
diff --git a/packages/xorg-font/font-xfree86-type1_1.0.0.bb b/packages/xorg-font/font-xfree86-type1_1.0.0.bb
new file mode 100644
index 0000000000..f8fe553c62
--- /dev/null
+++ b/packages/xorg-font/font-xfree86-type1_1.0.0.bb
@@ -0,0 +1,3 @@
+require xorg-font-common.inc
+
+PE = "1"
diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc
index 148437a3e3..7ffe818cb2 100644
--- a/packages/xorg-font/xorg-font-common.inc
+++ b/packages/xorg-font/xorg-font-common.inc
@@ -6,8 +6,7 @@ DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-n
 RDEPENDS = "encodings font-util font-alias"
 
 XORG_PN = "${PN}"
-XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/font/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig