--- xserver-xorg-video-ivtvdev-1.1.2.orig/Makefile.in +++ xserver-xorg-video-ivtvdev-1.1.2/Makefile.in @@ -52,7 +52,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +DIST_COMMON = README ChangeLog $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure ChangeLog config.guess config.sub \ depcomp install-sh ltmain.sh missing --- xserver-xorg-video-ivtvdev-1.1.2.orig/config.guess +++ xserver-xorg-video-ivtvdev-1.1.2/config.guess @@ -1,4 +1,9 @@ #! /bin/sh + +if [ -x /usr/share/misc/config.guess ]; then + exec /usr/share/misc/config.guess "$@" +fi + # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. --- xserver-xorg-video-ivtvdev-1.1.2.orig/config.sub +++ xserver-xorg-video-ivtvdev-1.1.2/config.sub @@ -1,4 +1,9 @@ #! /bin/sh + +if [ -x /usr/share/misc/config.sub ]; then + exec /usr/share/misc/config.sub "$@" +fi + # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/NEWS +++ xserver-xorg-video-ivtvdev-1.1.2/debian/NEWS @@ -0,0 +1,7 @@ +xserver-xorg-video-ivtvdev (1.0.0~svn4049-1) unstable; urgency=low + + * The IVTV X driver has been renamed by upstream from "ivtvdev" to just + "ivtv". You will need to update /etc/X11/xorg.conf. + + -- Ian Campbell Mon, 10 Sep 2007 07:24:39 +0100 + --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/README.source +++ xserver-xorg-video-ivtvdev-1.1.2/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-ivtvdev-1.1.2.orig/debian/changelog +++ xserver-xorg-video-ivtvdev-1.1.2/debian/changelog @@ -0,0 +1,142 @@ +xserver-xorg-video-ivtvdev (1.1.2-2) unstable; urgency=low + + * Build against xserver 1.14. + + -- Julien Cristau Mon, 23 Sep 2013 20:51:44 +0200 + +xserver-xorg-video-ivtvdev (1.1.2-1) unstable; urgency=low + + [ Ian Campbell ] + * New upstream release. + + [ Cyril Brulebois ] + * Wrap Build-Depends/Depends/Provides. + * Switch to dh: + - Use debhelper 8. + - Unlike other drivers, do not 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! + * Bump Standards-Version to 3.9.1 (no changes needed). + * Add watch file. + + -- Cyril Brulebois Sat, 05 Feb 2011 14:50:33 +0100 + +xserver-xorg-video-ivtvdev (1.1.1-3) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + * Add myself to Uploaders. + + -- Cyril Brulebois Sat, 16 Oct 2010 18:39:55 +0200 + +xserver-xorg-video-ivtvdev (1.1.1-2) unstable; urgency=low + + [ Ian Campbell ] + * Add misc:Depends for xserver-xorg-video-ivtv-dbg. + * Bump Standards-Version to 3.8.3 (no changes). + + [ Julien Cristau ] + * Update xsfbs and use new ${xviddriver:Depends} substvar. + + -- Julien Cristau Sun, 06 Jun 2010 18:40:53 +0200 + +xserver-xorg-video-ivtvdev (1.1.1-1) unstable; urgency=low + + [ Ian Campbell ] + * New upstream release. + * Update debian/copyright with correct URL, remove obsolete paragraph about + an old fork which is no longer used. + * Update to latest xsfbs. + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + + -- Ian Campbell Sat, 16 Jan 2010 19:46:45 +0000 + +xserver-xorg-video-ivtvdev (1.1.0-1) unstable; urgency=low + + * New upstream release. + * Rebuild against newer X server (Closes: #526075) + * Correct Section, Depends and Provides for xserver-xorg-video-ivtv-dbg. + * 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. + * Do not install .la files. + * Depend on autotools-dev and call out to up to date config.{sub,guess} + * Remove unused patching infrastructure from build and drop dependency + on quilt. + * Update to standards version 3.8.1. + + -- Ian Campbell Wed, 20 May 2009 23:16:16 +0100 + +xserver-xorg-video-ivtvdev (1.0.1-1) unstable; urgency=low + + * New upstream release. + * Vcs-Browser and Vcs-Git are now supported so drop the XS- prefix. + * Build a xserver-xorg-video-ivtv-dbg package with debugging symbols. + + -- Ian Campbell Sun, 09 Mar 2008 15:33:24 +0000 + +xserver-xorg-video-ivtvdev (1.0.0-1) unstable; urgency=low + + * New upstream release. + - remove-PAGE_MASK and remove-xf86_ansic.h have been merged upstream. + - Changelog is now ChangeLog. + * Do not build depend on ivtv-utils anymore, ivtv.h is no longer required. + + -- Ian Campbell Sun, 14 Oct 2007 22:27:12 +0100 + +xserver-xorg-video-ivtvdev (1.0.0~svn4049-3) unstable; urgency=low + + * Use sysconf(_SC_PAGESIZE) instead of PAGE_MASK, fixes FTBFS on powerpc, + mips, hppa (new patch remove-PAGE_MASK). + * Update patch remove-xf86_ansic.h to include headers for ioctl, mmap, + munmap & close, fixes build warnings. + + -- Ian Campbell Thu, 20 Sep 2007 19:00:59 +0100 + +xserver-xorg-video-ivtvdev (1.0.0~svn4049-2) unstable; urgency=low + + * Build against xserver 1.4. + + -- Ian Campbell Tue, 18 Sep 2007 08:25:11 +0100 + +xserver-xorg-video-ivtvdev (1.0.0~svn4049-1) unstable; urgency=low + + * Import upstream subversion revision 4049 (Closes: #441275). + * Patch 00_xorg_7_1 is no longer required. + * The xf86_ansic.h header is no longer required. + + -- Ian Campbell Mon, 10 Sep 2007 07:26:44 +0100 + +xserver-xorg-video-ivtvdev (0.10.6-3) UNRELEASED; urgency=low + + * Bump xserver ABI metadata to 1.1 for use with server 1.2 + + -- David Nusinow Sat, 10 Feb 2007 21:23:41 -0500 + +xserver-xorg-video-ivtvdev (0.10.6-2) UNRELEASED; urgency=low + + [ David Nusinow ] + * Bump server version requirement to use newer server so that reportbug + stuff is guaranteed to be installed + + [ Ian Campbell ] + * Include linux/types.h in ivtvhw.h. (Closes: #406032) + * Updates suggested by Brice Goglin: + - Pull latest xsfbs + - Use ${xviddriver:Provides} and ${xserver:Depends} + - Update build depends + - Added XS-Vcs-* + * Bumped standards version + + -- Ian Campbell Wed, 30 May 2007 20:13:22 +0100 + +xserver-xorg-video-ivtvdev (0.10.6-1) unstable; urgency=low + + [ Ian Campbell ] + * First xserver-xorg-driver-ivtv release. (Closes: #380174) + + -- David Nusinow Sat, 18 Nov 2006 20:32:31 -0500 --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/compat +++ xserver-xorg-video-ivtvdev-1.1.2/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/control +++ xserver-xorg-video-ivtvdev-1.1.2/debian/control @@ -0,0 +1,53 @@ +Source: xserver-xorg-video-ivtvdev +Section: contrib/x11 +Priority: extra +Maintainer: Debian X Strike Force +Uploaders: Ian Campbell , Cyril Brulebois +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + quilt, + pkg-config, + autotools-dev, + xserver-xorg-dev (>= 2:1.9.4), + x11proto-video-dev, + libxvmc-dev, + x11proto-fonts-dev, + x11proto-randr-dev, + x11proto-render-dev, + x11proto-xext-dev, +Standards-Version: 3.9.1 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ivtvdev +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ivtvdev.git + +Package: xserver-xorg-video-ivtv +Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} +Description: X.Org X server -- IVTV display driver + This package provides the driver for the overlay framebuffer provided + by the iTVC15 family of MPEG codecs. The iTVC15 family includes the + iTVC15 (CX24315) and iTVC16 (CX24316). These chips are commonly found + on Hauppauge's WinTV PVR-250 and PVR-350 TV capture cards. + . + This driver requires the IVTV kernel module provided by the + ivtv-source package. + +Package: xserver-xorg-video-ivtv-dbg +Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc +Depends: + xserver-xorg-video-ivtv (= ${binary:Version}), + ${misc:Depends}, +Section: contrib/debug +Priority: extra +Description: X.Org X server -- IVTV display driver (debug symbols) + This package provides the driver for the overlay framebuffer provided + by the iTVC15 family of MPEG codecs. The iTVC15 family includes the + iTVC15 (CX24315) and iTVC16 (CX24316). These chips are commonly found + on Hauppauge's WinTV PVR-250 and PVR-350 TV capture cards. + . + This package provides debugging symbols for this Xorg X driver. --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/copyright +++ xserver-xorg-video-ivtvdev-1.1.2/debian/copyright @@ -0,0 +1,55 @@ +This package was debianized by Ian Campbell on +Mon Aug 7 16:16:55 BST 2006. + +The original upstream source is available from +http://dl.ivtvdriver.org/xf86-video-ivtv/ + +The current upstream maintainer is John Harvey + +License: +-------- + + Copyright 2005 Adam Jackson. + + 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 + on the rights to use, copy, modify, merge, publish, distribute, sub + license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL + ADAM JACKSON 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) 2000 The XFree86 Project, Inc. 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 name of the XFree86 Project 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. --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/patches/0001-Remove-mibstore.h.patch +++ xserver-xorg-video-ivtvdev-1.1.2/debian/patches/0001-Remove-mibstore.h.patch @@ -0,0 +1,32 @@ +From 0da044a4fc22ca259acb6aaf25f6b3df7af328ea Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Tue, 17 Sep 2013 22:59:45 +0200 +Subject: [PATCH 1/2] Remove mibstore.h + +--- + src/ivtv.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/ivtv.c b/src/ivtv.c +index ede9c87..f86bd0e 100644 +--- a/src/ivtv.c ++++ b/src/ivtv.c +@@ -42,7 +42,6 @@ in this Software without prior written authorization from the XFree86 Project. + #include "xf86_OSproc.h" + + #include "mipointer.h" +-#include "mibstore.h" + #include "micmap.h" + #include "colormapst.h" + #include "xf86cmap.h" +@@ -692,7 +691,6 @@ IVTVDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + "Rotation might be broken in 24 bpp\n"); + + xf86SetBlackWhitePixels(pScreen); +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* software cursor */ +-- +1.8.4.rc3 + --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/patches/0002-Port-to-new-xserver-API.patch +++ xserver-xorg-video-ivtvdev-1.1.2/debian/patches/0002-Port-to-new-xserver-API.patch @@ -0,0 +1,335 @@ +From 4a2f6c27316bb0d643cef285a53ffe346d17a15d Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Mon, 23 Sep 2013 20:49:04 +0200 +Subject: [PATCH 2/2] Port to new xserver API + +--- + src/compat-api.h | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/ivtv.c | 31 +++++++++--------- + src/ivtv_hw.c | 22 ++++++------- + src/ivtv_hw.h | 12 ++++--- + 4 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 src/compat-api.h + +diff --git a/src/compat-api.h b/src/compat-api.h +new file mode 100644 +index 0000000..205ac59 +--- /dev/null ++++ b/src/compat-api.h +@@ -0,0 +1,99 @@ ++/* ++ * Copyright 2012 Red Hat, Inc. ++ * ++ * 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. ++ * ++ * Author: Dave Airlie ++ */ ++ ++/* this file provides API compat between server post 1.13 and pre it, ++ it should be reused inside as many drivers as possible */ ++#ifndef COMPAT_API_H ++#define COMPAT_API_H ++ ++#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR ++#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] ++#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p ++#endif ++ ++#ifndef XF86_HAS_SCRN_CONV ++#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] ++#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] ++#endif ++ ++#ifndef XF86_SCRN_INTERFACE ++ ++#define SCRN_ARG_TYPE int ++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] ++ ++#define SCREEN_ARG_TYPE int ++#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] ++ ++#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv ++ ++#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask ++#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask ++ ++#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen ++#define CLOSE_SCREEN_ARGS scrnIndex, pScreen ++ ++#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags ++#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 ++ ++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags ++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 ++ ++#define FREE_SCREEN_ARGS_DECL int arg, int flags ++ ++#define VT_FUNC_ARGS_DECL int arg, int flags ++#define VT_FUNC_ARGS pScrn->scrnIndex, 0 ++ ++#define XF86_SCRN_ARG(x) ((x)->scrnIndex) ++#else ++#define SCRN_ARG_TYPE ScrnInfoPtr ++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) ++ ++#define SCREEN_ARG_TYPE ScreenPtr ++#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) ++ ++#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv ++ ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask ++#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++ ++#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen ++#define CLOSE_SCREEN_ARGS pScreen ++ ++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y ++#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y ++ ++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode ++#define SWITCH_MODE_ARGS(arg, m) arg, m ++ ++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg ++ ++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg ++#define VT_FUNC_ARGS pScrn ++ ++#define XF86_SCRN_ARG(x) (x) ++ ++#endif ++ ++#endif +diff --git a/src/ivtv.c b/src/ivtv.c +index f86bd0e..4cb1839 100644 +--- a/src/ivtv.c ++++ b/src/ivtv.c +@@ -96,9 +96,8 @@ static const OptionInfoRec *IVTVDevAvailableOptions(int chipid, int busid); + static void IVTVDevIdentify(int flags); + static Bool IVTVDevProbe(DriverPtr drv, int flags); + static Bool IVTVDevPreInit(ScrnInfoPtr pScrn, int flags); +-static Bool IVTVDevScreenInit(int Index, ScreenPtr pScreen, int argc, +- char **argv); +-static Bool IVTVDevCloseScreen(int scrnIndex, ScreenPtr pScreen); ++static Bool IVTVDevScreenInit(SCREEN_INIT_ARGS_DECL); ++static Bool IVTVDevCloseScreen(CLOSE_SCREEN_ARGS_DECL); + + /* -------------------------------------------------------------------- */ + +@@ -587,9 +586,9 @@ IVTVDevShadowInit(ScreenPtr pScreen) + } + + static Bool +-IVTVDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ++IVTVDevScreenInit(SCREEN_INIT_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + IVTVDevPtr devPtr = IVTVDEVPTR(pScrn); + VisualPtr visual; + int ret, flags, width, height; +@@ -612,30 +611,30 @@ IVTVDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + ivtvHWSave(pScrn); + + if (!ivtvHWModeInit(pScrn, pScrn->currentMode)) { +- xf86DrvMsg(scrnIndex, X_ERROR, "DevScreenInit: Mode init failed\n"); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "DevScreenInit: Mode init failed\n"); + return FALSE; + } + ivtvHWSaveScreen(pScreen, SCREEN_SAVER_ON); +- ivtvHWAdjustFrame(scrnIndex, 0, 0, 0); ++ ivtvHWAdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0)); + + /* mi layer */ + miClearVisualTypes(); + if (pScrn->bitsPerPixel > 8) { + if (!miSetVisualTypes + (pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "DevScreenInit: Set >8bpp visual types failed\n"); + return FALSE; + } + } else if (!miSetVisualTypes(pScrn->depth, + miGetDefaultVisualMask(pScrn->depth), + pScrn->rgbBits, pScrn->defaultVisual)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "DevScreenInit: Set visual types failed\n"); + return FALSE; + } + if (!miSetPixmapDepths()) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "DevScreenInit: Set pixmap depths failed\n"); + return FALSE; + } +@@ -646,7 +645,7 @@ IVTVDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + /* shadowfb */ + if ((devPtr->shadowmem = calloc(1, pScrn->virtualX * pScrn->virtualY * + pScrn->bitsPerPixel)) == NULL) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "DevScreenInit: Allocation of shadow memory failed\n"); + return FALSE; + } +@@ -681,13 +680,13 @@ IVTVDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + "RENDER extension initialisation failed.\n"); + + if (devPtr->shadowmem && !IVTVDevShadowInit(pScreen)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "DevScreenInit: Shadow framebuffer initialization failed.\n"); + return FALSE; + } + + if (pScrn->bitsPerPixel == 24) +- xf86DrvMsg(scrnIndex, X_WARNING, ++ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Rotation might be broken in 24 bpp\n"); + + xf86SetBlackWhitePixels(pScreen); +@@ -729,9 +728,9 @@ IVTVDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + } + + static Bool +-IVTVDevCloseScreen(int scrnIndex, ScreenPtr pScreen) ++IVTVDevCloseScreen(CLOSE_SCREEN_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + IVTVDevPtr devPtr = IVTVDEVPTR(pScrn); + + /* Before we go, wipe the screen. If there is no console +@@ -754,5 +753,5 @@ IVTVDevCloseScreen(int scrnIndex, ScreenPtr pScreen) + } + + pScreen->CloseScreen = devPtr->CloseScreen; +- return (*pScreen->CloseScreen) (scrnIndex, pScreen); ++ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); + } +diff --git a/src/ivtv_hw.c b/src/ivtv_hw.c +index b50c2b0..fad3354 100644 +--- a/src/ivtv_hw.c ++++ b/src/ivtv_hw.c +@@ -709,16 +709,16 @@ ivtvHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) + } + + Bool +-ivtvHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) ++ivtvHWSwitchMode(SWITCH_MODE_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + IVTVDevPtr devPtr = IVTVDEVPTR(pScrn); + + TRACE_ENTER("SwitchMode"); + xfree2ivtv_timing(mode, &devPtr->var); + xfree2ivtv_fblayout(pScrn, &devPtr->var); + if (0 != ioctl(devPtr->fd, FBIOPUT_VSCREENINFO, (void *)(&devPtr->var))) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "SwitchMode: FBIOPUT_VSCREENINFO failed (%s)\n", strerror(errno)); + return FALSE; + } +@@ -726,35 +726,35 @@ ivtvHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) + } + + void +-ivtvHWAdjustFrame(int scrnIndex, int x, int y, int flags) ++ivtvHWAdjustFrame(ADJUST_FRAME_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + IVTVDevPtr devPtr = IVTVDEVPTR(pScrn); + + devPtr->var.xoffset = x; + devPtr->var.yoffset = y; + if (-1 == ioctl(devPtr->fd, FBIOPAN_DISPLAY, (void *)&devPtr->var)) { +- xf86DrvMsgVerb(scrnIndex, 5, X_WARNING, ++ xf86DrvMsgVerb(pScrn->scrnIndex, 5, X_WARNING, + "AdjustFrame: FBIOPAN_DISPLAY failed (%s)\n", strerror(errno)); + } + } + + Bool +-ivtvHWEnterVT(int scrnIndex, int flags) ++ivtvHWEnterVT(VT_FUNC_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + + TRACE_ENTER("EnterVT"); + if (!ivtvHWModeInit(pScrn, pScrn->currentMode)) + return FALSE; +- ivtvHWAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); ++ ivtvHWAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); + return TRUE; + } + + void +-ivtvHWLeaveVT(int scrnIndex, int flags) ++ivtvHWLeaveVT(VT_FUNC_ARGS_DECL) + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ SCRN_INFO_PTR(arg); + + TRACE_ENTER("LeaveVT"); + ivtvHWRestore(pScrn); +diff --git a/src/ivtv_hw.h b/src/ivtv_hw.h +index 352d5d8..238a42c 100644 +--- a/src/ivtv_hw.h ++++ b/src/ivtv_hw.h +@@ -31,7 +31,9 @@ in this Software without prior written authorization from the XFree86 Project. + #ifndef _IVTV_HW_H_ + #define _IVTV_HW_H_ + ++#include "xf86.h" + #include "xf86str.h" ++#include "shadow.h" + #include "colormapst.h" + #include + #undef __STRICT_ANSI__ +@@ -40,6 +42,8 @@ in this Software without prior written authorization from the XFree86 Project. + #include "ivtv_compat.h" + #include + ++#include "compat-api.h" ++ + #ifdef XORG_VERSION_CURRENT + # include "xorgVersion.h" + #endif +@@ -83,10 +87,10 @@ void ivtvHWRestore(ScrnInfoPtr pScrn); + void ivtvHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, + LOCO * colors, VisualPtr pVisual); + int ivtvHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags); +-Bool ivtvHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); +-void ivtvHWAdjustFrame(int scrnIndex, int x, int y, int flags); +-Bool ivtvHWEnterVT(int scrnIndex, int flags); +-void ivtvHWLeaveVT(int scrnIndex, int flags); ++Bool ivtvHWSwitchMode(SWITCH_MODE_ARGS_DECL); ++void ivtvHWAdjustFrame(ADJUST_FRAME_ARGS_DECL); ++Bool ivtvHWEnterVT(VT_FUNC_ARGS_DECL); ++void ivtvHWLeaveVT(VT_FUNC_ARGS_DECL); + void ivtvHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags); + Bool ivtvHWSaveScreen(ScreenPtr pScreen, int mode); + Bool ivtvHWSendDMA(ScrnInfoPtr pScrn, void *ptr, int x1, int x2, int y1, int y2); +-- +1.8.4.rc3 + --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/patches/series +++ xserver-xorg-video-ivtvdev-1.1.2/debian/patches/series @@ -0,0 +1,2 @@ +0001-Remove-mibstore.h.patch +0002-Port-to-new-xserver-API.patch --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/rules +++ xserver-xorg-video-ivtvdev-1.1.2/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +# 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 + +# Debug package: +override_dh_strip: + dh_strip --dbg-package=xserver-xorg-video-ivtv-dbg + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,xsf --builddirectory=build/ --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/watch +++ xserver-xorg-video-ivtvdev-1.1.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://dl.ivtvdriver.org/xf86-video-ivtv/ xf86-video-ivtv-(.*)\.tar\.gz --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/xserver-xorg-video-ivtv.install +++ xserver-xorg-video-ivtvdev-1.1.2/debian/xserver-xorg-video-ivtv.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/drivers/*.so --- xserver-xorg-video-ivtvdev-1.1.2.orig/debian/xserver-xorg-video-ivtvdev.links +++ xserver-xorg-video-ivtvdev-1.1.2/debian/xserver-xorg-video-ivtvdev.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-ivtvdev/script