diff options
88 files changed, 519 insertions, 459 deletions
diff --git a/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..481ce7d2cd --- /dev/null +++ b/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libx11 libxext xextproto applewmproto" + +XORG_PN = "libAppleWM" + diff --git a/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..8f0ed5f8ae --- /dev/null +++ b/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb @@ -0,0 +1,5 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libx11 libxext xextproto dmxproto" diff --git a/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..8f0ed5f8ae --- /dev/null +++ b/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb @@ -0,0 +1,5 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libx11 libxext xextproto dmxproto" diff --git a/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..cecd14f57f --- /dev/null +++ b/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X fontenc library (used by libxfont)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "zlib-native xproto-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libfontenc-${PV}.tar.bz2" +S = "${WORKDIR}/libfontenc-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..0ccc8dd3d3 --- /dev/null +++ b/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X libfontenc library (used by libxfont)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "zlib-native xproto-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libfontenc-${PV}.tar.bz2" +S = "${WORKDIR}/libfontenc-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb index 02883c4d26..72164c0415 100644 --- a/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb @@ -1,11 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "X fontenc library (used by libxfont)." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" LICENSE = "BSD-X" +PRIORITY = "optional" -DEPENDS = "zlib xproto" - -XORG_PN = "${PN}" +DEPENDS += " zlib xproto" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb index b67c4a0e38..72164c0415 100644 --- a/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb @@ -1,12 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "X fontenc library (used by libxfont)." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" LICENSE = "BSD-X" +PRIORITY = "optional" -DEPENDS = "zlib xproto" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "${PN}" +DEPENDS += " zlib xproto" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb b/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..9156ab01cb --- /dev/null +++ b/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = " " + +DEPENDS += " xproto fontsproto xtrans" + +XORG_PN = "libFS" + diff --git a/packages/xorg-lib/libice_X11R7.0-1.0.0.bb b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb index cd5c2d372f..2d16be34b8 100644 --- a/packages/xorg-lib/libice_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb @@ -1,12 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X11 ICE library" -SECTION = "libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" -DEPENDS = "libx11 util-macros" +DEPENDS += " xproto xtrans" PROVIDES = "ice" XORG_PN = "libICE" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libice_X11R7.1-1.0.1.bb b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb index a1e92b66fa..2d16be34b8 100644 --- a/packages/xorg-lib/libice_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb @@ -1,13 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X11 ICE library" -SECTION = "libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" -DEPENDS = "libx11 util-macros" +DEPENDS += " xproto xtrans" PROVIDES = "ice" -XORG_RELEASE = "X11R7.1" XORG_PN = "libICE" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb index 36837c23e4..7ce88dfe74 100644 --- a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb @@ -1,17 +1,6 @@ -DESCRIPTION = "X11 keyboard library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" +include xorg-lib-common.inc -DEPENDS = "xextproto" +DESCRIPTION = "XFIXES Extension" -XORG_PN = "${PN}" - -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-X11R7.0-${PV}.tar.bz2 \ - file://mkg3states.patch;patch=1" - -export CC_FOR_BUILD = "${BUILD_CC}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" +DEPENDS += " xextproto xproto zlib" +PROVIDES = "lbxutil" diff --git a/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb index 795cd4555d..7ce88dfe74 100644 --- a/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb @@ -1,18 +1,6 @@ -DESCRIPTION = "X11 keyboard library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" +include xorg-lib-common.inc -DEPENDS = "xproto" +DESCRIPTION = "XFIXES Extension" -XORG_RELEASE = "X11R7.1" -XORG_PN = "${PN}" - -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/${PN}-X11R7.1-${PV}.tar.bz2 \ - file://mkg3states.patch;patch=1" - -export CC_FOR_BUILD = "${BUILD_CC}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" +DEPENDS += " xextproto xproto zlib" +PROVIDES = "lbxutil" diff --git a/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..1dbf2fe068 --- /dev/null +++ b/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libx11" + +XORG_PN = "liboldX" + diff --git a/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb index bf96271ba6..2683d0042b 100644 --- a/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb @@ -1,12 +1,9 @@ +include xorg-lib-common.inc + DESCRIPTION = "Session management library" -SECTION = "libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT-X" -#PV="1:1.0.0" -DEPENDS = "libx11 libice util-macros" +DEPENDS += " libice xproto xtrans" XORG_PN = "libSM" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb index 468b014165..2683d0042b 100644 --- a/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb @@ -1,13 +1,9 @@ +include xorg-lib-common.inc + DESCRIPTION = "Session management library" -SECTION = "libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT-X" -#PV="1:1.0.1" -DEPENDS = "libx11 libice util-macros" +DEPENDS += " libice xproto xtrans" -XORG_RELEASE = "X11R7.1" XORG_PN = "libSM" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..1848a14fd2 --- /dev/null +++ b/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libx11 libxext xextproto windowswmproto" + +XORG_PN = "libWindowsWM" + diff --git a/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..2023b5741d --- /dev/null +++ b/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Base X libs." +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" +PROVIDES = "x11-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2" +S = "${WORKDIR}/libX11-${PV}" + +inherit native autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} diff --git a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..2b84b2c53c --- /dev/null +++ b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Base X libs." +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" +PROVIDES = "x11-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libX11-${PV}.tar.bz2" +S = "${WORKDIR}/libX11-${PV}" + +inherit native autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} diff --git a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb index ac9d87292a..de33be0bf8 100644 --- a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb @@ -1,19 +1,15 @@ +include xorg-lib-common.inc + DESCRIPTION = "Base X libs." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "XFree86" -DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" +DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "x11" -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" - XORG_PN = "libX11" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" do_compile() { ( diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index 6836c872bd..de33be0bf8 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -1,20 +1,15 @@ +include xorg-lib-common.inc + DESCRIPTION = "Base X libs." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "XFree86" -DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" +DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "x11" -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" - XORG_PN = "libX11" -XORG_RELEASE = "X11R7.1" - -include xorg-xlibs.inc -EXTRA_OECONF="--enable-malloc0returnsnull" +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" do_compile() { ( diff --git a/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..553c3aeacf --- /dev/null +++ b/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb @@ -0,0 +1,11 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto-native util-macros-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2" +S = "${WORKDIR}/libXau-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..c0a3ea802f --- /dev/null +++ b/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb @@ -0,0 +1,11 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto-native util-macros-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXau-${PV}.tar.bz2" +S = "${WORKDIR}/libXau-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb index f64be68583..1767424320 100644 --- a/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb @@ -1,13 +1,10 @@ -DESCRIPTION = "Authorization Protocol for X." -SECTION = "x11/libs" +include xorg-lib-common.inc + +DESCRIPTION = "A Sample Authorization Protocol for X" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" -DEPENDS = "xproto util-macros" +DEPENDS += " xproto" PROVIDES = "xau" XORG_PN = "libXau" -include xorg-xlibs.inc - diff --git a/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb index 39e2f88b95..1767424320 100644 --- a/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb @@ -1,14 +1,10 @@ -DESCRIPTION = "Authorization Protocol for X." -SECTION = "x11/libs" +include xorg-lib-common.inc + +DESCRIPTION = "A Sample Authorization Protocol for X" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" -DEPENDS = "xproto util-macros" +DEPENDS += " xproto" PROVIDES = "xau" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXau" -include xorg-xlibs.inc - diff --git a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb index 03ac373f77..b1b1ad48be 100644 --- a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb @@ -1,15 +1,15 @@ -DESCRIPTION = "X Athena Widgets library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT" +include xorg-lib-common.inc -DEPENDS = "xproto libx11 libxt libxmu libxpm" +DESCRIPTION = "Xaw is the X Athena Widget Set." + +DEPENDS += " xproto libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" XORG_PN = "libXaw" -include xorg-xlibs.inc - -# FIXME: libXaw needs a full x11, not diet -BROKEN = "1" +do_stage () { + autotools_stage_all + 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/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb index 7fb68385a1..b1b1ad48be 100644 --- a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb @@ -1,16 +1,15 @@ -DESCRIPTION = "X Athena Widgets library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT" +include xorg-lib-common.inc -DEPENDS = "xproto libx11 libxt libxmu libxpm" +DESCRIPTION = "Xaw is the X Athena Widget Set." + +DEPENDS += " xproto libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXaw" -include xorg-xlibs.inc - -# FIXME: libXaw needs a full x11, not diet -BROKEN = "1" +do_stage () { + autotools_stage_all + 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/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb index d3166a99f4..806cc69082 100644 --- a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb +++ b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb @@ -1,14 +1,11 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Composite extension library." -SECTION = "x11/libs" -#MAINTAINER = "" LICENSE= "BSD-X" -DEPENDS = "libx11 compositeproto xextproto libxfixes" +DEPENDS += " compositeproto libx11 libxfixes" PROVIDES = "xcomposite" XORG_PN = "libXcomposite" -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \ - file://change-include-order.patch;patch=1" +SRC_URI += " file://change-include-order.patch;patch=1" diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb index 2847ada716..806cc69082 100644 --- a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb +++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb @@ -1,15 +1,11 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Composite extension library." -SECTION = "x11/libs" -#MAINTAINER = "" LICENSE= "BSD-X" -DEPENDS = "libx11 compositeproto libxfixes" +DEPENDS += " compositeproto libx11 libxfixes" PROVIDES = "xcomposite" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXcomposite" -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/libXcomposite-${PV}.tar.bz2 \ - file://change-include-order.patch;patch=1" +SRC_URI += " file://change-include-order.patch;patch=1" diff --git a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb index 9aed134fbb..7b9aa035c6 100644 --- a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb +++ b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb @@ -1,13 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Cursor library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" LICENSE= "BSD-X" -DEPENDS = "libxfixes" +DEPENDS += " libxrender libxfixes libx11 fixesproto" XORG_PN = "libXcursor" -include xorg-xlibs.inc - FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb index 20f44bfb41..7b9aa035c6 100644 --- a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb +++ b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb @@ -1,14 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Cursor library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" LICENSE= "BSD-X" -DEPENDS = "libxfixes" +DEPENDS += " libxrender libxfixes libx11 fixesproto" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXcursor" -include xorg-xlibs.inc - FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb index acea09c7bd..190a01e2f6 100644 --- a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb +++ b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb @@ -1,11 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Damage extension library." -SECTION = "x11/libs" -#MAINTAINER = "" LICENSE= "BSD-X" -DEPENDS = "libx11 damageproto libxfixes xproto" +DEPENDS += " libx11 damageproto libxfixes fixesproto xextproto" PROVIDES = "xdamage" XORG_PN = "libXdamage" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb index b97e01cfb0..190a01e2f6 100644 --- a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb +++ b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb @@ -1,12 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Damage extension library." -SECTION = "x11/libs" -#MAINTAINER = "" LICENSE= "BSD-X" -DEPENDS = "libx11 damageproto libxfixes xproto" +DEPENDS += " libx11 damageproto libxfixes fixesproto xextproto" PROVIDES = "xdamage" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXdamage" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..fbbf8e9117 --- /dev/null +++ b/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb @@ -0,0 +1,11 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto-native util-macros-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2" +S = "${WORKDIR}/libXdmcp-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..8ab69a1d41 --- /dev/null +++ b/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb @@ -0,0 +1,11 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto-native util-macros-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXdmcp-${PV}.tar.bz2" +S = "${WORKDIR}/libXdmcp-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb index 5ea8cdd513..74c4b6e35d 100644 --- a/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb @@ -1,12 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Display Manager Control Protocol library." -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" -DEPENDS = "xproto util-macros" +DEPENDS += " xproto" PROVIDES = "xdmcp" XORG_PN = "libXdmcp" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb index d9cfadbf7b..74c4b6e35d 100644 --- a/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb @@ -1,13 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Display Manager Control Protocol library." -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" -DEPENDS = "xproto util-macros" +DEPENDS += " xproto" PROVIDES = "xdmcp" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXdmcp" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..da09dc69c0 --- /dev/null +++ b/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " xproto libx11 xextproto libxext evieext" + +XORG_PN = "libXevie" + diff --git a/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..da09dc69c0 --- /dev/null +++ b/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " xproto libx11 xextproto libxext evieext" + +XORG_PN = "libXevie" + diff --git a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb index 1c4a21280e..ca32e52d31 100644 --- a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb @@ -1,15 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Server Extension library" -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" -DEPENDS = "xproto libx11 xextproto util-macros" +DEPENDS += " xproto libx11 xextproto libxau" PROVIDES = "xext" -EXTRA_OECONF="--enable-malloc0returnsnull" - XORG_PN = "libXext" -include xorg-xlibs.inc - diff --git a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb index 5ee1d82990..ca32e52d31 100644 --- a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb @@ -1,16 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Server Extension library" -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" -DEPENDS = "xproto libx11 util-macros" +DEPENDS += " xproto libx11 xextproto libxau" PROVIDES = "xext" -EXTRA_OECONF="--enable-malloc0returnsnull" - -XORG_RELEASE = "X11R7.1" XORG_PN = "libXext" -include xorg-xlibs.inc - diff --git a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb index b22da223f5..04b2e48006 100644 --- a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb +++ b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb @@ -1,10 +1,9 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Fixes extension library." -SECTION = "x11/libs" -#MAINTAINER = "" LICENSE= "BSD-X" -DEPENDS = "libx11 fixesproto" +DEPENDS += " libx11 xproto fixesproto xextproto" XORG_PN = "libXfixes" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb index 5b8881e0b8..04b2e48006 100644 --- a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb +++ b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb @@ -1,11 +1,9 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Fixes extension library." -SECTION = "x11/libs" -#MAINTAINER = "" LICENSE= "BSD-X" -DEPENDS = "libx11 fixesproto" +DEPENDS += " libx11 xproto fixesproto xextproto" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXfixes" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..93aac77f7b --- /dev/null +++ b/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X font library (used by the X server)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2" +S = "${WORKDIR}/libXfont-${PV}" + +inherit native autotools pkgconfig + diff --git a/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..664f9440a4 --- /dev/null +++ b/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X font library (used by the X server)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXfont-${PV}.tar.bz2" +S = "${WORKDIR}/libXfont-${PV}" + +inherit native autotools pkgconfig + diff --git a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb index aff0e55e21..07fbf5f9a6 100644 --- a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb @@ -1,12 +1,11 @@ +include xorg-lib-common.inc + DESCRIPTION = "X font library (used by the X server)." -SECTION = "x11/libs" +LICENSE= "BSD-X" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "BSD-X" -DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc freetype" +DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" PROVIDES = "xfont" XORG_PN = "libXfont" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb index d17359dc29..07fbf5f9a6 100644 --- a/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb +++ b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb @@ -1,13 +1,11 @@ +include xorg-lib-common.inc + DESCRIPTION = "X font library (used by the X server)." -SECTION = "x11/libs" +LICENSE= "BSD-X" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "BSD-X" -DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype" +DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" PROVIDES = "xfont" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXfont" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb index 2701aef825..07fbf5f9a6 100644 --- a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb +++ b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb @@ -1,15 +1,11 @@ +include xorg-lib-common.inc + DESCRIPTION = "X font library (used by the X server)." -SECTION = "x11/libs" +LICENSE= "BSD-X" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "BSD-X" -DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype" +DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" PROVIDES = "xfont" XORG_PN = "libXfont" -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-1.2.0" diff --git a/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..5de5a2a590 --- /dev/null +++ b/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libx11 libxext xextproto fontcacheproto" + +XORG_PN = "libXfontcache" + diff --git a/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..5de5a2a590 --- /dev/null +++ b/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libx11 libxext xextproto fontcacheproto" + +XORG_PN = "libXfontcache" + diff --git a/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb index f1b6456740..88d850401e 100644 --- a/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb +++ b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb @@ -1,15 +1,12 @@ +include xorg-lib-common.inc + DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." -LICENSE = "MIT-X" -SECTION = "x11/libs" -DEPENDS = "libx11 xproto libxrender freetype fontconfig" +DEPENDS += " libxrender freetype fontconfig" PROVIDES = "xft" - XORG_PN = "libXft" -include xorg-xlibs.inc - FILES_${PN} = ${libdir}/lib*.so.* FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${libdir}/*.a ${libdir}/pkgconfig \ diff --git a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb index 4e357cde7c..10ea847e9c 100644 --- a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb @@ -1,11 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Input extension library." -SECTION = "x11/libs" -LICENSE = "MIT-X" -DEPENDS = "xproto libx11 libxext" +DEPENDS += " xproto libx11 xextproto libxext inputproto" XORG_PN = "libXi" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb index d698f04ee1..10ea847e9c 100644 --- a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb @@ -1,12 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Input extension library." -SECTION = "x11/libs" -LICENSE = "MIT-X" -DEPENDS = "xproto libx11 libxext" +DEPENDS += " xproto libx11 xextproto libxext inputproto" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXi" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb index 09a4f564f5..88ce13b30e 100644 --- a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb @@ -1,14 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "Xinerama library" -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT" -DEPENDS = "xineramaproto xproto libx11 libxext" +DEPENDS += " libx11 libxext xextproto xineramaproto" PROVIDES = "xinerama" XORG_PN = "libXinerama" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb index 5cbc9a1150..58b085294e 100644 --- a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb @@ -1,11 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "X11 keyboard library" -SECTION = "libs" +LICENSE= "GPL" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11" -XORG_PN = "${PN}" +DEPENDS += " libx11 kbproto" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb index 36e3e5f600..58b085294e 100644 --- a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb +++ b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb @@ -1,12 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "X11 keyboard library" -SECTION = "libs" +LICENSE= "GPL" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11" -XORG_RELEASE = "X11R7.1" -XORG_PN = "${PN}" +DEPENDS += " libx11 kbproto" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb index ded3da66f3..3039ff09b4 100644 --- a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb @@ -1,12 +1,8 @@ -DESCRIPTION = "X11 keyboard library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11 libxt libxkbfile kbproto" +include xorg-lib-common.inc -XORG_PN = "${PN}" - -include xorg-xlibs.inc +DESCRIPTION = "X11 lbxkbui library" +LICENSE= "GPL" +PRIORITY = "optional" +DEPENDS += " libx11 libxt libxkbfile" +PROVIDES = "xkbui" diff --git a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb index a914f1e0ef..3039ff09b4 100644 --- a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "X11 keyboard library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11 libxt libxkbfile" +include xorg-lib-common.inc -XORG_RELEASE = "X11R7.1" -XORG_PN = "${PN}" - -include xorg-xlibs.inc +DESCRIPTION = "X11 lbxkbui library" +LICENSE= "GPL" +PRIORITY = "optional" +DEPENDS += " libx11 libxt libxkbfile" +PROVIDES = "xkbui" diff --git a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb index 1693e5d0d5..ed2e765084 100644 --- a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb @@ -1,16 +1,13 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Window System miscellaneous utility library" -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT" -DEPENDS = "libxt libxext util-macros" +DEPENDS += " libxt libxext xextproto libx11" PROVIDES = "xmu" XORG_PN = "libXmu" -include xorg-xlibs.inc - PACKAGES =+ "libxmuu libxmuu-dev" FILES_libxmuu = "${libdir}/libXmuu.so.*" diff --git a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb index cc06d2a671..ed2e765084 100644 --- a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb @@ -1,17 +1,13 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Window System miscellaneous utility library" -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT" -DEPENDS = "libxt libxext util-macros" +DEPENDS += " libxt libxext xextproto libx11" PROVIDES = "xmu" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXmu" -include xorg-xlibs.inc - PACKAGES =+ "libxmuu libxmuu-dev" FILES_libxmuu = "${libdir}/libXmuu.so.*" diff --git a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb index 15653f1390..fc77aa08c8 100644 --- a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb @@ -1,13 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X print extension library." -SECTION = "libs" -#MAINTAINER = "" -LICENSE = "MIT" -DEPENDS = "libx11 libxext xextproto libxau printproto" +DEPENDS += " libx11 libxext xextproto libxau printproto" XORG_PN = "libXp" -include xorg-xlibs.inc - CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb index c88bd3f6bc..94e638ce74 100644 --- a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb +++ b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb @@ -1,21 +1,13 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Pixmap library." -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" LICENSE = "X-BSD" -PR = "r1" -DEPENDS = "xproto libx11 util-macros" +DEPENDS += " xproto libx11 libxt libxext xextproto" XORG_PN = "libXpm" -include xorg-xlibs.inc - -do_stage () { - install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h - oe_libinstall -a -so libXpm ${STAGING_LIBDIR} -} - PACKAGES =+ "sxpm cxpm" FILES_cxpm = "${bindir}/cxpm" FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb index 397be2faf4..94e638ce74 100644 --- a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb +++ b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb @@ -1,21 +1,13 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Pixmap library." -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" LICENSE = "X-BSD" -DEPENDS = "xproto libx11 util-macros" +DEPENDS += " xproto libx11 libxt libxext xextproto" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXpm" -include xorg-xlibs.inc - -do_stage () { - install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h - oe_libinstall -a -so libXpm ${STAGING_LIBDIR} -} - PACKAGES =+ "sxpm cxpm" FILES_cxpm = "${bindir}/cxpm" FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..d65caf0eae --- /dev/null +++ b/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libx11 libxp libxprintutil printproto libxau" + +XORG_PN = "libXprintAppUtil" + diff --git a/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..dfb38c6624 --- /dev/null +++ b/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libx11 libxp libxt printproto libxau" + +XORG_PN = "libXprintUtil" + diff --git a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb index 3081f4ab86..d14bc4c8bb 100644 --- a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb +++ b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb @@ -1,12 +1,9 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Resize and Rotate extension library." -SECTION = "x11/libs" -#MAINTAINER = "" LICENSE = "BSD-X" -DEPENDS = "randrproto libx11 libxrender libxext" +DEPENDS += " libx11 randrproto libxext xextproto libxrender renderproto" XORG_PN = "libXrandr" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb index 0c7978945a..d14bc4c8bb 100644 --- a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb +++ b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb @@ -1,13 +1,9 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Resize and Rotate extension library." -SECTION = "x11/libs" -#MAINTAINER = "" LICENSE = "BSD-X" -DEPENDS = "randrproto libx11 libxrender libxext" +DEPENDS += " libx11 randrproto libxext xextproto libxrender renderproto" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXrandr" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb index 1cff60983a..797780042c 100644 --- a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb +++ b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb @@ -1,12 +1,9 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Render extension library." -SECTION = "libs" -#MAINTAINER = "" -LICENSE = "BSD" +LICENSE = "BSD-X" -DEPENDS = "renderproto libx11" +DEPENDS += " libx11 renderproto" XORG_PN = "libXrender" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb index 1ee518645b..797780042c 100644 --- a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb +++ b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb @@ -1,13 +1,9 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Render extension library." -SECTION = "libs" -#MAINTAINER = "" -LICENSE = "BSD" +LICENSE = "BSD-X" -DEPENDS = "renderproto libx11" +DEPENDS += " libx11 renderproto" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXrender" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb index a9806f57b1..4e7b203584 100644 --- a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb @@ -1,13 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Resource usage library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE = "X-MIT" -DEPENDS = "libx11 xextproto libxext resourceproto" -PROVIDES = "xres" +DEPENDS += " libx11 libxext xextproto resourceproto" XORG_PN = "libXres" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb index e2ac5aee7b..4e7b203584 100644 --- a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb @@ -1,14 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Resource usage library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE = "X-MIT" -DEPENDS = "libx11 libxext" -PROVIDES = "xres" +DEPENDS += " libx11 libxext xextproto resourceproto" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXres" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb index 92dd4c82c4..fc77bdf373 100644 --- a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb @@ -1,15 +1,13 @@ +include xorg-lib-common.inc + DESCRIPTION = "X screen saver extension library." -SECTION = "libs" -#MAINTAINER = "" LICENSE = "GPL" -DEPENDS = "libx11 libxext xextproto scrnsaverproto" -PROVIDES = "libxss" -RREPLACES = "libxss" +DEPENDS += " libx11 libxext xextproto scrnsaverproto" XORG_PN = "libXScrnSaver" -include xorg-xlibs.inc +PROVIDES = "libxss" +RREPLACES = "libxss" #CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..fc77bdf373 --- /dev/null +++ b/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb @@ -0,0 +1,13 @@ +include xorg-lib-common.inc + +DESCRIPTION = "X screen saver extension library." +LICENSE = "GPL" + +DEPENDS += " libx11 libxext xextproto scrnsaverproto" + +XORG_PN = "libXScrnSaver" + +PROVIDES = "libxss" +RREPLACES = "libxss" + +#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" diff --git a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb index 606de5f31c..605827bc25 100644 --- a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb @@ -1,16 +1,13 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Toolkit Intrinsics" -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "X-MIT" -DEPENDS = "libx11 libsm util-macros kbproto" +DEPENDS += " libsm libx11 xproto kbproto" PROVIDES = "xt" XORG_PN = "libXt" -include xorg-xlibs.inc - EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" do_compile() { diff --git a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb index 69c74343a4..605827bc25 100644 --- a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb +++ b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb @@ -1,17 +1,13 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Toolkit Intrinsics" -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "X-MIT" -DEPENDS = "libx11 libsm util-macros" +DEPENDS += " libsm libx11 xproto kbproto" PROVIDES = "xt" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXt" -include xorg-xlibs.inc - EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" do_compile() { diff --git a/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..c8999efd81 --- /dev/null +++ b/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libx11 libxt trapproto libxext xextproto" + +XORG_PN = "libXTrap" + diff --git a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb index 1355142ffd..a89203f5df 100644 --- a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb @@ -1,12 +1,10 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Test Extension: client side library" -SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" -DEPENDS = "libx11 libxext recordproto xextproto inputproto" +DEPENDS += " libx11 libxext recordproto xextproto inputproto" PROVIDES = "xtst" XORG_PN = "libXtst" -include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb index 2d5c6aeb17..0f7d074098 100644 --- a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb +++ b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb @@ -1,12 +1,9 @@ +include xorg-lib-common.inc + DESCRIPTION = "X Video extension library." -SECTION = "x11/libs" -#MAINTAINER = "" LICENSE = "GPL" -DEPENDS = "libx11 libxext xextproto videoproto" +DEPENDS += " libx11 libxext xextproto videoproto" XORG_PN = "libXv" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..3625d38bb8 --- /dev/null +++ b/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +DESCRIPTION = "X Video Motion Compensation extension library." + +DEPENDS += " libx11 libxext libxv xextproto videoproto" + +XORG_PN = "libXvMC" + diff --git a/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..3625d38bb8 --- /dev/null +++ b/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb @@ -0,0 +1,8 @@ +include xorg-lib-common.inc + +DESCRIPTION = "X Video Motion Compensation extension library." + +DEPENDS += " libx11 libxext libxv xextproto videoproto" + +XORG_PN = "libXvMC" + diff --git a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb index 82e784789f..57b686a8b5 100644 --- a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb @@ -1,15 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "Xxf86dga extension library." -SECTION = "x11/libs" -LICENSE = "XFree86" -DEPENDS = "libx11 libxext xf86dgaproto" +DEPENDS += " xproto libx11 xextproto libxext xf86dgaproto" XORG_PN = "libXxf86dga" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - -do_stage() { - oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} -} diff --git a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb index 2842c2c458..57b686a8b5 100644 --- a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb @@ -1,16 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "Xxf86dga extension library." -SECTION = "x11/libs" -LICENSE = "XFree86" -DEPENDS = "libx11 libxext" +DEPENDS += " xproto libx11 xextproto libxext xf86dgaproto" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXxf86dga" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - -do_stage() { - oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} -} diff --git a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb index 5d5badb7a1..50bddbe2b8 100644 --- a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb @@ -1,11 +1,9 @@ -DESCRIPTION = "Xxf86vm extension library." -SECTION = "x11/libs" -LICENSE = "MIT" -DEPENDS = "libx11 libxext xf86miscproto" +include xorg-lib-common.inc -XORG_PN = "libXxf86misc" +#DESCRIPTION = "" -include xorg-xlibs.inc +DEPENDS += " xproto libx11 xextproto libxext xf86miscproto" +PROVIDES = "xxf86misc" -EXTRA_OECONF="--enable-malloc0returnsnull" +XORG_PN = "libXxf86misc" diff --git a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb index 2544f91ab1..50bddbe2b8 100644 --- a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb @@ -1,12 +1,9 @@ -DESCRIPTION = "Xxf86vm extension library." -SECTION = "x11/libs" -LICENSE = "MIT" -DEPENDS = "libx11 libxext" +include xorg-lib-common.inc -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXxf86misc" +#DESCRIPTION = "" -include xorg-xlibs.inc +DEPENDS += " xproto libx11 xextproto libxext xf86miscproto" +PROVIDES = "xxf86misc" -EXTRA_OECONF="--enable-malloc0returnsnull" +XORG_PN = "libXxf86misc" diff --git a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb index 47a319c28e..8dac3c7417 100644 --- a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb @@ -1,12 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "Xxf86vm extension library." -SECTION = "x11/libs" -LICENSE = "MIT" -DEPENDS = "libx11 libxext xf86vidmodeproto" +DEPENDS += " xproto libx11 xextproto libxext xf86vidmodeproto" XORG_PN = "libXxf86vm" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - diff --git a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb index 0ab206a0df..8dac3c7417 100644 --- a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb @@ -1,13 +1,8 @@ +include xorg-lib-common.inc + DESCRIPTION = "Xxf86vm extension library." -SECTION = "x11/libs" -LICENSE = "MIT" -DEPENDS = "libx11 libxext" +DEPENDS += " xproto libx11 xextproto libxext xf86vidmodeproto" -XORG_RELEASE = "X11R7.1" XORG_PN = "libXxf86vm" -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc index 8fb46777b0..7a3e0425c7 100644 --- a/packages/xorg-lib/xorg-lib-common.inc +++ b/packages/xorg-lib/xorg-lib-common.inc @@ -1,12 +1,17 @@ -XORG_PV = "${@['${XORG_RELEASE}-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:4]=='X11R']}" -XORG_RELEASE ?= "X11R7.0" - -SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-${XORG_PV}" +HOMEPAGE = "http://www.x.org" +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "MIT-X" +DEPENDS = "util-macros" +XORG_PN = "${PN}" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.gz" +S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig +EXTRA_OECONF="--enable-malloc0returnsnull" + do_stage() { autotools_stage_all } diff --git a/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..ff63987713 --- /dev/null +++ b/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb @@ -0,0 +1,11 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "util-macros-native" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/xtrans-${PV}.tar.bz2" +S = "${WORKDIR}/xtrans-${PV}" + +inherit native autotools pkgconfig diff --git a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb index b6933bf615..2fe92245c2 100644 --- a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb @@ -1,9 +1,8 @@ -LICENSE = "MIT" -SECTION = "x11/libs" +include xorg-lib-common.inc + DESCRIPTION = "network API translation layer to \ insulate X applications and libraries from OS \ network vageries." -XORG_PN = "${PN}" +#DEPENDS += " " -include xorg-xlibs.inc |