From 2153cacf1be31e93f727ec07fbc10832cd75eaf5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 3 Jul 2007 11:48:47 +0000 Subject: xorg-lib: X11 cleanup git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2086 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/xorg-lib/diet-x11_1.1.1.bb | 11 +++++++++ meta/packages/xorg-lib/diet-x11_X11R7.1-1.1.1.bb | 9 ------- meta/packages/xorg-lib/libapplewm_1.0.0.bb | 9 +++++++ meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb | 8 ------- meta/packages/xorg-lib/libdmx_1.0.2.bb | 6 +++++ meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb | 5 ---- meta/packages/xorg-lib/libfs_1.0.0.bb | 9 +++++++ meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb | 8 ------- meta/packages/xorg-lib/libice_1.0.1.bb | 11 +++++++++ meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb | 10 -------- meta/packages/xorg-lib/liblbxutil_1.0.1.bb | 11 +++++++++ meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb | 10 -------- meta/packages/xorg-lib/liboldx_1.0.1.bb | 9 +++++++ meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb | 8 ------- meta/packages/xorg-lib/libwindowswm_1.0.0.bb | 9 +++++++ .../xorg-lib/libwindowswm_X11R7.0-1.0.0.bb | 8 ------- meta/packages/xorg-lib/libx11-native_1.0.1.bb | 26 ++++++++++++++++++++ .../xorg-lib/libx11-native_X11R7.1-1.0.1.bb | 25 ------------------- meta/packages/xorg-lib/libx11_1.1.1.bb | 28 ++++++++++++++++++++++ meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb | 27 --------------------- meta/packages/xorg-lib/libxevie_1.0.1.bb | 9 +++++++ meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb | 8 ------- meta/packages/xorg-lib/libxext_1.0.1.bb | 11 +++++++++ meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb | 10 -------- meta/packages/xorg-lib/libxft_2.1.12.bb | 24 +++++++++++++++++++ meta/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb | 23 ------------------ meta/packages/xorg-lib/libxkbui_1.0.2.bb | 9 +++++++ meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb | 8 ------- meta/packages/xorg-lib/libxp_1.0.0.bb | 11 +++++++++ meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb | 10 -------- meta/packages/xorg-lib/libxprintapputil_1.0.1.bb | 9 +++++++ .../xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb | 8 ------- meta/packages/xorg-lib/libxprintutil_1.0.1.bb | 9 +++++++ .../xorg-lib/libxprintutil_X11R7.0-1.0.1.bb | 8 ------- meta/packages/xorg-lib/libxtrap_1.0.0.bb | 9 +++++++ meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb | 8 ------- meta/packages/xorg-lib/libxtst_1.0.1.bb | 11 +++++++++ meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb | 10 -------- meta/packages/xorg-lib/libxxf86dga_1.0.1.bb | 9 +++++++ .../packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb | 8 ------- meta/packages/xorg-lib/libxxf86misc_1.0.1.bb | 10 ++++++++ .../xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb | 9 ------- meta/packages/xorg-lib/libxxf86vm_1.0.1.bb | 9 +++++++ meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb | 8 ------- 44 files changed, 259 insertions(+), 236 deletions(-) create mode 100644 meta/packages/xorg-lib/diet-x11_1.1.1.bb delete mode 100644 meta/packages/xorg-lib/diet-x11_X11R7.1-1.1.1.bb create mode 100644 meta/packages/xorg-lib/libapplewm_1.0.0.bb delete mode 100644 meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb create mode 100644 meta/packages/xorg-lib/libdmx_1.0.2.bb delete mode 100644 meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb create mode 100644 meta/packages/xorg-lib/libfs_1.0.0.bb delete mode 100644 meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb create mode 100644 meta/packages/xorg-lib/libice_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb create mode 100644 meta/packages/xorg-lib/liblbxutil_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb create mode 100644 meta/packages/xorg-lib/liboldx_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb create mode 100644 meta/packages/xorg-lib/libwindowswm_1.0.0.bb delete mode 100644 meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb create mode 100644 meta/packages/xorg-lib/libx11-native_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb create mode 100644 meta/packages/xorg-lib/libx11_1.1.1.bb delete mode 100644 meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb create mode 100644 meta/packages/xorg-lib/libxevie_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb create mode 100644 meta/packages/xorg-lib/libxext_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb create mode 100644 meta/packages/xorg-lib/libxft_2.1.12.bb delete mode 100644 meta/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb create mode 100644 meta/packages/xorg-lib/libxkbui_1.0.2.bb delete mode 100644 meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb create mode 100644 meta/packages/xorg-lib/libxp_1.0.0.bb delete mode 100644 meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb create mode 100644 meta/packages/xorg-lib/libxprintapputil_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb create mode 100644 meta/packages/xorg-lib/libxprintutil_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb create mode 100644 meta/packages/xorg-lib/libxtrap_1.0.0.bb delete mode 100644 meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb create mode 100644 meta/packages/xorg-lib/libxtst_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb create mode 100644 meta/packages/xorg-lib/libxxf86dga_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb create mode 100644 meta/packages/xorg-lib/libxxf86misc_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb create mode 100644 meta/packages/xorg-lib/libxxf86vm_1.0.1.bb delete mode 100644 meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb (limited to 'meta') diff --git a/meta/packages/xorg-lib/diet-x11_1.1.1.bb b/meta/packages/xorg-lib/diet-x11_1.1.1.bb new file mode 100644 index 0000000000..ce5e2b4b8b --- /dev/null +++ b/meta/packages/xorg-lib/diet-x11_1.1.1.bb @@ -0,0 +1,11 @@ +SECTION = "x11/base" +require libx11_${PV}.bb + +PE = "1" + +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1" diff --git a/meta/packages/xorg-lib/diet-x11_X11R7.1-1.1.1.bb b/meta/packages/xorg-lib/diet-x11_X11R7.1-1.1.1.bb deleted file mode 100644 index 33e50df13a..0000000000 --- a/meta/packages/xorg-lib/diet-x11_X11R7.1-1.1.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SECTION = "x11/base" -require libx11_${PV}.bb - -EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" - -SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ - file://fix-disable-xlocale.diff;patch=1 \ - file://fix-utf8-wrong-define.patch;patch=1" diff --git a/meta/packages/xorg-lib/libapplewm_1.0.0.bb b/meta/packages/xorg-lib/libapplewm_1.0.0.bb new file mode 100644 index 0000000000..ee847a9ddd --- /dev/null +++ b/meta/packages/xorg-lib/libapplewm_1.0.0.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto applewmproto" + +XORG_PN = "libAppleWM" + +PE = "1" diff --git a/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb deleted file mode 100644 index 28abffa735..0000000000 --- a/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto applewmproto" - -XORG_PN = "libAppleWM" - diff --git a/meta/packages/xorg-lib/libdmx_1.0.2.bb b/meta/packages/xorg-lib/libdmx_1.0.2.bb new file mode 100644 index 0000000000..601aad10a6 --- /dev/null +++ b/meta/packages/xorg-lib/libdmx_1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto dmxproto" +PE = "1" diff --git a/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb deleted file mode 100644 index a612982a95..0000000000 --- a/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto dmxproto" diff --git a/meta/packages/xorg-lib/libfs_1.0.0.bb b/meta/packages/xorg-lib/libfs_1.0.0.bb new file mode 100644 index 0000000000..775f4ed3b3 --- /dev/null +++ b/meta/packages/xorg-lib/libfs_1.0.0.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +#DESCRIPTION = " " + +DEPENDS += " xproto fontsproto xtrans" + +XORG_PN = "libFS" + +PE = "1" diff --git a/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb deleted file mode 100644 index 5c07ce682c..0000000000 --- a/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = " " - -DEPENDS += " xproto fontsproto xtrans" - -XORG_PN = "libFS" - diff --git a/meta/packages/xorg-lib/libice_1.0.1.bb b/meta/packages/xorg-lib/libice_1.0.1.bb new file mode 100644 index 0000000000..e3fa1f9791 --- /dev/null +++ b/meta/packages/xorg-lib/libice_1.0.1.bb @@ -0,0 +1,11 @@ +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_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb deleted file mode 100644 index da40983162..0000000000 --- a/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 ICE library" -PRIORITY = "optional" - -DEPENDS += " xproto xtrans" -PROVIDES = "ice" - -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 new file mode 100644 index 0000000000..ec228fbcb7 --- /dev/null +++ b/meta/packages/xorg-lib/liblbxutil_1.0.1.bb @@ -0,0 +1,11 @@ +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" diff --git a/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb deleted file mode 100644 index 1b8660dda6..0000000000 --- a/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -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" diff --git a/meta/packages/xorg-lib/liboldx_1.0.1.bb b/meta/packages/xorg-lib/liboldx_1.0.1.bb new file mode 100644 index 0000000000..99dd24b00b --- /dev/null +++ b/meta/packages/xorg-lib/liboldx_1.0.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11" + +XORG_PN = "liboldX" + +PE = "1" diff --git a/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb deleted file mode 100644 index 2a380a65f6..0000000000 --- a/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11" - -XORG_PN = "liboldX" - diff --git a/meta/packages/xorg-lib/libwindowswm_1.0.0.bb b/meta/packages/xorg-lib/libwindowswm_1.0.0.bb new file mode 100644 index 0000000000..b3b366b069 --- /dev/null +++ b/meta/packages/xorg-lib/libwindowswm_1.0.0.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto windowswmproto" + +XORG_PN = "libWindowsWM" + +PE = "1" diff --git a/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb deleted file mode 100644 index 90b8aeca49..0000000000 --- a/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxext xextproto windowswmproto" - -XORG_PN = "libWindowsWM" - diff --git a/meta/packages/xorg-lib/libx11-native_1.0.1.bb b/meta/packages/xorg-lib/libx11-native_1.0.1.bb new file mode 100644 index 0000000000..2fb8801284 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-native_1.0.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Base X libs." +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" +PE = "1" + +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/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb deleted file mode 100644 index 2b84b2c53c..0000000000 --- a/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -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/meta/packages/xorg-lib/libx11_1.1.1.bb b/meta/packages/xorg-lib/libx11_1.1.1.bb new file mode 100644 index 0000000000..f639372ac7 --- /dev/null +++ b/meta/packages/xorg-lib/libx11_1.1.1.bb @@ -0,0 +1,28 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Base X libs." + +DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto" +PROVIDES = "virtual/libx11" +# RPROVIDES = "virtual/libx11" +PE = "1" + +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.1.1.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-1.1.1" + +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 + 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/meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb b/meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb deleted file mode 100644 index 73b6d910ba..0000000000 --- a/meta/packages/xorg-lib/libx11_X11R7.1-1.1.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Base X libs." - -DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" -PROVIDES = "virtual/libx11" -# RPROVIDES = "virtual/libx11" - -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 - 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/meta/packages/xorg-lib/libxevie_1.0.1.bb b/meta/packages/xorg-lib/libxevie_1.0.1.bb new file mode 100644 index 0000000000..71abb2c567 --- /dev/null +++ b/meta/packages/xorg-lib/libxevie_1.0.1.bb @@ -0,0 +1,9 @@ +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_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb deleted file mode 100644 index 4c3a134633..0000000000 --- a/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" - -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 new file mode 100644 index 0000000000..4d30befbe0 --- /dev/null +++ b/meta/packages/xorg-lib/libxext_1.0.1.bb @@ -0,0 +1,11 @@ +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_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb deleted file mode 100644 index fc2061514a..0000000000 --- a/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Server Extension library" -PRIORITY = "optional" - -DEPENDS += " xproto virtual/libx11 xextproto libxau" -PROVIDES = "xext" - -XORG_PN = "libXext" - diff --git a/meta/packages/xorg-lib/libxft_2.1.12.bb b/meta/packages/xorg-lib/libxft_2.1.12.bb new file mode 100644 index 0000000000..8843938d4e --- /dev/null +++ b/meta/packages/xorg-lib/libxft_2.1.12.bb @@ -0,0 +1,24 @@ +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" +PROVIDES = "xft" +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) +} diff --git a/meta/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb b/meta/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb deleted file mode 100644 index 5ae8247296..0000000000 --- a/meta/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb +++ /dev/null @@ -1,23 +0,0 @@ -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" -PROVIDES = "xft" - -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) -} diff --git a/meta/packages/xorg-lib/libxkbui_1.0.2.bb b/meta/packages/xorg-lib/libxkbui_1.0.2.bb new file mode 100644 index 0000000000..619b8a34b0 --- /dev/null +++ b/meta/packages/xorg-lib/libxkbui_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 lbxkbui library" +LICENSE= "GPL" +PRIORITY = "optional" +PE = "1" + +DEPENDS += " virtual/libx11 libxt libxkbfile" +PROVIDES = "xkbui" diff --git a/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb deleted file mode 100644 index e094728c2f..0000000000 --- a/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 lbxkbui library" -LICENSE= "GPL" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 libxt libxkbfile" -PROVIDES = "xkbui" diff --git a/meta/packages/xorg-lib/libxp_1.0.0.bb b/meta/packages/xorg-lib/libxp_1.0.0.bb new file mode 100644 index 0000000000..5dec1c26bb --- /dev/null +++ b/meta/packages/xorg-lib/libxp_1.0.0.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X print extension library." + +DEPENDS += " virtual/libx11 libxext xextproto libxau printproto" + +XORG_PN = "libXp" +PE = "1" + +CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb deleted file mode 100644 index fc7ecb5778..0000000000 --- a/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X print extension library." - -DEPENDS += " virtual/libx11 libxext xextproto libxau printproto" - -XORG_PN = "libXp" - -CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb b/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb new file mode 100644 index 0000000000..fd8a39670a --- /dev/null +++ b/meta/packages/xorg-lib/libxprintapputil_1.0.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau" + +XORG_PN = "libXprintAppUtil" + +PE = "1" diff --git a/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb deleted file mode 100644 index 077ac40a0a..0000000000 --- a/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau" - -XORG_PN = "libXprintAppUtil" - diff --git a/meta/packages/xorg-lib/libxprintutil_1.0.1.bb b/meta/packages/xorg-lib/libxprintutil_1.0.1.bb new file mode 100644 index 0000000000..67cf0be61d --- /dev/null +++ b/meta/packages/xorg-lib/libxprintutil_1.0.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxp libxt printproto libxau" + +XORG_PN = "libXprintUtil" + +PE = "1" diff --git a/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb deleted file mode 100644 index f965b9a2bc..0000000000 --- a/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxp libxt printproto libxau" - -XORG_PN = "libXprintUtil" - diff --git a/meta/packages/xorg-lib/libxtrap_1.0.0.bb b/meta/packages/xorg-lib/libxtrap_1.0.0.bb new file mode 100644 index 0000000000..81c9df458b --- /dev/null +++ b/meta/packages/xorg-lib/libxtrap_1.0.0.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto" + +XORG_PN = "libXTrap" + +PE = "1" diff --git a/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb deleted file mode 100644 index f9ebac47f9..0000000000 --- a/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto" - -XORG_PN = "libXTrap" - diff --git a/meta/packages/xorg-lib/libxtst_1.0.1.bb b/meta/packages/xorg-lib/libxtst_1.0.1.bb new file mode 100644 index 0000000000..3fa73b811a --- /dev/null +++ b/meta/packages/xorg-lib/libxtst_1.0.1.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Test Extension: client side library" +PRIORITY = "optional" + +DEPENDS += " virtual/libx11 libxext recordproto xextproto inputproto" +PROVIDES = "xtst" + +XORG_PN = "libXtst" + +PE = "1" diff --git a/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb deleted file mode 100644 index 802ea2836d..0000000000 --- a/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Test Extension: client side library" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 libxext recordproto xextproto inputproto" -PROVIDES = "xtst" - -XORG_PN = "libXtst" - diff --git a/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb b/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb new file mode 100644 index 0000000000..e563975933 --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86dga_1.0.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Xxf86dga extension library." + +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto" + +XORG_PN = "libXxf86dga" + +PE = "1" diff --git a/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb deleted file mode 100644 index e067190b84..0000000000 --- a/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Xxf86dga extension library." - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto" - -XORG_PN = "libXxf86dga" - diff --git a/meta/packages/xorg-lib/libxxf86misc_1.0.1.bb b/meta/packages/xorg-lib/libxxf86misc_1.0.1.bb new file mode 100644 index 0000000000..16fe73511c --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86misc_1.0.1.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto" +PROVIDES = "xxf86misc" + +XORG_PN = "libXxf86misc" + +PE = "1" diff --git a/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb deleted file mode 100644 index 3af4acba96..0000000000 --- a/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto" -PROVIDES = "xxf86misc" - -XORG_PN = "libXxf86misc" - diff --git a/meta/packages/xorg-lib/libxxf86vm_1.0.1.bb b/meta/packages/xorg-lib/libxxf86vm_1.0.1.bb new file mode 100644 index 0000000000..a82c997b36 --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86vm_1.0.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Xxf86vm extension library." + +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" + +XORG_PN = "libXxf86vm" + +PE = "1" diff --git a/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb deleted file mode 100644 index b85e2d2477..0000000000 --- a/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Xxf86vm extension library." - -DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" - -XORG_PN = "libXxf86vm" - -- cgit v1.2.3-54-g00ecf