diff options
Diffstat (limited to 'source/x')
132 files changed, 1026 insertions, 2053 deletions
diff --git a/source/x/fontconfig/doinst.sh b/source/x/fontconfig/doinst.sh index 6a4802323..ae60a1b15 100644 --- a/source/x/fontconfig/doinst.sh +++ b/source/x/fontconfig/doinst.sh @@ -3,5 +3,4 @@ if [ -x /usr/bin/fc-cache ]; then /usr/bin/fc-cache -f fi # else we'll catch it later with setup.fontconfig :-) -# make links: diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild index bb3b192f5..2fd360ae4 100755 --- a/source/x/fontconfig/fontconfig.SlackBuild +++ b/source/x/fontconfig/fontconfig.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -86,6 +86,10 @@ CFLAGS=$SLKCFLAGS \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --sysconfdir=/etc \ + --with-templatedir=/etc/fonts/conf.avail \ + --with-baseconfigdir=/etc/fonts \ + --with-configdir=/etc/fonts/conf.d \ + --with-xmldir=/etc/fonts \ --localstatedir=/var \ --enable-static=no \ --build=$ARCH-slackware-linux @@ -94,6 +98,15 @@ CFLAGS=$SLKCFLAGS \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Upstream has changed the default templatedir to /usr/share/fontconfig/conf.avail. +# This change, if accepted, would break any existing font package containing a +# conf.avail directory. The safest thing to do is to keep things in the +# traditional location, but put a link in the new place so that font packages +# following the new standard location will work. Let's hear it for being +# "more correct" at the expense of having things "just work"! +mkdir -p $PKG/usr/share/fontconfig +( cd $PKG/usr/share/fontconfig ; ln -sf /etc/fonts/conf.avail . ) + mkdir -p $PKG/usr/doc/fontconfig-$VERSION cp -a \ AUTHORS COPYING* INSTALL NEWS README \ @@ -120,7 +133,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ # Set up the default options in /etc/fonts/conf.d: ( cd $PKG/etc/fonts/conf.d for fontconf in \ - 20-fix-globaladvance.conf \ 20-unhint-small-vera.conf \ 30-urw-aliases.conf \ 30-metric-aliases.conf \ @@ -135,7 +147,12 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ 69-unifont.conf \ 80-delicious.conf \ 90-synthetic.conf ; do - ln -sf ../conf.avail/$fontconf . || exit 1 + if [ -r ../conf.avail/$fontconf ]; then + ln -sf ../conf.avail/$fontconf . + else + echo "ERROR: unable to symlink ../conf.avail/$fontconf, file does not exist." + exit 1 + fi done if [ ! $? = 0 ]; then exit 1 @@ -166,5 +183,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $TMP/fontconfig-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n --prepend $TMP/fontconfig-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fontconfig/fontconfig.font.dir.list.diff b/source/x/fontconfig/fontconfig.font.dir.list.diff index 1e68b0d12..63be22f51 100644 --- a/source/x/fontconfig/fontconfig.font.dir.list.diff +++ b/source/x/fontconfig/fontconfig.font.dir.list.diff @@ -1,25 +1,33 @@ -diff -Nur fontconfig-2.8.0.orig/fonts.conf.in fontconfig-2.8.0/fonts.conf.in ---- fontconfig-2.8.0.orig/fonts.conf.in 2009-06-28 12:48:47.000000000 -0500 -+++ fontconfig-2.8.0/fonts.conf.in 2009-12-01 21:48:48.134935536 -0600 -@@ -23,10 +23,21 @@ +--- ./fonts.conf.in.orig 2012-07-23 21:01:32.000000000 -0500 ++++ ./fonts.conf.in 2013-02-28 22:32:44.758585955 -0600 +@@ -22,13 +22,29 @@ + --> <!-- Font directory list --> - +- - <dir>@FC_DEFAULT_FONTS@</dir> - @FC_FONTPATH@ -+ <dir>/usr/share/fonts/OTF</dir> -+ <dir>/usr/share/fonts/TTF</dir> -+ <dir>/usr/share/fonts/Type1</dir> -+ <dir>/usr/share/fonts/Speedo</dir> -+ <dir>/usr/share/fonts/cyrillic</dir> -+ <dir>/usr/share/fonts/misc</dir> ++ <dir>/usr/share/fonts/OTF</dir> ++ <dir>/usr/share/fonts/TTF</dir> ++ <dir>/usr/share/fonts/Type1</dir> ++ <dir>/usr/share/fonts/Speedo</dir> ++ <dir>/usr/share/fonts/cyrillic</dir> ++ <dir>/usr/share/fonts/misc</dir> + <dir prefix="xdg">fonts</dir> + <!-- the following element will be removed in the future --> <dir>~/.fonts</dir> -+<!-- Commented out font directories: -+These are not indexed by default, as fontconfig then seems -+to prefer bitmapped fonts in some cases... -+ <dir>/usr/share/fonts/100dpi</dir> -+ <dir>/usr/share/fonts/75dpi</dir> ++<!-- Commented out font directories: ++ These are not indexed by default, as fontconfig then seems ++ to prefer bitmapped fonts in some cases... ++ <dir>/usr/share/fonts/100dpi</dir> ++ <dir>/usr/share/fonts/75dpi</dir> ++ The top-level font directory should also not be indexed, as that ++ will include the directories of bitmapped fonts: ++ <dir>@FC_DEFAULT_FONTS@</dir> ++ The empty line below is produced by the FC_FONTPATH macro. ++ Moving it here so it doesn't become a problem in the future: ++ @FC_FONTPATH@ +--> + <!-- diff --git a/source/x/glew/glew.SlackBuild b/source/x/glew/glew.SlackBuild index d210557fb..5187bb76c 100755 --- a/source/x/glew/glew.SlackBuild +++ b/source/x/glew/glew.SlackBuild @@ -22,7 +22,8 @@ # Slackware build script for glew -VERSION=1.5.7 +PKGNAM=glew +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -39,7 +40,7 @@ NUMJOBS=${NUMJOBS:--j8} CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-glew +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -58,9 +59,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 -rm -rf glew-$VERSION -tar xvf $CWD/glew-${VERSION}.tar.?z* || exit 1 -cd glew-${VERSION} || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-${VERSION}.tar.?z* || exit 1 +cd $PKGNAM-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -83,13 +84,13 @@ make install GLEW_DEST=$PKG/usr || exit 1 xargs strip --strip-unneeded 2> /dev/null ) -mkdir -p $PKG/usr/doc/glew-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ LICENSE* README* doc/* \ - $PKG/usr/doc/glew-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/glew-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/glu/glu.SlackBuild b/source/x/glu/glu.SlackBuild new file mode 100755 index 000000000..e5f76982c --- /dev/null +++ b/source/x/glu/glu.SlackBuild @@ -0,0 +1,92 @@ +#!/bin/sh + +# Slackware build script for glu + +# Copyright 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=glu +VERSION=${VERSION:-9.0.0} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PRGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1 +cd $PRGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --disable-static \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# No docs at all + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/glu/glu.url b/source/x/glu/glu.url new file mode 100644 index 000000000..4b79b6503 --- /dev/null +++ b/source/x/glu/glu.url @@ -0,0 +1,2 @@ +ftp://ftp.freedesktop.org/pub/mesa/glu/ +http://cgit.freedesktop.org/mesa/glu/ diff --git a/source/x/glu/slack-desc b/source/x/glu/slack-desc new file mode 100644 index 000000000..7ede5e95e --- /dev/null +++ b/source/x/glu/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +glu: glu (Mesa OpenGL utility library) +glu: +glu: glu is the Mesa OpenGL utility library (libGLU). +glu: +glu: +glu: +glu: +glu: +glu: +glu: +glu: diff --git a/source/x/libdrm/libdrm.SlackBuild b/source/x/libdrm/libdrm.SlackBuild index 31181fb5c..d6899ca51 100755 --- a/source/x/libdrm/libdrm.SlackBuild +++ b/source/x/libdrm/libdrm.SlackBuild @@ -73,10 +73,10 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ --enable-udev \ - --enable-nouveau-experimental-api \ - --enable-vmwgfx-experimental-api \ --enable-omap-experimental-api \ + --enable-exynos-experimental-api \ --build=$ARCH-slackware-linux # Build and install: diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index ca6701886..8d04e7fe0 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,14 +21,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=mesa -VERSION=8.0.4 -DEMOVERS=8.0.1 +VERSION=9.1.7 +DEMOVERS=8.1.0 BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j8} # Be sure this list is up-to-date: -DRI_DRIVERS="i915,i965,nouveau,r200,radeon,swrast" +DRI_DRIVERS="i915,i965,intel,nouveau,r200,radeon,swrast" if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -61,6 +61,9 @@ rm -rf Mesa-${VERSION} tar xvf $CWD/MesaLib-${VERSION}.tar.?z* || exit 1 cd Mesa-$VERSION +# Let's kill the warning about operating on a dangling symlink: +rm -f src/gallium/state_trackers/d3d1x/w32api + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -83,6 +86,9 @@ if [ ! -r configure ]; then autoreconf || exit 1 fi +# Running autogen to avoid problems if our autotools don't match upstream's: +./autogen.sh + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -92,8 +98,11 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/mesa-$VERSION \ --with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \ --with-dri-drivers="$DRI_DRIVERS" \ - --with-gallium-drivers=nouveau,swrast,r300,r600 \ + --with-gallium-drivers=nouveau,r300,r600,svga \ --enable-gallium-llvm \ + --enable-shared-glapi \ + --enable-xa \ + --enable-osmesa \ --build=$ARCH-slackware-linux # r300 requires llvm diff --git a/source/x/mtdev/mtdev.SlackBuild b/source/x/mtdev/mtdev.SlackBuild index e973ed342..d3e518cfd 100755 --- a/source/x/mtdev/mtdev.SlackBuild +++ b/source/x/mtdev/mtdev.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mtdev -VERSION=${VERSION:-1.1.2} +VERSION=${VERSION:-1.1.3} BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch deleted file mode 100644 index f925507a7..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp.bak 2009-01-18 01:04:20.000000000 +0800 -+++ scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp 2010-09-11 22:38:27.196979199 +0800 -@@ -65,7 +65,7 @@ - unsigned int tmp_uint; - - int option = 0; -- while (option != EOF) { -+ while (option != -1) { - option = getopt_long (argc, argv, short_options, long_options, NULL); - switch (option) { - case 'v': diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch deleted file mode 100644 index 85732013d..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp.bak 2009-02-03 22:36:14.000000000 +0800 -+++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp 2010-09-11 23:25:00.636978519 +0800 -@@ -60,6 +60,8 @@ - - static bool on_the_spot_enabled = true; - -+static String help_hotkeys = ""; -+ - /* Class definition */ - class ScimBridgeAgentIMContextImpl: public ScimBridgeAgentIMContext - { -@@ -274,6 +276,12 @@ - } - - -+void ScimBridgeAgentIMContext::set_help_hotkeys (const String &hotkey_str) -+{ -+ help_hotkeys = hotkey_str; -+} -+ -+ - ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener): - client_listener (new_client_listener), imengine (NULL), enabled (false), focused(false) ,preedit_mode (PREEDIT_ANY), - preedit_shown (false), preedit_cursor_position (0) -@@ -654,6 +662,8 @@ - - void ScimBridgeAgentIMContextImpl::focus_out () - { -+ if (!imengine_shared && imengine == NULL) alloc_imengine (); -+ - ScimBridgeAgentIMContext *focused_imcontext = static_cast<ScimBridgeAgentIMContext*> (get_imengine ()->get_frontend_data ()); - - if ( !focused ) -@@ -923,9 +933,11 @@ - - void ScimBridgeAgentIMContextImpl::panel_request_help () - { -- String help = String ("Smart Common Input Method platform ") + -- String (SCIM_VERSION) + -- String ("\n(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n\n"); -+ String help = String ("SCIM Bridge") + -+ String (VERSION) + -+ String ("\n(C) 2006-2008 Ryo Dairiki <ryo-dairiki@users.sourceforge.net>\n") + -+ help_hotkeys + -+ String ("\n\n"); - - IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ()); - if (factory.null ()) factory = fallback_imengine_factory; diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch deleted file mode 100644 index f16b34c14..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h.bak 2008-11-02 14:44:49.000000000 +0800 -+++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h 2010-09-11 23:12:18.085979961 +0800 -@@ -130,6 +130,21 @@ - static void set_enabled_by_default (bool enabled); - - /** -+ * Get the hotkey help messages. -+ * -+ * @return help messages about hotkeys. -+ */ -+ static scim::String get_help_hotkeys (); -+ -+ /** -+ * Set the hotkey help messages. -+ * -+ * @param hotkey_str Help message about hotkeys. -+ * -+ */ -+ static void set_help_hotkeys (const scim::String &hotkey_str); -+ -+ /** - * Destructor. - */ - virtual ~ScimBridgeAgentIMContext () {} diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch deleted file mode 100644 index 27c5cb73b..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- scim-bridge-0.4.16/agent/scim-bridge-agent.cpp.bak 2009-03-08 21:07:29.000000000 +0800 -+++ scim-bridge-0.4.16/agent/scim-bridge-agent.cpp 2010-09-11 22:59:34.476979479 +0800 -@@ -542,6 +542,27 @@ - scim_global_config_flush (); - - scim_keyboard_layout = scim_get_default_keyboard_layout (); -+ -+ // Hot key name, hot key config key. -+ // ! Update hotkey_list_length according to updated list length. -+ int hotkey_list_length = 6; -+ String hotkey_list[][2] = { -+ { "Toggle on/off - ", "/Hotkeys/FrontEnd/Trigger" }, -+ { "Turn on - ", "/Hotkeys/FrontEnd/On" }, -+ { "Turn off - ", "/Hotkeys/FrontEnd/Off" }, -+ { "Next input method - ", "/Hotkeys/FrontEnd/NextFactory" }, -+ { "Previous input method - ", "/Hotkeys/FrontEnd/PreviousFactory" }, -+ { "Show input method menu - ", "/Hotkeys/FrontEnd/ShowFactoryMenu" } -+ }; -+ -+ // Undefined hot keys are hidden from help window. -+ String help_hotkeys = "\nGlobal Hotkeys:"; -+ for ( int i = 0; i < hotkey_list_length; i++ ) { -+ String tmp_hotkeys = scim_config->read (String (hotkey_list[i][1]), String ("")); -+ if ( tmp_hotkeys != "" ) -+ help_hotkeys += "\n" + hotkey_list[i][0] + "<" + tmp_hotkeys + ">"; -+ } -+ ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys); - } - - diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch deleted file mode 100644 index 21f1f824e..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- scim-bridge-0.4.16/client-gtk/scim-bridge-client-imcontext-gtk.c.bak 2008-11-02 14:44:23.000000000 +0800 -+++ scim-bridge-0.4.16/client-gtk/scim-bridge-client-imcontext-gtk.c 2010-09-11 23:19:10.556978680 +0800 -@@ -35,6 +35,8 @@ - #include "scim-bridge-output.h" - #include "scim-bridge-string.h" - -+#define SEND_EVENT_MASK 0x02 -+ - /* Typedef */ - struct _ScimBridgeClientIMContext - { -@@ -200,7 +202,7 @@ - { - scim_bridge_pdebugln (7, "key_snooper ()"); - -- if (!event->send_event && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) { -+ if (!(event->send_event & SEND_EVENT_MASK) && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) { - if (focused_imcontext->client_window != NULL) { - int new_window_x; - int new_window_y; -@@ -556,7 +558,7 @@ - { - GdkEventKey gdk_event; - scim_bridge_key_event_bridge_to_gdk (&gdk_event, imcontext->client_window, key_event); -- gdk_event.send_event = TRUE; -+ gdk_event.send_event |= SEND_EVENT_MASK; - if (imcontext == focused_imcontext && focused_widget != NULL) { - const char *signal_name = NULL; - if (scim_bridge_key_event_is_pressed (key_event)) { -@@ -762,7 +764,7 @@ - - ScimBridgeClientIMContext *imcontext = SCIM_BRIDGE_CLIENT_IMCONTEXT (context); - -- if (!event->send_event && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) { -+ if (!(event->send_event & SEND_EVENT_MASK) && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) { - - if (imcontext->client_window != NULL) { - int new_window_x; -@@ -875,7 +877,7 @@ - scim_bridge_client_open_messenger (); - } - -- if (is_key_snooper_enabled ()) { -+ if (!key_snooper_used && is_key_snooper_enabled ()) { - key_snooper_id = gtk_key_snooper_install ((GtkKeySnoopFunc) &key_snooper, NULL); - key_snooper_used = TRUE; - } diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch deleted file mode 100644 index 74a3252ef..000000000 --- a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- scim-bridge-0.4.16/client-qt/scim-bridge-client-imcontext-qt.cpp.bak 2008-11-02 14:44:46.000000000 +0800 -+++ scim-bridge-0.4.16/client-qt/scim-bridge-client-imcontext-qt.cpp 2010-09-11 22:46:10.396979441 +0800 -@@ -220,7 +220,12 @@ - { - scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()"); - QInputContext::setFocusWidget (widget); -- focus_in (); -+ if (widget == NULL) { -+ focus_out (); -+ } -+ else { -+ focus_in (); -+ } - update (); - } - -@@ -442,9 +447,11 @@ - } - } - -- set_preedit_shown (false); -- update_preedit (); -- -+ if (preedit_shown) { -+ set_preedit_shown (false); -+ update_preedit (); -+ } -+ - focused_imcontext = NULL; - } - diff --git a/source/x/scim-bridge/scim-bridge.SlackBuild b/source/x/scim-bridge/scim-bridge.SlackBuild deleted file mode 100755 index 8501d9c4b..000000000 --- a/source/x/scim-bridge/scim-bridge.SlackBuild +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ----------------------------------------------------------------------------- -# -# Slackware SlackBuild script -# =========================== -# By: Eric Hameleers <alien@slackware.com> -# For: scim-bridge -# Descr: yet another gtk-immodule for SCIM -# URL: http://scim-im.org/ -# -# ----------------------------------------------------------------------------- - - -PKGNAM=scim-bridge -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -NUMJOBS=${NUMJOBS:-" -j7 "} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "armel" ]; then - SLKCFLAGS="-O2 -march=armv4t" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1 -cd ${PKGNAM}-${VERSION} || exit 1 -#sed -i -e "s/ -doxygen / doxygen /" $( grep -lr ' -doxygen ' * ) - -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch.gz | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -echo Building ... -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --enable-agent \ - --enable-ltdl-install \ - --enable-gtk2-immodule \ - --enable-qt4-immodule \ - --disable-qt3-immodule \ - --disable-documents \ - --disable-static \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux - # We disable the qt3-immodule because that one will not build. - # The qt4-immodule will build however. - -make $NUMJOBS || make || exit 1 -make DESTDIR=$PKG install || exit 1 - -# Add this to the doinst.sh -mkdir -p $PKG/install -cat <<EOINS >> $PKG/install/doinst.sh -# Run gtk-query-immodules so that "scim" will appear under Imput Method -# when you right- click your mouse in a text box. -if [ -x /usr/bin/update-gtk-immodules ]; then - /usr/bin/update-gtk-immodules -fi -EOINS - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING* ChangeLog INSTALL NEWS README* doc/LICENSE.* \ - $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; - -# Compress the man page(s): -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; - for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -fi - -# Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz - diff --git a/source/x/scim-bridge/slack-desc b/source/x/scim-bridge/slack-desc deleted file mode 100644 index cd58299a7..000000000 --- a/source/x/scim-bridge/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -scim-bridge: scim-bridge (yet another gtk-immodule for SCIM) -scim-bridge: -scim-bridge: Scim-bridge is yet another gtk-immodule for SCIM. Scim-bridge -scim-bridge: consists of two parts, that is, client and agent (server). The client -scim-bridge: is a GTK immodule which communicates with the agent over sockets. -scim-bridge: The agent communicates with SCIM, and brings back the data -scim-bridge: for each client. -scim-bridge: -scim-bridge: scim-bridge home: http://scim-im.org/ -scim-bridge: -scim-bridge: diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild index d03adc6e6..816a50018 100755 --- a/source/x/scim/scim.SlackBuild +++ b/source/x/scim/scim.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2006, 2007, 2008 Eric Hameleers, Eindhoven, NL -# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -35,7 +35,7 @@ PKGNAM=scim VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -90,14 +90,15 @@ echo Building ... CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --disable-static \ - --with-gtk-version=2 \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --disable-static \ + --with-gtk-version=2 \ + --with-qt4-im-module-dir=/usr/lib${LIBDIRSUFFIX}/qt/plugins/inputmethods \ + --program-prefix= \ + --program-suffix= \ + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make DESTDIR=$PKG install || exit 1 @@ -120,20 +121,15 @@ cat <<EOT > $PKG/etc/profile.d/scim.sh.new if [ -x /usr/bin/scim ]; then # Enable legacy X applications to use scim: export XMODIFIERS="@im=SCIM" - ## Enable Qt/KDE applications to use scim (not working with kde4): - #export QT_IM_MODULE="scim" + # Let GTK applications like Firefox/Thunderbird use scim as + # default immodule: + export GTK_IM_MODULE="scim" + # Enable Qt/KDE applications to use scim: + export QT_IM_MODULE="scim" # Make scim start automatically if the "magic key" Ctrl-Space is pressed: export XIM_PROGRAM="/usr/bin/scim -d" fi -if [ -x /usr/bin/scim-bridge ]; then - # Let GTK applications like Firefox/Thunderbird use scim-bridge as - # default immodule: - export GTK_IM_MODULE="scim-bridge" - # Enable Qt4/KDE4 applications to use scim: - export QT_IM_MODULE="scim-bridge" -fi - # This ensures scim starts when you logon. # This will only work if you login through runlevel 4 (graphical login)!!! # Better is to have it start through Ctrl-Space like configured higher up ^^. @@ -141,21 +137,6 @@ fi # /usr/bin/scim -d #fi -# GTK+ environments such as XFce should support SCIM automatically, BUT -# if the first app you run is a Qt one, you'll run into problems. This -# can be avoided by going into Menu -> Settings -> Autostarted Applications -# and adding SCIM: /usr/bin/scim -d - -# KDE will not start SCIM automatically, so you will need a script such as -# this one in your $HOME/.kde/Autostart: - -#!/bin/bash -#if [ -x /usr/bin/scim ]; then -# /usr/bin/scim -d & -#fi - -# Obviously, uncomment all but the first line. :-) - EOT cat <<EOT > $PKG/etc/profile.d/scim.csh.new @@ -174,21 +155,15 @@ cat <<EOT > $PKG/etc/profile.d/scim.csh.new if (\$status == 0) then # Enable legacy X applications to use scim: setenv XMODIFIERS "@im=SCIM" - ## Enable Qt/KDE applications to use scim (does not work for kde4): - #setenv QT_IM_MODULE "scim" + # Let GTK applications like Firefox/Thunderbird use scim as + # default immodule: + setenv GTK_IM_MODULE "scim" + # Enable Qt/KDE applications to use scim (does not work for kde4): + setenv QT_IM_MODULE "scim" # Make scim start automatically if the "magic key" Ctrl-Space is pressed: setenv XIM_PROGRAM "/usr/bin/scim -d" endif -[ -x /usr/bin/scim-bridge ] -if (\$status == 0) then - # Let GTK applications like Firefox/Thunderbird use scim-bridge as - # default immodule: - setenv GTK_IM_MODULE "scim-bridge" - # Enable Qt4/KDE4 applications to use scim: - setenv QT_IM_MODULE "scim-bridge" -endif - # This ensures scim starts when you logon. # This will only work if you login through runlevel 4 (graphical login)!!! # Better is to have it start through Ctrl-Space like configured higher up ^^. @@ -197,22 +172,6 @@ endif # /usr/bin/scim -d #endif -# GTK+ environments such as XFce should support SCIM automatically, BUT -# if the first app you run is a Qt one, you'll run into problems. This -# can be avoided by going into Menu -> Settings -> Autostarted Applications -# and adding SCIM: /usr/bin/scim -d - -# KDE will not start SCIM automatically, so you will need a script such as -# this one in your $HOME/.kde/Autostart: - -#!/bin/csh -#[ -x /usr/bin/scim ] -#if (\$status == 0) then -# /usr/bin/scim -d & -#endif - -# Obviously, uncomment all but the first line. :-) - EOT chmod 755 $PKG/etc/profile.d/scim.sh.new diff --git a/source/x/ttf-indic-fonts/COPYING b/source/x/ttf-indic-fonts/COPYING deleted file mode 100644 index 3912109b5..000000000 --- a/source/x/ttf-indic-fonts/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/source/x/ttf-indic-fonts/Samyak_Malayalam.ttf b/source/x/ttf-indic-fonts/Samyak_Malayalam.ttf Binary files differdeleted file mode 100644 index 5d06d2ed2..000000000 --- a/source/x/ttf-indic-fonts/Samyak_Malayalam.ttf +++ /dev/null diff --git a/source/x/ttf-indic-fonts/Samyak_Malayalam.url b/source/x/ttf-indic-fonts/Samyak_Malayalam.url deleted file mode 100644 index 993d05123..000000000 --- a/source/x/ttf-indic-fonts/Samyak_Malayalam.url +++ /dev/null @@ -1,4 +0,0 @@ -http://www.gnowledge.org/Gnoware/localization/Samyak_Font/new/Samyak_Malayalam.ttf - -This font is licensed under the GPL. - diff --git a/source/x/ttf-indic-fonts/doinst.sh b/source/x/ttf-indic-fonts/doinst.sh index f6ebdc7c3..2566f24ff 100644 --- a/source/x/ttf-indic-fonts/doinst.sh +++ b/source/x/ttf-indic-fonts/doinst.sh @@ -10,4 +10,3 @@ fi if [ -x /usr/bin/fc-cache ]; then /usr/bin/fc-cache -f fi -# make links: diff --git a/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild b/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild index 2353121ff..338b5edd7 100755 --- a/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild +++ b/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=0.4.7.4 +VERSION=0.5.14 ARCH=noarch BUILD=1 @@ -32,11 +32,8 @@ rm -rf $PKG mkdir -p $PKG cd $TMP rm -rf ttf-indic-fonts-$VERSION -tar xvf $CWD/ttf-indic-fonts-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/ttf-indic-fonts_$VERSION.tar.xz || exit 1 cd ttf-indic-fonts-$VERSION || exit 1 -# Patch copyright notices so that they do not give inaccurate -# information about where to find the GPL: -zcat $CWD/ttf-indic-fonts.copyright.diff.gz | patch -p1 --verbose || exit 1 # I'm very interested in making this a better package, but have a # long way to go in understanding how all of this works. I know @@ -64,27 +61,24 @@ find . \ mkdir -p $PKG/usr/share/fonts/TTF/ cp -a */*.ttf $PKG/usr/share/fonts/TTF -# This is a better Malayalam font: -cp -a $CWD/Samyak_Malayalam.ttf.bz2 $PKG/usr/share/fonts/TTF -( cd $PKG/usr/share/fonts/TTF - bzip2 -d Samyak_Malayalam.ttf.bz2 - chmod 644 Samyak_Malayalam.ttf - chown root:root Samyak_Malayalam.ttf +mkdir -p $PKG/etc/fonts/conf.avail +find . -name "*.conf" -exec cp -a {} $PKG/etc/fonts/conf.avail \; + +mkdir -p $PKG/etc/fonts/conf.d +( cd $PKG/etc/fonts/conf.d + for file in ../conf.avail/*.conf ; do + ln -sf $file . + done ) -# Remove the old Malayalam font: -rm -f $PKG/usr/share/fonts/TTF/malayalam.ttf # Put copyright notices in the docs directory: mkdir -p $PKG/usr/doc/ttf-indic-fonts-$VERSION find . -name "*.copyright" -exec cp -a {} $PKG/usr/doc/ttf-indic-fonts-$VERSION \; -cp -a $CWD/COPYING.bz2 $PKG/usr/doc/ttf-indic-fonts-$VERSION -cp -a $CWD/Samyak_Malayalam.url $PKG/usr/doc/ttf-indic-fonts-$VERSION -( cd $PKG/usr/doc/ttf-indic-fonts-$VERSION ; bzip2 -d COPYING.bz2 ) mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $TMP/ttf-indic-fonts-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n --prepend $TMP/ttf-indic-fonts-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/ttf-indic-fonts/ttf-indic-fonts.copyright.diff b/source/x/ttf-indic-fonts/ttf-indic-fonts.copyright.diff deleted file mode 100644 index d4ba218b5..000000000 --- a/source/x/ttf-indic-fonts/ttf-indic-fonts.copyright.diff +++ /dev/null @@ -1,65 +0,0 @@ ---- ./debian/ttf-punjabi-fonts.copyright.orig 2005-09-11 00:04:08.000000000 -0500 -+++ ./debian/ttf-punjabi-fonts.copyright 2006-09-21 02:19:02.000000000 -0500 -@@ -17,5 +17,3 @@ - Copyright (c) 2003, Automatic Control Equipments, Pune, INDIA. - Released under GPL - --On a Debian system the text of the GPL can be found in --/usr/share/common-licenses. ---- ./debian/ttf-tamil-fonts.copyright.orig 2005-09-11 00:04:08.000000000 -0500 -+++ ./debian/ttf-tamil-fonts.copyright 2006-09-21 02:19:05.000000000 -0500 -@@ -25,5 +25,3 @@ - - Opentype tables were added by T. Vaseeharan <t_vasee@yahoo.com>. - --On Debian GNU/Linux systems you can find a copy of the GPL in --/usr/share/common-licenses/GPL. ---- ./debian/ttf-gujarati-fonts.copyright.orig 2005-09-11 00:04:08.000000000 -0500 -+++ ./debian/ttf-gujarati-fonts.copyright 2006-09-21 02:18:40.000000000 -0500 -@@ -28,5 +28,3 @@ - Copyright (c) 2003, Automatic Control Equipments, Pune, INDIA. - Released under GPL - --On a Debian system the text of the GPL can be found in --/usr/share/common-licenses. ---- ./debian/ttf-malayalam-fonts.copyright.orig 2006-01-15 18:03:55.000000000 -0600 -+++ ./debian/ttf-malayalam-fonts.copyright 2006-09-21 02:18:56.000000000 -0500 -@@ -18,6 +18,3 @@ - - Copyright (c) 2005 K.H.Hussain <hussain@kfri.org> - --A copy of the GNU GPL can be found at -- -- /usr/share/common-licenses/GPL ---- ./debian/ttf-telugu-fonts.copyright.orig 2005-09-11 00:04:08.000000000 -0500 -+++ ./debian/ttf-telugu-fonts.copyright 2006-09-21 02:19:09.000000000 -0500 -@@ -14,5 +14,3 @@ - ----------- - GPLed Telugu font from http://www.kavya-nandanam.com - --On a Debian system the text of the GPL can be found in --/usr/share/common-licenses. ---- ./debian/ttf-kannada-fonts.copyright.orig 2006-01-15 17:51:13.000000000 -0600 -+++ ./debian/ttf-kannada-fonts.copyright 2006-09-21 02:18:47.000000000 -0500 -@@ -7,5 +7,3 @@ - (C) Indian Institute of Science,Bangalore 2005 - Released under the GPL. - --On a Debian system the text of the GPL can be found in --/usr/share/common-licenses. ---- ./debian/ttf-devanagari-fonts.copyright.orig 2006-01-15 17:51:13.000000000 -0600 -+++ ./debian/ttf-devanagari-fonts.copyright 2006-09-21 02:18:37.000000000 -0500 -@@ -30,5 +30,3 @@ - ------------------ - Copyright (c) Sanir Karmacharya <sanir@email.com>, Suyash Shrestha - --On a Debian system the text of the GPL can be found in --/usr/share/common-licenses. ---- ./debian/ttf-oriya-fonts.copyright.orig 2005-09-11 00:04:08.000000000 -0500 -+++ ./debian/ttf-oriya-fonts.copyright 2006-09-21 02:18:59.000000000 -0500 -@@ -11,5 +11,3 @@ - (C) Andy White 2003 - Released under GPL (http://oriya.sarovar.org/) - --On a Debian system the text of the GPL can be found in --/usr/share/common-licenses. diff --git a/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff b/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff new file mode 100644 index 000000000..6d8fa176f --- /dev/null +++ b/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff @@ -0,0 +1,21 @@ +Since this fontconfig change [1], we get warnings in 44-wqy-zenhei.conf +like this: "Having multiple values in <test> isn't supported and may +not work as expected" - let's fix that... + +[1] http://cgit.freedesktop.org/fontconfig/commit/?id=2837c63876b9b + +diff -Nur wqy-zenhei.orig/44-wqy-zenhei.conf wqy-zenhei/44-wqy-zenhei.conf +--- wqy-zenhei.orig/44-wqy-zenhei.conf 2009-05-17 15:25:41.000000000 -0500 ++++ wqy-zenhei/44-wqy-zenhei.conf 2013-02-25 19:00:36.870491434 -0600 +@@ -6,7 +6,11 @@ + <match target="font"> + <test qual="any" name="family"> + <string>WenQuanYi Zen Hei</string> ++ </test> ++ <test qual="any" name="family"> + <string>文泉驿正黑</string> ++ </test> ++ <test qual="any" name="family"> + <string>文泉驛正黑</string> + </test> + <edit name="globaladvance"><bool>false</bool></edit> diff --git a/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild b/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild index b9fb149da..ee34726bb 100755 --- a/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild +++ b/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild @@ -38,7 +38,7 @@ SRCNAM=wqy-zenhei VERSION=${VERSION:-0.8.38} SUB=${SUB:-1} ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -66,6 +66,9 @@ rm -rf ${PRGNAM}-${VERSION} tar -xvf ${SOURCE} || exit 1 mv ${SRCNAM} ${PRGNAM}-${VERSION} || exit 1 cd ${PRGNAM}-${VERSION} + +zcat $CWD/fixup-fontconfig-file.diff.gz | patch -p1 || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -73,6 +76,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# The following causes an error since the package no longer contains any ttf +# fonts, but it is harmless. It's probably safer to leave the cp command the +# way it is in case future versions include any ttf fonts. # Install font: cp *.ttf *.ttc $PKG$FONTDIR/ diff --git a/source/x/x11/build/increment.sh b/source/x/x11/build/increment.sh new file mode 100755 index 000000000..6de5d0da6 --- /dev/null +++ b/source/x/x11/build/increment.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# A script to increment build numbers. +# Call it with the list of the build numbers to increase by one: +# +# ./increment.sh xf86-input-acecad xf86-input-aiptek xf86-input-joystick +# +# If a build file does not exist, it will be created with a value of 2. + +for build in $* ; do + if [ ! -r $build ]; then + echo "Creating $build with value 2" + echo 2 > $build + else + echo "Incrementing $build $(cat $build) -> $(expr $(cat $build) + 1)" + echo $(expr $(cat $build) + 1) > $build + fi +done diff --git a/source/x/x11/build/xcb-util-image b/source/x/x11/build/xcb-util-image new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/x/x11/build/xcb-util-image @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xcompmgr new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/x/x11/build/xcompmgr @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm index 0cfbf0888..b8626c4cf 100644 --- a/source/x/x11/build/xdm +++ b/source/x/x11/build/xdm @@ -1 +1 @@ -2 +4 diff --git a/source/x/x11/build/xf86-input-acecad b/source/x/x11/build/xf86-input-acecad new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/source/x/x11/build/xf86-input-acecad @@ -0,0 +1 @@ +5 diff --git a/source/x/x11/build/xf86-input-aiptek b/source/x/x11/build/xf86-input-aiptek new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/source/x/x11/build/xf86-input-aiptek @@ -0,0 +1 @@ +5 diff --git a/source/x/x11/build/xf86-input-joystick b/source/x/x11/build/xf86-input-joystick new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/source/x/x11/build/xf86-input-joystick @@ -0,0 +1 @@ +5 diff --git a/source/x/x11/build/xcb-proto b/source/x/x11/build/xf86-input-keyboard index 00750edc0..00750edc0 100644 --- a/source/x/x11/build/xcb-proto +++ b/source/x/x11/build/xf86-input-keyboard diff --git a/source/x/x11/build/xf86-input-mouse b/source/x/x11/build/xf86-input-mouse new file mode 100644 index 000000000..00750edc0 --- /dev/null +++ b/source/x/x11/build/xf86-input-mouse @@ -0,0 +1 @@ +3 diff --git a/source/x/x11/build/xf86-input-penmount b/source/x/x11/build/xf86-input-penmount new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/source/x/x11/build/xf86-input-penmount @@ -0,0 +1 @@ +5 diff --git a/source/x/x11/build/xf86-input-synaptics b/source/x/x11/build/xf86-input-synaptics new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/x/x11/build/xf86-input-synaptics @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-input-vmmouse b/source/x/x11/build/xf86-input-vmmouse new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-input-vmmouse @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-input-void b/source/x/x11/build/xf86-input-void new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/source/x/x11/build/xf86-input-void @@ -0,0 +1 @@ +5 diff --git a/source/x/x11/build/xf86-input-wacom b/source/x/x11/build/xf86-input-wacom index 0cfbf0888..b8626c4cf 100644 --- a/source/x/x11/build/xf86-input-wacom +++ b/source/x/x11/build/xf86-input-wacom @@ -1 +1 @@ -2 +4 diff --git a/source/x/x11/build/xf86-video-apm b/source/x/x11/build/xf86-video-apm index 0cfbf0888..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-apm +++ b/source/x/x11/build/xf86-video-apm @@ -1 +1 @@ -2 +4 diff --git a/source/x/x11/build/xf86-video-ark b/source/x/x11/build/xf86-video-ark new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-ark @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-ast b/source/x/x11/build/xf86-video-ast new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/x/x11/build/xf86-video-ast @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-ati b/source/x/x11/build/xf86-video-ati new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/x/x11/build/xf86-video-ati @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-chips b/source/x/x11/build/xf86-video-chips index 0cfbf0888..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-chips +++ b/source/x/x11/build/xf86-video-chips @@ -1 +1 @@ -2 +4 diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xf86-video-cirrus new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-cirrus @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-glint b/source/x/x11/build/xf86-video-glint new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-glint @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-i128 b/source/x/x11/build/xf86-video-i128 new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-i128 @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64 new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-mach64 @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-mga b/source/x/x11/build/xf86-video-mga new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-mga @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-modesetting b/source/x/x11/build/xf86-video-modesetting new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/x/x11/build/xf86-video-modesetting @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-neomagic b/source/x/x11/build/xf86-video-neomagic new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/x/x11/build/xf86-video-neomagic @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-nouveau b/source/x/x11/build/xf86-video-nouveau new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/x/x11/build/xf86-video-nouveau @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-nv b/source/x/x11/build/xf86-video-nv new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/source/x/x11/build/xf86-video-nv @@ -0,0 +1 @@ +5 diff --git a/source/x/x11/build/xf86-video-omap b/source/x/x11/build/xf86-video-omap new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-omap @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-openchrome b/source/x/x11/build/xf86-video-openchrome new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/source/x/x11/build/xf86-video-openchrome @@ -0,0 +1 @@ +2 diff --git a/source/x/x11/build/xf86-video-rendition b/source/x/x11/build/xf86-video-rendition new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-rendition @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/source/x/x11/build/xf86-video-s3virge @@ -0,0 +1 @@ +5 diff --git a/source/x/x11/build/xf86-video-siliconmotion b/source/x/x11/build/xf86-video-siliconmotion new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/source/x/x11/build/xf86-video-siliconmotion @@ -0,0 +1 @@ +5 diff --git a/source/x/x11/build/xf86-video-sis b/source/x/x11/build/xf86-video-sis new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-sis @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-sisusb b/source/x/x11/build/xf86-video-sisusb index 0cfbf0888..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-sisusb +++ b/source/x/x11/build/xf86-video-sisusb @@ -1 +1 @@ -2 +4 diff --git a/source/x/x11/build/xf86-video-tdfx b/source/x/x11/build/xf86-video-tdfx new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-tdfx @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-trident b/source/x/x11/build/xf86-video-trident new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-trident @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-tseng b/source/x/x11/build/xf86-video-tseng index 0cfbf0888..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-tseng +++ b/source/x/x11/build/xf86-video-tseng @@ -1 +1 @@ -2 +4 diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l index 7ed6ff82d..ec635144f 100644 --- a/source/x/x11/build/xf86-video-v4l +++ b/source/x/x11/build/xf86-video-v4l @@ -1 +1 @@ -5 +9 diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-vmware @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo index 0cfbf0888..7ed6ff82d 100644 --- a/source/x/x11/build/xf86-video-voodoo +++ b/source/x/x11/build/xf86-video-voodoo @@ -1 +1 @@ -2 +5 diff --git a/source/x/x11/build/xf86-video-xgi b/source/x/x11/build/xf86-video-xgi index 0cfbf0888..b8626c4cf 100644 --- a/source/x/x11/build/xf86-video-xgi +++ b/source/x/x11/build/xf86-video-xgi @@ -1 +1 @@ -2 +4 diff --git a/source/x/x11/build/xf86-video-xgixp b/source/x/x11/build/xf86-video-xgixp new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/source/x/x11/build/xf86-video-xgixp @@ -0,0 +1 @@ +4 diff --git a/source/x/x11/configure/xf86-input-vmmouse b/source/x/x11/configure/xf86-input-vmmouse index 1b99250b6..1ac863519 100644 --- a/source/x/x11/configure/xf86-input-vmmouse +++ b/source/x/x11/configure/xf86-input-vmmouse @@ -8,8 +8,7 @@ CXXFLAGS=$SLKCFLAGS \ --infodir=/usr/info \ --mandir=/usr/man \ --disable-static \ - --with-hal-bin-dir=/usr/bin \ - --with-hal-callouts-dir=/usr/libexec \ - --with-hal-fdi-dir=/usr/share/hal/fdi/policy/10osvendor \ - --with-udev-rules-dir=none \ + --with-hal-bin-dir=none \ + --with-hal-callouts-dir=none \ + --with-hal-fdi-dir=none \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-nouveau b/source/x/x11/configure/xf86-video-nouveau deleted file mode 100644 index e050771b3..000000000 --- a/source/x/x11/configure/xf86-video-nouveau +++ /dev/null @@ -1,11 +0,0 @@ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./autogen.sh \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --disable-static \ - --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server index 778d7668a..b62befbae 100644 --- a/source/x/x11/configure/xorg-server +++ b/source/x/x11/configure/xorg-server @@ -27,7 +27,7 @@ CFLAGS="$SLKCFLAGS" \ --with-int10=x86emu \ --with-default-font-path="${DEF_FONTPATH}" \ --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \ - --with-os-name="Slackware 14.0" \ + --with-os-name="Slackware 14.1" \ --with-os-vendor="Slackware Linux Project" \ --with-xkb-path=/etc/X11/xkb \ --with-xkb-output=/var/lib/xkb \ diff --git a/source/x/x11/doinst.sh/xdm b/source/x/x11/doinst.sh/xdm index e1d72520d..871a3897f 100644 --- a/source/x/x11/doinst.sh/xdm +++ b/source/x/x11/doinst.sh/xdm @@ -11,7 +11,7 @@ config() { } for conffile in \ Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \ - GiveConsole TakeConsole chooser xdm-config ../app-defaults/Chooser ; + GiveConsole TakeConsole xdm-config ../app-defaults/Chooser ; do config etc/X11/xdm/${conffile}.new done diff --git a/source/x/x11/makepkg/xorg-server b/source/x/x11/makepkg/xorg-server index 67b93c971..4f47738e1 100644 --- a/source/x/x11/makepkg/xorg-server +++ b/source/x/x11/makepkg/xorg-server @@ -33,3 +33,10 @@ cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr cd $PKG /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz +if [ "$UPGRADE_PACKAGES" = "yes" ]; then + /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz + /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz + /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz + /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz +fi + diff --git a/source/x/x11/modularize b/source/x/x11/modularize index d6eb2f68a..38762ffda 100644 --- a/source/x/x11/modularize +++ b/source/x/x11/modularize @@ -126,6 +126,7 @@ sessreg setxkbmap showfont smproxy +transset twm util-macros videoproto @@ -138,12 +139,14 @@ xbitmaps xcalc xcb-proto xcb-util +xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xclipboard xclock +xcm xcmiscproto xcmsdb xcompmgr @@ -163,6 +166,8 @@ xf86-input-acecad xf86-input-aiptek xf86-input-evdev xf86-input-joystick +xf86-input-keyboard +xf86-input-mouse xf86-input-penmount xf86-input-synaptics xf86-input-vmmouse @@ -186,6 +191,7 @@ xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau xf86-video-nv +xf86-video-omap xf86-video-openchrome xf86-video-qxl xf86-video-r128 @@ -205,6 +211,7 @@ xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-xgi +xf86-video-xgixp xf86bigfontproto xf86dga xf86dgaproto diff --git a/source/x/x11/package-blacklist b/source/x/x11/package-blacklist index 377624999..8e2f3eb5c 100644 --- a/source/x/x11/package-blacklist +++ b/source/x/x11/package-blacklist @@ -2,6 +2,10 @@ # this platform) below. Just the package name -- no version # number is needed. +# ARM only packages: +# They also say in the README for this one that it is not yet ready: +xf86-video-omap + # MacOS related packages: applewmproto windowswmproto diff --git a/source/x/x11/patch/xcompmgr.patch b/source/x/x11/patch/xcompmgr.patch index 6097b12a3..33c43a524 100644 --- a/source/x/x11/patch/xcompmgr.patch +++ b/source/x/x11/patch/xcompmgr.patch @@ -1,2 +1,4 @@ zcat $CWD/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff.gz | patch -p1 --verbose \ || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +zcat $CWD/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff.gz | patch -p0 --verbose \ + || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff b/source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff new file mode 100644 index 000000000..39b8ac725 --- /dev/null +++ b/source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff @@ -0,0 +1,28 @@ +--- xcompmgr.c 2011-11-19 01:49:52.000000000 -0600 ++++ xcompmgr.c 2012-08-11 21:58:58.000000000 -0500 +@@ -1028,7 +1028,6 @@ + { + w->borderClip = XFixesCreateRegion (dpy, NULL, 0); + XFixesCopyRegion (dpy, w->borderClip, region); +- XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); + } + w->prev_trans = t; + t = w; +@@ -1080,6 +1079,8 @@ + if (w->mode == WINDOW_TRANS) + { + int x, y, wid, hei; ++ XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); ++ XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip); + #if HAS_NAME_WINDOW_PIXMAP + x = w->a.x; + y = w->a.y; +@@ -1099,6 +1100,8 @@ + else if (w->mode == WINDOW_ARGB) + { + int x, y, wid, hei; ++ XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); ++ XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip); + #if HAS_NAME_WINDOW_PIXMAP + x = w->a.x; + y = w->a.y; diff --git a/source/x/x11/patch/xdm.patch b/source/x/x11/patch/xdm.patch new file mode 100644 index 000000000..75e0dcb92 --- /dev/null +++ b/source/x/x11/patch/xdm.patch @@ -0,0 +1 @@ +zcat $CWD/patch/xdm/xdm.glibc.crypt.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xdm/xdm.glibc.crypt.diff b/source/x/x11/patch/xdm/xdm.glibc.crypt.diff new file mode 100644 index 000000000..076df37dc --- /dev/null +++ b/source/x/x11/patch/xdm/xdm.glibc.crypt.diff @@ -0,0 +1,42 @@ +From 8d1eb5c74413e4c9a21f689fc106949b121c0117 Mon Sep 17 00:00:00 2001 +From: mancha <mancha1@hush.com> +Date: Wed, 22 May 2013 14:20:26 +0000 +Subject: Handle NULL returns from glibc 2.17+ crypt(). + +Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL +(w/ NULL return) if the salt violates specifications. Additionally, +on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords +passed to crypt() fail with EPERM (w/ NULL return). + +If using glibc's crypt(), check return value to avoid a possible +NULL pointer dereference. + +Reviewed-by: Matthieu Herrb <matthieu@herrb.eu> +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +--- +diff --git a/greeter/verify.c b/greeter/verify.c +index db3cb7d..b009e2b 100644 +--- a/greeter/verify.c ++++ b/greeter/verify.c +@@ -329,6 +329,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) + struct spwd *sp; + # endif + char *user_pass = NULL; ++ char *crypted_pass = NULL; + # endif + # ifdef __OpenBSD__ + char *s; +@@ -464,7 +465,9 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) + # if defined(ultrix) || defined(__ultrix__) + if (authenticate_user(p, greet->password, NULL) < 0) + # else +- if (strcmp (crypt (greet->password, user_pass), user_pass)) ++ crypted_pass = crypt (greet->password, user_pass); ++ if ((crypted_pass == NULL) ++ || (strcmp (crypted_pass, user_pass))) + # endif + { + if(!greet->allow_null_passwd || strlen(p->pw_passwd) > 0) { +-- +cgit v0.9.0.2-2-gbebe + diff --git a/source/x/x11/patch/xf86-video-apm.patch b/source/x/x11/patch/xf86-video-apm.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-apm.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-ark.patch b/source/x/x11/patch/xf86-video-ark.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-ark.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-ast.patch b/source/x/x11/patch/xf86-video-ast.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-ast.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-chips.patch b/source/x/x11/patch/xf86-video-chips.patch index a5a54ac0e..a9ddcaa4d 100644 --- a/source/x/x11/patch/xf86-video-chips.patch +++ b/source/x/x11/patch/xf86-video-chips.patch @@ -1,4 +1,25 @@ -for patchfile in $CWD/patch/xf86-video-chips/*.patch ; do - cat $patchfile | patch -p1 --verbose \ - || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } ; +# Rationale for this is here: + +# commit bde65934fe8b40a5fdc8a469d0355caca59e81b5 +# Author: Alan Coopersmith <alan.coopersmith@oracle.com> +# Date: Sat Jul 21 09:27:10 2012 -0700 +# +# Add iopl.h to source lists in util/Makefile.am so it gets packaged +# +# Was missed when it was created in commit c421f2477c9999, since +# "make distcheck" passes due to configure determining it can't +# build the utils without the header and moving on. +# +# Reported-by: Andreas Radke <a.radke@arcor.de> +# Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +# iopl.h obtained from git repo +cp $CWD/patch/xf86-video-chips/iopl.h util/ \ + || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file done diff --git a/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch b/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch deleted file mode 100644 index a52e41037..000000000 --- a/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch +++ /dev/null @@ -1,588 +0,0 @@ -From e4bd864898fd276a62dac05cdfff394e98434f02 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Tue, 29 Mar 2011 13:53:31 +1000 -Subject: [PATCH 1/9] chips: gut the overlay 8/16 support from driver. - -This driver is for chips that were bought by Intel in 1997, -this feature means maintaining a lot of code in the X server -for little gain. - -Drop it like its hot. - -Signed-off-by: Dave Airlie <airlied@redhat.com> -Reviewed-by: Adam Jackson <ajax@redhat.com> ---- - man/chips.man | 3 - - src/ct_accel.c | 46 ++--------- - src/ct_driver.c | 234 ++++++------------------------------------------------- - src/ct_driver.h | 1 - - src/ct_video.c | 3 +- - 5 files changed, 28 insertions(+), 259 deletions(-) - -diff --git a/man/chips.man b/man/chips.man -index 740af38..0c022ee 100644 ---- a/man/chips.man -+++ b/man/chips.man -@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off - Force driver to leave centering and stretching registers alone. This - can fix some laptop suspend/resume problems. Default: off - .TP --.BI "Option \*qOverlay\*q" --Enable 8+24 overlay mode. Only appropriate for depth 24. Default: off. --.TP - .BI "Option \*qColorKey\*q \*q" integer \*q - Set the colormap index used for the transparency key for the depth 8 plane - when operating in 8+16 overlay mode. The value must be in the range -diff --git a/src/ct_accel.c b/src/ct_accel.c -index 3920b0a..4b5776a 100644 ---- a/src/ct_accel.c -+++ b/src/ct_accel.c -@@ -428,19 +428,7 @@ chips_imagewrite: - infoPtr->ImageWriteFlags |= NO_PLANEMASK; - #endif - -- --#ifdef CHIPS_HIQV -- if (XAAInit(pScreen, infoPtr)) { -- if (cPtr->Flags & ChipsOverlay8plus16) -- return(XAAInitDualFramebufferOverlay(pScreen, -- CTNAME(DepthChange))); -- else -- return TRUE; -- } else -- return FALSE; --#else - return(XAAInit(pScreen, infoPtr)); --#endif - } - - #ifdef CHIPS_HIQV -@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn, - #endif - w *= cAcl->BytesPerPixel; - ctBLTWAIT; --#ifdef CHIPS_HIQV -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) && -- (pScrn->depth == 8)) -- ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes); --#endif - ctSETSRCADDR(srcaddr); - ctSETDSTADDR(destaddr); - #ifdef CHIPS_HIQV -@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, - patternaddr = (paty * pScrn->displayWidth + - (patx & ~0x3F)) * cAcl->BytesPerPixel; - cAcl->patternyrot = (patx & 0x3F) >> 3; --#ifdef CHIPS_HIQV -- if (cPtr->Flags & ChipsOverlay8plus16) -- patternaddr += cPtr->FbOffset16; --#endif - - ctBLTWAIT; - ctSETPATSRCADDR(patternaddr); -@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, - - #ifdef CHIPS_HIQV - patternaddr = paty * pScrn->displayWidth + patx; -- if (cPtr->Flags & ChipsOverlay8plus16) -- patternaddr = patternaddr * 2 + cPtr->FbOffset16; -- else -- patternaddr *= cAcl->BytesPerPixel; -+ patternaddr *= cAcl->BytesPerPixel; - #else - patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel; - #endif -@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dwords = (((skipleft + bytesPerLine + 0x7) & ~0x7)) >> 2; - destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); - destpitch = pScrn->displayWidth * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- destaddr += cPtr->FbOffset16; -- else -- destaddr += cAcl->FbOffset; -+ destaddr += cAcl->FbOffset; - - ctBLTWAIT; - -@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - y++; - - destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- destaddr += cPtr->FbOffset16; -- else -- destaddr += cAcl->FbOffset; -+ destaddr += cAcl->FbOffset; - - ctBLTWAIT; - ctSETDSTADDR(destaddr); -@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2; - srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); - srcpitch = pScrn->displayWidth * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- srcaddr += cPtr->FbOffset16; -- else -- srcaddr += cAcl->FbOffset; -+ srcaddr += cAcl->FbOffset; - - ctBLTWAIT; - ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | -@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dst += dstwidth; - y++; - srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- srcaddr += cPtr->FbOffset16; -- else -- srcaddr += cAcl->FbOffset; -+ srcaddr += cAcl->FbOffset; - ctBLTWAIT; - ctSETSRCADDR(srcaddr); - ctSETHEIGHTWIDTHGO(h, bytesPerLine); -diff --git a/src/ct_driver.c b/src/ct_driver.c -index 6624b79..08df050 100644 ---- a/src/ct_driver.c -+++ b/src/ct_driver.c -@@ -1639,55 +1639,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - } - } - -- if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) { -- if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) { -- if (pScrn->bitsPerPixel == 16) { -- if (cPtr->Flags & ChipsLinearSupport) { -- cPtr->Flags |= ChipsOverlay8plus16; -- if(!xf86GetOptValInteger( -- cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey))) -- pScrn->colorKey = TRANSPARENCY_KEY; -- pScrn->overlayFlags = OVERLAY_8_16_DUALFB; -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "PseudoColor overlay enabled.\n"); -- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH)) -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Forcing option \"Stretch\" \"ON\".\n"); -- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER)) -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Forcing option \"LcdCenter\" \"OFF\".\n"); -- if (cPtr->Flags & ChipsShadowFB) { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Disabling \"Shadow Framebuffer\".\n"); -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " Not support with option \"8Plus16\".\n"); -- cPtr->Flags &= ~ChipsShadowFB; -- cPtr->Rotate = 0; -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n"); -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "Option \"Overlay\" is not supported in this configuration\n"); -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "\"%s\" is not a valid value for Option \"Overlay\"\n", s); -- } -- } -- -- if (!(cPtr->Flags & ChipsOverlay8plus16)) { -- if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, -- &(cPtr->videoKey))) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", -+ if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, -+ &(cPtr->videoKey))) { -+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", - cPtr->videoKey); -- } else { -- cPtr->videoKey = (1 << pScrn->offset.red) | -+ } else { -+ cPtr->videoKey = (1 << pScrn->offset.red) | - (1 << pScrn->offset.green) | - (((pScrn->mask.blue >> pScrn->offset.blue) - 1) - << pScrn->offset.blue); -- } - } - - if (cPtr->Flags & ChipsShadowFB) { -@@ -2335,28 +2295,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - /* and 32bits on the others. Thus multiply by a suitable factor */ - if (cPtr->Flags & Chips64BitMemory) { - if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) -- if (cPtr->Flags & ChipsOverlay8plus16 ) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1)); - else -- if (cPtr->Flags & ChipsOverlay8plus16) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 8 * 0.7 / bytesPerPixel); - } else { - if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) -- if (cPtr->Flags & ChipsOverlay8plus16 ) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1)); - else -- if (cPtr->Flags & ChipsOverlay8plus16) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 4 * 0.7 / bytesPerPixel); - } -@@ -3736,8 +3684,7 @@ CHIPSEnterVT(int scrnIndex, int flags) - /* Should we re-save the text mode on each VT enter? */ - if(!chipsModeInit(pScrn, pScrn->currentMode)) - return FALSE; -- if ((!(cPtr->Flags & ChipsOverlay8plus16)) -- && (cPtr->Flags & ChipsVideoSupport) -+ if ((cPtr->Flags & ChipsVideoSupport) - && (cPtr->Flags & ChipsLinearSupport)) - CHIPSResetVideo(pScrn); - -@@ -3788,8 +3735,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, - int i, index, shift ; - CHIPSEntPtr cPtrEnt; - -- shift = ((pScrn->depth == 15) && -- (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0; -+ shift = (pScrn->depth == 15) ? 3 : 0; - - if (cPtr->UseDualChannel) { - cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0], -@@ -3895,18 +3841,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, - hwp->disablePalette(hwp); - } - --static Bool --cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8, -- int xsize, int ysize, int dpix, int dpiy, -- int width16, int width8) --{ -- return -- (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize, -- dpix, dpiy, width16, width8, 16, 8) && -- fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize, -- dpix, dpiy, width16, width8, 16, 8, 16, 8)); --} -- - /* Mandatory */ - static Bool - CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -@@ -3947,22 +3881,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!chipsMapMem(pScrn)) - return FALSE; - -- /* Setup a pointer to the overlay if needed */ -- if (cPtr->Flags & ChipsOverlay8plus16) { -- cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY; -- cPtr->FbSize16 = (pScrn->displayWidth << 1) * pScrn->virtualY; -- if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "Too little memory for overlay. Disabling.\n"); -- cPtr->Flags &= ~ChipsOverlay8plus16; -- } -- if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "Max overlay Width/Height 1024 pixels. Disabling.\n"); -- cPtr->Flags &= ~ChipsOverlay8plus16; -- } -- } -- - /* Setup the MMIO register access functions if need */ - if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) { - CHIPSSetMmioExtFuncs(cPtr); -@@ -4035,18 +3953,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - miClearVisualTypes(); - - /* Setup the visuals we support. */ -- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){ -- if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask, -- pScrn->rgbBits, PseudoColor)) -- return FALSE; -- if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor)) -- return FALSE; -- } else { -- if (!miSetVisualTypes(pScrn->depth, -+ if (!miSetVisualTypes(pScrn->depth, - miGetDefaultVisualMask(pScrn->depth), - pScrn->rgbBits, pScrn->defaultVisual)) -- return FALSE; -- } -+ return FALSE; - miSetPixmapDepths (); - - /* -@@ -4090,13 +4000,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - break; - #endif - case 16: -- if (cPtr->Flags & ChipsOverlay8plus16) { -- ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + -- cPtr->FbOffset16, FBStart, width, -- height, pScrn->xDpi, pScrn->yDpi, -- displayWidth, displayWidth); -- break; -- } - default: - ret = fbScreenInit(pScreen, FBStart, - width,height, -@@ -4244,9 +4147,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (pScrn->bitsPerPixel < 8) - freespace = allocatebase - pScrn->displayWidth * - pScrn->virtualY / 2; -- else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) -- freespace = allocatebase - pScrn->displayWidth * -- pScrn->virtualY - cPtr->FbSize16; - else - freespace = allocatebase - pScrn->displayWidth * - pScrn->virtualY * (pScrn->bitsPerPixel >> 3); -@@ -4369,9 +4269,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - AvailFBArea.y2 = cAcl->CacheEnd / - (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)); - -- if (!(cPtr->Flags & ChipsOverlay8plus16)) { -- xf86InitFBManager(pScreen, &AvailFBArea); -- } -+ xf86InitFBManager(pScreen, &AvailFBArea); - } - if (cPtr->Flags & ChipsAccelSupport) { - if (IS_HiQV(cPtr)) { -@@ -4425,16 +4323,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!miCreateDefColormap(pScreen)) - return FALSE; - -- if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) { -- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette, -- NULL, CMAP_RELOAD_ON_MODE_SWITCH)) -- return FALSE; -- } else { -- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, -+ if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, - (pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette), - NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR)) -- return FALSE; -- } -+ return FALSE; - - #ifndef XSERVER_LIBPCIACCESS - racflag = RAC_COLORMAP; -@@ -4448,8 +4340,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - xf86SetSilkenMouse(pScreen); - #endif - -- if ((!(cPtr->Flags & ChipsOverlay8plus16)) -- && (cPtr->Flags & ChipsVideoSupport) -+ if ((cPtr->Flags & ChipsVideoSupport) - && (cPtr->Flags & ChipsLinearSupport)) { - CHIPSInitVideo(pScreen); - } -@@ -4522,10 +4413,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) - Base >>= 3; - break; - case 16: -- if (!(cPtr->Flags & ChipsOverlay8plus16)) -- Base >>= 1; -- else -- Base >>= 2; -+ Base >>= 1; - break; - case 24: - if (!IS_HiQV(cPtr)) -@@ -4581,14 +4469,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) - cPtr->writeMSS(cPtr, hwp, MSS); - } - -- if (cPtr->Flags & ChipsOverlay8plus16) { -- Base = (Base << 3) & ~(unsigned long)0xF; -- -- cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8); -- cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF); -- cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF); -- } -- - } - - /* Mandatory */ -@@ -4652,13 +4532,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; - CHIPSPtr cPtr = CHIPSPTR(pScrn); - -- if (flags & MODECHECK_FINAL) { -- /* Don't subtract FrambufferSize here as it should be subtracted already */ -- if ((cPtr->Flags & ChipsOverlay8plus16) -- && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY -- < 0)) -- return MODE_MEM; -- } - /* The tests here need to be expanded */ - if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD)) - return MODE_NO_INTERLACE; -@@ -5544,12 +5417,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } else { - ChipsStd->Attribute[0x10] = 0x01; /* mode */ - } -- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) { -- /* Make sure that the overlay isn't visible in the overscan region */ -- if (ChipsStd->Attribute[0x11] == pScrn->colorKey) -- ChipsStd->Attribute[0x11] = pScrn->colorKey - 1; -- } else -- ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ -+ ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ - ChipsStd->Attribute[0x12] = 0x0F; /* enable all color planes */ - ChipsStd->Attribute[0x13] = 0x00; /* horiz pixel panning 0 */ - -@@ -5558,8 +5426,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - /* set virtual screen width */ - tmp = pScrn->displayWidth >> 3; - if (pScrn->bitsPerPixel == 16) { -- if (!(cPtr->Flags & ChipsOverlay8plus16)) -- tmp <<= 1; /* double the width of the buffer */ -+ tmp <<= 1; /* double the width of the buffer */ - } else if (pScrn->bitsPerPixel == 24) { - tmp += tmp << 1; - } else if (pScrn->bitsPerPixel == 32) { -@@ -5688,8 +5555,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - - /* centering/stretching */ - if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) { -- if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) || -- (cPtr->Flags & ChipsOverlay8plus16)) { -+ if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) { - ChipsNew->FR[0x40] &= 0xDF; /* Disable Horizontal stretching */ - ChipsNew->FR[0x48] &= 0xFB; /* Disable vertical stretching */ - ChipsNew->XR[0xA0] = 0x10; /* Disable cursor stretching */ -@@ -5709,8 +5575,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } - } - -- if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) -- || (cPtr->Flags & ChipsOverlay8plus16)) { -+ if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) { - ChipsNew->FR[0x40] |= 0x3; /* Enable Horizontal centering */ - ChipsNew->FR[0x48] |= 0x3; /* Enable Vertical centering */ - } else { -@@ -5723,8 +5588,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - ChipsNew->XR[0x82] |=0x02; - - /* software mode flag */ -- ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ? -- 8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ? -+ ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ? - min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) : - mode->CrtcHDisplay, mode->CrtcVDisplay); - #ifdef DEBUG -@@ -5762,7 +5626,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } - } - /* bpp depend */ -- if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) { -+ if (pScrn->bitsPerPixel == 16) { - ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4; - if (cPtr->Flags & ChipsGammaSupport) - ChipsNew->XR[0x82] |= 0x0C; -@@ -5915,60 +5779,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - /* Turn off multimedia by default as it degrades performance */ - ChipsNew->XR[0xD0] &= 0x0f; - -- /* Setup the video/overlay */ -- if (cPtr->Flags & ChipsOverlay8plus16) { -- ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ --#ifdef SAR04 -- ChipsNew->XR[0x4F] = 0x2A; /* SAR04 >352 pixel overlay width */ --#endif -- ChipsNew->MR[0x1E] &= 0xE0; /* Set Zoom and Direction */ -- if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE)) -- ChipsNew->MR[0x1E] |= 0x10; /* Interlace */ -- ChipsNew->MR[0x1F] &= 0x14; /* Mask reserved bits */ -- ChipsNew->MR[0x1F] |= 0x08; /* RGB 16bpp */ -- if (pScrn->weight.green == 5) -- ChipsNew->MR[0x1F] |= 0x01; /* RGB 15bpp */ -- -- ChipsNew->MR[0x20] &= 0x03; /* Mask reserved bits */ -- ChipsNew->MR[0x20] |= 0x80; /* Auto Centre, Use mem ptr1 */ -- ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 1 */ -- ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF; -- ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF; -- ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 2 */ -- ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF; -- ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF; -- ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ -- ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1; -- -- /* Left Edge of Overlay */ -- ChipsNew->MR[0x2A] = cPtr->OverlaySkewX; -- ChipsNew->MR[0x2B] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7); -- /* Right Edge of Overlay */ -- ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - -- 1) & 0xFF; -- ChipsNew->MR[0x2D] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth - -- 1) >> 8) & 0x07; -- /* Top Edge of Overlay */ -- ChipsNew->MR[0x2E] = cPtr->OverlaySkewY; -- ChipsNew->MR[0x2F] &= 0xF8; -- ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7); -- /* Bottom Edge of Overlay*/ -- ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF; -- ChipsNew->MR[0x31] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - -- 1 ) >> 8) & 0x07; -- -- ChipsNew->MR[0x3C] &= 0x18; /* Mask reserved bits */ -- ChipsNew->MR[0x3C] |= 0x07; /* Enable keyed overlay window */ -- ChipsNew->MR[0x3D] = 0x00; -- ChipsNew->MR[0x3E] = 0x00; -- ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */ -- ChipsNew->MR[0x40] = 0xFF; -- ChipsNew->MR[0x41] = 0xFF; -- ChipsNew->MR[0x42] = 0x00; -- } else if (cPtr->Flags & ChipsVideoSupport) { -+ if (cPtr->Flags & ChipsVideoSupport) { - #if 0 /* if we do this even though video isn't playing we kill performance */ - ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ - #endif -@@ -6877,8 +6688,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs) - } - - /* Set SAR04 multimedia register correctly */ -- if ((cPtr->Flags & ChipsOverlay8plus16) -- || (cPtr->Flags & ChipsVideoSupport)) { -+ if ((cPtr->Flags & ChipsVideoSupport)) { - #ifdef SAR04 - cPtr->writeXR(cPtr, 0x4E, 0x04); - if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F]) -diff --git a/src/ct_driver.h b/src/ct_driver.h -index d8ce228..10a24d4 100644 ---- a/src/ct_driver.h -+++ b/src/ct_driver.h -@@ -114,7 +114,6 @@ typedef struct { - /* Options flags for the C&T chipsets */ - #define ChipsHWCursor 0x00001000 - #define ChipsShadowFB 0x00002000 --#define ChipsOverlay8plus16 0x00004000 - #define ChipsUseNewFB 0x00008000 - - /* Architecture type flags */ -diff --git a/src/ct_video.c b/src/ct_video.c -index a68acb9..c9e5bb4 100644 ---- a/src/ct_video.c -+++ b/src/ct_video.c -@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen) - CHIPSPtr cPtr = CHIPSPTR(pScrn); - int num_adaptors; - -- if (!(cPtr->Flags & ChipsOverlay8plus16) && -- (cPtr->Flags & ChipsVideoSupport)) { -+ if ((cPtr->Flags & ChipsVideoSupport)) { - newAdaptor = CHIPSSetupImageVideo(pScreen); - CHIPSInitOffscreenImages(pScreen); - } --- -1.7.9.4 - diff --git a/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch b/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch deleted file mode 100644 index 6caaa210d..000000000 --- a/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5f8a7320123255408b393eab9ecfae783920622a Mon Sep 17 00:00:00 2001 -From: Mark Kettenis <kettenis@openbsd.org> -Date: Mon, 26 Sep 2011 21:26:26 +0200 -Subject: [PATCH 2/9] PciTag is unused when using libpciaccess - -Signed-off-by: Mark Kettenis <kettenis@openbsd.org> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -Reviewed-by: Julien Cristau <jcristau@debian.org> ---- - src/ct_driver.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/ct_driver.h b/src/ct_driver.h -index 10a24d4..39eeb6e 100644 ---- a/src/ct_driver.h -+++ b/src/ct_driver.h -@@ -271,7 +271,9 @@ typedef struct { - - typedef struct _CHIPSRec { - pciVideoPtr PciInfo; -+#ifndef XSERVER_LIBPCIACCESS - PCITAG PciTag; -+#endif - int Chipset; - EntityInfoPtr pEnt; - IOADDRESS PIOBase; --- -1.7.9.4 - diff --git a/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch b/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch deleted file mode 100644 index de379e4dd..000000000 --- a/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7ca1840f39d0216e44fe1ca938cfc3ced048da1d Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Tue, 18 Oct 2011 22:24:54 -0700 -Subject: [PATCH 3/9] Use malloc/calloc/realloc/free directly - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- - src/ct_driver.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/ct_driver.c b/src/ct_driver.c -index 08df050..e6538c6 100644 ---- a/src/ct_driver.c -+++ b/src/ct_driver.c -@@ -949,7 +949,7 @@ CHIPSProbe(DriverPtr drv, int flags) - } - - } -- xfree(usedChips); -+ free(usedChips); - } - } - -@@ -981,12 +981,12 @@ CHIPSProbe(DriverPtr drv, int flags) - pScrn->ValidMode = CHIPSValidMode; - foundScreen = TRUE; - } -- xfree(usedChips); -+ free(usedChips); - } - } - #endif - -- xfree(devSections); -+ free(devSections); - return foundScreen; - } - #endif -@@ -4126,7 +4126,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY, - pScrn->displayWidth, pBankInfo)) { -- xfree(pBankInfo); -+ free(pBankInfo); - pBankInfo = NULL; - return FALSE; - } --- -1.7.9.4 - diff --git a/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch b/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch deleted file mode 100644 index bcf6355a1..000000000 --- a/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f5191838b70d67e991bef3491d2a60915988079c Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Tue, 18 Oct 2011 22:37:00 -0700 -Subject: [PATCH 4/9] configure.ac: Remove AM_PROG_CC_C_O - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- - configure.ac | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 225e516..c0ed508 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -44,9 +44,6 @@ XORG_DEFAULT_OPTIONS - AC_DISABLE_STATIC - AC_PROG_LIBTOOL - --# Checks for programs. --AM_PROG_CC_C_O -- - AH_TOP([#include "xorg-server.h"]) - - # Define a configure option for an alternate module directory --- -1.7.9.4 - diff --git a/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch b/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch deleted file mode 100644 index 77d0d5bc0..000000000 --- a/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch +++ /dev/null @@ -1,283 +0,0 @@ -From 94a8b34528b42a4fe6f81c8b8bd1ddb6bebaeea9 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Tue, 18 Oct 2011 23:04:32 -0700 -Subject: [PATCH 5/9] util: Consolidate common macros - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- - util/dRegs.c | 57 +------------------------------------------------------ - util/iopl.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - util/mRegs.c | 57 +------------------------------------------------------ - util/modClock.c | 53 ++------------------------------------------------- - 4 files changed, 58 insertions(+), 163 deletions(-) - create mode 100644 util/iopl.h - -diff --git a/util/dRegs.c b/util/dRegs.c -index b7edc8f..0d2f0cb 100644 ---- a/util/dRegs.c -+++ b/util/dRegs.c -@@ -1,63 +1,8 @@ -- -- -- -- -- -- --#ifdef __NetBSD__ --# include <sys/types.h> --# include <machine/pio.h> --# include <machine/sysarch.h> --#else --# if defined(SVR4) && defined(i386) --# include <sys/types.h> --# ifdef NCR -- /* broken NCR <sys/sysi86.h> */ --# define __STDC --# include <sys/sysi86.h> --# undef __STDC --# else --# include <sys/sysi86.h> --# endif --# ifdef SVR4 --# if !defined(sun) --# include <sys/seg.h> --# endif --# endif --# include <sys/v86.h> --# if defined(sun) --# include <sys/psw.h> --# endif --# endif --# include "AsmMacros.h" --#endif /* NetBSD */ -- - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> - --#ifdef __NetBSD__ --# define SET_IOPL() i386_iopl(3) --# define RESET_IOPL() i386_iopl(0) --#else --# if defined(SVR4) && defined(i386) --# ifndef SI86IOPL --# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) --# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) --# else --# define SET_IOPL() sysi86(SI86IOPL,3) --# define RESET_IOPL() sysi86(SI86IOPL,0) --# endif --# else --# ifdef linux --# define SET_IOPL() iopl(3) --# define RESET_IOPL() iopl(0) --# else --# define SET_IOPL() (void)0 --# define RESET_IOPL() (void)0 --# endif --# endif --#endif -+#include "iopl.h" - - int main(void) - { -diff --git a/util/iopl.h b/util/iopl.h -new file mode 100644 -index 0000000..d7890b3 ---- /dev/null -+++ b/util/iopl.h -@@ -0,0 +1,54 @@ -+#ifdef __NetBSD__ -+# include <sys/types.h> -+# include <machine/pio.h> -+# include <machine/sysarch.h> -+#else -+# if defined(SVR4) && defined(i386) -+# include <sys/types.h> -+# ifdef NCR -+ /* broken NCR <sys/sysi86.h> */ -+# define __STDC -+# include <sys/sysi86.h> -+# undef __STDC -+# else -+# include <sys/sysi86.h> -+# endif -+# ifdef SVR4 -+# if !defined(sun) -+# include <sys/seg.h> -+# endif -+# endif -+# include <sys/v86.h> -+# if defined(sun) -+# include <sys/psw.h> -+# endif -+# endif -+# include "AsmMacros.h" -+#endif /* NetBSD */ -+ -+#include <unistd.h> -+#include <stdio.h> -+#include <stdlib.h> -+ -+#ifdef __NetBSD__ -+# define SET_IOPL() i386_iopl(3) -+# define RESET_IOPL() i386_iopl(0) -+#else -+# if defined(SVR4) && defined(i386) -+# ifndef SI86IOPL -+# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) -+# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) -+# else -+# define SET_IOPL() sysi86(SI86IOPL,3) -+# define RESET_IOPL() sysi86(SI86IOPL,0) -+# endif -+# else -+# ifdef linux -+# define SET_IOPL() iopl(3) -+# define RESET_IOPL() iopl(0) -+# else -+# define SET_IOPL() (void)0 -+# define RESET_IOPL() (void)0 -+# endif -+# endif -+#endif -diff --git a/util/mRegs.c b/util/mRegs.c -index f359738..843d01d 100644 ---- a/util/mRegs.c -+++ b/util/mRegs.c -@@ -1,63 +1,8 @@ -- -- -- -- -- -- --#ifdef __NetBSD__ --# include <sys/types.h> --# include <machine/pio.h> --# include <machine/sysarch.h> --#else --# if defined(SVR4) && defined(i386) --# include <sys/types.h> --# ifdef NCR -- /* broken NCR <sys/sysi86.h> */ --# define __STDC --# include <sys/sysi86.h> --# undef __STDC --# else --# include <sys/sysi86.h> --# endif --# ifdef SVR4 --# if !defined(sun) --# include <sys/seg.h> --# endif --# endif --# include <sys/v86.h> --# if defined(sun) --# include <sys/psw.h> --# endif --# endif --# include "AsmMacros.h" --#endif /* NetBSD */ -- - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> - --#ifdef __NetBSD__ --# define SET_IOPL() i386_iopl(3) --# define RESET_IOPL() i386_iopl(0) --#else --# if defined(SVR4) && defined(i386) --# ifndef SI86IOPL --# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) --# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) --# else --# define SET_IOPL() sysi86(SI86IOPL,3) --# define RESET_IOPL() sysi86(SI86IOPL,0) --# endif --# else --# ifdef linux --# define SET_IOPL() iopl(3) --# define RESET_IOPL() iopl(0) --# else --# define SET_IOPL() (void)0 --# define RESET_IOPL() (void)0 --# endif --# endif --#endif -+#include "iopl.h" - - int hex2int(char* str); - -diff --git a/util/modClock.c b/util/modClock.c -index 89a291a..45af19b 100644 ---- a/util/modClock.c -+++ b/util/modClock.c -@@ -1,61 +1,12 @@ -- --#ifdef __NetBSD__ --# include <sys/types.h> --# include <machine/pio.h> --# include <machine/sysarch.h> --#else --# if defined(SVR4) && defined(i386) --# include <sys/types.h> --# ifdef NCR -- /* broken NCR <sys/sysi86.h> */ --# define __STDC --# include <sys/sysi86.h> --# undef __STDC --# else --# include <sys/sysi86.h> --# endif --# ifdef SVR4 --# if !defined(sun) --# include <sys/seg.h> --# endif --# endif --# include <sys/v86.h> --# if defined(sun) --# include <sys/psw.h> --# endif --# endif --# include "AsmMacros.h" --#endif /* NetBSD */ -- - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> -+ - #ifndef Lynx - #include <fnmatch.h> - #endif - --#ifdef __NetBSD__ --# define SET_IOPL() i386_iopl(3) --# define RESET_IOPL() i386_iopl(0) --#else --# if defined(SVR4) && defined(i386) --# ifndef SI86IOPL --# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) --# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) --# else --# define SET_IOPL() sysi86(SI86IOPL,3) --# define RESET_IOPL() sysi86(SI86IOPL,0) --# endif --# else --# ifdef linux --# define SET_IOPL() iopl(3) --# define RESET_IOPL() iopl(0) --# else --# define SET_IOPL() (void)0 --# define RESET_IOPL() (void)0 --# endif --# endif --#endif -+#include "iopl.h" - - #define tolerance 0.01 /* +/- 1% */ - --- -1.7.9.4 - diff --git a/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch b/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch deleted file mode 100644 index a0b4bb4b9..000000000 --- a/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c421f2477c99990d0dc712d6aece981fa6c961e5 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Tue, 18 Oct 2011 23:09:09 -0700 -Subject: [PATCH 6/9] Fix implicit declaration of iopl -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -warning: implicit declaration of function ‘iopl’ [-Wimplicit-function-declaration] - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- - util/iopl.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/util/iopl.h b/util/iopl.h -index d7890b3..e08207c 100644 ---- a/util/iopl.h -+++ b/util/iopl.h -@@ -3,6 +3,12 @@ - # include <machine/pio.h> - # include <machine/sysarch.h> - #else -+# if defined(__linux__) -+/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc -+ * # include <sys/io.h> -+ */ -+int iopl(int level); -+# endif - # if defined(SVR4) && defined(i386) - # include <sys/types.h> - # ifdef NCR --- -1.7.9.4 - diff --git a/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch b/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch deleted file mode 100644 index 12dc51316..000000000 --- a/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8a5ea07f30cc71ecc413fad0713facff72f77472 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Tue, 18 Oct 2011 23:21:33 -0700 -Subject: [PATCH 7/9] Build fix for ABI Version 12 - -ABI Version 12 removes support for multiple PCI domains. If you need to -use this driver on a system with more than one PCI domain, you should -either port this driver to using libpciaccess directly or stick with an -older server. - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- - src/ct_driver.c | 5 +++++ - src/ct_driver.h | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/ct_driver.c b/src/ct_driver.c -index e6538c6..a2e5c94 100644 ---- a/src/ct_driver.c -+++ b/src/ct_driver.c -@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - - hwp = VGAHWPTR(pScrn); - vgaHWGetIOBase(hwp); -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - cPtr->PIOBase = hwp->PIOOffset; -+#else -+ cPtr->PIOBase = 0; -+#endif -+ - /* - * Must allow ensure that storage for the 2nd set of vga registers is - * allocated for dual channel cards -diff --git a/src/ct_driver.h b/src/ct_driver.h -index 39eeb6e..9033867 100644 ---- a/src/ct_driver.h -+++ b/src/ct_driver.h -@@ -276,8 +276,8 @@ typedef struct _CHIPSRec { - #endif - int Chipset; - EntityInfoPtr pEnt; -- IOADDRESS PIOBase; -- CARD32 IOAddress; -+ unsigned long PIOBase; -+ unsigned long IOAddress; - unsigned long FbAddress; - unsigned int IOBase; - unsigned char * FbBase; --- -1.7.9.4 - diff --git a/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch b/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch deleted file mode 100644 index 3478fa34b..000000000 --- a/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5d5753551609f1483801e5edd8d42b11713c981e Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 19 Dec 2011 16:18:34 -0500 -Subject: [PATCH 8/9] Fall back to shadowfb if XAA is unavailable - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- - src/ct_driver.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/ct_driver.c b/src/ct_driver.c -index a2e5c94..95092a2 100644 ---- a/src/ct_driver.c -+++ b/src/ct_driver.c -@@ -1345,10 +1345,9 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags) - - if (cPtr->Flags & ChipsAccelSupport) { - if (!xf86LoadSubModule(pScrn, "xaa")) { -- vbeFree(cPtr->pVbe); -- cPtr->pVbe = NULL; -- CHIPSFreeRec(pScrn); -- return FALSE; -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); -+ cPtr->Flags &= ~(ChipsAccelSupport); -+ cPtr->Flags |= ChipsShadowFB; - } - } - --- -1.7.9.4 - diff --git a/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch b/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch deleted file mode 100644 index 74ec37225..000000000 --- a/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 989cf4f1fb2ac57f38d363734b71a5cf749db146 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 19 Dec 2011 17:45:41 -0500 -Subject: [PATCH 9/9] Fix for new vgaHW ABI - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- - src/ct_driver.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ct_driver.c b/src/ct_driver.c -index 95092a2..08ccd72 100644 ---- a/src/ct_driver.c -+++ b/src/ct_driver.c -@@ -1444,6 +1444,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - return FALSE; - - hwp = VGAHWPTR(pScrn); -+ vgaHWSetStdFuncs(hwp); - vgaHWGetIOBase(hwp); - #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - cPtr->PIOBase = hwp->PIOOffset; --- -1.7.9.4 - diff --git a/source/x/x11/patch/xf86-video-chips/iopl.h b/source/x/x11/patch/xf86-video-chips/iopl.h new file mode 100644 index 000000000..e08207c7f --- /dev/null +++ b/source/x/x11/patch/xf86-video-chips/iopl.h @@ -0,0 +1,60 @@ +#ifdef __NetBSD__ +# include <sys/types.h> +# include <machine/pio.h> +# include <machine/sysarch.h> +#else +# if defined(__linux__) +/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc + * # include <sys/io.h> + */ +int iopl(int level); +# endif +# if defined(SVR4) && defined(i386) +# include <sys/types.h> +# ifdef NCR + /* broken NCR <sys/sysi86.h> */ +# define __STDC +# include <sys/sysi86.h> +# undef __STDC +# else +# include <sys/sysi86.h> +# endif +# ifdef SVR4 +# if !defined(sun) +# include <sys/seg.h> +# endif +# endif +# include <sys/v86.h> +# if defined(sun) +# include <sys/psw.h> +# endif +# endif +# include "AsmMacros.h" +#endif /* NetBSD */ + +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> + +#ifdef __NetBSD__ +# define SET_IOPL() i386_iopl(3) +# define RESET_IOPL() i386_iopl(0) +#else +# if defined(SVR4) && defined(i386) +# ifndef SI86IOPL +# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) +# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) +# else +# define SET_IOPL() sysi86(SI86IOPL,3) +# define RESET_IOPL() sysi86(SI86IOPL,0) +# endif +# else +# ifdef linux +# define SET_IOPL() iopl(3) +# define RESET_IOPL() iopl(0) +# else +# define SET_IOPL() (void)0 +# define RESET_IOPL() (void)0 +# endif +# endif +#endif diff --git a/source/x/x11/patch/xf86-video-dummy.patch b/source/x/x11/patch/xf86-video-dummy.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-dummy.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-geode.patch b/source/x/x11/patch/xf86-video-geode.patch new file mode 100644 index 000000000..6bbc3b34a --- /dev/null +++ b/source/x/x11/patch/xf86-video-geode.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScrn);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScrn);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-glint.patch b/source/x/x11/patch/xf86-video-glint.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-glint.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-i128.patch b/source/x/x11/patch/xf86-video-i128.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-i128.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-i740.patch b/source/x/x11/patch/xf86-video-i740.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-i740.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-neomagic.patch b/source/x/x11/patch/xf86-video-neomagic.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-neomagic.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-nv.patch b/source/x/x11/patch/xf86-video-nv.patch new file mode 100644 index 000000000..5e71368fe --- /dev/null +++ b/source/x/x11/patch/xf86-video-nv.patch @@ -0,0 +1,10 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l '#include <mibstore.h>' * | while read file ; do + sed -i "s/#include <mibstore.h>//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-r128.patch b/source/x/x11/patch/xf86-video-r128.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-r128.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-rendition.patch b/source/x/x11/patch/xf86-video-rendition.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-rendition.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-s3.patch b/source/x/x11/patch/xf86-video-s3.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-s3.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-s3virge.patch b/source/x/x11/patch/xf86-video-s3virge.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-s3virge.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-savage.patch b/source/x/x11/patch/xf86-video-savage.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-savage.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-siliconmotion.patch b/source/x/x11/patch/xf86-video-siliconmotion.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-siliconmotion.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-sis.patch b/source/x/x11/patch/xf86-video-sis.patch new file mode 100644 index 000000000..45276b4c8 --- /dev/null +++ b/source/x/x11/patch/xf86-video-sis.patch @@ -0,0 +1,2 @@ +zcat $CWD/patch/xf86-video-sis/sis-0.10.7-git.patch.gz | patch -p1 --verbose \ + || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xf86-video-sis/sis-0.10.7-git.patch b/source/x/x11/patch/xf86-video-sis/sis-0.10.7-git.patch new file mode 100644 index 000000000..865237552 --- /dev/null +++ b/source/x/x11/patch/xf86-video-sis/sis-0.10.7-git.patch @@ -0,0 +1,121 @@ +diff --git a/src/sis.h b/src/sis.h +index 46fca2a..20e6134 100644 +--- a/src/sis.h ++++ b/src/sis.h +@@ -75,7 +75,6 @@ + + #include "compiler.h" + #include "xf86Pci.h" +-#include "xf86Priv.h" + #include "xf86_OSproc.h" + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" +diff --git a/src/sis_driver.c b/src/sis_driver.c +index 61e8075..0fd83d7 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -57,7 +57,6 @@ + #include "fb.h" + #include "micmap.h" + #include "mipointer.h" +-#include "mibstore.h" + #include "edid.h" + + #define SIS_NEED_inSISREG +@@ -94,6 +93,10 @@ + #include "dri.h" + #endif + ++#ifndef DEFAULT_DPI ++#define DEFAULT_DPI 96 ++#endif ++ + /* + * LookupWindow was removed with video abi 11. + */ +@@ -7344,7 +7347,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountIOBase) { + pSiSEnt->MapCountIOBase--; + if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); ++#endif + pSiSEnt->IOBase = NULL; + pSiSEnt->MapCountIOBase = 0; + pSiSEnt->forceUnmapIOBase = FALSE; +@@ -7355,7 +7362,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountIOBaseDense) { + pSiSEnt->MapCountIOBaseDense--; + if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); ++#endif + pSiSEnt->IOBaseDense = NULL; + pSiSEnt->MapCountIOBaseDense = 0; + pSiSEnt->forceUnmapIOBaseDense = FALSE; +@@ -7366,7 +7377,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountFbBase) { + pSiSEnt->MapCountFbBase--; + if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); ++#endif + pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL; + pSiSEnt->MapCountFbBase = 0; + pSiSEnt->forceUnmapFbBase = FALSE; +@@ -7376,13 +7391,25 @@ SISUnmapMem(ScrnInfoPtr pScrn) + } + } else { + #endif ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); ++#endif + pSiS->IOBase = NULL; + #ifdef __alpha__ ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); ++#endif + pSiS->IOBaseDense = NULL; + #endif ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); ++#endif + pSiS->FbBase = pSiS->RealFbBase = NULL; + #ifdef SISDUALHEAD + } +@@ -8859,7 +8886,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL) + } + pSiS->SiSFastVidCopyDone = TRUE; + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +@@ -9352,7 +9378,14 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y) + } + if(doit) { + sigstate = xf86BlockSIGIO(); +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18 ++ { ++ double dx = x, dy = y; ++ miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, NULL, NULL); ++ x = (int)dx; ++ y = (int)dy; ++ } ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 + { + double dx = x, dy = y; + miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy); diff --git a/source/x/x11/patch/xf86-video-sisusb.patch b/source/x/x11/patch/xf86-video-sisusb.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-sisusb.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-tdfx.patch b/source/x/x11/patch/xf86-video-tdfx.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-tdfx.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-tga.patch b/source/x/x11/patch/xf86-video-tga.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-tga.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-trident.patch b/source/x/x11/patch/xf86-video-trident.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-trident.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-tseng.patch b/source/x/x11/patch/xf86-video-tseng.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-tseng.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-vesa.patch b/source/x/x11/patch/xf86-video-vesa.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-vesa.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-vmware.patch b/source/x/x11/patch/xf86-video-vmware.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-vmware.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-voodoo.patch b/source/x/x11/patch/xf86-video-voodoo.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-voodoo.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-xgi.patch b/source/x/x11/patch/xf86-video-xgi.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-xgi.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xf86-video-xgixp.patch b/source/x/x11/patch/xf86-video-xgixp.patch new file mode 100644 index 000000000..17d7e8297 --- /dev/null +++ b/source/x/x11/patch/xf86-video-xgixp.patch @@ -0,0 +1,7 @@ +# Remove obsolete references to mibstore.h and miInitializeBackingStore(): +grep -r -l '#include "mibstore.h"' * | while read file ; do + sed -i "s/#include \"mibstore.h\"//g" $file +done +grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do + sed -i "s/miInitializeBackingStore(pScreen);//g" $file +done diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch index 01be43a3b..c0c4810fd 100644 --- a/source/x/x11/patch/xorg-server.patch +++ b/source/x/x11/patch/xorg-server.patch @@ -1 +1,2 @@ zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +zcat $CWD/patch/xorg-server/xorg-server.CVE-2013-4396.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xorg-server/xorg-server.CVE-2013-4396.diff b/source/x/x11/patch/xorg-server/xorg-server.CVE-2013-4396.diff new file mode 100644 index 000000000..14c31782f --- /dev/null +++ b/source/x/x11/patch/xorg-server/xorg-server.CVE-2013-4396.diff @@ -0,0 +1,73 @@ +From 7bddc2ba16a2a15773c2ea8947059afa27727764 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith at oracle.com> +Date: Mon, 16 Sep 2013 21:47:16 -0700 +Subject: [PATCH] Avoid use-after-free in dix/dixfonts.c: doImageText() + [CVE-2013-4396] + +Save a pointer to the passed in closure structure before copying it +and overwriting the *c pointer to point to our copy instead of the +original. If we hit an error, once we free(c), reset c to point to +the original structure before jumping to the cleanup code that +references *c. + +Since one of the errors being checked for is whether the server was +able to malloc(c->nChars * itemSize), the client can potentially pass +a number of characters chosen to cause the malloc to fail and the +error path to be taken, resulting in the read from freed memory. + +Since the memory is accessed almost immediately afterwards, and the +X server is mostly single threaded, the odds of the free memory having +invalid contents are low with most malloc implementations when not using +memory debugging features, but some allocators will definitely overwrite +the memory there, leading to a likely crash. + +Reported-by: Pedro Ribeiro <pedrib at gmail.com> +Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com> +Reviewed-by: Julien Cristau <jcristau at debian.org> +--- + dix/dixfonts.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/dix/dixfonts.c b/dix/dixfonts.c +index feb765d..2e34d37 100644 +--- a/dix/dixfonts.c ++++ b/dix/dixfonts.c +@@ -1425,6 +1425,7 @@ doImageText(ClientPtr client, ITclosurePtr c) + GC *pGC; + unsigned char *data; + ITclosurePtr new_closure; ++ ITclosurePtr old_closure; + + /* We're putting the client to sleep. We need to + save some state. Similar problem to that handled +@@ -1436,12 +1437,14 @@ doImageText(ClientPtr client, ITclosurePtr c) + err = BadAlloc; + goto bail; + } ++ old_closure = c; + *new_closure = *c; + c = new_closure; + + data = malloc(c->nChars * itemSize); + if (!data) { + free(c); ++ c = old_closure; + err = BadAlloc; + goto bail; + } +@@ -1452,6 +1455,7 @@ doImageText(ClientPtr client, ITclosurePtr c) + if (!pGC) { + free(c->data); + free(c); ++ c = old_closure; + err = BadAlloc; + goto bail; + } +@@ -1464,6 +1468,7 @@ doImageText(ClientPtr client, ITclosurePtr c) + FreeScratchGC(pGC); + free(c->data); + free(c); ++ c = old_closure; + err = BadAlloc; + goto bail; + } diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install index 73611b47e..a88899705 100644 --- a/source/x/x11/post-install/xdm.post-install +++ b/source/x/x11/post-install/xdm.post-install @@ -19,9 +19,14 @@ chmod 0755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0 for conffile in \ Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \ - GiveConsole TakeConsole chooser xdm-config ../app-defaults/Chooser ; + GiveConsole TakeConsole xdm-config ../app-defaults/Chooser ; do - mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ; + # Use awk to strip leading blank lines... weird bug that cropped up in the + # pre Slackware-14.1 development cycle. + awk "/[^ ]/ { copy=1 }; copy { print }" $PKG/etc/X11/xdm/${conffile} > $PKG/etc/X11/xdm/${conffile}.new + touch -r $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new + rm -f $PKG/etc/X11/xdm/${conffile} + #mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ; done mkdir -p $PKG/var/lib/xdm diff --git a/source/x/x11/post-install/xsm.post-install b/source/x/x11/post-install/xsm.post-install deleted file mode 100644 index 509b84477..000000000 --- a/source/x/x11/post-install/xsm.post-install +++ /dev/null @@ -1,5 +0,0 @@ -mkdir -p $PKG/etc/X11 -( cd $PKG/usr/lib/X11 - mv xsm $PKG/etc/X11 - ln -sf ../../../etc/X11/xsm . -) diff --git a/source/x/x11/slack-desc/xcb-util-cursor b/source/x/x11/slack-desc/xcb-util-cursor new file mode 100644 index 000000000..003917741 --- /dev/null +++ b/source/x/x11/slack-desc/xcb-util-cursor @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xcb-util-cursor: xcb-util-cursor (XCB cursor management library) +xcb-util-cursor: +xcb-util-cursor: The xcb-util-cursor module implements the XCB cursor library, which +xcb-util-cursor: is the XCB replacement for libXcursor. +xcb-util-cursor: +xcb-util-cursor: +xcb-util-cursor: +xcb-util-cursor: +xcb-util-cursor: +xcb-util-cursor: +xcb-util-cursor: diff --git a/source/x/x11/slack-desc/xcm b/source/x/x11/slack-desc/xcm new file mode 100644 index 000000000..d7ba58362 --- /dev/null +++ b/source/x/x11/slack-desc/xcm @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xcm: xcm (X color management tools) +xcm: +xcm: Tools based on libXcm, a library for colour management on X. +xcm: xcmddc requests EDID from a monitor over the i2c bus. +xcm: xcmedid is for parsing EDID data blocks. +xcm: xcmevents observes X11 colour management events. +xcm: +xcm: +xcm: +xcm: +xcm: diff --git a/source/x/x11/slack-desc/xf86-video-xgixp b/source/x/x11/slack-desc/xf86-video-xgixp new file mode 100644 index 000000000..6ba3359e7 --- /dev/null +++ b/source/x/x11/slack-desc/xf86-video-xgixp @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xf86-video-xgixp: xf86-video-xgixp (XGI XGI Volari 8300 video driver) +xf86-video-xgixp: +xf86-video-xgixp: xf86-video-xgixp is part of X11. +xf86-video-xgixp: +xf86-video-xgixp: For more information about the X.Org Foundation (the providers of the +xf86-video-xgixp: X.Org implementation of the X Window System), see their website: +xf86-video-xgixp: +xf86-video-xgixp: http://www.x.org +xf86-video-xgixp: +xf86-video-xgixp: +xf86-video-xgixp: diff --git a/source/x/x11/slack-desc/xfwp b/source/x/x11/slack-desc/xfwp new file mode 100644 index 000000000..6ff16980c --- /dev/null +++ b/source/x/x11/slack-desc/xfwp @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xfwp: xfwp (X Firewall Proxy) +xfwp: +xfwp: xfwp is part of X11. +xfwp: +xfwp: For more information about the X.Org Foundation (the providers of the +xfwp: X.Org implementation of the X Window System), see their website: +xfwp: +xfwp: http://www.x.org +xfwp: +xfwp: +xfwp: diff --git a/source/x/x11/slack-desc/xproxymanagementprotocol b/source/x/x11/slack-desc/xproxymanagementprotocol new file mode 100644 index 000000000..fa0b25501 --- /dev/null +++ b/source/x/x11/slack-desc/xproxymanagementprotocol @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xproxymanagementprotocol: xproxymanagementprotocol (X Proxy Management protocol) +xproxymanagementprotocol: +xproxymanagementprotocol: xproxymanagementprotocol is part of X11. +xproxymanagementprotocol: +xproxymanagementprotocol: For more information about the X.Org Foundation (the providers of the +xproxymanagementprotocol: X.Org implementation of the X Window System), see their website: +xproxymanagementprotocol: +xproxymanagementprotocol: http://www.x.org +xproxymanagementprotocol: +xproxymanagementprotocol: +xproxymanagementprotocol: diff --git a/source/x/x11/x11.SlackBuild b/source/x/x11/x11.SlackBuild index ca7297082..6da53346f 100755 --- a/source/x/x11/x11.SlackBuild +++ b/source/x/x11/x11.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2007-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007-2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,6 +25,10 @@ # and the name of the package, like: # ./x11.SlackBuild lib libX11 +# Upgrade packages as they are built. +# This is default. To not upgrade, pass UPGRADE_PACKAGES=no (or anything else). +UPGRADE_PACKAGES=${UPGRADE_PACKAGES:-yes} + pkgbase() { PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev) case $PKGEXT in @@ -130,7 +134,7 @@ mkdir -p $SLACK_X_BUILD_DIR # in the "magic order". I built mine by hand through trial-and-error # before getting this script to work. It wasn't that hard... I think. ;-) ( cd src - for x_source_dir in proto data util xcb lib app doc driver font xserver ; do + for x_source_dir in proto data util xcb lib app doc xserver driver font ; do # See if $1 is a source directory like "lib": if [ ! -z "$1" ]; then if [ ! "$1" = "${x_source_dir}" ]; then @@ -269,6 +273,9 @@ mkdir -p $SLACK_X_BUILD_DIR BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME} else /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz + if [ "$UPGRADE_PACKAGES" = "yes" ]; then + /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz + fi fi fi @@ -320,6 +327,9 @@ mkdir -p $SLACK_X_BUILD_DIR BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME} else /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz + if [ "$UPGRADE_PACKAGES" = "yes" ]; then + /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/x11-${x_source_dir}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz + fi fi ) done diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild index ad05d7044..eabc72605 100755 --- a/source/x/xdg-utils/xdg-utils.SlackBuild +++ b/source/x/xdg-utils/xdg-utils.SlackBuild @@ -4,7 +4,7 @@ # Written by Erik Hanson erik@slackbuilds.org # Modified for VERSION version by Patrick Volkerding <volkerdi@slackware.com> -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ PKGNAM=xdg-utils VERSION=1.1.0-rc1 ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} PKG_VERSION=${VERSION/-/_} @@ -47,6 +47,8 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 cd $PKGNAM-$VERSION || exit 1 +zcat $CWD/xdg-utils.mate.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/x/xdg-utils/xdg-utils.mate.diff b/source/x/xdg-utils/xdg-utils.mate.diff new file mode 100644 index 000000000..c2480e322 --- /dev/null +++ b/source/x/xdg-utils/xdg-utils.mate.diff @@ -0,0 +1,43 @@ +--- ./scripts/xdg-open.orig 2011-01-01 04:03:14.000000000 -0600 ++++ ./scripts/xdg-open 2013-06-09 21:15:55.612892954 -0500 +@@ -308,6 +308,7 @@ + elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; + elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"mate" ]; then DE=mate; + else DE="" + fi + } +@@ -371,6 +372,21 @@ + fi + } + ++open_mate() ++{ ++ if gvfs-open --help 2>/dev/null 1>&2; then ++ gvfs-open "$1" ++ else ++ mate-open "$1" ++ fi ++ ++ if [ $? -eq 0 ]; then ++ exit_success ++ else ++ exit_failure_operation_failed ++ fi ++} ++ + open_xfce() + { + exo-open "$1" +@@ -539,6 +555,10 @@ + open_gnome "$url" + ;; + ++ mate) ++ open_mate "$url" ++ ;; ++ + xfce) + open_xfce "$url" + ;; |