diff options
144 files changed, 1995 insertions, 273 deletions
diff --git a/packages/xorg-app/x11perf_1.4.1.bb b/packages/xorg-app/x11perf_1.4.1.bb new file mode 100644 index 0000000000..35680e7925 --- /dev/null +++ b/packages/xorg-app/x11perf_1.4.1.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "X11 server performance test program" +DEPENDS += "libxmu libxrender libxft libxext fontconfig" +PR = "r1" +PE = "1" diff --git a/packages/xorg-app/xauth_1.0.2.bb b/packages/xorg-app/xauth_1.0.2.bb index 45aaafb1ce..93ddf7e828 100644 --- a/packages/xorg-app/xauth_1.0.2.bb +++ b/packages/xorg-app/xauth_1.0.2.bb @@ -1,7 +1,6 @@ require xorg-app-common.inc -PE = "1" - -#DESCRIPTION = "" - -DEPENDS += " virtual/libx11 libxau libxext libxmu" +DESCRIPTION = "X authority file utility" +DEPENDS += "libxau libxext libxmu" +PR = "r1" +PE = "1" diff --git a/packages/xorg-app/xdpyinfo_1.0.2.bb b/packages/xorg-app/xdpyinfo_1.0.2.bb index 62825e5a0f..4764a7089f 100644 --- a/packages/xorg-app/xdpyinfo_1.0.2.bb +++ b/packages/xorg-app/xdpyinfo_1.0.2.bb @@ -1,10 +1,10 @@ require xorg-app-common.inc -PE = "1" DESCRIPTION = "X display information utility" LICENSE = "MIT" - -DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" +DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau" +PR = "r1" +PE = "1" SRC_URI += "file://disable-xkb.patch;patch=1" diff --git a/packages/xorg-app/xev-1.0.2/.mtn2git_empty b/packages/xorg-app/xev-1.0.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-app/xev-1.0.2/.mtn2git_empty diff --git a/packages/xorg-app/xev-1.0.2/diet-x11.patch b/packages/xorg-app/xev-1.0.2/diet-x11.patch new file mode 100644 index 0000000000..9f515e8c73 --- /dev/null +++ b/packages/xorg-app/xev-1.0.2/diet-x11.patch @@ -0,0 +1,80 @@ +--- + xev.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +Index: xev-1.0.2/xev.c +=================================================================== +--- xev-1.0.2.orig/xev.c 2006-06-02 00:25:44.000000000 +0100 ++++ xev-1.0.2/xev.c 2007-05-10 15:22:07.000000000 +0100 +@@ -109,7 +109,7 @@ do_KeyPress (XEvent *eventp) + nbytes = XLookupString (e, str, 256, &ks, NULL); + + /* not supposed to call XmbLookupString on a key release event */ +- if (e->type == KeyPress && xic) { ++ /*if (e->type == KeyPress && xic) { + do { + nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); + buf[nmbbytes] = '\0'; +@@ -119,7 +119,7 @@ do_KeyPress (XEvent *eventp) + buf = realloc (buf, bsize); + } + } while (status == XBufferOverflow); +- } ++ }*/ + + if (ks == NoSymbol) + ksname = "NoSymbol"; +@@ -149,7 +149,7 @@ do_KeyPress (XEvent *eventp) + } + + /* not supposed to call XmbLookupString on a key release event */ +- if (e->type == KeyPress && xic) { ++ /*if (e->type == KeyPress && xic) { + printf (" XmbLookupString gives %d bytes: ", nmbbytes); + if (nmbbytes > 0) { + dump (buf, nmbbytes); +@@ -157,7 +157,7 @@ do_KeyPress (XEvent *eventp) + } else { + printf ("\n"); + } +- } ++ } */ + + printf (" XFilterEvent returns: %s\n", + XFilterEvent (eventp, e->window) ? "True" : "False"); +@@ -804,7 +804,7 @@ main (int argc, char **argv) + fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); + } + +- xim = XOpenIM (dpy, NULL, NULL, NULL); ++ /*xim = XOpenIM (dpy, NULL, NULL, NULL); + if (xim == NULL) { + fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); + } +@@ -831,7 +831,7 @@ main (int argc, char **argv) + } + XFree (xim_styles); + } +- } ++ }*/ + + screen = DefaultScreen (dpy); + +@@ -891,7 +891,7 @@ main (int argc, char **argv) + printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); + } + +- if (xim && xim_style) { ++ /*if (xim && xim_style) { + xic = XCreateIC (xim, + XNInputStyle, xim_style, + XNClientWindow, w, +@@ -901,7 +901,7 @@ main (int argc, char **argv) + if (xic == NULL) { + fprintf (stderr, "XCreateIC failed\n"); + } +- } ++ }*/ + + for (done = 0; !done; ) { + XEvent event; diff --git a/packages/xorg-app/xev_1.0.2.bb b/packages/xorg-app/xev_1.0.2.bb new file mode 100644 index 0000000000..b7a4070a8f --- /dev/null +++ b/packages/xorg-app/xev_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Event Viewer" +LICENSE = "MIT" +PE = "1" + +SRC_URI += "file://diet-x11.patch;patch=1" diff --git a/packages/xorg-app/xhost_1.0.2.bb b/packages/xorg-app/xhost_1.0.2.bb new file mode 100644 index 0000000000..af5beadd79 --- /dev/null +++ b/packages/xorg-app/xhost_1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "Server access control program for X" +LICENSE = "MIT" +DEPENDS += "libxmu libxau" +PE = "1" diff --git a/packages/xorg-app/xinit_1.0.4.bb b/packages/xorg-app/xinit_1.0.4.bb new file mode 100644 index 0000000000..ce82fb05d4 --- /dev/null +++ b/packages/xorg-app/xinit_1.0.4.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Window System initializer" +PE = "1" + +FILES_${PN} += "${libdir}X11/xinit" diff --git a/packages/xorg-app/xmodmap_1.0.2.bb b/packages/xorg-app/xmodmap_1.0.2.bb index b934ebfa48..4b031293a2 100644 --- a/packages/xorg-app/xmodmap_1.0.2.bb +++ b/packages/xorg-app/xmodmap_1.0.2.bb @@ -1,8 +1,5 @@ require xorg-app-common.inc -PE = "1" DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" LICENSE = "MIT" - -DEPENDS += " virtual/libx11" - +PE = "1" diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc index a33d107675..cd7f654be2 100644 --- a/packages/xorg-app/xorg-app-common.inc +++ b/packages/xorg-app/xorg-app-common.inc @@ -1,18 +1,19 @@ DESCRIPTION = "X application" -HOMEPAGE = "http://www.x.org" -SECTION = "x11/applications" +HOMEPAGE = "http://www.x.org/" +SECTION = "x11/apps" LICENSE = "MIT-X" +DEPENDS = "util-macros-native virtual/libx11" -DEPENDS = "util-macros" XORG_PN = "${PN}" -XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" -SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/app/${XORG_PN}-${PV}.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-${PV}" -FILES_${PN} += " /usr/lib/X11/${XORG_PN}" +SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2" + +S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig do_stage() { - autotools_stage_all + autotools_stage_all } + +FILES_${PN} += " /usr/lib/X11/${XORG_PN}" diff --git a/packages/xorg-app/xrandr/resolve_symbol_clash.patch b/packages/xorg-app/xrandr/resolve_symbol_clash.patch index 80d8960c94..1ecf9563f6 100644 --- a/packages/xorg-app/xrandr/resolve_symbol_clash.patch +++ b/packages/xorg-app/xrandr/resolve_symbol_clash.patch @@ -2,11 +2,9 @@ xrandr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: xrandr-1.2.0/xrandr.c -=================================================================== ---- xrandr-1.2.0.orig/xrandr.c 2007-02-19 05:26:50.000000000 +0000 -+++ xrandr-1.2.0/xrandr.c 2007-05-28 19:22:30.000000000 +0100 -@@ -163,7 +163,7 @@ reflection_name (Rotation rotation) +--- xrandr-1.2.2.orig/xrandr.c ++++ xrandr-1.2.2/xrandr.c +@@ -189,7 +189,7 @@ #if HAS_RANDR_1_2 typedef enum _policy { @@ -15,16 +13,16 @@ Index: xrandr-1.2.0/xrandr.c } policy_t; typedef enum _relation { -@@ -1398,7 +1398,7 @@ main (int argc, char **argv) +@@ -1602,7 +1602,7 @@ + int ret = 0; #if HAS_RANDR_1_2 output_t *output = NULL; - char *crtc; - policy_t policy = clone; + policy_t policy = policy_clone; Bool setit_1_2 = False; Bool query_1_2 = False; - Bool query_1 = False; -@@ -1634,7 +1634,7 @@ main (int argc, char **argv) + Bool modeit = False; +@@ -1863,7 +1863,7 @@ continue; } if (!strcmp ("--clone", argv[i])) { diff --git a/packages/xorg-app/xrandr_1.2.2.bb b/packages/xorg-app/xrandr_1.2.2.bb new file mode 100644 index 0000000000..05ef6af95d --- /dev/null +++ b/packages/xorg-app/xrandr_1.2.2.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Resize and Rotate extension command." +LICENSE= "BSD-X" +DEPENDS += "libxrandr libxrender" +PE = "1" + +SRC_URI += "file://resolve_symbol_clash.patch;patch=1" diff --git a/packages/xorg-app/xrdb_1.0.3.bb b/packages/xorg-app/xrdb_1.0.3.bb index d8a3cee728..177d3ab23b 100644 --- a/packages/xorg-app/xrdb_1.0.3.bb +++ b/packages/xorg-app/xrdb_1.0.3.bb @@ -2,6 +2,5 @@ require xorg-app-common.inc DESCRIPTION = "X server resource database utility" LICENSE = "xrdb" - -DEPENDS += " libxmu virtual/libx11 libxext" +DEPENDS += "libxmu" PE = "1" diff --git a/packages/xorg-app/xset_1.0.2.bb b/packages/xorg-app/xset_1.0.2.bb new file mode 100644 index 0000000000..fa2e4c25a2 --- /dev/null +++ b/packages/xorg-app/xset_1.0.2.bb @@ -0,0 +1,11 @@ +require xorg-app-common.inc + +DESCRIPTION = "user preference utility for X" +LICENSE = "MIT" +DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" +PE = "1" + +SRC_URI += "file://disable-xkb.patch;patch=1" + +CFLAGS += "-D_GNU_SOURCE" +EXTRA_OECONF = "--disable-xkb" diff --git a/packages/xorg-app/xvinfo_1.0.1.bb b/packages/xorg-app/xvinfo_1.0.1.bb new file mode 100644 index 0000000000..ac27f13f34 --- /dev/null +++ b/packages/xorg-app/xvinfo_1.0.1.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "Print out X-Video extension adaptor information" +DEPENDS += " libxv" +PE = "1" diff --git a/packages/xorg-lib/diet-x11_1.1.2.bb b/packages/xorg-lib/diet-x11_1.1.2.bb new file mode 100644 index 0000000000..f032987b88 --- /dev/null +++ b/packages/xorg-lib/diet-x11_1.1.2.bb @@ -0,0 +1,8 @@ +require libx11_${PV}.bb + +SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1" + +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch new file mode 100644 index 0000000000..f43d38065e --- /dev/null +++ b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch @@ -0,0 +1,22 @@ +--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 ++++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 +@@ -56,7 +56,7 @@ + #include <stdio.h> + + #ifndef ERRORDB +-#define ERRORDB "/usr/lib/X11/XErrorDB" ++#define ERRORDB "/usr/share/X11/XErrorDB" + #endif + + /* +--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 ++++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 +@@ -36,7 +36,7 @@ + #include "Key.h" + + #ifndef KEYSYMDB +-#define KEYSYMDB "/usr/lib/X11/XKeysymDB" ++#define KEYSYMDB "/usr/share/X11/XKeysymDB" + #endif + + static Bool initialized; diff --git a/packages/xorg-lib/libapplewm_1.0.0.bb b/packages/xorg-lib/libapplewm_1.0.0.bb new file mode 100644 index 0000000000..bc502fb505 --- /dev/null +++ b/packages/xorg-lib/libapplewm_1.0.0.bb @@ -0,0 +1,7 @@ +require xorg-lib-common.inc + +DEPENDS += "libxext applewmproto" +PR = "r1" +PE = "1" + +XORG_PN = "libAppleWM" diff --git a/packages/xorg-lib/libdmx_1.0.2.bb b/packages/xorg-lib/libdmx_1.0.2.bb new file mode 100644 index 0000000000..9b66101563 --- /dev/null +++ b/packages/xorg-lib/libdmx_1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Distributed Multihead extension library" +DEPENDS += "libxext dmxproto" +PR = "r1" +PE = "1" diff --git a/packages/xorg-lib/libfontenc-native_1.0.4.bb b/packages/xorg-lib/libfontenc-native_1.0.4.bb new file mode 100644 index 0000000000..a907e08f12 --- /dev/null +++ b/packages/xorg-lib/libfontenc-native_1.0.4.bb @@ -0,0 +1,8 @@ +require libfontenc_${PV}.bb + +DEPENDS = "zlib-native xproto-native" +PE = "1" + +XORG_PN = "libfontenc" + +inherit native diff --git a/packages/xorg-lib/libfontenc_1.0.4.bb b/packages/xorg-lib/libfontenc_1.0.4.bb index afb7ffe10e..654fc72eca 100644 --- a/packages/xorg-lib/libfontenc_1.0.4.bb +++ b/packages/xorg-lib/libfontenc_1.0.4.bb @@ -1,9 +1,7 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X fontenc library (used by libxfont)." +DESCRIPTION = "X11 font encoding library" LICENSE = "BSD-X" -PRIORITY = "optional" - -DEPENDS += " zlib xproto" - +DEPENDS += "zlib xproto" +PR = "r1" +PE = "1" diff --git a/packages/xorg-lib/libfs_1.0.0.bb b/packages/xorg-lib/libfs_1.0.0.bb new file mode 100644 index 0000000000..010aa311e0 --- /dev/null +++ b/packages/xorg-lib/libfs_1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Font Services library" +DEPENDS += "xproto fontsproto xtrans" +PR = "r1" +PE = "1" + +XORG_PN = "libFS" diff --git a/packages/xorg-lib/libice_1.0.3.bb b/packages/xorg-lib/libice_1.0.3.bb index 28d0885370..e4a6557397 100644 --- a/packages/xorg-lib/libice_1.0.3.bb +++ b/packages/xorg-lib/libice_1.0.3.bb @@ -1,12 +1,9 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X11 ICE library" -PRIORITY = "optional" - -DEPENDS += " xproto xtrans" +DESCRIPTION = "X11 Inter-Client Exchange library" +DEPENDS += "xproto xtrans" PROVIDES = "ice" +PR = "r1" +PE = "1" XORG_PN = "libICE" - diff --git a/packages/xorg-lib/liblbxutil_1.0.1.bb b/packages/xorg-lib/liblbxutil_1.0.1.bb new file mode 100644 index 0000000000..adb7b0513e --- /dev/null +++ b/packages/xorg-lib/liblbxutil_1.0.1.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "XFIXES Extension" +DEPENDS += " xextproto xproto zlib" +PROVIDES = "lbxutil" +PE = "1" + +SRC_URI += "file://mkg3states.patch;patch=1" + +export CC_FOR_BUILD = "gcc" diff --git a/packages/xorg-lib/liboldx_1.0.1.bb b/packages/xorg-lib/liboldx_1.0.1.bb new file mode 100644 index 0000000000..84470cbc78 --- /dev/null +++ b/packages/xorg-lib/liboldx_1.0.1.bb @@ -0,0 +1,6 @@ +require xorg-lib-common.inc + +DEPENDS += " virtual/libx11" +PE = "1" + +XORG_PN = "liboldX" diff --git a/packages/xorg-lib/libsm_1.0.3.bb b/packages/xorg-lib/libsm_1.0.3.bb new file mode 100644 index 0000000000..edb6ff45ca --- /dev/null +++ b/packages/xorg-lib/libsm_1.0.3.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Session management library" +DEPENDS += "libice xproto xtrans" +PR = "r1" +PE = "1" + +XORG_PN = "libSM" diff --git a/packages/xorg-lib/libwindowswm_1.0.0.bb b/packages/xorg-lib/libwindowswm_1.0.0.bb new file mode 100644 index 0000000000..a03d49505b --- /dev/null +++ b/packages/xorg-lib/libwindowswm_1.0.0.bb @@ -0,0 +1,6 @@ +require xorg-lib-common.inc + +DEPENDS += "libxext windowswmproto" +PE = "1" + +XORG_PN = "libWindowsWM" diff --git a/packages/xorg-lib/libx11-native_1.0.1.bb b/packages/xorg-lib/libx11-native_1.0.1.bb new file mode 100644 index 0000000000..7bc5fd3524 --- /dev/null +++ b/packages/xorg-lib/libx11-native_1.0.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Base X libs." +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" +PE = "1" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" +PROVIDES = "x11-native" + +XORG_PN = "libX11" + +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.1.1.tar.bz2" +S = "${WORKDIR}/libX11-${PV}" + +inherit native autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} diff --git a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb index 16f77f7687..3c30890ac8 100644 --- a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb @@ -12,7 +12,7 @@ SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libX11-${PV}.tar.bz2" SRC_URI += "file://makekeys.diff;patch=1" S = "${WORKDIR}/libX11-${PV}" -inherit native autotools pkgconfig +inherit autotools pkgconfig native EXTRA_OECONF="--enable-malloc0returnsnull" @@ -23,3 +23,5 @@ do_compile() { ) oe_runmake } + + diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb new file mode 100644 index 0000000000..bab2277fd0 --- /dev/null +++ b/packages/xorg-lib/libx11_1.1.2.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" +PE = "1" + +XORG_PN = "libX11" + +EXTRA_OECONF += "--without-xcb" + +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 + ) + oe_runmake +} + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb index 5a333914e2..f2929624e8 100644 --- a/packages/xorg-lib/libx11_git.bb +++ b/packages/xorg-lib/libx11_git.bb @@ -2,12 +2,11 @@ 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" +PR = "r1" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/packages/xorg-lib/libxau-native_1.0.3.bb b/packages/xorg-lib/libxau-native_1.0.3.bb new file mode 100644 index 0000000000..953a93adf1 --- /dev/null +++ b/packages/xorg-lib/libxau-native_1.0.3.bb @@ -0,0 +1,8 @@ +require libxau_${PV}.bb + +DEPENDS = "xproto-native util-macros-native" +PR = "r1" + +XORG_PN = "libXau" + +inherit native diff --git a/packages/xorg-lib/libxau_1.0.3.bb b/packages/xorg-lib/libxau_1.0.3.bb index dcde9b4da2..3a77534cff 100644 --- a/packages/xorg-lib/libxau_1.0.3.bb +++ b/packages/xorg-lib/libxau_1.0.3.bb @@ -1,11 +1,8 @@ require xorg-lib-common.inc -PE = "1" DESCRIPTION = "A Sample Authorization Protocol for X" -PRIORITY = "optional" - DEPENDS += " xproto" PROVIDES = "xau" +PE = "1" XORG_PN = "libXau" - diff --git a/packages/xorg-lib/libxaw_1.0.3.bb b/packages/xorg-lib/libxaw_1.0.3.bb index 7e7f91b82f..f45431e79e 100644 --- a/packages/xorg-lib/libxaw_1.0.3.bb +++ b/packages/xorg-lib/libxaw_1.0.3.bb @@ -1,14 +1,14 @@ require xorg-lib-common.inc -DESCRIPTION = "Xaw is the X Athena Widget Set." -DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" +DESCRIPTION = "X Athena Widget Set" +DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" +PR = "r1" PE = "1" XORG_PN = "libXaw" -do_stage () { - autotools_stage_all +do_stage_append () { ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6 ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so diff --git a/packages/xorg-lib/libxcalibrate/.mtn2git_empty b/packages/xorg-lib/libxcalibrate/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-lib/libxcalibrate/.mtn2git_empty diff --git a/packages/xorg-lib/libxcalibrate/coords.patch b/packages/xorg-lib/libxcalibrate/coords.patch new file mode 100644 index 0000000000..19cf1639f6 --- /dev/null +++ b/packages/xorg-lib/libxcalibrate/coords.patch @@ -0,0 +1,50 @@ +--- + xcalibrate.c | 26 ++++++++++++++++++++++++++ + xcalibrate.h | 2 ++ + 2 files changed, 28 insertions(+) + +Index: XCalibrate/xcalibrate.c +=================================================================== +--- XCalibrate.orig/xcalibrate.c 2007-06-30 14:12:22.000000000 +0100 ++++ XCalibrate/xcalibrate.c 2007-06-30 14:18:10.000000000 +0100 +@@ -227,3 +227,29 @@ XCalibrateSetRawMode (Display *dpy, Bool + SyncHandle (); + return 0; + } ++ ++Status ++XCalibrateScreenToCoord (Display *dpy, int *x, int *y) ++{ ++ XExtDisplayInfo *info = XCalibrateFindDisplay (dpy); ++ xXCalibrateScreenToCoordReq *req; ++ xXCalibrateScreenToCoordReply rep; ++ LockDisplay (dpy); ++ GetReq (XCalibrateScreenToCoord, req); ++ req->reqType = info->codes->major_opcode; ++ req->xCalibrateReqType = X_XCalibrateScreenToCoord; ++ req->x = *x; ++ req->y = *y; ++ if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) ++ { ++ UnlockDisplay (dpy); ++ SyncHandle (); ++ return 1; ++ } ++ *x = rep.x; ++ *y = rep.y; ++ UnlockDisplay (dpy); ++ SyncHandle (); ++ return 0; ++} ++ +Index: XCalibrate/xcalibrate.h +=================================================================== +--- XCalibrate.orig/xcalibrate.h 2007-06-30 14:16:16.000000000 +0100 ++++ XCalibrate/xcalibrate.h 2007-06-30 14:16:38.000000000 +0100 +@@ -43,4 +43,6 @@ Status XCalibrateQueryVersion (Display * + + Status XCalibrateSetRawMode (Display *dpy, Bool enable); + ++Status XCalibrateScreenToCoord (Display *dpy, int *x, int *y); ++ + #endif diff --git a/packages/xorg-lib/libxcalibrate_git.bb b/packages/xorg-lib/libxcalibrate_git.bb index 4e70d2670a..99f11e40fd 100644 --- a/packages/xorg-lib/libxcalibrate_git.bb +++ b/packages/xorg-lib/libxcalibrate_git.bb @@ -1,20 +1,14 @@ +require xorg-lib-common.inc + DESCRIPTION = " Touchscreen calibration client library" -SECTION = "x11/libs" -PRIORITY = "optional" LICENSE = "BSD-X" - -PV = "0.0+git4be232e30cd33a44a1ce6d3ec429ee6101540c62" - DEPENDS = "virtual/libx11 calibrateproto libxext" +PV = "0.0+git${SRCDATE}" +PR = "r2" -FILES_${PN}-locale += "${datadir}/X11/locale" +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62 \ + file://coords.patch;patch=1" -SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62" S = "${WORKDIR}/git" -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - +FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/packages/xorg-lib/libxcomposite_0.4.0.bb b/packages/xorg-lib/libxcomposite_0.4.0.bb new file mode 100644 index 0000000000..8921b927bf --- /dev/null +++ b/packages/xorg-lib/libxcomposite_0.4.0.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" +PE = "1" + +XORG_PN = "libXcomposite" + +SRC_URI += " file://change-include-order.patch;patch=1" diff --git a/packages/xorg-lib/libxcursor_1.1.8.bb b/packages/xorg-lib/libxcursor_1.1.8.bb index bf795757f6..4713eccc48 100644 --- a/packages/xorg-lib/libxcursor_1.1.8.bb +++ b/packages/xorg-lib/libxcursor_1.1.8.bb @@ -1,11 +1,9 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X Cursor library" +DESCRIPTION = "X cursor management library" LICENSE= "BSD-X" - -DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto" +DEPENDS += "libxrender libxfixes" +PR = "r2" +PE = "1" XORG_PN = "libXcursor" - -FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xorg-lib/libxdamage_1.1.1.bb b/packages/xorg-lib/libxdamage_1.1.1.bb new file mode 100644 index 0000000000..e56d1d0954 --- /dev/null +++ b/packages/xorg-lib/libxdamage_1.1.1.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 damaged region extension library" +LICENSE= "BSD-X" +DEPENDS += "damageproto libxfixes" +PROVIDES = "xdamage" +PR = "r1" +PE = "1" + +XORG_PN = "libXdamage" diff --git a/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/packages/xorg-lib/libxdmcp-native_1.0.2.bb index 2438a7b599..d57f8ac48e 100644 --- a/packages/xorg-lib/libxdmcp-native_1.0.2.bb +++ b/packages/xorg-lib/libxdmcp-native_1.0.2.bb @@ -1,11 +1,9 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" -PE = "1" +require libxdmcp_${PV}.bb DEPENDS = "xproto-native util-macros-native" +PR = "r1" +PE = "1" -SRC_URI = "${XORG_MIRROR}/individual/lib/libXdmcp-${PV}.tar.bz2" -S = "${WORKDIR}/libXdmcp-${PV}" +XORG_PN = "libXdmcp" -inherit native autotools pkgconfig +inherit native diff --git a/packages/xorg-lib/libxdmcp_1.0.2.bb b/packages/xorg-lib/libxdmcp_1.0.2.bb index 109c5b5615..0aa95b4677 100644 --- a/packages/xorg-lib/libxdmcp_1.0.2.bb +++ b/packages/xorg-lib/libxdmcp_1.0.2.bb @@ -1,11 +1,9 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Display Manager Control Protocol library." -PRIORITY = "optional" -DEPENDS += " xproto" +DESCRIPTION = "X Display Manager Control Protocol library" +DEPENDS += "xproto" PROVIDES = "xdmcp" +PR = "r1" +PE = "1" XORG_PN = "libXdmcp" - diff --git a/packages/xorg-lib/libxevie_1.0.2.bb b/packages/xorg-lib/libxevie_1.0.2.bb index 06985bd112..6c6b4595aa 100644 --- a/packages/xorg-lib/libxevie_1.0.2.bb +++ b/packages/xorg-lib/libxevie_1.0.2.bb @@ -1,9 +1,8 @@ require xorg-lib-common.inc -PE = "1" - -#DESCRIPTION = "" -DEPENDS += " xproto virtual/libx11 xextproto libxext evieext" +DESCRIPTION = "X11 EvIE extension library" +DEPENDS += "libxext evieext" +PR = "r1" +PE = "1" XORG_PN = "libXevie" - diff --git a/packages/xorg-lib/libxext_1.0.3.bb b/packages/xorg-lib/libxext_1.0.3.bb new file mode 100644 index 0000000000..81231a866c --- /dev/null +++ b/packages/xorg-lib/libxext_1.0.3.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 miscellaneous extension library" +DEPENDS += "xproto virtual/libx11 xextproto libxau" +PROVIDES = "xext" +PR = "r1" +PE = "1" + +XORG_PN = "libXext" diff --git a/packages/xorg-lib/libxfixes_4.0.3.bb b/packages/xorg-lib/libxfixes_4.0.3.bb index cffe56a03a..5b2100a815 100644 --- a/packages/xorg-lib/libxfixes_4.0.3.bb +++ b/packages/xorg-lib/libxfixes_4.0.3.bb @@ -1,10 +1,8 @@ require xorg-lib-common.inc -PE = "1" DESCRIPTION = "X Fixes extension library." LICENSE= "BSD-X" - -DEPENDS += " virtual/libx11 xproto fixesproto xextproto" +DEPENDS += "virtual/libx11 xproto fixesproto xextproto" +PE = "1" XORG_PN = "libXfixes" - diff --git a/packages/xorg-lib/libxfont-native_1.3.0.bb b/packages/xorg-lib/libxfont-native_1.3.0.bb new file mode 100644 index 0000000000..efd1e07d6a --- /dev/null +++ b/packages/xorg-lib/libxfont-native_1.3.0.bb @@ -0,0 +1,10 @@ +require libxfont_${PV}.bb + +DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native \ + libfontenc-native xtrans-native freetype-native util-macros-native" +PE = "1" + +# no need for patch used in libxfont +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" + +inherit native diff --git a/packages/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch b/packages/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch new file mode 100644 index 0000000000..dd307434b9 --- /dev/null +++ b/packages/xorg-lib/libxfont/builtinreaddirectory-no-side-effect.patch @@ -0,0 +1,188 @@ +commit 7670d4a2720c61fbc7b989fed14c676f04ac3ad1 +Author: Dodji Seketeli <dodji@openedhand.com> +Date: Mon Jul 16 12:24:34 2007 +0200 + + Remove side effects from BuiltinReadDirectory() + + The first time BuiltinReadDirectory() is called, + save the content of builtin_dir and builtin_alias, + before calling FontFileAddFontFile(), because that fonction + will modify those. + + Then, in subsequent calls to BuiltinReadDirectory(), restore + builtin_dir and builtin_alias so that the side effect incurred + by the first call disappears. + +diff --git a/src/builtins/dir.c b/src/builtins/dir.c +index c272449..97f1e1e 100644 +--- a/src/builtins/dir.c ++++ b/src/builtins/dir.c +@@ -29,6 +29,133 @@ + #endif + #include "builtin.h" + ++BuiltinDirPtr ++BuiltinDirsDup (const BuiltinDirPtr a_dirs, ++ int a_dirs_len) ++{ ++ BuiltinDirPtr dirs=NULL ; ++ int i=0 ; ++ ++ if (!a_dirs) ++ return NULL ; ++ ++ dirs = xcalloc (a_dirs_len, sizeof (BuiltinDirRec)) ; ++ if (!dirs) ++ return NULL ; ++ ++ for (i=0; i < a_dirs_len; i++) { ++ int len = strlen (a_dirs[i].file_name) ; ++ dirs[i].file_name = xcalloc (1, len) ; ++ memmove (dirs[i].file_name, a_dirs[i].file_name, len); ++ len = strlen (a_dirs[i].font_name) ; ++ dirs[i].font_name = xcalloc (1, len) ; ++ memmove (dirs[i].font_name, a_dirs[i].font_name, len); ++ } ++ return dirs ; ++} ++ ++/** ++ * Copy a_save back into a_cur ++ * @param a_cur the instance of BuiltinDir to restore ++ * @param a_saved the saved instance of BuiltinDir to copy into a_cur ++ * @return 0 if went okay, 1 otherwise. ++ */ ++int ++BuiltinDirRestore (BuiltinDirPtr a_cur, ++ const BuiltinDirPtr a_saved) ++{ ++ if (!a_cur) ++ return 1 ; ++ if (!a_saved) ++ return 0 ; ++ ++ if (a_saved->font_name) ++ memmove (a_cur->font_name, a_saved->font_name, strlen (a_saved->font_name)) ; ++ return 0 ; ++} ++ ++ ++int ++BuiltinDirsRestore (BuiltinDirPtr a_cur_tab, ++ const BuiltinDirPtr a_saved_tab, ++ int a_tab_len) ++{ ++ int i=0 ; ++ ++ if (!a_cur_tab) ++ return 1 ; ++ if (!a_saved_tab) ++ return 0 ; ++ ++ for (i=0 ; i < a_tab_len; i++) { ++ if (BuiltinDirRestore (&a_cur_tab[i], &a_saved_tab[i])) ++ return 1 ; ++ } ++ return 0 ; ++} ++ ++BuiltinAliasPtr ++BuiltinAliasesDup (const BuiltinAliasPtr a_aliases, ++ int a_aliases_len) ++{ ++ BuiltinAliasPtr aliases=NULL ; ++ int i=0 ; ++ ++ if (!a_aliases) ++ return NULL ; ++ ++ aliases = xcalloc (a_aliases_len, sizeof (BuiltinAliasRec)) ; ++ if (!aliases) ++ return NULL ; ++ ++ for (i=0; i < a_aliases_len; i++) { ++ int len = strlen (a_aliases[i].font_name) ; ++ aliases[i].font_name = xcalloc (1, len) ; ++ memmove (aliases[i].font_name, a_aliases[i].font_name, len); ++ } ++ return aliases ; ++} ++ ++/** ++ * Copy a_save back into a_cur ++ * @param a_cur the instance of BuiltinAlias to restore ++ * @param a_saved the saved instance of BuiltinAlias to copy into a_cur ++ * @return 0 if went okay, 1 otherwise. ++ */ ++int ++BuiltinAliasRestore (BuiltinAliasPtr a_cur, ++ const BuiltinAliasPtr a_save) ++{ ++ if (!a_cur) ++ return 1 ; ++ if (!a_save) ++ return 0 ; ++ if (a_save->alias_name) ++ memmove (a_cur->alias_name, a_save->alias_name, strlen (a_save->alias_name)) ; ++ if (a_save->font_name) ++ memmove (a_cur->font_name, a_save->font_name, strlen (a_save->font_name)) ; ++ return 0 ; ++} ++ ++int ++BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab, ++ const BuiltinAliasPtr a_saved_tab, ++ int a_tab_len) ++{ ++ int i=0 ; ++ ++ if (!a_cur_tab) ++ return 1 ; ++ if (!a_saved_tab) ++ return 0 ; ++ ++ for (i=0 ; i < a_tab_len; i++) { ++ if (BuiltinAliasRestore (&a_cur_tab[i], &a_saved_tab[i])) ++ return 1 ; ++ } ++ return 0 ; ++} ++ + int + BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir) + { +@@ -36,6 +163,34 @@ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir) + int i; + + dir = FontFileMakeDir ("", builtin_dir_count); ++ static BuiltinDirPtr saved_builtin_dir ; ++ static BuiltinAliasPtr saved_builtin_alias ; ++ ++ ++ if (saved_builtin_dir) ++ { ++ BuiltinDirsRestore ((BuiltinDirPtr) builtin_dir, ++ saved_builtin_dir, ++ builtin_dir_count) ; ++ } ++ else ++ { ++ saved_builtin_dir = BuiltinDirsDup ((const BuiltinDirPtr) builtin_dir, ++ builtin_dir_count) ; ++ } ++ ++ if (saved_builtin_alias) ++ { ++ BuiltinAliasesRestore ((BuiltinAliasPtr) builtin_alias, ++ saved_builtin_alias, ++ builtin_alias_count) ; ++ } ++ else ++ { ++ saved_builtin_alias = BuiltinAliasesDup ((const BuiltinAliasPtr) builtin_alias, ++ builtin_alias_count) ; ++ } ++ + for (i = 0; i < builtin_dir_count; i++) + { + if (!FontFileAddFontFile (dir, diff --git a/packages/xorg-lib/libxfont_1.3.0.bb b/packages/xorg-lib/libxfont_1.3.0.bb new file mode 100644 index 0000000000..d452d9796d --- /dev/null +++ b/packages/xorg-lib/libxfont_1.3.0.bb @@ -0,0 +1,13 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 font rasterisation library" +LICENSE= "BSD-X" +DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" +PR = "r2" +PE = "1" + +SRC_URI += "file://no-scalable-crash.patch;patch=1 \ + file://builtinreaddirectory-no-side-effect.patch;patch=1" + +XORG_PN = "libXfont" diff --git a/packages/xorg-lib/libxfontcache_1.0.4.bb b/packages/xorg-lib/libxfontcache_1.0.4.bb index 1e45867950..ee999de4f5 100644 --- a/packages/xorg-lib/libxfontcache_1.0.4.bb +++ b/packages/xorg-lib/libxfontcache_1.0.4.bb @@ -1,9 +1,8 @@ require xorg-lib-common.inc -PE = "1" - -#DESCRIPTION = "" -DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto" +DESCRIPTION = "X-TrueType font cache extension client library" +DEPENDS += "libxext fontcacheproto" +PR = "r1" +PE = "1" XORG_PN = "libXfontcache" - diff --git a/packages/xorg-lib/libxft_2.1.12.bb b/packages/xorg-lib/libxft_2.1.12.bb new file mode 100644 index 0000000000..8e54dac01d --- /dev/null +++ b/packages/xorg-lib/libxft_2.1.12.bb @@ -0,0 +1,20 @@ +require xorg-lib-common.inc + +DESCRIPTION = "FreeType-based font drawing library for X" +DEPENDS += "libxrender freetype fontconfig" +PROVIDES = "xft" +PR = "r1" +PE = "1" + +XORG_PN = "libXft" + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.build.exec_func('package_do_package', d) +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir}" diff --git a/packages/xorg-lib/libxi_1.1.2.bb b/packages/xorg-lib/libxi_1.1.2.bb new file mode 100644 index 0000000000..31e3b4906d --- /dev/null +++ b/packages/xorg-lib/libxi_1.1.2.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Input extension library" +DEPENDS += "libxext inputproto" +PR = "r1" +PE = "1" + +XORG_PN = "libXi" diff --git a/packages/xorg-lib/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb index 9bfe62ae07..b7135bc28e 100644 --- a/packages/xorg-lib/libxinerama_1.0.2.bb +++ b/packages/xorg-lib/libxinerama_1.0.2.bb @@ -1,11 +1,9 @@ require xorg-lib-common.inc -DESCRIPTION = "Xinerama library" -PRIORITY = "optional" -PE = "1" - -DEPENDS += " virtual/libx11 libxext xextproto xineramaproto" +DESCRIPTION = "X11 Xinerama extension library" +DEPENDS += "libxext xineramaproto" PROVIDES = "xinerama" +PR = "r3" +PE = "1" XORG_PN = "libXinerama" - diff --git a/packages/xorg-lib/libxkbfile_1.0.4.bb b/packages/xorg-lib/libxkbfile_1.0.4.bb index 2d9b778d02..a404180d49 100644 --- a/packages/xorg-lib/libxkbfile_1.0.4.bb +++ b/packages/xorg-lib/libxkbfile_1.0.4.bb @@ -1,9 +1,7 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X11 keyboard library" +DESCRIPTION = "X11 keyboard file manipulation library" LICENSE= "GPL" -PRIORITY = "optional" - -DEPENDS += " virtual/libx11 kbproto" - +DEPENDS += "virtual/libx11 kbproto" +PR = "r1" +PE = "1" diff --git a/packages/xorg-lib/libxkbui_1.0.2.bb b/packages/xorg-lib/libxkbui_1.0.2.bb new file mode 100644 index 0000000000..9a3f5f1327 --- /dev/null +++ b/packages/xorg-lib/libxkbui_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 keyboard UI presentation library" +LICENSE= "GPL" +DEPENDS += "virtual/libx11 libxt libxkbfile" +PROVIDES = "xkbui" +PR = "r1" +PE = "1" diff --git a/packages/xorg-lib/libxmu_1.0.3.bb b/packages/xorg-lib/libxmu_1.0.3.bb index e055874b3d..9a02bf82be 100644 --- a/packages/xorg-lib/libxmu_1.0.3.bb +++ b/packages/xorg-lib/libxmu_1.0.3.bb @@ -1,17 +1,16 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Window System miscellaneous utility library" -PRIORITY = "optional" -DEPENDS += " libxt libxext xextproto virtual/libx11" +DESCRIPTION = "X11 miscellaneous utility library" +DEPENDS += "libxt libxext" PROVIDES = "xmu" +PR = "r1" +PE = "1" XORG_PN = "libXmu" +LEAD_SONAME = "libXmu" + PACKAGES =+ "libxmuu libxmuu-dev" FILES_libxmuu = "${libdir}/libXmuu.so.*" FILES_libxmuu-dev = "${libdir}/libXmuu.so" - -LEAD_SONAME = "libXmu" diff --git a/packages/xorg-lib/libxp_1.0.0.bb b/packages/xorg-lib/libxp_1.0.0.bb new file mode 100644 index 0000000000..53fb47c054 --- /dev/null +++ b/packages/xorg-lib/libxp_1.0.0.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Printing Extension (Xprint) client library" +DEPENDS += "libxext libxau printproto" +PR = "r1" +PE = "1" + +XORG_PN = "libXp" + +CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" diff --git a/packages/xorg-lib/libxpm_3.5.6.bb b/packages/xorg-lib/libxpm_3.5.6.bb index 60779da43f..4e0a6eaacd 100644 --- a/packages/xorg-lib/libxpm_3.5.6.bb +++ b/packages/xorg-lib/libxpm_3.5.6.bb @@ -1,11 +1,10 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X Pixmap library." -PRIORITY = "optional" +DESCRIPTION = "X11 Pixmap library" LICENSE = "X-BSD" - -DEPENDS += " xproto virtual/libx11 libxt libxext xextproto" +DEPENDS += "libxt libxext" +PR = "r1" +PE = "1" XORG_PN = "libXpm" diff --git a/packages/xorg-lib/libxprintapputil_1.0.1.bb b/packages/xorg-lib/libxprintapputil_1.0.1.bb new file mode 100644 index 0000000000..3a24a888d1 --- /dev/null +++ b/packages/xorg-lib/libxprintapputil_1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Xprint job utility client library" +DEPENDS += "libxp libxt libxprintutil" +PR = "r1" +PE = "1" + +XORG_PN = "libXprintAppUtil" diff --git a/packages/xorg-lib/libxprintutil_1.0.1.bb b/packages/xorg-lib/libxprintutil_1.0.1.bb new file mode 100644 index 0000000000..327138e7fd --- /dev/null +++ b/packages/xorg-lib/libxprintutil_1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Xprint printer utility client library" +DEPENDS += "libxp libxt" +PR = "r1" +PE = "1" + +XORG_PN = "libXprintUtil" diff --git a/packages/xorg-lib/libxrandr_1.2.1.bb b/packages/xorg-lib/libxrandr_1.2.1.bb index 18e5deffb8..cf2a73a72c 100644 --- a/packages/xorg-lib/libxrandr_1.2.1.bb +++ b/packages/xorg-lib/libxrandr_1.2.1.bb @@ -1,10 +1,9 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X Resize and Rotate extension library." +DESCRIPTION = "X11 Resize and Rotate extension library" LICENSE = "BSD-X" - -DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto" +DEPENDS += "randrproto libxrender" +PR = "r1" +PE = "1" XORG_PN = "libXrandr" - diff --git a/packages/xorg-lib/libxrender_0.9.2.bb b/packages/xorg-lib/libxrender_0.9.2.bb index b1372d3dac..f8b9c37b50 100644 --- a/packages/xorg-lib/libxrender_0.9.2.bb +++ b/packages/xorg-lib/libxrender_0.9.2.bb @@ -1,10 +1,9 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X Render extension library." +DESCRIPTION = "X11 Rendering Extension client library" LICENSE = "BSD-X" - -DEPENDS += " virtual/libx11 renderproto" +DEPENDS += "virtual/libx11 renderproto xproto" +PR = "r1" +PE = "1" XORG_PN = "libXrender" - diff --git a/packages/xorg-lib/libxres_1.0.3.bb b/packages/xorg-lib/libxres_1.0.3.bb index b9d2fd68ce..02a0cae0d8 100644 --- a/packages/xorg-lib/libxres_1.0.3.bb +++ b/packages/xorg-lib/libxres_1.0.3.bb @@ -1,9 +1,8 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Resource usage library." -DEPENDS += " virtual/libx11 libxext xextproto resourceproto" +DESCRIPTION = "X11 Resource extension library" +DEPENDS += "libxext resourceproto" +PR = "r1" +PE = "1" XORG_PN = "libXres" - diff --git a/packages/xorg-lib/libxscrnsaver_1.1.2.bb b/packages/xorg-lib/libxscrnsaver_1.1.2.bb index 163ca199c1..ff22c337a0 100644 --- a/packages/xorg-lib/libxscrnsaver_1.1.2.bb +++ b/packages/xorg-lib/libxscrnsaver_1.1.2.bb @@ -1,14 +1,11 @@ require xorg-lib-common.inc -PE = "1" -DESCRIPTION = "X screen saver extension library." +DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" - -DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto" - -XORG_PN = "libXScrnSaver" - +DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" RREPLACES = "libxss" +PR = "r1" +PE = "1" -#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" +XORG_PN = "libXScrnSaver" diff --git a/packages/xorg-lib/libxt_1.0.5.bb b/packages/xorg-lib/libxt_1.0.5.bb index e67590bdf1..5b25c4b3a5 100644 --- a/packages/xorg-lib/libxt_1.0.5.bb +++ b/packages/xorg-lib/libxt_1.0.5.bb @@ -1,15 +1,14 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Toolkit Intrinsics" -PRIORITY = "optional" -DEPENDS += " libsm virtual/libx11 xproto kbproto" +DESCRIPTION = "X11 toolkit intrinsics library" +DEPENDS += "libsm virtual/libx11 kbproto" PROVIDES = "xt" +PR = "r1" +PE = "1" XORG_PN = "libXt" -EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" +EXTRA_OECONF += "--disable-install-makestrs --disable-xkb" do_compile() { ( diff --git a/packages/xorg-lib/libxtrap_1.0.0.bb b/packages/xorg-lib/libxtrap_1.0.0.bb new file mode 100644 index 0000000000..7a25ae5bce --- /dev/null +++ b/packages/xorg-lib/libxtrap_1.0.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 event trapping extension library" +DEPENDS += "libxt trapproto libxext" +PR = "r1" +PE = "1" + +XORG_PN = "libXTrap" diff --git a/packages/xorg-lib/libxtst_1.0.2.bb b/packages/xorg-lib/libxtst_1.0.2.bb new file mode 100644 index 0000000000..14e10ff285 --- /dev/null +++ b/packages/xorg-lib/libxtst_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Test Extension: client side library" +DEPENDS += "libxext recordproto inputproto" +PROVIDES = "xtst" +PR = "r1" +PE = "1" + +XORG_PN = "libXtst" diff --git a/packages/xorg-lib/libxv_1.0.3.bb b/packages/xorg-lib/libxv_1.0.3.bb index 0d045940e3..6014326e90 100644 --- a/packages/xorg-lib/libxv_1.0.3.bb +++ b/packages/xorg-lib/libxv_1.0.3.bb @@ -1,9 +1,8 @@ require xorg-lib-common.inc -DESCRIPTION = "X Video extension library." +DESCRIPTION = "X11 Video extension library" LICENSE = "GPL" - -DEPENDS += " virtual/libx11 libxext xextproto videoproto" +DEPENDS += "libxext videoproto" +PR = "r1" XORG_PN = "libXv" - diff --git a/packages/xorg-lib/libxvmc_1.0.4.bb b/packages/xorg-lib/libxvmc_1.0.4.bb index 54aaa895ff..64943ce9bd 100644 --- a/packages/xorg-lib/libxvmc_1.0.4.bb +++ b/packages/xorg-lib/libxvmc_1.0.4.bb @@ -1,9 +1,8 @@ require xorg-lib-common.inc -PE = "1" - -DESCRIPTION = "X Video Motion Compensation extension library." -DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto" +DESCRIPTION = "X Video Motion Compensation extension library" +DEPENDS += "libxext libxv videoproto" +PR = "r1" +PE = "1" XORG_PN = "libXvMC" - diff --git a/packages/xorg-lib/libxxf86dga_1.0.1.bb b/packages/xorg-lib/libxxf86dga_1.0.1.bb new file mode 100644 index 0000000000..47492d7108 --- /dev/null +++ b/packages/xorg-lib/libxxf86dga_1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Direct Graphics Access extension library" +DEPENDS += "libxext xf86dgaproto" +PR = "r1" +PE = "1" + +XORG_PN = "libXxf86dga" diff --git a/packages/xorg-lib/libxxf86misc_1.0.1.bb b/packages/xorg-lib/libxxf86misc_1.0.1.bb new file mode 100644 index 0000000000..d1f8719cde --- /dev/null +++ b/packages/xorg-lib/libxxf86misc_1.0.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 XFree86 miscellaneous extension library" +DEPENDS += "libxext xf86miscproto" +PROVIDES = "xxf86misc" +PR = "r1" +PE = "1" + +XORG_PN = "libXxf86misc" diff --git a/packages/xorg-lib/libxxf86vm_1.0.1.bb b/packages/xorg-lib/libxxf86vm_1.0.1.bb new file mode 100644 index 0000000000..efb90d4854 --- /dev/null +++ b/packages/xorg-lib/libxxf86vm_1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 XFree86 video mode extension library" +DEPENDS += "libxext xf86vidmodeproto" +PR = "r1" +PE = "1" + +XORG_PN = "libXxf86vm" diff --git a/packages/xorg-lib/xorg-headers-native.bb b/packages/xorg-lib/xorg-headers-native.bb index f88bcc7aee..82d5d79415 100644 --- a/packages/xorg-lib/xorg-headers-native.bb +++ b/packages/xorg-lib/xorg-headers-native.bb @@ -6,4 +6,3 @@ do_stage() { install -d ${STAGING_INCDIR} cp -pPfR ${WORKDIR}/X11 ${STAGING_INCDIR} } - diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc index b1c1153bf4..130f8d1755 100644 --- a/packages/xorg-lib/xorg-lib-common.inc +++ b/packages/xorg-lib/xorg-lib-common.inc @@ -1,12 +1,12 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/libs" LICENSE = "MIT-X" - DEPENDS = "util-macros xorg-headers-native" + XORG_PN = "${PN}" -XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" -SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2 \ -" + +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" + S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig @@ -14,5 +14,5 @@ inherit autotools pkgconfig EXTRA_OECONF = "--enable-malloc0returnsnull" do_stage() { - autotools_stage_all + autotools_stage_all } diff --git a/packages/xorg-lib/xtrans-native_1.0.3.bb b/packages/xorg-lib/xtrans-native_1.0.3.bb new file mode 100644 index 0000000000..722d7e15e7 --- /dev/null +++ b/packages/xorg-lib/xtrans-native_1.0.3.bb @@ -0,0 +1,10 @@ +require xtrans_${PV}.bb + +DEPENDS = "util-macros-native" +PE = "1" + +XORG_PN = "xtrans" + +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" + +inherit native diff --git a/packages/xorg-lib/xtrans_1.0.3.bb b/packages/xorg-lib/xtrans_1.0.3.bb index e32509a5c4..42cf655a3f 100644 --- a/packages/xorg-lib/xtrans_1.0.3.bb +++ b/packages/xorg-lib/xtrans_1.0.3.bb @@ -1,9 +1,7 @@ require xorg-lib-common.inc + +DESCRIPTION = "network API translation layer to insulate X applications and \ +libraries from OS network vageries." PE = "1" SRC_URI += "file://fix-missing-includepath.patch;patch=1" - -DESCRIPTION = "network API translation layer to \ -insulate X applications and libraries from OS \ -network vageries." - diff --git a/packages/xorg-proto/applewmproto_1.0.3.bb b/packages/xorg-proto/applewmproto_1.0.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/applewmproto_1.0.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/bigreqsproto-native_1.0.2.bb b/packages/xorg-proto/bigreqsproto-native_1.0.2.bb new file mode 100644 index 0000000000..e86417195d --- /dev/null +++ b/packages/xorg-proto/bigreqsproto-native_1.0.2.bb @@ -0,0 +1,7 @@ +require bigreqsproto_${PV}.bb + +PR = "r1" + +XORG_PN = "bigreqsproto" + +inherit native diff --git a/packages/xorg-proto/bigreqsproto_1.0.2.bb b/packages/xorg-proto/bigreqsproto_1.0.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/bigreqsproto_1.0.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/calibrateproto/.mtn2git_empty b/packages/xorg-proto/calibrateproto/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-proto/calibrateproto/.mtn2git_empty diff --git a/packages/xorg-proto/calibrateproto/coords.patch b/packages/xorg-proto/calibrateproto/coords.patch new file mode 100644 index 0000000000..8f44b029c5 --- /dev/null +++ b/packages/xorg-proto/calibrateproto/coords.patch @@ -0,0 +1,56 @@ +--- + xcalibrateproto.h | 25 +++++++++++++++++++++++++ + xcalibratewire.h | 3 ++- + 2 files changed, 27 insertions(+), 1 deletion(-) + +Index: XCalibrateExt/xcalibrateproto.h +=================================================================== +--- XCalibrateExt.orig/xcalibrateproto.h 2004-06-02 20:18:47.000000000 +0100 ++++ XCalibrateExt/xcalibrateproto.h 2007-06-30 14:17:29.000000000 +0100 +@@ -78,6 +78,31 @@ typedef struct { + + #define sz_xXCalibrateRawModeReply 32 + ++typedef struct { ++ CARD8 reqType; ++ CARD8 xCalibrateReqType; ++ CARD16 length B16; ++ CARD32 x B32; ++ CARD32 y B32; ++} xXCalibrateScreenToCoordReq; ++ ++#define sz_xXCalibrateScreenToCoordReq 12 ++ ++typedef struct { ++ BYTE type; /* X_Reply */ ++ BYTE pad1; ++ CARD16 sequenceNumber B16; ++ CARD32 x; ++ CARD32 y; ++ CARD32 pad2 B32; ++ CARD32 pad3 B32; ++ CARD32 pad4 B32; ++ CARD32 pad5 B32; ++ CARD32 pad6 B32; ++} xXCalibrateScreenToCoordReply; ++ ++#define sz_xXCalibrateScreenToCoordReply 32 ++ + /* Events */ + + typedef struct { +Index: XCalibrateExt/xcalibratewire.h +=================================================================== +--- XCalibrateExt.orig/xcalibratewire.h 2004-06-02 20:18:47.000000000 +0100 ++++ XCalibrateExt/xcalibratewire.h 2007-06-30 14:17:29.000000000 +0100 +@@ -31,8 +31,9 @@ + + #define X_XCalibrateQueryVersion 0 + #define X_XCalibrateRawMode 1 ++#define X_XCalibrateScreenToCoord 2 + +-#define XCalibrateNumberRequests (X_XCalibrateSetRawMode + 1) ++#define XCalibrateNumberRequests (X_XCalibrateScreenToCoord + 1) + + #define X_XCalibrateRawTouchscreen 0 + diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb index bc407badb4..60308601b9 100644 --- a/packages/xorg-proto/calibrateproto_git.bb +++ b/packages/xorg-proto/calibrateproto_git.bb @@ -1,9 +1,11 @@ require xorg-proto-common.inc -DESCRIPTION = " Touchscreen calibration protocol" +DESCRIPTION = "Touchscreen calibration protocol" -PV = "0.0+gita1d5ef0c73fbef3e758c51b57ac69ba9567bae04" +PV = "0.0+git${SRCDATE}" +PR = "r1" -SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04" -S = "${WORKDIR}/git" +SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04 \ + file://coords.patch;patch=1" +S = "${WORKDIR}/git" diff --git a/packages/xorg-proto/compositeproto_0.4.bb b/packages/xorg-proto/compositeproto_0.4.bb new file mode 100644 index 0000000000..f74413c551 --- /dev/null +++ b/packages/xorg-proto/compositeproto_0.4.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +CONFLICTS = "compositeext" +PE = "1" diff --git a/packages/xorg-proto/damageproto_1.1.0.bb b/packages/xorg-proto/damageproto_1.1.0.bb index ae54c06a64..202ec2874f 100644 --- a/packages/xorg-proto/damageproto_1.1.0.bb +++ b/packages/xorg-proto/damageproto_1.1.0.bb @@ -1,8 +1,5 @@ require xorg-proto-common.inc -PE = "1" - -#DESCRIPTION = "" - -#DEPENDS += " " CONFLICTS = "damageext" +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/dmxproto_2.2.2.bb b/packages/xorg-proto/dmxproto_2.2.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/dmxproto_2.2.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/evieext_1.0.2.bb b/packages/xorg-proto/evieext_1.0.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/evieext_1.0.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/fixesproto_4.0.bb b/packages/xorg-proto/fixesproto_4.0.bb new file mode 100644 index 0000000000..1bc36e00da --- /dev/null +++ b/packages/xorg-proto/fixesproto_4.0.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "fixesext" +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/fontcacheproto-native_0.1.2.bb b/packages/xorg-proto/fontcacheproto-native_0.1.2.bb new file mode 100644 index 0000000000..f6df67f59e --- /dev/null +++ b/packages/xorg-proto/fontcacheproto-native_0.1.2.bb @@ -0,0 +1,7 @@ +require fontcacheproto_${PV}.bb + +PR = "r1" + +XORG_PN = "fontcacheproto" + +inherit native diff --git a/packages/xorg-proto/fontcacheproto_0.1.2.bb b/packages/xorg-proto/fontcacheproto_0.1.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/fontcacheproto_0.1.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/fontsproto-native_2.0.2.bb b/packages/xorg-proto/fontsproto-native_2.0.2.bb new file mode 100644 index 0000000000..4371a07836 --- /dev/null +++ b/packages/xorg-proto/fontsproto-native_2.0.2.bb @@ -0,0 +1,9 @@ +require fontsproto_${PV}.bb + +PR = "r1" + +XORG_PN = "fontsproto" + +S = "${WORKDIR}/fontsproto-${PV}" + +inherit native diff --git a/packages/xorg-proto/fontsproto_2.0.2.bb b/packages/xorg-proto/fontsproto_2.0.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/fontsproto_2.0.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/glproto_1.4.8.bb b/packages/xorg-proto/glproto_1.4.8.bb index 7a4888d489..9f09fff7b7 100644 --- a/packages/xorg-proto/glproto_1.4.8.bb +++ b/packages/xorg-proto/glproto_1.4.8.bb @@ -1,6 +1,4 @@ require xorg-proto-common.inc -PE="1" -#DESCRIPTION = "" - -#DEPENDS += " " +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/inputproto-native_1.4.2.bb b/packages/xorg-proto/inputproto-native_1.4.2.bb new file mode 100644 index 0000000000..11e0dae601 --- /dev/null +++ b/packages/xorg-proto/inputproto-native_1.4.2.bb @@ -0,0 +1,7 @@ +require inputproto_${PV}.bb + +PR = "r1" + +XORG_PN = "inputproto" + +inherit native diff --git a/packages/xorg-proto/inputproto_1.4.2.bb b/packages/xorg-proto/inputproto_1.4.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/inputproto_1.4.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/kbproto-native_1.0.3.bb b/packages/xorg-proto/kbproto-native_1.0.3.bb new file mode 100644 index 0000000000..68c677c07b --- /dev/null +++ b/packages/xorg-proto/kbproto-native_1.0.3.bb @@ -0,0 +1,7 @@ +require kbproto_${PV}.bb + +PR = "r1" + +XORG_PN = "kbproto" + +inherit native diff --git a/packages/xorg-proto/kbproto_1.0.3.bb b/packages/xorg-proto/kbproto_1.0.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/kbproto_1.0.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/printproto_1.0.3.bb b/packages/xorg-proto/printproto_1.0.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/printproto_1.0.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/randrproto_1.2.1.bb b/packages/xorg-proto/randrproto_1.2.1.bb index 1116da8f93..eb8c7e0147 100644 --- a/packages/xorg-proto/randrproto_1.2.1.bb +++ b/packages/xorg-proto/randrproto_1.2.1.bb @@ -1,8 +1,5 @@ require xorg-proto-common.inc -PE = "1" - -#DESCRIPTION = "" - -#DEPENDS += " " CONFLICTS = "randrext" +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/recordproto_1.13.2.bb b/packages/xorg-proto/recordproto_1.13.2.bb new file mode 100644 index 0000000000..af63403600 --- /dev/null +++ b/packages/xorg-proto/recordproto_1.13.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "recordext" +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/renderproto_0.9.2.bb b/packages/xorg-proto/renderproto_0.9.2.bb new file mode 100644 index 0000000000..39f4b66be7 --- /dev/null +++ b/packages/xorg-proto/renderproto_0.9.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "renderext" +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/resourceproto_1.0.2.bb b/packages/xorg-proto/resourceproto_1.0.2.bb new file mode 100644 index 0000000000..1fb8aa7f12 --- /dev/null +++ b/packages/xorg-proto/resourceproto_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "resourceext" +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/scrnsaverproto_1.1.0.bb b/packages/xorg-proto/scrnsaverproto_1.1.0.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/scrnsaverproto_1.1.0.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/trapproto_3.4.3.bb b/packages/xorg-proto/trapproto_3.4.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/trapproto_3.4.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/videoproto_2.2.2.bb b/packages/xorg-proto/videoproto_2.2.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/videoproto_2.2.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/windowswmproto_1.0.3.bb b/packages/xorg-proto/windowswmproto_1.0.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/windowswmproto_1.0.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xcmiscproto-native_1.1.2.bb b/packages/xorg-proto/xcmiscproto-native_1.1.2.bb new file mode 100644 index 0000000000..417a2aaf13 --- /dev/null +++ b/packages/xorg-proto/xcmiscproto-native_1.1.2.bb @@ -0,0 +1,7 @@ +require xcmiscproto_${PV}.bb + +PR = "r1" + +XORG_PN = "xcmiscproto" + +inherit native diff --git a/packages/xorg-proto/xcmiscproto_1.1.2.bb b/packages/xorg-proto/xcmiscproto_1.1.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/xcmiscproto_1.1.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xextproto-native_7.0.2.bb b/packages/xorg-proto/xextproto-native_7.0.2.bb new file mode 100644 index 0000000000..ff2bc4ffd3 --- /dev/null +++ b/packages/xorg-proto/xextproto-native_7.0.2.bb @@ -0,0 +1,7 @@ +require xextproto_${PV}.bb + +PR = "r1" + +XORG_PN = "xextproto" + +inherit native diff --git a/packages/xorg-proto/xextproto_7.0.2.bb b/packages/xorg-proto/xextproto_7.0.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/xextproto_7.0.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb b/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb new file mode 100644 index 0000000000..b0ac594997 --- /dev/null +++ b/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb @@ -0,0 +1,7 @@ +require xf86bigfontproto_${PV}.bb + +PR = "r1" + +XORG_PN = "xf86bigfontproto" + +inherit native diff --git a/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_1.1.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/xf86bigfontproto_1.1.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xf86dgaproto_2.0.2.bb b/packages/xorg-proto/xf86dgaproto_2.0.2.bb new file mode 100644 index 0000000000..2e0e734858 --- /dev/null +++ b/packages/xorg-proto/xf86dgaproto_2.0.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "xxf86dgaext" +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xf86driproto_2.0.3.bb b/packages/xorg-proto/xf86driproto_2.0.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/xf86driproto_2.0.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xf86miscproto_0.9.2.bb b/packages/xorg-proto/xf86miscproto_0.9.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/xf86miscproto_0.9.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xf86rushproto_1.1.2.bb b/packages/xorg-proto/xf86rushproto_1.1.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/xf86rushproto_1.1.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb new file mode 100644 index 0000000000..946be11407 --- /dev/null +++ b/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "xxf86vmext" +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xineramaproto_1.1.2.bb b/packages/xorg-proto/xineramaproto_1.1.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/packages/xorg-proto/xineramaproto_1.1.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc index 1dc4f12fc7..248bbc7e11 100644 --- a/packages/xorg-proto/xorg-proto-common.inc +++ b/packages/xorg-proto/xorg-proto-common.inc @@ -1,16 +1,16 @@ -DESCRIPTION = "X protocol headers" +DESCRIPTION = "X protocol headers: ${XORG_PN}" HOMEPAGE = "http://www.x.org" SECTION = "x11/libs" LICENSE = "MIT-X" -#DEPENDS = "" XORG_PN = "${PN}" -XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" -SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/proto/${XORG_PN}-${PV}.tar.bz2" + +SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2" + S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig do_stage() { - autotools_stage_all + autotools_stage_all } diff --git a/packages/xorg-proto/xproto-native_7.0.10.bb b/packages/xorg-proto/xproto-native_7.0.10.bb index 12a58b5a0a..88ed38e93c 100644 --- a/packages/xorg-proto/xproto-native_7.0.10.bb +++ b/packages/xorg-proto/xproto-native_7.0.10.bb @@ -1,9 +1,7 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" -PE = "1" +require xproto_${PV}.bb -SRC_URI = "${XORG_MIRROR}/individual/proto/xproto-${PV}.tar.bz2" -S = "${WORKDIR}/xproto-${PV}" +PR = "r1" -inherit native autotools pkgconfig +XORG_PN = "xproto" + +inherit native diff --git a/packages/xorg-proto/xproto_7.0.10.bb b/packages/xorg-proto/xproto_7.0.10.bb index 3f598df1bb..9f09fff7b7 100644 --- a/packages/xorg-proto/xproto_7.0.10.bb +++ b/packages/xorg-proto/xproto_7.0.10.bb @@ -1,6 +1,4 @@ require xorg-proto-common.inc -PE = "1" - -#DESCRIPTION = "" -#DEPENDS += " " +PR = "r1" +PE = "1" diff --git a/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb new file mode 100644 index 0000000000..9c3d9efa71 --- /dev/null +++ b/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +PROVIDES="xproxymngproto" +PR = "r1" +PE = "1" diff --git a/packages/xorg-util/gccmakedep_1.0.2.bb b/packages/xorg-util/gccmakedep_1.0.2.bb new file mode 100644 index 0000000000..3abfa037a2 --- /dev/null +++ b/packages/xorg-util/gccmakedep_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-util-common.inc + +DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" +RDEPENDS = "gcc" + +PR = "r2" +PE = "1" diff --git a/packages/xorg-util/imake_1.0.2.bb b/packages/xorg-util/imake_1.0.2.bb new file mode 100644 index 0000000000..deeb4477a1 --- /dev/null +++ b/packages/xorg-util/imake_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-util-common.inc + +DESCRIPTION = "C preprocessor interface to the make utility" +RDEPENDS = "perl xproto" + +PR = "r1" +PE = "1" diff --git a/packages/xorg-util/lndir_1.0.1.bb b/packages/xorg-util/lndir_1.0.1.bb new file mode 100644 index 0000000000..34309a6487 --- /dev/null +++ b/packages/xorg-util/lndir_1.0.1.bb @@ -0,0 +1,5 @@ +require xorg-util-common.inc + +DESCRIPTION = "create a shadow directory of symbolic links to another directory tree" +PR = "r1" +PE = "1" diff --git a/packages/xorg-util/makedepend-native_1.0.1.bb b/packages/xorg-util/makedepend-native_1.0.1.bb new file mode 100644 index 0000000000..554270e6e4 --- /dev/null +++ b/packages/xorg-util/makedepend-native_1.0.1.bb @@ -0,0 +1,8 @@ +require xorg-util-common.inc +inherit native + +DESCRIPTION = "create dependencies in makefiles" +PR = "r1" +PE = "1" + +XORG_PN = "makedepend" diff --git a/packages/xorg-util/makedepend_1.0.1.bb b/packages/xorg-util/makedepend_1.0.1.bb new file mode 100644 index 0000000000..3605b51d49 --- /dev/null +++ b/packages/xorg-util/makedepend_1.0.1.bb @@ -0,0 +1,5 @@ +require xorg-util-common.inc + +DESCRIPTION = "create dependencies in makefiles" +PR = "r1" +PE = "1" diff --git a/packages/xorg-util/util-macros-native_1.1.5.bb b/packages/xorg-util/util-macros-native_1.1.5.bb new file mode 100644 index 0000000000..c327f3f54e --- /dev/null +++ b/packages/xorg-util/util-macros-native_1.1.5.bb @@ -0,0 +1,9 @@ +require util-macros_${PV}.bb + +inherit native + +PR = "r1" + +XORG_PN = "util-macros" + +S = "${WORKDIR}/util-macros-1.1.5" diff --git a/packages/xorg-util/util-macros_1.1.5.bb b/packages/xorg-util/util-macros_1.1.5.bb new file mode 100644 index 0000000000..22634bffd2 --- /dev/null +++ b/packages/xorg-util/util-macros_1.1.5.bb @@ -0,0 +1,7 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" +PR = "r1" +PE = "1" + +SRC_URI += "file://unbreak_cross_compile.patch;patch=1" diff --git a/packages/xorg-util/xorg-cf-files_1.0.2.bb b/packages/xorg-util/xorg-cf-files_1.0.2.bb new file mode 100644 index 0000000000..7c3fb8d7e9 --- /dev/null +++ b/packages/xorg-util/xorg-cf-files_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-util-common.inc + +DESCRIPTION = "X Window System CF files" + +PR = "r1" +PE = "1" + +FILES_${PN} += " /usr/lib/X11/config" diff --git a/packages/xorg-util/xorg-util-common.inc b/packages/xorg-util/xorg-util-common.inc index f6e9c65b78..56aae30725 100644 --- a/packages/xorg-util/xorg-util-common.inc +++ b/packages/xorg-util/xorg-util-common.inc @@ -2,13 +2,14 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/utils" 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.bz2" + +SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz" + S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig do_stage() { - autotools_stage_all + autotools_stage_all } diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 7bcd483c24..b45f3eeac6 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -2,54 +2,34 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/base" LICENSE = "MIT-X" -RPROVIDES_${PN} = "virtual/xserver" PROVIDES = "virtual/xserver" -MESA_VER ?= "6.5" - -DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ -xf86driproto libdrm glproto randrproto renderproto fixesproto damageproto \ +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 mkfontscale-native" +libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" -RDEPENDS_${PN} = "rgb" +REPENDS="rgb" XORG_PN = "xorg-server" -XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" -SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/xserver/${XORG_PN}-${PV}.tar.bz2 \ - ${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${MESA_VER}.tar.bz2 \ +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 -EXTRA_OECONF = "--disable-builddocs --with-mesa-source=${WORKDIR}/Mesa-${MESA_VER}" - -PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xnest ${PN}-dmx" +PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils" -FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print ${bindir}/Xprt" +FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" FILES_${PN}-xvfb = "${bindir}/Xvfb" -FILES_${PN}-xnest = "${bindir}/Xnest" -FILES_${PN}-dmx = "${bindir}/Xdmx ${bindir}/dmx* ${bindir}/xdmxconfig ${bindir}/xdmx ${bindir}/vdltodmx" 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}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so /etc/X11" +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" -FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug ${libdir}/xorg/modules/*/.debug" -FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" - -PACKAGES =+ "${PN}-multimedia ${PN}-configtools" - -FILES_${PN}-multimedia = "${libdir}/xorg/modules/multimedia/*.so" -FILES_${PN}-configtools = "${bindir}/xorgconfig ${bindir}/xorgcfg" - -do_configure_prepend() { - sed -i -e s:/usr/include/drm:${STAGING_INCDIR}/drm:g hw/xfree86/os-support/linux/Makefile.am -} do_stage() { autotools_stage_all @@ -57,5 +37,5 @@ do_stage() { do_install_append () { install -d ${D}/etc/X11 - install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/ + install -m0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/ } diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch new file mode 100644 index 0000000000..e0cca5428b --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/xcalibrate_coords.patch @@ -0,0 +1,122 @@ +--- + Xext/xcalibrate.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- + hw/kdrive/src/kdrive.h | 3 +++ + hw/kdrive/src/kinput.c | 12 ++++++++++++ + 3 files changed, 61 insertions(+), 1 deletion(-) + +Index: xorg-server-1.3.0.0/Xext/xcalibrate.c +=================================================================== +--- xorg-server-1.3.0.0.orig/Xext/xcalibrate.c 2007-06-29 17:30:03.000000000 +0100 ++++ xorg-server-1.3.0.0/Xext/xcalibrate.c 2007-06-30 14:04:40.000000000 +0100 +@@ -166,7 +166,6 @@ ProcXCalibrateSetRawMode (ClientPtr clie + return (client->noClientException); + } + +- + static int + SProcXCalibrateSetRawMode (ClientPtr client) + { +@@ -180,6 +179,47 @@ SProcXCalibrateSetRawMode (ClientPtr cli + return ProcXCalibrateSetRawMode(client); + } + ++static int ++ProcXCalibrateScreenToCoord (ClientPtr client) ++{ ++ REQUEST(xXCalibrateScreenToCoordReq); ++ xXCalibrateScreenToCoordReply rep; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq); ++ ++ memset (&rep, 0, sizeof (rep)); ++ rep.type = X_Reply; ++ rep.sequenceNumber = client->sequence; ++ rep.x = stuff->x; ++ rep.y = stuff->y; ++ ++ KdScreenToMouseCoords(&rep.x, &rep.y); ++ ++ if (client->swapped) ++ { ++ int n; ++ ++ swaps (&rep.x, n); ++ swaps (&rep.y, n); ++ } ++ WriteToClient(client, sizeof (rep), (char *) &rep); ++ return (client->noClientException); ++} ++ ++static int ++SProcXCalibrateScreenToCoord (ClientPtr client) ++{ ++ REQUEST(xXCalibrateScreenToCoordReq); ++ int n; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq); ++ ++ swaps(&stuff->x, n); ++ swaps(&stuff->y, n); ++ ++ return ProcXCalibrateScreenToCoord(client); ++} ++ + static void + XCalibrateResetProc (ExtensionEntry *extEntry) + { +@@ -194,6 +234,9 @@ ProcXCalibrateDispatch (ClientPtr client + return ProcXCalibrateQueryVersion(client); + case X_XCalibrateRawMode: + return ProcXCalibrateSetRawMode(client); ++ case X_XCalibrateScreenToCoord: ++ return ProcXCalibrateScreenToCoord(client); ++ + default: break; + } + +@@ -213,6 +256,8 @@ SProcXCalibrateDispatch (ClientPtr clien + return SProcXCalibrateQueryVersion(client); + case X_XCalibrateRawMode: + return SProcXCalibrateSetRawMode(client); ++ case X_XCalibrateScreenToCoord: ++ return SProcXCalibrateScreenToCoord(client); + + default: break; + } +Index: xorg-server-1.3.0.0/hw/kdrive/src/kdrive.h +=================================================================== +--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kdrive.h 2007-06-30 13:43:45.000000000 +0100 ++++ xorg-server-1.3.0.0/hw/kdrive/src/kdrive.h 2007-06-30 13:45:03.000000000 +0100 +@@ -746,6 +746,9 @@ void + KdSetMouseMatrix (KdMouseMatrix *matrix); + + void ++KdScreenToMouseCoords (int *x, int *y); ++ ++void + KdComputeMouseMatrix (KdMouseMatrix *matrix, Rotation randr, int width, int height); + + void +Index: xorg-server-1.3.0.0/hw/kdrive/src/kinput.c +=================================================================== +--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kinput.c 2007-06-29 17:30:16.000000000 +0100 ++++ xorg-server-1.3.0.0/hw/kdrive/src/kinput.c 2007-06-30 15:52:16.000000000 +0100 +@@ -381,6 +381,18 @@ KdSetMouseMatrix (KdMouseMatrix *matrix) + } + + void ++KdScreenToMouseCoords (int *x, int *y) ++{ ++ int (*m)[3] = kdMouseMatrix.matrix; ++ int div = m[0][1] * m[1][0] - m[1][1] * m[0][0]; ++ int sx = *x; ++ int sy = *y; ++ ++ *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div; ++ *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div; ++} ++ ++void + KdComputeMouseMatrix (KdMouseMatrix *m, Rotation randr, int width, int height) + { + int x_dir = 1, y_dir = 1; diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 02df9d2d4e..e46abe3fe8 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -1,9 +1,8 @@ LICENSE = "MIT" -DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto scrnsaverproto videoproto xextproto xproto \ - libxau libxext libxdmcp libxfont libxrandr tslib virtual/libsdl virtual/libx11 xtrans" +DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto scrnsaverproto xineramaproto videoproto xextproto xproto \ + libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans" PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" PACKAGES =+ "xserver-kdrive-fbdev \ xserver-kdrive-sdl \ xserver-kdrive-fake \ @@ -106,7 +105,9 @@ KDRIVE_COMMON_PATCHES = " \ SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" +SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "${MACHINE_ARCH}" +PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}" inherit autotools pkgconfig @@ -118,7 +119,11 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx ${W100_OECONF} ${IMAGEON_OECONF} \ + --disable-dmx \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" + +do_configure_prepend() { + sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac +} diff --git a/packages/xorg-xserver/xserver-kdrive-xomap/calibrateext.patch b/packages/xorg-xserver/xserver-kdrive-xomap/calibrateext.patch index df5bbe2abf..c5997c2ffa 100644 --- a/packages/xorg-xserver/xserver-kdrive-xomap/calibrateext.patch +++ b/packages/xorg-xserver/xserver-kdrive-xomap/calibrateext.patch @@ -5,19 +5,6 @@ 2 files changed, 39 insertions(+), 31 deletions(-) -Index: xorg-server-1.1.99.3/configure.ac -=================================================================== ---- xorg-server-1.1.99.3.orig/configure.ac 2007-01-30 00:22:41.000000000 +0000 -+++ xorg-server-1.1.99.3/configure.ac 2007-01-30 00:22:41.000000000 +0000 -@@ -717,7 +717,7 @@ fi - - if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then - AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) -- REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" -+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext" - else - XCALIBRATE=no - fi Index: xorg-server-1.1.99.3/hw/kdrive/linux/tslib.c =================================================================== --- xorg-server-1.1.99.3.orig/hw/kdrive/linux/tslib.c 2007-01-30 00:44:13.000000000 +0000 diff --git a/packages/xorg-xserver/xserver-kdrive-xomap/xcalibrate_coords.patch b/packages/xorg-xserver/xserver-kdrive-xomap/xcalibrate_coords.patch new file mode 100644 index 0000000000..fbe89b16b1 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-xomap/xcalibrate_coords.patch @@ -0,0 +1,122 @@ +--- + Xext/xcalibrate.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- + hw/kdrive/src/kdrive.h | 3 +++ + hw/kdrive/src/kinput.c | 12 ++++++++++++ + 3 files changed, 61 insertions(+), 1 deletion(-) + +Index: xorg-server-1.1.99.3/Xext/xcalibrate.c +=================================================================== +--- xorg-server-1.1.99.3.orig/Xext/xcalibrate.c 2007-06-30 16:27:13.000000000 +0100 ++++ xorg-server-1.1.99.3/Xext/xcalibrate.c 2007-06-30 16:27:15.000000000 +0100 +@@ -166,7 +166,6 @@ ProcXCalibrateSetRawMode (ClientPtr clie + return (client->noClientException); + } + +- + static int + SProcXCalibrateSetRawMode (ClientPtr client) + { +@@ -180,6 +179,47 @@ SProcXCalibrateSetRawMode (ClientPtr cli + return ProcXCalibrateSetRawMode(client); + } + ++static int ++ProcXCalibrateScreenToCoord (ClientPtr client) ++{ ++ REQUEST(xXCalibrateScreenToCoordReq); ++ xXCalibrateScreenToCoordReply rep; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq); ++ ++ memset (&rep, 0, sizeof (rep)); ++ rep.type = X_Reply; ++ rep.sequenceNumber = client->sequence; ++ rep.x = stuff->x; ++ rep.y = stuff->y; ++ ++ KdScreenToMouseCoords(&rep.x, &rep.y); ++ ++ if (client->swapped) ++ { ++ int n; ++ ++ swaps (&rep.x, n); ++ swaps (&rep.y, n); ++ } ++ WriteToClient(client, sizeof (rep), (char *) &rep); ++ return (client->noClientException); ++} ++ ++static int ++SProcXCalibrateScreenToCoord (ClientPtr client) ++{ ++ REQUEST(xXCalibrateScreenToCoordReq); ++ int n; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq); ++ ++ swaps(&stuff->x, n); ++ swaps(&stuff->y, n); ++ ++ return ProcXCalibrateScreenToCoord(client); ++} ++ + static void + XCalibrateResetProc (ExtensionEntry *extEntry) + { +@@ -194,6 +234,9 @@ ProcXCalibrateDispatch (ClientPtr client + return ProcXCalibrateQueryVersion(client); + case X_XCalibrateRawMode: + return ProcXCalibrateSetRawMode(client); ++ case X_XCalibrateScreenToCoord: ++ return ProcXCalibrateScreenToCoord(client); ++ + default: break; + } + +@@ -213,6 +256,8 @@ SProcXCalibrateDispatch (ClientPtr clien + return SProcXCalibrateQueryVersion(client); + case X_XCalibrateRawMode: + return SProcXCalibrateSetRawMode(client); ++ case X_XCalibrateScreenToCoord: ++ return SProcXCalibrateScreenToCoord(client); + + default: break; + } +Index: xorg-server-1.1.99.3/hw/kdrive/src/kdrive.h +=================================================================== +--- xorg-server-1.1.99.3.orig/hw/kdrive/src/kdrive.h 2007-06-30 16:27:13.000000000 +0100 ++++ xorg-server-1.1.99.3/hw/kdrive/src/kdrive.h 2007-06-30 16:30:40.000000000 +0100 +@@ -851,6 +851,9 @@ void + KdSetPointerMatrix (KdPointerMatrix *pointer); + + void ++KdScreenToMouseCoords (int *x, int *y); ++ ++void + KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height); + + void +Index: xorg-server-1.1.99.3/hw/kdrive/src/kinput.c +=================================================================== +--- xorg-server-1.1.99.3.orig/hw/kdrive/src/kinput.c 2007-06-30 16:27:14.000000000 +0100 ++++ xorg-server-1.1.99.3/hw/kdrive/src/kinput.c 2007-06-30 16:30:16.000000000 +0100 +@@ -570,6 +570,18 @@ KdSetPointerMatrix (KdPointerMatrix *mat + } + + void ++KdScreenToMouseCoords (int *x, int *y) ++{ ++ int (*m)[3] = kdPointerMatrix.matrix; ++ int div = m[0][1] * m[1][0] - m[1][1] * m[0][0]; ++ int sx = *x; ++ int sy = *y; ++ ++ *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div; ++ *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div; ++} ++ ++void + KdComputePointerMatrix (KdPointerMatrix *m, Rotation randr, int width, + int height) + { diff --git a/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb new file mode 100644 index 0000000000..372971e2ed --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb @@ -0,0 +1,51 @@ +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto calibrateproto recordproto videoproto scrnsaverproto xpext xsp libxkbfile dbus" + +PROVIDES = "virtual/xserver" +PACKAGES =+ "xserver-kdrive-xomap" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800" + +PE = "1" + +COMPATIBLE_MACHINE = "nokia(800|770)" + +FILES_${PN} = "${libdir}/xserver /etc/dbus-1/* ${bindir}/Xomap" + +SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/xorg-server_1.1.99.3-0osso31.tar.gz \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://xcalibrate.patch;patch=1 \ + file://fixups.patch;patch=1 \ + file://button_only.patch;patch=1 \ + file://calibrateext.patch;patch=1 \ + file://xcalibrate_coords.patch;patch=1" +# file://kdrive-evdev.patch;patch=1 \ +# file://kdrive-use-evdev.patch;patch=1 \ +# file://optional-xkb.patch;patch=1 \ +# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ +# file://enable-tslib.patch;patch=1 \ +# file://xfbdev-fb-opt.patch;patch=1" + +S = "${WORKDIR}/xorg-server-1.1.99.3" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --enable-kdrive --enable-builtin-fonts \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-dmx --enable-xcalibrate \ + --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 \ + --enable-xomap" + +do_configure_prepend() { + sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac +} diff --git a/packages/xorg-xserver/xserver-kdrive/devfs.patch b/packages/xorg-xserver/xserver-kdrive/devfs.patch new file mode 100644 index 0000000000..a6238126c0 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/devfs.patch @@ -0,0 +1,47 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- xserver/hw/kdrive/linux/linux.c~devfs ++++ xserver/hw/kdrive/linux/linux.c +@@ -82,10 +82,10 @@ + vtno = kdVirtualTerminal; + else + { +- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0) ++ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0) + { + FatalError( +- "LinuxInit: Cannot open /dev/tty0 (%s)\n", ++ "LinuxInit: Cannot open /dev/tty/0 (%s)\n", + strerror(errno)); + } + if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || +@@ -96,7 +96,7 @@ + } + close(fd); + +- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */ ++ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */ + + if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0) + { +@@ -113,7 +113,7 @@ + * + * Why is this needed? + */ +- LinuxCheckChown ("/dev/tty0"); ++ LinuxCheckChown ("/dev/vc/0"); + /* + * Linux doesn't switch to an active vt after the last close of a vt, + * so we do this ourselves by remembering which is active now. +@@ -453,7 +453,7 @@ + activeVT = -1; + } + close(LinuxConsoleFd); /* make the vt-manager happy */ +- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0); ++ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0); + if (fd >= 0) + { + memset (&vts, '\0', sizeof (vts)); /* valgrind */ diff --git a/packages/xorg-xserver/xserver-kdrive/hide-cursor-and-ppm-root.patch b/packages/xorg-xserver/xserver-kdrive/hide-cursor-and-ppm-root.patch new file mode 100644 index 0000000000..c160cd41dc --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/hide-cursor-and-ppm-root.patch @@ -0,0 +1,307 @@ +diff -u -r xorg-server-X11R7.1-1.1.0.orig/dix/window.c xorg-server-X11R7.1-1.1.0/dix/window.c +--- xorg-server-X11R7.1-1.1.0.orig/dix/window.c 2007-01-08 14:30:38.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/dix/window.c 2007-01-16 17:16:19.000000000 +0000 +@@ -185,6 +185,8 @@ + _X_EXPORT int numSaveUndersViewable = 0; + _X_EXPORT int deltaSaveUndersViewable = 0; + ++char* RootPPM = NULL; ++ + #ifdef DEBUG + /****** + * PrintWindowTree +@@ -311,6 +313,115 @@ + #endif + } + ++static int ++get_int(FILE *fp) ++{ ++ int c = 0; ++ ++ while ((c = getc(fp)) != EOF) ++ { ++ if (isspace(c)) ++ continue; ++ ++ if (c == '#') ++ while (c = getc(fp)) ++ if (c == EOF) ++ return 0; ++ else if (c == '\n') ++ break; ++ ++ if (isdigit(c)) ++ { ++ int val = c - '0'; ++ while ((c = getc(fp)) && isdigit(c)) ++ val = (val * 10) + (c - '0'); ++ return val; ++ } ++ } ++ ++ return 0; ++} ++ ++static unsigned char* ++ppm_load (const char* path, int depth, int *width, int *height) ++{ ++ FILE *fp; ++ int max, n = 0, w, h, i, j, bytes_per_line; ++ unsigned char *data, *res, h1, h2; ++ ++ if (depth < 16 || depth > 32) ++ return NULL; ++ ++ if (depth > 16) ++ depth = 32; ++ ++ fp = fopen (path, "r"); ++ if (fp == NULL) ++ return FALSE; ++ ++ h1 = getc(fp); ++ h2 = getc(fp); ++ ++ /* magic is 'P6' for raw ppm */ ++ if (h1 != 'P' && h2 != '6') ++ goto fail; ++ ++ w = get_int(fp); ++ h = get_int(fp); ++ ++ if (w == 0 || h == 0) ++ goto fail; ++ ++ max = get_int(fp); ++ ++ if (max != 255) ++ goto fail; ++ ++ bytes_per_line = ((w * depth + 31) >> 5) << 2; ++ ++ res = data = malloc(bytes_per_line * h); ++ ++ for (i=0; i<h; i++) ++ { ++ for (j=0; j<w; j++) ++ { ++ unsigned char buf[3]; ++ fread(buf, 1, 3, fp); ++ ++ switch (depth) ++ { ++ case 24: ++ case 32: ++ *data = buf[2]; ++ *(data+1) = buf[1]; ++ *(data+2) = buf[0]; ++ data += 4; ++ break; ++ case 16: ++ default: ++ *(unsigned short*)data ++ = ((buf[0] >> 3) << 11) | ((buf[1] >> 2) << 5) | (buf[2] >> 3); ++ data += 2; ++ break; ++ } ++ } ++ data += (bytes_per_line - (w*(depth>>3))); ++ } ++ ++ data = res; ++ ++ *width = w; ++ *height = h; ++ ++ fclose(fp); ++ ++ return res; ++ ++ fail: ++ fclose(fp); ++ return NULL; ++} ++ + static void + MakeRootTile(WindowPtr pWin) + { +@@ -321,6 +432,36 @@ + register unsigned char *from, *to; + register int i, j; + ++ if (RootPPM != NULL) ++ { ++ int w, h; ++ unsigned char *data; ++ ++ if ((data = ppm_load (RootPPM, pScreen->rootDepth, &w, &h)) != NULL) ++ { ++ pWin->background.pixmap ++ = (*pScreen->CreatePixmap)(pScreen, w, h, pScreen->rootDepth); ++ ++ pWin->backgroundState = BackgroundPixmap; ++ pGC = GetScratchGC(pScreen->rootDepth, pScreen); ++ if (!pWin->background.pixmap || !pGC) ++ FatalError("could not create root tile"); ++ ++ ValidateGC((DrawablePtr)pWin->background.pixmap, pGC); ++ ++ (*pGC->ops->PutImage)((DrawablePtr)pWin->background.pixmap, ++ pGC, ++ pScreen->rootDepth, ++ 0, 0, w, h, 0, ZPixmap, (char *)data); ++ FreeScratchGC(pGC); ++ ++ free(data); ++ return; ++ } ++ else ++ ErrorF("Unable to load root window image."); ++ } ++ + pWin->background.pixmap = (*pScreen->CreatePixmap)(pScreen, 4, 4, + pScreen->rootDepth); + +@@ -357,6 +498,7 @@ + + } + ++ + WindowPtr + AllocateWindow(ScreenPtr pScreen) + { +diff -u -r xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kdrive.c xorg-server-X11R7.1-1.1.0/hw/kdrive/src/kdrive.c +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/src/kdrive.c 2007-01-08 14:30:38.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/src/kdrive.c 2007-01-15 17:53:06.000000000 +0000 +@@ -58,6 +58,9 @@ + { 32, 32 } + }; + ++int ++ProcXFixesHideCursor (ClientPtr client) ; ++ + #define NUM_KD_DEPTHS (sizeof (kdDepths) / sizeof (kdDepths[0])) + + int kdScreenPrivateIndex; +@@ -84,6 +87,9 @@ + KdOsFuncs *kdOsFuncs; + extern WindowPtr *WindowTable; + ++extern Bool CursorInitiallyHidden; /* See Xfixes cursor.c */ ++extern char* RootPPM; /* dix/window.c */ ++ + void + KdSetRootClip (ScreenPtr pScreen, BOOL enable) + { +@@ -312,6 +318,7 @@ + KdSetRootClip (pScreen, TRUE); + if (pScreenPriv->card->cfuncs->dpms) + (*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState); ++ + return TRUE; + } + +@@ -686,10 +693,14 @@ + ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n"); + ErrorF("-switchCmd Command to execute on vt switch\n"); + ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n"); ++ ErrorF("-hide-cursor Start with cursor hidden\n"); ++ ErrorF("-root-ppm [path] Specify ppm file to use as root window background.\n"); + ErrorF("vtxx Use virtual terminal xx instead of the next available\n"); + #ifdef PSEUDO8 + p8UseMsg (); + #endif ++ ++ + } + + int +@@ -761,6 +772,19 @@ + kdSoftCursor = TRUE; + return 1; + } ++ if (!strcmp (argv[i], "-hide-cursor")) ++ { ++ CursorInitiallyHidden = TRUE; ++ return 1; ++ } ++ if (!strcmp (argv[i], "-root-ppm")) ++ { ++ if ((i+1) < argc) ++ RootPPM = argv[i+1]; ++ else ++ UseMsg (); ++ return 2; ++ } + if (!strcmp (argv[i], "-videoTest")) + { + kdVideoTest = TRUE; +diff -u -r xorg-server-X11R7.1-1.1.0.orig/xfixes/cursor.c xorg-server-X11R7.1-1.1.0/xfixes/cursor.c +--- xorg-server-X11R7.1-1.1.0.orig/xfixes/cursor.c 2007-01-08 14:30:38.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/xfixes/cursor.c 2007-01-11 16:33:00.000000000 +0000 +@@ -59,9 +59,12 @@ + static RESTYPE CursorWindowType; + static int CursorScreenPrivateIndex = -1; + static int CursorGeneration; ++static Bool CursorGloballyHidden; + static CursorPtr CursorCurrent; + static CursorPtr pInvisibleCursor = NULL; + ++Bool CursorInitiallyHidden = FALSE; ++ + static void deleteCursorHideCountsForScreen (ScreenPtr pScreen); + + #define VERIFY_CURSOR(pCursor, cursor, client, access) { \ +@@ -130,7 +133,7 @@ + + Unwrap (cs, pScreen, DisplayCursor); + +- if (cs->pCursorHideCounts != NULL) { ++ if (cs->pCursorHideCounts != NULL || CursorGloballyHidden) { + ret = (*pScreen->DisplayCursor) (pScreen, pInvisibleCursor); + } else { + ret = (*pScreen->DisplayCursor) (pScreen, pCursor); +@@ -848,6 +851,12 @@ + return BadWindow; + } + ++ /* Is cursor set to be initially hidden ?, if so reset this ++ * flag as now visibility assumed under control of client. ++ */ ++ if (CursorGloballyHidden) ++ CursorGloballyHidden = FALSE; ++ + /* + * Has client hidden the cursor before on this screen? + * If so, just increment the count. +@@ -899,9 +908,19 @@ + return BadWindow; + } + ++ /* X was started with cursor hidden, therefore just reset our flag ++ * (returning to normal client control) and cause cursor to now be ++ * shown. ++ */ ++ if (CursorGloballyHidden == TRUE) ++ { ++ CursorGloballyHidden = FALSE; ++ return (client->noClientException); ++ } ++ + /* + * Has client hidden the cursor on this screen? +- * If not, generate an error. ++ * If so, generate an error. + */ + pChc = findCursorHideCount(client, pWin->drawable.pScreen); + if (pChc == NULL) { +@@ -1009,6 +1028,8 @@ + XFixesCursorInit (void) + { + int i; ++ ++ CursorGloballyHidden = CursorInitiallyHidden; + + if (CursorGeneration != serverGeneration) + { diff --git a/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch b/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch new file mode 100644 index 0000000000..a8f002ea2a --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch @@ -0,0 +1,82 @@ +--- + hw/kdrive/fbdev/fbdev.c | 17 ++++++++++++----- + hw/kdrive/fbdev/fbdev.h | 1 + + hw/kdrive/fbdev/fbinit.c | 20 ++++++++++++++++---- + 3 files changed, 29 insertions(+), 9 deletions(-) + +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.c ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbdev.c +@@ -33,16 +33,23 @@ + + extern int KdTsPhyScreen; + ++char *fbdevDevicePath = NULL; + Bool + fbdevInitialize (KdCardInfo *card, FbdevPriv *priv) + { + int k; + unsigned long off; +- if ((priv->fd = open("/dev/fb0", O_RDWR)) < 0 && \ +- (priv->fd = open("/dev/fb/0", O_RDWR)) < 0) { +- perror("Error opening /dev/fb0"); +- return FALSE; +- } ++ ++ if (fbdevDevicePath == NULL) ++ fbdevDevicePath = "/dev/fb0"; ++ ++ if ((priv->fd = open(fbdevDevicePath, O_RDWR)) < 0) ++ { ++ ErrorF("Error opening framebuffer %s: %s\n", ++ fbdevDevicePath, strerror(errno)); ++ return FALSE; ++ } ++ + /* quiet valgrind */ + memset (&priv->fix, '\0', sizeof (priv->fix)); + if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0) { +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.h ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbdev.h +@@ -53,6 +53,7 @@ typedef struct _fbdevScrPriv { + } FbdevScrPriv; + + extern KdCardFuncs fbdevFuncs; ++extern char* fbdevDevicePath; + + Bool + fbdevInitialize (KdCardInfo *card, FbdevPriv *priv); +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbinit.c ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbinit.c +@@ -59,16 +59,28 @@ InitInput (int argc, char **argv) + void + ddxUseMsg (void) + { +- KdUseMsg(); ++ KdUseMsg(); ++ ErrorF("\nXfbdev Device Usage:\n"); ++ ErrorF("-fb path Framebuffer device to use. Defaults to /dev/fb0\n"); ++ ErrorF("\n"); + } + + int + ddxProcessArgument (int argc, char **argv, int i) + { +- return KdProcessArgument (argc, argv, i); +-} +- ++ if (!strcmp (argv[i], "-fb")) ++ { ++ if (i+1 < argc) ++ { ++ fbdevDevicePath = argv[i+1]; ++ return 2; ++ } ++ UseMsg(); ++ exit(1); ++ } + ++ return KdProcessArgument (argc, argv, i); ++} + + KdCardFuncs fbdevFuncs = { + fbdevCardInit, /* cardinit */ diff --git a/packages/xorg-xserver/xserver-kdrive_1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_1.1.0.bb new file mode 100644 index 0000000000..bd54518105 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_1.1.0.bb @@ -0,0 +1,60 @@ +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto calibrateproto recordproto videoproto scrnsaverproto" + +PROVIDES = "virtual/xserver" +# RPROVIDES = "virtual/xserver" +PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr" +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" + +PE = "1" + +FILES_${PN} = "${libdir}/xserver" +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +RDEPENDS_xserver-kdrive-fbdev = "${PN}" +RDEPENDS_xserver-kdrive-fake = "${PN}" +RDEPENDS_xserver-kdrive-xephyr = "${PN}" + +SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-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 \ + file://xfbdev-fb-opt.patch;patch=1 \ + file://hide-cursor-and-ppm-root.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + +S = "${WORKDIR}/xorg-server-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" + +do_configure_prepend() { + sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac +} diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 8c6db70987..f1be1420dc 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -1,17 +1,15 @@ require xserver-kdrive-common.inc -# it's missing the xw100 patch -DEFAULT_PREFERENCE = "-1" - DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r0" +PR = "r15" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ file://fix_default_mode.patch;patch=1 \ file://enable-xcalibrate.patch;patch=1 \ - file://hide-cursor-and-ppm-root.patch;patch=1" + file://hide-cursor-and-ppm-root.patch;patch=1 \ + file://xcalibrate_coords.patch;patch=1" S = "${WORKDIR}/xorg-server-${PV}" diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 74d0aed432..74323cd320 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,18 +1,48 @@ +PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" -require xserver-kdrive-common.inc +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto calibrateproto recordproto videoproto scrnsaverproto" -DEPENDS += "libxkbfile libxcalibrate" +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" -PE = "1" -PV = "1.2.0+git${SRCDATE}" -PR = "r8" +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 \ - ${KDRIVE_COMMON_PATCHES} \ - file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ - file://build-fix-panoramix.patch;patch=1 \ - " + 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/packages/xorg-xserver/xserver-xorg/no-screen-blanking.patch b/packages/xorg-xserver/xserver-xorg/no-screen-blanking.patch new file mode 100644 index 0000000000..021ba6cded --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg/no-screen-blanking.patch @@ -0,0 +1,13 @@ +--- xserver/include/site.h-orig 2006-11-02 10:37:14.000000000 +0000 ++++ xserver/include/site.h 2006-11-02 10:37:14.000000000 +0000 +@@ -117,8 +117,8 @@ + #define DEFAULT_PTR_DENOMINATOR 1 + #define DEFAULT_PTR_THRESHOLD 4 + +-#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000)) +-#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000)) ++#define DEFAULT_SCREEN_SAVER_TIME 0 ++#define DEFAULT_SCREEN_SAVER_INTERVAL 0 + #define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking + #define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures + #ifndef NOLOGOHACK diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb index 08b965bb75..78fdc01b46 100644 --- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb @@ -5,6 +5,8 @@ PE = "1" EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " +export LDFLAGS += " -ldl " + #DESCRIPTION = "" #DEPENDS += " " diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index 08b965bb75..78fdc01b46 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -5,6 +5,8 @@ PE = "1" EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " +export LDFLAGS += " -ldl " + #DESCRIPTION = "" #DEPENDS += " " |