diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-07-04 14:45:36 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-07-04 14:45:36 +0000 |
commit | 6c9d93a8c6ea5a8a4996dc6e6393b4ce83abe216 (patch) | |
tree | 8e1e43ceacf3da7f618bb62dd976829b313715ed /meta/packages/xorg-lib | |
parent | d48249ddf3745d3fe7c8ced9c58e3b3308fce8bb (diff) | |
download | poky-6c9d93a8c6ea5a8a4996dc6e6393b4ce83abe216.tar.gz |
xorg-lib: X11 cleanup part 2: added DESCRIPTION fields, fixed DEPENDS lines, fixed order of fields
- dropped old unused recipes: libice 1.0.1, libxevie 1.0.1, libxext 1.0.1
- dependencies are cleaned as many recipes had repeated deps of own deps
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2099 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-lib')
56 files changed, 204 insertions, 331 deletions
diff --git a/meta/packages/xorg-lib/diet-x11_1.1.1.bb b/meta/packages/xorg-lib/diet-x11_1.1.1.bb index ce5e2b4b8b..33fda1cd66 100644 --- a/meta/packages/xorg-lib/diet-x11_1.1.1.bb +++ b/meta/packages/xorg-lib/diet-x11_1.1.1.bb | |||
@@ -1,11 +1,10 @@ | |||
1 | SECTION = "x11/base" | ||
2 | require libx11_${PV}.bb | 1 | require libx11_${PV}.bb |
3 | 2 | ||
4 | PE = "1" | 3 | PR = "r1" |
5 | |||
6 | EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" | ||
7 | CFLAGS += "-D_GNU_SOURCE" | ||
8 | 4 | ||
9 | SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ | 5 | SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ |
10 | file://fix-disable-xlocale.diff;patch=1 \ | 6 | file://fix-disable-xlocale.diff;patch=1 \ |
11 | file://fix-utf8-wrong-define.patch;patch=1" | 7 | file://fix-utf8-wrong-define.patch;patch=1" |
8 | |||
9 | EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" | ||
10 | CFLAGS += "-D_GNU_SOURCE" | ||
diff --git a/meta/packages/xorg-lib/libapplewm_1.0.0.bb b/meta/packages/xorg-lib/libapplewm_1.0.0.bb index ee847a9ddd..bc502fb505 100644 --- a/meta/packages/xorg-lib/libapplewm_1.0.0.bb +++ b/meta/packages/xorg-lib/libapplewm_1.0.0.bb | |||
@@ -1,9 +1,7 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | #DESCRIPTION = "" | 3 | DEPENDS += "libxext applewmproto" |
4 | 4 | PR = "r1" | |
5 | DEPENDS += " virtual/libx11 libxext xextproto applewmproto" | 5 | PE = "1" |
6 | 6 | ||
7 | XORG_PN = "libAppleWM" | 7 | XORG_PN = "libAppleWM" |
8 | |||
9 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libdmx_1.0.2.bb b/meta/packages/xorg-lib/libdmx_1.0.2.bb index 601aad10a6..9b66101563 100644 --- a/meta/packages/xorg-lib/libdmx_1.0.2.bb +++ b/meta/packages/xorg-lib/libdmx_1.0.2.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | #DESCRIPTION = "" | 3 | DESCRIPTION = "X11 Distributed Multihead extension library" |
4 | 4 | DEPENDS += "libxext dmxproto" | |
5 | DEPENDS += " virtual/libx11 libxext xextproto dmxproto" | 5 | PR = "r1" |
6 | PE = "1" | 6 | PE = "1" |
diff --git a/meta/packages/xorg-lib/libfontenc-native_1.0.4.bb b/meta/packages/xorg-lib/libfontenc-native_1.0.4.bb index 9135244ab7..a907e08f12 100644 --- a/meta/packages/xorg-lib/libfontenc-native_1.0.4.bb +++ b/meta/packages/xorg-lib/libfontenc-native_1.0.4.bb | |||
@@ -1,14 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require libfontenc_${PV}.bb |
2 | DESCRIPTION = "X libfontenc library (used by libxfont)." | ||
3 | SECTION = "x11/libs" | ||
4 | PRIORITY = "optional" | ||
5 | LICENSE = "BSD-X" | ||
6 | 2 | ||
7 | DEPENDS = "zlib-native xproto-native" | 3 | DEPENDS = "zlib-native xproto-native" |
8 | |||
9 | PE = "1" | 4 | PE = "1" |
10 | 5 | ||
11 | XORG_PN = "libfontenc" | 6 | XORG_PN = "libfontenc" |
12 | S = "${WORKDIR}/libfontenc-${PV}" | ||
13 | 7 | ||
14 | inherit native autotools pkgconfig | 8 | inherit native |
diff --git a/meta/packages/xorg-lib/libfontenc_1.0.4.bb b/meta/packages/xorg-lib/libfontenc_1.0.4.bb index afb7ffe10e..654fc72eca 100644 --- a/meta/packages/xorg-lib/libfontenc_1.0.4.bb +++ b/meta/packages/xorg-lib/libfontenc_1.0.4.bb | |||
@@ -1,9 +1,7 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "X fontenc library (used by libxfont)." | 3 | DESCRIPTION = "X11 font encoding library" |
5 | LICENSE = "BSD-X" | 4 | LICENSE = "BSD-X" |
6 | PRIORITY = "optional" | 5 | DEPENDS += "zlib xproto" |
7 | 6 | PR = "r1" | |
8 | DEPENDS += " zlib xproto" | 7 | PE = "1" |
9 | |||
diff --git a/meta/packages/xorg-lib/libfs_1.0.0.bb b/meta/packages/xorg-lib/libfs_1.0.0.bb index 775f4ed3b3..010aa311e0 100644 --- a/meta/packages/xorg-lib/libfs_1.0.0.bb +++ b/meta/packages/xorg-lib/libfs_1.0.0.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | #DESCRIPTION = " " | 3 | DESCRIPTION = "X11 Font Services library" |
4 | 4 | DEPENDS += "xproto fontsproto xtrans" | |
5 | DEPENDS += " xproto fontsproto xtrans" | 5 | PR = "r1" |
6 | PE = "1" | ||
6 | 7 | ||
7 | XORG_PN = "libFS" | 8 | XORG_PN = "libFS" |
8 | |||
9 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libice_1.0.1.bb b/meta/packages/xorg-lib/libice_1.0.1.bb deleted file mode 100644 index e3fa1f9791..0000000000 --- a/meta/packages/xorg-lib/libice_1.0.1.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | DESCRIPTION = "X11 ICE library" | ||
4 | PRIORITY = "optional" | ||
5 | |||
6 | DEPENDS += " xproto xtrans" | ||
7 | PROVIDES = "ice" | ||
8 | |||
9 | XORG_PN = "libICE" | ||
10 | |||
11 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libice_1.0.3.bb b/meta/packages/xorg-lib/libice_1.0.3.bb index 28d0885370..e4a6557397 100644 --- a/meta/packages/xorg-lib/libice_1.0.3.bb +++ b/meta/packages/xorg-lib/libice_1.0.3.bb | |||
@@ -1,12 +1,9 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | PE = "1" | 3 | DESCRIPTION = "X11 Inter-Client Exchange library" |
4 | 4 | DEPENDS += "xproto xtrans" | |
5 | DESCRIPTION = "X11 ICE library" | ||
6 | PRIORITY = "optional" | ||
7 | |||
8 | DEPENDS += " xproto xtrans" | ||
9 | PROVIDES = "ice" | 5 | PROVIDES = "ice" |
6 | PR = "r1" | ||
7 | PE = "1" | ||
10 | 8 | ||
11 | XORG_PN = "libICE" | 9 | XORG_PN = "libICE" |
12 | |||
diff --git a/meta/packages/xorg-lib/liblbxutil_1.0.1.bb b/meta/packages/xorg-lib/liblbxutil_1.0.1.bb index ec228fbcb7..adb7b0513e 100644 --- a/meta/packages/xorg-lib/liblbxutil_1.0.1.bb +++ b/meta/packages/xorg-lib/liblbxutil_1.0.1.bb | |||
@@ -1,11 +1,10 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | export CC_FOR_BUILD = "gcc" | ||
4 | |||
5 | SRC_URI += "file://mkg3states.patch;patch=1" | ||
6 | |||
7 | DESCRIPTION = "XFIXES Extension" | 3 | DESCRIPTION = "XFIXES Extension" |
8 | |||
9 | DEPENDS += " xextproto xproto zlib" | 4 | DEPENDS += " xextproto xproto zlib" |
10 | PROVIDES = "lbxutil" | 5 | PROVIDES = "lbxutil" |
11 | PE = "1" | 6 | PE = "1" |
7 | |||
8 | SRC_URI += "file://mkg3states.patch;patch=1" | ||
9 | |||
10 | export CC_FOR_BUILD = "gcc" | ||
diff --git a/meta/packages/xorg-lib/liboldx_1.0.1.bb b/meta/packages/xorg-lib/liboldx_1.0.1.bb index 99dd24b00b..84470cbc78 100644 --- a/meta/packages/xorg-lib/liboldx_1.0.1.bb +++ b/meta/packages/xorg-lib/liboldx_1.0.1.bb | |||
@@ -1,9 +1,6 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | #DESCRIPTION = "" | ||
4 | |||
5 | DEPENDS += " virtual/libx11" | 3 | DEPENDS += " virtual/libx11" |
4 | PE = "1" | ||
6 | 5 | ||
7 | XORG_PN = "liboldX" | 6 | XORG_PN = "liboldX" |
8 | |||
9 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libsm_1.0.2.bb b/meta/packages/xorg-lib/libsm_1.0.2.bb index e5113dfc76..edb6ff45ca 100644 --- a/meta/packages/xorg-lib/libsm_1.0.2.bb +++ b/meta/packages/xorg-lib/libsm_1.0.2.bb | |||
@@ -1,10 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | |||
4 | DESCRIPTION = "Session management library" | ||
5 | PRIORITY = "optional" | ||
6 | 2 | ||
7 | DEPENDS += " libice xproto xtrans" | 3 | DESCRIPTION = "X11 Session management library" |
4 | DEPENDS += "libice xproto xtrans" | ||
5 | PR = "r1" | ||
6 | PE = "1" | ||
8 | 7 | ||
9 | XORG_PN = "libSM" | 8 | XORG_PN = "libSM" |
10 | |||
diff --git a/meta/packages/xorg-lib/libwindowswm_1.0.0.bb b/meta/packages/xorg-lib/libwindowswm_1.0.0.bb index b3b366b069..a03d49505b 100644 --- a/meta/packages/xorg-lib/libwindowswm_1.0.0.bb +++ b/meta/packages/xorg-lib/libwindowswm_1.0.0.bb | |||
@@ -1,9 +1,6 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | #DESCRIPTION = "" | 3 | DEPENDS += "libxext windowswmproto" |
4 | 4 | PE = "1" | |
5 | DEPENDS += " virtual/libx11 libxext xextproto windowswmproto" | ||
6 | 5 | ||
7 | XORG_PN = "libWindowsWM" | 6 | XORG_PN = "libWindowsWM" |
8 | |||
9 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libx11_1.1.1.bb b/meta/packages/xorg-lib/libx11_1.1.1.bb index f639372ac7..3bd760e796 100644 --- a/meta/packages/xorg-lib/libx11_1.1.1.bb +++ b/meta/packages/xorg-lib/libx11_1.1.1.bb | |||
@@ -1,23 +1,16 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | DESCRIPTION = "Base X libs." | 3 | DESCRIPTION = "Base X libs." |
4 | 4 | DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ | |
5 | DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ | 5 | libxdmcp xf86bigfontproto kbproto inputproto" |
6 | libxdmcp xf86bigfontproto kbproto inputproto" | ||
7 | PROVIDES = "virtual/libx11" | 6 | PROVIDES = "virtual/libx11" |
8 | # RPROVIDES = "virtual/libx11" | 7 | PR = "r1" |
9 | PE = "1" | 8 | PE = "1" |
10 | 9 | ||
11 | SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.1.1.tar.bz2" | ||
12 | S = "${WORKDIR}/${XORG_PN}-1.1.1" | ||
13 | |||
14 | XORG_PN = "libX11" | 10 | XORG_PN = "libX11" |
15 | 11 | ||
16 | EXTRA_OECONF += "--without-xcb" | 12 | EXTRA_OECONF += "--without-xcb" |
17 | 13 | ||
18 | FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" | ||
19 | FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" | ||
20 | |||
21 | do_compile() { | 14 | do_compile() { |
22 | ( | 15 | ( |
23 | unset CC LD CXX CCLD | 16 | unset CC LD CXX CCLD |
@@ -26,3 +19,6 @@ do_compile() { | |||
26 | rm -f ${STAGING_INCDIR}/X11/Xlib.h | 19 | rm -f ${STAGING_INCDIR}/X11/Xlib.h |
27 | oe_runmake | 20 | oe_runmake |
28 | } | 21 | } |
22 | |||
23 | FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" | ||
24 | FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" | ||
diff --git a/meta/packages/xorg-lib/libxau-native_1.0.3.bb b/meta/packages/xorg-lib/libxau-native_1.0.3.bb index f3e73daf38..953a93adf1 100644 --- a/meta/packages/xorg-lib/libxau-native_1.0.3.bb +++ b/meta/packages/xorg-lib/libxau-native_1.0.3.bb | |||
@@ -1,11 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require libxau_${PV}.bb |
2 | SECTION = "x11/libs" | ||
3 | PRIORITY = "optional" | ||
4 | LICENSE = "BSD-X" | ||
5 | 2 | ||
6 | DEPENDS = "xproto-native util-macros-native" | 3 | DEPENDS = "xproto-native util-macros-native" |
4 | PR = "r1" | ||
7 | 5 | ||
8 | XORG_PN = "libXau" | 6 | XORG_PN = "libXau" |
9 | S = "${WORKDIR}/libXau-${PV}" | ||
10 | 7 | ||
11 | inherit native autotools pkgconfig | 8 | inherit native |
diff --git a/meta/packages/xorg-lib/libxau_1.0.3.bb b/meta/packages/xorg-lib/libxau_1.0.3.bb index dcde9b4da2..3a77534cff 100644 --- a/meta/packages/xorg-lib/libxau_1.0.3.bb +++ b/meta/packages/xorg-lib/libxau_1.0.3.bb | |||
@@ -1,11 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "A Sample Authorization Protocol for X" | 3 | DESCRIPTION = "A Sample Authorization Protocol for X" |
5 | PRIORITY = "optional" | ||
6 | |||
7 | DEPENDS += " xproto" | 4 | DEPENDS += " xproto" |
8 | PROVIDES = "xau" | 5 | PROVIDES = "xau" |
6 | PE = "1" | ||
9 | 7 | ||
10 | XORG_PN = "libXau" | 8 | XORG_PN = "libXau" |
11 | |||
diff --git a/meta/packages/xorg-lib/libxaw_1.0.3.bb b/meta/packages/xorg-lib/libxaw_1.0.3.bb index 7e7f91b82f..f45431e79e 100644 --- a/meta/packages/xorg-lib/libxaw_1.0.3.bb +++ b/meta/packages/xorg-lib/libxaw_1.0.3.bb | |||
@@ -1,14 +1,14 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | DESCRIPTION = "Xaw is the X Athena Widget Set." | 3 | DESCRIPTION = "X Athena Widget Set" |
4 | DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" | 4 | DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" |
5 | PROVIDES = "xaw" | 5 | PROVIDES = "xaw" |
6 | PR = "r1" | ||
6 | PE = "1" | 7 | PE = "1" |
7 | 8 | ||
8 | XORG_PN = "libXaw" | 9 | XORG_PN = "libXaw" |
9 | 10 | ||
10 | do_stage () { | 11 | do_stage_append () { |
11 | autotools_stage_all | ||
12 | ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6 | 12 | ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6 |
13 | ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 | 13 | ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 |
14 | ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so | 14 | ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so |
diff --git a/meta/packages/xorg-lib/libxcalibrate_git.bb b/meta/packages/xorg-lib/libxcalibrate_git.bb index aa4b77b39d..99f11e40fd 100644 --- a/meta/packages/xorg-lib/libxcalibrate_git.bb +++ b/meta/packages/xorg-lib/libxcalibrate_git.bb | |||
@@ -1,21 +1,14 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
1 | DESCRIPTION = " Touchscreen calibration client library" | 3 | DESCRIPTION = " Touchscreen calibration client library" |
2 | SECTION = "x11/libs" | ||
3 | PRIORITY = "optional" | ||
4 | LICENSE = "BSD-X" | 4 | LICENSE = "BSD-X" |
5 | |||
6 | PV = "0.0+git${SRCDATE}" | ||
7 | PR = "r1" | ||
8 | |||
9 | DEPENDS = "virtual/libx11 calibrateproto libxext" | 5 | DEPENDS = "virtual/libx11 calibrateproto libxext" |
10 | 6 | PV = "0.0+git${SRCDATE}" | |
11 | FILES_${PN}-locale += "${datadir}/X11/locale" | 7 | PR = "r2" |
12 | 8 | ||
13 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62 \ | 9 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62 \ |
14 | file://coords.patch;patch=1" | 10 | file://coords.patch;patch=1" |
15 | S = "${WORKDIR}/git" | ||
16 | 11 | ||
17 | inherit autotools pkgconfig | 12 | S = "${WORKDIR}/git" |
18 | 13 | ||
19 | do_stage() { | 14 | FILES_${PN}-locale += "${datadir}/X11/locale" |
20 | autotools_stage_all | ||
21 | } | ||
diff --git a/meta/packages/xorg-lib/libxcomposite_0.3.1.bb b/meta/packages/xorg-lib/libxcomposite_0.3.1.bb index 71842d4a4d..8921b927bf 100644 --- a/meta/packages/xorg-lib/libxcomposite_0.3.1.bb +++ b/meta/packages/xorg-lib/libxcomposite_0.3.1.bb | |||
@@ -1,11 +1,10 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "X Composite extension library." | 3 | DESCRIPTION = "X Composite extension library." |
5 | LICENSE= "BSD-X" | 4 | LICENSE= "BSD-X" |
6 | |||
7 | DEPENDS += " compositeproto virtual/libx11 libxfixes" | 5 | DEPENDS += " compositeproto virtual/libx11 libxfixes" |
8 | PROVIDES = "xcomposite" | 6 | PROVIDES = "xcomposite" |
7 | PE = "1" | ||
9 | 8 | ||
10 | XORG_PN = "libXcomposite" | 9 | XORG_PN = "libXcomposite" |
11 | 10 | ||
diff --git a/meta/packages/xorg-lib/libxcursor_1.1.8.bb b/meta/packages/xorg-lib/libxcursor_1.1.8.bb index 6eb0bcca1f..4713eccc48 100644 --- a/meta/packages/xorg-lib/libxcursor_1.1.8.bb +++ b/meta/packages/xorg-lib/libxcursor_1.1.8.bb | |||
@@ -1,12 +1,9 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | PR = "r1" | ||
4 | 2 | ||
5 | DESCRIPTION = "X Cursor library" | 3 | DESCRIPTION = "X cursor management library" |
6 | LICENSE= "BSD-X" | 4 | LICENSE= "BSD-X" |
7 | 5 | DEPENDS += "libxrender libxfixes" | |
8 | DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" | 6 | PR = "r2" |
7 | PE = "1" | ||
9 | 8 | ||
10 | XORG_PN = "libXcursor" | 9 | XORG_PN = "libXcursor" |
11 | |||
12 | FILES_libxcursor = "${libdir}/*.so.*" | ||
diff --git a/meta/packages/xorg-lib/libxdamage_1.0.4.bb b/meta/packages/xorg-lib/libxdamage_1.0.4.bb index dd6fc42df6..e56d1d0954 100644 --- a/meta/packages/xorg-lib/libxdamage_1.0.4.bb +++ b/meta/packages/xorg-lib/libxdamage_1.0.4.bb | |||
@@ -1,11 +1,10 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "X Damage extension library." | 3 | DESCRIPTION = "X11 damaged region extension library" |
5 | LICENSE= "BSD-X" | 4 | LICENSE= "BSD-X" |
6 | 5 | DEPENDS += "damageproto libxfixes" | |
7 | DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" | ||
8 | PROVIDES = "xdamage" | 6 | PROVIDES = "xdamage" |
7 | PR = "r1" | ||
8 | PE = "1" | ||
9 | 9 | ||
10 | XORG_PN = "libXdamage" | 10 | XORG_PN = "libXdamage" |
11 | |||
diff --git a/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb index 2438a7b599..d57f8ac48e 100644 --- a/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb +++ b/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb | |||
@@ -1,11 +1,9 @@ | |||
1 | SECTION = "x11/libs" | 1 | require libxdmcp_${PV}.bb |
2 | PRIORITY = "optional" | ||
3 | LICENSE = "BSD-X" | ||
4 | PE = "1" | ||
5 | 2 | ||
6 | DEPENDS = "xproto-native util-macros-native" | 3 | DEPENDS = "xproto-native util-macros-native" |
4 | PR = "r1" | ||
5 | PE = "1" | ||
7 | 6 | ||
8 | SRC_URI = "${XORG_MIRROR}/individual/lib/libXdmcp-${PV}.tar.bz2" | 7 | XORG_PN = "libXdmcp" |
9 | S = "${WORKDIR}/libXdmcp-${PV}" | ||
10 | 8 | ||
11 | inherit native autotools pkgconfig | 9 | inherit native |
diff --git a/meta/packages/xorg-lib/libxdmcp_1.0.2.bb b/meta/packages/xorg-lib/libxdmcp_1.0.2.bb index 109c5b5615..0aa95b4677 100644 --- a/meta/packages/xorg-lib/libxdmcp_1.0.2.bb +++ b/meta/packages/xorg-lib/libxdmcp_1.0.2.bb | |||
@@ -1,11 +1,9 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | |||
4 | DESCRIPTION = "X Display Manager Control Protocol library." | ||
5 | PRIORITY = "optional" | ||
6 | 2 | ||
7 | DEPENDS += " xproto" | 3 | DESCRIPTION = "X Display Manager Control Protocol library" |
4 | DEPENDS += "xproto" | ||
8 | PROVIDES = "xdmcp" | 5 | PROVIDES = "xdmcp" |
6 | PR = "r1" | ||
7 | PE = "1" | ||
9 | 8 | ||
10 | XORG_PN = "libXdmcp" | 9 | XORG_PN = "libXdmcp" |
11 | |||
diff --git a/meta/packages/xorg-lib/libxevie_1.0.1.bb b/meta/packages/xorg-lib/libxevie_1.0.1.bb deleted file mode 100644 index 71abb2c567..0000000000 --- a/meta/packages/xorg-lib/libxevie_1.0.1.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | #DESCRIPTION = "" | ||
4 | |||
5 | DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" | ||
6 | |||
7 | XORG_PN = "libXevie" | ||
8 | |||
9 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libxevie_1.0.2.bb b/meta/packages/xorg-lib/libxevie_1.0.2.bb index 06985bd112..6c6b4595aa 100644 --- a/meta/packages/xorg-lib/libxevie_1.0.2.bb +++ b/meta/packages/xorg-lib/libxevie_1.0.2.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | |||
4 | #DESCRIPTION = "" | ||
5 | 2 | ||
6 | DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" | 3 | DESCRIPTION = "X11 EvIE extension library" |
4 | DEPENDS += "libxext evieext" | ||
5 | PR = "r1" | ||
6 | PE = "1" | ||
7 | 7 | ||
8 | XORG_PN = "libXevie" | 8 | XORG_PN = "libXevie" |
9 | |||
diff --git a/meta/packages/xorg-lib/libxext_1.0.1.bb b/meta/packages/xorg-lib/libxext_1.0.1.bb deleted file mode 100644 index 4d30befbe0..0000000000 --- a/meta/packages/xorg-lib/libxext_1.0.1.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | require xorg-lib-common.inc | ||
2 | |||
3 | DESCRIPTION = "X Server Extension library" | ||
4 | PRIORITY = "optional" | ||
5 | |||
6 | DEPENDS += " xproto virtual/libx11 xextproto libxau" | ||
7 | PROVIDES = "xext" | ||
8 | PE = "1" | ||
9 | |||
10 | XORG_PN = "libXext" | ||
11 | |||
diff --git a/meta/packages/xorg-lib/libxext_1.0.3.bb b/meta/packages/xorg-lib/libxext_1.0.3.bb index a64067e2ad..81231a866c 100644 --- a/meta/packages/xorg-lib/libxext_1.0.3.bb +++ b/meta/packages/xorg-lib/libxext_1.0.3.bb | |||
@@ -1,11 +1,9 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | |||
4 | DESCRIPTION = "X Server Extension library" | ||
5 | PRIORITY = "optional" | ||
6 | 2 | ||
7 | DEPENDS += " xproto virtual/libx11 xextproto libxau" | 3 | DESCRIPTION = "X11 miscellaneous extension library" |
4 | DEPENDS += "xproto virtual/libx11 xextproto libxau" | ||
8 | PROVIDES = "xext" | 5 | PROVIDES = "xext" |
6 | PR = "r1" | ||
7 | PE = "1" | ||
9 | 8 | ||
10 | XORG_PN = "libXext" | 9 | XORG_PN = "libXext" |
11 | |||
diff --git a/meta/packages/xorg-lib/libxfixes_4.0.3.bb b/meta/packages/xorg-lib/libxfixes_4.0.3.bb index cffe56a03a..5b2100a815 100644 --- a/meta/packages/xorg-lib/libxfixes_4.0.3.bb +++ b/meta/packages/xorg-lib/libxfixes_4.0.3.bb | |||
@@ -1,10 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "X Fixes extension library." | 3 | DESCRIPTION = "X Fixes extension library." |
5 | LICENSE= "BSD-X" | 4 | LICENSE= "BSD-X" |
6 | 5 | DEPENDS += "virtual/libx11 xproto fixesproto xextproto" | |
7 | DEPENDS += " virtual/libx11 xproto fixesproto xextproto" | 6 | PE = "1" |
8 | 7 | ||
9 | XORG_PN = "libXfixes" | 8 | XORG_PN = "libXfixes" |
10 | |||
diff --git a/meta/packages/xorg-lib/libxfont-native_1.2.8.bb b/meta/packages/xorg-lib/libxfont-native_1.2.8.bb index 3fd134bd8b..4f9cb8073a 100644 --- a/meta/packages/xorg-lib/libxfont-native_1.2.8.bb +++ b/meta/packages/xorg-lib/libxfont-native_1.2.8.bb | |||
@@ -1,13 +1,10 @@ | |||
1 | DESCRIPTION = "X font library (used by the X server)." | 1 | require libxfont_${PV}.bb |
2 | SECTION = "x11/libs" | ||
3 | PRIORITY = "optional" | ||
4 | LICENSE = "BSD-X" | ||
5 | PE = "1" | ||
6 | |||
7 | DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native" | ||
8 | 2 | ||
9 | SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" | 3 | DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native \ |
10 | S = "${WORKDIR}/libXfont-1.2.0" | 4 | libfontenc-native xtrans-native freetype-native util-macros-native" |
5 | PE = "1" | ||
11 | 6 | ||
12 | inherit native autotools pkgconfig | 7 | # no need for patch used in libxfont |
8 | SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2" | ||
13 | 9 | ||
10 | inherit native | ||
diff --git a/meta/packages/xorg-lib/libxfont_1.2.8.bb b/meta/packages/xorg-lib/libxfont_1.2.8.bb index cc855c0106..dff7a0fb6f 100644 --- a/meta/packages/xorg-lib/libxfont_1.2.8.bb +++ b/meta/packages/xorg-lib/libxfont_1.2.8.bb | |||
@@ -1,14 +1,12 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "X font library (used by the X server)." | 3 | DESCRIPTION = "X11 font rasterisation library" |
5 | LICENSE= "BSD-X" | 4 | LICENSE= "BSD-X" |
6 | PRIORITY = "optional" | 5 | DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc" |
6 | PROVIDES = "xfont" | ||
7 | PR = "r1" | ||
8 | PE = "1" | ||
7 | 9 | ||
8 | SRC_URI += "file://no-scalable-crash.patch;patch=1" | 10 | SRC_URI += "file://no-scalable-crash.patch;patch=1" |
9 | 11 | ||
10 | DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" | ||
11 | PROVIDES = "xfont" | ||
12 | |||
13 | XORG_PN = "libXfont" | 12 | XORG_PN = "libXfont" |
14 | |||
diff --git a/meta/packages/xorg-lib/libxfontcache_1.0.4.bb b/meta/packages/xorg-lib/libxfontcache_1.0.4.bb index 1e45867950..ee999de4f5 100644 --- a/meta/packages/xorg-lib/libxfontcache_1.0.4.bb +++ b/meta/packages/xorg-lib/libxfontcache_1.0.4.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | |||
4 | #DESCRIPTION = "" | ||
5 | 2 | ||
6 | DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" | 3 | DESCRIPTION = "X-TrueType font cache extension client library" |
4 | DEPENDS += "libxext fontcacheproto" | ||
5 | PR = "r1" | ||
6 | PE = "1" | ||
7 | 7 | ||
8 | XORG_PN = "libXfontcache" | 8 | XORG_PN = "libXfontcache" |
9 | |||
diff --git a/meta/packages/xorg-lib/libxft_2.1.12.bb b/meta/packages/xorg-lib/libxft_2.1.12.bb index 8843938d4e..8e54dac01d 100644 --- a/meta/packages/xorg-lib/libxft_2.1.12.bb +++ b/meta/packages/xorg-lib/libxft_2.1.12.bb | |||
@@ -1,24 +1,20 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | SRC_URI = "${XORG_MIRROR}/individual/lib/libXft-2.1.12.tar.bz2" | 3 | DESCRIPTION = "FreeType-based font drawing library for X" |
4 | S = "${WORKDIR}/${XORG_PN}-2.1.12" | 4 | DEPENDS += "libxrender freetype fontconfig" |
5 | |||
6 | |||
7 | DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." | ||
8 | |||
9 | DEPENDS += " libxrender freetype fontconfig" | ||
10 | PROVIDES = "xft" | 5 | PROVIDES = "xft" |
6 | PR = "r1" | ||
11 | PE = "1" | 7 | PE = "1" |
12 | 8 | ||
13 | XORG_PN = "libXft" | 9 | XORG_PN = "libXft" |
14 | 10 | ||
15 | FILES_${PN} = "${libdir}/lib*.so.*" | ||
16 | FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ | ||
17 | ${libdir}/*.a ${libdir}/pkgconfig \ | ||
18 | ${datadir}/aclocal ${bindir} ${sbindir}" | ||
19 | |||
20 | python do_package() { | 11 | python do_package() { |
21 | if bb.data.getVar('DEBIAN_NAMES', d, 1): | 12 | if bb.data.getVar('DEBIAN_NAMES', d, 1): |
22 | bb.data.setVar('PKG_${PN}', 'libxft2', d) | 13 | bb.data.setVar('PKG_${PN}', 'libxft2', d) |
23 | bb.build.exec_func('package_do_package', d) | 14 | bb.build.exec_func('package_do_package', d) |
24 | } | 15 | } |
16 | |||
17 | FILES_${PN} = "${libdir}/lib*.so.*" | ||
18 | FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ | ||
19 | ${libdir}/*.a ${libdir}/pkgconfig \ | ||
20 | ${datadir}/aclocal ${bindir} ${sbindir}" | ||
diff --git a/meta/packages/xorg-lib/libxi_1.1.0.bb b/meta/packages/xorg-lib/libxi_1.1.0.bb index 84c67f5ae3..31e3b4906d 100644 --- a/meta/packages/xorg-lib/libxi_1.1.0.bb +++ b/meta/packages/xorg-lib/libxi_1.1.0.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | |||
4 | DESCRIPTION = "X Input extension library." | ||
5 | 2 | ||
6 | DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" | 3 | DESCRIPTION = "X11 Input extension library" |
4 | DEPENDS += "libxext inputproto" | ||
5 | PR = "r1" | ||
6 | PE = "1" | ||
7 | 7 | ||
8 | XORG_PN = "libXi" | 8 | XORG_PN = "libXi" |
9 | |||
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2.bb b/meta/packages/xorg-lib/libxinerama_1.0.2.bb index 193928a2dc..b7135bc28e 100644 --- a/meta/packages/xorg-lib/libxinerama_1.0.2.bb +++ b/meta/packages/xorg-lib/libxinerama_1.0.2.bb | |||
@@ -1,12 +1,9 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | DESCRIPTION = "Xinerama library" | 3 | DESCRIPTION = "X11 Xinerama extension library" |
4 | PRIORITY = "optional" | 4 | DEPENDS += "libxext xineramaproto" |
5 | PE = "1" | ||
6 | PR = "r2" | ||
7 | |||
8 | DEPENDS += " virtual/libx11 libxext xextproto xineramaproto" | ||
9 | PROVIDES = "xinerama" | 5 | PROVIDES = "xinerama" |
6 | PR = "r3" | ||
7 | PE = "1" | ||
10 | 8 | ||
11 | XORG_PN = "libXinerama" | 9 | XORG_PN = "libXinerama" |
12 | |||
diff --git a/meta/packages/xorg-lib/libxkbfile_1.0.4.bb b/meta/packages/xorg-lib/libxkbfile_1.0.4.bb index 2d9b778d02..a404180d49 100644 --- a/meta/packages/xorg-lib/libxkbfile_1.0.4.bb +++ b/meta/packages/xorg-lib/libxkbfile_1.0.4.bb | |||
@@ -1,9 +1,7 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "X11 keyboard library" | 3 | DESCRIPTION = "X11 keyboard file manipulation library" |
5 | LICENSE= "GPL" | 4 | LICENSE= "GPL" |
6 | PRIORITY = "optional" | 5 | DEPENDS += "virtual/libx11 kbproto" |
7 | 6 | PR = "r1" | |
8 | DEPENDS += " virtual/libx11 kbproto" | 7 | PE = "1" |
9 | |||
diff --git a/meta/packages/xorg-lib/libxkbui_1.0.2.bb b/meta/packages/xorg-lib/libxkbui_1.0.2.bb index 619b8a34b0..9a3f5f1327 100644 --- a/meta/packages/xorg-lib/libxkbui_1.0.2.bb +++ b/meta/packages/xorg-lib/libxkbui_1.0.2.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | DESCRIPTION = "X11 lbxkbui library" | 3 | DESCRIPTION = "X11 keyboard UI presentation library" |
4 | LICENSE= "GPL" | 4 | LICENSE= "GPL" |
5 | PRIORITY = "optional" | 5 | DEPENDS += "virtual/libx11 libxt libxkbfile" |
6 | PE = "1" | ||
7 | |||
8 | DEPENDS += " virtual/libx11 libxt libxkbfile" | ||
9 | PROVIDES = "xkbui" | 6 | PROVIDES = "xkbui" |
7 | PR = "r1" | ||
8 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libxmu_1.0.3.bb b/meta/packages/xorg-lib/libxmu_1.0.3.bb index e055874b3d..9a02bf82be 100644 --- a/meta/packages/xorg-lib/libxmu_1.0.3.bb +++ b/meta/packages/xorg-lib/libxmu_1.0.3.bb | |||
@@ -1,17 +1,16 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | |||
4 | DESCRIPTION = "X Window System miscellaneous utility library" | ||
5 | PRIORITY = "optional" | ||
6 | 2 | ||
7 | DEPENDS += " libxt libxext xextproto virtual/libx11" | 3 | DESCRIPTION = "X11 miscellaneous utility library" |
4 | DEPENDS += "libxt libxext" | ||
8 | PROVIDES = "xmu" | 5 | PROVIDES = "xmu" |
6 | PR = "r1" | ||
7 | PE = "1" | ||
9 | 8 | ||
10 | XORG_PN = "libXmu" | 9 | XORG_PN = "libXmu" |
11 | 10 | ||
11 | LEAD_SONAME = "libXmu" | ||
12 | |||
12 | PACKAGES =+ "libxmuu libxmuu-dev" | 13 | PACKAGES =+ "libxmuu libxmuu-dev" |
13 | 14 | ||
14 | FILES_libxmuu = "${libdir}/libXmuu.so.*" | 15 | FILES_libxmuu = "${libdir}/libXmuu.so.*" |
15 | FILES_libxmuu-dev = "${libdir}/libXmuu.so" | 16 | FILES_libxmuu-dev = "${libdir}/libXmuu.so" |
16 | |||
17 | LEAD_SONAME = "libXmu" | ||
diff --git a/meta/packages/xorg-lib/libxp_1.0.0.bb b/meta/packages/xorg-lib/libxp_1.0.0.bb index 5dec1c26bb..53fb47c054 100644 --- a/meta/packages/xorg-lib/libxp_1.0.0.bb +++ b/meta/packages/xorg-lib/libxp_1.0.0.bb | |||
@@ -1,11 +1,10 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | DESCRIPTION = "X print extension library." | 3 | DESCRIPTION = "X Printing Extension (Xprint) client library" |
4 | 4 | DEPENDS += "libxext libxau printproto" | |
5 | DEPENDS += " virtual/libx11 libxext xextproto libxau printproto" | 5 | PR = "r1" |
6 | PE = "1" | ||
6 | 7 | ||
7 | XORG_PN = "libXp" | 8 | XORG_PN = "libXp" |
8 | PE = "1" | ||
9 | 9 | ||
10 | CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" | 10 | CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" |
11 | EXTRA_OECONF="--enable-malloc0returnsnull" | ||
diff --git a/meta/packages/xorg-lib/libxpm_3.5.6.bb b/meta/packages/xorg-lib/libxpm_3.5.6.bb index 60779da43f..4e0a6eaacd 100644 --- a/meta/packages/xorg-lib/libxpm_3.5.6.bb +++ b/meta/packages/xorg-lib/libxpm_3.5.6.bb | |||
@@ -1,11 +1,10 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "X Pixmap library." | 3 | DESCRIPTION = "X11 Pixmap library" |
5 | PRIORITY = "optional" | ||
6 | LICENSE = "X-BSD" | 4 | LICENSE = "X-BSD" |
7 | 5 | DEPENDS += "libxt libxext" | |
8 | DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" | 6 | PR = "r1" |
7 | PE = "1" | ||
9 | 8 | ||
10 | XORG_PN = "libXpm" | 9 | XORG_PN = "libXpm" |
11 | 10 | ||
diff --git a/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb b/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb index fd8a39670a..3a24a888d1 100644 --- a/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb +++ b/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | #DESCRIPTION = "" | 3 | DESCRIPTION = "Xprint job utility client library" |
4 | 4 | DEPENDS += "libxp libxt libxprintutil" | |
5 | DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau" | 5 | PR = "r1" |
6 | PE = "1" | ||
6 | 7 | ||
7 | XORG_PN = "libXprintAppUtil" | 8 | XORG_PN = "libXprintAppUtil" |
8 | |||
9 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libxprintutil_1.0.1.bb b/meta/packages/xorg-lib/libxprintutil_1.0.1.bb index 67cf0be61d..327138e7fd 100644 --- a/meta/packages/xorg-lib/libxprintutil_1.0.1.bb +++ b/meta/packages/xorg-lib/libxprintutil_1.0.1.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | #DESCRIPTION = "" | 3 | DESCRIPTION = "Xprint printer utility client library" |
4 | 4 | DEPENDS += "libxp libxt" | |
5 | DEPENDS += " virtual/libx11 libxp libxt printproto libxau" | 5 | PR = "r1" |
6 | PE = "1" | ||
6 | 7 | ||
7 | XORG_PN = "libXprintUtil" | 8 | XORG_PN = "libXprintUtil" |
8 | |||
9 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libxrandr_1.2.1.bb b/meta/packages/xorg-lib/libxrandr_1.2.1.bb index 18e5deffb8..cf2a73a72c 100644 --- a/meta/packages/xorg-lib/libxrandr_1.2.1.bb +++ b/meta/packages/xorg-lib/libxrandr_1.2.1.bb | |||
@@ -1,10 +1,9 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "X Resize and Rotate extension library." | 3 | DESCRIPTION = "X11 Resize and Rotate extension library" |
5 | LICENSE = "BSD-X" | 4 | LICENSE = "BSD-X" |
6 | 5 | DEPENDS += "randrproto libxrender" | |
7 | DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" | 6 | PR = "r1" |
7 | PE = "1" | ||
8 | 8 | ||
9 | XORG_PN = "libXrandr" | 9 | XORG_PN = "libXrandr" |
10 | |||
diff --git a/meta/packages/xorg-lib/libxrender_0.9.2.bb b/meta/packages/xorg-lib/libxrender_0.9.2.bb index b1372d3dac..f8b9c37b50 100644 --- a/meta/packages/xorg-lib/libxrender_0.9.2.bb +++ b/meta/packages/xorg-lib/libxrender_0.9.2.bb | |||
@@ -1,10 +1,9 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "X Render extension library." | 3 | DESCRIPTION = "X11 Rendering Extension client library" |
5 | LICENSE = "BSD-X" | 4 | LICENSE = "BSD-X" |
6 | 5 | DEPENDS += "virtual/libx11 renderproto xproto" | |
7 | DEPENDS += " virtual/libx11 renderproto" | 6 | PR = "r1" |
7 | PE = "1" | ||
8 | 8 | ||
9 | XORG_PN = "libXrender" | 9 | XORG_PN = "libXrender" |
10 | |||
diff --git a/meta/packages/xorg-lib/libxres_1.0.3.bb b/meta/packages/xorg-lib/libxres_1.0.3.bb index b9d2fd68ce..02a0cae0d8 100644 --- a/meta/packages/xorg-lib/libxres_1.0.3.bb +++ b/meta/packages/xorg-lib/libxres_1.0.3.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | |||
4 | DESCRIPTION = "X Resource usage library." | ||
5 | 2 | ||
6 | DEPENDS += " virtual/libx11 libxext xextproto resourceproto" | 3 | DESCRIPTION = "X11 Resource extension library" |
4 | DEPENDS += "libxext resourceproto" | ||
5 | PR = "r1" | ||
6 | PE = "1" | ||
7 | 7 | ||
8 | XORG_PN = "libXres" | 8 | XORG_PN = "libXres" |
9 | |||
diff --git a/meta/packages/xorg-lib/libxscrnsaver_1.1.2.bb b/meta/packages/xorg-lib/libxscrnsaver_1.1.2.bb index 163ca199c1..ff22c337a0 100644 --- a/meta/packages/xorg-lib/libxscrnsaver_1.1.2.bb +++ b/meta/packages/xorg-lib/libxscrnsaver_1.1.2.bb | |||
@@ -1,14 +1,11 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | 2 | ||
4 | DESCRIPTION = "X screen saver extension library." | 3 | DESCRIPTION = "X Screen Saver extension library" |
5 | LICENSE = "GPL" | 4 | LICENSE = "GPL" |
6 | 5 | DEPENDS += "libxext scrnsaverproto" | |
7 | DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" | ||
8 | |||
9 | XORG_PN = "libXScrnSaver" | ||
10 | |||
11 | PROVIDES = "libxss" | 6 | PROVIDES = "libxss" |
12 | RREPLACES = "libxss" | 7 | RREPLACES = "libxss" |
8 | PR = "r1" | ||
9 | PE = "1" | ||
13 | 10 | ||
14 | #CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" | 11 | XORG_PN = "libXScrnSaver" |
diff --git a/meta/packages/xorg-lib/libxt_1.0.5.bb b/meta/packages/xorg-lib/libxt_1.0.5.bb index e67590bdf1..5b25c4b3a5 100644 --- a/meta/packages/xorg-lib/libxt_1.0.5.bb +++ b/meta/packages/xorg-lib/libxt_1.0.5.bb | |||
@@ -1,15 +1,14 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | |||
4 | DESCRIPTION = "X Toolkit Intrinsics" | ||
5 | PRIORITY = "optional" | ||
6 | 2 | ||
7 | DEPENDS += " libsm virtual/libx11 xproto kbproto" | 3 | DESCRIPTION = "X11 toolkit intrinsics library" |
4 | DEPENDS += "libsm virtual/libx11 kbproto" | ||
8 | PROVIDES = "xt" | 5 | PROVIDES = "xt" |
6 | PR = "r1" | ||
7 | PE = "1" | ||
9 | 8 | ||
10 | XORG_PN = "libXt" | 9 | XORG_PN = "libXt" |
11 | 10 | ||
12 | EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" | 11 | EXTRA_OECONF += "--disable-install-makestrs --disable-xkb" |
13 | 12 | ||
14 | do_compile() { | 13 | do_compile() { |
15 | ( | 14 | ( |
diff --git a/meta/packages/xorg-lib/libxtrap_1.0.0.bb b/meta/packages/xorg-lib/libxtrap_1.0.0.bb index 81c9df458b..7a25ae5bce 100644 --- a/meta/packages/xorg-lib/libxtrap_1.0.0.bb +++ b/meta/packages/xorg-lib/libxtrap_1.0.0.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | #DESCRIPTION = "" | 3 | DESCRIPTION = "X11 event trapping extension library" |
4 | 4 | DEPENDS += "libxt trapproto libxext" | |
5 | DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto" | 5 | PR = "r1" |
6 | PE = "1" | ||
6 | 7 | ||
7 | XORG_PN = "libXTrap" | 8 | XORG_PN = "libXTrap" |
8 | |||
9 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libxtst_1.0.1.bb b/meta/packages/xorg-lib/libxtst_1.0.1.bb index 3fa73b811a..14e10ff285 100644 --- a/meta/packages/xorg-lib/libxtst_1.0.1.bb +++ b/meta/packages/xorg-lib/libxtst_1.0.1.bb | |||
@@ -1,11 +1,9 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | DESCRIPTION = "X Test Extension: client side library" | 3 | DESCRIPTION = "X Test Extension: client side library" |
4 | PRIORITY = "optional" | 4 | DEPENDS += "libxext recordproto inputproto" |
5 | |||
6 | DEPENDS += " virtual/libx11 libxext recordproto xextproto inputproto" | ||
7 | PROVIDES = "xtst" | 5 | PROVIDES = "xtst" |
6 | PR = "r1" | ||
7 | PE = "1" | ||
8 | 8 | ||
9 | XORG_PN = "libXtst" | 9 | XORG_PN = "libXtst" |
10 | |||
11 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libxv_1.0.3.bb b/meta/packages/xorg-lib/libxv_1.0.3.bb index 0d045940e3..6014326e90 100644 --- a/meta/packages/xorg-lib/libxv_1.0.3.bb +++ b/meta/packages/xorg-lib/libxv_1.0.3.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | DESCRIPTION = "X Video extension library." | 3 | DESCRIPTION = "X11 Video extension library" |
4 | LICENSE = "GPL" | 4 | LICENSE = "GPL" |
5 | 5 | DEPENDS += "libxext videoproto" | |
6 | DEPENDS += " virtual/libx11 libxext xextproto videoproto" | 6 | PR = "r1" |
7 | 7 | ||
8 | XORG_PN = "libXv" | 8 | XORG_PN = "libXv" |
9 | |||
diff --git a/meta/packages/xorg-lib/libxvmc_1.0.4.bb b/meta/packages/xorg-lib/libxvmc_1.0.4.bb index 54aaa895ff..64943ce9bd 100644 --- a/meta/packages/xorg-lib/libxvmc_1.0.4.bb +++ b/meta/packages/xorg-lib/libxvmc_1.0.4.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | PE = "1" | ||
3 | |||
4 | DESCRIPTION = "X Video Motion Compensation extension library." | ||
5 | 2 | ||
6 | DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" | 3 | DESCRIPTION = "X Video Motion Compensation extension library" |
4 | DEPENDS += "libxext libxv videoproto" | ||
5 | PR = "r1" | ||
6 | PE = "1" | ||
7 | 7 | ||
8 | XORG_PN = "libXvMC" | 8 | XORG_PN = "libXvMC" |
9 | |||
diff --git a/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb b/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb index e563975933..47492d7108 100644 --- a/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb +++ b/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | DESCRIPTION = "Xxf86dga extension library." | 3 | DESCRIPTION = "X11 Direct Graphics Access extension library" |
4 | 4 | DEPENDS += "libxext xf86dgaproto" | |
5 | DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto" | 5 | PR = "r1" |
6 | PE = "1" | ||
6 | 7 | ||
7 | XORG_PN = "libXxf86dga" | 8 | XORG_PN = "libXxf86dga" |
8 | |||
9 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libxxf86misc_1.0.1.bb b/meta/packages/xorg-lib/libxxf86misc_1.0.1.bb index 16fe73511c..d1f8719cde 100644 --- a/meta/packages/xorg-lib/libxxf86misc_1.0.1.bb +++ b/meta/packages/xorg-lib/libxxf86misc_1.0.1.bb | |||
@@ -1,10 +1,9 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | #DESCRIPTION = "" | 3 | DESCRIPTION = "X11 XFree86 miscellaneous extension library" |
4 | 4 | DEPENDS += "libxext xf86miscproto" | |
5 | DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto" | ||
6 | PROVIDES = "xxf86misc" | 5 | PROVIDES = "xxf86misc" |
6 | PR = "r1" | ||
7 | PE = "1" | ||
7 | 8 | ||
8 | XORG_PN = "libXxf86misc" | 9 | XORG_PN = "libXxf86misc" |
9 | |||
10 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/libxxf86vm_1.0.1.bb b/meta/packages/xorg-lib/libxxf86vm_1.0.1.bb index a82c997b36..efb90d4854 100644 --- a/meta/packages/xorg-lib/libxxf86vm_1.0.1.bb +++ b/meta/packages/xorg-lib/libxxf86vm_1.0.1.bb | |||
@@ -1,9 +1,8 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | 2 | ||
3 | DESCRIPTION = "Xxf86vm extension library." | 3 | DESCRIPTION = "X11 XFree86 video mode extension library" |
4 | 4 | DEPENDS += "libxext xf86vidmodeproto" | |
5 | DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" | 5 | PR = "r1" |
6 | PE = "1" | ||
6 | 7 | ||
7 | XORG_PN = "libXxf86vm" | 8 | XORG_PN = "libXxf86vm" |
8 | |||
9 | PE = "1" | ||
diff --git a/meta/packages/xorg-lib/xorg-headers-native.bb b/meta/packages/xorg-lib/xorg-headers-native.bb index f88bcc7aee..82d5d79415 100644 --- a/meta/packages/xorg-lib/xorg-headers-native.bb +++ b/meta/packages/xorg-lib/xorg-headers-native.bb | |||
@@ -6,4 +6,3 @@ do_stage() { | |||
6 | install -d ${STAGING_INCDIR} | 6 | install -d ${STAGING_INCDIR} |
7 | cp -pPfR ${WORKDIR}/X11 ${STAGING_INCDIR} | 7 | cp -pPfR ${WORKDIR}/X11 ${STAGING_INCDIR} |
8 | } | 8 | } |
9 | |||
diff --git a/meta/packages/xorg-lib/xorg-lib-common.inc b/meta/packages/xorg-lib/xorg-lib-common.inc index e1f783e352..8aea0a5f03 100644 --- a/meta/packages/xorg-lib/xorg-lib-common.inc +++ b/meta/packages/xorg-lib/xorg-lib-common.inc | |||
@@ -1,11 +1,12 @@ | |||
1 | HOMEPAGE = "http://www.x.org" | 1 | HOMEPAGE = "http://www.x.org" |
2 | SECTION = "x11/libs" | 2 | SECTION = "x11/libs" |
3 | LICENSE = "MIT-X" | 3 | LICENSE = "MIT-X" |
4 | |||
5 | DEPENDS = "util-macros xorg-headers-native" | 4 | DEPENDS = "util-macros xorg-headers-native" |
5 | |||
6 | XORG_PN = "${PN}" | 6 | XORG_PN = "${PN}" |
7 | XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" | 7 | |
8 | SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2" | 8 | SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2" |
9 | |||
9 | S = "${WORKDIR}/${XORG_PN}-${PV}" | 10 | S = "${WORKDIR}/${XORG_PN}-${PV}" |
10 | 11 | ||
11 | inherit autotools pkgconfig | 12 | inherit autotools pkgconfig |
@@ -13,5 +14,5 @@ inherit autotools pkgconfig | |||
13 | EXTRA_OECONF = "--enable-malloc0returnsnull" | 14 | EXTRA_OECONF = "--enable-malloc0returnsnull" |
14 | 15 | ||
15 | do_stage() { | 16 | do_stage() { |
16 | autotools_stage_all | 17 | autotools_stage_all |
17 | } | 18 | } |
diff --git a/meta/packages/xorg-lib/xtrans-native_1.0.3.bb b/meta/packages/xorg-lib/xtrans-native_1.0.3.bb index 3afa2d8bd8..b10a2064e3 100644 --- a/meta/packages/xorg-lib/xtrans-native_1.0.3.bb +++ b/meta/packages/xorg-lib/xtrans-native_1.0.3.bb | |||
@@ -1,12 +1,10 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xtrans_${PV}.bb |
2 | SECTION = "x11/libs" | ||
3 | PRIORITY = "optional" | ||
4 | LICENSE = "BSD-X" | ||
5 | 2 | ||
6 | DEPENDS = "util-macros-native" | 3 | DEPENDS = "util-macros-native" |
7 | PE = "1" | 4 | PE = "1" |
8 | 5 | ||
9 | XORG_PN = "xtrans" | 6 | XORG_PN = "xtrans" |
10 | S = "${WORKDIR}/xtrans-${PV}" | ||
11 | 7 | ||
12 | inherit native autotools pkgconfig | 8 | SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2" |
9 | |||
10 | inherit native | ||
diff --git a/meta/packages/xorg-lib/xtrans_1.0.3.bb b/meta/packages/xorg-lib/xtrans_1.0.3.bb index e32509a5c4..42cf655a3f 100644 --- a/meta/packages/xorg-lib/xtrans_1.0.3.bb +++ b/meta/packages/xorg-lib/xtrans_1.0.3.bb | |||
@@ -1,9 +1,7 @@ | |||
1 | require xorg-lib-common.inc | 1 | require xorg-lib-common.inc |
2 | |||
3 | DESCRIPTION = "network API translation layer to insulate X applications and \ | ||
4 | libraries from OS network vageries." | ||
2 | PE = "1" | 5 | PE = "1" |
3 | 6 | ||
4 | SRC_URI += "file://fix-missing-includepath.patch;patch=1" | 7 | SRC_URI += "file://fix-missing-includepath.patch;patch=1" |
5 | |||
6 | DESCRIPTION = "network API translation layer to \ | ||
7 | insulate X applications and libraries from OS \ | ||
8 | network vageries." | ||
9 | |||