rpms/xorg-x11-drv-ivtv/F-12 xf86-video-ivtv.patch, NONE, 1.1 xorg-x11-drv-ivtv.spec, 1.11, 1.12 xf86-video-ivtv-1.1.0-Xextproto71.patch, 1.1, NONE
Nicolas Chauvet
kwizart at fedoraproject.org
Wed Nov 11 11:48:58 UTC 2009
Author: kwizart
Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14815
Modified Files:
xorg-x11-drv-ivtv.spec
Added Files:
xf86-video-ivtv.patch
Removed Files:
xf86-video-ivtv-1.1.0-Xextproto71.patch
Log Message:
-Switch to upstream patch
xf86-video-ivtv.patch:
configure.ac | 5 +++++
src/Makefile.am | 2 +-
src/ivtv.c | 20 ++++++++++++++++----
src/ivtv_hw.c | 8 ++++++--
4 files changed, 28 insertions(+), 7 deletions(-)
--- NEW FILE xf86-video-ivtv.patch ---
Index: configure.ac
===================================================================
--- configure.ac (revision 146)
+++ configure.ac (working copy)
@@ -54,6 +54,11 @@
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)
Index: src/ivtv_hw.c
===================================================================
--- src/ivtv_hw.c (revision 146)
+++ src/ivtv_hw.c (working copy)
@@ -55,8 +55,12 @@
#include "xf86cmap.h"
#include "globals.h"
-#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#ifdef HAVE_XEXTPROTO_71
+# include <X11/extensions/dpmsconst.h>
+#else
+# define DPMS_SERVER
+# include <X11/extensions/dpms.h>
+#endif
#if IVTVDEBUG
# define TRACE_ENTER(str) ErrorF("ivtv_hw: " str " %d\n",pScrn->scrnIndex)
Index: src/Makefile.am
===================================================================
--- src/Makefile.am (revision 146)
+++ src/Makefile.am (working copy)
@@ -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
Index: src/ivtv.c
===================================================================
--- src/ivtv.c (revision 146)
+++ src/ivtv.c (working copy)
@@ -51,8 +51,10 @@
/* for visuals */
#include "fb.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+# include "xf86Resources.h"
+# include "xf86RAC.h"
+#endif
#ifdef XvExtension
# include "xf86xv.h"
@@ -117,7 +119,7 @@
(IVTVDEV_VERSION_MINOR << 8) | \
(IVTVDEV_VERSION_PATCH))
-DriverRec IVTVDEV = {
+_X_EXPORT DriverRec IVTVDEV = {
IVTVDEV_VERSION,
IVTVDEV_DRIVER_NAME,
IVTVDevIdentify,
@@ -175,7 +177,7 @@
{0, 0, 0, 0}
};
-XF86ModuleData ivtvModuleData = { &IVTVDevVersRec, IVTVDevSetup, NULL };
+_X_EXPORT XF86ModuleData ivtvModuleData = { &IVTVDevVersRec, IVTVDevSetup, NULL };
pointer
IVTVDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -185,7 +187,9 @@
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&IVTVDEV, module, 0);
+#ifndef HAVE_XEXTPROTO_71
LoaderRefSymLists(fbSymbols, shadowSymbols, NULL);
+#endif
return (pointer) 1;
}
if (errmaj)
@@ -403,6 +407,7 @@
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 +418,7 @@
"DevPreInit: xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
+#endif
/* open device */
if (!ivtvHWInit(pScrn, NULL,
@@ -519,9 +525,12 @@
IVTVDevFreeRec(pScrn);
return FALSE;
}
+
+#ifndef HAVE_XEXTPROTO_71
if (mod && syms) {
xf86LoaderReqSymLists(syms, NULL);
}
+#endif
/* Load shadow */
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Using \"Shadow Framebuffer\"\n");
@@ -529,7 +538,10 @@
IVTVDevFreeRec(pScrn);
return FALSE;
}
+
+#ifndef HAVE_XEXTPROTO_71
xf86LoaderReqSymLists(shadowSymbols, NULL);
+#endif
TRACE_EXIT("PreInit");
return TRUE;
Index: xorg-x11-drv-ivtv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-12/xorg-x11-drv-ivtv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xorg-x11-drv-ivtv.spec 20 Oct 2009 21:36:49 -0000 1.11
+++ xorg-x11-drv-ivtv.spec 11 Nov 2009 11:48:58 -0000 1.12
@@ -1,13 +1,13 @@
Name: xorg-x11-drv-ivtv
Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?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
+Patch0: xf86-video-ivtv.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -22,7 +22,7 @@ X.Org X11 ivtv video driver.
%prep
%setup -q -n xf86-video-ivtv-%{version}
-%patch0 -p1 -b .Xextproto71
+%patch0 -p0 -b .Xextproto71
autoreconf -vif
%build
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Nov 11 2009 kwizart < kwizart at gmail.com > - 1.1.0-4
+- Switch to upstream patch.
+
* 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
--- xf86-video-ivtv-1.1.0-Xextproto71.patch DELETED ---
More information about the scm-commits
mailing list