diff options
Diffstat (limited to 'packages/xorg-lib')
61 files changed, 13 insertions, 670 deletions
diff --git a/packages/xorg-lib/diet-x11/.mtn2git_empty b/packages/xorg-lib/diet-x11/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/diet-x11/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/diet-x11/autofoo.patch b/packages/xorg-lib/diet-x11/autofoo.patch deleted file mode 100644 index 8bdba09768..0000000000 --- a/packages/xorg-lib/diet-x11/autofoo.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-6.2.1/configure.ac~autofoo -+++ libX11-6.2.1/configure.ac -@@ -7,12 +7,12 @@ - [jg@freedesktop.org], - libX11) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_INIT_AUTOMAKE([dist-bzip2]) -+AC_CONFIG_AUX_DIR(.) - -+AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([src/config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/diet-x11/makekeys.diff b/packages/xorg-lib/diet-x11/makekeys.diff deleted file mode 100644 index cea08725ec..0000000000 --- a/packages/xorg-lib/diet-x11/makekeys.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru libX11-X11R7.1-1.0.1.org/src/util/makekeys.c libX11-X11R7.1-1.0.1/src/util/makekeys.c ---- libX11-X11R7.1-1.0.1.org/src/util/makekeys.c 2007-03-08 14:34:34.000000000 +0100 -+++ libX11-X11R7.1-1.0.1/src/util/makekeys.c 2007-03-08 14:34:58.000000000 +0100 -@@ -49,7 +49,7 @@ - KeySym val; - } info[KTNUM]; - --#define MIN_REHASH 10 -+#define MIN_REHASH 15 - #define MATCHES 10 - - char tab[KTNUM]; diff --git a/packages/xorg-lib/diet-x11_1.1.1.bb b/packages/xorg-lib/diet-x11_1.1.1.bb index 8dc3174a16..4219b0c997 100644 --- a/packages/xorg-lib/diet-x11_1.1.1.bb +++ b/packages/xorg-lib/diet-x11_1.1.1.bb @@ -4,6 +4,8 @@ require libx11_${PV}.bb EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb" CFLAGS += "-D_GNU_SOURCE" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ file://fix-disable-xlocale.diff;patch=1 \ file://fix-utf8-wrong-define.patch;patch=1 \ diff --git a/packages/xorg-lib/diet-x11_1.1.2.bb b/packages/xorg-lib/diet-x11_1.1.2.bb index f032987b88..2dbd458ec7 100644 --- a/packages/xorg-lib/diet-x11_1.1.2.bb +++ b/packages/xorg-lib/diet-x11_1.1.2.bb @@ -4,5 +4,7 @@ SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ file://fix-disable-xlocale.diff;patch=1 \ file://fix-utf8-wrong-define.patch;patch=1" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/xorg-lib/diet-x11_1.1.3.bb b/packages/xorg-lib/diet-x11_1.1.3.bb index f032987b88..2dbd458ec7 100644 --- a/packages/xorg-lib/diet-x11_1.1.3.bb +++ b/packages/xorg-lib/diet-x11_1.1.3.bb @@ -4,5 +4,7 @@ SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ file://fix-disable-xlocale.diff;patch=1 \ file://fix-utf8-wrong-define.patch;patch=1" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/xorg-lib/files/.mtn2git_empty b/packages/xorg-lib/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/files/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch deleted file mode 100644 index f43d38065e..0000000000 --- a/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/files/fix-utf8-wrong-define.patch b/packages/xorg-lib/files/fix-utf8-wrong-define.patch deleted file mode 100644 index dca88fba92..0000000000 --- a/packages/xorg-lib/files/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define -+++ libX11-6.2.1/include/X11/Xlib.h -@@ -100,7 +100,7 @@ - - /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in - November 2000. Its presence is indicated through the following macro. */ --#define X_HAVE_UTF8_STRING 1 -+#undef X_HAVE_UTF8_STRING - - typedef char *XPointer; - diff --git a/packages/xorg-lib/libice/.mtn2git_empty b/packages/xorg-lib/libice/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libice/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libice/autofoo.patch b/packages/xorg-lib/libice/autofoo.patch deleted file mode 100644 index 8ab0585fb8..0000000000 --- a/packages/xorg-lib/libice/autofoo.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libICE-6.3.3/configure.ac~autofoo 2004-05-11 01:50:07.000000000 -0400 -+++ libICE-6.3.3/configure.ac 2005-01-18 02:30:07.463895544 -0500 -@@ -8,12 +8,12 @@ - libICE) - - AC_CONFIG_SRCDIR([Makefile.am]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch deleted file mode 100644 index afa34712e2..0000000000 --- a/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ruN liblbxutil-X11R7.0-1.0.0_orig/configure.ac liblbxutil-X11R7.0-1.0.0/configure.ac ---- liblbxutil-X11R7.0-1.0.0_orig/configure.ac 2005-12-15 00:24:36.000000000 +0000 -+++ liblbxutil-X11R7.0-1.0.0/configure.ac 2006-08-21 18:32:04.000000000 +0000 -@@ -60,4 +60,5 @@ - - AC_OUTPUT([Makefile - src/Makefile -+ src/image/Makefile - lbxutil.pc]) -diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am liblbxutil-X11R7.0-1.0.0/src/Makefile.am ---- liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am 2005-10-16 02:07:10.000000000 +0000 -+++ liblbxutil-X11R7.0-1.0.0/src/Makefile.am 2006-08-21 18:32:04.000000000 +0000 -@@ -1,9 +1,6 @@ - lib_LTLIBRARIES = liblbxutil.la - --noinst_PROGRAMS = mkg3states -- --mkg3states_SOURCES = \ -- $(srcdir)/image/mkg3states.c -+SUBDIRS = image - - liblbxutil_la_SOURCES = \ - $(srcdir)/lbx_zlib/reqstats.h \ -@@ -28,9 +25,8 @@ - - $(srcdir)/image/dfaxg42d.c: g3states.h - --g3states.h: mkg3states -- -rm -f g3states.h -- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h -+g3states.h: image/mkg3states -+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h - - liblbxutil_la_LDFLAGS = -version-number 1:0:0 - -diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am ---- liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am 1970-01-01 00:00:00.000000000 +0000 -+++ liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am 2006-08-21 18:32:04.000000000 +0000 -@@ -0,0 +1,15 @@ -+# evil hack -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) -+ -+CC=$(CC_FOR_BUILD) -+LIBTOOL = @LIBTOOL@ --tag=CC -+ -+noinst_PROGRAMS = mkg3states -+ -+mkg3states_SOURCES = \ -+ mkg3states.c -+ -+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) -+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) diff --git a/packages/xorg-lib/libsm/.mtn2git_empty b/packages/xorg-lib/libsm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libsm/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libsm/autofoo.patch b/packages/xorg-lib/libsm/autofoo.patch deleted file mode 100644 index 8cb204a66e..0000000000 --- a/packages/xorg-lib/libsm/autofoo.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libSM-6.0.3/configure.ac~autofoo 2004-05-11 01:51:21.000000000 -0400 -+++ libSM-6.0.3/configure.ac 2005-01-18 12:15:50.405356376 -0500 -@@ -8,12 +8,12 @@ - libSM) - - AC_CONFIG_SRCDIR([Makefile.am]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/diet-x11/X18NCMSstubs.diff b/packages/xorg-lib/libx11/X18NCMSstubs.diff index 54b1727a95..54b1727a95 100644 --- a/packages/xorg-lib/diet-x11/X18NCMSstubs.diff +++ b/packages/xorg-lib/libx11/X18NCMSstubs.diff diff --git a/packages/xorg-lib/libx11/autofoo.patch b/packages/xorg-lib/libx11/autofoo.patch deleted file mode 100644 index 8bdba09768..0000000000 --- a/packages/xorg-lib/libx11/autofoo.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-6.2.1/configure.ac~autofoo -+++ libX11-6.2.1/configure.ac -@@ -7,12 +7,12 @@ - [jg@freedesktop.org], - libX11) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_INIT_AUTOMAKE([dist-bzip2]) -+AC_CONFIG_AUX_DIR(.) - -+AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([src/config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff b/packages/xorg-lib/libx11/fix-disable-xlocale.diff index 9dbf6dac68..9dbf6dac68 100644 --- a/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff +++ b/packages/xorg-lib/libx11/fix-disable-xlocale.diff diff --git a/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch b/packages/xorg-lib/libx11/fix-utf8-wrong-define.patch index a098db1941..a098db1941 100644 --- a/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch +++ b/packages/xorg-lib/libx11/fix-utf8-wrong-define.patch diff --git a/packages/xorg-lib/files/ruutf8.patch b/packages/xorg-lib/libx11/ruutf8.patch index 0822b30cb8..0822b30cb8 100644 --- a/packages/xorg-lib/files/ruutf8.patch +++ b/packages/xorg-lib/libx11/ruutf8.patch diff --git a/packages/xorg-lib/diet-x11/xchar2b.patch b/packages/xorg-lib/libx11/xchar2b.patch index 31da58fa5c..31da58fa5c 100644 --- a/packages/xorg-lib/diet-x11/xchar2b.patch +++ b/packages/xorg-lib/libx11/xchar2b.patch diff --git a/packages/xorg-lib/diet-x11/xim.patch b/packages/xorg-lib/libx11/xim.patch index 0eab197a80..0eab197a80 100644 --- a/packages/xorg-lib/diet-x11/xim.patch +++ b/packages/xorg-lib/libx11/xim.patch diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index 7ac5b58345..5b1e304d51 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -1,23 +1,18 @@ require xorg-lib-common.inc PE = "1" -PR = "r4" +PR = "r5" DESCRIPTION = "Base X libs." - DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxcb libxdmcp xf86bigfontproto kbproto inputproto" + libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" XORG_PN = "libX11" -PACKAGES =+ "libx11-xcb" +EXTRA_OECONF += "--without-xcb" SRC_URI += " file://ruutf8.patch;patch=1" -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" -FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*" - do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS @@ -27,3 +22,5 @@ do_compile() { 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/libxau/.mtn2git_empty b/packages/xorg-lib/libxau/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxau/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxau/autofoo.patch b/packages/xorg-lib/libxau/autofoo.patch deleted file mode 100644 index 1e42eb974d..0000000000 --- a/packages/xorg-lib/libxau/autofoo.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libXau-0.1.1/configure.ac~autofoo -+++ libXau-0.1.1/configure.ac -@@ -25,11 +25,10 @@ - - AC_PREREQ([2.57]) - AC_INIT(libXau, [0.1.1], [keithp@keithp.com],libXau) --AM_INIT_AUTOMAKE([dist-bzip2]) --AM_MAINTAINER_MODE -- - AM_CONFIG_HEADER(config.h) - AC_CONFIG_AUX_DIR(.) -+AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_MAINTAINER_MODE - - AC_PROG_CC - AC_PROG_INSTALL diff --git a/packages/xorg-lib/libxaw/.mtn2git_empty b/packages/xorg-lib/libxaw/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxaw/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxaw/auxdir.patch b/packages/xorg-lib/libxaw/auxdir.patch deleted file mode 100644 index 4226ab6a4d..0000000000 --- a/packages/xorg-lib/libxaw/auxdir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/configure.ac 2005-06-17 21:26:17.519157272 +0200 -+++ libXaw-7.0.2/configure.ac 2005-06-17 21:26:34.832525240 +0200 -@@ -10,7 +10,6 @@ - AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xorg-lib/libxcalibrate/.mtn2git_empty b/packages/xorg-lib/libxcalibrate/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxcalibrate/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxcalibrate/coords.patch b/packages/xorg-lib/libxcalibrate/coords.patch deleted file mode 100644 index 19cf1639f6..0000000000 --- a/packages/xorg-lib/libxcalibrate/coords.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- - 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 99f11e40fd..24b4a1f067 100644 --- a/packages/xorg-lib/libxcalibrate_git.bb +++ b/packages/xorg-lib/libxcalibrate_git.bb @@ -3,11 +3,9 @@ require xorg-lib-common.inc DESCRIPTION = " Touchscreen calibration client library" LICENSE = "BSD-X" DEPENDS = "virtual/libx11 calibrateproto libxext" -PV = "0.0+git${SRCDATE}" -PR = "r2" +PV = "0.0+git${SRCREV}" -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" S = "${WORKDIR}/git" diff --git a/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty b/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch b/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch deleted file mode 100644 index 072cf25214..0000000000 --- a/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libXcomposite-1.0.1/configure.ac -=================================================================== ---- libXcomposite-1.0.1.orig/configure.ac 2004-01-15 03:59:12.000000000 -0500 -+++ libXcomposite-1.0.1/configure.ac 2005-01-18 17:05:25.573929256 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXcomposite, 1.0.1, [keithp@keithp.com], libXcomposite) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty b/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch b/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch deleted file mode 100644 index 99cd45a7ea..0000000000 --- a/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXcursor-1.1.2/configure.ac~autofoo 2004-01-16 23:38:26.000000000 -0500 -+++ libXcursor-1.1.2/configure.ac 2005-01-18 13:40:06.539707120 -0500 -@@ -31,11 +31,11 @@ - dnl not possible to extract the version number here from Xcursor.h - dnl - AC_INIT([libXcursor],1.1.2,[keithp@keithp.com],[libXcursor]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AC_CONFIG_SRCDIR([Makefile.am]) - AM_MAINTAINER_MODE - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - dnl libtool versioning - diff --git a/packages/xorg-lib/libxcursor/.mtn2git_empty b/packages/xorg-lib/libxcursor/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxcursor/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxcursor/autofoo.patch b/packages/xorg-lib/libxcursor/autofoo.patch deleted file mode 100644 index 7aa573ce13..0000000000 --- a/packages/xorg-lib/libxcursor/autofoo.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: Xcursor/configure.ac -=================================================================== ---- Xcursor.orig/configure.ac 2004-04-12 10:11:12.000000000 -0400 -+++ Xcursor/configure.ac 2005-01-18 16:04:36.860617992 -0500 -@@ -31,11 +31,11 @@ - dnl not possible to extract the version number here from Xcursor.h - dnl - AC_INIT([libXcursor],1.1.3,[keithp@keithp.com],[libXcursor]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AC_CONFIG_SRCDIR([Makefile.am]) - AM_MAINTAINER_MODE - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - dnl libtool versioning - diff --git a/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty b/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch b/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch deleted file mode 100644 index 1e3ec45d4a..0000000000 --- a/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libXdamage-1.0.1/configure.ac -=================================================================== ---- libXdamage-1.0.1.orig/configure.ac 2004-01-15 03:54:55.000000000 -0500 -+++ libXdamage-1.0.1/configure.ac 2005-01-18 19:07:16.951430928 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xorg-lib/libxdamage/.mtn2git_empty b/packages/xorg-lib/libxdamage/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxdamage/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxdamage/m4.patch b/packages/xorg-lib/libxdamage/m4.patch deleted file mode 100644 index 393f3d13d2..0000000000 --- a/packages/xorg-lib/libxdamage/m4.patch +++ /dev/null @@ -1,65 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null -+++ Xdamage/m4/pkg.m4 -@@ -0,0 +1,57 @@ -+ -+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -+dnl also defines GSTUFF_PKG_ERRORS on error -+AC_DEFUN(PKG_CHECK_MODULES, [ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ AC_MSG_CHECKING(for $2) -+ -+ if $PKG_CONFIG --exists "$2" ; then -+ AC_MSG_RESULT(yes) -+ succeeded=yes -+ -+ AC_MSG_CHECKING($1_CFLAGS) -+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` -+ AC_MSG_RESULT($$1_CFLAGS) -+ -+ AC_MSG_CHECKING($1_LIBS) -+ $1_LIBS=`$PKG_CONFIG --libs "$2"` -+ AC_MSG_RESULT($$1_LIBS) -+ else -+ $1_CFLAGS="" -+ $1_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ ifelse([$4], ,echo $$1_PKG_ERRORS,) -+ fi -+ -+ AC_SUBST($1_CFLAGS) -+ AC_SUBST($1_LIBS) -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ ifelse([$3], , :, [$3]) -+ else -+ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) -+ fi -+]) -+ -+ diff --git a/packages/xorg-lib/libxdmcp/.mtn2git_empty b/packages/xorg-lib/libxdmcp/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxdmcp/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxdmcp/autofoo.patch b/packages/xorg-lib/libxdmcp/autofoo.patch deleted file mode 100644 index ff1a76ad04..0000000000 --- a/packages/xorg-lib/libxdmcp/autofoo.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libXdmcp-0.1.3/configure.ac~autofoo -+++ libXdmcp-0.1.3/configure.ac -@@ -25,12 +25,11 @@ - - AC_PREREQ([2.57]) - AC_INIT(libXdmcp, [0.1.3], [keithp@keithp.com],libXdmcp) -+AC_CONFIG_AUX_DIR(.) -+AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h]) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE -- - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) --AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h]) - - AC_PROG_CC - AC_PROG_INSTALL diff --git a/packages/xorg-lib/libxext/.mtn2git_empty b/packages/xorg-lib/libxext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxext/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxext/autofoo.patch b/packages/xorg-lib/libxext/autofoo.patch deleted file mode 100644 index c006884526..0000000000 --- a/packages/xorg-lib/libxext/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Xext/configure.ac~autofoo -+++ Xext/configure.ac -@@ -8,9 +8,8 @@ - libXext) - - AC_CONFIG_SRCDIR([Makefile.am]) --AM_INIT_AUTOMAKE([dist-bzip2]) -- - AC_CONFIG_AUX_DIR(.) -+AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - diff --git a/packages/xorg-lib/libxfixes/.mtn2git_empty b/packages/xorg-lib/libxfixes/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxfixes/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxfixes/autofoo.patch b/packages/xorg-lib/libxfixes/autofoo.patch deleted file mode 100644 index 26803cf7f3..0000000000 --- a/packages/xorg-lib/libxfixes/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXfixes-2.0.1/configure.ac~autofoo 2004-01-15 03:40:23.000000000 -0500 -+++ libXfixes-2.0.1/configure.ac 2005-01-18 13:35:33.461221360 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXfixes, 2.0.1, [keithp@keithp.com], libXfixes) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xorg-lib/libxfont/autofoo.patch b/packages/xorg-lib/libxfont/autofoo.patch deleted file mode 100644 index 4998625c24..0000000000 --- a/packages/xorg-lib/libxfont/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400 -+++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500 -@@ -35,9 +35,9 @@ - dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's - dnl not possible to extract the version number here from Xfont.h - dnl -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) - - # Check for progs diff --git a/packages/xorg-lib/libxfont/scalable.patch b/packages/xorg-lib/libxfont/scalable.patch deleted file mode 100644 index 7f97b9a8f6..0000000000 --- a/packages/xorg-lib/libxfont/scalable.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: fontfile/fontdir.c -=================================================================== -RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v -retrieving revision 3.22 -diff -u -r3.22 fontdir.c ---- xfont/fontfile/fontdir.c 7 Jul 2003 16:40:11 -0000 3.22 -+++ xfont/fontfile/fontdir.c 30 Dec 2004 20:37:12 -0000 -@@ -699,6 +699,11 @@ - */ - if (isscale) - { -+ /* If the fontname says it is scalable, make sure that the -+ * renderer supports OpenScalable and GetInfoScalable. -+ */ -+ if (renderer->OpenScalable && renderer->GetInfoScalable) -+ { - if (vals.values_supplied & SIZE_SPECIFY_MASK) - { - bzero((char *)&zeroVals, sizeof(zeroVals)); -@@ -798,6 +803,7 @@ - bitmap->name.name); - } - } -+ } - } - return TRUE; - } diff --git a/packages/xorg-lib/libxft/.mtn2git_empty b/packages/xorg-lib/libxft/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxft/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxft/autofoo.patch b/packages/xorg-lib/libxft/autofoo.patch deleted file mode 100644 index 54120aa612..0000000000 --- a/packages/xorg-lib/libxft/autofoo.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXft-2.1.6/configure.ac~autofoo 2004-03-22 10:02:59.000000000 -0500 -+++ libXft-2.1.6/configure.ac 2005-01-17 02:08:10.165951760 -0500 -@@ -33,12 +33,12 @@ - dnl Please bump the minor library number at each release as well. - dnl - AC_INIT(libXft, 2.1.6, [keithp@keithp.com], libXft) -+AC_CONFIG_AUX_DIR(.) - - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # checks for progs - AC_PROG_CC diff --git a/packages/xorg-lib/libxi/.mtn2git_empty b/packages/xorg-lib/libxi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxi/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxi/autofoo.patch b/packages/xorg-lib/libxi/autofoo.patch deleted file mode 100644 index f1bce9ed7a..0000000000 --- a/packages/xorg-lib/libxi/autofoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libXi-6.0.1/configure.ac -=================================================================== ---- libXi-6.0.1.orig/configure.ac 2003-11-01 04:11:49.000000000 -0500 -+++ libXi-6.0.1/configure.ac 2005-01-20 11:34:06.878357352 -0500 -@@ -8,7 +8,6 @@ - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/libxpm/.mtn2git_empty b/packages/xorg-lib/libxpm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxpm/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxpm/autofoo.patch b/packages/xorg-lib/libxpm/autofoo.patch deleted file mode 100644 index 6b2174bf02..0000000000 --- a/packages/xorg-lib/libxpm/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: libXpm-3.5.1/configure.ac -=================================================================== ---- libXpm-3.5.1.orig/configure.ac 2004-05-11 02:00:35.000000000 -0400 -+++ libXpm-3.5.1/configure.ac 2005-01-19 18:35:57.187402008 -0500 -@@ -1,12 +1,12 @@ - AC_PREREQ(2.57) - AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm) - AC_CONFIG_SRCDIR([Makefile.am]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([lib/config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty b/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch b/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch deleted file mode 100644 index 21f6e7fd78..0000000000 --- a/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXrandr-1.0.2/configure.ac~autofoo 2004-01-15 03:23:00.000000000 -0500 -+++ libXrandr-1.0.2/configure.ac 2005-01-16 11:18:35.924069872 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xorg-lib/libxrandr/.mtn2git_empty b/packages/xorg-lib/libxrandr/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxrandr/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxrandr/autofoo.patch b/packages/xorg-lib/libxrandr/autofoo.patch deleted file mode 100644 index 7b1db760f2..0000000000 --- a/packages/xorg-lib/libxrandr/autofoo.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Xrandr/configure.ac~autofoo.patch 2004-07-01 15:01:55.000000000 -0400 -+++ Xrandr/configure.ac 2005-01-16 11:22:09.169651616 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC ---- Xrandr/ChangeLog~autofoo.patch 2004-09-19 04:53:38.000000000 -0400 -+++ Xrandr/ChangeLog 2005-01-16 11:52:29.694889712 -0500 -@@ -1,3 +1,7 @@ -+2005-01-16 Chris Larson <kergoth@handhelds.org> -+ -+ * configure.ac: Fix to work with automake 1.9.x. -+ - 2004-09-19 Carlos Romero <kidcrash@freedesktop.org> - - * Makefile.am: diff --git a/packages/xorg-lib/libxrender/.mtn2git_empty b/packages/xorg-lib/libxrender/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxrender/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxrender/autofoo.patch b/packages/xorg-lib/libxrender/autofoo.patch deleted file mode 100644 index eb21c766f8..0000000000 --- a/packages/xorg-lib/libxrender/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libXrender-0.8.4/configure.ac~autofoo -+++ libXrender-0.8.4/configure.ac -@@ -33,11 +33,10 @@ - dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXrender, 0.8.4, [keithp@keithp.com], libXrender) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE -- - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xorg-lib/libxt/.mtn2git_empty b/packages/xorg-lib/libxt/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-lib/libxt/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/libxt/autofoo.patch b/packages/xorg-lib/libxt/autofoo.patch deleted file mode 100644 index ff6dfdbbcc..0000000000 --- a/packages/xorg-lib/libxt/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXt-0.1.5/configure.ac~autofoo 2004-05-06 20:19:04.000000000 -0400 -+++ libXt-0.1.5/configure.ac 2005-01-18 13:10:13.683262728 -0500 -@@ -28,11 +28,11 @@ - dnl - dnl - AC_INIT(libXt, 0.1.5, [keithp@keithp.com], libXt) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC |