diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2007-03-29 10:10:26 +0000 |
|---|---|---|
| committer | Philipp Zabel <philipp.zabel@gmail.com> | 2007-03-29 10:10:26 +0000 |
| commit | 5b092eca308028230d8e65384c2eeef3652e25a9 (patch) | |
| tree | 87ac96aace802d2050337f8cabc9a9a2917c4d8b /packages/xorg-xserver/xserver-kdrive-1.2 | |
| parent | 29ecffc666e166906ccaa73f65c2e12ea17a1769 (diff) | |
xserver-kdrive: clean up different patch versions, drop imageon from 1.2 for now
Diffstat (limited to 'packages/xorg-xserver/xserver-kdrive-1.2')
5 files changed, 102 insertions, 0 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..4b7e41e3e9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,39 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 ++++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 +@@ -513,7 +513,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1540,7 +1544,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1560,10 +1566,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch new file mode 100644 index 0000000000..8ec3a37c78 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch @@ -0,0 +1,11 @@ +Index: xorg-server-1.2.0/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am 2007-03-28 17:11:38.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-03-28 17:12:28.000000000 +0200 +@@ -1,5 +1,5 @@ + if KDRIVEFBDEV +-FBDEV_SUBDIRS = fbdev ++FBDEV_SUBDIRS = fbdev epson + endif + + if KDRIVEIMAGEON diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch new file mode 100644 index 0000000000..1e72a3ea53 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch @@ -0,0 +1,28 @@ +Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am +=================================================================== +--- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 ++++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 +@@ -6,6 +6,10 @@ + + bin_PROGRAMS = Xfbdev + ++if TSLIB ++TSLIB_FLAG = -lts ++endif ++ + libfbdev_a_SOURCES = \ + fbdev.c \ + fbdev.h +@@ -16,7 +20,10 @@ + Xfbdev_LDADD = \ + libfbdev.a \ + @KDRIVE_LIBS@ \ +- @XSERVER_LIBS@ ++ @XSERVER_LIBS@ \ ++ $(TSLIB_FLAG) + + Xfbdev_DEPENDENCIES = \ +- libfbdev.a ++ libfbdev.a \ ++ @KDRIVE_LIBS@ ++ diff --git a/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch new file mode 100644 index 0000000000..aec94a3a6d --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch @@ -0,0 +1,24 @@ +Index: xorg-server-1.2.0/mi/miinitext.c +=================================================================== +--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200 ++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200 +@@ -372,6 +372,9 @@ + #ifdef DMXEXT + extern void DMXExtensionInit(INITARGS); + #endif ++#ifdef XCALIBRATE ++extern void XCalibrateExtensionInit(INITARGS); ++#endif + #ifdef XEVIE + extern void XevieExtensionInit(INITARGS); + #endif +@@ -663,6 +666,9 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void |