diff options
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 ce5e2b4b8..33fda1cd6 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 @@ -SECTION = "x11/base" require libx11_${PV}.bb -PE = "1" - -EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" +PR = "r1" SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ file://fix-disable-xlocale.diff;patch=1 \ file://fix-utf8-wrong-define.patch;patch=1" + +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" +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 ee847a9dd..bc502fb50 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 @@ require xorg-lib-common.inc -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto applewmproto" +DEPENDS += "libxext applewmproto" +PR = "r1" +PE = "1" XORG_PN = "libAppleWM" - -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 601aad10a..9b6610156 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 @@ require xorg-lib-common.inc -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto dmxproto" +DESCRIPTION = "X11 Distributed Multihead extension library" +DEPENDS += "libxext dmxproto" +PR = "r1" 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 9135244ab..a907e08f1 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 @@ -require xorg-lib-common.inc -DESCRIPTION = "X libfontenc library (used by libxfont)." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" +require libfontenc_${PV}.bb DEPENDS = "zlib-native xproto-native" - PE = "1" XORG_PN = "libfontenc" -S = "${WORKDIR}/libfontenc-${PV}" -inherit native autotools pkgconfig +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 afb7ffe10..654fc72ec 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 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X fontenc library (used by libxfont)." +DESCRIPTION = "X11 font encoding library" LICENSE = "BSD-X" -PRIORITY = "optional" - -DEPENDS += " zlib xproto" - +DEPENDS += "zlib xproto" +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-lib/libfs_1.0.0.bb b/meta/packages/xorg-lib/libfs_1.0.0.bb index 775f4ed3b..010aa311e 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 @@ require xorg-lib-common.inc -#DESCRIPTION = " " - -DEPENDS += " xproto fontsproto xtrans" +DESCRIPTION = "X11 Font Services library" +DEPENDS += "xproto fontsproto xtrans" +PR = "r1" +PE = "1" XORG_PN = "libFS" - -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 e3fa1f979..000000000 --- a/meta/packages/xorg-lib/libice_1.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 ICE library" -PRIORITY = "optional" - -DEPENDS += " xproto xtrans" -PROVIDES = "ice" - -XORG_PN = "libICE" - -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 28d088537..e4a655739 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 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X11 ICE library" -PRIORITY = "optional" - -DEPENDS += " xproto xtrans" +DESCRIPTION = "X11 Inter-Client Exchange library" +DEPENDS += "xproto xtrans" PROVIDES = "ice" +PR = "r1" +PE = "1" XORG_PN = "libICE" - diff --git a/meta/packages/xorg-lib/liblbxutil_1.0.1.bb b/meta/packages/xorg-lib/liblbxutil_1.0.1.bb index ec228fbcb..adb7b0513 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 @@ require xorg-lib-common.inc -export CC_FOR_BUILD = "gcc" - -SRC_URI += "file://mkg3states.patch;patch=1" - DESCRIPTION = "XFIXES Extension" - DEPENDS += " xextproto xproto zlib" PROVIDES = "lbxutil" PE = "1" + +SRC_URI += "file://mkg3states.patch;patch=1" + +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 99dd24b00..84470cbc7 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 @@ require xorg-lib-common.inc -#DESCRIPTION = "" - DEPENDS += " virtual/libx11" +PE = "1" XORG_PN = "liboldX" - -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 e5113dfc7..edb6ff45c 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 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "Session management library" -PRIORITY = "optional" -DEPENDS += " libice xproto xtrans" +DESCRIPTION = "X11 Session management library" +DEPENDS += "libice xproto xtrans" +PR = "r1" +PE = "1" XORG_PN = "libSM" - diff --git a/meta/packages/xorg-lib/libwindowswm_1.0.0.bb b/meta/packages/xorg-lib/libwindowswm_1.0.0.bb index b3b366b06..a03d49505 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 @@ require xorg-lib-common.inc -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto windowswmproto" +DEPENDS += "libxext windowswmproto" +PE = "1" XORG_PN = "libWindowsWM" - -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 f639372ac..3bd760e79 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 @@ require xorg-lib-common.inc DESCRIPTION = "Base X libs." - -DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" -# RPROVIDES = "virtual/libx11" +PR = "r1" PE = "1" -SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.1.1.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-1.1.1" - XORG_PN = "libX11" EXTRA_OECONF += "--without-xcb" -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" - do_compile() { ( unset CC LD CXX CCLD @@ -26,3 +19,6 @@ do_compile() { rm -f ${STAGING_INCDIR}/X11/Xlib.h oe_runmake } + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +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 f3e73daf3..953a93adf 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 @@ -require xorg-lib-common.inc -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" +require libxau_${PV}.bb DEPENDS = "xproto-native util-macros-native" +PR = "r1" XORG_PN = "libXau" -S = "${WORKDIR}/libXau-${PV}" -inherit native autotools pkgconfig +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 dcde9b4da..3a77534cf 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 @@ require xorg-lib-common.inc -PE = "1" DESCRIPTION = "A Sample Authorization Protocol for X" -PRIORITY = "optional" - DEPENDS += " xproto" PROVIDES = "xau" +PE = "1" XORG_PN = "libXau" - diff --git a/meta/packages/xorg-lib/libxaw_1.0.3.bb b/meta/packages/xorg-lib/libxaw_1.0.3.bb index 7e7f91b82..f45431e79 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 @@ require xorg-lib-common.inc -DESCRIPTION = "Xaw is the X Athena Widget Set." -DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" +DESCRIPTION = "X Athena Widget Set" +DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" +PR = "r1" PE = "1" XORG_PN = "libXaw" -do_stage () { - autotools_stage_all +do_stage_append () { ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6 ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 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 aa4b77b39..99f11e40f 100644 --- a/meta/packages/xorg-lib/libxcalibrate_git.bb +++ b/meta/packages/xorg-lib/libxcalibrate_git.bb @@ -1,21 +1,14 @@ +require xorg-lib-common.inc + DESCRIPTION = " Touchscreen calibration client library" -SECTION = "x11/libs" -PRIORITY = "optional" LICENSE = "BSD-X" - -PV = "0.0+git${SRCDATE}" -PR = "r1" - DEPENDS = "virtual/libx11 calibrateproto libxext" - -FILES_${PN}-locale += "${datadir}/X11/locale" +PV = "0.0+git${SRCDATE}" +PR = "r2" SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62 \ file://coords.patch;patch=1" -S = "${WORKDIR}/git" -inherit autotools pkgconfig +S = "${WORKDIR}/git" -do_stage() { - autotools_stage_all -} +FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/meta/packages/xorg-lib/libxcomposite_0.3.1.bb b/meta/packages/xorg-lib/libxcomposite_0.3.1.bb index 71842d4a4..8921b927b 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 @@ require xorg-lib-common.inc -PE = "1" DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" - DEPENDS += " compositeproto virtual/libx11 libxfixes" PROVIDES = "xcomposite" +PE = "1" XORG_PN = "libXcomposite" diff --git a/meta/packages/xorg-lib/libxcursor_1.1.8.bb b/meta/packages/xorg-lib/libxcursor_1.1.8.bb index 6eb0bcca1..4713eccc4 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 @@ require xorg-lib-common.inc -PE = "1" -PR = "r1" -DESCRIPTION = "X Cursor library" +DESCRIPTION = "X cursor management library" LICENSE= "BSD-X" - -DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" +DEPENDS += "libxrender libxfixes" +PR = "r2" +PE = "1" XORG_PN = "libXcursor" - -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 dd6fc42df..e56d1d095 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 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X Damage extension library." +DESCRIPTION = "X11 damaged region extension library" LICENSE= "BSD-X" - -DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" +DEPENDS += "damageproto libxfixes" PROVIDES = "xdamage" +PR = "r1" +PE = "1" XORG_PN = "libXdamage" - 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 2438a7b59..d57f8ac48 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 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" -PE = "1" +require libxdmcp_${PV}.bb DEPENDS = "xproto-native util-macros-native" +PR = "r1" +PE = "1" -SRC_URI = "${XORG_MIRROR}/individual/lib/libXdmcp-${PV}.tar.bz2" -S = "${WORKDIR}/libXdmcp-${PV}" +XORG_PN = "libXdmcp" -inherit native autotools pkgconfig +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 109c5b561..0aa95b467 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 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Display Manager Control Protocol library." -PRIORITY = "optional" -DEPENDS += " xproto" +DESCRIPTION = "X Display Manager Control Protocol library" +DEPENDS += "xproto" PROVIDES = "xdmcp" +PR = "r1" +PE = "1" XORG_PN = "libXdmcp" - 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 71abb2c56..000000000 --- a/meta/packages/xorg-lib/libxevie_1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" - -XORG_PN = "libXevie" - -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 06985bd11..6c6b4595a 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 @@ require xorg-lib-common.inc -PE = "1" - -#DESCRIPTION = "" -DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" +DESCRIPTION = "X11 EvIE extension library" +DEPENDS += "libxext evieext" +PR = "r1" +PE = "1" XORG_PN = "libXevie" - 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 4d30befbe..000000000 --- a/meta/packages/xorg-lib/libxext_1.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Server Extension library" -PRIORITY = "optional" - -DEPENDS += " xproto virtual/libx11 xextproto libxau" -PROVIDES = "xext" -PE = "1" - -XORG_PN = "libXext" - diff --git a/meta/packages/xorg-lib/libxext_1.0.3.bb b/meta/packages/xorg-lib/libxext_1.0.3.bb index a64067e2a..81231a866 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 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Server Extension library" -PRIORITY = "optional" -DEPENDS += " xproto virtual/libx11 xextproto libxau" +DESCRIPTION = "X11 miscellaneous extension library" +DEPENDS += "xproto virtual/libx11 xextproto libxau" PROVIDES = "xext" +PR = "r1" +PE = "1" XORG_PN = "libXext" - diff --git a/meta/packages/xorg-lib/libxfixes_4.0.3.bb b/meta/packages/xorg-lib/libxfixes_4.0.3.bb index cffe56a03..5b2100a81 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 @@ require xorg-lib-common.inc -PE = "1" DESCRIPTION = "X Fixes extension library." LICENSE= "BSD-X" - -DEPENDS += " virtual/libx11 xproto fixesproto xextproto" +DEPENDS += "virtual/libx11 xproto fixesproto xextproto" +PE = "1" XORG_PN = "libXfixes" - 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 3fd134bd8..4f9cb8073 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 @@ -DESCRIPTION = "X font library (used by the X server)." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" -PE = "1" - -DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native" +require libxfont_${PV}.bb -SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" -S = "${WORKDIR}/libXfont-1.2.0" +DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native \ + libfontenc-native xtrans-native freetype-native util-macros-native" +PE = "1" -inherit native autotools pkgconfig +# no need for patch used in libxfont +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2" +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 cc855c010..dff7a0fb6 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 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X font library (used by the X server)." +DESCRIPTION = "X11 font rasterisation library" LICENSE= "BSD-X" -PRIORITY = "optional" +DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" +PR = "r1" +PE = "1" SRC_URI += "file://no-scalable-crash.patch;patch=1" -DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" -PROVIDES = "xfont" - XORG_PN = "libXfont" - diff --git a/meta/packages/xorg-lib/libxfontcache_1.0.4.bb b/meta/packages/xorg-lib/libxfontcache_1.0.4.bb index 1e4586795..ee999de4f 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 @@ require xorg-lib-common.inc -PE = "1" - -#DESCRIPTION = "" -DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" +DESCRIPTION = "X-TrueType font cache extension client library" +DEPENDS += "libxext fontcacheproto" +PR = "r1" +PE = "1" XORG_PN = "libXfontcache" - diff --git a/meta/packages/xorg-lib/libxft_2.1.12.bb b/meta/packages/xorg-lib/libxft_2.1.12.bb index 8843938d4..8e54dac01 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 @@ require xorg-lib-common.inc -SRC_URI = "${XORG_MIRROR}/individual/lib/libXft-2.1.12.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-2.1.12" - - -DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." - -DEPENDS += " libxrender freetype fontconfig" +DESCRIPTION = "FreeType-based font drawing library for X" +DEPENDS += "libxrender freetype fontconfig" PROVIDES = "xft" +PR = "r1" PE = "1" XORG_PN = "libXft" -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir}" - python do_package() { if bb.data.getVar('DEBIAN_NAMES', d, 1): bb.data.setVar('PKG_${PN}', 'libxft2', d) bb.build.exec_func('package_do_package', d) } + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${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 84c67f5ae..31e3b4906 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 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Input extension library." -DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" +DESCRIPTION = "X11 Input extension library" +DEPENDS += "libxext inputproto" +PR = "r1" +PE = "1" XORG_PN = "libXi" - diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2.bb b/meta/packages/xorg-lib/libxinerama_1.0.2.bb index 193928a2d..b7135bc28 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 @@ require xorg-lib-common.inc -DESCRIPTION = "Xinerama library" -PRIORITY = "optional" -PE = "1" -PR = "r2" - -DEPENDS += " virtual/libx11 libxext xextproto xineramaproto" +DESCRIPTION = "X11 Xinerama extension library" +DEPENDS += "libxext xineramaproto" PROVIDES = "xinerama" +PR = "r3" +PE = "1" XORG_PN = "libXinerama" - diff --git a/meta/packages/xorg-lib/libxkbfile_1.0.4.bb b/meta/packages/xorg-lib/libxkbfile_1.0.4.bb index 2d9b778d0..a404180d4 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 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X11 keyboard library" +DESCRIPTION = "X11 keyboard file manipulation library" LICENSE= "GPL" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 kbproto" - +DEPENDS += "virtual/libx11 kbproto" +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-lib/libxkbui_1.0.2.bb b/meta/packages/xorg-lib/libxkbui_1.0.2.bb index 619b8a34b..9a3f5f132 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 @@ require xorg-lib-common.inc -DESCRIPTION = "X11 lbxkbui library" +DESCRIPTION = "X11 keyboard UI presentation library" LICENSE= "GPL" -PRIORITY = "optional" -PE = "1" - -DEPENDS += " virtual/libx11 libxt libxkbfile" +DEPENDS += "virtual/libx11 libxt libxkbfile" PROVIDES = "xkbui" +PR = "r1" +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 e055874b3..9a02bf82b 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 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Window System miscellaneous utility library" -PRIORITY = "optional" -DEPENDS += " libxt libxext xextproto virtual/libx11" +DESCRIPTION = "X11 miscellaneous utility library" +DEPENDS += "libxt libxext" PROVIDES = "xmu" +PR = "r1" +PE = "1" XORG_PN = "libXmu" +LEAD_SONAME = "libXmu" + PACKAGES =+ "libxmuu libxmuu-dev" FILES_libxmuu = "${libdir}/libXmuu.so.*" FILES_libxmuu-dev = "${libdir}/libXmuu.so" - -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 5dec1c26b..53fb47c05 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 @@ require xorg-lib-common.inc -DESCRIPTION = "X print extension library." - -DEPENDS += " virtual/libx11 libxext xextproto libxau printproto" +DESCRIPTION = "X Printing Extension (Xprint) client library" +DEPENDS += "libxext libxau printproto" +PR = "r1" +PE = "1" 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/libxpm_3.5.6.bb b/meta/packages/xorg-lib/libxpm_3.5.6.bb index 60779da43..4e0a6eaac 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 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X Pixmap library." -PRIORITY = "optional" +DESCRIPTION = "X11 Pixmap library" LICENSE = "X-BSD" - -DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" +DEPENDS += "libxt libxext" +PR = "r1" +PE = "1" XORG_PN = "libXpm" diff --git a/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb b/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb index fd8a39670..3a24a888d 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 @@ require xorg-lib-common.inc -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau" +DESCRIPTION = "Xprint job utility client library" +DEPENDS += "libxp libxt libxprintutil" +PR = "r1" +PE = "1" XORG_PN = "libXprintAppUtil" - -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 67cf0be61..327138e7f 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 @@ require xorg-lib-common.inc -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxp libxt printproto libxau" +DESCRIPTION = "Xprint printer utility client library" +DEPENDS += "libxp libxt" +PR = "r1" +PE = "1" XORG_PN = "libXprintUtil" - -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 18e5deffb..cf2a73a72 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 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X Resize and Rotate extension library." +DESCRIPTION = "X11 Resize and Rotate extension library" LICENSE = "BSD-X" - -DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" +DEPENDS += "randrproto libxrender" +PR = "r1" +PE = "1" XORG_PN = "libXrandr" - diff --git a/meta/packages/xorg-lib/libxrender_0.9.2.bb b/meta/packages/xorg-lib/libxrender_0.9.2.bb index b1372d3da..f8b9c37b5 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 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X Render extension library." +DESCRIPTION = "X11 Rendering Extension client library" LICENSE = "BSD-X" - -DEPENDS += " virtual/libx11 renderproto" +DEPENDS += "virtual/libx11 renderproto xproto" +PR = "r1" +PE = "1" XORG_PN = "libXrender" - diff --git a/meta/packages/xorg-lib/libxres_1.0.3.bb b/meta/packages/xorg-lib/libxres_1.0.3.bb index b9d2fd68c..02a0cae0d 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 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Resource usage library." -DEPENDS += " virtual/libx11 libxext xextproto resourceproto" +DESCRIPTION = "X11 Resource extension library" +DEPENDS += "libxext resourceproto" +PR = "r1" +PE = "1" XORG_PN = "libXres" - diff --git a/meta/packages/xorg-lib/libxscrnsaver_1.1.2.bb b/meta/packages/xorg-lib/libxscrnsaver_1.1.2.bb index 163ca199c..ff22c337a 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 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X screen saver extension library." +DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" - -DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" - -XORG_PN = "libXScrnSaver" - +DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" RREPLACES = "libxss" +PR = "r1" +PE = "1" -#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" +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 e67590bdf..5b25c4b3a 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 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Toolkit Intrinsics" -PRIORITY = "optional" -DEPENDS += " libsm virtual/libx11 xproto kbproto" +DESCRIPTION = "X11 toolkit intrinsics library" +DEPENDS += "libsm virtual/libx11 kbproto" PROVIDES = "xt" +PR = "r1" +PE = "1" XORG_PN = "libXt" -EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" +EXTRA_OECONF += "--disable-install-makestrs --disable-xkb" do_compile() { ( diff --git a/meta/packages/xorg-lib/libxtrap_1.0.0.bb b/meta/packages/xorg-lib/libxtrap_1.0.0.bb index 81c9df458..7a25ae5bc 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 @@ require xorg-lib-common.inc -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto" +DESCRIPTION = "X11 event trapping extension library" +DEPENDS += "libxt trapproto libxext" +PR = "r1" +PE = "1" XORG_PN = "libXTrap" - -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 3fa73b811..14e10ff28 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 @@ require xorg-lib-common.inc DESCRIPTION = "X Test Extension: client side library" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 libxext recordproto xextproto inputproto" +DEPENDS += "libxext recordproto inputproto" PROVIDES = "xtst" +PR = "r1" +PE = "1" XORG_PN = "libXtst" - -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 0d045940e..6014326e9 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 @@ require xorg-lib-common.inc -DESCRIPTION = "X Video extension library." +DESCRIPTION = "X11 Video extension library" LICENSE = "GPL" - -DEPENDS += " virtual/libx11 libxext xextproto videoproto" +DEPENDS += "libxext videoproto" +PR = "r1" XORG_PN = "libXv" - diff --git a/meta/packages/xorg-lib/libxvmc_1.0.4.bb b/meta/packages/xorg-lib/libxvmc_1.0.4.bb index 54aaa895f..64943ce9b 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 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Video Motion Compensation extension library." -DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" +DESCRIPTION = "X Video Motion Compensation extension library" +DEPENDS += "libxext libxv videoproto" +PR = "r1" +PE = "1" XORG_PN = "libXvMC" - diff --git a/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb b/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb index e56397593..47492d710 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 @@ require xorg-lib-common.inc -DESCRIPTION = "Xxf86dga extension library." - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto" +DESCRIPTION = "X11 Direct Graphics Access extension library" +DEPENDS += "libxext xf86dgaproto" +PR = "r1" +PE = "1" XORG_PN = "libXxf86dga" - -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 16fe73511..d1f8719cd 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 @@ require xorg-lib-common.inc -#DESCRIPTION = "" - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto" +DESCRIPTION = "X11 XFree86 miscellaneous extension library" +DEPENDS += "libxext xf86miscproto" PROVIDES = "xxf86misc" +PR = "r1" +PE = "1" XORG_PN = "libXxf86misc" - -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 a82c997b3..efb90d485 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 @@ require xorg-lib-common.inc -DESCRIPTION = "Xxf86vm extension library." - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" +DESCRIPTION = "X11 XFree86 video mode extension library" +DEPENDS += "libxext xf86vidmodeproto" +PR = "r1" +PE = "1" XORG_PN = "libXxf86vm" - -PE = "1" diff --git a/meta/packages/xorg-lib/xorg-headers-native.bb b/meta/packages/xorg-lib/xorg-headers-native.bb index f88bcc7ae..82d5d7941 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() { install -d ${STAGING_INCDIR} cp -pPfR ${WORKDIR}/X11 ${STAGING_INCDIR} } - diff --git a/meta/packages/xorg-lib/xorg-lib-common.inc b/meta/packages/xorg-lib/xorg-lib-common.inc index e1f783e35..8aea0a5f0 100644 --- a/meta/packages/xorg-lib/xorg-lib-common.inc +++ b/meta/packages/xorg-lib/xorg-lib-common.inc @@ -1,11 +1,12 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/libs" LICENSE = "MIT-X" - DEPENDS = "util-macros xorg-headers-native" + 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}/lib/${XORG_PN}-${PV}.tar.bz2" + S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig @@ -13,5 +14,5 @@ inherit autotools pkgconfig EXTRA_OECONF = "--enable-malloc0returnsnull" do_stage() { - autotools_stage_all + autotools_stage_all } 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 3afa2d8bd..b10a2064e 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 @@ -require xorg-lib-common.inc -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" +require xtrans_${PV}.bb DEPENDS = "util-macros-native" PE = "1" XORG_PN = "xtrans" -S = "${WORKDIR}/xtrans-${PV}" -inherit native autotools pkgconfig +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2" + +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 e32509a5c..42cf655a3 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 @@ require xorg-lib-common.inc + +DESCRIPTION = "network API translation layer to insulate X applications and \ +libraries from OS network vageries." PE = "1" SRC_URI += "file://fix-missing-includepath.patch;patch=1" - -DESCRIPTION = "network API translation layer to \ -insulate X applications and libraries from OS \ -network vageries." - |