From 5b092eca308028230d8e65384c2eeef3652e25a9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 10:10:26 +0000 Subject: xserver-kdrive: clean up different patch versions, drop imageon from 1.2 for now --- .../xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty | 0 .../disable-xf86-dga-xorgcfg.patch | 39 ++++++++++++++++++++++ .../xserver-kdrive-1.2/enable-epson.patch | 11 ++++++ .../xserver-kdrive-1.2/enable-tslib.patch | 28 ++++++++++++++++ .../xserver-kdrive-1.2/enable-xcalibrate.patch | 24 +++++++++++++ packages/xorg-xserver/xserver-kdrive-common.inc | 3 ++ .../xserver-kdrive/build-fix-panoramix.patch | 18 ++++++++++ .../disable-xf86-dga-xorgcfg-1.2.patch | 39 ---------------------- .../xserver-kdrive/enable-epson-1.2.patch | 11 ------ packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 11 ++---- .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 3 -- 11 files changed, 125 insertions(+), 62 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/.mtn2git_empty create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/disable-xf86-dga-xorgcfg.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-epson.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-tslib.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-1.2/enable-xcalibrate.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch delete mode 100644 packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch (limited to 'packages/xorg-xserver') 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 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 diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index 3cb038648e..72c2a87b32 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -96,7 +96,10 @@ KDRIVE_COMMON_PATCHES = " \ file://kdrive-use-evdev.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ file://kmode-palm.patch;patch=1 \ " diff --git a/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch b/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch new file mode 100644 index 0000000000..f919b48f0e --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/build-fix-panoramix.patch @@ -0,0 +1,18 @@ +Index: git/composite/compext.c +=================================================================== +--- git.orig/composite/compext.c 2007-03-28 16:25:12.000000000 +0200 ++++ git/composite/compext.c 2007-03-28 16:25:15.000000000 +0200 +@@ -696,11 +696,13 @@ + if (GetPictureScreenIfSet(pScreen) == NULL) + return; + } ++#ifdef PANORAMIX + /* Xinerama's rewriting of window drawing before Composite gets to it + * breaks Composite. + */ + if (!noPanoramiXExtension) + return; ++#endif + + CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow); + if (!CompositeClientWindowType) diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch deleted file mode 100644 index 4b7e41e3e9..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-1.2.patch +++ /dev/null @@ -1,39 +0,0 @@ -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/enable-epson-1.2.patch b/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch deleted file mode 100644 index 8ec3a37c78..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/enable-epson-1.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -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.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index ac276a8e60..d4c01f240a 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,19 +3,12 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r1" - -PACKAGES =+ "xserver-kdrive-imageon" +PR = "r2" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ - file://disable-xf86-dga-xorgcfg-1.2.patch;patch=1 \ - file://enable-epson-1.2.patch;patch=1 \ - file://kdrive-vidmemarea.patch;patch=1 \ - file://kdrive-imageon.patch;patch=1 \ + file://enable-xcalibrate.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" -IMAGEON_OECONF = "--disable-imageon" -IMAGEON_OECONF_arm = "--enable-imageon" diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 1aff9cdf79..3f97527553 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -8,10 +8,7 @@ PACKAGES =+ "xserver-kdrive-w100" SRC_URI = "${XORG_MIRROR}/X11R7.1/src/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://xcalibrate.patch;patch=1 \ - file://enable-epson.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ file://w100.patch;patch=1 \ " -- cgit v1.2.3