diff --git a/import.log b/import.log new file mode 100644 index 0000000..9919a48 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +xorg-x11-drv-ivtv-1_1_0-3_fc11:F-12:xorg-x11-drv-ivtv-1.1.0-3.fc11.src.rpm:1256074502 diff --git a/xf86-video-ivtv-1.1.0-Xextproto71.patch b/xf86-video-ivtv-1.1.0-Xextproto71.patch new file mode 100644 index 0000000..06a7824 --- /dev/null +++ b/xf86-video-ivtv-1.1.0-Xextproto71.patch @@ -0,0 +1,80 @@ +diff -up xf86-video-ivtv-1.1.0/configure.ac.Xextproto71 xf86-video-ivtv-1.1.0/configure.ac +--- xf86-video-ivtv-1.1.0/configure.ac.Xextproto71 2009-10-20 22:25:07.742871233 +0200 ++++ xf86-video-ivtv-1.1.0/configure.ac 2009-10-20 22:27:34.791874162 +0200 +@@ -54,6 +54,11 @@ PKG_CHECK_EXISTS([xorg-server >= 1.0.99. + PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) + sdkdir=$(pkg-config --variable=sdkdir xorg-server) + ++PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], ++ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), ++ HAVE_XEXTPROTO_71="no") ++AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) ++ + # Checks for extensions + XORG_DRIVER_CHECK_EXT(RANDR, randrproto) + XORG_DRIVER_CHECK_EXT(RENDER, renderproto) +diff -up xf86-video-ivtv-1.1.0/src/ivtv.c.Xextproto71 xf86-video-ivtv-1.1.0/src/ivtv.c +--- xf86-video-ivtv-1.1.0/src/ivtv.c.Xextproto71 2009-10-20 22:54:20.940868205 +0200 ++++ xf86-video-ivtv-1.1.0/src/ivtv.c 2009-10-20 23:28:20.961620109 +0200 +@@ -51,8 +51,10 @@ in this Software without prior written a + /* for visuals */ + #include "fb.h" + ++#ifndef XSERVER_LIBPCIACCESS + #include "xf86Resources.h" + #include "xf86RAC.h" ++#endif + + #ifdef XvExtension + # include "xf86xv.h" +@@ -403,6 +405,7 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int fl + + devPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); + ++#ifndef XSERVER_LIBPCIACCESS + pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; + /* XXX Is this right? Can probably remove RAC_FB */ + pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; +@@ -413,6 +416,13 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int fl + "DevPreInit: xf86RegisterResources() found resource conflicts\n"); + return FALSE; + } ++#else ++ if (devPtr->pEnt->location.type == BUS_PCI ) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "DevPreInit: xf86RegisterResources() found resource conflicts\n"); ++ return FALSE; ++ } ++#endif + + /* open device */ + if (!ivtvHWInit(pScrn, NULL, +diff -up xf86-video-ivtv-1.1.0/src/ivtv_hw.c.Xextproto71 xf86-video-ivtv-1.1.0/src/ivtv_hw.c +--- xf86-video-ivtv-1.1.0/src/ivtv_hw.c.Xextproto71 2009-10-20 22:29:13.508623060 +0200 ++++ xf86-video-ivtv-1.1.0/src/ivtv_hw.c 2009-10-20 22:52:44.711622244 +0200 +@@ -55,8 +55,12 @@ in this Software without prior written a + #include "xf86cmap.h" + + #include "globals.h" ++#ifdef HAVE_XEXTPROTO_71 ++#include ++#else + #define DPMS_SERVER + #include ++#endif + + #if IVTVDEBUG + # define TRACE_ENTER(str) ErrorF("ivtv_hw: " str " %d\n",pScrn->scrnIndex) +diff -up xf86-video-ivtv-1.1.0/src/ivtv_hw.h.Xextproto71 xf86-video-ivtv-1.1.0/src/ivtv_hw.h +diff -up xf86-video-ivtv-1.1.0/src/Makefile.am.Xextproto71 xf86-video-ivtv-1.1.0/src/Makefile.am +--- xf86-video-ivtv-1.1.0/src/Makefile.am.Xextproto71 2009-10-20 22:28:39.726904017 +0200 ++++ xf86-video-ivtv-1.1.0/src/Makefile.am 2009-10-20 22:31:06.987875245 +0200 +@@ -23,7 +23,7 @@ + # -avoid-version prevents gratuitous .0.0.0 version numbers on the end + # _ladir passes a dummy rpath to libtool so the thing will actually link + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. +-AM_CFLAGS = @XORG_CFLAGS@ ++AM_CFLAGS = @XORG_CFLAGS@ @XEXT_CFLAGS@ + ivtv_drv_la_LTLIBRARIES = ivtv_drv.la + ivtv_drv_la_LDFLAGS = -module -avoid-version + ivtv_drv_ladir = @moduledir@/drivers diff --git a/xorg-x11-drv-ivtv.spec b/xorg-x11-drv-ivtv.spec index 3a180b9..9d39be1 100644 --- a/xorg-x11-drv-ivtv.spec +++ b/xorg-x11-drv-ivtv.spec @@ -1,16 +1,18 @@ Name: xorg-x11-drv-ivtv Version: 1.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Xorg X11 ivtv video driver Group: User Interface/X Hardware Support License: MIT URL: http://ivtvdriver.org Source0: http://dl.ivtvdriver.org/xf86-video-ivtv/archive/1.1.x/xf86-video-ivtv-%{version}.tar.gz +Patch0: xf86-video-ivtv-1.1.0-Xextproto71.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6 -#BuildRequires: libtool +BuildRequires: xorg-x11-proto-devel +BuildRequires: libtool Requires: xorg-x11-server-Xorg >= 1.3.0.0-6 Requires: ivtv-firmware Obsoletes: ivtv_xdriver < %{version} @@ -20,7 +22,8 @@ X.Org X11 ivtv video driver. %prep %setup -q -n xf86-video-ivtv-%{version} -#sh autogen.sh +%patch0 -p1 -b .Xextproto71 +autoreconf -vif %build %configure @@ -44,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.1.0-3 +- Rebuild for F-12 +- Add xf86-video-ivtv-1.1.0-Xextproto71.patch to fix new Xorg + * Mon Jul 27 2009 Fedora Release Engineering - 1.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild