xorg-lib: X11 cleanup

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2086 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/xorg-lib/diet-x11_X11R7.1-1.1.1.bb b/meta/packages/xorg-lib/diet-x11_1.1.1.bb
similarity index 96%
rename from meta/packages/xorg-lib/diet-x11_X11R7.1-1.1.1.bb
rename to meta/packages/xorg-lib/diet-x11_1.1.1.bb
index 33e50df13a023d185f167ab32b0a186f229bcb08..ce5e2b4b8b242c246f3df0557f53af41254f18bd 100644 (file)
--- a/meta/packages/xorg-lib/diet-x11_X11R7.1-1.1.1.bb
+++ b/meta/packages/xorg-lib/diet-x11_1.1.1.bb
@@ -1,6 +1,8 @@
 SECTION = "x11/base"
 require libx11_${PV}.bb
 
+PE = "1"
+
 EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 

diff --git a/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libapplewm_1.0.0.bb
similarity index 93%
rename from meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
rename to meta/packages/xorg-lib/libapplewm_1.0.0.bb
index 28abffa735b2a7bd494a55c99521d0ca9f6ba8c9..ee847a9ddd53b3738b424d650fd316fa85f62862 100644 (file)
--- a/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-lib/libapplewm_1.0.0.bb
@@ -6,3 +6,4 @@ DEPENDS += " virtual/libx11 libxext xextproto applewmproto"
 
 XORG_PN = "libAppleWM"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libdmx_1.0.2.bb
similarity index 92%
rename from meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
rename to meta/packages/xorg-lib/libdmx_1.0.2.bb
index a612982a95d4b56ec676620d5234714cc9c7091a..601aad10a6550ab2ef65e107be3e72f8d683c09c 100644 (file)
--- a/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
+++ b/meta/packages/xorg-lib/libdmx_1.0.2.bb
@@ -3,3 +3,4 @@ require xorg-lib-common.inc
 #DESCRIPTION = ""
 
 DEPENDS += " virtual/libx11 libxext xextproto dmxproto"
+PE = "1"

diff --git a/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libfs_1.0.0.bb
similarity index 92%
rename from meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb
rename to meta/packages/xorg-lib/libfs_1.0.0.bb
index 5c07ce682c5257d9bc4fa3c39f063f8e6089e8dd..775f4ed3b3fc06a1c2ec6b2bec97dd44cfc90c62 100644 (file)
--- a/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-lib/libfs_1.0.0.bb
@@ -6,3 +6,4 @@ DEPENDS += " xproto fontsproto xtrans"
 
 XORG_PN = "libFS"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libice_1.0.1.bb
similarity index 94%
rename from meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
rename to meta/packages/xorg-lib/libice_1.0.1.bb
index da40983162adb09cdf56226a746636a24b45261f..e3fa1f9791ba5835bf858eed370afdd51a6aaf62 100644 (file)
--- a/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-lib/libice_1.0.1.bb
@@ -8,3 +8,4 @@ PROVIDES = "ice"
 
 XORG_PN = "libICE"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/liblbxutil_1.0.1.bb
similarity index 95%
rename from meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
rename to meta/packages/xorg-lib/liblbxutil_1.0.1.bb
index 1b8660dda652744063175c7f28030096bf77e551..ec228fbcb7dd51e5b60c9e59f1fe702d59d19c5e 100644 (file)
--- a/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-lib/liblbxutil_1.0.1.bb
@@ -8,3 +8,4 @@ DESCRIPTION = "XFIXES Extension"
 
 DEPENDS += " xextproto xproto zlib"
 PROVIDES = "lbxutil"
+PE = "1"

diff --git a/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/liboldx_1.0.1.bb
similarity index 91%
rename from meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
rename to meta/packages/xorg-lib/liboldx_1.0.1.bb
index 2a380a65f6bf801f0adf28aa73fb2467368f2c37..99dd24b00b2f4c8da105a9d4c4da10ee58d802e2 100644 (file)
--- a/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
+++ b/meta/packages/xorg-lib/liboldx_1.0.1.bb
@@ -6,3 +6,4 @@ DEPENDS += " virtual/libx11"
 
 XORG_PN = "liboldX"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libwindowswm_1.0.0.bb
similarity index 93%
rename from meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
rename to meta/packages/xorg-lib/libwindowswm_1.0.0.bb
index 90b8aeca4927b256133320fe75807e62dc833d41..b3b366b069b404333211e7043844f2e0cb1d78aa 100644 (file)
--- a/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-lib/libwindowswm_1.0.0.bb
@@ -6,3 +6,4 @@ DEPENDS += " virtual/libx11 libxext xextproto windowswmproto"
 
 XORG_PN = "libWindowsWM"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libx11-native_1.0.1.bb
similarity index 98%
rename from meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
rename to meta/packages/xorg-lib/libx11-native_1.0.1.bb
index 2b84b2c53c395781c730cfc7ead7ff1f7018d8cc..2fb8801284a02fdf3bd0d5d739ffbf8e937783cf 100644 (file)
--- a/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-lib/libx11-native_1.0.1.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Base X libs."
 SECTION = "x11/libs"
 PRIORITY = "optional"
 LICENSE = "XFree86"
+PE = "1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 

diff --git a/meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb b/meta/packages/xorg-lib/libx11_1.1.1.bb
similarity index 98%
rename from meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb
rename to meta/packages/xorg-lib/libx11_1.1.1.bb
index 73b6d910ba0eb2b1004ad3bd9af20fccf17a09e2..f639372ac734f3216bdcb8247aeb6515a7bb819c 100644 (file)
--- a/meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb
+++ b/meta/packages/xorg-lib/libx11_1.1.1.bb
@@ -6,6 +6,7 @@ DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
        libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 # RPROVIDES = "virtual/libx11"
+PE = "1"
 
 SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.1.1.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-1.1.1"

diff --git a/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxevie_1.0.1.bb
similarity index 93%
rename from meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
rename to meta/packages/xorg-lib/libxevie_1.0.1.bb
index 4c3a134633f6d81eb5c27c76bb3eb526f89d2f4a..71abb2c5676828eabd6639e4fca9564cc337ebba 100644 (file)
--- a/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-lib/libxevie_1.0.1.bb
@@ -6,3 +6,4 @@ DEPENDS += " xproto virtual/libx11 xextproto libxext evieext"
 
 XORG_PN = "libXevie"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxext_1.0.1.bb
similarity index 95%
rename from meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
rename to meta/packages/xorg-lib/libxext_1.0.1.bb
index fc2061514afecf1eadc6e5be6b4a617f32cd03c0..4d30befbe0f51b055c090e29659198981d7e24a7 100644 (file)
--- a/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-lib/libxext_1.0.1.bb
@@ -5,6 +5,7 @@ PRIORITY = "optional"
 
 DEPENDS += " xproto virtual/libx11 xextproto libxau"
 PROVIDES = "xext"
+PE = "1"
 
 XORG_PN = "libXext"
 

diff --git a/meta/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb b/meta/packages/xorg-lib/libxft_2.1.12.bb
similarity index 98%
rename from meta/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb
rename to meta/packages/xorg-lib/libxft_2.1.12.bb
index 5ae82472964c08889cb53f9bf40e173ffe09d913..8843938d4ec93ebfde25d95f49d2c9c1532fedda 100644 (file)
--- a/meta/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb
+++ b/meta/packages/xorg-lib/libxft_2.1.12.bb
@@ -8,6 +8,7 @@ DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
 
 DEPENDS += " libxrender freetype fontconfig"
 PROVIDES = "xft"
+PE = "1"
 
 XORG_PN = "libXft"
 

diff --git a/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxkbui_1.0.2.bb
similarity index 94%
rename from meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
rename to meta/packages/xorg-lib/libxkbui_1.0.2.bb
index e094728c2f799383aaca7e2dd483839ba23720c6..619b8a34b023a463dd384f907a8676f16884cd3a 100644 (file)
--- a/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
+++ b/meta/packages/xorg-lib/libxkbui_1.0.2.bb
@@ -3,6 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 lbxkbui library"
 LICENSE= "GPL"
 PRIORITY = "optional"
+PE = "1"
 
 DEPENDS += " virtual/libx11 libxt libxkbfile"
 PROVIDES = "xkbui"

diff --git a/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxp_1.0.0.bb
similarity index 96%
rename from meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
rename to meta/packages/xorg-lib/libxp_1.0.0.bb
index fc7ecb57788fd41acb694bdf2d47c3a38fee5044..5dec1c26bbe57bc56f5028f09ac599343dddb949 100644 (file)
--- a/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-lib/libxp_1.0.0.bb
@@ -5,6 +5,7 @@ DESCRIPTION = "X print extension library."
 DEPENDS += " virtual/libx11 libxext xextproto libxau printproto"
 
 XORG_PN = "libXp"
+PE = "1"
 
 CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
 EXTRA_OECONF="--enable-malloc0returnsnull"

diff --git a/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb
similarity index 94%
rename from meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
rename to meta/packages/xorg-lib/libxprintapputil_1.0.1.bb
index 077ac40a0a8e9be07ff9ac29915efc32774b7830..fd8a39670ab1aff791dcf99833d82d6d0830053a 100644 (file)
--- a/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
+++ b/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb
@@ -6,3 +6,4 @@ DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau"
 
 XORG_PN = "libXprintAppUtil"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxprintutil_1.0.1.bb
similarity index 93%
rename from meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
rename to meta/packages/xorg-lib/libxprintutil_1.0.1.bb
index f965b9a2bce884a6a8da9f786b952dcdae93c80e..67cf0be61da479f5d6113fd142ea09a618c826c1 100644 (file)
--- a/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
+++ b/meta/packages/xorg-lib/libxprintutil_1.0.1.bb
@@ -6,3 +6,4 @@ DEPENDS += " virtual/libx11 libxp libxt printproto libxau"
 
 XORG_PN = "libXprintUtil"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxtrap_1.0.0.bb
similarity index 93%
rename from meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
rename to meta/packages/xorg-lib/libxtrap_1.0.0.bb
index f9ebac47f97f90380ba9b9a2fe12c4bd749ff699..81c9df458b9dd3889be02d6970c3960d7bd97c3d 100644 (file)
--- a/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
+++ b/meta/packages/xorg-lib/libxtrap_1.0.0.bb
@@ -6,3 +6,4 @@ DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto"
 
 XORG_PN = "libXTrap"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxtst_1.0.1.bb
similarity index 96%
rename from meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
rename to meta/packages/xorg-lib/libxtst_1.0.1.bb
index 802ea2836d23a5ca1d461bf66b68659c38f1b7f6..3fa73b811ac61b83b113035fe54ae9e195553922 100644 (file)
--- a/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
+++ b/meta/packages/xorg-lib/libxtst_1.0.1.bb
@@ -8,3 +8,4 @@ PROVIDES = "xtst"
 
 XORG_PN = "libXtst"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb
similarity index 94%
rename from meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
rename to meta/packages/xorg-lib/libxxf86dga_1.0.1.bb
index e067190b84da3e77a9c68b8f5384fb005313bfee..e56397593324a1259719ae70f253dd06c0ddb502 100644 (file)
--- a/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb
@@ -6,3 +6,4 @@ DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto"
 
 XORG_PN = "libXxf86dga"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86misc_1.0.1.bb
similarity index 94%
rename from meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
rename to meta/packages/xorg-lib/libxxf86misc_1.0.1.bb
index 3af4acba96b9cb8a6d93c0a76b44c7835f3d60c6..16fe73511c359fd7b81594b9cc7dbb7faa3ef7aa 100644 (file)
--- a/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-lib/libxxf86misc_1.0.1.bb
@@ -7,3 +7,4 @@ PROVIDES = "xxf86misc"
 
 XORG_PN = "libXxf86misc"
 
+PE = "1"

diff --git a/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86vm_1.0.1.bb
similarity index 94%
rename from meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
rename to meta/packages/xorg-lib/libxxf86vm_1.0.1.bb
index b85e2d2477a90fb70b77a732791d2451f15a5f26..a82c997b3644e6982064a53e15111ebe315f83bc 100644 (file)
--- a/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-lib/libxxf86vm_1.0.1.bb
@@ -6,3 +6,4 @@ DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto"
 
 XORG_PN = "libXxf86vm"
 
+PE = "1"