--- xserver-xorg-video-siliconmotion-1.7.8.orig/autogen.sh +++ xserver-xorg-video-siliconmotion-1.7.8/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/README.source +++ xserver-xorg-video-siliconmotion-1.7.8/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/changelog +++ xserver-xorg-video-siliconmotion-1.7.8/debian/changelog @@ -0,0 +1,350 @@ +xserver-xorg-video-siliconmotion (1:1.7.8-1ubuntu6) xenial; urgency=medium + + * Really rebuild against the new xserver. + + -- Timo Aaltonen Thu, 03 Mar 2016 13:31:58 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.8-1ubuntu5) xenial; urgency=medium + + * Rebuild against new xserver. + + -- Timo Aaltonen Thu, 04 Feb 2016 12:47:31 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.8-1ubuntu4) wily; urgency=medium + + * debian/patches/array-overflow.patch: + - Remove code that does an array overflow. This caused a FTBFS on PPC64 but + actually affects all achitectures. + + -- Robert Ancell Wed, 07 Oct 2015 09:01:05 +1300 + +xserver-xorg-video-siliconmotion (1:1.7.8-1ubuntu3) wily; urgency=medium + + * debian/patches/fix-ftbfs-1.17.diff: + - Actually fix patch correctly + + -- Robert Ancell Wed, 30 Sep 2015 08:55:24 +1300 + +xserver-xorg-video-siliconmotion (1:1.7.8-1ubuntu2) wily; urgency=medium + + * debian/patches/fix-ftbfs-1.17.diff: + - Fix patch correctly + + -- Robert Ancell Tue, 29 Sep 2015 14:17:25 +1300 + +xserver-xorg-video-siliconmotion (1:1.7.8-1ubuntu1) wily; urgency=medium + + * debian/patches/fix-ftbfs-1.17.diff: + - Fix FTBFS for ARM64 and PPC64 + + -- Robert Ancell Mon, 28 Sep 2015 15:31:16 +1300 + +xserver-xorg-video-siliconmotion (1:1.7.8-1) unstable; urgency=medium + + * New upstream release. + * Let uscan verify tarball signatures. + * Remove Cyril from Uploaders. + * Bump debhelper compat level to 9. + + -- Julien Cristau Sat, 09 May 2015 17:06:15 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.7-2) unstable; urgency=low + + * Release to unstable. + + -- Maarten Lankhorst Wed, 25 Sep 2013 13:12:17 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.7-1) experimental; urgency=low + + * New upstream release. + * Include upstream patch to remove mibstore.h + + -- Maarten Lankhorst Tue, 24 Sep 2013 15:05:22 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.6-1) unstable; urgency=low + + * New upstream release: + - Fix FTBFS against X server 1.12. + * Drop unused x11proto-randr-dev and x11proto-render-dev build-deps. + + -- Cyril Brulebois Tue, 01 May 2012 19:05:51 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.5-1) unstable; urgency=low + + * New upstream release. + * Bump xutils-dev build-dep for new macros. + * Update debian/copyright from upstream COPYING. + + -- Cyril Brulebois Wed, 09 Mar 2011 00:31:34 +0100 + +xserver-xorg-video-siliconmotion (1:1.7.4-3) unstable; urgency=low + + * Switch to dh: + - Use debhelper 8. + - Use dh-autoreconf. + - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf + debhelper sequence. + * Remove xsfbs accordingly. + * Update Uploaders list. Thanks, David & Brice! + * Remove long obsolete Replaces/Conflicts. + * Wrap Depends/Provides. + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Cyril Brulebois Sat, 05 Feb 2011 14:55:28 +0100 + +xserver-xorg-video-siliconmotion (1:1.7.4-2) experimental; urgency=low + + [ Julien Cristau ] + * Drop 01_siliconmotion_rotate_option_disables_randr.diff, it was disabled + since 1.7.0 and most likely obsoleted by randr 1.2 support in that + release. + + [ Cyril Brulebois ] + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Sat, 16 Oct 2010 21:03:39 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.4-1) experimental; urgency=low + + [ Christopher James Halse Rogers ] + * New upstream release + - Fixes FTBFS against Xserver 1.8 + + -- Julien Cristau Thu, 10 Jun 2010 11:32:50 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.3-2) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Cyril Brulebois ] + * Update to new xsfbs, replace deprecated ${xserver:Depends} with + ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev + accordingly. + * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + + -- Cyril Brulebois Tue, 04 May 2010 00:19:15 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.3-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 01:50:22 +0100 + +xserver-xorg-video-siliconmotion (1:1.7.2-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.8.2. + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + -- Brice Goglin Mon, 20 Jul 2009 00:13:38 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.1-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Wed, 29 Apr 2009 18:33:55 +0200 + +xserver-xorg-video-siliconmotion (1:1.7.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 11:38:48 +0100 + +xserver-xorg-video-siliconmotion (1:1.7.0-1) experimental; urgency=low + + * New upstream release. + + Add support for EXA, RandR 1.2 and some smi 50x chipsets. + + Disable 01_siliconmotion_rotate_option_disables_randr.diff. + * Build against xserver 1.6 rc1. + * Allow parallel builds. + * Run autoreconf on build; add build-deps on automake, libtool and + xutils-dev. + * Add myself to Uploaders. + + -- Brice Goglin Sun, 01 Feb 2009 16:15:46 +0100 + +xserver-xorg-video-siliconmotion (1:1.6.0-2) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau Mon, 08 Sep 2008 19:37:00 +0100 + +xserver-xorg-video-siliconmotion (1:1.6.0-1) unstable; urgency=low + + [ Brice Goglin ] + * Add upstream URL to debian/copyright. + + [ Julien Cristau ] + * New upstream release. + * Refresh patches. + * Remove Branden from Uploaders with his permission, and add myself. + * Bump Standards-Version to 3.7.3. + * Drop the XS- prefix from Vcs-* control fields. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on + dpkg-dev >= 1.14.17. + + -- Julien Cristau Fri, 06 Jun 2008 12:19:48 +0200 + +xserver-xorg-video-siliconmotion (1:1.5.1-3) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 15:43:48 -0400 + +xserver-xorg-video-siliconmotion (1:1.5.1-2) experimental; urgency=low + + * Build against xserver 1.4 and build-dep on it + * Add 02_gen_pci_ids.diff. This patch provides a set of pci id's supported + by this driver so that it can be automatically loaded by the server. + + -- David Nusinow Thu, 13 Sep 2007 20:20:40 -0400 + +xserver-xorg-video-siliconmotion (1:1.5.1-1) unstable; urgency=low + + [ Julien Cristau ] + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-siliconmotion. + + [ Brice Goglin ] + * New upstream version + + Pull more upstream fixes up-to 1a803a8f91a931c00106f9d3d41cfa5d74c19f55 + + Refresh 01_siliconmotion_rotate_option_disables_randr.diff + * Install the upstream changelog. + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 + (needed to let xsfbs get access to serverminver). + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-video-siliconmotion + module in the long description. + * Remove Fabio from uploaders with his permission. He's always welcome back. + + -- Julien Cristau Wed, 02 May 2007 15:08:45 +0200 + +xserver-xorg-video-siliconmotion (1:1.4.2-1) experimental; urgency=low + + * New upstream version + * Generate server dependencies automatically from the ABI + + -- David Nusinow Wed, 21 Feb 2007 22:54:34 -0500 + +xserver-xorg-video-siliconmotion (1:1.4.1-4) unstable; urgency=low + + * Add quilt to build-depends. Thanks lamont. closes: #388641 + * Bump standards version to 3.7.2.0. No changes needed. + + -- David Nusinow Thu, 21 Sep 2006 22:20:51 -0400 + +xserver-xorg-video-siliconmotion (1:1.4.1-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + -- David Nusinow Mon, 18 Sep 2006 19:57:51 -0400 + +xserver-xorg-video-siliconmotion (1:1.4.1-2) experimental; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0 not xserver-xorg-video. + + [ David Nusinow ] + * Bump xserver (build-)depends epochs to 2: to deal with botched + server upload + + -- David Nusinow Tue, 22 Aug 2006 23:46:40 +0000 + +xserver-xorg-video-siliconmotion (1:1.4.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + + [ David Nusinow ] + * New upstream release + * Add dependency on xserver-xorg-core to >= 1:1.1.1. Bump version for + the build-dep on xserver-xorg-dev. + * Bump debhelper compat to 5 + + -- David Nusinow Tue, 15 Aug 2006 23:45:05 +0000 + +xserver-xorg-video-siliconmotion (1:1.3.1.5-3) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:54 -0500 + +xserver-xorg-video-siliconmotion (1:1.3.1.5-2) experimental; urgency=low + + * Port patches from trunk: + + general/083_siliconmotion_rotate_option_disables_randr.diff + + -- David Nusinow Sun, 26 Feb 2006 17:53:12 -0500 + +xserver-xorg-video-siliconmotion (1:1.3.1.5-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Fri, 13 Jan 2006 00:40:05 -0500 + +xserver-xorg-driver-siliconmotion (1:1.3.1.5-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-driver. + + -- Daniel Stone Wed, 4 Jan 2006 20:02:33 +1100 + +xserver-xorg-driver-siliconmotion (1:1.3.1.4-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:11:22 +1100 + +xserver-xorg-driver-siliconmotion (1:1.3.1.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 12 Dec 2005 13:07:11 +1100 + +xserver-xorg-driver-siliconmotion (1:1.3.1.2-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:57:32 +1100 + +xserver-xorg-driver-siliconmotion (1:1.3.1.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:36:09 +1100 + +xserver-xorg-driver-siliconmotion (1:1.3.1.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 17:10:12 +1000 + +xserver-xorg-driver-siliconmotion (1:1.3.1-1) breezy; urgency=low + + * First xserver-xorg-driver-siliconmotion release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/compat +++ xserver-xorg-video-siliconmotion-1.7.8/debian/compat @@ -0,0 +1 @@ +9 --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/control +++ xserver-xorg-video-siliconmotion-1.7.8/debian/control @@ -0,0 +1,35 @@ +Source: xserver-xorg-video-siliconmotion +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Build-Depends: + debhelper (>= 9), + dh-autoreconf, + pkg-config, + xserver-xorg-dev (>= 2:1.9.4), + x11proto-video-dev, + x11proto-xext-dev, + x11proto-core-dev, + x11proto-fonts-dev, + quilt, + xutils-dev (>= 1:7.5+4), +Standards-Version: 3.9.3 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-siliconmotion +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-siliconmotion.git + +Package: xserver-xorg-video-siliconmotion +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} +Description: X.Org X server -- SiliconMotion display driver + This package provides the driver for the SiliconMotion Lynx and Cougar family + of chipsets, commonly found in laptops. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-siliconmotion driver module. --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/copyright +++ xserver-xorg-video-siliconmotion-1.7.8/debian/copyright @@ -0,0 +1,75 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. +Copyright (C) 2000,2008 Silicon Motion, Inc. All Rights Reserved. +Copyright (C) 2001 Corvin Zahn. All Rights Reserved. +Copyright (C) 2008 Francisco Jerez. All Rights Reserved. +Copyright (C) 2008 Mandriva Linux. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the names of The XFree86 Project and +Silicon Motion shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Software without prior written +authorization from The XFree86 Project or Silicon Motion. + +****************************************************************************** + +Copyright 2007 George Sapountzis + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +****************************************************************************** + +Copyright (C) 2006 Dennis De Winter All Rights Reserved. +Copyright (C) 2007 Alex Deucher All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/gbp.conf +++ xserver-xorg-video-siliconmotion-1.7.8/debian/gbp.conf @@ -0,0 +1,4 @@ +[DEFAULT] +upstream-branch=upstream-experimental +debian-branch=debian-experimental +pristine-tar = True --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/patches/array-overflow.patch +++ xserver-xorg-video-siliconmotion-1.7.8/debian/patches/array-overflow.patch @@ -0,0 +1,33 @@ +From 14cea31979bc56a2bc8cf15e9ab99715bc0c36d7 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Wed, 30 Sep 2015 16:59:27 +1300 +Subject: [PATCH xf86-video-siliconmotion] Stop accessing the attribute array + using the attribute name enum. + +The array has only two elements but the clamping code was assuming it contained +all the elements in order. This means no clamping is now done but at least it +wont read off the end of the array. + +Signed-off-by: Robert Ancell +--- + src/smi_video.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/smi_video.c b/src/smi_video.c +index 27df68d..a13668e 100644 +--- a/src/smi_video.c ++++ b/src/smi_video.c +@@ -681,10 +681,6 @@ SetAttr(ScrnInfoPtr pScrn, int i, int value) + + if (i < XV_ENCODING || i > XV_HUE) + return BadMatch; +- +- /* clamps value to attribute range */ +- value = CLAMP(value, SMI_VideoAttributes[i].min_value, +- SMI_VideoAttributes[i].max_value); + + if (i == XV_BRIGHTNESS) { + int my_value = (value <= 128? value + 128 : value - 128); +-- +2.5.0 + --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/patches/fix-ftbfs-1.17.diff +++ xserver-xorg-video-siliconmotion-1.7.8/debian/patches/fix-ftbfs-1.17.diff @@ -0,0 +1,155 @@ +Description: Fix build against xorg server 1.17 +Author: Maarten Lankhorst + +Index: xserver-xorg-video-siliconmotion-1.7.8/src/smi.h +=================================================================== +--- xserver-xorg-video-siliconmotion-1.7.8.orig/src/smi.h ++++ xserver-xorg-video-siliconmotion-1.7.8/src/smi.h +@@ -170,6 +170,8 @@ typedef struct + pciVideoPtr PciInfo; /* PCI info vars */ + #ifndef XSERVER_LIBPCIACCESS + PCITAG PciTag; ++#else ++ struct pci_io_handle *io; + #endif + int Chipset; /* Chip info, set using PCI + above */ +Index: xserver-xorg-video-siliconmotion-1.7.8/src/smilynx_hw.c +=================================================================== +--- xserver-xorg-video-siliconmotion-1.7.8.orig/src/smilynx_hw.c ++++ xserver-xorg-video-siliconmotion-1.7.8/src/smilynx_hw.c +@@ -365,9 +365,8 @@ SMILynx_WriteMode(ScrnInfoPtr pScrn, vga + xf86ExecX86int10(pSmi->pInt10); + + /* Enable linear mode. */ +- outb(pSmi->PIOBase + VGA_SEQ_INDEX, 0x18); +- tmp = inb(pSmi->PIOBase + VGA_SEQ_DATA); +- outb(pSmi->PIOBase + VGA_SEQ_DATA, tmp | 0x01); ++ tmp = VGAIN8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x18); ++ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x18, tmp | 0x01); + + /* Enable DPR/VPR registers. */ + tmp = VGAIN8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x21); +Index: xserver-xorg-video-siliconmotion-1.7.8/src/regsmi.h +=================================================================== +--- xserver-xorg-video-siliconmotion-1.7.8.orig/src/regsmi.h ++++ xserver-xorg-video-siliconmotion-1.7.8/src/regsmi.h +@@ -64,8 +64,13 @@ VGAIN8_INDEX(SMIPtr pSmi, int indexPort, + MMIO_OUT8(pSmi->IOBase, indexPort, index); + return(MMIO_IN8(pSmi->IOBase, dataPort)); + } else { ++#ifdef XSERVER_LIBPCIACCESS ++ pci_io_write8(pSmi->io, indexPort, index); ++ return pci_io_read8(pSmi->io, dataPort); ++#else + outb(pSmi->PIOBase + indexPort, index); + return(inb(pSmi->PIOBase + dataPort)); ++#endif + } + } + +@@ -76,8 +81,13 @@ VGAOUT8_INDEX(SMIPtr pSmi, int indexPort + MMIO_OUT8(pSmi->IOBase, indexPort, index); + MMIO_OUT8(pSmi->IOBase, dataPort, data); + } else { ++#ifdef XSERVER_LIBPCIACCESS ++ pci_io_write8(pSmi->io, indexPort, index); ++ pci_io_write8(pSmi->io, dataPort, data); ++#else + outb(pSmi->PIOBase + indexPort, index); + outb(pSmi->PIOBase + dataPort, data); ++#endif + } + } + +@@ -87,7 +97,11 @@ VGAIN8(SMIPtr pSmi, int port) + if (pSmi->IOBase) { + return(MMIO_IN8(pSmi->IOBase, port)); + } else { ++#ifdef XSERVER_LIBPCIACCESS ++ return pci_io_read8(pSmi->io, port); ++#else + return(inb(pSmi->PIOBase + port)); ++#endif + } + } + +@@ -97,7 +111,11 @@ VGAOUT8(SMIPtr pSmi, int port, CARD8 dat + if (pSmi->IOBase) { + MMIO_OUT8(pSmi->IOBase, port, data); + } else { ++#ifdef XSERVER_LIBPCIACCESS ++ pci_io_write8(pSmi->io, port, data); ++#else + outb(pSmi->PIOBase + port, data); ++#endif + } + } + +Index: xserver-xorg-video-siliconmotion-1.7.8/src/smi_driver.c +=================================================================== +--- xserver-xorg-video-siliconmotion-1.7.8.orig/src/smi_driver.c ++++ xserver-xorg-video-siliconmotion-1.7.8/src/smi_driver.c +@@ -446,6 +446,9 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags + pSmi->PIOBase = hwp->PIOOffset; + #else + pSmi->PIOBase = 0; ++#ifdef XSERVER_LIBPCIACCESS ++ pSmi->io = hwp->io; ++#endif + #endif + + xf86ErrorFVerb(VERBLEV, "\tSMI_PreInit vgaCRIndex=%x, vgaIOBase=%x, " +@@ -2022,16 +2025,14 @@ SMI_EnableMmio(ScrnInfoPtr pScrn) + vgaHWSetStdFuncs(hwp); + + /* Enable linear mode */ +- outb(pSmi->PIOBase + VGA_SEQ_INDEX, 0x18); +- tmp = inb(pSmi->PIOBase + VGA_SEQ_DATA); ++ tmp = VGAIN8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x18); + pSmi->SR18Value = tmp; /* PDR#521 */ +- outb(pSmi->PIOBase + VGA_SEQ_DATA, tmp | 0x11); ++ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x18, tmp | 0x11); + + /* Enable 2D/3D Engine and Video Processor */ +- outb(pSmi->PIOBase + VGA_SEQ_INDEX, 0x21); +- tmp = inb(pSmi->PIOBase + VGA_SEQ_DATA); ++ tmp = VGAIN8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x21); + pSmi->SR21Value = tmp; /* PDR#521 */ +- outb(pSmi->PIOBase + VGA_SEQ_DATA, tmp & ~0x03); ++ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x21, tmp & ~0x03); + } + + LEAVE(); +@@ -2050,12 +2051,10 @@ SMI_DisableMmio(ScrnInfoPtr pScrn) + vgaHWSetStdFuncs(hwp); + + /* Disable 2D/3D Engine and Video Processor */ +- outb(pSmi->PIOBase + VGA_SEQ_INDEX, 0x21); +- outb(pSmi->PIOBase + VGA_SEQ_DATA, pSmi->SR21Value); /* PDR#521 */ ++ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x21, pSmi->SR21Value); /* PDR#521 */ + + /* Disable linear mode */ +- outb(pSmi->PIOBase + VGA_SEQ_INDEX, 0x18); +- outb(pSmi->PIOBase + VGA_SEQ_DATA, pSmi->SR18Value); /* PDR#521 */ ++ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x18, pSmi->SR18Value); /* PDR#521 */ + } + + LEAVE(); +Index: xserver-xorg-video-siliconmotion-1.7.8/src/smilynx_crtc.c +=================================================================== +--- xserver-xorg-video-siliconmotion-1.7.8.orig/src/smilynx_crtc.c ++++ xserver-xorg-video-siliconmotion-1.7.8/src/smilynx_crtc.c +@@ -619,9 +619,9 @@ SMILynx_CrtcModeSet_bios(xf86CrtcPtr crt + xf86ExecX86int10(pSmi->pInt10); + + /* Enable linear mode. */ +- outb(pSmi->PIOBase + VGA_SEQ_INDEX, 0x18); +- tmp = inb(pSmi->PIOBase + VGA_SEQ_DATA); +- outb(pSmi->PIOBase + VGA_SEQ_DATA, tmp | 0x01); ++ VGAOUT8(pSmi, VGA_SEQ_INDEX, 0x18); ++ tmp = VGAIN8(pSmi, VGA_SEQ_DATA); ++ VGAOUT8(pSmi, VGA_SEQ_DATA, tmp | 0x01); + + /* Enable DPR/VPR registers. */ + tmp = VGAIN8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x21); --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/patches/series +++ xserver-xorg-video-siliconmotion-1.7.8/debian/patches/series @@ -0,0 +1,2 @@ +fix-ftbfs-1.17.diff +array-overflow.patch --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/rules +++ xserver-xorg-video-siliconmotion-1.7.8/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +override_dh_auto_configure: + dh_auto_configure -- \ + --disable-silent-rules \ + --libdir=\$${exec_prefix}/lib + +# Install in debian/tmp to retain control through dh_install: +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + +# Kill *.la files, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + dh_install --fail-missing + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/upstream/signing-key.asc +++ xserver-xorg-video-siliconmotion-1.7.8/debian/upstream/signing-key.asc @@ -0,0 +1,64 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBEoIZDEBEAD5MrFJC9Hi4mXZ97HlFotHIrkMURIFkvl17XEuJ8Jh3hlzJD/q +K1ByzQGHozzVcfbg4lP4lzqfdps6WCbusqtVYcTF61jjFhYo398lBgpKHUBbsEPC +SfYp5WkoICa824zcmWO9qYizGqkpd1C6gdQtK6ZaGjLx3xt08M9oVZqj+E2SsPHz +WaYLugCwCKhlbVTaP28OGy7tBRY6hcLtiZc2CNpr0YjZ53B7Ubs0BVYQutYxho7l +u0ChE9zNesy4KaIOumXZjTUrMCLpxF/01M1tfzXArMMLAqx3F1M6QIuy18F1zJ2W +LlkRwJi47NTiJ6jwLUYKBTN9T3nmy0oNAvv5v4B8nWgZAOjjDC2pFoVJa1O3K8Ab +vSRA3L/N+80MxM9VK5bw451pDqNhxn5q0yeS+RBagmOb2PZSMIuw9adooMurAfDJ +hsxqp3KaCTdYX5p+mCczNkoKMRUQiVUi250426o69IAmtpVi1q+MV0qWLl2tSvx4 +I4iph9XAhho7ycb4jziWf46ZljnhoGn54EU5GEqH0huakYcXK7XoNxU0XzS/eQuD +qVy2NH2C945h3LAtMo4zr49VZXjNnFn++zZqCUHASDX6Y3h8uMpzIY6Eslu2S85W +gpb+V4M5RvKPeuEJTuzxJOOW/B3nyoWFQfN6SXWGVW618dLEmFmQnyLBwwARAQAB +tCxKdWxpZW4gQ3Jpc3RhdSA8anVsaWVuLmNyaXN0YXVAZW5zLWx5b24ub3JnPokC +PAQTAQgAJgIbAwIeAQIXgAYLCQgHAwIGFQoJCAsCBRYCAwEABQJK4Fj7AhkBAAoJ +EDEBgAUJBeQMu/wP/jmGDVXrXZXtNJ7Ov94iDBwcEBlLoNHUyH4FWQG05eW3CqT0 +w9ZOvZEQ/kKlSjpdZzPiYMjgunl7D78aoL4Il2qKyirlT+trt+v79rl5VkD2xJx/ +gi7iN34VJQ50iGBxyxPicUjkXUO17kpJ2/uw/7/pNG0buBDbLGPwYPQFyV3UVOv7 +R8chvmAqtujck1961gRffKPihiv6sj4zjGs8ukmLCO3EgLzpz3shBfJyq6GNMNmy +aVX7hAcwhErKCrPeGVlzFpCLbtqIxpq6uPfxrDI20LhQkQ9NPD/4t1qkvenRCY77 +wqoiUBSYlpsKND2I2mywOE2FVMj34aBKvn96YsZWlj3Rkc++JvzdZQy09WQIUXt5 +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 +=+xMJ +-----END PGP PUBLIC KEY BLOCK----- --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/watch +++ xserver-xorg-video-siliconmotion-1.7.8/debian/watch @@ -0,0 +1,4 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-siliconmotion +version=3 +opts="pgpsigurlmangle=s/$/.sig/" \ +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-siliconmotion-(.*)\.tar\.gz --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/xserver-xorg-video-siliconmotion.install +++ xserver-xorg-video-siliconmotion-1.7.8/debian/xserver-xorg-video-siliconmotion.install @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/man/man4/* --- xserver-xorg-video-siliconmotion-1.7.8.orig/debian/xserver-xorg-video-siliconmotion.links +++ xserver-xorg-video-siliconmotion-1.7.8/debian/xserver-xorg-video-siliconmotion.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-siliconmotion/script