commit xorg-x11-driver-video-ivtv

28 Jul 2008

Hello community,

here is the log from the commit of package xorg-x11-driver-video-ivtv
checked in at Mon Jul 28 02:06:00 CEST 2008.


--------

--- arch/i386/xorg-x11-driver-video-ivtv/xorg-x11-driver-video-ivtv.changes	2008-04-26 10:56:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-ivtv/xorg-x11-driver-video-ivtv.changes	2008-07-28 01:42:53.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jul 28 01:42:26 CEST 2008 - ro@suse.de
+
+- update to version 1.0.1
+  - Add support for newer X org versions with libpciaccess
+  - xf86-video-ivtv Xv scaling fix
+
+-------------------------------------------------------------------



Old:
----
  xf86-video-ivtv-1.0.0.tar.bz2

New:
----
  xf86-video-ivtv-1.0.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-driver-video-ivtv.spec ++++++
--- /var/tmp/diff_new_pack.YsZ384/_old	2008-07-28 01:47:22.000000000 +0200
+++ /var/tmp/diff_new_pack.YsZ384/_new	2008-07-28 01:47:22.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package xorg-x11-driver-video-ivtv (Version 1.0.0)
+# spec file for package xorg-x11-driver-video-ivtv (Version 1.0.1)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -25,8 +25,8 @@
 License:        X11/MIT
 Group:          System/X11/Servers/XF86_4
 AutoReqProv:    on
-Version:        1.0.0
-Release:        59
+Version:        1.0.1
+Release:        1
 Summary:        The X11 video driver for the PVR-350 frame buffer
 Requires:       xorg-x11-server
 Source:         xf86-video-ivtv-%{version}.tar.bz2
@@ -71,6 +71,10 @@
 %{_libdir}/xorg/modules/drivers/*_drv.so
 
 %changelog
+* Mon Jul 28 2008 ro@suse.de
+- update to version 1.0.1
+  - Add support for newer X org versions with libpciaccess
+  - xf86-video-ivtv Xv scaling fix
 * Sat Apr 26 2008 coolo@suse.de
 - fix build
 * Wed Oct 17 2007 ro@suse.de

++++++ xf86-video-ivtv-1.0.0.tar.bz2 -> xf86-video-ivtv-1.0.1.tar.bz2 ++++++
++++ 3515 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/autogen.sh new/xf86-video-ivtv-1.0.1/autogen.sh
--- old/xf86-video-ivtv-1.0.0/autogen.sh	2007-02-17 14:21:08.000000000 +0100
+++ new/xf86-video-ivtv-1.0.1/autogen.sh	1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /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 "$@"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/ChangeLog new/xf86-video-ivtv-1.0.1/ChangeLog
--- old/xf86-video-ivtv-1.0.0/ChangeLog	2007-10-14 18:36:10.000000000 +0200
+++ new/xf86-video-ivtv-1.0.1/ChangeLog	2008-03-05 18:41:35.000000000 +0100
@@ -1,3 +1,5 @@
+#1.0.1  - Add support for newer X org versions with libpciaccess
+	- xf86-video-ivtv Xv scaling fix
 #1.0.0 	- Renamed to ivtv_drv and xf86-video-ivtv for consistency with X11R7
 	  naming convention.
 	- When the ivtv X driver is loaded, it ensures the osd/framebuffer is switched
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/config.h.in new/xf86-video-ivtv-1.0.1/config.h.in
--- old/xf86-video-ivtv-1.0.0/config.h.in	2007-02-17 14:21:08.000000000 +0100
+++ new/xf86-video-ivtv-1.0.1/config.h.in	2007-10-19 21:19:45.000000000 +0200
@@ -50,8 +50,20 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Version number of package */
 #undef VERSION
+
+/* Update some functions to new X parameter list */
+#undef X_NEW_PARMS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/configure.ac new/xf86-video-ivtv-1.0.1/configure.ac
--- old/xf86-video-ivtv-1.0.0/configure.ac	2007-08-25 21:01:09.000000000 +0200
+++ new/xf86-video-ivtv-1.0.1/configure.ac	2008-02-28 08:07:04.000000000 +0100
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-ivtv],
-        1.0.0,
+        1.0.1,
         [http://ivtvdriver.org/trac],
         xf86-video-ivtv)
 
@@ -47,16 +47,30 @@
             [moduledir="$withval"],
             [moduledir="$libdir/xorg/modules"])
 
+PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
+                  [AC_DEFINE(X_NEW_PARMS,1,[Update some functions to new X parameter list])])
+
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+XORG_DRIVER_CHECK_EXT(XSERVER_LIBPCIACCESS, pciaccess)
 XORG_DRIVER_CHECK_EXT(XV, videoproto)
 
-# Checks for libraries.
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+              [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
+              [#include "xorg-server.h"])
+CFLAGS="$save_CFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
 # Checks for header files.
 AC_HEADER_STDC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/README new/xf86-video-ivtv-1.0.1/README
--- old/xf86-video-ivtv-1.0.0/README	2007-10-14 19:47:44.000000000 +0200
+++ new/xf86-video-ivtv-1.0.1/README	2008-01-14 23:43:22.000000000 +0100
@@ -40,16 +40,28 @@
 Xorg 7.x Servers
 ================
 
-For new 7.x servers run the configure script followed by make and then make install.
-The installation path may well need to be altered using the --prefix option.
+For new 7.x servers run:
 
-If you get this error when running the configure script:
+	autogen.sh 
+        make
+        make install
 
-checking for XORG... configure: error: Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto ) were not met.
+The installation path may well need to be altered using the --prefix
+option in autogen.sh.
+
+If you get this error when running autogen.sh or the configure script:
+
+checking for XORG... configure: error: Package requirements (xorg-server
+xproto fontsproto ) were not met.
 
 then it is likely that you are missing the xorg-server development
 package. For Fedora this package is called 'xorg-x11-server-sdk'.
 
+Debian 4.0 (etch) uses X 7.1.1. You must install the required packages
+by using 'apt-get install autoconf automake libtool xserver-xorg-dev
+x11proto-core-dev x11proto-fonts-dev'. You can check success by
+checking if the files ivtv_drv.la and ivtv_drv.so are available at
+/usr/local/lib/xorg/modules/drivers
 
 Xorg 6.x & Xfree86 servers
 ==========================
@@ -192,9 +204,10 @@
 not specified with the ivtv-fb module. Setting that option locks down the
 resolution to a fixed value.
 
-If you want to use a custom resolution then you should first load the ivtvfb
-module with the resolutions you want. To do that add a line to
-/etc/modprobe.conf, e.g.:
+If you want to use a custom resolution then you should first load the
+ivtvfb module with the resolutions you want. To do that change your
+modprobe configuration file by adding a line to /etc/modprobe.conf or
+(for Debian 4.0) by creating a file /etc/modprobe.d/ivtvfb:
 
 options ivtvfb osd_xres=720 osd_yres=576
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/src/Imakefile new/xf86-video-ivtv-1.0.1/src/Imakefile
--- old/xf86-video-ivtv-1.0.0/src/Imakefile	2007-08-27 17:08:53.000000000 +0200
+++ new/xf86-video-ivtv-1.0.1/src/Imakefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-XCOMM
-XCOMM This is an Imakefile for the ivtv driver.  
-XCOMM
-#undef DefaultCCOptions
-#define DefaultCCOptions
-#define IHaveModules
-#include <Server.tmpl>
-
-SRCS = ivtv.c ivtv_hw.c ivtv_xv.c
-OBJS = ivtv.o ivtv_hw.o ivtv_xv.o
-
-#if defined(XF86DriverSDK)
-INCLUDES = -I. -I../../include
-#else
-INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
-           -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \
-           -I$(SERVERSRC)/fb -I$(XF86SRC)/xaa \
-	   -I$(XF86SRC)/fbdevhw -I$(XF86SRC)/ramdac \
-           -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \
-           -I$(XF86SRC)/rac \
-           -I$(SERVERSRC)/Xext -I$(XF86SRC)/xf24_32bpp\
-           -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
-	   -I$(SERVERSRC)/miext/shadow -I$(EXTINCSRC) -I$(SERVERSRC)/render
-#endif
-#ifdef XF86_VERSION_CURRENT
-XCOMM We are using Xfree86
-
-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,16,0)
-DEFREGIONNULL = -DX_USE_REGION_NULL
-#endif
-
-#else
-XCOMM We are using X.org
-DEFREGIONNULL = -DX_USE_REGION_NULL
-#endif
-DEFINES = FbdevDefines  $(DEFREGIONNULL)
-
-#if MakeHasPosixVariableSubstitutions
-SubdirLibraryRule($(OBJS))
-#endif
-
-ModuleObjectRule()
-
-ObjectModuleTarget(ivtv,$(OBJS))
-
-InstallObjectModule(ivtv,$(MODULEDIR),drivers)
-
-
-DependTarget()
-
-InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/ivtv)
-InstallDriverSDKNonExecFile(ivtv.c,$(DRIVERSDKDIR)/drivers/ivtv)
-
-InstallDriverSDKObjectModule(ivtv,$(DRIVERSDKMODULEDIR),drivers)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/src/ivtv.c new/xf86-video-ivtv-1.0.1/src/ivtv.c
--- old/xf86-video-ivtv-1.0.0/src/ivtv.c	2007-10-12 09:12:46.000000000 +0200
+++ new/xf86-video-ivtv-1.0.1/src/ivtv.c	2008-02-28 08:07:07.000000000 +0100
@@ -114,7 +114,7 @@
 #define IVTVDEV_DRIVER_NAME	"ivtv"
 #define IVTVDEV_VERSION_MAJOR	1
 #define IVTVDEV_VERSION_MINOR	0
-#define IVTVDEV_VERSION_PATCH	0
+#define IVTVDEV_VERSION_PATCH	1
 #define IVTVDEV_VERSION	((IVTVDEV_VERSION_MAJOR << 16) | \
 			(IVTVDEV_VERSION_MINOR << 8) | \
 			(IVTVDEV_VERSION_PATCH))
@@ -198,7 +198,7 @@
 static void
 IVTVshadowUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
 {
-#ifdef X_MODULAR
+#ifdef X_NEW_PARMS
     RegionPtr damage = DamageRegion(pBuf->pDamage);
 #else
     RegionPtr damage = &pBuf->damage;
@@ -330,9 +330,6 @@
 	    xf86MatchDevice(IVTVDEV_DRIVER_NAME, &devSections)) <= 0)
 	return FALSE;
 
-    if (xf86GetPciVideoInfo() == NULL)
-	return FALSE;
-
     numUsed = xf86MatchPciInstances(IVTVDEV_DRIVER_NAME,
 	PCI_HAUPPAUGE_VENDOR_ID,
 	IVTVChipsets,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/src/ivtv_hw.c new/xf86-video-ivtv-1.0.1/src/ivtv_hw.c
--- old/xf86-video-ivtv-1.0.0/src/ivtv_hw.c	2007-10-12 09:14:57.000000000 +0200
+++ new/xf86-video-ivtv-1.0.1/src/ivtv_hw.c	2008-02-28 08:05:23.000000000 +0100
@@ -269,7 +269,13 @@
 		xf86DrvMsg(scrnIndex, X_ERROR,
 			"Unable to open yuv device '%s'\n", yuvDevFull);
 	    }
+	} else if (yuvFd == -1 && errno == EACCES) {
+		/* Device exists, but we weren't allowed to open it */
+		xf86DrvMsg(scrnIndex, X_ERROR,
+		    "Unable to open yuv device '%s'. "
+                    "Check device permissions.\n", yuvDevFull);
 	}
+
 	if (yuvFd == -1)
 		continue;
 
@@ -350,7 +356,11 @@
 /* -------------------------------------------------------------------- */
 
 Bool
+#if XSERVER_LIBPCIACCESS
+ivtvHWProbe(struct pci_device *PciInfo, char *device, char **namep)
+#else
 ivtvHWProbe(pciVideoPtr pPci, char *device, char **namep)
+#endif
 {
     int fd;
     Bool retVal = TRUE;
@@ -377,7 +387,11 @@
 }
 
 Bool
+#if XSERVER_LIBPCIACCESS
+ivtvHWInit(ScrnInfoPtr pScrn, struct pci_device *PciInfo, char *device)
+#else
 ivtvHWInit(ScrnInfoPtr pScrn, pciVideoPtr pPci, char *device)
+#endif
 {
     ivtvHWPtr hwPtr;
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/src/ivtv_hw.h new/xf86-video-ivtv-1.0.1/src/ivtv_hw.h
--- old/xf86-video-ivtv-1.0.0/src/ivtv_hw.h	2007-08-28 10:37:51.000000000 +0200
+++ new/xf86-video-ivtv-1.0.1/src/ivtv_hw.h	2008-02-28 08:05:23.000000000 +0100
@@ -44,6 +44,10 @@
 # include "xorgVersion.h"
 #endif
 
+#ifdef XSERVER_LIBPCIACCESS
+#include <pciaccess.h>
+#endif
+
 typedef struct
 {
     /* framebuffer device: filename (/dev/fb*), handle, more */
@@ -90,17 +94,15 @@
 # define IVTVDEVHW_BYTE_SWAP 1
 #endif
 
-/* FIXME - There must be a better way to do this..... */
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(7,0,0,0,0)
-# define X_MODULAR 1
-#elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,0,0,0,0)
-# define X_MODULAR 1
-#endif
-
 Bool ivtvHWGetRec(ScrnInfoPtr pScrn);
 void ivtvHWFreeRec(ScrnInfoPtr pScrn);
+#if XSERVER_LIBPCIACCESS
+Bool ivtvHWProbe(struct pci_device *PciInfo, char *device, char **namep);
+Bool ivtvHWInit(ScrnInfoPtr pScrn, struct pci_device *PciInfo, char *device);
+#else
 Bool ivtvHWProbe(pciVideoPtr pPci, char *device, char **namep);
 Bool ivtvHWInit(ScrnInfoPtr pScrn, pciVideoPtr pPci, char *device);
+#endif
 char *ivtvHWGetName(ScrnInfoPtr pScrn);
 int ivtvHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp);
 int ivtvHWGetLineLength(ScrnInfoPtr pScrn);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ivtv-1.0.0/src/ivtv_xv.c new/xf86-video-ivtv-1.0.1/src/ivtv_xv.c
--- old/xf86-video-ivtv-1.0.0/src/ivtv_xv.c	2007-08-28 10:37:51.000000000 +0200
+++ new/xf86-video-ivtv-1.0.1/src/ivtv_xv.c	2007-11-05 18:31:09.000000000 +0100
@@ -66,7 +66,7 @@
 static void IVTVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short,
     unsigned int *, unsigned int *, pointer);
 
-#ifdef X_MODULAR
+#ifdef X_NEW_PARMS
 static int IVTVPutImage(ScrnInfoPtr, short, short, short, short, short,
     short, short, short, int, unsigned char *, short,
     short, Bool, RegionPtr, pointer, DrawablePtr);
@@ -566,11 +566,12 @@
 		((sc_y & 15) << 4) + (blk_index & 15) + suv_offset;
 
 	    /* Copy v */
-	    dst[dst_offset] = src[(width >> 1) * us_y + v_offset + us_x];
-	    blk_index++;
+	    dst[dst_offset++] = src[(width >> 1) * us_y + v_offset + us_x];
+
 	    /* Copy u */
 	    dst[dst_offset] = src[(width >> 1) * us_y + u_offset + us_x];
-	    blk_index++;
+
+	    blk_index+=2;
 
 	    if (xskip_count != xskip) {
 		/* Count towards the next horizontal skip */
@@ -676,7 +677,7 @@
     return (sc_x << 16) | sc_y;
 }
 
-#ifdef X_MODULAR
+#ifdef X_NEW_PARMS
 static int
 IVTVPutImage(ScrnInfoPtr pScrn,
     short src_x, short src_y,


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)