diff options
| author | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
|---|---|---|
| committer | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
| commit | ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch) | |
| tree | 2000b53f806c79510671d8fd1a6a36125f8b25b3 | |
| parent | c210d01a7ca8c00ddc45d292878b89086b137129 (diff) | |
| download | openembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz openembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.bz2 openembedded-core-ca10363baac7de9581ec90ab47957f973e1dbdc4.zip | |
Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
335 files changed, 3953 insertions, 60 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc new file mode 100644 index 0000000000..1a28a3f3b4 --- /dev/null +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -0,0 +1,109 @@ +PREFERRED_VERSION_applewmproto = "X11R7.0-1.0.3" +PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2" +PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2" +PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1" +PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3" +PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1" +PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2" +PREFERRED_VERSION_evieext = "X11R7.0-1.0.2" +PREFERRED_VERSION_fixesproto = "X11R7.1-4.0" +PREFERRED_VERSION_fontcacheproto = "X11R7.0-0.1.2" +PREFERRED_VERSION_fontcacheproto-native = "X11R7.0-0.1.2" +PREFERRED_VERSION_fontsproto = "X11R7.0-2.0.2" +PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2" +PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2" +PREFERRED_VERSION_glproto = "X11R7.1-1.4.7" +PREFERRED_VERSION_imake = "X11R7.1-1.0.2" +PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2" +PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2" +PREFERRED_VERSION_kbproto = "X11R7.1-1.0.3" +PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2" +PREFERRED_VERSION_libapplewm = "X11R7.0-1.0.0" +PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2" +PREFERRED_VERSION_libfs = "X11R7.0-1.0.0" +PREFERRED_VERSION_libice = "X11R7.1-1.0.1" +PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1" +PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1" +PREFERRED_VERSION_libsm = "X11R7.1-1.0.1" +PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0" +PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1" +PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxau = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2" +PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3" +PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6" +PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3" +PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxevie = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxext = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxfixes = "X11R7.1-4.0.1" +PREFERRED_VERSION_libxfont = "X11R7.1-1.2.0" +PREFERRED_VERSION_libxfont-native = "X11R7.1-1.1.0" +PREFERRED_VERSION_libxfontcache = "X11R7.1-1.0.2" +PREFERRED_VERSION_libxft = "X11R7.0-2.1.8.2" +PREFERRED_VERSION_libxi = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxinerama = "X11R7.0-1.0.1" +PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3" +PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2" +PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxp = "X11R7.0-1.0.0" +PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5" +PREFERRED_VERSION_libxprintapputil = "X11R7.0-1.0.1" +PREFERRED_VERSION_libxprintutil = "X11R7.0-1.0.1" +PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1" +PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1" +PREFERRED_VERSION_libxres = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0" +PREFERRED_VERSION_libxt = "X11R7.1-1.0.2" +PREFERRED_VERSION_libxtrap = "X11R7.0-1.0.0" +PREFERRED_VERSION_libxtst = "X11R7.0-1.0.1" +PREFERRED_VERSION_libxv = "X11R7.0-1.0.1" +PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2" +PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1" +PREFERRED_VERSION_lndir = "X11R7.0-1.0.1" +PREFERRED_VERSION_makedepend = "X11R7.0-1.0.0" +PREFERRED_VERSION_makedepend-native = "X11R7.0-1.0.0" +PREFERRED_VERSION_printproto = "X11R7.0-1.0.3" +PREFERRED_VERSION_randrproto = "X11R7.0-1.1.2" +PREFERRED_VERSION_recordproto = "X11R7.0-1.13.2" +PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2" +PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2" +PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0" +PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3" +PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2" +PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2" +PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3" +PREFERRED_VERSION_xauth = "X11R7.0-1.0.1" +PREFERRED_VERSION_xcmiscproto = "X11R7.0-1.1.2" +PREFERRED_VERSION_xcmiscproto-native = "X11R7.0-1.1.2" +PREFERRED_VERSION_xdpyinfo = "X11R7.0-1.0.1" +PREFERRED_VERSION_xextproto = "X11R7.0-7.0.2" +PREFERRED_VERSION_xextproto-native = "X11R7.0-7.0.2" +PREFERRED_VERSION_xf86bigfontproto = "X11R7.0-1.1.2" +PREFERRED_VERSION_xf86bigfontproto-native = "X11R7.0-1.1.2" +PREFERRED_VERSION_xf86dgaproto = "X11R7.0-2.0.2" +PREFERRED_VERSION_xf86driproto = "X11R7.0-2.0.3" +PREFERRED_VERSION_xf86miscproto = "X11R7.0-0.9.2" +PREFERRED_VERSION_xf86rushproto = "X11R7.0-1.1.2" +PREFERRED_VERSION_xf86vidmodeproto = "X11R7.0-2.2.2" +PREFERRED_VERSION_xhost = "X11R7.1-1.0.1" +PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2" +PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1" +PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2" +PREFERRED_VERSION_xproto = "X11R7.1-7.0.5" +PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5" +PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2" +PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2" +PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2" +PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" +PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0" +PREFERRED_VERSION_xset = "X11R7.1-1.0.2" +PREFERRED_VERSION_xtrans = "X11R7.0-1.0.0" +PREFERRED_VERSION_xtrans-native = "X11R7.0-1.0.0" diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index a08abf134c..561effbe29 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -103,7 +103,7 @@ SRCDATE_libfakekey ?= "20051101" SRCDATE_xmodmap ?= "20051101" SRCDATE_libxrandr ?= "20051101" SRCDATE_libxtst ?= "20051101" -SRCDATE_xcalibrate ?= "20051101" +SRCDATE_xcalibrate ?= "20060312" SRCDATE_libxmu ?= "20051115" SRCDATE_xdpyinfo ?= "20051115" SRCDATE_xauth ?= "20060120" @@ -127,7 +127,6 @@ PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}" PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}" PREFERRED_VERSION_matchbox-wm ?= "1.1" PREFERRED_VERSION_libmatchbox ?= "1.9" -PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}" PREFERRED_VERSION_glib-2.0 ?= "2.10.3" PREFERRED_VERSION_glib-2.0-native ?= "2.10.3" @@ -140,7 +139,6 @@ PREFERRED_VERSION_pango ?= "1.10.1" PREFERRED_VERSION_dbus ?= "0.60" PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}" -PREFERRED_VERSION_diet-x11 ?= "6.2.1" PREFERRED_VERSION_dillo2 ?= "0.6.6" PREFERRED_VERSION_evince ?= "0.3.2" PREFERRED_VERSION_firefox ?= "1.0" @@ -161,14 +159,15 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6" PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_xdemineur ?= "2.1.1" PREFERRED_VERSION_xextensions ?= "1.0.1" -PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" + + PREFERRED_VERSION_xmonobut ?= "0.4" PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_xproto ?= "6.6.2" -PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xst ?= "0.15" PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}" +require conf/distro/include/preferred-xorg-versions.inc + PCMCIA_MANAGER ?= "pcmciautils" CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/" diff --git a/meta/packages/xcalibrate/xcalibrate/xextproto.patch b/meta/packages/xcalibrate/xcalibrate/xextproto.patch new file mode 100644 index 0000000000..cb190c073b --- /dev/null +++ b/meta/packages/xcalibrate/xcalibrate/xextproto.patch @@ -0,0 +1,11 @@ +--- XCalibrate/configure.ac.orig 2006-03-08 14:57:07.000000000 +0100 ++++ XCalibrate/configure.ac 2006-03-08 14:57:14.000000000 +0100 +@@ -7,7 +7,7 @@ + AC_PROG_LIBTOOL + + # Check for X +-PKG_CHECK_MODULES(XCALIBRATE, x11 xextensions xcalibrateext) ++PKG_CHECK_MODULES(XCALIBRATE, x11 xextproto xcalibrateext) + + AC_OUTPUT([Makefile + xcalibrate.pc]) diff --git a/meta/packages/xcalibrate/xcalibrate_20060312.bb b/meta/packages/xcalibrate/xcalibrate_20060312.bb new file mode 100644 index 0000000000..1de87c04eb --- /dev/null +++ b/meta/packages/xcalibrate/xcalibrate_20060312.bb @@ -0,0 +1,17 @@ +PV = "0.0+cvs${FIXEDSRCDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +LICENSE = "BSD-X" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "virtual/libx11 xcalibrateext libxext" +DESCRIPTION = "XCalibrate client-side library" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \ + file://xextproto.patch;patch=1" +S = "${WORKDIR}/XCalibrate" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xcalibrate/xcalibrate_cvs.bb b/meta/packages/xcalibrate/xcalibrate_cvs.bb index ab2b076079..a5b435795a 100644 --- a/meta/packages/xcalibrate/xcalibrate_cvs.bb +++ b/meta/packages/xcalibrate/xcalibrate_cvs.bb @@ -2,10 +2,11 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "libx11 xcalibrateext libxext" +DEPENDS = "virtual/libx11 xcalibrateext libxext" DESCRIPTION = "XCalibrate client-side library" -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate" +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \ + file://xextproto.patch;patch=1" S = "${WORKDIR}/XCalibrate" inherit autotools pkgconfig diff --git a/meta/packages/xauth/xauth/autofoo.patch b/meta/packages/xorg-app/xauth/autofoo.patch index d279a6f4fc..d279a6f4fc 100644 --- a/meta/packages/xauth/xauth/autofoo.patch +++ b/meta/packages/xorg-app/xauth/autofoo.patch diff --git a/meta/packages/xorg-app/xauth_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xauth_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..b891ff90ef --- /dev/null +++ b/meta/packages/xorg-app/xauth_X11R7.0-1.0.1.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxau libxext libxmu" + diff --git a/meta/packages/xauth/xauth_cvs.bb b/meta/packages/xorg-app/xauth_cvs.bb index 54700574b7..a944d1d51d 100644 --- a/meta/packages/xauth/xauth_cvs.bb +++ b/meta/packages/xorg-app/xauth_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" -DEPENDS = "libx11 libxau libxmu libxext" +DEPENDS = "virtual/libx11 libxau libxmu libxext" DESCRIPTION = "X authority file utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" diff --git a/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch b/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch new file mode 100644 index 0000000000..24af21f4fc --- /dev/null +++ b/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch @@ -0,0 +1,18 @@ +--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100 ++++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100 +@@ -45,11 +45,15 @@ + AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) + ++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), ++ XKB="$enableval", XKB="yes") ++if test "x$XKB" = "xyes" ; then + PKG_CHECK_MODULES(DPY_XKB, x11, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) ++fi + + PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, + [SAVE_CPPFLAGS="$CPPFLAGS" diff --git a/meta/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..d212bc1422 --- /dev/null +++ b/meta/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb @@ -0,0 +1,10 @@ +require xorg-app-common.inc + +DESCRIPTION = "X display information utility" +LICENSE = "MIT" + +DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" + +SRC_URI += "file://disable-xkb.patch;patch=1" + +EXTRA_OECONF = "--disable-xkb" diff --git a/meta/packages/xdpyinfo/xdpyinfo_cvs.bb b/meta/packages/xorg-app/xdpyinfo_cvs.bb index eb63ae7f4d..df31ba68d5 100644 --- a/meta/packages/xdpyinfo/xdpyinfo_cvs.bb +++ b/meta/packages/xorg-app/xdpyinfo_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" -DEPENDS = "libx11 libxext libxtst" +DEPENDS = "virtual/libx11 libxext libxtst" DESCRIPTION = "X display information utility" MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "x11/base" diff --git a/meta/packages/xhost/xhost/autofoo.patch b/meta/packages/xorg-app/xhost/autofoo.patch index b29f017abc..b29f017abc 100644 --- a/meta/packages/xhost/xhost/autofoo.patch +++ b/meta/packages/xorg-app/xhost/autofoo.patch diff --git a/meta/packages/xhost/xhost_20040413.bb b/meta/packages/xorg-app/xhost_20040413.bb index 4d36e62bee..ed240dbba1 100644 --- a/meta/packages/xhost/xhost_20040413.bb +++ b/meta/packages/xorg-app/xhost_20040413.bb @@ -1,7 +1,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE = "MIT" PV = "0.0+cvs${FIXEDSRCDATE}" -DEPENDS = "libx11 libxext libxmu" +DEPENDS = "virtual/libx11 libxext libxmu" DESCRIPTION = "server access control program for X" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" diff --git a/meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..a08ad7184d --- /dev/null +++ b/meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "Server access control program for X" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +LICENSE = "MIT" + +DEPENDS += " virtual/libx11 libxmu libxau" + diff --git a/meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..a08ad7184d --- /dev/null +++ b/meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "Server access control program for X" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +LICENSE = "MIT" + +DEPENDS += " virtual/libx11 libxmu libxau" + diff --git a/meta/packages/xmodmap/xmodmap/autofoo.patch b/meta/packages/xorg-app/xmodmap/autofoo.patch index f309add086..f309add086 100644 --- a/meta/packages/xmodmap/xmodmap/autofoo.patch +++ b/meta/packages/xorg-app/xmodmap/autofoo.patch diff --git a/meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..b671beb07b --- /dev/null +++ b/meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +LICENSE = "MIT" + +DEPENDS += " virtual/libx11" + diff --git a/meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..4fe4c0c4cc --- /dev/null +++ b/meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +LICENSE = "MIT" + +DEPENDS += " virtual/libx11" + diff --git a/meta/packages/xmodmap/xmodmap_cvs.bb b/meta/packages/xorg-app/xmodmap_cvs.bb index 773466e6bb..7f45b28a89 100644 --- a/meta/packages/xmodmap/xmodmap_cvs.bb +++ b/meta/packages/xorg-app/xmodmap_cvs.bb @@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" PR = "r1" -DEPENDS = "libx11" +DEPENDS = "virtual/libx11" SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \ file://autofoo.patch;patch=1" diff --git a/meta/packages/xorg-app/xorg-app-common.inc b/meta/packages/xorg-app/xorg-app-common.inc new file mode 100644 index 0000000000..78146b1e78 --- /dev/null +++ b/meta/packages/xorg-app/xorg-app-common.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "X application" +HOMEPAGE = "http://www.x.org" +SECTION = "x11/apps" +#MAINTAINER = "" +LICENSE = "MIT-X" + +#DEPENDS = "" +XORG_PN = "${PN}" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.gz" +S = "${WORKDIR}/${XORG_PN}-${PV}" + +FILES_${PN} += " /usr/lib/X11/${XORG_PN}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..4b878cc32e --- /dev/null +++ b/meta/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Resize and Rotate extension command." +LICENSE= "BSD-X" + +DEPENDS += " libxrandr libxrender virtual/libx11" + diff --git a/meta/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb b/meta/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..4b878cc32e --- /dev/null +++ b/meta/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Resize and Rotate extension command." +LICENSE= "BSD-X" + +DEPENDS += " libxrandr libxrender virtual/libx11" + diff --git a/meta/packages/xrandr/xrandr_cvs.bb b/meta/packages/xorg-app/xrandr_cvs.bb index 0ab7c745f4..30a31e1569 100644 --- a/meta/packages/xrandr/xrandr_cvs.bb +++ b/meta/packages/xorg-app/xrandr_cvs.bb @@ -1,6 +1,6 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" -DEPENDS = "libxrandr libx11 libxext" +DEPENDS = "libxrandr virtual/libx11 libxext" DESCRIPTION = "X Resize and Rotate extension command." SECTION = "x11/base" diff --git a/meta/packages/xrdb/xrdb/autofoo.patch b/meta/packages/xorg-app/xrdb/autofoo.patch index b30a46bc36..b30a46bc36 100644 --- a/meta/packages/xrdb/xrdb/autofoo.patch +++ b/meta/packages/xorg-app/xrdb/autofoo.patch diff --git a/meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..bad78d3873 --- /dev/null +++ b/meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "X server resource database utility" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +LICENSE = "xrdb" + +DEPENDS += " libxmu virtual/libx11 libxext" + diff --git a/meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..d73890cc15 --- /dev/null +++ b/meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc + +DESCRIPTION = "X server resource database utility" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +LICENSE = "xrdb" + +DEPENDS += " libxmu virtual/libx11 libxext" diff --git a/meta/packages/xrdb/xrdb_cvs.bb b/meta/packages/xorg-app/xrdb_cvs.bb index cbf2caac70..51a3fcd08a 100644 --- a/meta/packages/xrdb/xrdb_cvs.bb +++ b/meta/packages/xorg-app/xrdb_cvs.bb @@ -1,5 +1,5 @@ PV = "0.0+cvs${SRCDATE}" -DEPENDS = "libx11 libxmu libxext" +DEPENDS = "virtual/libx11 libxmu libxext" DESCRIPTION = "X server resource database utility" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" diff --git a/meta/packages/xset/xset/autofoo.patch b/meta/packages/xorg-app/xset/autofoo.patch index 039d1319e3..039d1319e3 100644 --- a/meta/packages/xset/xset/autofoo.patch +++ b/meta/packages/xorg-app/xset/autofoo.patch diff --git a/meta/packages/xset/xset/disable-xkb.patch b/meta/packages/xorg-app/xset/disable-xkb.patch index 6060fbb995..6060fbb995 100644 --- a/meta/packages/xset/xset/disable-xkb.patch +++ b/meta/packages/xorg-app/xset/disable-xkb.patch diff --git a/meta/packages/xset/xset_20040817.bb b/meta/packages/xorg-app/xset_20040817.bb index daf57d15c8..90247fdb26 100644 --- a/meta/packages/xset/xset_20040817.bb +++ b/meta/packages/xorg-app/xset_20040817.bb @@ -5,7 +5,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.0+cvs${FIXEDSRCDATE}" PR = "r1" -DEPENDS = "libx11 libxext xextensions libxmu" +DEPENDS = "virtual/libx11 libxext xextensions libxmu" CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..b8b204e657 --- /dev/null +++ b/meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb @@ -0,0 +1,13 @@ +require xorg-app-common.inc + +DESCRIPTION = "user preference utility for X" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" +LICENSE = "MIT" + +DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp" + +SRC_URI += "file://disable-xkb.patch;patch=1" + +CFLAGS += "-D_GNU_SOURCE" +EXTRA_OECONF = "--disable-xkb" + diff --git a/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..b8b204e657 --- /dev/null +++ b/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb @@ -0,0 +1,13 @@ +require xorg-app-common.inc + +DESCRIPTION = "user preference utility for X" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" +LICENSE = "MIT" + +DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp" + +SRC_URI += "file://disable-xkb.patch;patch=1" + +CFLAGS += "-D_GNU_SOURCE" +EXTRA_OECONF = "--disable-xkb" + diff --git a/meta/packages/xorg-lib/diet-x11/X18NCMSstubs.diff b/meta/packages/xorg-lib/diet-x11/X18NCMSstubs.diff new file mode 100644 index 0000000000..54b1727a95 --- /dev/null +++ b/meta/packages/xorg-lib/diet-x11/X18NCMSstubs.diff @@ -0,0 +1,528 @@ +--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100 +@@ -83,6 +83,7 @@ + * from UCS char to specified charset char. + * This converter is needed for _XimGetCharCode subroutine. + */ ++#ifdef XLOCALE + XPointer + _XimGetLocaleCode ( + _Xconst char* encoding_name) +@@ -96,6 +97,7 @@ + } + return cvt; + } ++#endif + + /* + * Returns the locale dependent representation of a keysym. +@@ -107,6 +109,7 @@ + * locale + */ + /*ARGSUSED*/ ++#ifdef XLOCALE + int + _XimGetCharCode ( + XPointer ucs_conv, +@@ -135,6 +138,7 @@ + buf[count]= '\0'; + return count; + } ++#endif + + #ifdef XKB + static int lookup_string( +--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100 +@@ -0,0 +1,428 @@ ++/* ++ * X18NCMSstubs.c ++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed ++ * ++ * Copyright © 2003 Matthew Allum ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Matthew Allum not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Keith Packard and Compaq makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS ++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, ++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include <stdlib.h> ++#include "Xlibint.h" ++#include "Xlcint.h" ++#include <X11/Xlocale.h> ++#include <X11/Xos.h> ++#ifdef WIN32 ++#undef close ++#endif ++#include <X11/Xutil.h> ++#include "XlcPubI.h" ++ ++#include "Xcmsint.h" /* for XcmsCCC type */ ++#include "XlcPubI.h" /* for XLCd type */ ++#include "config.h" ++ ++#if ! XLOCALE ++ ++Bool ++XSupportsLocale() ++{ ++ return False; ++} ++ ++char * ++XSetLocaleModifiers( ++ const char *modifiers) ++{ ++ return NULL; ++} ++ ++XLCd ++_XOpenLC( ++ char *name) ++{ ++ return NULL; ++} ++ ++XLCd ++_XlcCurrentLC() ++{ ++ return NULL; ++} ++ ++void ++_XlcVaToArgList( ++ va_list var, ++ int count, ++ XlcArgList *args_ret) ++{ ++ return; ++} ++ ++void ++_XlcCountVaList( ++ va_list var, ++ int *count_ret) ++{ ++ return; ++} ++ ++void ++_XCloseLC( ++ XLCd lcd) ++{ ++ return; ++} ++ ++int ++_XlcConvert( ++ XlcConv conv, ++ XPointer *from, ++ int *from_left, ++ XPointer *to, ++ int *to_left, ++ XPointer *args, ++ int num_args) ++{ ++ return 0; ++} ++ ++/* XIM Stubs */ ++ ++XPointer ++_XimGetLocaleCode ( _Xconst char* encoding_name ) ++{ ++ return NULL; ++} ++ ++int ++_XimGetCharCode ( ++ XPointer ucs_conv, ++ KeySym keysym, ++ unsigned char* buf, ++ int nbytes) ++{ ++ return 0; ++} ++ ++/* Xrm Stubs */ ++ ++XrmMethods ++_XrmInitParseInfo( ++ XPointer *state) ++{ ++ return (XrmMethods) NULL; ++} ++ ++/* Xwc Stubs */ ++ ++int ++XwcTextExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XwcDrawString(Display *display, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, int y, ++ _Xconst wchar_t *string, ++ int num_wchars) ++{ ++ ; ++} ++ ++void ++XwcDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XwcTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XwcDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XwcTextEscapement( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XwcTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ ; ++} ++ ++int ++XwcTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ wchar_t ***list_ret, ++ int *count_ret) ++{ ++ return 0; ++} ++ ++int ++XwcTextListToTextProperty( ++ Display *dpy, ++ wchar_t **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return 0; ++} ++ ++void ++XwcFreeStringList(wchar_t **list) ++{ ++ return; ++} ++ ++ ++void XmbSetWMProperties ( /* Actually from mbWMProps.c */ ++ Display *dpy, ++ Window w, ++ _Xconst char *windowName, ++ _Xconst char *iconName, ++ char **argv, ++ int argc, ++ XSizeHints *sizeHints, ++ XWMHints *wmHints, ++ XClassHint *classHints) ++{ ++ return; ++} ++ ++int ++XmbTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ char ***list_ret, ++ int *count_ret) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextListToTextProperty( ++ Display *dpy, ++ char **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XmbDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XmbTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XmbDrawString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++void ++XmbDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XmbTextEscapement( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XmbTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ return 0; ++} ++ ++unsigned int ++KeySymToUcs4(KeySym keysym) ++{ ++ return 0; ++} ++ ++#endif ++ ++#if ! XCMS ++ ++XcmsCCC ++XcmsCCCOfColormap(dpy, cmap) ++ Display *dpy; ++ Colormap cmap; ++{ ++ return NULL; ++} ++ ++Status ++_XcmsResolveColorString ( ++ XcmsCCC ccc, ++ const char **color_string, ++ XcmsColor *pColor_exact_return, ++ XcmsColorFormat result_format) ++{ ++ return(XcmsFailure); ++} ++ ++void ++_XcmsUnresolveColor( ++ XcmsCCC ccc, ++ XcmsColor *pColor) ++{ ++ return; ++} ++ ++void ++_XUnresolveColor( ++ XcmsCCC ccc, ++ XColor *pXColor) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsAddCmapRec(dpy, cmap, windowID, visual) ++ Display *dpy; ++ Colormap cmap; ++ Window windowID; ++ Visual *visual; ++{ ++ return NULL; ++} ++ ++void ++_XcmsRGB_to_XColor( ++ XcmsColor *pColors, ++ XColor *pXColors, ++ unsigned int nColors) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsCopyCmapRecAndFree( ++ Display *dpy, ++ Colormap src_cmap, ++ Colormap copy_cmap) ++{ ++ return NULL; ++} ++ ++void ++_XcmsDeleteCmapRec( ++ Display *dpy, ++ Colormap cmap) ++{ ++ return; ++} ++ ++#endif +--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100 +@@ -331,6 +331,8 @@ + libX11_la_SOURCES+=UIThrStubs.c + endif + ++libX11_la_SOURCES+=X18NCMSstubs.c ++ + x11datadir = @X11_DATADIR@ + x11data_DATA = XKeysymDB XErrorDB + +@@ -338,7 +340,8 @@ + $(x11data_DATA) \ + os2Stubs.c \ + udcInf.c \ +- UIThrStubs.c ++ UIThrStubs.c \ ++ X18NCMSstubs.c + + # + # Figure out which sub-libraries to link into Xlib +--- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100 +@@ -55,7 +55,9 @@ + #define NUM_FREE_CVLS 4 + + /* in lcWrap.c */ ++#ifdef XLOCALE + extern LockInfoPtr _Xi18n_lock; ++#endif + + #ifdef WIN32 + static DWORD _X_TlsIndex = (DWORD)-1; +@@ -625,9 +627,11 @@ + _Xglobal_lock = &global_lock; + xmutex_init(_Xglobal_lock->lock); + xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); ++#ifdef XLOCALE + _Xi18n_lock = &i18n_lock; + xmutex_init(_Xi18n_lock->lock); + xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); ++#endif + _XLockMutex_fn = _XLockMutex; + _XUnlockMutex_fn = _XUnlockMutex; + _XCreateMutex_fn = _XCreateMutex; +--- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100 +@@ -215,7 +215,14 @@ + esac + AC_SUBST(KEYSYMDEF) + +-AM_CONDITIONAL(UDC, test xfalse = xtrue) ++AC_ARG_ENABLE(udc, ++ AC_HELP_STRING([--disable-udc], ++ [Disable Xlib support for UDC *EXPERIMENTAL*]), ++ [UDC=$enableval],[UDC=yes]) ++AM_CONDITIONAL(UDC, [test x$UDC = xyes ]) ++if test x"$UDC" = "xyes"; then ++ AC_DEFINE(UDC,1,[Include support for UDC]) ++fi + + AC_ARG_ENABLE(xcms, + AC_HELP_STRING([--disable-xcms], diff --git a/meta/packages/xlibs/libx11/autofoo.patch b/meta/packages/xorg-lib/diet-x11/autofoo.patch index 8bdba09768..8bdba09768 100644 --- a/meta/packages/xlibs/libx11/autofoo.patch +++ b/meta/packages/xorg-lib/diet-x11/autofoo.patch diff --git a/meta/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff b/meta/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff new file mode 100644 index 0000000000..9dbf6dac68 --- /dev/null +++ b/meta/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff @@ -0,0 +1,14 @@ +--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 +@@ -701,7 +701,11 @@ + } + if (l - 2 - (p - charset) < 0) + return 0; ++#ifdef XLOCALE + if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) ++#else ++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) ++#endif + return 0; + if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) + return 0; diff --git a/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch b/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch new file mode 100644 index 0000000000..a098db1941 --- /dev/null +++ b/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define ++++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h +@@ -103,7 +103,7 @@ + + /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +-#define X_HAVE_UTF8_STRING 1 ++#undef X_HAVE_UTF8_STRING + + typedef char *XPointer; + diff --git a/meta/packages/xorg-lib/diet-x11/xim.patch b/meta/packages/xorg-lib/diet-x11/xim.patch new file mode 100644 index 0000000000..0eab197a80 --- /dev/null +++ b/meta/packages/xorg-lib/diet-x11/xim.patch @@ -0,0 +1,55 @@ +--- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000 ++++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000 +@@ -90,6 +90,52 @@ + return; + } + ++XIM ++XOpenIM ( ++ Display* display, ++ struct _XrmHashBucketRec* rdb, ++ char* res_name, ++ char* res_class) ++{ ++ return (XIM) NULL; ++} ++ ++Status ++XCloseIM ( XIM im ) ++{ ++ return NULL; ++} ++ ++XIC ++XCreateIC ( XIM im, ...) ++{ ++ return NULL; ++} ++ ++void ++XDestroyIC ( XIC ic ) ++{ ++ return; ++} ++ ++int ++XmbLookupString ( ++ XIC ic, ++ XKeyPressedEvent* ev, ++ char* buffer, ++ int nbytes, ++ KeySym* keysym, ++ Status* status) ++{ ++ return XLookupNone; ++} ++ ++char * ++XGetICValues( XIC ic, ...) ++{ ++ return (char *) NULL; ++} ++ + XPointer + _XimGetLocaleCode ( _Xconst char* encoding_name ) + { diff --git a/meta/packages/xlibs/diet-x11_6.2.1.bb b/meta/packages/xorg-lib/diet-x11_20050226.bb index 284fcc21cc..1220806052 100644 --- a/meta/packages/xlibs/diet-x11_6.2.1.bb +++ b/meta/packages/xorg-lib/diet-x11_20050226.bb @@ -1,10 +1,6 @@ SECTION = "x11/base" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" -include libx11_${PV}.bb +require libx11_${PV}.bb EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1" - - diff --git a/meta/packages/xorg-lib/diet-x11_6.2.1.bb b/meta/packages/xorg-lib/diet-x11_6.2.1.bb new file mode 100644 index 0000000000..96d63aa0ee --- /dev/null +++ b/meta/packages/xorg-lib/diet-x11_6.2.1.bb @@ -0,0 +1,9 @@ +SECTION = "x11/base" +require libx11_${PV}.bb + +EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \ + file://xim.patch;patch=1" + diff --git a/meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..b30098c850 --- /dev/null +++ b/meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb @@ -0,0 +1,13 @@ +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" + +#do_stage_append () { +# rm -f ${STAGING_INCDIR}/X11/XKBlib.h +#} diff --git a/meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..33e50df13a --- /dev/null +++ b/meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb @@ -0,0 +1,9 @@ +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/diet-x11_cvs.bb b/meta/packages/xorg-lib/diet-x11_cvs.bb new file mode 100644 index 0000000000..968764b500 --- /dev/null +++ b/meta/packages/xorg-lib/diet-x11_cvs.bb @@ -0,0 +1,7 @@ +SECTION = "x11/base" +require libx11_cvs.bb + +EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" + +SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \ + file://xim.patch;patch=1" diff --git a/meta/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch b/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch index f43d38065e..f43d38065e 100644 --- a/meta/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch +++ b/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch diff --git a/meta/packages/xlibs/libx11/fix-utf8-wrong-define.patch b/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch index dca88fba92..dca88fba92 100644 --- a/meta/packages/xlibs/libx11/fix-utf8-wrong-define.patch +++ b/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch 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 new file mode 100644 index 0000000000..28abffa735 --- /dev/null +++ b/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto applewmproto" + +XORG_PN = "libAppleWM" + diff --git a/meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..a612982a95 --- /dev/null +++ b/meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb @@ -0,0 +1,5 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto dmxproto" 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 new file mode 100644 index 0000000000..a612982a95 --- /dev/null +++ b/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto dmxproto" diff --git a/meta/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..cecd14f57f --- /dev/null +++ b/meta/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/meta/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..0ccc8dd3d3 --- /dev/null +++ b/meta/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/meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..a4badc38ce --- /dev/null +++ b/meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X fontenc library (used by libxfont)." +LICENSE = "BSD-X" +PRIORITY = "optional" + +DEPENDS += " zlib xproto" + diff --git a/meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..a4badc38ce --- /dev/null +++ b/meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X fontenc library (used by libxfont)." +LICENSE = "BSD-X" +PRIORITY = "optional" + +DEPENDS += " zlib xproto" + 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 new file mode 100644 index 0000000000..5c07ce682c --- /dev/null +++ b/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = " " + +DEPENDS += " xproto fontsproto xtrans" + +XORG_PN = "libFS" + diff --git a/meta/packages/xlibs/libice/autofoo.patch b/meta/packages/xorg-lib/libice/autofoo.patch index 8ab0585fb8..8ab0585fb8 100644 --- a/meta/packages/xlibs/libice/autofoo.patch +++ b/meta/packages/xorg-lib/libice/autofoo.patch diff --git a/meta/packages/xlibs/libice_6.3.3.bb b/meta/packages/xorg-lib/libice_6.3.3.bb index 1311145334..e771161e59 100644 --- a/meta/packages/xlibs/libice_6.3.3.bb +++ b/meta/packages/xorg-lib/libice_6.3.3.bb @@ -2,7 +2,7 @@ SECTION = "libs" LICENSE= "MIT" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "libx11" +DEPENDS = "virtual/libx11" PROVIDES = "ice" DESCRIPTION = "X11 ICE library" PR = "r1" diff --git a/meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..da40983162 --- /dev/null +++ b/meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb @@ -0,0 +1,10 @@ +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/libice_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..da40983162 --- /dev/null +++ b/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb @@ -0,0 +1,10 @@ +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/libice_cvs.bb b/meta/packages/xorg-lib/libice_cvs.bb new file mode 100644 index 0000000000..1756a235d7 --- /dev/null +++ b/meta/packages/xorg-lib/libice_cvs.bb @@ -0,0 +1,17 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "MIT" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libx11" +PROVIDES = "ice" +DESCRIPTION = "X11 ICE library" +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ICE" +S = "${WORKDIR}/ICE" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/liblbxutil/mkg3states.patch b/meta/packages/xorg-lib/liblbxutil/mkg3states.patch new file mode 100644 index 0000000000..58463db46b --- /dev/null +++ b/meta/packages/xorg-lib/liblbxutil/mkg3states.patch @@ -0,0 +1,51 @@ +--- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500 ++++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500 +@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +--- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500 ++++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500 +@@ -1,9 +1,6 @@ + lib_LTLIBRARIES = liblbxutil.la + +-noinst_PROGRAMS = mkg3states +- +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c ++SUBDIRS = image + + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ +@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@ + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states +- -rm -f g3states.h +- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++g3states.h: image/mkg3states ++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + + liblbxutil_la_LDFLAGS = -version-number 1:0:0 + +--- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500 ++++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500 +@@ -0,0 +1,15 @@ ++# evil hack ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ ++CC=$(CC_FOR_BUILD) ++LIBTOOL = @LIBTOOL@ --tag=CC ++ ++noinst_PROGRAMS = mkg3states ++ ++mkg3states_SOURCES = \ ++ mkg3states.c ++ ++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) ++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) diff --git a/meta/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..df8b267601 --- /dev/null +++ b/meta/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb @@ -0,0 +1,6 @@ +require xorg-lib-common.inc + +DESCRIPTION = "XFIXES Extension" + +DEPENDS += " xextproto xproto zlib" +PROVIDES = "lbxutil" 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 new file mode 100644 index 0000000000..df8b267601 --- /dev/null +++ b/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb @@ -0,0 +1,6 @@ +require xorg-lib-common.inc + +DESCRIPTION = "XFIXES Extension" + +DEPENDS += " xextproto xproto zlib" +PROVIDES = "lbxutil" 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 new file mode 100644 index 0000000000..2a380a65f6 --- /dev/null +++ b/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11" + +XORG_PN = "liboldX" + diff --git a/meta/packages/xlibs/libsm/autofoo.patch b/meta/packages/xorg-lib/libsm/autofoo.patch index 8cb204a66e..8cb204a66e 100644 --- a/meta/packages/xlibs/libsm/autofoo.patch +++ b/meta/packages/xorg-lib/libsm/autofoo.patch diff --git a/meta/packages/xlibs/libsm_6.0.3.bb b/meta/packages/xorg-lib/libsm_6.0.3.bb index 08f9597045..cd374649bb 100644 --- a/meta/packages/xlibs/libsm_6.0.3.bb +++ b/meta/packages/xorg-lib/libsm_6.0.3.bb @@ -2,7 +2,7 @@ SECTION = "libs" LICENSE = "MIT-X" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "libx11 libice" +DEPENDS = "virtual/libx11 libice" DESCRIPTION = "Session management library" PR = "r1" diff --git a/meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..383e29e743 --- /dev/null +++ b/meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Session management library" +PRIORITY = "optional" + +DEPENDS += " libice xproto xtrans" + +XORG_PN = "libSM" + diff --git a/meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..383e29e743 --- /dev/null +++ b/meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Session management library" +PRIORITY = "optional" + +DEPENDS += " libice xproto xtrans" + +XORG_PN = "libSM" + diff --git a/meta/packages/xorg-lib/libsm_cvs.bb b/meta/packages/xorg-lib/libsm_cvs.bb new file mode 100644 index 0000000000..45d6bfa236 --- /dev/null +++ b/meta/packages/xorg-lib/libsm_cvs.bb @@ -0,0 +1,18 @@ +PV = "6.0.3+cvs${SRCDATE}" +LICENSE = "MIT-X" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libx11 libice" +DESCRIPTION = "Session management library" +PR = "r1" + +DEFAULT_PREFERENCE="-1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=SM" +S = "${WORKDIR}/SM" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} 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 new file mode 100644 index 0000000000..90b8aeca49 --- /dev/null +++ b/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto windowswmproto" + +XORG_PN = "libWindowsWM" + diff --git a/meta/packages/xlibs/libx11-native_6.2.1.bb b/meta/packages/xorg-lib/libx11-native_6.2.1.bb index 9513c4237e..54bb4486e7 100644 --- a/meta/packages/xlibs/libx11-native_6.2.1.bb +++ b/meta/packages/xorg-lib/libx11-native_6.2.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/base" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" -include libx11_${PV}.bb +require libx11_${PV}.bb inherit native DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" PROVIDES = "" diff --git a/meta/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..2023b5741d --- /dev/null +++ b/meta/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/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 new file mode 100644 index 0000000000..2b84b2c53c --- /dev/null +++ b/meta/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/meta/packages/xorg-lib/libx11-native_cvs.bb b/meta/packages/xorg-lib/libx11-native_cvs.bb new file mode 100644 index 0000000000..c76d4dce8b --- /dev/null +++ b/meta/packages/xorg-lib/libx11-native_cvs.bb @@ -0,0 +1,5 @@ +SECTION = "x11/base" +require libx11_cvs.bb +inherit native +DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" +PROVIDES = "" diff --git a/meta/packages/xorg-lib/libx11/autofoo.patch b/meta/packages/xorg-lib/libx11/autofoo.patch new file mode 100644 index 0000000000..8bdba09768 --- /dev/null +++ b/meta/packages/xorg-lib/libx11/autofoo.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-6.2.1/configure.ac~autofoo ++++ libX11-6.2.1/configure.ac +@@ -7,12 +7,12 @@ + [jg@freedesktop.org], + libX11) + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_INIT_AUTOMAKE([dist-bzip2]) ++AC_CONFIG_AUX_DIR(.) + ++AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([src/config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/meta/packages/xorg-lib/libx11_20050226.bb b/meta/packages/xorg-lib/libx11_20050226.bb new file mode 100644 index 0000000000..2fa9e995b8 --- /dev/null +++ b/meta/packages/xorg-lib/libx11_20050226.bb @@ -0,0 +1,6 @@ +SRCDATE = "20050226" + +require libx11_cvs.bb + +DEFAULT_PREFERENCE = "0" + diff --git a/meta/packages/xlibs/libx11_6.2.1.bb b/meta/packages/xorg-lib/libx11_6.2.1.bb index 901746bafa..ce57c42f7f 100644 --- a/meta/packages/xlibs/libx11_6.2.1.bb +++ b/meta/packages/xorg-lib/libx11_6.2.1.bb @@ -3,7 +3,8 @@ LICENSE = "XFree86" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" DEPENDS = "xproto xextensions libxau xtrans libxdmcp" -PROVIDES = "x11" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" DESCRIPTION = "Base X libs." FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..b31ed72998 --- /dev/null +++ b/meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb @@ -0,0 +1,22 @@ +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" + +XORG_PN = "libX11" + +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.0.1.bb b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..b31ed72998 --- /dev/null +++ b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -0,0 +1,22 @@ +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" + +XORG_PN = "libX11" + +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_cvs.bb b/meta/packages/xorg-lib/libx11_cvs.bb new file mode 100644 index 0000000000..aaa052eba3 --- /dev/null +++ b/meta/packages/xorg-lib/libx11_cvs.bb @@ -0,0 +1,42 @@ +PV = "6.2.1+cvs${SRCDATE}" +LICENSE = "XFree86" +PR = "r6" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert <greg@treke.net>" +DEPENDS = "xproto xextensions libxau xtrans libxdmcp" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" +DESCRIPTION = "Base X libs." +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \ + file://errordb-keysymdb-path-fix.patch;patch=1" +S = "${WORKDIR}/X11" + +inherit autotools pkgconfig + +do_compile() { + ( + unset CC LD CXX CCLD +# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} + +do_stage() { + install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h + install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h + install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h + install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h + install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h + install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h + install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h + install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h + install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h + + oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR} +} diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/packages/xorg-lib/libx11_git.bb new file mode 100644 index 0000000000..3f7fd5853e --- /dev/null +++ b/meta/packages/xorg-lib/libx11_git.bb @@ -0,0 +1,33 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "Xlib/XCB: Xlib with XCB transport" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" + +DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git" +S = "${WORKDIR}/git" + +inherit 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 +} + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xlibs/libxau-native_0.1.1.bb b/meta/packages/xorg-lib/libxau-native_0.1.1.bb index ecb71ce3d6..f5acbee736 100644 --- a/meta/packages/xlibs/libxau-native_0.1.1.bb +++ b/meta/packages/xorg-lib/libxau-native_0.1.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/base" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" -include libxau_${PV}.bb +require libxau_${PV}.bb inherit native DEPENDS = "xproto-native" PROVIDES = "" diff --git a/meta/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..553c3aeacf --- /dev/null +++ b/meta/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/meta/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..c0a3ea802f --- /dev/null +++ b/meta/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/meta/packages/xlibs/libxau-native_cvs.bb b/meta/packages/xorg-lib/libxau-native_cvs.bb index cd070033ce..685f849bd5 100644 --- a/meta/packages/xlibs/libxau-native_cvs.bb +++ b/meta/packages/xorg-lib/libxau-native_cvs.bb @@ -1,6 +1,6 @@ SECTION = "x11/base" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" -include libxau_cvs.bb +require libxau_cvs.bb inherit native DEPENDS = "xproto-native" PROVIDES = "" diff --git a/meta/packages/xlibs/libxau/autofoo.patch b/meta/packages/xorg-lib/libxau/autofoo.patch index 1e42eb974d..1e42eb974d 100644 --- a/meta/packages/xlibs/libxau/autofoo.patch +++ b/meta/packages/xorg-lib/libxau/autofoo.patch diff --git a/meta/packages/xlibs/libxau_0.1.1.bb b/meta/packages/xorg-lib/libxau_0.1.1.bb index dc1a28171b..dc1a28171b 100644 --- a/meta/packages/xlibs/libxau_0.1.1.bb +++ b/meta/packages/xorg-lib/libxau_0.1.1.bb diff --git a/meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..5ad793c9b8 --- /dev/null +++ b/meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "A Sample Authorization Protocol for X" +PRIORITY = "optional" + +DEPENDS += " xproto" +PROVIDES = "xau" + +XORG_PN = "libXau" + diff --git a/meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..5ad793c9b8 --- /dev/null +++ b/meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "A Sample Authorization Protocol for X" +PRIORITY = "optional" + +DEPENDS += " xproto" +PROVIDES = "xau" + +XORG_PN = "libXau" + diff --git a/meta/packages/xlibs/libxau_cvs.bb b/meta/packages/xorg-lib/libxau_cvs.bb index 518744816d..518744816d 100644 --- a/meta/packages/xlibs/libxau_cvs.bb +++ b/meta/packages/xorg-lib/libxau_cvs.bb diff --git a/meta/packages/xorg-lib/libxaw/auxdir.patch b/meta/packages/xorg-lib/libxaw/auxdir.patch new file mode 100644 index 0000000000..4226ab6a4d --- /dev/null +++ b/meta/packages/xorg-lib/libxaw/auxdir.patch @@ -0,0 +1,10 @@ +--- /tmp/configure.ac 2005-06-17 21:26:17.519157272 +0200 ++++ libXaw-7.0.2/configure.ac 2005-06-17 21:26:34.832525240 +0200 +@@ -10,7 +10,6 @@ + AM_INIT_AUTOMAKE([dist-bzip2]) + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/meta/packages/xorg-lib/libxaw_7.0.2.bb b/meta/packages/xorg-lib/libxaw_7.0.2.bb new file mode 100644 index 0000000000..04f2855101 --- /dev/null +++ b/meta/packages/xorg-lib/libxaw_7.0.2.bb @@ -0,0 +1,21 @@ +SECTION = "x11/libs" +LICENSE = "MIT" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" +DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm" +PROVIDES = "xaw" +DESCRIPTION = "X Athena Widgets library" + +SRC_URI = "${XLIBS_MIRROR}/libXaw-${PV}.tar.bz2 \ + file://auxdir.patch;patch=1" + +S = "${WORKDIR}/libXaw-${PV}" + +inherit autotools pkgconfig + +# FIXME: libXaw needs a full x11, not diet +BROKEN = "1" + +do_stage () { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..3961042a2d --- /dev/null +++ b/meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb @@ -0,0 +1,15 @@ +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" +PROVIDES = "xaw" + +XORG_PN = "libXaw" + +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/meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..3961042a2d --- /dev/null +++ b/meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb @@ -0,0 +1,15 @@ +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" +PROVIDES = "xaw" + +XORG_PN = "libXaw" + +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/meta/packages/xorg-lib/libxaw_cvs.bb b/meta/packages/xorg-lib/libxaw_cvs.bb new file mode 100644 index 0000000000..2c696ceba2 --- /dev/null +++ b/meta/packages/xorg-lib/libxaw_cvs.bb @@ -0,0 +1,19 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm" +PROVIDES = "xaw" +DESCRIPTION = "X Athena Widgets library" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw" +S = "${WORKDIR}/Xaw" + +inherit autotools pkgconfig + +# FIXME: libXaw needs a full x11, not diet +BROKEN = "1" + +do_stage () { + oe_runmake install DESTDIR="" mandir=${STAGING_DATADIR}/man bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/meta/packages/xlibs/libxcomposite-1.0.1/autofoo.patch b/meta/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch index 072cf25214..072cf25214 100644 --- a/meta/packages/xlibs/libxcomposite-1.0.1/autofoo.patch +++ b/meta/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch diff --git a/meta/packages/xorg-lib/libxcomposite/change-include-order.patch b/meta/packages/xorg-lib/libxcomposite/change-include-order.patch new file mode 100644 index 0000000000..630b8818fc --- /dev/null +++ b/meta/packages/xorg-lib/libxcomposite/change-include-order.patch @@ -0,0 +1,14 @@ +This patch makes the build use its own Xcomposite.h over rather than an +older Xcomposite.h that might already be installed in the staging dir. + +--- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100 ++++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100 +@@ -21,7 +21,7 @@ + # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + +-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include ++AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) + + lib_LTLIBRARIES = libXcomposite.la + diff --git a/meta/packages/xlibs/libxcomposite_1.0.1.bb b/meta/packages/xorg-lib/libxcomposite_1.0.1.bb index e2ca3bbc7b..a60f8d5179 100644 --- a/meta/packages/xlibs/libxcomposite_1.0.1.bb +++ b/meta/packages/xorg-lib/libxcomposite_1.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "libx11 compositeext xextensions libxfixes" +DEPENDS = "virtual/libx11 compositeext xextensions libxfixes" PROVIDES = "xcomposite" DESCRIPTION = "X Composite extension library." PR = "r1" diff --git a/meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb b/meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb new file mode 100644 index 0000000000..4cab60a531 --- /dev/null +++ b/meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Composite extension library." +LICENSE= "BSD-X" + +DEPENDS += " compositeproto virtual/libx11 libxfixes" +PROVIDES = "xcomposite" + +XORG_PN = "libXcomposite" + +SRC_URI += " file://change-include-order.patch;patch=1" diff --git a/meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb new file mode 100644 index 0000000000..4cab60a531 --- /dev/null +++ b/meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Composite extension library." +LICENSE= "BSD-X" + +DEPENDS += " compositeproto virtual/libx11 libxfixes" +PROVIDES = "xcomposite" + +XORG_PN = "libXcomposite" + +SRC_URI += " file://change-include-order.patch;patch=1" diff --git a/meta/packages/xlibs/libxcomposite_cvs.bb b/meta/packages/xorg-lib/libxcomposite_cvs.bb index 1d8b69c8c6..fd31b5dbff 100644 --- a/meta/packages/xlibs/libxcomposite_cvs.bb +++ b/meta/packages/xorg-lib/libxcomposite_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "libx11 compositeext xextensions libxfixes" +DEPENDS = "virtual/libx11 compositeext xextensions libxfixes" PROVIDES = "xcomposite" DESCRIPTION = "X Composite extension library." diff --git a/meta/packages/xlibs/libxcursor-1.1.2/autofoo.patch b/meta/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch index 99cd45a7ea..99cd45a7ea 100644 --- a/meta/packages/xlibs/libxcursor-1.1.2/autofoo.patch +++ b/meta/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch diff --git a/meta/packages/xlibs/libxcursor/autofoo.patch b/meta/packages/xorg-lib/libxcursor/autofoo.patch index 7aa573ce13..7aa573ce13 100644 --- a/meta/packages/xlibs/libxcursor/autofoo.patch +++ b/meta/packages/xorg-lib/libxcursor/autofoo.patch diff --git a/meta/packages/xlibs/libxcursor_1.1.2.bb b/meta/packages/xorg-lib/libxcursor_1.1.2.bb index 25744c7dca..25744c7dca 100644 --- a/meta/packages/xlibs/libxcursor_1.1.2.bb +++ b/meta/packages/xorg-lib/libxcursor_1.1.2.bb diff --git a/meta/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb b/meta/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb new file mode 100644 index 0000000000..2b13c4213c --- /dev/null +++ b/meta/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Cursor library" +LICENSE= "BSD-X" + +DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" + +XORG_PN = "libXcursor" + +FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/meta/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/meta/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb new file mode 100644 index 0000000000..2b13c4213c --- /dev/null +++ b/meta/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Cursor library" +LICENSE= "BSD-X" + +DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" + +XORG_PN = "libXcursor" + +FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/meta/packages/xorg-lib/libxcursor_cvs.bb b/meta/packages/xorg-lib/libxcursor_cvs.bb new file mode 100644 index 0000000000..5fe2334b85 --- /dev/null +++ b/meta/packages/xorg-lib/libxcursor_cvs.bb @@ -0,0 +1,17 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "BSD-X" +SECTION = "x11/libs" +PRIORITY = "optional" +DESCRIPTION = "X Cursor library" +DEPENDS = "libxfixes" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcursor" +S = "${WORKDIR}/Xcursor" +FILES_${PN} += "${libdir}/libXcursor.so" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xlibs/libxdamage-1.0.1/autofoo.patch b/meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch index 1e3ec45d4a..1e3ec45d4a 100644 --- a/meta/packages/xlibs/libxdamage-1.0.1/autofoo.patch +++ b/meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch diff --git a/meta/packages/xlibs/libxdamage/m4.patch b/meta/packages/xorg-lib/libxdamage/m4.patch index 393f3d13d2..393f3d13d2 100644 --- a/meta/packages/xlibs/libxdamage/m4.patch +++ b/meta/packages/xorg-lib/libxdamage/m4.patch diff --git a/meta/packages/xlibs/libxdamage_1.0.1.bb b/meta/packages/xorg-lib/libxdamage_1.0.1.bb index 040e863447..a132b751c0 100644 --- a/meta/packages/xlibs/libxdamage_1.0.1.bb +++ b/meta/packages/xorg-lib/libxdamage_1.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "libx11 damageext libxfixes xproto" +DEPENDS = "virtual/libx11 damageext libxfixes xproto" PROVIDES = "xdamage" DESCRIPTION = "X Damage extension library." PR = "r1" diff --git a/meta/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb b/meta/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb new file mode 100644 index 0000000000..6bb9c39f60 --- /dev/null +++ b/meta/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Damage extension library." +LICENSE= "BSD-X" + +DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" +PROVIDES = "xdamage" + +XORG_PN = "libXdamage" + diff --git a/meta/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb b/meta/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb new file mode 100644 index 0000000000..6bb9c39f60 --- /dev/null +++ b/meta/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Damage extension library." +LICENSE= "BSD-X" + +DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto" +PROVIDES = "xdamage" + +XORG_PN = "libXdamage" + diff --git a/meta/packages/xlibs/libxdamage_cvs.bb b/meta/packages/xorg-lib/libxdamage_cvs.bb index ba8a68033a..a613d0e673 100644 --- a/meta/packages/xlibs/libxdamage_cvs.bb +++ b/meta/packages/xorg-lib/libxdamage_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "libx11 damageext libxfixes xproto" +DEPENDS = "virtual/libx11 damageext libxfixes xproto" PROVIDES = "xdamage" DESCRIPTION = "X Damage extension library." diff --git a/meta/packages/xorg-lib/libxdmcp-native_0.1.1.bb b/meta/packages/xorg-lib/libxdmcp-native_0.1.1.bb new file mode 100644 index 0000000000..41b772376e --- /dev/null +++ b/meta/packages/xorg-lib/libxdmcp-native_0.1.1.bb @@ -0,0 +1,5 @@ +SECTION = "x11/libs" +require libxdmcp_${PV}.bb +inherit native +DEPENDS = "xproto-native" +PROVIDES = "" diff --git a/meta/packages/xlibs/libxdmcp-native_0.1.3.bb b/meta/packages/xorg-lib/libxdmcp-native_0.1.3.bb index 8d7162b351..87db29c799 100644 --- a/meta/packages/xlibs/libxdmcp-native_0.1.3.bb +++ b/meta/packages/xorg-lib/libxdmcp-native_0.1.3.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp" -include libxdmcp_${PV}.bb +require libxdmcp_${PV}.bb inherit native DEPENDS = "xproto-native" PROVIDES = "" diff --git a/meta/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..fbbf8e9117 --- /dev/null +++ b/meta/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/meta/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..8ab69a1d41 --- /dev/null +++ b/meta/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/meta/packages/xlibs/libxdmcp/autofoo.patch b/meta/packages/xorg-lib/libxdmcp/autofoo.patch index ff1a76ad04..ff1a76ad04 100644 --- a/meta/packages/xlibs/libxdmcp/autofoo.patch +++ b/meta/packages/xorg-lib/libxdmcp/autofoo.patch diff --git a/meta/packages/xorg-lib/libxdmcp_0.1.1.bb b/meta/packages/xorg-lib/libxdmcp_0.1.1.bb new file mode 100644 index 0000000000..19fba1529e --- /dev/null +++ b/meta/packages/xorg-lib/libxdmcp_0.1.1.bb @@ -0,0 +1,18 @@ +SECTION = "x11/libs" +LICENSE= "MIT" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert <greg@treke.net>" +DEPENDS = "xproto" +PROVIDES = "xdmcp" +DESCRIPTION = "X Display Manager Control Protocol library." +PR = "r1" +S = "${WORKDIR}/libXdmcp-${PV}" + +SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xlibs/libxdmcp_0.1.3.bb b/meta/packages/xorg-lib/libxdmcp_0.1.3.bb index aa2736cdb2..aa2736cdb2 100644 --- a/meta/packages/xlibs/libxdmcp_0.1.3.bb +++ b/meta/packages/xorg-lib/libxdmcp_0.1.3.bb diff --git a/meta/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..c0139498c5 --- /dev/null +++ b/meta/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Display Manager Control Protocol library." +PRIORITY = "optional" + +DEPENDS += " xproto" +PROVIDES = "xdmcp" + +XORG_PN = "libXdmcp" + diff --git a/meta/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..c0139498c5 --- /dev/null +++ b/meta/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Display Manager Control Protocol library." +PRIORITY = "optional" + +DEPENDS += " xproto" +PROVIDES = "xdmcp" + +XORG_PN = "libXdmcp" + diff --git a/meta/packages/xorg-lib/libxdmcp_cvs.bb b/meta/packages/xorg-lib/libxdmcp_cvs.bb new file mode 100644 index 0000000000..20b957b522 --- /dev/null +++ b/meta/packages/xorg-lib/libxdmcp_cvs.bb @@ -0,0 +1,18 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "MIT" +PR = "r1" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert <greg@treke.net>" +DEPENDS = "xproto" +PROVIDES = "xdmcp" +DESCRIPTION = "X Display Manager Control Protocol library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdmcp" +S = "${WORKDIR}/Xdmcp" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..4c3a134633 --- /dev/null +++ b/meta/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" + +XORG_PN = "libXevie" + 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 new file mode 100644 index 0000000000..4c3a134633 --- /dev/null +++ b/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" + +XORG_PN = "libXevie" + diff --git a/meta/packages/xlibs/libxext-native_cvs.bb b/meta/packages/xorg-lib/libxext-native_cvs.bb index 9294b080b7..82360db00d 100644 --- a/meta/packages/xlibs/libxext-native_cvs.bb +++ b/meta/packages/xorg-lib/libxext-native_cvs.bb @@ -1,6 +1,6 @@ SECTION = "unknown" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext" -include libxext_${PV}.bb +require libxext_${PV}.bb inherit native -DEPENDS = "libx11-native xextensions-native" +DEPENDS = "virtual/libx11-native xextensions-native" PROVIDES = "" diff --git a/meta/packages/xlibs/libxext/autofoo.patch b/meta/packages/xorg-lib/libxext/autofoo.patch index c006884526..c006884526 100644 --- a/meta/packages/xlibs/libxext/autofoo.patch +++ b/meta/packages/xorg-lib/libxext/autofoo.patch diff --git a/meta/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..fc2061514a --- /dev/null +++ b/meta/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb @@ -0,0 +1,10 @@ +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/libxext_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..fc2061514a --- /dev/null +++ b/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb @@ -0,0 +1,10 @@ +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/xlibs/libxext_cvs.bb b/meta/packages/xorg-lib/libxext_cvs.bb index 0ef675ca70..101c240c5e 100644 --- a/meta/packages/xlibs/libxext_cvs.bb +++ b/meta/packages/xorg-lib/libxext_cvs.bb @@ -4,7 +4,7 @@ LICENSE= "MIT" DESCRIPTION = "X Server Extension library" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "xproto libx11 xextensions" +DEPENDS = "xproto virtual/libx11 xextensions" PROVIDES = "xext" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" diff --git a/meta/packages/xlibs/libxfixes/autofoo.patch b/meta/packages/xorg-lib/libxfixes/autofoo.patch index 26803cf7f3..26803cf7f3 100644 --- a/meta/packages/xlibs/libxfixes/autofoo.patch +++ b/meta/packages/xorg-lib/libxfixes/autofoo.patch diff --git a/meta/packages/xlibs/libxfixes_2.0.1.bb b/meta/packages/xorg-lib/libxfixes_2.0.1.bb index 710fa17454..ceebdfaa11 100644 --- a/meta/packages/xlibs/libxfixes_2.0.1.bb +++ b/meta/packages/xorg-lib/libxfixes_2.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "libx11 fixesext" +DEPENDS = "virtual/libx11 fixesext" DESCRIPTION = "X Fixes extension library." PR = "r1" diff --git a/meta/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb b/meta/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb new file mode 100644 index 0000000000..b63633dea2 --- /dev/null +++ b/meta/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Fixes extension library." +LICENSE= "BSD-X" + +DEPENDS += " virtual/libx11 xproto fixesproto xextproto" + +XORG_PN = "libXfixes" + diff --git a/meta/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb b/meta/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb new file mode 100644 index 0000000000..b63633dea2 --- /dev/null +++ b/meta/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Fixes extension library." +LICENSE= "BSD-X" + +DEPENDS += " virtual/libx11 xproto fixesproto xextproto" + +XORG_PN = "libXfixes" + diff --git a/meta/packages/xlibs/libxfixes_cvs.bb b/meta/packages/xorg-lib/libxfixes_cvs.bb index 4494dc9326..92bad48eeb 100644 --- a/meta/packages/xlibs/libxfixes_cvs.bb +++ b/meta/packages/xorg-lib/libxfixes_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "libx11 fixesext" +DEPENDS = "virtual/libx11 fixesext" DESCRIPTION = "X Fixes extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes" diff --git a/meta/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..93aac77f7b --- /dev/null +++ b/meta/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/meta/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb b/meta/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..664f9440a4 --- /dev/null +++ b/meta/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/meta/packages/xlibs/libxfont/autofoo.patch b/meta/packages/xorg-lib/libxfont/autofoo.patch index 4998625c24..4998625c24 100644 --- a/meta/packages/xlibs/libxfont/autofoo.patch +++ b/meta/packages/xorg-lib/libxfont/autofoo.patch diff --git a/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch b/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch new file mode 100644 index 0000000000..90bded6fba --- /dev/null +++ b/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch @@ -0,0 +1,22 @@ +--- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200 ++++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200 +@@ -695,6 +695,11 @@ + */ + if (isscale) + { ++ /* If the fontname says it is scalable, make sure that the ++ * renderer supports OpenScalable and GetInfoScalable. ++ */ ++ if (renderer->OpenScalable && renderer->GetInfoScalable) ++ { + if (vals.values_supplied & SIZE_SPECIFY_MASK) + { + bzero((char *)&zeroVals, sizeof(zeroVals)); +@@ -794,6 +799,7 @@ + bitmap->name.name); + } + } ++ } + } + return TRUE; + } diff --git a/meta/packages/xlibs/libxfont/scalable.patch b/meta/packages/xorg-lib/libxfont/scalable.patch index 7f97b9a8f6..7f97b9a8f6 100644 --- a/meta/packages/xlibs/libxfont/scalable.patch +++ b/meta/packages/xorg-lib/libxfont/scalable.patch diff --git a/meta/packages/xlibs/libxfont_1.4.2.bb b/meta/packages/xorg-lib/libxfont_1.4.2.bb index 0cc45397fe..0cc45397fe 100644 --- a/meta/packages/xlibs/libxfont_1.4.2.bb +++ b/meta/packages/xorg-lib/libxfont_1.4.2.bb diff --git a/meta/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..a3a28d6578 --- /dev/null +++ b/meta/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb @@ -0,0 +1,15 @@ +require xorg-lib-common.inc + +PR = "r1" +SRC_URI += "file://no-scalable-crash.patch;patch=1" + + +DESCRIPTION = "X font library (used by the X server)." +LICENSE= "BSD-X" +PRIORITY = "optional" + +DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" + +XORG_PN = "libXfont" + diff --git a/meta/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb b/meta/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..748a71f1ae --- /dev/null +++ b/meta/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X font library (used by the X server)." +LICENSE= "BSD-X" +PRIORITY = "optional" + +DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" + +XORG_PN = "libXfont" + diff --git a/meta/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/meta/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb new file mode 100644 index 0000000000..8739822a07 --- /dev/null +++ b/meta/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb @@ -0,0 +1,17 @@ +require xorg-lib-common.inc + +PR = "r1" + +DESCRIPTION = "X font library (used by the X server)." +LICENSE= "BSD-X" +PRIORITY = "optional" + +SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" +SRC_URI += "file://no-scalable-crash.patch;patch=1" + +DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" + +XORG_PN = "libXfont" + +S = "${WORKDIR}/libXfont-1.2.0" diff --git a/meta/packages/xlibs/libxfont_cvs.bb b/meta/packages/xorg-lib/libxfont_cvs.bb index bd21e0fd12..bd21e0fd12 100644 --- a/meta/packages/xlibs/libxfont_cvs.bb +++ b/meta/packages/xorg-lib/libxfont_cvs.bb diff --git a/meta/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..c75278ecb0 --- /dev/null +++ b/meta/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" + +XORG_PN = "libXfontcache" + diff --git a/meta/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..c75278ecb0 --- /dev/null +++ b/meta/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" + +XORG_PN = "libXfontcache" + diff --git a/meta/packages/xlibs/libxft/autofoo.patch b/meta/packages/xorg-lib/libxft/autofoo.patch index 54120aa612..54120aa612 100644 --- a/meta/packages/xlibs/libxft/autofoo.patch +++ b/meta/packages/xorg-lib/libxft/autofoo.patch diff --git a/meta/packages/xlibs/libxft_2.1.6.bb b/meta/packages/xorg-lib/libxft_2.1.6.bb index c3f1f74e40..a793925596 100644 --- a/meta/packages/xlibs/libxft_2.1.6.bb +++ b/meta/packages/xorg-lib/libxft_2.1.6.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE = "MIT-X" -DEPENDS = "libx11 xproto libxrender freetype fontconfig" +DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" PR = "r1" diff --git a/meta/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb b/meta/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb new file mode 100644 index 0000000000..2c46849fd2 --- /dev/null +++ b/meta/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb @@ -0,0 +1,19 @@ +require xorg-lib-common.inc + +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/xlibs/libxft_cvs.bb b/meta/packages/xorg-lib/libxft_cvs.bb index 6c1a5f5c32..38ba5a6d5c 100644 --- a/meta/packages/xlibs/libxft_cvs.bb +++ b/meta/packages/xorg-lib/libxft_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "libx11 xproto libxrender freetype fontconfig" +DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" diff --git a/meta/packages/xlibs/libxi/autofoo.patch b/meta/packages/xorg-lib/libxi/autofoo.patch index f1bce9ed7a..f1bce9ed7a 100644 --- a/meta/packages/xlibs/libxi/autofoo.patch +++ b/meta/packages/xorg-lib/libxi/autofoo.patch diff --git a/meta/packages/xlibs/libxi_6.0.1.bb b/meta/packages/xorg-lib/libxi_6.0.1.bb index 5c44d06df3..b9958ea6ac 100644 --- a/meta/packages/xlibs/libxi_6.0.1.bb +++ b/meta/packages/xorg-lib/libxi_6.0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "X Input Extension library" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "xproto libx11 xextensions" +DEPENDS = "xproto virtual/libx11 xextensions" PR = "r1" SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \ diff --git a/meta/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..af5e4008eb --- /dev/null +++ b/meta/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Input extension library." + +DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" + +XORG_PN = "libXi" + diff --git a/meta/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..af5e4008eb --- /dev/null +++ b/meta/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Input extension library." + +DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto" + +XORG_PN = "libXi" + diff --git a/meta/packages/xorg-lib/libxi_cvs.bb b/meta/packages/xorg-lib/libxi_cvs.bb new file mode 100644 index 0000000000..f37c78e819 --- /dev/null +++ b/meta/packages/xorg-lib/libxi_cvs.bb @@ -0,0 +1,16 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT-X" +SECTION = "x11/libs" +DEPENDS = "xproto virtual/libx11 xextensions" +DESCRIPTION = "X Input extension library." +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xi \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/Xi" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb b/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb new file mode 100644 index 0000000000..eb4a6d54cf --- /dev/null +++ b/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xinerama library" +LICENSE = "MIT" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" +DEPENDS = "panoramixext xproto virtual/libx11 libxext" +PROVIDES = "xinerama" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505" +S = "${WORKDIR}/Xinerama" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2.bb b/meta/packages/xorg-lib/libxinerama_1.0.2.bb new file mode 100644 index 0000000000..429c2fc4d0 --- /dev/null +++ b/meta/packages/xorg-lib/libxinerama_1.0.2.bb @@ -0,0 +1,17 @@ +LICENSE = "MIT" +DESCRIPTION = "Xinerama library" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" +DEPENDS = "panoramixext xproto virtual/libx11 libxext" +PROVIDES = "xinerama" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2" +S = "${WORKDIR}/libXinerama-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..8f72c20898 --- /dev/null +++ b/meta/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Xinerama library" +PRIORITY = "optional" + +DEPENDS += " virtual/libx11 libxext xextproto xineramaproto" +PROVIDES = "xinerama" + +XORG_PN = "libXinerama" + diff --git a/meta/packages/xorg-lib/libxinerama_cvs.bb b/meta/packages/xorg-lib/libxinerama_cvs.bb new file mode 100644 index 0000000000..5138367bbf --- /dev/null +++ b/meta/packages/xorg-lib/libxinerama_cvs.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xinerama library" +LICENSE = "MIT" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "panoramixext xproto virtual/libx11 libxext" +PROVIDES = "xinerama" +PV = "0.0+cvs${SRCDATE}" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama" +S = "${WORKDIR}/Xinerama" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..715dcd0554 --- /dev/null +++ b/meta/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 keyboard library" +LICENSE= "GPL" +PRIORITY = "optional" + +DEPENDS += " virtual/libx11 kbproto" + diff --git a/meta/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb b/meta/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb new file mode 100644 index 0000000000..715dcd0554 --- /dev/null +++ b/meta/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 keyboard library" +LICENSE= "GPL" +PRIORITY = "optional" + +DEPENDS += " virtual/libx11 kbproto" + diff --git a/meta/packages/xorg-lib/libxkbfile_cvs.bb b/meta/packages/xorg-lib/libxkbfile_cvs.bb new file mode 100644 index 0000000000..336caf139a --- /dev/null +++ b/meta/packages/xorg-lib/libxkbfile_cvs.bb @@ -0,0 +1,15 @@ +LICENSE = "GPL" +PV = "0.0+cvs${SRCDATE}" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libx11" +DESCRIPTION = "X11 keyboard library" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile" +S = "${WORKDIR}/xkbfile" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..e094728c2f --- /dev/null +++ b/meta/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +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/libxkbui_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..e094728c2f --- /dev/null +++ b/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb @@ -0,0 +1,8 @@ +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/libxmu_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..02df24cd9f --- /dev/null +++ b/meta/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb @@ -0,0 +1,16 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Window System miscellaneous utility library" +PRIORITY = "optional" + +DEPENDS += " libxt libxext xextproto virtual/libx11" +PROVIDES = "xmu" + +XORG_PN = "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/libxmu_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..02df24cd9f --- /dev/null +++ b/meta/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb @@ -0,0 +1,16 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Window System miscellaneous utility library" +PRIORITY = "optional" + +DEPENDS += " libxt libxext xextproto virtual/libx11" +PROVIDES = "xmu" + +XORG_PN = "libXmu" + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +LEAD_SONAME = "libXmu" diff --git a/meta/packages/xlibs/libxmu_cvs.bb b/meta/packages/xorg-lib/libxmu_cvs.bb index 500b373c32..500b373c32 100644 --- a/meta/packages/xlibs/libxmu_cvs.bb +++ b/meta/packages/xorg-lib/libxmu_cvs.bb 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 new file mode 100644 index 0000000000..fc7ecb5778 --- /dev/null +++ b/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb @@ -0,0 +1,10 @@ +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/libxp_cvs.bb b/meta/packages/xorg-lib/libxp_cvs.bb new file mode 100644 index 0000000000..e434e089cf --- /dev/null +++ b/meta/packages/xorg-lib/libxp_cvs.bb @@ -0,0 +1,18 @@ + +LICENSE = "MIT" +PV = "0.0+cvs${SRCDATE}" + +SECTION = "libs" +DEPENDS = "virtual/libx11 libxext" +DESCRIPTION = "X print extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp" +S = "${WORKDIR}/Xp" + +inherit autotools pkgconfig + +CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xlibs/libxpm/autofoo.patch b/meta/packages/xorg-lib/libxpm/autofoo.patch index 6b2174bf02..6b2174bf02 100644 --- a/meta/packages/xlibs/libxpm/autofoo.patch +++ b/meta/packages/xorg-lib/libxpm/autofoo.patch diff --git a/meta/packages/xlibs/libxpm_3.5.1.bb b/meta/packages/xorg-lib/libxpm_3.5.1.bb index 513261efd3..8447cd3630 100644 --- a/meta/packages/xlibs/libxpm_3.5.1.bb +++ b/meta/packages/xorg-lib/libxpm_3.5.1.bb @@ -2,7 +2,7 @@ SECTION = "x11/libs" LICENSE = "X-BSD" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" -DEPENDS = "xproto libx11" +DEPENDS = "xproto virtual/libx11" PROVIDES = "xpm" DESCRIPTION = "X Pixmap library." PR = "r1" diff --git a/meta/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb b/meta/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb new file mode 100644 index 0000000000..3ff582a8e3 --- /dev/null +++ b/meta/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb @@ -0,0 +1,13 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Pixmap library." +PRIORITY = "optional" +LICENSE = "X-BSD" + +DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" + +XORG_PN = "libXpm" + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" diff --git a/meta/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/meta/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb new file mode 100644 index 0000000000..3ff582a8e3 --- /dev/null +++ b/meta/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb @@ -0,0 +1,13 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Pixmap library." +PRIORITY = "optional" +LICENSE = "X-BSD" + +DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" + +XORG_PN = "libXpm" + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" diff --git a/meta/packages/xlibs/libxpm_cvs.bb b/meta/packages/xorg-lib/libxpm_cvs.bb index 1b46855735..4d4d534e9a 100644 --- a/meta/packages/xlibs/libxpm_cvs.bb +++ b/meta/packages/xorg-lib/libxpm_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "X-BSD" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" -DEPENDS = "xproto libx11" +DEPENDS = "xproto virtual/libx11" PROVIDES = "xpm" DESCRIPTION = "X Pixmap library." PR = "r1" 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 new file mode 100644 index 0000000000..077ac40a0a --- /dev/null +++ b/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau" + +XORG_PN = "libXprintAppUtil" + 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 new file mode 100644 index 0000000000..f965b9a2bc --- /dev/null +++ b/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxp libxt printproto libxau" + +XORG_PN = "libXprintUtil" + diff --git a/meta/packages/xlibs/libxrandr-1.0.2/autofoo.patch b/meta/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch index 21f6e7fd78..21f6e7fd78 100644 --- a/meta/packages/xlibs/libxrandr-1.0.2/autofoo.patch +++ b/meta/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch diff --git a/meta/packages/xlibs/libxrandr/autofoo.patch b/meta/packages/xorg-lib/libxrandr/autofoo.patch index 7b1db760f2..7b1db760f2 100644 --- a/meta/packages/xlibs/libxrandr/autofoo.patch +++ b/meta/packages/xorg-lib/libxrandr/autofoo.patch diff --git a/meta/packages/xlibs/libxrandr_1.0.2.bb b/meta/packages/xorg-lib/libxrandr_1.0.2.bb index efd0505544..d87471af05 100644 --- a/meta/packages/xlibs/libxrandr_1.0.2.bb +++ b/meta/packages/xorg-lib/libxrandr_1.0.2.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE = "BSD-X" -DEPENDS = "randrext libx11 libxrender libxext" +DEPENDS = "randrext virtual/libx11 libxrender libxext" DESCRIPTION = "X Resize and Rotate extension library." PR = "r1" diff --git a/meta/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb b/meta/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb new file mode 100644 index 0000000000..363550fade --- /dev/null +++ b/meta/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Resize and Rotate extension library." +LICENSE = "BSD-X" + +DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" + +XORG_PN = "libXrandr" + diff --git a/meta/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb b/meta/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb new file mode 100644 index 0000000000..363550fade --- /dev/null +++ b/meta/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Resize and Rotate extension library." +LICENSE = "BSD-X" + +DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" + +XORG_PN = "libXrandr" + diff --git a/meta/packages/xorg-lib/libxrandr_cvs.bb b/meta/packages/xorg-lib/libxrandr_cvs.bb new file mode 100644 index 0000000000..12f3b4ef38 --- /dev/null +++ b/meta/packages/xorg-lib/libxrandr_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "BSD-X" +SECTION = "x11/libs" +DEPENDS = "randrext virtual/libx11 libxrender libxext" +DESCRIPTION = "X Resize and Rotate extension library." +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrandr" +S = "${WORKDIR}/Xrandr" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xlibs/libxrender/autofoo.patch b/meta/packages/xorg-lib/libxrender/autofoo.patch index eb21c766f8..eb21c766f8 100644 --- a/meta/packages/xlibs/libxrender/autofoo.patch +++ b/meta/packages/xorg-lib/libxrender/autofoo.patch diff --git a/meta/packages/xorg-lib/libxrender_0.8.4.bb b/meta/packages/xorg-lib/libxrender_0.8.4.bb new file mode 100644 index 0000000000..32e1962f26 --- /dev/null +++ b/meta/packages/xorg-lib/libxrender_0.8.4.bb @@ -0,0 +1,15 @@ +SECTION = "libs" +DEPENDS = "renderext virtual/libx11" +DESCRIPTION = "X Render extension library." +LICENSE = "BSD" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXrender-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb b/meta/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb new file mode 100644 index 0000000000..32ba95721d --- /dev/null +++ b/meta/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Render extension library." +LICENSE = "BSD-X" + +DEPENDS += " virtual/libx11 renderproto" + +XORG_PN = "libXrender" + diff --git a/meta/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb b/meta/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb new file mode 100644 index 0000000000..32ba95721d --- /dev/null +++ b/meta/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Render extension library." +LICENSE = "BSD-X" + +DEPENDS += " virtual/libx11 renderproto" + +XORG_PN = "libXrender" + diff --git a/meta/packages/xlibs/libxrender_cvs.bb b/meta/packages/xorg-lib/libxrender_cvs.bb index ea6b1f4607..31a710643c 100644 --- a/meta/packages/xlibs/libxrender_cvs.bb +++ b/meta/packages/xorg-lib/libxrender_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" PR = "r1" SECTION = "libs" -DEPENDS = "renderext libx11" +DEPENDS = "renderext virtual/libx11" DESCRIPTION = "X Render extension library." LICENSE = "BSD" diff --git a/meta/packages/xorg-lib/libxres_1.0.1.bb b/meta/packages/xorg-lib/libxres_1.0.1.bb new file mode 100644 index 0000000000..3f0d32bfe4 --- /dev/null +++ b/meta/packages/xorg-lib/libxres_1.0.1.bb @@ -0,0 +1,14 @@ +SECTION = "x11/libs" +MAINTAINER = "Greg Gilbert <greg@treke.net>" +DEPENDS = "virtual/libx11 xextensions libxext resourceext" +PROVIDES = "xres" +DESCRIPTION = "X Resource usage library." +LICENSE = "X-MIT" +SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2" +S = "${WORKDIR}/libXres-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..282947e7fe --- /dev/null +++ b/meta/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Resource usage library." + +DEPENDS += " virtual/libx11 libxext xextproto resourceproto" + +XORG_PN = "libXres" + diff --git a/meta/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..282947e7fe --- /dev/null +++ b/meta/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Resource usage library." + +DEPENDS += " virtual/libx11 libxext xextproto resourceproto" + +XORG_PN = "libXres" + diff --git a/meta/packages/xorg-lib/libxres_cvs.bb b/meta/packages/xorg-lib/libxres_cvs.bb new file mode 100644 index 0000000000..a457d6c14f --- /dev/null +++ b/meta/packages/xorg-lib/libxres_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +SECTION = "x11/libs" +MAINTAINER = "Greg Gilbert <greg@treke.net>" +DEPENDS = "virtual/libx11 xextensions libxext resourceext" +PROVIDES = "xres" +DESCRIPTION = "X Resource usage library." +LICENSE = "X-MIT" +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes" +S = "${WORKDIR}/XRes" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..2f0168e2b5 --- /dev/null +++ b/meta/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb @@ -0,0 +1,13 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X screen saver extension library." +LICENSE = "GPL" + +DEPENDS += " virtual/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/meta/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb b/meta/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..2f0168e2b5 --- /dev/null +++ b/meta/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb @@ -0,0 +1,13 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X screen saver extension library." +LICENSE = "GPL" + +DEPENDS += " virtual/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/meta/packages/xorg-lib/libxss_cvs.bb b/meta/packages/xorg-lib/libxss_cvs.bb new file mode 100644 index 0000000000..614133fce7 --- /dev/null +++ b/meta/packages/xorg-lib/libxss_cvs.bb @@ -0,0 +1,19 @@ +LICENSE = "GPL" + +PV = "0.0+cvs${SRCDATE}" +PR = "r2" + +SECTION = "libs" +DEPENDS = "virtual/libx11 libxext" +DESCRIPTION = "X screen saver extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss" +S = "${WORKDIR}/Xss" + +inherit autotools pkgconfig + +#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xlibs/libxt/autofoo.patch b/meta/packages/xorg-lib/libxt/autofoo.patch index ff6dfdbbcc..ff6dfdbbcc 100644 --- a/meta/packages/xlibs/libxt/autofoo.patch +++ b/meta/packages/xorg-lib/libxt/autofoo.patch diff --git a/meta/packages/xlibs/libxt_0.1.5.bb b/meta/packages/xorg-lib/libxt_0.1.5.bb index 00cbe9a3ad..9c31075285 100644 --- a/meta/packages/xlibs/libxt_0.1.5.bb +++ b/meta/packages/xorg-lib/libxt_0.1.5.bb @@ -1,7 +1,7 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "libx11 libsm" +DEPENDS = "virtual/libx11 libsm" PROVIDES = "xt" DESCRIPTION = "X Toolkit Intrinsics" LICENSE = "X-MIT" diff --git a/meta/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..b8bbe4dea3 --- /dev/null +++ b/meta/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb @@ -0,0 +1,19 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Toolkit Intrinsics" +PRIORITY = "optional" + +DEPENDS += " libsm virtual/libx11 xproto kbproto" +PROVIDES = "xt" + +XORG_PN = "libXt" + +EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C 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}' makestrs + ) + oe_runmake +} diff --git a/meta/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..b8bbe4dea3 --- /dev/null +++ b/meta/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb @@ -0,0 +1,19 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Toolkit Intrinsics" +PRIORITY = "optional" + +DEPENDS += " libsm virtual/libx11 xproto kbproto" +PROVIDES = "xt" + +XORG_PN = "libXt" + +EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C 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}' makestrs + ) + oe_runmake +} diff --git a/meta/packages/xorg-lib/libxt_cvs.bb b/meta/packages/xorg-lib/libxt_cvs.bb new file mode 100644 index 0000000000..3fd2eabe67 --- /dev/null +++ b/meta/packages/xorg-lib/libxt_cvs.bb @@ -0,0 +1,26 @@ +PV = "0.0+cvs${SRCDATE}" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "virtual/libx11 libsm" +PROVIDES = "xt" +DESCRIPTION = "X Toolkit Intrinsics" +LICENSE = "X-MIT" +PR = "r1" +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xt" +S = "${WORKDIR}/Xt" + +inherit autotools pkgconfig + + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs + ) + oe_runmake +} + + +do_stage () { + autotools_stage_all +} 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 new file mode 100644 index 0000000000..f9ebac47f9 --- /dev/null +++ b/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +#DESCRIPTION = "" + +DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto" + +XORG_PN = "libXTrap" + 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 new file mode 100644 index 0000000000..802ea2836d --- /dev/null +++ b/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb @@ -0,0 +1,10 @@ +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/xlibs/libxtst_cvs.bb b/meta/packages/xorg-lib/libxtst_cvs.bb index c7c24d5d74..dc3e358d64 100644 --- a/meta/packages/xlibs/libxtst_cvs.bb +++ b/meta/packages/xorg-lib/libxtst_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "libx11 recordext libxext" +DEPENDS = "virtual/libx11 recordext libxext" PROVIDES = "xtst" DESCRIPTION = "X Test Extension: client side library" PR = "r3" diff --git a/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb b/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb new file mode 100644 index 0000000000..93c41ce126 --- /dev/null +++ b/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +SECTION = "x11/libs" +DEPENDS = "virtual/libx11 libxext" +DESCRIPTION = "X Video extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver" +S = "${WORKDIR}/Xv" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxv_2.2.2.bb b/meta/packages/xorg-lib/libxv_2.2.2.bb new file mode 100644 index 0000000000..d42302979e --- /dev/null +++ b/meta/packages/xorg-lib/libxv_2.2.2.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +SECTION = "x11/libs" +DEPENDS = "virtual/libx11 libxext" +DESCRIPTION = "X Video extension library." + +SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2" +S = "${WORKDIR}/libXv-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..0d045940e3 --- /dev/null +++ b/meta/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Video extension library." +LICENSE = "GPL" + +DEPENDS += " virtual/libx11 libxext xextproto videoproto" + +XORG_PN = "libXv" + diff --git a/meta/packages/xorg-lib/libxvmc/drm.patch b/meta/packages/xorg-lib/libxvmc/drm.patch new file mode 100644 index 0000000000..d48cdb3d0b --- /dev/null +++ b/meta/packages/xorg-lib/libxvmc/drm.patch @@ -0,0 +1,9 @@ +--- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000 ++++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000 +@@ -1,5 +1,5 @@ + AM_CFLAGS = $(XVMC_CFLAGS) +-libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm ++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm + + lib_LTLIBRARIES = libviaXvMC.la + diff --git a/meta/packages/xorg-lib/libxvmc/true.patch b/meta/packages/xorg-lib/libxvmc/true.patch new file mode 100644 index 0000000000..7059295007 --- /dev/null +++ b/meta/packages/xorg-lib/libxvmc/true.patch @@ -0,0 +1,11 @@ +--- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100 ++++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100 +@@ -43,6 +43,8 @@ + #include <xf86drm.h> + #include <pthread.h> + #include "vldXvMC.h" ++ ++#define TRUE 1 + + #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \ + (((CARD8 *)(ctx)->sAreaAddress) + \ diff --git a/meta/packages/xorg-lib/libxvmc/via.patch b/meta/packages/xorg-lib/libxvmc/via.patch new file mode 100644 index 0000000000..21cdfbdd6b --- /dev/null +++ b/meta/packages/xorg-lib/libxvmc/via.patch @@ -0,0 +1,23 @@ +--- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100 ++++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100 +@@ -14,4 +14,5 @@ + AC_OUTPUT([Makefile + hw/Makefile + hw/i810/Makefile ++ hw/via/Makefile + xvmc.pc]) +--- /dev/null 2004-06-13 02:32:19.000000000 +0100 ++++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100 +@@ -0,0 +1,7 @@ ++AM_CFLAGS = $(XVMC_CFLAGS) ++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm ++ ++lib_LTLIBRARIES = libviaXvMC.la ++ ++libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \ ++ viaXvMCPriv.h +--- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100 ++++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100 +@@ -1 +1 @@ +-SUBDIRS = i810 ++SUBDIRS = i810 via diff --git a/meta/packages/xorg-lib/libxvmc_20040919.bb b/meta/packages/xorg-lib/libxvmc_20040919.bb new file mode 100644 index 0000000000..f256211962 --- /dev/null +++ b/meta/packages/xorg-lib/libxvmc_20040919.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "X Video Motion Compensation extension library." +SECTION = "x11/libs" +DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ + cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;module=libxvmc;date=${PV};method=pserver \ + file://via.patch;patch=1 \ + file://true.patch" +S = "${WORKDIR}/XvMC" + +CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg" + +# this one is for via only atm. +COMPATIBLE_HOST = 'i.86.*-linux' + +inherit autotools pkgconfig + +do_configure_prepend() { + install -d ${S}/hw/via + cp ${WORKDIR}/libxvmc/*.[ch] ${S}/hw/via/ + ( cd ${S}/hw/via ; patch < ${WORKDIR}/true.patch ) +} + +do_compile() { + oe_runmake + oe_runmake -C hw/via +} + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man + oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR} + install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/ +} diff --git a/meta/packages/xorg-lib/libxvmc_20041025.bb b/meta/packages/xorg-lib/libxvmc_20041025.bb new file mode 100644 index 0000000000..ff8dda58a6 --- /dev/null +++ b/meta/packages/xorg-lib/libxvmc_20041025.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "X Video Motion Compensation extension library." +SECTION = "x11/libs" +DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ + file://true.patch;patch=1 file://drm.patch;patch=1" +S = "${WORKDIR}/XvMC" + +CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE" + +# this one is for via only atm. +COMPATIBLE_HOST = 'i.86.*-linux' + +inherit autotools pkgconfig + +do_compile() { + oe_runmake + oe_runmake -C hw/via +} + +do_install() { + oe_runmake DESTDIR='${D}' install + oe_runmake -C hw/via DESTDIR='${D}' install +} + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man + oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR} + install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/ +} diff --git a/meta/packages/xorg-lib/libxvmc_20050612.bb b/meta/packages/xorg-lib/libxvmc_20050612.bb new file mode 100644 index 0000000000..d9be65baa0 --- /dev/null +++ b/meta/packages/xorg-lib/libxvmc_20050612.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "X Video Motion Compensation extension library." +SECTION = "x11/libs" +DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg" +PR = "r0" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ + ${FREEDESKTOP_CVS}/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \ + file://true.patch;patch=1 file://drm.patch;patch=1" +S = "${WORKDIR}/XvMC" + +CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE" + +# this one is for via only atm. +COMPATIBLE_HOST = 'i.86.*-linux' + +inherit autotools pkgconfig + +do_compile() { + oe_runmake + oe_runmake -C hw/via +} + +do_install() { + oe_runmake DESTDIR='${D}' install + oe_runmake -C hw/via DESTDIR='${D}' install +} + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man + oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR} + install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/ +} diff --git a/meta/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..a0f9f7be25 --- /dev/null +++ b/meta/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Video Motion Compensation extension library." + +DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" + +XORG_PN = "libXvMC" + diff --git a/meta/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..a0f9f7be25 --- /dev/null +++ b/meta/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Video Motion Compensation extension library." + +DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" + +XORG_PN = "libXvMC" + diff --git a/meta/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..e067190b84 --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +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/libxxf86dga_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..e067190b84 --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb @@ -0,0 +1,8 @@ +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/libxxf86dga_cvs.bb b/meta/packages/xorg-lib/libxxf86dga_cvs.bb new file mode 100644 index 0000000000..d110e7e4c0 --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86dga_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "XFree86" + +SECTION = "x11/libs" +DEPENDS = "virtual/libx11 libxext xxf86dgaext" +DESCRIPTION = "Xxf86dga extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga" +S = "${WORKDIR}/Xxf86dga" + +inherit autotools pkgconfig + +do_stage() { + oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} +} diff --git a/meta/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..3af4acba96 --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb @@ -0,0 +1,9 @@ +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/libxxf86misc_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..3af4acba96 --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb @@ -0,0 +1,9 @@ +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_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..b85e2d2477 --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Xxf86vm extension library." + +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" + +XORG_PN = "libXxf86vm" + 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 new file mode 100644 index 0000000000..b85e2d2477 --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Xxf86vm extension library." + +DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto" + +XORG_PN = "libXxf86vm" + diff --git a/meta/packages/xorg-lib/libxxf86vm_cvs.bb b/meta/packages/xorg-lib/libxxf86vm_cvs.bb new file mode 100644 index 0000000000..5464c4330c --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86vm_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" + +SECTION = "x11/libs" +DEPENDS = "virtual/libx11 libxext xxf86vmext" +DESCRIPTION = "Xxf86vm extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm" +S = "${WORKDIR}/Xxf86vm" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-lib/xorg-lib-common.inc b/meta/packages/xorg-lib/xorg-lib-common.inc new file mode 100644 index 0000000000..7a3e0425c7 --- /dev/null +++ b/meta/packages/xorg-lib/xorg-lib-common.inc @@ -0,0 +1,17 @@ +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/meta/packages/xlibs/xtrans-native_0.1.bb b/meta/packages/xorg-lib/xtrans-native_0.1.bb index 80de95c869..db1e6e4673 100644 --- a/meta/packages/xlibs/xtrans-native_0.1.bb +++ b/meta/packages/xorg-lib/xtrans-native_0.1.bb @@ -1,3 +1,3 @@ SECTION = "x11/base" -include xtrans_${PV}.bb +require xtrans_${PV}.bb inherit native diff --git a/meta/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..ff63987713 --- /dev/null +++ b/meta/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/meta/packages/xlibs/xtrans_0.1.bb b/meta/packages/xorg-lib/xtrans_0.1.bb index 8fee0d5089..8fee0d5089 100644 --- a/meta/packages/xlibs/xtrans_0.1.bb +++ b/meta/packages/xorg-lib/xtrans_0.1.bb diff --git a/meta/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..1ab38ad838 --- /dev/null +++ b/meta/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "network API translation layer to \ +insulate X applications and libraries from OS \ +network vageries." + +#DEPENDS += " " + diff --git a/meta/packages/xlibs/xtrans_cvs.bb b/meta/packages/xorg-lib/xtrans_cvs.bb index 9714f4017b..9714f4017b 100644 --- a/meta/packages/xlibs/xtrans_cvs.bb +++ b/meta/packages/xorg-lib/xtrans_cvs.bb diff --git a/meta/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb new file mode 100644 index 0000000000..1f4cf97e70 --- /dev/null +++ b/meta/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + diff --git a/meta/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..9b9cc8e472 --- /dev/null +++ b/meta/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/bigreqsproto-${PV}.tar.bz2" +S = "${WORKDIR}/bigreqsproto-${PV}" + +inherit native autotools pkgconfig diff --git a/meta/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..1f4cf97e70 --- /dev/null +++ b/meta/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + diff --git a/meta/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb b/meta/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb new file mode 100644 index 0000000000..59eae3a0bb --- /dev/null +++ b/meta/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "compositeext" diff --git a/meta/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb b/meta/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb new file mode 100644 index 0000000000..59eae3a0bb --- /dev/null +++ b/meta/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "compositeext" diff --git a/meta/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb new file mode 100644 index 0000000000..a05558f979 --- /dev/null +++ b/meta/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "damageext" diff --git a/meta/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb b/meta/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb b/meta/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb new file mode 100644 index 0000000000..16ff0441b5 --- /dev/null +++ b/meta/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "fixesext" diff --git a/meta/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb b/meta/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb new file mode 100644 index 0000000000..16ff0441b5 --- /dev/null +++ b/meta/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "fixesext" diff --git a/meta/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb new file mode 100644 index 0000000000..062c6ccbb9 --- /dev/null +++ b/meta/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontcacheproto-${PV}.tar.bz2" +S = "${WORKDIR}/fontcacheproto-${PV}" + +inherit native autotools pkgconfig diff --git a/meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb b/meta/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb new file mode 100644 index 0000000000..3c5356f0df --- /dev/null +++ b/meta/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontsproto-${PV}.tar.bz2" +S = "${WORKDIR}/fontsproto-${PV}" + +inherit native autotools pkgconfig diff --git a/meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb b/meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb b/meta/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb b/meta/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb b/meta/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb new file mode 100644 index 0000000000..c89ec23505 --- /dev/null +++ b/meta/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/inputproto-${PV}.tar.bz2" +S = "${WORKDIR}/inputproto-${PV}" + +inherit native autotools pkgconfig diff --git a/meta/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb b/meta/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..983730ecc0 --- /dev/null +++ b/meta/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/kbproto-${PV}.tar.bz2" +S = "${WORKDIR}/kbproto-${PV}" + +inherit native autotools pkgconfig diff --git a/meta/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb b/meta/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb new file mode 100644 index 0000000000..813143995d --- /dev/null +++ b/meta/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc + +SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-1.0.3.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-1.0.3" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..ffdbf51ebf --- /dev/null +++ b/meta/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "randrext" diff --git a/meta/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb b/meta/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb new file mode 100644 index 0000000000..255ab83609 --- /dev/null +++ b/meta/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "recordext" diff --git a/meta/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb b/meta/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb new file mode 100644 index 0000000000..881eed5240 --- /dev/null +++ b/meta/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "renderext" diff --git a/meta/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..231eb0b37f --- /dev/null +++ b/meta/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "resourceext" diff --git a/meta/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb b/meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb b/meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb b/meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..af35684479 --- /dev/null +++ b/meta/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xcmiscproto-${PV}.tar.bz2" +S = "${WORKDIR}/xcmiscproto-${PV}" + +inherit native autotools pkgconfig diff --git a/meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb b/meta/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb new file mode 100644 index 0000000000..0c1fda0e16 --- /dev/null +++ b/meta/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/protto/xextproto-${PV}.tar.bz2" +S = "${WORKDIR}/xextproto-${PV}" + +inherit native autotools pkgconfig + +PROVIDES = "xextensions-native" diff --git a/meta/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb b/meta/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb new file mode 100644 index 0000000000..3b35a020e4 --- /dev/null +++ b/meta/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +PROVIDES = "xextensions" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..3fa9c9522c --- /dev/null +++ b/meta/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xf86bigfontproto-${PV}.tar.bz2" +S = "${WORKDIR}/xf86bigfontproto-${PV}" + +inherit native autotools pkgconfig diff --git a/meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb b/meta/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb new file mode 100644 index 0000000000..18207c0307 --- /dev/null +++ b/meta/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "xxf86dgaext" diff --git a/meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb b/meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb b/meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb b/meta/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb new file mode 100644 index 0000000000..d3acf1f590 --- /dev/null +++ b/meta/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +CONFLICTS = "xxf86vmext" diff --git a/meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/xorg-proto-common.inc b/meta/packages/xorg-proto/xorg-proto-common.inc new file mode 100644 index 0000000000..74e7312a50 --- /dev/null +++ b/meta/packages/xorg-proto/xorg-proto-common.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "X protocol headers" +HOMEPAGE = "http://www.x.org" +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "MIT-X" + +#DEPENDS = "" +XORG_PN = "${PN}" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.gz" +S = "${WORKDIR}/${XORG_PN}-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xproto/xproto-native_6.6.2.bb b/meta/packages/xorg-proto/xproto-native_6.6.2.bb index 44ccb5f035..6645f592bd 100644 --- a/meta/packages/xproto/xproto-native_6.6.2.bb +++ b/meta/packages/xorg-proto/xproto-native_6.6.2.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include xproto_${PV}.bb +require xproto_${PV}.bb inherit native PROVIDES = "" diff --git a/meta/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb b/meta/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb new file mode 100644 index 0000000000..c197c87298 --- /dev/null +++ b/meta/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xproto-${PV}.tar.bz2" +S = "${WORKDIR}/xproto-${PV}" + +inherit native autotools pkgconfig diff --git a/meta/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb b/meta/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb new file mode 100644 index 0000000000..8cec6426fd --- /dev/null +++ b/meta/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/proto/xproto-${PV}.tar.bz2" +S = "${WORKDIR}/xproto-${PV}" + +inherit native autotools pkgconfig diff --git a/meta/packages/xproto/xproto-native_cvs.bb b/meta/packages/xorg-proto/xproto-native_cvs.bb index 7b768a8079..a34db98ab9 100644 --- a/meta/packages/xproto/xproto-native_cvs.bb +++ b/meta/packages/xorg-proto/xproto-native_cvs.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include xproto_cvs.bb +require xproto_cvs.bb inherit native PROVIDES = "" diff --git a/meta/packages/xproto/xproto_6.6.2+cvs20050226.bb b/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb index 594a351155..594a351155 100644 --- a/meta/packages/xproto/xproto_6.6.2+cvs20050226.bb +++ b/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb diff --git a/meta/packages/xproto/xproto_6.6.2.bb b/meta/packages/xorg-proto/xproto_6.6.2.bb index b5cf751053..b5cf751053 100644 --- a/meta/packages/xproto/xproto_6.6.2.bb +++ b/meta/packages/xorg-proto/xproto_6.6.2.bb diff --git a/meta/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb b/meta/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb b/meta/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb new file mode 100644 index 0000000000..d7cd7c8c86 --- /dev/null +++ b/meta/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xproto/xproto_cvs.bb b/meta/packages/xorg-proto/xproto_cvs.bb index 1d9c96c87d..1d9c96c87d 100644 --- a/meta/packages/xproto/xproto_cvs.bb +++ b/meta/packages/xorg-proto/xproto_cvs.bb diff --git a/meta/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..b265a53346 --- /dev/null +++ b/meta/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PROVIDES="xproxymngproto" +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..f9dc1f3d3e --- /dev/null +++ b/meta/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + diff --git a/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..f9dc1f3d3e --- /dev/null +++ b/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + diff --git a/meta/packages/xorg-util/imake_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/imake_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..b2b11cf038 --- /dev/null +++ b/meta/packages/xorg-util/imake_X11R7.0-1.0.1.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +DESCRIPTION = "imake utility" + +DEPENDS += " perl xproto" + diff --git a/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..b2b11cf038 --- /dev/null +++ b/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +DESCRIPTION = "imake utility" + +DEPENDS += " perl xproto" + diff --git a/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..09a7787ee3 --- /dev/null +++ b/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +#DESCRIPTION = "" + +DEPENDS += " xproto" + diff --git a/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..1b8476be47 --- /dev/null +++ b/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb @@ -0,0 +1,10 @@ +require xorg-util-common.inc +inherit native + +#DESCRIPTION = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/makedepend-${PV}.tar.bz2" +S="${WORKDIR}/makedepend-${PV}" + +DEPENDS += " util-macros-native xproto-native" + diff --git a/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb b/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..09a7787ee3 --- /dev/null +++ b/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +#DESCRIPTION = "" + +DEPENDS += " xproto" + diff --git a/meta/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..8696ae62f8 --- /dev/null +++ b/meta/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/util-macros-${PV}.tar.bz2" +S = "${WORKDIR}/util-macros-${PV}" + +inherit native autotools pkgconfig + diff --git a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..1506bd3cb2 --- /dev/null +++ b/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2" +S = "${WORKDIR}/util-macros-${PV}" + +inherit native autotools pkgconfig + diff --git a/meta/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..4e2ddece48 --- /dev/null +++ b/meta/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" + +#DEPENDS += " " + diff --git a/meta/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..4e2ddece48 --- /dev/null +++ b/meta/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" + +#DEPENDS += " " + diff --git a/meta/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..f1b6b0d4f7 --- /dev/null +++ b/meta/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-util-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +FILES_${PN} += " /usr/lib/X11/config" diff --git a/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..f1b6b0d4f7 --- /dev/null +++ b/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-util-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +FILES_${PN} += " /usr/lib/X11/config" diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/packages/xorg-util/xorg-util-common.inc new file mode 100644 index 0000000000..f00a29a21c --- /dev/null +++ b/meta/packages/xorg-util/xorg-util-common.inc @@ -0,0 +1,15 @@ +HOMEPAGE = "http://www.x.org" +SECTION = "x11/utils" +#MAINTAINER = "" +LICENSE = "MIT-X" + +#DEPENDS = "" +XORG_PN = "${PN}" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/util/${XORG_PN}-${PV}.tar.gz" +S = "${WORKDIR}/${XORG_PN}-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/meta/packages/xorg-xserver/xorg-xserver-common.inc b/meta/packages/xorg-xserver/xorg-xserver-common.inc new file mode 100644 index 0000000000..6c1bbd34a9 --- /dev/null +++ b/meta/packages/xorg-xserver/xorg-xserver-common.inc @@ -0,0 +1,43 @@ +HOMEPAGE = "http://www.x.org" +SECTION = "x11/base" +#MAINTAINER = "" +LICENSE = "MIT-X" + +RPROVIDES = "virtual/xserver" +PROVIDES = "virtual/xserver" + +DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ +xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ +xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ +scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ +xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ +resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ +libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ +libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" + +REPENDS="rgb" + +XORG_PN = "xorg-server" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \ + file://xorg.conf" + +S = "${WORKDIR}/${XORG_PN}-${PV}" + +inherit autotools pkgconfig + +PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils" + +FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" +FILES_${PN}-xvfb = "${bindir}/Xvfb" +FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" +FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/modules ${libdir}/xorg/modules /etc/X11 " +FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" + +do_stage() { + autotools_stage_all +} + +do_install_append () { + install -d ${D}/etc/X11 + install -m0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/ +} diff --git a/meta/packages/xserver/xserver-kdrive-omap/configure-tslib.patch b/meta/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch index 0c0b64bf14..0c0b64bf14 100644 --- a/meta/packages/xserver/xserver-kdrive-omap/configure-tslib.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch diff --git a/meta/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/meta/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch index f87e7cc2cd..f87e7cc2cd 100644 --- a/meta/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch diff --git a/meta/packages/xserver/xserver-kdrive-omap/kmode.patch b/meta/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch index 22ad51c5ad..22ad51c5ad 100644 --- a/meta/packages/xserver/xserver-kdrive-omap/kmode.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch diff --git a/meta/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/meta/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb index c6a23deb9d..b7e192dc76 100644 --- a/meta/packages/xserver/xserver-kdrive-omap_6.6.3.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" PROVIDES = "virtual/xserver" PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" @@ -20,7 +20,4 @@ S = "${WORKDIR}/xserver" inherit autotools pkgconfig EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \ - --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr \ - --enable-static=no --disable-static " -LDFLAGS += " -lXfont -lXdmcp -lXau " - + --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr" diff --git a/meta/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/meta/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff index 596e498b80..596e498b80 100644 --- a/meta/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff +++ b/meta/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff diff --git a/meta/packages/xserver/xserver-kdrive/devfs.patch b/meta/packages/xorg-xserver/xserver-kdrive/devfs.patch index a6238126c0..a6238126c0 100644 --- a/meta/packages/xserver/xserver-kdrive/devfs.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/devfs.patch diff --git a/meta/packages/xserver/xserver-kdrive/disable-apm.patch b/meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch index bd8842721b..bd8842721b 100644 --- a/meta/packages/xserver/xserver-kdrive/disable-apm.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch diff --git a/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..9c43e52ead --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,37 @@ +--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 ++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 +@@ -505,7 +505,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1514,7 +1526,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1534,10 +1548,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/meta/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch b/meta/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch new file mode 100644 index 0000000000..13a6c2c954 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch @@ -0,0 +1,12 @@ +--- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200 ++++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200 +@@ -52,8 +52,8 @@ + /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */ + + #define NEED_REPLIES + #ifdef HAVE_DIX_CONFIG_H +-#include <dix-config.h> ++#include <kdrive-config.h> + #endif + + #include <X11/X.h> diff --git a/meta/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch b/meta/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch new file mode 100644 index 0000000000..e488657b74 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch @@ -0,0 +1,23 @@ +--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 ++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 +@@ -1438,6 +1446,10 @@ + fi + +- # tslib... ++ AC_CHECK_HEADERS([tslib.h]) ++ if test "$ac_cv_header_tslib_h" = yes; then ++ AC_DEFINE(TSLIB, 1, [Build kdrive with tslib support]) ++ AC_DEFINE(TOUCHSCREEN, 1, [Build kdrive with touchscreen support]) ++ fi + + # damage shadow extension glx (NOTYET) fb mi + KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src' +@@ -1467,7 +1479,7 @@ + AC_SUBST(KDRIVE_CFLAGS) + AC_SUBST(KDRIVE_PURE_LIBS) + AC_SUBST(KDRIVE_LIBS) +-AM_CONDITIONAL(TSLIB, false) ++AM_CONDITIONAL(TSLIB, [test x"$ac_cv_header_tslib_h" = xyes]) + AM_CONDITIONAL(H3600_TS, false) + AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes]) + AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes]) diff --git a/meta/packages/xserver/xserver-kdrive/epson.patch b/meta/packages/xorg-xserver/xserver-kdrive/epson.patch index 07009bdc40..07009bdc40 100644 --- a/meta/packages/xserver/xserver-kdrive/epson.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/epson.patch diff --git a/meta/packages/xserver/xserver-kdrive/faster-rotated.patch b/meta/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch index eaf7ddec36..eaf7ddec36 100644 --- a/meta/packages/xserver/xserver-kdrive/faster-rotated.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch diff --git a/meta/packages/xserver/xserver-kdrive/fbdev-not-fix.patch b/meta/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch index f87e7cc2cd..f87e7cc2cd 100644 --- a/meta/packages/xserver/xserver-kdrive/fbdev-not-fix.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch diff --git a/meta/packages/xserver/xserver-kdrive/kdrive-evdev.patch b/meta/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch index 2dc22bf50e..2dc22bf50e 100644 --- a/meta/packages/xserver/xserver-kdrive/kdrive-evdev.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch diff --git a/meta/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch b/meta/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch index d4f885ee26..d4f885ee26 100644 --- a/meta/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch diff --git a/meta/packages/xserver/xserver-kdrive/kmode.patch b/meta/packages/xorg-xserver/xserver-kdrive/kmode.patch index 5ad3e4e277..5ad3e4e277 100644 --- a/meta/packages/xserver/xserver-kdrive/kmode.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/kmode.patch diff --git a/meta/packages/xserver/xserver-kdrive/no-serial-probing.patch b/meta/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch index 35ccadaa8d..35ccadaa8d 100644 --- a/meta/packages/xserver/xserver-kdrive/no-serial-probing.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch diff --git a/meta/packages/xserver/xserver-kdrive/onlyfb.patch b/meta/packages/xorg-xserver/xserver-kdrive/onlyfb.patch index e773324981..e773324981 100644 --- a/meta/packages/xserver/xserver-kdrive/onlyfb.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/onlyfb.patch diff --git a/meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch b/meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch new file mode 100644 index 0000000000..d9ef51c5ba --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch @@ -0,0 +1,54 @@ +--- git/Makefile.am.orig 2006-06-09 16:01:51.000000000 +0200 ++++ git/Makefile.am 2006-06-09 16:02:59.000000000 +0200 +@@ -35,6 +35,10 @@ + XINPUT_DIR=Xi + endif + ++if XKB ++XKB_DIR=xkb ++endif ++ + if DBE + DBE_DIR=dbe + endif +@@ -51,7 +55,7 @@ + randr \ + render \ + $(XINPUT_DIR) \ +- xkb \ ++ $(XKB_DIR) \ + $(DBE_DIR) \ + $(MFB_DIR) \ + $(AFB_DIR) \ +--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 ++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 +@@ -418,6 +418,7 @@ + AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes]) + AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes]) + AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) ++AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) + + dnl DDXes. + AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) +@@ -739,12 +740,15 @@ + + AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) + +-AC_DEFINE(XKB, 1, [Build XKB]) +-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) +-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) +-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" +-XKB_LIB='$(top_builddir)/xkb/libxkb.la' +-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) ++if test "x$XKB" = xyes; then ++ AC_DEFINE(XKB, 1, [Build XKB]) ++ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) ++ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" ++ XKB_LIB='$(top_builddir)/xkb/libxkb.la' ++ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++fi + + AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, + [Do not have `strcasecmp'.])) diff --git a/meta/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch b/meta/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch new file mode 100644 index 0000000000..3f8cd4ea5c --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch @@ -0,0 +1,351 @@ +--- xorg-server-X11R7.1-1.1.0/mi/miinitext.c.orig 2006-06-22 14:11:46.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/mi/miinitext.c 2006-06-22 15:26:17.000000000 +0200 +@@ -385,6 +385,9 @@ + #ifdef DMXEXT + extern void DMXExtensionInit(INITARGS); + #endif ++#ifdef XCALIBRATE ++extern void XCalibrateExtensionInit(INITARGS); ++#endif + #ifdef XEVIE + extern void XevieExtensionInit(INITARGS); + #endif +@@ -679,6 +682,9 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void +--- xorg-server-X11R7.1-1.1.0/configure.ac.orig 2006-06-15 17:03:14.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/configure.ac 2006-06-24 08:21:25.000000000 +0200 +@@ -407,6 +407,7 @@ + AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes]) + AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes]) + AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes]) ++AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--disable-xcalibrate], [Build XCalibrate extension (default: enabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=yes]) + AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes]) + AC_ARG_ENABLE(lbx, AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no]) + AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=yes]) +@@ -641,6 +642,12 @@ + AC_DEFINE(XCSECURITY, 1, [Build Security extension]) + fi + ++AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes]) ++if test "x$XCALIBRATE" = xyes; then ++ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext" ++fi ++ + AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) + if test "x$XEVIE" = xyes; then + AC_DEFINE(XEVIE, 1, [Build XEvIE extension]) +@@ -1466,7 +1473,7 @@ + KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a' + KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a' + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB" ++ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) +--- xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in.orig 2006-06-22 14:22:07.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in 2006-06-22 14:33:29.000000000 +0200 +@@ -22,4 +22,7 @@ + /* Support tslib touchscreen abstraction library */ + #undef TSLIB + ++/* Enable XCalibrate extension */ ++#undef XCALIBRATE ++ + #endif /* _KDRIVE_CONFIG_H_ */ +--- xorg-server-X11R7.1-1.1.0/Xext/Makefile.am.orig 2006-06-15 17:06:43.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/Xext/Makefile.am 2006-06-15 18:12:40.000000000 +0200 +@@ -78,6 +78,11 @@ + AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\" + endif + ++XCALIBRATE_SRCS = xcalibrate.c ++if XCALIBRATE ++BUILTIN_SRCS += $(XCALIBRATE_SRCS) ++endif ++ + # X EVent Interception Extension: allows accessibility helpers & composite + # managers to intercept events from input devices and transform as needed + # before the clients see them. +@@ -155,6 +160,7 @@ + $(SCREENSAVER_SRCS) \ + $(XCSECURITY_SRCS) \ + $(XINERAMA_SRCS) \ ++ $(XCALIBRATE_SRCS) \ + $(XEVIE_SRCS) \ + $(XPRINT_SRCS) \ + $(APPGROUP_SRCS) \ +--- xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c.orig 2006-06-15 17:05:19.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c 2006-06-22 15:15:09.000000000 +0200 +@@ -0,0 +1,262 @@ ++/* ++ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $ ++ * ++ * Copyright © 2003 Philip Blundell ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Philip Blundell not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Philip Blundell makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_KDRIVE_CONFIG_H ++#include <kdrive-config.h> ++#endif ++ ++#define NEED_EVENTS ++#define NEED_REPLIES ++ ++#include <X11/X.h> ++#include <X11/Xproto.h> ++#include "misc.h" ++#include "os.h" ++#include "dixstruct.h" ++#include "extnsionst.h" ++#include "swaprep.h" ++ ++#include <X11/extensions/xcalibrateproto.h> ++#include <X11/extensions/xcalibratewire.h> ++ ++extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure); ++extern void *tslib_raw_event_closure; ++ ++static CARD8 XCalibrateReqCode; ++int XCalibrateEventBase; ++int XCalibrateReqBase; ++int XCalibrateErrorBase; ++ ++static ClientPtr xcalibrate_client; ++ ++static void ++xcalibrate_event_hook (int x, int y, int pressure, void *closure) ++{ ++ ClientPtr pClient = (ClientPtr) closure; ++ xXCalibrateRawTouchscreenEvent ev; ++ ++ ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen; ++ ev.sequenceNumber = pClient->sequence; ++ ev.x = x; ++ ev.y = y; ++ ev.pressure = pressure; ++ ++ if (!pClient->clientGone) ++ WriteEventsToClient (pClient, 1, (xEvent *) &ev); ++} ++ ++static int ++ProcXCalibrateQueryVersion (ClientPtr client) ++{ ++ REQUEST(xXCalibrateQueryVersionReq); ++ xXCalibrateQueryVersionReply rep; ++ CARD16 client_major, client_minor; /* not used */ ++ ++ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); ++ ++ client_major = stuff->majorVersion; ++ client_minor = stuff->minorVersion; ++ ++ fprintf(stderr, "%s(): called\n", __func__); ++ ++ rep.type = X_Reply; ++ rep.length = 0; ++ rep.sequenceNumber = client->sequence; ++ rep.majorVersion = XCALIBRATE_MAJOR_VERSION; ++ rep.minorVersion = XCALIBRATE_MINOR_VERSION; ++ if (client->swapped) { ++ int n; ++ swaps(&rep.sequenceNumber, n); ++ swapl(&rep.length, n); ++ swaps(&rep.majorVersion, n); ++ swaps(&rep.minorVersion, n); ++ } ++ WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep); ++ return (client->noClientException); ++} ++ ++static int ++SProcXCalibrateQueryVersion (ClientPtr client) ++{ ++ REQUEST(xXCalibrateQueryVersionReq); ++ int n; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); ++ swaps(&stuff->majorVersion,n); ++ swaps(&stuff->minorVersion,n); ++ return ProcXCalibrateQueryVersion(client); ++} ++ ++static int ++ProcXCalibrateSetRawMode (ClientPtr client) ++{ ++ REQUEST(xXCalibrateRawModeReq); ++ xXCalibrateRawModeReply rep; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); ++ ++ memset (&rep, 0, sizeof (rep)); ++ rep.type = X_Reply; ++ rep.sequenceNumber = client->sequence; ++ ++ if (stuff->on) ++ { ++ if (xcalibrate_client == NULL) ++ { ++ /* Start calibrating. */ ++ xcalibrate_client = client; ++ tslib_raw_event_hook = xcalibrate_event_hook; ++ tslib_raw_event_closure = client; ++ rep.status = GrabSuccess; ++ } ++ else ++ { ++ rep.status = AlreadyGrabbed; ++ } ++ } ++ else ++ { ++ if (xcalibrate_client == client) ++ { ++ /* Stop calibrating. */ ++ xcalibrate_client = NULL; ++ tslib_raw_event_hook = NULL; ++ tslib_raw_event_closure = NULL; ++ rep.status = GrabSuccess; ++ ++ /* Cycle input off and on to reload configuration. */ ++ KdDisableInput (); ++ KdEnableInput (); ++ } ++ else ++ { ++ rep.status = AlreadyGrabbed; ++ } ++ } ++ ++ if (client->swapped) ++ { ++ int n; ++ ++ swaps (&rep.sequenceNumber, n); ++ swaps (&rep.status, n); ++ } ++ WriteToClient(client, sizeof (rep), (char *) &rep); ++ return (client->noClientException); ++} ++ ++ ++static int ++SProcXCalibrateSetRawMode (ClientPtr client) ++{ ++ REQUEST(xXCalibrateRawModeReq); ++ int n; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); ++ ++ swaps(&stuff->on, n); ++ ++ return ProcXCalibrateSetRawMode(client); ++} ++ ++static void ++XCalibrateResetProc (ExtensionEntry *extEntry) ++{ ++} ++ ++static int ++ProcXCalibrateDispatch (ClientPtr client) ++{ ++ REQUEST(xReq); ++ switch (stuff->data) { ++ case X_XCalibrateQueryVersion: ++ return ProcXCalibrateQueryVersion(client); ++ case X_XCalibrateRawMode: ++ return ProcXCalibrateSetRawMode(client); ++ default: break; ++ } ++ ++ return BadRequest; ++} ++ ++static int ++SProcXCalibrateDispatch (ClientPtr client) ++{ ++ REQUEST(xReq); ++ int n; ++ ++ swaps(&stuff->length,n); ++ ++ switch (stuff->data) { ++ case X_XCalibrateQueryVersion: ++ return SProcXCalibrateQueryVersion(client); ++ case X_XCalibrateRawMode: ++ return SProcXCalibrateSetRawMode(client); ++ ++ default: break; ++ } ++ ++ return BadRequest; ++} ++ ++static void ++XCalibrateClientCallback (CallbackListPtr *list, ++ pointer closure, ++ pointer data) ++{ ++ NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; ++ ClientPtr pClient = clientinfo->client; ++ ++ if (clientinfo->setup == NULL ++ && xcalibrate_client != NULL ++ && xcalibrate_client == pClient) ++ { ++ /* Stop calibrating. */ ++ xcalibrate_client = NULL; ++ tslib_raw_event_hook = NULL; ++ tslib_raw_event_closure = NULL; ++ } ++} ++ ++void ++XCalibrateExtensionInit(void) ++{ ++ ExtensionEntry *extEntry; ++ ++ if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0)) ++ return; ++ ++ extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors, ++ ProcXCalibrateDispatch, SProcXCalibrateDispatch, ++ XCalibrateResetProc, StandardMinorOpcode); ++ ++ if (!extEntry) ++ return; ++ ++ XCalibrateReqCode = (unsigned char)extEntry->base; ++ XCalibrateEventBase = extEntry->eventBase; ++ XCalibrateErrorBase = extEntry->errorBase; ++ ++ xcalibrate_client = 0; ++} diff --git a/meta/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/meta/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch index ce80a7e389..ce80a7e389 100644 --- a/meta/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch diff --git a/meta/packages/xserver/xserver-kdrive_20050207.bb b/meta/packages/xorg-xserver/xserver-kdrive_20050207.bb index 32fdb82146..c198a94de2 100644 --- a/meta/packages/xserver/xserver-kdrive_20050207.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_20050207.bb @@ -3,11 +3,11 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" DEFAULT_PREFERENCE = "1" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" # Uncomment the following DEPENDS line and the commented line in SRC_URI # to make this snapshot build against X11R7.0 xlibs. -#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" +#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" @@ -25,7 +25,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r10" +PR = "r11" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" diff --git a/meta/packages/xserver/xserver-kdrive_20050624.bb b/meta/packages/xorg-xserver/xserver-kdrive_20050624.bb index c2e44f7837..f9ba323529 100644 --- a/meta/packages/xserver/xserver-kdrive_20050624.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_20050624.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${FIXEDSRCDATE}" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" diff --git a/meta/packages/xserver/xserver-kdrive_20060312.bb b/meta/packages/xorg-xserver/xserver-kdrive_20060312.bb index e5101a3579..594b6d74ec 100644 --- a/meta/packages/xserver/xserver-kdrive_20060312.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_20060312.bb @@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" DEFAULT_PREFERENCE = "1" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" diff --git a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..cfb1294c09 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -0,0 +1,46 @@ +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://xcalibrate.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + +S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-dmx \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --with-default-font-path=built-ins \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/meta/packages/xserver/xserver-kdrive_cvs.bb b/meta/packages/xorg-xserver/xserver-kdrive_cvs.bb index f034fbfd73..c2b25973fb 100644 --- a/meta/packages/xserver/xserver-kdrive_cvs.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" @@ -19,7 +19,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r10" +PR = "r11" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" @@ -34,6 +34,10 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \ file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1" SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" diff --git a/meta/packages/xorg-xserver/xserver-kdrive_git.bb b/meta/packages/xorg-xserver/xserver-kdrive_git.bb new file mode 100644 index 0000000000..491e486b3d --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive_git.bb @@ -0,0 +1,48 @@ +PV = "1.1.0+git${SRCDATE}" +DEFAULT_PREFERENCE = "-2" + +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ +# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://enable-tslib.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx \ + --with-default-font-path=built-ins \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/meta/packages/xserver/xserver-xorg/dri.patch b/meta/packages/xorg-xserver/xserver-xorg/dri.patch index 37d0407fe4..37d0407fe4 100644 --- a/meta/packages/xserver/xserver-xorg/dri.patch +++ b/meta/packages/xorg-xserver/xserver-xorg/dri.patch diff --git a/meta/packages/xorg-xserver/xserver-xorg/drmfix.patch b/meta/packages/xorg-xserver/xserver-xorg/drmfix.patch new file mode 100644 index 0000000000..04b0c1ae4f --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xorg/drmfix.patch @@ -0,0 +1,13 @@ +Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am ++++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am +@@ -24,7 +24,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_vid + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ + +-INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SOURCES = \ diff --git a/meta/packages/xserver/xserver-xorg/fontfile.patch b/meta/packages/xorg-xserver/xserver-xorg/fontfile.patch index ed39bf45d0..ed39bf45d0 100644 --- a/meta/packages/xserver/xserver-xorg/fontfile.patch +++ b/meta/packages/xorg-xserver/xserver-xorg/fontfile.patch diff --git a/meta/packages/xserver/xserver-xorg/freetype.patch b/meta/packages/xorg-xserver/xserver-xorg/freetype.patch index 0ba3dd5627..0ba3dd5627 100644 --- a/meta/packages/xserver/xserver-xorg/freetype.patch +++ b/meta/packages/xorg-xserver/xserver-xorg/freetype.patch diff --git a/meta/packages/xserver/xserver-xorg/imake-installed.patch b/meta/packages/xorg-xserver/xserver-xorg/imake-installed.patch index 57821075ef..57821075ef 100644 --- a/meta/packages/xserver/xserver-xorg/imake-installed.patch +++ b/meta/packages/xorg-xserver/xserver-xorg/imake-installed.patch diff --git a/meta/packages/xserver/xserver-xorg/imake-staging.patch b/meta/packages/xorg-xserver/xserver-xorg/imake-staging.patch index bf2e350830..bf2e350830 100644 --- a/meta/packages/xserver/xserver-xorg/imake-staging.patch +++ b/meta/packages/xorg-xserver/xserver-xorg/imake-staging.patch diff --git a/meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch b/meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch new file mode 100644 index 0000000000..fbade4319a --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch @@ -0,0 +1,11 @@ +--- temp/xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2005-12-01 23:02:44.000000000 -0700 ++++ xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2006-04-18 23:16:04.315823560 -0600 +@@ -2,7 +2,7 @@ + + AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ + +-INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support ++INCLUDES = -I$(top_srcdir)/miext/shadow -I$(top_srcdir)/hw/xfree86/os-support + + liblayer_la_SOURCES = \ + layer.h \ diff --git a/meta/packages/xorg-xserver/xserver-xorg/xorg.conf b/meta/packages/xorg-xserver/xserver-xorg/xorg.conf new file mode 100644 index 0000000000..34f4465764 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xorg/xorg.conf @@ -0,0 +1,149 @@ + +# xorg configuration + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Mouse0" "CorePointer" + InputDevice "Keyboard0" "CoreKeyboard" +EndSection + +Section "Files" + +# RgbPath is the location of the RGB database. Note, this is the name of the +# file minus the extension (like ".txt" or ".db"). There is normally +# no need to change the default. +# Multiple FontPath entries are allowed (they are concatenated together) +# By default, Red Hat 6.0 and later now use a font server independent of +# the X server to render fonts. +# FontPath "unix/:7100" + FontPath "/usr/lib/X11/fonts/misc" +EndSection + +Section "Module" + Load "dbe" + Load "extmod" + Load "fbdevhw" +# Load "glx" + Load "record" + Load "freetype" + Load "type1" +# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox +# Load "z4l" +EndSection + +Section "InputDevice" + +# Specify which keyboard LEDs can be user-controlled (eg, with xset(1)) +# Option "Xleds" "1 2 3" +# To disable the XKEYBOARD extension, uncomment XkbDisable. +# Option "XkbDisable" +# To customise the XKB settings to suit your keyboard, modify the +# lines below (which are the defaults). For example, for a non-U.S. +# keyboard, you will probably want to use: +# Option "XkbModel" "pc102" +# If you have a US Microsoft Natural keyboard, you can use: +# Option "XkbModel" "microsoft" +# +# Then to change the language, change the Layout setting. +# For example, a german layout can be obtained with: +# Option "XkbLayout" "de" +# or: +# Option "XkbLayout" "de" +# Option "XkbVariant" "nodeadkeys" +# +# If you'd like to switch the positions of your capslock and +# control keys, use: +# Option "XkbOptions" "ctrl:swapcaps" +# Or if you just want both to be control, use: +# Option "XkbOptions" "ctrl:nocaps" +# + Identifier "Keyboard0" + Driver "keyboard" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Mouse0" + Driver "mouse" + Option "Protocol" "PS/2" +# Option "Protocol" "IMPS/2" + Option "Device" "/dev/psaux" +# Option "Device" "/dev/input/mice" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "yes" +EndSection + +Section "Monitor" + Identifier "Monitor0" + VendorName "Monitor Vendor" + ModelName "NEC FP2141SB" +# DisplaySize 400 300 +# Note: setting HorizSync/VertRefresh will override DDC probe +# HorizSync 30.0 - 140.0 +# VertRefresh 25.0 - 160.0 + Option "dpms" +EndSection + +Section "Monitor" + Identifier "Monitor1" + VendorName "Generic Vendor" + ModelName "Generic Monitor" + HorizSync 28-50 + VertRefresh 43-73 + Modeline "800x600-60" 40.0000 800 840 976 1056 600 601 605 628 + Modeline "800x600-72" 50.0000 800 856 976 1040 600 637 643 666 + Modeline "640x480-60" 25.1749 640 656 744 800 480 490 492 525 -HSync -VSync + Modeline "640x480-72" 31.5000 640 664 704 832 480 489 492 520 -HSync -VSync + Option "dpms" +EndSection + + +Section "Device" + Identifier "Videocard0" + Driver "s3" +# Driver "nv" + VendorName "Videocard vendor" + BoardName "S3 driver" + #BoardName "NVidia driver" +EndSection + +Section "Device" + Identifier "FBDev" + Driver "fbdev" + #Option "shadowfb" "off" + VideoRam 4096 +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Videocard0" + Monitor "Monitor0" +# DefaultDepth 8 + DefaultDepth 16 +# DefaultDepth 24 + + SubSection "Display" + Depth 8 + Modes "1024x768" "800x600" "640x480" + EndSubsection + + SubSection "Display" + Depth 16 + Modes "1024x768" "800x600" "640x480" + EndSubsection + + SubSection "Display" + Depth 24 + FbBpp 32 + Modes "1024x768" "800x600" "640x480" + EndSubsection + +EndSection + +Section "DRI" + Group 0 + Mode 0666 +EndSection + diff --git a/meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch b/meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch new file mode 100644 index 0000000000..17d05d3ff8 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch @@ -0,0 +1,30 @@ +--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am.orig 2006-06-23 10:20:42.126095128 -0600 ++++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am 2006-06-23 10:20:50.923757680 -0600 +@@ -1,6 +1,6 @@ + xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts + +-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts ++parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts + + XPFONTS = \ + AvantGarde-Book.pmf \ +--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am.orig 2006-06-23 10:21:02.877940368 -0600 ++++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am 2006-06-23 10:21:11.903568264 -0600 +@@ -1,6 +1,6 @@ + xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts + +-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts ++parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts + + XPFONTS = \ + AvantGarde-Book.pmf \ +--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am.orig 2006-06-23 10:21:22.893897480 -0600 ++++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am 2006-06-23 10:21:28.412058592 -0600 +@@ -1,6 +1,6 @@ + xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts + +-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts ++parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts + + XPFONTS = \ + Courier-Bold.pmf \ diff --git a/meta/packages/xserver/xserver-xorg_6.8.99.10.bb b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb index 37546fe1ee..37546fe1ee 100644 --- a/meta/packages/xserver/xserver-xorg_6.8.99.10.bb +++ b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb diff --git a/meta/packages/xserver/xserver-xorg_6.8.99.11.bb b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb index e60f62ef57..e60f62ef57 100644 --- a/meta/packages/xserver/xserver-xorg_6.8.99.11.bb +++ b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb diff --git a/meta/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/meta/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..2a7ba03431 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb @@ -0,0 +1,9 @@ +require xorg-xserver-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +SRC_URI += " file://miext_layer_shadow_h.patch;patch=1 \ + file://xpconfig-parentdir.patch;patch=1" + diff --git a/meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..3db5c640c7 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb @@ -0,0 +1,9 @@ +require xorg-xserver-common.inc + +SRC_URI += "file://drmfix.patch;patch=1" + +EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/meta/packages/xserver/xserver-xorg_cvs.bb b/meta/packages/xorg-xserver/xserver-xorg_cvs.bb index e410581e17..e410581e17 100644 --- a/meta/packages/xserver/xserver-xorg_cvs.bb +++ b/meta/packages/xorg-xserver/xserver-xorg_cvs.bb |