Future of xserver-xorg-video-ivtvdev package
[cc: kibi, Julien, the other uploaders of this package] Hi, On the back of #899766[0] I've just filed #900631[1] to have the ivtv- utils package removed from unstable which made me wonder about the ivtv X driver. Like with the utils I've been unable to find any current upstream for the driver, the ivtvdriver.org site is dead (domain parked at the moment). Popcon[2] is v. low, hasn't been uploaded since 2013. I was a bit surprised it was even installable on a modern system but I guess X's ABI compat is pretty good. WTYT, should this one be removed as well? Ian. [0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=899766 [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900631 [2] https://qa.debian.org/popcon.php?package=xserver-xorg-video-ivtvdev
Re: heads up: xserver 1.14 to unstable
On Mon, 2013-09-23 at 21:02 +0200, Julien Cristau wrote: On Tue, Sep 17, 2013 at 22:50:44 +0100, Ian Campbell wrote: On Tue, 2013-09-17 at 23:29 +0200, Julien Cristau wrote: It doesn't build. The attached patch fixes that (and hopefully still builds against 1.12), but I don't know if that's enough to make it run. Ack, thanks. I'll run this by upstream. In the meantime I think we can just run with it? I can prepare an MU if you like, although it will need sponsoring (I'm still in the NM queue. I'm travelling but in a week or two should be doable. I've just uploaded with those changes. Thanks! No response from upstream so far. If you have other things to put on top of it let me know and I'll sponsor that. I've not got anything. Ian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1380007444.30708.43.ca...@dagon.hellion.org.uk
Re: heads up: xserver 1.14 to unstable
On Tue, 2013-09-17 at 21:27 +0200, Julien Cristau wrote: Hi all, the X Strike Force is getting ready to upload a newer xserver to unstable. The current plan is to do that once systemd 204 reaches testing, so probably in a week or two. Please let us know for each non-XSF-maintained driver whether you'll want to make a new source upload for the transition or if it should be handled by binNMUs. I've not seen a new upstream release of the ivtv driver in forever. A binNMU is the way to go I think, unless it doesn't build or something in which case let me know... Cheers, Ian. I notice that fglrx-driver, fglrx-legacy-driver and nvidia-graphics-drivers-legacy-96xx in sid don't declare support for the new ABI. Is there a newer version of those? Thanks, Julien -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1379450272.11304.198.ca...@hastur.hellion.org.uk
Re: heads up: xserver 1.14 to unstable
On Tue, 2013-09-17 at 23:29 +0200, Julien Cristau wrote: On Tue, Sep 17, 2013 at 21:37:52 +0100, Ian Campbell wrote: On Tue, 2013-09-17 at 21:27 +0200, Julien Cristau wrote: Hi all, the X Strike Force is getting ready to upload a newer xserver to unstable. The current plan is to do that once systemd 204 reaches testing, so probably in a week or two. Please let us know for each non-XSF-maintained driver whether you'll want to make a new source upload for the transition or if it should be handled by binNMUs. I've not seen a new upstream release of the ivtv driver in forever. A binNMU is the way to go I think, unless it doesn't build or something in which case let me know... It doesn't build. The attached patch fixes that (and hopefully still builds against 1.12), but I don't know if that's enough to make it run. Ack, thanks. I'll run this by upstream. In the meantime I think we can just run with it? I can prepare an MU if you like, although it will need sponsoring (I'm still in the NM queue. I'm travelling but in a week or two should be doable. Ian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1379454644.11304.212.ca...@hastur.hellion.org.uk
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |2 +- debian/control |1 - 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 3e7dcde8938afc875a190c5cc38165cb4813c18b Author: Ian Campbell i...@hellion.org.uk Date: Sun Sep 23 09:45:54 2012 +0100 Remove DM-Upload-Allowed: yes, it's already obsolete. diff --git a/debian/changelog b/debian/changelog index f26fa7c..ec7c442 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ xserver-xorg-video-ivtvdev (1.1.2-2) UNRELEASED; urgency=low - * Set DM-Upload-Allowed: yes. + * -- Ian Campbell i...@hellion.org.uk Mon, 20 Aug 2012 08:32:57 +0100 diff --git a/debian/control b/debian/control index 05066de..de46726 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: contrib/x11 Priority: extra Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: Ian Campbell i...@hellion.org.uk, Cyril Brulebois k...@debian.org -DM-Upload-Allowed: yes Build-Depends: debhelper (= 8), dh-autoreconf, -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1tfhpo-000844...@vasks.debian.org
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/control |1 + 2 files changed, 7 insertions(+) New commits: commit 33655c7fac6fb15c1ee47e42919b73edfe8ebced Author: Ian Campbell i...@hellion.org.uk Date: Wed Aug 22 20:06:33 2012 +0100 Set DM-Upload-Allowed: yes now I'm a DM. diff --git a/debian/changelog b/debian/changelog index c1a1a84..f26fa7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-ivtvdev (1.1.2-2) UNRELEASED; urgency=low + + * Set DM-Upload-Allowed: yes. + + -- Ian Campbell i...@hellion.org.uk Mon, 20 Aug 2012 08:32:57 +0100 + xserver-xorg-video-ivtvdev (1.1.2-1) unstable; urgency=low [ Ian Campbell ] diff --git a/debian/control b/debian/control index de46726..05066de 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: contrib/x11 Priority: extra Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: Ian Campbell i...@hellion.org.uk, Cyril Brulebois k...@debian.org +DM-Upload-Allowed: yes Build-Depends: debhelper (= 8), dh-autoreconf, -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1t4pvp-000555...@vasks.debian.org
Re: xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'
On Sun, 2011-01-02 at 19:14 +, Ian Campbell wrote: A small update to remove some now deprecated calls (xfree, xcalloc, xalloc). Version number bumped to 1.1.2 I committed this new upstream version to the debian-experimental branch of xserver-xorg-video-ivtvdev.git (as 1.1.2-1). Assuming the existing version is building ok against the xserver in experimental I don't think there is any pressing need for an upload but I figured it was worth mentioning in case a newer xserver which removes the deprecated symbols arrives before the package is uploaded for some other reason. Ian. -- Ian Campbell You will have a long and unpleasant discussion with your supervisor. signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'upstream/tags/1.1.2'
New branch 'upstream/tags/1.1.2' available with the following commits: commit 42a0afe6a81ce899ba2d2b11a5d395c83e1c2034 Author: awalls awa...@f93e8361-94ff-0310-af1b-c9b61a63ab7d Date: Sun Dec 26 15:20:12 2010 + Added release tag 1.1.2 git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tags/1@4156 f93e8361-94ff-0310-af1b-c9b61a63ab7d commit ed488f869fb3220fa4e1241e696d355263cb4ff5 Author: awalls awa...@f93e8361-94ff-0310-af1b-c9b61a63ab7d Date: Sun Dec 26 15:16:29 2010 + Author: Ian Armstrong i...@iarmst.demon.co.uk A small update to remove some now deprecated calls (xfree, xcalloc, xalloc). Version number bumped to 1.1.2 git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tr...@4155 f93e8361-94ff-0310-af1b-c9b61a63ab7d -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pztnv-0002gh...@alioth.debian.org
xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'
debian/changelog |6 ++
src/ivtv.c | 18 +-
src/ivtv_xv.c|8
3 files changed, 19 insertions(+), 13 deletions(-)
New commits:
commit 798e69e3ee9d17153c5d70cca0fa7993151e4470
Author: Ian Campbell i...@hellion.org.uk
Date: Fri Dec 31 13:30:59 2010 +
Add changelog entry for 1.1.2-1
diff --git a/debian/changelog b/debian/changelog
index fc43148..16b493b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ivtvdev (1.1.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Ian Campbell i...@hellion.org.uk Fri, 31 Dec 2010 13:30:47 +
+
xserver-xorg-video-ivtvdev (1.1.1-3) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
commit ed488f869fb3220fa4e1241e696d355263cb4ff5
Author: awalls awa...@f93e8361-94ff-0310-af1b-c9b61a63ab7d
Date: Sun Dec 26 15:16:29 2010 +
Author: Ian Armstrong i...@iarmst.demon.co.uk
A small update to remove some now deprecated calls (xfree, xcalloc, xalloc).
Version number bumped to 1.1.2
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tr...@4155
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/src/ivtv.c b/src/ivtv.c
index 0888204..ede9c87 100644
--- a/src/ivtv.c
+++ b/src/ivtv.c
@@ -114,7 +114,7 @@ static int pix24bpp = 0;
#define IVTVDEV_DRIVER_NAMEivtv
#define IVTVDEV_VERSION_MAJOR 1
#define IVTVDEV_VERSION_MINOR 1
-#define IVTVDEV_VERSION_PATCH 1
+#define IVTVDEV_VERSION_PATCH 2
#define IVTVDEV_VERSION((IVTVDEV_VERSION_MAJOR 16) | \
(IVTVDEV_VERSION_MINOR 8) | \
(IVTVDEV_VERSION_PATCH))
@@ -293,7 +293,7 @@ IVTVDevFreeRec(ScrnInfoPtr pScrn)
{
if (pScrn-driverPrivate == NULL)
return;
-xfree(pScrn-driverPrivate);
+free(pScrn-driverPrivate);
pScrn-driverPrivate = NULL;
}
@@ -341,7 +341,7 @@ IVTVDevProbe(DriverPtr drv, int flags)
return FALSE;
if (flags PROBE_DETECT) {
- xfree(devSections);
+ free(devSections);
TRACE(probe done);
return TRUE;
}
@@ -378,7 +378,7 @@ IVTVDevProbe(DriverPtr drv, int flags)
xf86DrvMsg(pScrn-scrnIndex, X_INFO,
using %s\n, dev ? dev : default device);
}
-xfree(devSections);
+free(devSections);
TRACE(probe done);
return foundScreen;
}
@@ -468,7 +468,7 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int flags)
/* handle options */
xf86CollectOptions(pScrn, NULL);
-if (!(devPtr-Options = xalloc(sizeof(IVTVDevOptions
+if (!(devPtr-Options = malloc(sizeof(IVTVDevOptions
return FALSE;
memcpy(devPtr-Options, IVTVDevOptions, sizeof(IVTVDevOptions));
xf86ProcessOptions(pScrn-scrnIndex, devPtr-pEnt-device-options,
@@ -645,7 +645,7 @@ IVTVDevScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
width = pScrn-virtualX;
/* shadowfb */
-if ((devPtr-shadowmem = xcalloc(1, pScrn-virtualX * pScrn-virtualY *
+if ((devPtr-shadowmem = calloc(1, pScrn-virtualX * pScrn-virtualY *
pScrn-bitsPerPixel)) == NULL) {
xf86DrvMsg(scrnIndex, X_ERROR,
DevScreenInit: Allocation of shadow memory failed\n);
@@ -718,7 +718,7 @@ IVTVDevScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
IvtvInitVideo(pScreen);
/* Allocate buffer for yv12 to hm12 conversion */
-devPtr-xv_buffer = xalloc(622080);
+devPtr-xv_buffer = malloc(622080);
if (!devPtr-xv_buffer) {
xf86DrvMsg(pScrn-scrnIndex, X_ERROR,
DevScreenInit: Failed to allocate xv conversion buffer\n);
@@ -747,11 +747,11 @@ IVTVDevCloseScreen(int scrnIndex, ScreenPtr pScreen)
ivtvHWUnmapVidmem(pScrn);
#endif
ivtvHWRestore(pScrn);
-xfree(devPtr-shadowmem);
+free(devPtr-shadowmem);
pScrn-vtSema = FALSE;
if (devPtr-xv_buffer) {
- xfree(devPtr-xv_buffer);
+ free(devPtr-xv_buffer);
devPtr-xv_buffer = 0;
}
diff --git a/src/ivtv_xv.c b/src/ivtv_xv.c
index bc8515c..7e61677 100644
--- a/src/ivtv_xv.c
+++ b/src/ivtv_xv.c
@@ -143,7 +143,7 @@ IvtvInitVideo(ScreenPtr pScreen)
adaptors = newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
if (newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));
@@ -158,7 +158,7 @@ IvtvInitVideo(ScreenPtr pScreen)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
if (newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
static int
@@ -413,8 +413,8 @@ IVTVAllocAdaptor(ScreenPtr pScreen)
if (!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
return NULL;
-if (!(pPriv = xcalloc(1, sizeof(DevUnion
Re: xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'
On Sat, 2010-10-16 at 18:52 +0200, Cyril Brulebois wrote: Hi Ian, Cyril Brulebois k...@alioth.debian.org (16/10/2010): Rebased ref, commits from common ancestor: commit dc16e55aed305eea5f13cf8280af782cd3d4d691 since I haven't seen any work on the debian-experimental branch in a while, I kept the 2007 version with last changes from you as “debian-experimental-2007” and I superseded “debian-experimental” with changes on top of “debian-unstable”, i.e. building against XServer 1.9. That's fine, IIRC everything interesting from the experimental branch was fully merged up into debian-unstable (and if not then 2007 is so long ago it can't have been that important ;-)). Thanks for taking care of this. Ian. -- Ian Campbell No alcohol, dogs or horses. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1287303377.6575.78.ca...@cthulhu.hellion.org.uk
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |1 + debian/control |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit e72f10f0d29c72c08b2efe9ce4565d54bca71343 Author: Ian Campbell i...@hellion.org.uk Date: Mon Jan 18 15:19:08 2010 + Bump Standards-Version to 3.8.3 (no changes). diff --git a/debian/changelog b/debian/changelog index d5dc1e2..df42401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-ivtvdev (1.1.1-2) UNRELEASED; urgency=low * Add misc:Depends for xserver-xorg-video-ivtv-dbg. + * Bump Standards-Version to 3.8.3 (no changes). -- Ian Campbell i...@hellion.org.uk Sat, 16 Jan 2010 20:04:28 + diff --git a/debian/control b/debian/control index 6b6fd99..ff07181 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow dnusi...@debian.org, Ian Campbell i...@hellion.org.uk Build-Depends: debhelper (= 5), pkg-config, autotools-dev, xserver-xorg-dev (= 2:1.4), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev -Standards-Version: 3.8.1 +Standards-Version: 3.8.3 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 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Re: ivtv driver for xorg-server 1.7
On Sat, 2010-01-16 at 20:08 +, Julien Cristau wrote: (There's two minor lintian warnings you may want to address at some point: W: xserver-xorg-video-ivtvdev source: debhelper-but-no-misc-depends xserver-xorg-video-ivtv-dbg W: xserver-xorg-video-ivtvdev source: out-of-date-standards-version 3.8.1 (current is 3.8.3) These are both now fixed in the git repo and I've marked 1.1.1-2 as released so if you feel inclined to do another upload so soon these could be fixed. I don't think either of them are critical if you are busy though. -- Ian Campbell Soitainly. I was assuming that came with the OO-ness of it. -- Larry Wall in 199710011802.laa21...@wall.org -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xserver-xorg-video-ivtvdev-1.1.1-2'
Tag 'xserver-xorg-video-ivtvdev-1.1.1-2' created by Ian Campbell i...@hellion.org.uk at 2010-01-18 15:23 + Debian release 1.1.1-2 Changes since xserver-xorg-video-ivtvdev-1.1.1-1: Ian Campbell (3): Add misc:Depends for xserver-xorg-video-ivtv-dbg. Bump Standards-Version to 3.8.3 (no changes). Release 1.1.1-2 --- debian/changelog |7 +++ debian/control |4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Re: ivtv driver for xorg-server 1.7
On Sat, 2010-01-16 at 18:23 +, Julien Cristau wrote: Hi Ian, xserver 1.7 is now in sid, and version 1.1.0 of the ivtv driver doesn't seem to build against it. I see there's a newer 1.1.1 version at http://dl.ivtvdriver.org/xf86-video-ivtv/ would you have time to update the package for that? Certainly, it's been on my todo list for a little while, I hadn't realised the new xserver version had hit sid. I'm just about to go out of town for a little while -- unless I find a minute in an airport or something it'll likely be next weekend before I can make the update. Ian. -- Ian Campbell I want to reach your mind -- where is it currently located? signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'upstream/tags/1.1.0'
New branch 'upstream/tags/1.1.0' available with the following commits: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-ivtvdev: Changes to 'upstream/tags/1.1.1'
New branch 'upstream/tags/1.1.1' available with the following commits: commit 5cdd3c297022456b896bb2c59d0b86bf1a5d1d39 Author: hverkuil hverk...@f93e8361-94ff-0310-af1b-c9b61a63ab7d Date: Sun Nov 15 10:11:16 2009 + Release 1.1.1. git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tags/1@4152 f93e8361-94ff-0310-af1b-c9b61a63ab7d commit d3798d4edecde2a3624d4e1c0052ba0289bf6ef4 Author: hverkuil hverk...@f93e8361-94ff-0310-af1b-c9b61a63ab7d Date: Sun Nov 15 10:09:05 2009 + Updated ChangeLog. git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tr...@4151 f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 886b3cf633060d72cdeeec19af9ed1d7e9eaf817 Author: hverkuil hverk...@f93e8361-94ff-0310-af1b-c9b61a63ab7d Date: Sun Nov 15 10:04:09 2009 + Also update the version in configure.ac. git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tr...@4150 f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 52564f8762b43ea83c6e8b6a8694fd11c4e3b651 Author: hverkuil hverk...@f93e8361-94ff-0310-af1b-c9b61a63ab7d Date: Sun Nov 15 09:59:25 2009 + Patch provided by Ian Armstrong: This is simply a fix to allow the driver to compile run with the latest Xorg release. The version is changed to 1.1.1, but there is no functional difference with 1.1.0. The driver can still build run with previous versions. Thanks should go to Nicolas Chauvet kwiz...@gmail.com who did most of the work. git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tr...@4149 f93e8361-94ff-0310-af1b-c9b61a63ab7d -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-ivtvdev: Changes to 'upstream/trunk'
ChangeLog |2
Makefile.in |2
config.h.in |3 +
configure | 123 +---
configure.ac|7 ++-
src/Makefile.am |2
src/Makefile.in |4 +
src/ivtv.c | 22 +++---
src/ivtv_hw.c |8 ++-
9 files changed, 139 insertions(+), 34 deletions(-)
New commits:
commit d3798d4edecde2a3624d4e1c0052ba0289bf6ef4
Author: hverkuil hverk...@f93e8361-94ff-0310-af1b-c9b61a63ab7d
Date: Sun Nov 15 10:09:05 2009 +
Updated ChangeLog.
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tr...@4151
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/ChangeLog b/ChangeLog
index 4e3db85..d606755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+#1.1.1 - Compile fixes for latest Xorg. Thanks to Ian Armstrong and Nicolas
Chauvet
+ who did most of the work.
#1.1.0 - No longer uses proprietary ivtv ioctls with ivtv 1.4.0
- Added Xv attribute 'XV_VIDEODEVNUM'. This is read-only contains the
number
of the video device being using for output. (i.e. 48 = video48)
commit 886b3cf633060d72cdeeec19af9ed1d7e9eaf817
Author: hverkuil hverk...@f93e8361-94ff-0310-af1b-c9b61a63ab7d
Date: Sun Nov 15 10:04:09 2009 +
Also update the version in configure.ac.
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tr...@4150
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/configure b/configure
index 51825c4..a4eadf4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for xf86-video-ivtv 1.1.0.
+# Generated by GNU Autoconf 2.62 for xf86-video-ivtv 1.1.1.
#
# Report bugs to http://ivtvdriver.org/trac.
#
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-ivtv'
PACKAGE_TARNAME='xf86-video-ivtv'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='xf86-video-ivtv 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='xf86-video-ivtv 1.1.1'
PACKAGE_BUGREPORT='http://ivtvdriver.org/trac'
ac_unique_file=Makefile.am
@@ -1501,7 +1501,7 @@ if test $ac_init_help = long; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat _ACEOF
-\`configure' configures xf86-video-ivtv 1.1.0 to adapt to many kinds of
systems.
+\`configure' configures xf86-video-ivtv 1.1.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1571,7 +1571,7 @@ fi
if test -n $ac_init_help; then
case $ac_init_help in
- short | recursive ) echo Configuration of xf86-video-ivtv 1.1.0:;;
+ short | recursive ) echo Configuration of xf86-video-ivtv 1.1.1:;;
esac
cat \_ACEOF
@@ -1686,7 +1686,7 @@ fi
test -n $ac_init_help exit $ac_status
if $ac_init_version; then
cat \_ACEOF
-xf86-video-ivtv configure 1.1.0
+xf86-video-ivtv configure 1.1.1
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1700,7 +1700,7 @@ cat config.log _ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-ivtv $as_me 1.1.0, which was
+It was created by xf86-video-ivtv $as_me 1.1.1, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -2419,7 +2419,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-ivtv'
- VERSION='1.1.0'
+ VERSION='1.1.1'
cat confdefs.h _ACEOF
@@ -13232,7 +13232,7 @@ exec 61
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log=
-This file was extended by xf86-video-ivtv $as_me 1.1.0, which was
+This file was extended by xf86-video-ivtv $as_me 1.1.1, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES= $CONFIG_FILES
@@ -13285,7 +13285,7 @@ Report bugs to bug-autoc...@gnu.org.
_ACEOF
cat $CONFIG_STATUS _ACEOF || ac_write_fail=1
ac_cs_version=\\
-xf86-video-ivtv config.status 1.1.0
+xf86-video-ivtv config.status 1.1.1
configured by $0, generated by GNU Autoconf 2.62,
with options \\`$as_echo $ac_configure_args | sed 's/^ //;
s/[\\\`\$]//g'`\\
diff --git a/configure.ac b/configure.ac
index 3dac739..743bdd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ivtv],
-1.1.0,
+1.1.1,
[http://ivtvdriver.org/trac],
xf86-video-ivtv)
commit 52564f8762b43ea83c6e8b6a8694fd11c4e3b651
Author: hverkuil hverk...@f93e8361-94ff-0310-af1b-c9b61a63ab7d
Date: Sun Nov 15 09:59:25 2009 +
Patch provided by Ian Armstrong:
This is simply a fix to allow the driver to compile run with the latest
Xorg release. The version is changed to 1.1.1, but there is no functional
difference with
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
ChangeLog |2
Makefile.in |2
config.h.in |3
configure | 123 -
configure.ac |7 +
debian/README.source | 73 ++
debian/changelog |4
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 245 --
src/Makefile.am |2
src/Makefile.in |4
src/ivtv.c| 22 +++-
src/ivtv_hw.c |8 +
13 files changed, 218 insertions(+), 298 deletions(-)
New commits:
commit ba51e696117d24bc51e4e28253de733651089629
Author: Ian Campbell i...@hellion.org.uk
Date: Sat Jan 16 19:30:56 2010 +
Update changelog after merge of new xsfbs.
diff --git a/debian/changelog b/debian/changelog
index f9b636d..eb948fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-ivtvdev (1.1.1-1) UNRELEASED; urgency=low
* 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
commit 17bdd629971e6ed01f4b02eec5bf4beb650b3be4
Author: Ian Campbell i...@hellion.org.uk
Date: Sat Jan 16 19:30:13 2010 +
Update changelog for 1.1.1 release.
diff --git a/debian/changelog b/debian/changelog
index ef95453..f9b636d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-xserver-xorg-video-ivtvdev (1.1.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-ivtvdev (1.1.1-1) UNRELEASED; 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.
commit d3798d4edecde2a3624d4e1c0052ba0289bf6ef4
Author: hverkuil hverk...@f93e8361-94ff-0310-af1b-c9b61a63ab7d
Date: Sun Nov 15 10:09:05 2009 +
Updated ChangeLog.
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tr...@4151
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/ChangeLog b/ChangeLog
index 4e3db85..d606755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+#1.1.1 - Compile fixes for latest Xorg. Thanks to Ian Armstrong and Nicolas
Chauvet
+ who did most of the work.
#1.1.0 - No longer uses proprietary ivtv ioctls with ivtv 1.4.0
- Added Xv attribute 'XV_VIDEODEVNUM'. This is read-only contains the
number
of the video device being using for output. (i.e. 48 = video48)
commit 886b3cf633060d72cdeeec19af9ed1d7e9eaf817
Author: hverkuil hverk...@f93e8361-94ff-0310-af1b-c9b61a63ab7d
Date: Sun Nov 15 10:04:09 2009 +
Also update the version in configure.ac.
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tr...@4150
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/configure b/configure
index 51825c4..a4eadf4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for xf86-video-ivtv 1.1.0.
+# Generated by GNU Autoconf 2.62 for xf86-video-ivtv 1.1.1.
#
# Report bugs to http://ivtvdriver.org/trac.
#
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-ivtv'
PACKAGE_TARNAME='xf86-video-ivtv'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='xf86-video-ivtv 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='xf86-video-ivtv 1.1.1'
PACKAGE_BUGREPORT='http://ivtvdriver.org/trac'
ac_unique_file=Makefile.am
@@ -1501,7 +1501,7 @@ if test $ac_init_help = long; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat _ACEOF
-\`configure' configures xf86-video-ivtv 1.1.0 to adapt to many kinds of
systems.
+\`configure' configures xf86-video-ivtv 1.1.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1571,7 +1571,7 @@ fi
if test -n $ac_init_help; then
case $ac_init_help in
- short | recursive ) echo Configuration of xf86-video-ivtv 1.1.0:;;
+ short | recursive ) echo Configuration of xf86-video-ivtv 1.1.1:;;
esac
cat \_ACEOF
@@ -1686,7 +1686,7 @@ fi
test -n $ac_init_help exit $ac_status
if $ac_init_version; then
cat \_ACEOF
-xf86-video-ivtv configure 1.1.0
+xf86-video-ivtv configure 1.1.1
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1700,7 +1700,7 @@ cat config.log _ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-ivtv $as_me 1.1.0, which was
+It was created by xf86-video-ivtv $as_me 1.1.1, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -2419,7 +2419,7 @@ fi
# Define the identity
Re: ivtv driver for xorg-server 1.7
On Sat, 2010-01-16 at 19:27 +, Ian Campbell wrote: On Sat, 2010-01-16 at 18:23 +, Julien Cristau wrote: Hi Ian, xserver 1.7 is now in sid, and version 1.1.0 of the ivtv driver doesn't seem to build against it. I see there's a newer 1.1.1 version at http://dl.ivtvdriver.org/xf86-video-ivtv/ would you have time to update the package for that? Certainly, it's been on my todo list for a little while, I hadn't realised the new xserver version had hit sid. I'm just about to go out of town for a little while -- unless I find a minute in an airport or something it'll likely be next weekend before I can make the update. Actually, the update turned out to be trivial (and more interesting than packing) so I have just pushed the tag xserver-xorg-video-ivtvdev-1.1.1-1 to the repository. Are you able to sponsor an upload directly from git or would you like me to stick the bits somewhere? Ian. -- Ian Campbell Nice guys finish last, but we get to sleep in. -- Evan Davis signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6697c9d5f9fa4d140a370bd66dd2908e978b2005 Author: Ian Campbell i...@hellion.org.uk Date: Sat Jan 16 19:46:54 2010 + Prepare changelog for upload of 1.1.1-1 diff --git a/debian/changelog b/debian/changelog index eb948fa..90ace39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-ivtvdev (1.1.1-1) UNRELEASED; urgency=low +xserver-xorg-video-ivtvdev (1.1.1-1) unstable; urgency=low [ Ian Campbell ] * New upstream release. @@ -10,7 +10,7 @@ xserver-xorg-video-ivtvdev (1.1.1-1) UNRELEASED; urgency=low * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! - -- Ian Campbell i...@hellion.org.uk Thu, 21 May 2009 08:45:22 +0100 + -- Ian Campbell i...@hellion.org.uk Sat, 16 Jan 2010 19:46:45 + xserver-xorg-video-ivtvdev (1.1.0-1) unstable; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xserver-xorg-video-ivtvdev-1.1.1-1'
Tag 'xserver-xorg-video-ivtvdev-1.1.1-1' created by Ian Campbell
i...@hellion.org.uk at 2010-01-16 19:47 +
Debian release 1.1.1-1
Changes since xserver-xorg-video-ivtvdev-1.1.0-1:
David Nusinow (1):
Add README.source
Ian Campbell (7):
Update debian/copyright
Typo in changelog (stray m should be ,)
Merge branch 'upstream/tags/1.1.1' into debian-unstable
Update changelog for 1.1.1 release.
Merge remote branch 'xsfbs/debian-unstable' into debian-unstable
Update changelog after merge of new xsfbs.
Prepare changelog for upload of 1.1.1-1
Julien Cristau (12):
xsfbs: don't run dpkg --print-installation-architecture
Kill custom readlink function
xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
xsfbs.sh: remove unused analyze_path
xsfbs.sh: remove unused maplink function
xsfbs.sh: remove unused find_culprits function
xsfbs.sh: remove unused reject_whitespace function
xsfbs.mk: no need for shlibs.local
xsfbs.sh: fix typo and remove svn keyword
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
xsfbs.mk: remove more obsolete code
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good
reason. Thanks, Colin Watson!
hverkuil (4):
Patch provided by Ian Armstrong:
Also update the version in configure.ac.
Updated ChangeLog.
Release 1.1.1.
---
ChangeLog |2
Makefile.in |2
config.h.in |3
configure | 123 -
configure.ac |7 +
debian/README.source | 73 ++
debian/changelog | 14 ++
debian/copyright |8 -
debian/rules | 10 +-
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 245 --
src/Makefile.am |2
src/Makefile.in |4
src/ivtv.c| 22 +++-
src/ivtv_hw.c |8 +
15 files changed, 235 insertions(+), 309 deletions(-)
---
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Re: ivtv driver for xorg-server 1.7
On Sat, 2010-01-16 at 20:08 +, Julien Cristau wrote: On Sat, Jan 16, 2010 at 19:52:08 +, Ian Campbell wrote: Actually, the update turned out to be trivial (and more interesting than packing) so I have just pushed the tag xserver-xorg-video-ivtvdev-1.1.1-1 to the repository. Are you able to sponsor an upload directly from git or would you like me to stick the bits somewhere? Awesome, thanks. Uploaded. (There's two minor lintian warnings you may want to address at some point: W: xserver-xorg-video-ivtvdev source: debhelper-but-no-misc-depends xserver-xorg-video-ivtv-dbg Thanks, I was just fixing that one (I stupidly forgot to run lintian until after I sent you the previous mail). It makes no difference to the final depends so no need to reupload IMHO. W: xserver-xorg-video-ivtvdev source: out-of-date-standards-version 3.8.1 (current is 3.8.3) ) My lintian must be out of date since I didn't see this one. I'll have to leave it for another time though. Ian. -- Ian Campbell Any fool can paint a picture, but it takes a wise person to be able to sell it. signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |6 ++
debian/control |2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 46771e0647d1a7ee896b6cbf3b1327292d0cab1f
Author: Ian Campbell i...@hellion.org.uk
Date: Sat Jan 16 20:09:31 2010 +
Add misc:Depends for xserver-xorg-video-ivtv-dbg.
No actual change to the final dependencies but stops lintian from warning.
diff --git a/debian/changelog b/debian/changelog
index 90ace39..d5dc1e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ivtvdev (1.1.1-2) UNRELEASED; urgency=low
+
+ * Add misc:Depends for xserver-xorg-video-ivtv-dbg.
+
+ -- Ian Campbell i...@hellion.org.uk Sat, 16 Jan 2010 20:04:28 +
+
xserver-xorg-video-ivtvdev (1.1.1-1) unstable; urgency=low
[ Ian Campbell ]
diff --git a/debian/control b/debian/control
index bbdc5f0..6b6fd99 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Description: X.Org X server -- IVTV display driver
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})
+Depends: xserver-xorg-video-ivtv (= ${binary:Version}), ${misc:Depends}
Section: contrib/debug
Priority: extra
Description: X.Org X server -- IVTV display driver (debug symbols)
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |7 +++ debian/copyright |8 +--- 2 files changed, 8 insertions(+), 7 deletions(-) New commits: commit 67c4dcd554fdad4ae55e78a4571fc4bc0ef006f7 Author: Ian Campbell i...@hellion.org.uk Date: Thu May 21 08:46:26 2009 +0100 Update debian/copyright diff --git a/debian/changelog b/debian/changelog index 0fc48bc..cf8346b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-ivtvdev (1.1.0-2) UNRELEASED; urgency=low + + * Update debian/copyright with correct URLm remove obsolete paragraph about +an old fork which is no longer used. + + -- Ian Campbell i...@hellion.org.uk Thu, 21 May 2009 08:45:22 +0100 + xserver-xorg-video-ivtvdev (1.1.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/copyright b/debian/copyright index 12026f2..84db67d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,13 +2,7 @@ This package was debianized by Ian Campbell i...@hellion.org.uk on Mon Aug 7 16:16:55 BST 2006. The original upstream source is available from -http://dl.ivtvdriver.org/xdriver/ - -This package is based on an updated source package from -http://www.mit.edu/~je18337/ivtvdev/. This version has been updated to -support the X.org version 7 build system. The only changes relative to -the original source are to the build infrastructure and a small number -of #include statements. +http://dl.ivtvdriver.org/xf86-video-ivtv/ The current upstream maintainer is John Harvey john.p.har...@btinternet.com -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b0b12831a5f3d214ba9b2e233db38f99938f75ba Author: Ian Campbell i...@hellion.org.uk Date: Thu May 21 08:50:02 2009 +0100 Typo in changelog (stray m should be ,) diff --git a/debian/changelog b/debian/changelog index cf8346b..1d0e564 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ xserver-xorg-video-ivtvdev (1.1.0-2) UNRELEASED; urgency=low - * Update debian/copyright with correct URLm remove obsolete paragraph about + * Update debian/copyright with correct URL, remove obsolete paragraph about an old fork which is no longer used. -- Ian Campbell i...@hellion.org.uk Thu, 21 May 2009 08:45:22 +0100 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xserver-xorg-video-ivtvdev-1.1.0-1'
Tag 'xserver-xorg-video-ivtvdev-1.1.0-1' created by Ian Campbell
i...@hellion.org.uk at 2009-05-20 22:36 +
Debian release 1.1.0-1
Changes since xserver-xorg-video-ivtvdev-1.0.1-1:
Brice Goglin (1):
Update xsfbs/quilt patching rules to be compatible with the
Ian Campbell (10):
Continue with 1.0.1-2
Merge commit 'xsfbs/debian-unstable' into debian-unstable
Merge branch 'upstream/tags/1.1.0' into debian-unstable
Prepare for 1.1.0 upload.
Correct the package metadata for xserver-xorg-video-ivtv-dbg
Quieten dpkg-shlibdeps and exclude .la files
Depends on autotools-dev, quietens lintian warning about out of date
config.{sub,guess}
remove unused patch infrastrucutre, drop dependency on quilt
Update standards version
Update debian/changelog ready for upload.
Julien Cristau (12):
xsfbs.mk: make 'serverabi' depend on 'install'
Remove xsfbs-autoreconf.mk
Remove the .pc directory properly
xsfbs.sh: add remove_conffile_lookup
xsfbs.sh: use 'local' now that policy allows it
xsfbs.mk: fix the prepare target for parallel make
xsfbs.mk: more parallel make fixing
xsfbs.mk: update the list of releases, and drop some unused code
xsfbs.mk: make 'log' a separate target
xsfbs: add a repack script for uscan
xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
xsfbs: repack.sh needs to be executable
hverkuil (6):
Userland shouldn't use asm/page.h, so replace it with getpagesize() to
This 1.0.2 release was brought to you by Ian Armstrong. Thanks Ian!
Thanks again to Ian Armstrong for this 1.1.0 update!
Update the ChangeLog.
Add Xv interlace controls doc.
Release 1.1.0.
---
ChangeLog| 16
Makefile.in | 51
README | 38
aclocal.m4 | 9011 +++---
config.guess |5
config.h.in |4
config.sub |5
configure|18604 +++
configure.ac |2
debian/changelog | 16
debian/control |8
debian/rules |6
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk| 51
debian/xsfbs/xsfbs.sh| 405
ltmain.sh| 7923 +---
src/Makefile.in | 51
src/ivtv.c | 61
src/ivtv.h | 39
src/ivtv_compat.h| 21
src/ivtv_hw.c| 327
src/ivtv_hw.h| 40
src/ivtv_xv.c| 614 -
24 files changed, 16281 insertions(+), 21199 deletions(-)
---
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#526075: xserver-xorg-video-ivtv: uninstallable on unstable
On Tue, 2009-05-19 at 23:11 +0200, Julien Cristau wrote: On Tue, Apr 28, 2009 at 21:57:53 -0700, Paul Cassella wrote: xserver-xorg-core conflicts with the ivtv driver by way of xserver-xorg-video-2. The ivtv driver needs rebuilding against the new xserver-xorg-dev. Unfortunately src/ivtv_hw.c includes asm/page.h (for no reason) and the driver ftbfs because that file doesn't exist so this can't be done with binary NMUs. Dropping the #include allows it to build. Ian, can you update the package in git? Yes, I noticed this bug just this week mixed in with the other debian-x traffic but thanks for drawing my attention to it, it's easy to miss stuff in the flood. There's a new upstream release which needs packaging (and I guess omits the asm/page.h include since I didn't notice any failures). I've been working on it and it's pretty much done, just need to finalise it. I was hoping to find an evening this week but it looks like next is more likely at this point. Ian. Thanks, Julien -- Ian Campbell BOFH excuse #269: Melting hard drives signature.asc Description: This is a digitally signed message part
Re: xserver-xorg-video-ivtvdev in contrib. Can be moved to main?
On Wed, 2008-08-27 at 21:07 +0200, Julien Cristau wrote: [cc:ing Ian, who's the x-x-v-ivtvdev maintainer, because I don't know if he reads debian-x] I receive it but I don't often actually read it, so thanks. On Wed, Aug 27, 2008 at 20:21:05 +0200, Anders Semb Hermansen wrote: Hello Debian X Strike Force, xserver-xorg-video-ivtvdev is in contrib. Is this only because ivtv- source is in contrib? If so, ivtv and ivtvfb kernel modules are now in the default kernel. Can xserver-xorg-video-ivtvdev therefore move to main, or am I missing something? Don't know if it makes a difference (I think it probably does) but it depends on firmware which is non-free (although not currently packaged in non-free, it could be -- I just didn't ever quite get round it it). Ian. -- Ian Campbell Have the courage to take your own thoughts seriously, for they will shape you. -- Albert Einstein signature.asc Description: This is a digitally signed message part
Re: Sponsorship request for ivtv X driver.
On Thu, 2008-03-13 at 18:33 +, Ian Campbell wrote: Please could you upload a new upstream release of the ivtv X driver. I've put sources and i386/amd64 binaries at: http://www.hellion.org.uk/ivtv/debian/1.0.1/ and pushed the xserver-xorg-video-ivtvdev-1.0.1-1 tag to git. It seems that David is rather busy at the moment[0]. Would another DD in the XSF be interested in sponsoring this upload or should I head on over to debian-mentors? Cheers, Ian. [0] http://gravityboy.livejournal.com/42391.html -- Ian Campbell Actresses will happen in the best regulated families. -- Addison Mizner and Oliver Herford, The Entirely New Cynic's Calendar, 1905 signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit cc2359a012e0dc7c79310ea5b605d81aa7ff3650 Author: Ian Campbell [EMAIL PROTECTED] Date: Thu Mar 13 18:03:27 2008 + Release 1.0.1-1 diff --git a/debian/changelog b/debian/changelog index 0652bc6..e341f7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -xserver-xorg-video-ivtvdev (1.0.1-1) UNRELEASED; urgency=low +xserver-xorg-video-ivtvdev (1.0.1-1) unstable; urgency=low - * NOT RELEASED YET * 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. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Sponsorship request for ivtv X driver.
Hi David, Please could you upload a new upstream release of the ivtv X driver. I've put sources and i386/amd64 binaries at: http://www.hellion.org.uk/ivtv/debian/1.0.1/ and pushed the xserver-xorg-video-ivtvdev-1.0.1-1 tag to git. Thanks, Ian. -- Ian Campbell It was pity stayed his hand. Pity I don't have any more bullets, thought Frito. -- _Bored_of_the_Rings_, a Harvard Lampoon parody of Tolkein -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xserver-xorg-video-ivtvdev-1.0.1-1'
Tag 'xserver-xorg-video-ivtvdev-1.0.1-1' created by Ian Campbell [EMAIL PROTECTED] at 2008-03-13 18:08 + Debian release 1.0.1-1 Changes since xserver-xorg-video-ivtvdev-1.0.0-1: Brice Goglin (4): Fix displaying of patches applied by quilt. Minor fixes in the patching system. Fix display the output of quilt push/pop. Do not call laptop-detect, let the only user call it directly David Nusinow (2): Remove make-orig-tar-gz target Kill the manifest code. Ian Campbell (9): Continue with 1.0.0-2 Merge git://git.debian.org/git/pkg-xorg/xsfbs into debian-unstable Vcs-Browser and Vcs-Git are now supported so drop the XS- prefix. Merge commit 'xsfbs/debian-unstable' into debian-unstable Merge branch 'upstream/tags/1.0.1' into debian-unstable Update to 1.0.1-1 Build a xserver-xorg-video-ivtv-dbg package with debugging symbols. 1.0.1-1 isn't ready for release yet, mark it as such in debian/changelog Release 1.0.1-1 hverkuil (13): Continue with 1.0.1. Also update configure.ac Changelog - ChangeLog Rename xdriver to the standard name of Xorg drivers. Update README with note regarding the MythTV interlacing settings. Allows building with some older Xorg 7.x releases. (patch from Ian Armstrong) Add some Debian clarifications. xf86-video-ivtv - Add support for newer X org versions with libpciaccess Revert version bump (was not needed) Update ChangeLog Update Release 1.0.1 --- .gitignore|1 ChangeLog |2 Makefile.in |4 README| 27 config.h.in | 12 configure | 1509 -- configure.ac | 20 debian/changelog |8 debian/control| 17 debian/rules |2 debian/xsfbs/xsfbs.mk | 103 --- debian/xsfbs/xsfbs.sh |7 src/ivtv.c|7 src/ivtv_hw.c | 14 src/ivtv_hw.h | 16 src/ivtv_xv.c | 11 16 files changed, 1121 insertions(+), 639 deletions(-) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
.gitignore|1
ChangeLog |2
Makefile.in |4
README| 27
config.h.in | 12
configure | 1509 --
configure.ac | 20
debian/changelog |6
debian/control| 13
debian/rules |2
debian/xsfbs/xsfbs.mk | 53 -
src/ivtv.c|7
src/ivtv_hw.c | 14
src/ivtv_hw.h | 16
src/ivtv_xv.c | 11
15 files changed, 1097 insertions(+), 600 deletions(-)
New commits:
commit 8a90e17f8961bb87cc11d438deb217a489e1831d
Author: Ian Campbell [EMAIL PROTECTED]
Date: Sun Mar 9 15:22:51 2008 +
Build a xserver-xorg-video-ivtv-dbg package with debugging symbols.
diff --git a/.gitignore b/.gitignore
index f59f3e9..15bf46b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ debian/tmp
debian/files
debian/*.substvars
debian/xserver-xorg-video-ivtv
+debian/xserver-xorg-video-ivtv-dbg
obj-*
*~
build-stamp
diff --git a/debian/changelog b/debian/changelog
index a43679d..dbb0e7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ 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 [EMAIL PROTECTED] Wed, 05 Mar 2008 21:49:04 +
+ -- Ian Campbell [EMAIL PROTECTED] Sun, 09 Mar 2008 15:19:29 +
xserver-xorg-video-ivtvdev (1.0.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 47e3cb9..7b16228 100644
--- a/debian/control
+++ b/debian/control
@@ -20,3 +20,16 @@ Description: X.Org X server -- IVTV display driver
.
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}), ${shlibs:Depends}
+Priority: extra
+Provides: ${xviddriver:Provides}
+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.
diff --git a/debian/rules b/debian/rules
index d96501a..c44315e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ binary-arch: build install serverabi
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing
dh_link
- dh_strip
+ dh_strip --dbg-package=xserver-xorg-video-ivtv-dbg
dh_compress
dh_fixperms
dh_makeshlibs
commit 59c53c68d6bb78273ac3d1c905c2a97b6e59fda5
Author: Ian Campbell [EMAIL PROTECTED]
Date: Wed Mar 5 21:49:38 2008 +
Update to 1.0.1-1
diff --git a/debian/changelog b/debian/changelog
index eb2c175..a43679d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-ivtvdev (1.0.0-2) unstable; urgency=low
+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.
- -- Ian Campbell [EMAIL PROTECTED] Fri, 19 Oct 2007 23:12:00 +0100
+ -- Ian Campbell [EMAIL PROTECTED] Wed, 05 Mar 2008 21:49:04 +
xserver-xorg-video-ivtvdev (1.0.0-1) unstable; urgency=low
commit be94e511f17db8b5a8ac4b1497c755245802493d
Author: hverkuil [EMAIL PROTECTED]
Date: Wed Mar 5 17:41:46 2008 +
Update
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/ChangeLog b/ChangeLog
index c708f98..475551b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +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
commit 564e95c109b3a3b9a4f8d4c8c314e0c4e523701b
Author: hverkuil [EMAIL PROTECTED]
Date: Thu Feb 28 07:08:23 2008 +
Update ChangeLog
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/ChangeLog b/ChangeLog
index d5da1f9..c708f98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+#1.0.1 - Add support for newer X org versions with libpciaccess
#1.0.0 - Renamed to ivtv_drv and xf86-video-ivtv for consistency with
X11R7
naming convention.
- When the ivtv X driver is loaded
xserver-xorg-video-ivtvdev: Changes to 'upstream/trunk'
ChangeLog |2
README| 26 -
configure | 1462 ++
configure.ac | 13
src/ivtv.c|3
src/ivtv_hw.c | 17
src/ivtv_hw.h |9
src/ivtv_xv.c |7
8 files changed, 1025 insertions(+), 514 deletions(-)
New commits:
commit 8655362bef37b713277bc8c1638b3b33d0babcc1
Author: hverkuil [EMAIL PROTECTED]
Date: Sat Mar 8 15:56:15 2008 +
Userland shouldn't use asm/page.h, so replace it with getpagesize() to
determine the page size when mapping memory.
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/src/ivtv_hw.c b/src/ivtv_hw.c
index 0493b72..2becdc7 100644
--- a/src/ivtv_hw.c
+++ b/src/ivtv_hw.c
@@ -54,7 +54,6 @@ in this Software without prior written authorization from the
XFree86 Project.
#include xf86cmap.h
-#include asm/page.h /* #define for PAGE_* */
#include globals.h
#define DPMS_SERVER
#include X11/extensions/dpms.h
@@ -570,7 +569,7 @@ void *
ivtvHWMapVidmem(ScrnInfoPtr pScrn)
{
ivtvHWPtr hwPtr = IVTVDEVHWPTR(pScrn);
-long page_mask = ~(sysconf(_SC_PAGESIZE) - 1);
+long page_mask = ~(getpagesize() - 1);
TRACE_ENTER(MapVidmem);
if (NULL == hwPtr-fbmem) {
commit be94e511f17db8b5a8ac4b1497c755245802493d
Author: hverkuil [EMAIL PROTECTED]
Date: Wed Mar 5 17:41:46 2008 +
Update
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/ChangeLog b/ChangeLog
index c708f98..475551b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +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
commit 564e95c109b3a3b9a4f8d4c8c314e0c4e523701b
Author: hverkuil [EMAIL PROTECTED]
Date: Thu Feb 28 07:08:23 2008 +
Update ChangeLog
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/ChangeLog b/ChangeLog
index d5da1f9..c708f98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+#1.0.1 - Add support for newer X org versions with libpciaccess
#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
commit 2a0c018fe01a5513f6c0e9731af6508df6038594
Author: hverkuil [EMAIL PROTECTED]
Date: Thu Feb 28 07:07:29 2008 +
Revert version bump (was not needed)
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/configure.ac b/configure.ac
index af5097f..cd4200c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ivtv],
-1.0.2,
+1.0.1,
[http://ivtvdriver.org/trac],
xf86-video-ivtv)
diff --git a/src/ivtv.c b/src/ivtv.c
index 4461d2d..840ed7e 100644
--- a/src/ivtv.c
+++ b/src/ivtv.c
@@ -114,7 +114,7 @@ static int pix24bpp = 0;
#define IVTVDEV_DRIVER_NAMEivtv
#define IVTVDEV_VERSION_MAJOR 1
#define IVTVDEV_VERSION_MINOR 0
-#define IVTVDEV_VERSION_PATCH 2
+#define IVTVDEV_VERSION_PATCH 1
#define IVTVDEV_VERSION((IVTVDEV_VERSION_MAJOR 16) | \
(IVTVDEV_VERSION_MINOR 8) | \
(IVTVDEV_VERSION_PATCH))
commit a49a89fc3d29e2ef646fc7254f2b882e7c9b3f6d
Author: hverkuil [EMAIL PROTECTED]
Date: Thu Feb 28 07:06:34 2008 +
xf86-video-ivtv - Add support for newer X org versions with libpciaccess
Changes to Xorg resulted in the driver no longer compiling. This patch makes
the necessary changes to correct that. One additional change is that the
driver will now log an error if the yuv device exists but cannot be opened
due to permission problems, since this disables Xv support.
This patch is based on the original xf86-video-ivtv libpciaccess patch
supplied by Nicolas Chauvet.
It should be noted that this patch does not convert the driver to use
libpciacess.
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/configure b/configure
index 8735e5e..0b04515 100755
--- a/configure
+++ b/configure
@@ -855,6 +855,7 @@ AMDEPBACKSLASH
CCDEPMODE
am__fastdepCC_TRUE
am__fastdepCC_FALSE
+SED
GREP
EGREP
LN_S
@@ -876,6 +877,10 @@ LIBTOOL
PKG_CONFIG
XORG_CFLAGS
XORG_LIBS
+PCIACCESS_CFLAGS
+PCIACCESS_LIBS
+XSERVER_LIBPCIACCESS_TRUE
+XSERVER_LIBPCIACCESS_FALSE
moduledir
DRIVER_NAME
APP_MAN_SUFFIX
@@ -910,7 +915,9 @@ F77
FFLAGS
PKG_CONFIG
xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'
ChangeLog | 47 ++ Changelog | 47 -- Makefile.in|6 README | 272 - config.h.in| 12 + configure | 53 --- configure.ac |7 debian/changelog | 32 debian/control |6 debian/patches/remove-xf86_ansic.h | 41 - debian/patches/series |1 debian/rules |2 debian/xsfbs/xsfbs.mk | 50 ++ debian/xsfbs/xsfbs.sh |7 src/ivtv.c |5 src/ivtv_hw.c | 20 +- src/ivtv_hw.h |7 src/ivtv_xv.c |4 18 files changed, 439 insertions(+), 180 deletions(-) New commits: commit 57e41e85696a6cdfa0e3ce6cd51fa6ae491ba8d0 Author: Ian Campbell [EMAIL PROTECTED] Date: Thu Nov 1 08:47:34 2007 + Vcs-Browser and Vcs-Git are now supported so drop the XS- prefix. diff --git a/debian/changelog b/debian/changelog index 64fd726..eb2c175 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ xserver-xorg-video-ivtvdev (1.0.0-2) unstable; urgency=low - * UNRELEASED + * Vcs-Browser and Vcs-Git are now supported so drop the XS- prefix. -- Ian Campbell [EMAIL PROTECTED] Fri, 19 Oct 2007 23:12:00 +0100 diff --git a/debian/control b/debian/control index b071224..47e3cb9 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Ian Campbell [EMAIL PROTECTED] Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.4), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev Standards-Version: 3.7.2.2 -XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ivtvdev -XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ivtvdev.git +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 commit f7ef338b3472aa3d14dba3a715c7363241c6cb5e Author: Ian Campbell [EMAIL PROTECTED] Date: Fri Oct 19 23:12:21 2007 +0100 Continue with 1.0.0-2 diff --git a/debian/changelog b/debian/changelog index 2fe40b3..64fd726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-ivtvdev (1.0.0-2) unstable; urgency=low + + * UNRELEASED + + -- Ian Campbell [EMAIL PROTECTED] Fri, 19 Oct 2007 23:12:00 +0100 + xserver-xorg-video-ivtvdev (1.0.0-1) unstable; urgency=low * New upstream release. commit 48fbd819f3ba302215d69b61870de974c57fd7c2 Author: hverkuil [EMAIL PROTECTED] Date: Fri Oct 19 19:17:52 2007 + Allows building with some older Xorg 7.x releases. git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/Makefile.in b/Makefile.in index ee651a5..18a8352 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,10 +52,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README ChangeLog $(am__configure_deps) $(srcdir)/Makefile.am \ +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure config.guess config.sub depcomp \ - install-sh ltmain.sh missing + $(top_srcdir)/configure ChangeLog config.guess config.sub \ + depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/README b/README index 4d52737..be744b4 100644 --- a/README +++ b/README @@ -40,12 +40,13 @@ So don't use that. 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 the autogen.sh script followed by make and then +make install. The installation path may well need to be altered using the +--prefix option. -If you get this error when running the configure script: +If you get this error when running autogen.sh or the configure script: -checking for XORG... configure: error: Package requirements (xorg-server = 1.0.99.901 xproto fontsproto ) were not met. +checking for XORG... configure: error: Package requirements (xorg-server xproto fontsproto ) were not met. then it is likely that you are missing the xorg
xserver-xorg-video-ivtvdev: Changes to 'upstream/tags/1.0.1'
New branch 'upstream/tags/1.0.1' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 32c6abedd6f76b683caec245e6a570f3f4ada1f6 Author: Ian Campbell [EMAIL PROTECTED] Date: Sun Mar 9 15:34:06 2008 + 1.0.1-1 isn't ready for release yet, mark it as such in debian/changelog diff --git a/debian/changelog b/debian/changelog index dbb0e7d..0652bc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -xserver-xorg-video-ivtvdev (1.0.1-1) unstable; urgency=low +xserver-xorg-video-ivtvdev (1.0.1-1) UNRELEASED; urgency=low + * NOT RELEASED YET * 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 [EMAIL PROTECTED] Sun, 09 Mar 2008 15:19:29 + + -- Ian Campbell [EMAIL PROTECTED] Sun, 09 Mar 2008 15:33:24 + xserver-xorg-video-ivtvdev (1.0.0-1) unstable; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#449268: I have seen this also
I saw a crash with a similar backtrace. I worked around the problem with: gconftool-2 --recursive-unset /desktop/gnome/peripherals/keyboard I'm sorry but I didn't think to save a copy of ~/.gconf before I did this. Attached Xorg.20.log.old contains the stack trace and xorg.conf is the configuration. Ian. -- Ian Campbell Murphy's Law is recursive. Washing your car to make it rain doesn't work. # /etc/X11/xorg.conf (xorg X Window System server configuration file) # # This file was generated by dexconf, the Debian X Configuration tool, using # values from the debconf database. # # Edit this file with caution, and see the /etc/X11/xorg.conf manual page. # (Type man /etc/X11/xorg.conf at the shell prompt.) # # This file is automatically updated on xserver-xorg package upgrades *only* # if it has not been modified since the last upgrade of the xserver-xorg # package. # # If you have edited this file but would like it to be automatically updated # again, run the following command: # sudo dpkg-reconfigure -phigh xserver-xorg Section Extensions Option Composite Disable EndSection Section Files FontPath/usr/share/fonts/X11/misc FontPath/usr/X11R6/lib/X11/fonts/misc FontPath/usr/share/fonts/X11/cyrillic FontPath/usr/X11R6/lib/X11/fonts/cyrillic FontPath/usr/share/fonts/X11/100dpi/:unscaled FontPath/usr/X11R6/lib/X11/fonts/100dpi/:unscaled FontPath/usr/share/fonts/X11/75dpi/:unscaled FontPath/usr/X11R6/lib/X11/fonts/75dpi/:unscaled FontPath/usr/share/fonts/X11/Type1 FontPath/usr/X11R6/lib/X11/fonts/Type1 FontPath/usr/share/fonts/X11/100dpi FontPath/usr/X11R6/lib/X11/fonts/100dpi FontPath/usr/share/fonts/X11/75dpi FontPath/usr/X11R6/lib/X11/fonts/75dpi # path to defoma fonts FontPath/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType EndSection Section Module Loadbitmap Loaddbe Loadddc Loadextmod Loadfreetype Loadglx Loadint10 Loadrecord Loadvbe EndSection Section InputDevice Identifier Generic Keyboard Driver kbd Option CoreKeyboard Option XkbRules xorg Option XkbModel microsoftpro Option XkbLayout gb EndSection Section InputDevice Identifier Configured Mouse Driver mouse Option CorePointer Option Device/dev/input/mice Option Protocol ImPS/2 Option Emulate3Buttons true EndSection Section Device Identifier nVidia Corporation NV43 [GeForce 6600] Driver nvidia BusID PCI:1:0:0 #Option NvAgp 1 EndSection Section Monitor Identifier Samsung SyncMaster 225W Option DPMS HorizSync 30-90 VertRefresh 50-60 EndSection Section Screen Identifier Default Screen Device nVidia Corporation NV43 [GeForce 6600] Monitor Samsung SyncMaster 225W DefaultDepth24 SubSection Display Depth 1 Modes 1680x1050 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 4 Modes 1680x1050 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 8 Modes 1680x1050 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 15 Modes 1680x1050 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 16 Modes 1680x1050 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 24 Modes 1680x1050 1024x768 800x600 640x480 EndSubSection EndSection Section ServerLayout Identifier Default Layout Screen Default Screen InputDevice Generic Keyboard InputDevice Configured Mouse EndSection Section DRI Mode0666 EndSection This is a pre-release version of the X server from The X.Org Foundation. It is not supported in any way. Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/. Select the xorg product for bugs you find in this release. Before reporting bugs in pre-release versions please check the latest version in the X.Org Foundation git repository. See http://wiki.x.org/wiki/GitPage for git access instructions. X.Org X Server 1.4.0.90 Release Date: 5 September
Re: Sponsored upload of ivtv video driver 1.0.0-1
Hi David, I've just had an email asking when this will be uploaded. I presume it simply fell off you radar... On Wed, 2007-10-17 at 18:25 +0100, Ian Campbell wrote: Hi David, Please could you upload the 1.0.0 release of the ivtv X driver. I have put the packages at http://www.hellion.org.uk/ivtv/debian/ Cheers, Ian. -- Ian Campbell Custer committed Siouxicide. signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/control|4 ++-- debian/xsfbs/xsfbs.mk | 50 ++ debian/xsfbs/xsfbs.sh |7 --- 4 files changed, 26 insertions(+), 41 deletions(-) New commits: commit 57e41e85696a6cdfa0e3ce6cd51fa6ae491ba8d0 Author: Ian Campbell [EMAIL PROTECTED] Date: Thu Nov 1 08:47:34 2007 + Vcs-Browser and Vcs-Git are now supported so drop the XS- prefix. diff --git a/debian/changelog b/debian/changelog index 64fd726..eb2c175 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ xserver-xorg-video-ivtvdev (1.0.0-2) unstable; urgency=low - * UNRELEASED + * Vcs-Browser and Vcs-Git are now supported so drop the XS- prefix. -- Ian Campbell [EMAIL PROTECTED] Fri, 19 Oct 2007 23:12:00 +0100 diff --git a/debian/control b/debian/control index b071224..47e3cb9 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Ian Campbell [EMAIL PROTECTED] Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.4), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev Standards-Version: 3.7.2.2 -XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ivtvdev -XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ivtvdev.git +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 commit f7ef338b3472aa3d14dba3a715c7363241c6cb5e Author: Ian Campbell [EMAIL PROTECTED] Date: Fri Oct 19 23:12:21 2007 +0100 Continue with 1.0.0-2 diff --git a/debian/changelog b/debian/changelog index 2fe40b3..64fd726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-ivtvdev (1.0.0-2) unstable; urgency=low + + * UNRELEASED + + -- Ian Campbell [EMAIL PROTECTED] Fri, 19 Oct 2007 23:12:00 +0100 + xserver-xorg-video-ivtvdev (1.0.0-1) unstable; urgency=low * New upstream release. commit 331c032528ba1faebef1d8eaa56db47f533f0426 Author: David Nusinow [EMAIL PROTECTED] Date: Sat Sep 22 23:49:11 2007 -0400 Remove make-orig-tar-gz target This target wasn't kept up to date and was totally broken for the git world. The way we use git has made this target pretty well impossible to use in any form, so it's been supersceded by a script that is currently located at http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index bfca7bb..b8f7afd 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -272,29 +272,6 @@ prune-upstream-tree: dh_testdir grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf -# Change to what should be the correct directory, ensure it is, and if -# so, create the .orig.tar.gz file. Exclude the debian directory and its -# contents, and any .svn directories and their contents (so that we can safely -# build an .orig.tar.gz from SVN checkout, not just an export). -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -# -# This rule *IS* the recommended method for creating a new .orig.tar.gz file, -# for the rare situations when one is needed. -.PHONY: make-orig-tar-gz -make-orig-tar-gz: clean prune-upstream-tree - ( cd .. \ - if [ $(shell basename $(CURDIR)) != $(SOURCE_NAME)-$(NO_EPOCH_VER) ]; then \ - echo Our current working directory has the wrong name. Renaming... 2; \ - mv $(CURDIR) $(SOURCE_NAME)-$(NO_EPOCH_VER); \ - fi; \ - tar --exclude=debian --exclude=debian/* \ - --exclude=.svn --exclude=.svn/* \ - -cf - $(SOURCE_NAME)-$(NO_EPOCH_VER) \ - | gzip -9 $(SOURCE_NAME)_$(NO_EPOCH_VER).orig.tar.gz; \ - ) - # Verify that there are no offsets or fuzz in the patches we apply. # # Note: This rule is for Debian package maintainers' convenience, and is not commit 575efb7249d7cf194f07e45db17e601d9c259231 Author: Brice Goglin [EMAIL PROTECTED] Date: Wed Aug 29 09:36:00 2007 +0200 Do not call laptop-detect, let the only user call it directly diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 52473ca..a90ff7d 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -59,13 +59,6 @@ fi ARCHITECTURE=$(dpkg --print-installation-architecture) -LAPTOP= -if [ -n $(which laptop-detect) ]; then -if laptop-detect /dev/null; then - LAPTOP=true -fi -fi - if [ $1 = reconfigure ] || [ -n $DEBCONF_RECONFIGURE ]; then RECONFIGURE=true else
xserver-xorg-video-ivtvdev: Changes to 'upstream/trunk'
Makefile.in |6 +++---
README|9 +
config.h.in | 12
configure | 33 +++--
configure.ac |5 -
src/ivtv.c|2 +-
src/ivtv_hw.h |7 ---
src/ivtv_xv.c |4 ++--
8 files changed, 50 insertions(+), 28 deletions(-)
New commits:
commit 48fbd819f3ba302215d69b61870de974c57fd7c2
Author: hverkuil [EMAIL PROTECTED]
Date: Fri Oct 19 19:17:52 2007 +
Allows building with some older Xorg 7.x releases.
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/Makefile.in b/Makefile.in
index ee651a5..18a8352 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,10 +52,10 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = README ChangeLog $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure config.guess config.sub depcomp \
- install-sh ltmain.sh missing
+ $(top_srcdir)/configure ChangeLog config.guess config.sub \
+ depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/README b/README
index 4d52737..be744b4 100644
--- a/README
+++ b/README
@@ -40,12 +40,13 @@ So don't use that.
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 the autogen.sh script followed by make and then
+make install. The installation path may well need to be altered using the
+--prefix option.
-If you get this error when running the configure script:
+If you get this error when running autogen.sh or the configure script:
-checking for XORG... configure: error: Package requirements (xorg-server =
1.0.99.901 xproto fontsproto ) were not met.
+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'.
diff --git a/config.h.in b/config.h.in
index db6ccf2..b3efa5f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -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 --git a/configure b/configure
index ca8c3f7..8735e5e 100755
--- a/configure
+++ b/configure
@@ -20015,7 +20015,6 @@ else
fi
-# Checks for pkg-config packages
if test x$ac_cv_env_PKG_CONFIG_set != xset; then
@@ -20136,6 +20135,20 @@ echo ${ECHO_T}no 6; }
fi
fi
+if test -n $PKG_CONFIG \
+{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\xorg-server = 1.0.99.901\) 5
+ ($PKG_CONFIG --exists --print-errors xorg-server = 1.0.99.901) 25
+ ac_status=$?
+ echo $as_me:$LINENO: \$? = $ac_status 5
+ (exit $ac_status); }; then
+
+cat confdefs.h \_ACEOF
+#define X_NEW_PARMS 1
+_ACEOF
+
+fi
+
+# Checks for pkg-config packages
pkg_failed=no
{ echo $as_me:$LINENO: checking for XORG 5
@@ -20143,12 +20156,12 @@ echo $ECHO_N checking for XORG... $ECHO_C 6; }
if test -n $PKG_CONFIG; then
if test -n $PKG_CONFIG \
-{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\xorg-server = 1.0.99.901 xproto fontsproto \$REQUIRED_MODULES\) 5
- ($PKG_CONFIG --exists --print-errors xorg-server = 1.0.99.901 xproto
fontsproto $REQUIRED_MODULES) 25
+{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\xorg-server xproto fontsproto \$REQUIRED_MODULES\) 5
+ ($PKG_CONFIG --exists --print-errors xorg-server xproto fontsproto
$REQUIRED_MODULES) 25
ac_status=$?
echo $as_me:$LINENO: \$? = $ac_status 5
(exit $ac_status); }; then
- pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags xorg-server = 1.0.99.901 xproto
fontsproto $REQUIRED_MODULES 2/dev/null`
+ pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags xorg-server xproto fontsproto
$REQUIRED_MODULES 2/dev/null`
else
pkg_failed=yes
fi
@@ -20157,12 +20170,12 @@ else
fi
if test -n $PKG_CONFIG; then
if test -n $PKG_CONFIG \
-{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\xorg-server = 1.0.99.901 xproto fontsproto \$REQUIRED_MODULES\) 5
- ($PKG_CONFIG --exists --print-errors xorg-server = 1.0.99.901 xproto
fontsproto
xserver-xorg-video-ivtvdev: Changes to 'upstream/tags/1.0.0'
New branch 'upstream/tags/1.0.0' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'upstream/trunk'
New branch 'upstream/trunk' available with the following commits: commit bfd21e06ccdfe3e9477407bd8cd93a8bbd9bc463 Author: hverkuil [EMAIL PROTECTED] Date: Sun Oct 14 16:35:04 2007 + Changelog - ChangeLog Add ChangeLog to the dist target. git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 7ebe05c04228bc923d4ab2d0343932fa87048ea6 Author: hverkuil [EMAIL PROTECTED] Date: Sun Oct 14 16:25:34 2007 + Also update configure.ac git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit d7970f8f3d600b8371bd5db6e57f65eae7bb71ae Author: hverkuil [EMAIL PROTECTED] Date: Sun Oct 14 16:23:31 2007 + Continue with 1.0.1. git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'upstream/trunk'
README |6 ++ 1 file changed, 6 insertions(+) New commits: commit 804d2bdd30eef9e1eaf785996928cd894a558bcc Author: hverkuil [EMAIL PROTECTED] Date: Sun Oct 14 17:47:01 2007 + Update README with note regarding the MythTV interlacing settings. git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/README b/README index de38ba3..4d52737 100644 --- a/README +++ b/README @@ -31,6 +31,12 @@ replace it with 'ivtv-fb'. The ivtv framebuffer driver can be obtained from www.ivtvdriver.org. It is part of the ivtv package. It will be merged with kernel 2.6.24. +The latest MythTV subversion code has overhauled the video out +handling. By default it will select the 'Bob (2x)' deinterlacer for +Xv output. This is NOT compatible with the Xv overlay support for the +PVR-350. It won't crash, but the resulting image will be extremely poor. +So don't use that. + Xorg 7.x Servers -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
configure| 20 ++-- configure.ac |2 +- src/ivtv.c |2 +- 3 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 804d2bdd30eef9e1eaf785996928cd894a558bcc Author: hverkuil [EMAIL PROTECTED] Date: Sun Oct 14 17:47:01 2007 + Update README with note regarding the MythTV interlacing settings. git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/README b/README index de38ba3..4d52737 100644 --- a/README +++ b/README @@ -31,6 +31,12 @@ replace it with 'ivtv-fb'. The ivtv framebuffer driver can be obtained from www.ivtvdriver.org. It is part of the ivtv package. It will be merged with kernel 2.6.24. +The latest MythTV subversion code has overhauled the video out +handling. By default it will select the 'Bob (2x)' deinterlacer for +Xv output. This is NOT compatible with the Xv overlay support for the +PVR-350. It won't crash, but the resulting image will be extremely poor. +So don't use that. + Xorg 7.x Servers commit bfd21e06ccdfe3e9477407bd8cd93a8bbd9bc463 Author: hverkuil [EMAIL PROTECTED] Date: Sun Oct 14 16:35:04 2007 + Changelog - ChangeLog Add ChangeLog to the dist target. git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 000..d5da1f9 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,47 @@ +#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 + on, and both global local alpha are off. + - Remove obsolete text from the README. + - Delete obsolete xc directory. + - Reformatted code to Xorg style + - Fixed Xv support for IVTV versions 1.0.0 + - Removed dead code + - Other minor tweaks clean-ups to make the code more consistent. + - Tweaked configure.ac for a more graceful failure if the base requirements + aren't met. + - Add support for multiple PVR350's + - Add support for multiple 'resolutions', switchable via randr + - Add support for 8/16 bpp modes - XV not supported for 8bpp + - Add support for Virtual resolutions with panning + - Add support for Big-endian CPUs - induces speed penalty since cpu has to byte swap all data + - Takes advantage of improved dma if ivtv 0.10.0 + - Most ErrorF calls replaced with xf86DrvMsg + - New resolution/colour support only works if ivtv-fb is loaded WITHOUT 'osd_compat=1' + - compiles with Xorg 7.x as well as older X versions + - Add software scaling for images larger than 720x576 +#0.10.6 - Improved performance by only fixing up correct sized region + - should build against xorg corrrectly +#0.10.5 - Add autopaint colorkey support (XV_AUTOPAINTCOLORKEY) +#0.10.4 - Add colorkey support (XV_COLORKEY) +#0.10.2 - Fix device identification for /dev/video/1 type fb devices + - Allow ivtv/350 to scale up xv playback +#0.10.1 - Fix NTSC playback +#0.10 - Fix playback of non full height videos + - center video in screen + - revert PREP_FRAME code to same as 0.8 for now. +#0.9- first attempt at Xv + - Remove some ioctl calls we know will fail and aren't important. +#0.8 - fix error using fbdev option to specify device to use +#0.7 - frame buffer device now specified with fbdev again + - Configuration code is more like most pci cards instead of + framebuffer driver so less things go wrong + and error messages are more sensible + - Uses installed ivtv header file + - Probe does ivtvfb ioctl to ensure frame buffer is really ivtv. +#0.6 - Fix dma too large an area on full screen updates +#0.5 - Remove name conflicts +#0.4 - Sends data in multiples of 64K to keep ivtv happ(ish) + - Grabs the sum of the dirty regions and just updates that region. + - pointer passed to ivtv is not aligned on page boundaries so relies on + ivtv-0.1.10-pre2-ck108d or newer version of myth to work properly. diff --git a/Changelog b/Changelog deleted file mode 100644 index d5da1f9..000 --- a/Changelog +++ /dev/null @@ -1,47 +0,0 @@ -#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 - on, and both global local alpha are off. - - Remove obsolete text from the README. - - Delete obsolete xc directory. - - Reformatted code to Xorg style - - Fixed Xv support for IVTV versions 1.0.0 - - Removed dead code - - Other minor tweaks clean-ups to make the code more consistent. - - Tweaked configure.ac for a more graceful failure if the base
Sponsored upload of ivtv video driver 1.0.0-1
Hi David, Please could you upload the 1.0.0 release of the ivtv X driver. I have put the packages at http://www.hellion.org.uk/ivtv/debian/ Cheers, Ian. -- Ian Campbell Who goeth a-borrowing goeth a-sorrowing. -- Thomas Tusser signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xserver-xorg-video-ivtvdev-1.0.0-1'
Tag 'xserver-xorg-video-ivtvdev-1.0.0-1' created by Ian Campbell [EMAIL PROTECTED] at 2007-10-17 17:19 + Debian release 1.0.0-1 Changes since xserver-xorg-video-ivtvdev-1.0.0.svn4049-3: Ian Campbell (4): Start -4 development. Update headers on patches ready for patch bomb upstream. Merge commit '630bda6' into debian-unstable Updates for upstream release 1.0.0 plus no longer build-dep on ivtv-utils since hverkuil (9): x86_ansic.h is deprecated. Use sysconf(_SC_PAGESIZE) as the portable alternative to PAGE_MASK. Update README with info on how to configure X. More doc updates. Applied patch from Ian Armstrong. Release xdriver-1.0.0 Changelog - ChangeLog Rename xdriver to the standard name of Xorg drivers. Add late-breaking note on MythTV interlacing. --- ChangeLog | 47 ++ Changelog | 47 -- Makefile.in|2 README | 263 + debian/changelog |9 + debian/control |2 debian/patches/remove-PAGE_MASK| 38 - debian/patches/remove-xf86_ansic.h | 44 -- debian/patches/series |2 debian/rules |2 src/ivtv.c |1 src/ivtv_hw.c | 20 +- 12 files changed, 336 insertions(+), 141 deletions(-) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xf86-video-ivtv-1.0.0'
Tag 'xf86-video-ivtv-1.0.0' created by Ian Campbell [EMAIL PROTECTED] at 2007-10-17 19:26 + Release 1.0.0 Changes since the dawn of time: (no author) (1): New repository initialized by cvs2svn. hverkuil (37): (John Harvey asked me to commit this) The resulting driver is capable of supporting both the new old API. Add missing file. From Ian Armstrong: Delete obsolete xc directory. Remove obsolete text from the README. When the ivtv X driver is loaded, it ensures the osd/framebuffer is switched Minor tweaks support for older ivtv versions as far back as 0.2. Update version to 1.0.0. Did some renaming, modified ivtv_compat.h to check for kernel = 2.6.22. Update Changelog file. Some cleanups. Fix spelling mistake. Fix -Wall compile warnings, remove obsolete TODO file. Introduce a small bug in the previous change. Fixed. Fix 64-bit compiler warnings. Cleanup. Add ivtv_xv.h, cleanup header guards and a few 'fbdev' leftovers. Re-added Imakefile for X11R6 support. Update README. Oops, shouldn't have renamed that option. Reverted that change. Fix breakage. Removed some dead code. Fix 64-bit compile problem. Add info on how to install the xorg-server-sdk package. Fix from Ian Armstrong fixing the bug I managed to introduce in the Imakefile. Put in correct licenses and (hopefully) correct copyrights. Add copyright Matthias (hope I've got this right) x86_ansic.h is deprecated. Use sysconf(_SC_PAGESIZE) as the portable alternative to PAGE_MASK. Update README with info on how to configure X. More doc updates. Applied patch from Ian Armstrong. Release xdriver-1.0.0 Changelog - ChangeLog Rename xdriver to the standard name of Xorg drivers. Add late-breaking note on MythTV interlacing. jharvey (1): Add software scaling for larger images than the 350 can cope with jpharvey (35): Initial revision V04 of the driver v05 of the driver version 06 of the driver uses ivtv installed header file probe tries to do ivtv specific ioctl to ensure we actually have an ivtv frame buffer clear out some gcc flags since they strict ansi doesnt work with ivtv header file use more standard pci card initialisation v0.7 changelog last minute change to Changelog use fbdev all the time 1st attempt a Xv support. Needs lots of tidying up workign version of xv support v0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelog try to cope with any screen size 0.9 version adding xv support 0.9 version layout change add xv support revert to correct version to ship ensure at least v 3.6.X ivtv make v 10.2 and test make NTSC work build correct files add notes for 0.10.1 0.10.2 increase version number to 0.10.5 add colorkey and autpaintcolorkey support add comments for 0.10.4 0.10.5 versions Change Region initisation code when compiling with XORG de_macro routines now just munge the correct amount of data move version to 0.10.6 added changes for 0.10.6 test Changes from Ian Armstrong (at last) remove redundant XF86ModuleVersionInfo and associated global variables. rename XF86ModuleData variable now that driver has been renamed so X finds it and loads the driver. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
ChangeLog | 47 ++
Changelog | 47 --
Makefile.in|2
README | 263 +
debian/changelog |9 -
debian/control |2
debian/patches/remove-PAGE_MASK| 45 --
debian/patches/remove-xf86_ansic.h | 46 --
debian/patches/series |2
debian/rules |2
src/ivtv.c |1
src/ivtv_hw.c | 20 +-
12 files changed, 333 insertions(+), 153 deletions(-)
New commits:
commit a498d593b9919a92c033a177584e1d2438494dbc
Author: Ian Campbell [EMAIL PROTECTED]
Date: Sun Oct 14 22:29:12 2007 +0100
Updates for upstream release 1.0.0 plus no longer build-dep on ivtv-utils
since
it no longer contains ivtv.h and we don't need that header anyway.
diff --git a/debian/changelog b/debian/changelog
index 9b59c45..2fe40b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-xserver-xorg-video-ivtvdev (1.0.0~svn4049-4) unstable; urgency=low
+xserver-xorg-video-ivtvdev (1.0.0-1) unstable; urgency=low
- * UNRELEASED.
+ * 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 [EMAIL PROTECTED] Fri, 21 Sep 2007 07:36:24 +0100
+ -- Ian Campbell [EMAIL PROTECTED] Sun, 14 Oct 2007 22:27:12 +0100
xserver-xorg-video-ivtvdev (1.0.0~svn4049-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6c64475..b071224 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/x11
Priority: extra
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Uploaders: David Nusinow [EMAIL PROTECTED], Ian Campbell [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (=
2:1.4), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, ivtv-utils
+Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (=
2:1.4), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
Standards-Version: 3.7.2.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ivtvdev
XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ivtvdev.git
diff --git a/debian/patches/remove-PAGE_MASK b/debian/patches/remove-PAGE_MASK
deleted file mode 100644
index b2bd1b9..000
--- a/debian/patches/remove-PAGE_MASK
+++ /dev/null
@@ -1,45 +0,0 @@
-Use sysconf(_SC_PAGESIZE) as the portable alternative to PAGE_MASK.
-
-PAGE_MASK is not portable to systems such as powerpc, mips and hppa
-where page size is not a constant.
-
-Signed-off-by: Ian Campbell [EMAIL PROTECTED]
-
-Index: xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c
-===
xserver-xorg-video-ivtvdev.git.orig/src/ivtv_hw.c 2007-09-20
18:55:16.0 +0100
-+++ xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c 2007-09-20
19:00:32.0 +0100
-@@ -557,12 +557,13 @@
- ivtvHWMapVidmem(ScrnInfoPtr pScrn)
- {
- ivtvHWPtr hwPtr = IVTVDEVHWPTR(pScrn);
-+long page_mask = ~(sysconf(_SC_PAGESIZE) - 1);
-
- TRACE_ENTER(MapVidmem);
- if (NULL == hwPtr-fbmem) {
-- hwPtr-fboff = (unsigned long)hwPtr-fix.smem_start ~PAGE_MASK;
-+ hwPtr-fboff = (unsigned long)hwPtr-fix.smem_start ~page_mask;
- hwPtr-fbmem_len =
-- (hwPtr-fboff + hwPtr-fix.smem_len + ~PAGE_MASK) PAGE_MASK;
-+ (hwPtr-fboff + hwPtr-fix.smem_len + ~page_mask) page_mask;
- hwPtr-fbmem =
- mmap(NULL, hwPtr-fbmem_len, PROT_READ | PROT_WRITE, MAP_SHARED,
- hwPtr-fd, 0);
-@@ -573,14 +574,14 @@
- } else {
- /* Perhaps we'd better add fboff to fbmem and return 0 in
-* ivtvHWLinearOffset()? Of course we then need to mask
-- * fPtr-fbmem with PAGE_MASK in ivtvHWUnmapVidmem() as
-+ * fPtr-fbmem with page_mask in ivtvHWUnmapVidmem() as
-* well. [geert] */
- }
- }
- pScrn-memPhysBase =
-- (unsigned long)hwPtr-fix.smem_start (unsigned long)(PAGE_MASK);
-+ (unsigned long)hwPtr-fix.smem_start (unsigned long)(page_mask);
- pScrn-fbOffset =
-- (unsigned long)hwPtr-fix.smem_start (unsigned long)(~PAGE_MASK);
-+ (unsigned long)hwPtr-fix.smem_start (unsigned long)(~page_mask);
- return hwPtr-fbmem;
- }
-
diff --git a/debian/patches/remove-xf86_ansic.h
b/debian/patches/remove-xf86_ansic.h
deleted file mode 100644
index 339a154..000
--- a/debian/patches/remove-xf86_ansic.h
+++ /dev/null
@@ -1,46 +0,0 @@
-x86_ansic.h is deprecated upstream.
-
-Directly include necessary headers instead
xserver-xorg-video-ivtvdev: Changes to 'upstream-trunk'
+Flags-HSync -VSync
+EndMode
+
+Replace the Mode subsection in the Monitor section and update the
+Modes resolution in the Screen section.
+
+Start X and the new resolution should be used.
+
+You can also have multiple Mode subsections in Monitor and use xrandr to
+switch dynamically.
+
+
+How to prevent the console from using the framebuffer
+=
+
+By default when you load ivtvfb the framebuffer is used for the console
+output. Unfortunately, this is usually very annoying since this makes it
+hard to unload ivtvfb.
+
+You can prevent this by adding a magic incantation to the kernel options
+in your grub or lilo configuration.
+
+If your monitor console is using the framebuffer of you graphics cards,
+then you should use kernel option 'fbcon=vc:0-0'. This ensures that only
+the first framebuffer device (that of your graphics card) is used.
+
+If you don't use a framebuffer at all for your console, then use the option
+'fbcon=vc:64-63', this will prevent any framebuffer device from being used
+for the console.
commit 89cd9b89d704c27e3be05b260c47d81c38c06bf0
Author: hverkuil [EMAIL PROTECTED]
Date: Fri Oct 12 07:14:57 2007 +
Use sysconf(_SC_PAGESIZE) as the portable alternative to PAGE_MASK.
Thanks to Ian Campbell for this patch.
git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/src/ivtv_hw.c b/src/ivtv_hw.c
index e16caf0..21bb49d 100644
--- a/src/ivtv_hw.c
+++ b/src/ivtv_hw.c
@@ -556,12 +556,13 @@ void *
ivtvHWMapVidmem(ScrnInfoPtr pScrn)
{
ivtvHWPtr hwPtr = IVTVDEVHWPTR(pScrn);
+long page_mask = ~(sysconf(_SC_PAGESIZE) - 1);
TRACE_ENTER(MapVidmem);
if (NULL == hwPtr-fbmem) {
- hwPtr-fboff = (unsigned long)hwPtr-fix.smem_start ~PAGE_MASK;
+ hwPtr-fboff = (unsigned long)hwPtr-fix.smem_start ~page_mask;
hwPtr-fbmem_len =
- (hwPtr-fboff + hwPtr-fix.smem_len + ~PAGE_MASK) PAGE_MASK;
+ (hwPtr-fboff + hwPtr-fix.smem_len + ~page_mask) page_mask;
hwPtr-fbmem =
mmap(NULL, hwPtr-fbmem_len, PROT_READ | PROT_WRITE, MAP_SHARED,
hwPtr-fd, 0);
@@ -572,14 +573,14 @@ ivtvHWMapVidmem(ScrnInfoPtr pScrn)
} else {
/* Perhaps we'd better add fboff to fbmem and return 0 in
* ivtvHWLinearOffset()? Of course we then need to mask
-* fPtr-fbmem with PAGE_MASK in ivtvHWUnmapVidmem() as
+* fPtr-fbmem with page_mask in ivtvHWUnmapVidmem() as
* well. [geert] */
}
}
pScrn-memPhysBase =
- (unsigned long)hwPtr-fix.smem_start (unsigned long)(PAGE_MASK);
+ (unsigned long)hwPtr-fix.smem_start (unsigned long)(page_mask);
pScrn-fbOffset =
- (unsigned long)hwPtr-fix.smem_start (unsigned long)(~PAGE_MASK);
+ (unsigned long)hwPtr-fix.smem_start (unsigned long)(~page_mask);
return hwPtr-fbmem;
}
commit 717f034d8e5383c1335aaae9b46e343be1e2a4d4
Author: hverkuil [EMAIL PROTECTED]
Date: Fri Oct 12 07:12:46 2007 +
x86_ansic.h is deprecated.
Thanks to Ian Campbell for this patch.
git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/src/ivtv.c b/src/ivtv.c
index ed5be5b..069d439 100644
--- a/src/ivtv.c
+++ b/src/ivtv.c
@@ -40,7 +40,6 @@ in this Software without prior written authorization from the
XFree86 Project.
/* all drivers need this */
#include xf86.h
#include xf86_OSproc.h
-#include xf86_ansic.h
#include mipointer.h
#include mibstore.h
diff --git a/src/ivtv_hw.c b/src/ivtv_hw.c
index 08f1a76..e16caf0 100644
--- a/src/ivtv_hw.c
+++ b/src/ivtv_hw.c
@@ -32,6 +32,14 @@ in this Software without prior written authorization from
the XFree86 Project.
# include config.h
#endif
+#include errno.h
+#include fcntl.h
+#include unistd.h
+#include sys/ioctl.h
+#include sys/mman.h
+#include sys/stat.h
+#include sys/types.h
+
#include ivtv_compat.h
#include ivtv_hw.h
#include ivtv.h
@@ -39,7 +47,6 @@ in this Software without prior written authorization from the
XFree86 Project.
/* all drivers need this */
#include xf86.h
#include xf86_OSproc.h
-#include xf86_ansic.h
/* pci stuff */
#include xf86PciInfo.h
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/patches/remove-PAGE_MASK|7 +++ debian/patches/remove-xf86_ansic.h |6 -- 3 files changed, 17 insertions(+), 2 deletions(-) New commits: commit c4a29582afbf8753e305aa8567580cb42c17089e Author: Ian Campbell [EMAIL PROTECTED] Date: Fri Sep 21 08:35:15 2007 +0100 Update headers on patches ready for patch bomb upstream. diff --git a/debian/patches/remove-PAGE_MASK b/debian/patches/remove-PAGE_MASK index db88ffb..b2bd1b9 100644 --- a/debian/patches/remove-PAGE_MASK +++ b/debian/patches/remove-PAGE_MASK @@ -1,3 +1,10 @@ +Use sysconf(_SC_PAGESIZE) as the portable alternative to PAGE_MASK. + +PAGE_MASK is not portable to systems such as powerpc, mips and hppa +where page size is not a constant. + +Signed-off-by: Ian Campbell [EMAIL PROTECTED] + Index: xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c === --- xserver-xorg-video-ivtvdev.git.orig/src/ivtv_hw.c 2007-09-20 18:55:16.0 +0100 diff --git a/debian/patches/remove-xf86_ansic.h b/debian/patches/remove-xf86_ansic.h index 2ef1fc2..339a154 100644 --- a/debian/patches/remove-xf86_ansic.h +++ b/debian/patches/remove-xf86_ansic.h @@ -1,6 +1,8 @@ -x86_ansic.h is obsolete upstream, directly include necessary headers instead. +x86_ansic.h is deprecated upstream. -Signed-off-by: Ian Campbell [EMAIL PROTECTED] +Directly include necessary headers instead. + +Signed-off-by: Ian Campbell [EMAIL PROTECTED] Index: xserver-xorg-video-ivtvdev.git/src/ivtv.c === commit b34e9020bbc73c5ec4a5aeca086e96d7c36f6a42 Author: Ian Campbell [EMAIL PROTECTED] Date: Fri Sep 21 07:36:48 2007 +0100 Start -4 development. diff --git a/debian/changelog b/debian/changelog index 53c4151..9b59c45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-ivtvdev (1.0.0~svn4049-4) unstable; urgency=low + + * UNRELEASED. + + -- Ian Campbell [EMAIL PROTECTED] Fri, 21 Sep 2007 07:36:24 +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, -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
sponsored upload of ivtv driver 1.0.0~svn4049-3
Hi David, xserver-xorg-video-ivtvdev 1.0.0~svn4049-2 failed to build on hppa, mips and powerpc. I have committed a fix (hopefully -- I have no access to those architectures) as version 1.0.0~svn4049-3 and uploaded to http://www.hellion.org.uk/ivtv/debian/ could you upload please. Sorry for the rapid rate of uploads, I should have noticed that -1 failed to build before I cut -2. Thanks, Ian. -- Ian Campbell CChheecckk yyoouurr dduupplleexx sswwiittcchh.. signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xserver-xorg-video-ivtvdev-1.0.0.svn4049-3'
Tag 'xserver-xorg-video-ivtvdev-1.0.0.svn4049-3' created by Ian Campbell [EMAIL PROTECTED] at 2007-09-20 18:15 + Debian release 1.0.0~svn4049-3 Changes since xserver-xorg-video-ivtvdev-1.0.0.svn4049-2: Ian Campbell (1): Update patches to silence build warnings and hopefully fix FTBFS on hppa, mips --- debian/changelog |9 debian/patches/remove-PAGE_MASK| 38 + debian/patches/remove-xf86_ansic.h | 17 +--- debian/patches/series |1 4 files changed, 58 insertions(+), 7 deletions(-) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |9
debian/patches/remove-PAGE_MASK| 38 +
debian/patches/remove-xf86_ansic.h | 17 +---
debian/patches/series |1
4 files changed, 58 insertions(+), 7 deletions(-)
New commits:
commit 71455798b16225aff65eb920bcb547b51ae42d27
Author: Ian Campbell [EMAIL PROTECTED]
Date: Thu Sep 20 19:12:24 2007 +0100
Update patches to silence build warnings and hopefully fix FTBFS on hppa,
mips
powerpc.
diff --git a/debian/changelog b/debian/changelog
index 48da4f7..53c4151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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 [EMAIL PROTECTED] 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.
diff --git a/debian/patches/remove-PAGE_MASK b/debian/patches/remove-PAGE_MASK
new file mode 100644
index 000..db88ffb
--- /dev/null
+++ b/debian/patches/remove-PAGE_MASK
@@ -0,0 +1,38 @@
+Index: xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c
+===
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtv_hw.c 2007-09-20
18:55:16.0 +0100
xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c 2007-09-20
19:00:32.0 +0100
+@@ -557,12 +557,13 @@
+ ivtvHWMapVidmem(ScrnInfoPtr pScrn)
+ {
+ ivtvHWPtr hwPtr = IVTVDEVHWPTR(pScrn);
++long page_mask = ~(sysconf(_SC_PAGESIZE) - 1);
+
+ TRACE_ENTER(MapVidmem);
+ if (NULL == hwPtr-fbmem) {
+- hwPtr-fboff = (unsigned long)hwPtr-fix.smem_start ~PAGE_MASK;
++ hwPtr-fboff = (unsigned long)hwPtr-fix.smem_start ~page_mask;
+ hwPtr-fbmem_len =
+- (hwPtr-fboff + hwPtr-fix.smem_len + ~PAGE_MASK) PAGE_MASK;
++ (hwPtr-fboff + hwPtr-fix.smem_len + ~page_mask) page_mask;
+ hwPtr-fbmem =
+ mmap(NULL, hwPtr-fbmem_len, PROT_READ | PROT_WRITE, MAP_SHARED,
+ hwPtr-fd, 0);
+@@ -573,14 +574,14 @@
+ } else {
+ /* Perhaps we'd better add fboff to fbmem and return 0 in
+* ivtvHWLinearOffset()? Of course we then need to mask
+- * fPtr-fbmem with PAGE_MASK in ivtvHWUnmapVidmem() as
++ * fPtr-fbmem with page_mask in ivtvHWUnmapVidmem() as
+* well. [geert] */
+ }
+ }
+ pScrn-memPhysBase =
+- (unsigned long)hwPtr-fix.smem_start (unsigned long)(PAGE_MASK);
++ (unsigned long)hwPtr-fix.smem_start (unsigned long)(page_mask);
+ pScrn-fbOffset =
+- (unsigned long)hwPtr-fix.smem_start (unsigned long)(~PAGE_MASK);
++ (unsigned long)hwPtr-fix.smem_start (unsigned long)(~page_mask);
+ return hwPtr-fbmem;
+ }
+
diff --git a/debian/patches/remove-xf86_ansic.h
b/debian/patches/remove-xf86_ansic.h
index 4b386a7..2ef1fc2 100644
--- a/debian/patches/remove-xf86_ansic.h
+++ b/debian/patches/remove-xf86_ansic.h
@@ -4,9 +4,9 @@ Signed-off-by: Ian Campbell [EMAIL PROTECTED]
Index: xserver-xorg-video-ivtvdev.git/src/ivtv.c
===
xserver-xorg-video-ivtvdev.git.orig/src/ivtv.c 2007-08-26
10:06:06.0 +0100
-+++ xserver-xorg-video-ivtvdev.git/src/ivtv.c 2007-08-26 10:18:42.0
+0100
-@@ -12,7 +12,6 @@
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtv.c 2007-09-18
08:24:59.0 +0100
xserver-xorg-video-ivtvdev.git/src/ivtv.c 2007-09-20 18:53:26.0
+0100
+@@ -40,7 +40,6 @@
/* all drivers need this */
#include xf86.h
#include xf86_OSproc.h
@@ -16,22 +16,25 @@ Index: xserver-xorg-video-ivtvdev.git/src/ivtv.c
#include mibstore.h
Index: xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c
===
xserver-xorg-video-ivtvdev.git.orig/src/ivtv_hw.c 2007-08-26
10:06:06.0 +0100
-+++ xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c 2007-08-26
10:19:10.0 +0100
-@@ -2,6 +2,12 @@
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtv_hw.c 2007-09-18
08:24:59.0 +0100
xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c 2007-09-20
19:02:15.0 +0100
+@@ -32,6 +32,15 @@
# include config.h
#endif
++#include sys/ioctl.h
++#include sys/mman.h
+#include sys/stat.h
+#include sys/types.h
+
+#include errno.h
+#include fcntl.h
++#include unistd.h
+
#include ivtv_compat.h
#include ivtv_hw.h
#include ivtv.h
-@@ -9,7 +15,6 @@
+@@ -39,7 +48,6 @@
/* all drivers need this */
#include xf86.h
#include xf86_OSproc.h
diff --git a/debian/patches/series b/debian/patches/series
index 2256471..1596c0f 100644
--- a/debian/patches
Re: sponsored upload of ivtv
On Tue, 2007-09-18 at 20:28 -0400, David Nusinow wrote: On Tue, Sep 18, 2007 at 08:56:04AM +0100, Ian Campbell wrote: Please upload with the other 1.4 packages Done. Thanks! Cheers! Ian. -- Ian Campbell I think trash is the most important manifestation of culture we have in my lifetime. -- Johnny Legend signature.asc Description: This is a digitally signed message part
Re: sponsored upload of ivtv
Hi David, On Sun, 2007-09-16 at 11:49 -0400, David Nusinow wrote: We're going to have to do another upload soonish when we get the new server in to unstable also because the ABI has changed for the 1.4 release. I've tagged and uploaded xserver-xorg-video-ivtvdev-1.0.0~svn4049-2 to http://www.hellion.org.uk/ivtv/debian/. Only change is bump of xserver dependency to 2:1.4. Please upload with the other 1.4 packages, looks like this has started to happen now? Thanks, Ian. -- Ian Campbell Oatmeal raisin. signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xserver-xorg-video-ivtvdev-1.0.0.svn4049-2'
Tag 'xserver-xorg-video-ivtvdev-1.0.0.svn4049-2' created by Ian Campbell [EMAIL PROTECTED] at 2007-09-18 07:42 + Debian release 1.0.0~svn4049-2 Changes since xserver-xorg-video-ivtvdev-1.0.0.svn4049-1: Ian Campbell (1): Build depend on xserver 1.4 --- debian/changelog |6 ++ debian/control |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/control |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit a01c0cdcb22485b5f8d4745c25fa43a6768fb89f Author: Ian Campbell [EMAIL PROTECTED] Date: Tue Sep 18 08:40:59 2007 +0100 Build depend on xserver 1.4 diff --git a/debian/changelog b/debian/changelog index 31cf906..48da4f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-ivtvdev (1.0.0~svn4049-2) unstable; urgency=low + + * Build against xserver 1.4. + + -- Ian Campbell [EMAIL PROTECTED] 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). diff --git a/debian/control b/debian/control index ba659c9..6c64475 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: contrib/x11 Priority: extra Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Ian Campbell [EMAIL PROTECTED] -Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.2.99.902), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, ivtv-utils +Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.4), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, ivtv-utils Standards-Version: 3.7.2.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ivtvdev XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ivtvdev.git -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: sponsored upload of ivtv
On Sun, 2007-09-16 at 11:49 -0400, David Nusinow wrote: No problem. I've just uploaded it. Excellent, thanks very much. Just so you know, We're going to have to do another upload soonish when we get the new server in to unstable also because the ABI has changed for the 1.4 release. Thanks for the heads up, Brice already let me know so the changes are waiting to be pushed when I get a spare moment. Ian. -- Ian Campbell Advice to young men: Be ascetic, and if you can't be ascetic, then at least be aseptic. signature.asc Description: This is a digitally signed message part
Re: sponsored upload of ivtv
On Thu, 2007-09-13 at 20:03 -0400, David Nusinow wrote: Hi Ian, On Mon, Sep 10, 2007 at 10:20:19PM +0100, Ian Campbell wrote: Hi David, Please could you sponsor another upload of xserver-xorg-video-ivtvdev. I didn't really want to upload an svn snapshot but unfortunately version 1.0.0~svn4049-1 is required to work with the version of the kernel driver which is now in the 2.6.22 kernel packages (#441275). I've uploaded source and binaries to http://www.hellion.org.uk/ivtv/debian/ and tagged the same in the git repo with xserver-xorg-video-ivtvdev-1.0.0.svn4049-1 (git-buildpackage seems to have squashed the ~ into a . for me). I can't find svn4049-1 at that source, just svn4027-1. I can upload this if you like, but I assume it's an older version. If you want 4027 uploaded, just let me know and I'll get it done ASAP. I put the files in my staging area but forgot to run the upload script. They are there now. Sorry about that! Ian. -- Ian Campbell Your heart is pure, and your mind clear, and your soul devout. signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'
.gitignore |2
Changelog| 40
Makefile.in | 139
README | 16
aclocal.m4 | 560 -
configure| 8225 +++-
configure.ac |8
debian/NEWS |7
debian/changelog | 15
debian/patches/configure-correct-version |12142 ---
debian/patches/remove-xf86_ansic.h | 32
debian/patches/series|1
src/Imakefile| 17
src/Makefile.am | 19
src/Makefile.in | 203
src/TODO | 12
src/ivtv.c | 741 +
src/ivtv.h | 57
src/ivtv_compat.h| 128
src/ivtv_hw.c| 900 ++
src/ivtv_hw.h| 132
src/ivtv_xv.c| 217
src/ivtv_xv.h| 33
src/ivtvcompat.h | 77
src/ivtvdev.c| 726 -
src/ivtvdev.h| 27
src/ivtvhw.c | 922 --
src/ivtvhw.h | 108
28 files changed, 7025 insertions(+), 18481 deletions(-)
New commits:
commit 423e2d6308f16a27dc52fdd05663f2c082c6de47
Author: Ian Campbell [EMAIL PROTECTED]
Date: Mon Sep 10 07:27:10 2007 +0100
This new version fixed 441275
diff --git a/debian/changelog b/debian/changelog
index 9d31c48..067e351 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
xserver-xorg-video-ivtvdev (1.0.0~svn4049-1) unstable; urgency=low
- * Import upstream subversion revision 4049.
+ * 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 [EMAIL PROTECTED] Sun, 26 Aug 2007 10:06:42 +0100
+ -- Ian Campbell [EMAIL PROTECTED] Mon, 10 Sep 2007 07:26:44 +0100
xserver-xorg-video-ivtvdev (0.10.6-3) UNRELEASED; urgency=low
commit e0aa623a1e77f0d0d5a1dd34833f1f8bbfb27643
Author: Ian Campbell [EMAIL PROTECTED]
Date: Mon Sep 10 07:26:23 2007 +0100
Add a NEWS file noting the change in the driver name
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 000..e2ad560
--- /dev/null
+++ b/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 [EMAIL PROTECTED] Mon, 10 Sep 2007 07:24:39 +0100
+
commit 2f5ba71704dd6a50cb90d5f74de5862bceca6993
Author: Ian Campbell [EMAIL PROTECTED]
Date: Mon Sep 10 07:23:20 2007 +0100
Update changelog for r4049. Collapse multiple unreleased svn snapshot
changelog
entries into one.
diff --git a/debian/changelog b/debian/changelog
index 2f2022d..9d31c48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,10 @@
-xserver-xorg-video-ivtvdev (1.0.0~svn4027-1) unstable; urgency=low
+xserver-xorg-video-ivtvdev (1.0.0~svn4049-1) unstable; urgency=low
- * Import upstream subversion revision 4027.
-
- -- Ian Campbell [EMAIL PROTECTED] Sun, 26 Aug 2007 10:06:42 +0100
-
-xserver-xorg-video-ivtvdev (0.10.8~svn3991-1) unstable; urgency=low
-
- * Import upstream subversion revision 3991.
- * correct upstream version in configure{,.ac} (0.3.1=0.10.8)
- * Switch to using ~ for svn revision so they sort correctly.
-
- -- Ian Campbell [EMAIL PROTECTED] Sun, 12 Aug 2007 14:50:02 +0100
-
-xserver-xorg-video-ivtvdev (0.10.6+svn3805-1) UNRELEASED; urgency=low
-
- * Imported upstream subversion revision 3805.
+ * Import upstream subversion revision 4049.
* Patch 00_xorg_7_1 is no longer required.
* The xf86_ansic.h header is no longer required.
- -- Ian Campbell [EMAIL PROTECTED] Wed, 28 Mar 2007 22:05:43 +0100
+ -- Ian Campbell [EMAIL PROTECTED] Sun, 26 Aug 2007 10:06:42 +0100
xserver-xorg-video-ivtvdev (0.10.6-3) UNRELEASED; urgency=low
commit 4045de03e540d6dff52486212e123fa1e6bd4271
Author: hverkuil [EMAIL PROTECTED]
Date: Tue Aug 28 08:37:51 2007 +
Add copyright Matthias (hope I've got this right)
git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED]
f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/src/ivtv.c b/src/ivtv.c
index 26a57d1..ed5be5b 100644
--- a/src/ivtv.c
+++ b/src/ivtv.c
@@ -3,6 +3,7 @@
X11 video driver for the Conexant 23415 MPEG encoder/decoder On-Screen Display
using the ivtvfb framebuffer driver.
+Copyright (C) 2004 Matthias Badaire
Copyright (C) 2004-2007 John P. Harvey [EMAIL PROTECTED]
Copyright (C) 2006
xserver-xorg-video-ivtvdev: Changes to 'upstream-trunk'
Changelog | 40 Makefile.in | 139 README| 16 aclocal.m4| 560 ++- configure | 8225 -- configure.ac |8 src/Imakefile | 17 src/Makefile.am | 19 src/Makefile.in | 203 - src/TODO | 12 src/ivtv.c| 741 src/ivtv.h| 57 src/ivtv_compat.h | 128 src/ivtv_hw.c | 900 + src/ivtv_hw.h | 132 src/ivtv_xv.c | 217 - src/ivtv_xv.h | 33 src/ivtvcompat.h | 77 src/ivtvdev.c | 726 src/ivtvdev.h | 27 src/ivtvhw.c | 922 -- src/ivtvhw.h | 108 22 files changed, 6995 insertions(+), 6312 deletions(-) New commits: commit 4045de03e540d6dff52486212e123fa1e6bd4271 Author: hverkuil [EMAIL PROTECTED] Date: Tue Aug 28 08:37:51 2007 + Add copyright Matthias (hope I've got this right) git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/src/ivtv.c b/src/ivtv.c index 26a57d1..ed5be5b 100644 --- a/src/ivtv.c +++ b/src/ivtv.c @@ -3,6 +3,7 @@ X11 video driver for the Conexant 23415 MPEG encoder/decoder On-Screen Display using the ivtvfb framebuffer driver. +Copyright (C) 2004 Matthias Badaire Copyright (C) 2004-2007 John P. Harvey [EMAIL PROTECTED] Copyright (C) 2006-2007 Ian Armstrong [EMAIL PROTECTED] diff --git a/src/ivtv.h b/src/ivtv.h index de953e0..af89615 100644 --- a/src/ivtv.h +++ b/src/ivtv.h @@ -2,6 +2,8 @@ X11 video driver for the Conexant 23415 MPEG encoder/decoder On-Screen Display using the ivtvfb framebuffer driver. +Copyright (C) 2004 Matthias Badaire +Copyright (C) 2004-2007 John P. Harvey [EMAIL PROTECTED] Copyright (C) 2006-2007 Ian Armstrong [EMAIL PROTECTED] Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/src/ivtv_hw.c b/src/ivtv_hw.c index 54fa066..08f1a76 100644 --- a/src/ivtv_hw.c +++ b/src/ivtv_hw.c @@ -2,6 +2,7 @@ X11 video driver for the Conexant 23415 MPEG encoder/decoder On-Screen Display using the ivtvfb framebuffer driver. +Copyright (C) 2004 Matthias Badaire Copyright (C) 2004-2007 John P. Harvey [EMAIL PROTECTED] Copyright (C) 2006-2007 Ian Armstrong [EMAIL PROTECTED] diff --git a/src/ivtv_hw.h b/src/ivtv_hw.h index 571d860..a7d0170 100644 --- a/src/ivtv_hw.h +++ b/src/ivtv_hw.h @@ -2,6 +2,7 @@ X11 video driver for the Conexant 23415 MPEG encoder/decoder On-Screen Display using the ivtvfb framebuffer driver. +Copyright (C) 2004 Matthias Badaire Copyright (C) 2004-2007 John P. Harvey [EMAIL PROTECTED] Copyright (C) 2006-2007 Ian Armstrong [EMAIL PROTECTED] diff --git a/src/ivtv_xv.c b/src/ivtv_xv.c index bf36962..1a16e69 100644 --- a/src/ivtv_xv.c +++ b/src/ivtv_xv.c @@ -2,6 +2,7 @@ X Video Extension support for ivtv_drv. Based on s3virge xv code from XFree86 +Copyright (C) 2004 Matthias Badaire Copyright (C) 2004-2007 John P. Harvey [EMAIL PROTECTED] Copyright (C) 2006-2007 Ian Armstrong [EMAIL PROTECTED] commit 8e3f1dcaf0e7c76a8c80eccbdd5cd2f17477da48 Author: hverkuil [EMAIL PROTECTED] Date: Tue Aug 28 08:17:36 2007 + Put in correct licenses and (hopefully) correct copyrights. git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/src/ivtv.c b/src/ivtv.c index 1ac7443..26a57d1 100644 --- a/src/ivtv.c +++ b/src/ivtv.c @@ -1,7 +1,32 @@ /* - * Authors: Alan Hourihane, [EMAIL PROTECTED] - * Michel D�nzer, [EMAIL PROTECTED] - */ + +X11 video driver for the Conexant 23415 MPEG encoder/decoder On-Screen Display +using the ivtvfb framebuffer driver. + +Copyright (C) 2004-2007 John P. Harvey [EMAIL PROTECTED] +Copyright (C) 2006-2007 Ian Armstrong [EMAIL PROTECTED] + +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
xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'
debian/changelog |1 - 1 file changed, 1 deletion(-) New commits: commit b6a4c3aa1ba4dea1676da27d79c2f39879fb60f7 Author: Ian Campbell [EMAIL PROTECTED] Date: Mon Sep 10 08:56:13 2007 +0100 Remove blank entry from changelog diff --git a/debian/changelog b/debian/changelog index 067e351..0eb987d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,6 @@ 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 [EMAIL PROTECTED] Mon, 10 Sep 2007 07:26:44 +0100 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
.gitignore |4 COPYING | 12 ChangeLog | 39 Changelog | 47 Makefile.am |2 Makefile.in | 363 README | 26 aclocal.m4 | 3840 + autogen.sh | 12 config.sub |6 configure |13054 +++- configure.ac| 19 debian/NEWS |7 debian/changelog| 14 debian/patches/00_xorg_7_1 | 425 - debian/patches/01_include_linux_types_h | 12 debian/patches/remove-xf86_ansic.h | 41 debian/patches/series |3 debian/rules|2 debian/xserver-xorg-video-ivtv.install |1 depcomp | 103 install-sh | 477 - ltmain.sh | 1402 ++- man/Makefile.am | 59 man/Makefile.in | 386 man/ivtvdev.man | 63 missing | 142 mkinstalldirs | 111 src/Imakefile | 54 src/Makefile.am | 19 src/Makefile.in | 338 src/TODO| 11 src/configure.ac| 64 src/ivtv.c | 741 + src/ivtv.h | 57 src/ivtv_compat.h | 128 src/ivtv_hw.c | 900 ++ src/ivtv_hw.h | 132 src/ivtv_xv.c | 1389 +-- src/ivtv_xv.h | 33 src/ivtvdev.c | 606 - src/ivtvdev.h | 17 src/ivtvhw.c| 821 -- src/ivtvhw.h| 86 44 files changed, 13448 insertions(+), 12620 deletions(-) New commits: commit b6a4c3aa1ba4dea1676da27d79c2f39879fb60f7 Author: Ian Campbell [EMAIL PROTECTED] Date: Mon Sep 10 08:56:13 2007 +0100 Remove blank entry from changelog diff --git a/debian/changelog b/debian/changelog index 067e351..0eb987d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,6 @@ 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 [EMAIL PROTECTED] Mon, 10 Sep 2007 07:26:44 +0100 commit 423e2d6308f16a27dc52fdd05663f2c082c6de47 Author: Ian Campbell [EMAIL PROTECTED] Date: Mon Sep 10 07:27:10 2007 +0100 This new version fixed 441275 diff --git a/debian/changelog b/debian/changelog index 9d31c48..067e351 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ xserver-xorg-video-ivtvdev (1.0.0~svn4049-1) unstable; urgency=low - * Import upstream subversion revision 4049. + * 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 [EMAIL PROTECTED] Sun, 26 Aug 2007 10:06:42 +0100 + -- Ian Campbell [EMAIL PROTECTED] Mon, 10 Sep 2007 07:26:44 +0100 xserver-xorg-video-ivtvdev (0.10.6-3) UNRELEASED; urgency=low commit e0aa623a1e77f0d0d5a1dd34833f1f8bbfb27643 Author: Ian Campbell [EMAIL PROTECTED] Date: Mon Sep 10 07:26:23 2007 +0100 Add a NEWS file noting the change in the driver name diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 000..e2ad560 --- /dev/null +++ b/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 [EMAIL PROTECTED] Mon, 10 Sep 2007 07:24:39 +0100 + commit 2f5ba71704dd6a50cb90d5f74de5862bceca6993 Author: Ian Campbell [EMAIL PROTECTED] Date: Mon Sep 10 07:23:20 2007 +0100 Update changelog for r4049. Collapse multiple unreleased svn snapshot changelog entries into one. diff --git a/debian/changelog b/debian/changelog index 2f2022d..9d31c48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,24 +1,10 @@ -xserver-xorg-video-ivtvdev (1.0.0~svn4027-1) unstable; urgency=low +xserver-xorg-video-ivtvdev (1.0.0~svn4049-1) unstable; urgency=low - * Import upstream subversion revision 4027. - - -- Ian Campbell [EMAIL PROTECTED] Sun, 26 Aug 2007 10:06:42 +0100 - -xserver-xorg-video-ivtvdev (0.10.8~svn3991-1) unstable; urgency=low
sponsored upload of ivtv
Hi David, Please could you sponsor another upload of xserver-xorg-video-ivtvdev. I didn't really want to upload an svn snapshot but unfortunately version 1.0.0~svn4049-1 is required to work with the version of the kernel driver which is now in the 2.6.22 kernel packages (#441275). I've uploaded source and binaries to http://www.hellion.org.uk/ivtv/debian/ and tagged the same in the git repo with xserver-xorg-video-ivtvdev-1.0.0.svn4049-1 (git-buildpackage seems to have squashed the ~ into a . for me). Many thanks, Ian. -- Ian Campbell Remember, if it's being done correctly, here or abroad, it's ___not the U.S. Army doing it! -- Good Morning VietNam -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xserver-xorg-video-ivtvdev-1.0.0.svn4049-1'
Tag 'xserver-xorg-video-ivtvdev-1.0.0.svn4049-1' created by Ian Campbell [EMAIL PROTECTED] at 2007-09-10 21:04 + Debian release 1.0.0~svn4049-1 Changes since xserver-xorg-video-ivtvdev-0.10.6-2: (no author) (1): New repository initialized by cvs2svn. David Nusinow (2): Prepare drivers for use with xserver 1.2, which has a new ABI (version 1.1) Merge branch 'xsfbs' into debian-experimental Ian Campbell (18): Merge commit 'origin/upstream-trunk' into debian-experimental Update packaging for new upstream revision Really commit updates for subversion trunk revision. Merge branch 'debian-unstable' into debian-experimental Remove inclusion of xf86ansic.h from drivers targetting Xorg 7.0. Bump version number. Merge branch 'upstream-trunk' into debian-experimental Updates for upstream r3991. Add .gitignore Merge branch 'upstream-trunk' into debian-experimental Updates for new upstream r4027 Update .gitignore Merge branch 'upstream-trunk' into debian-experimental Update changelog for r4049. Collapse multiple unreleased svn snapshot changelog Add a NEWS file noting the change in the driver name This new version fixed 441275 Remove blank entry from changelog Merge branch 'debian-experimental' into debian-unstable hverkuil (28): (John Harvey asked me to commit this) The resulting driver is capable of supporting both the new old API. Add missing file. From Ian Armstrong: Delete obsolete xc directory. Remove obsolete text from the README. When the ivtv X driver is loaded, it ensures the osd/framebuffer is switched Minor tweaks support for older ivtv versions as far back as 0.2. Update version to 1.0.0. Did some renaming, modified ivtv_compat.h to check for kernel = 2.6.22. Update Changelog file. Some cleanups. Fix spelling mistake. Fix -Wall compile warnings, remove obsolete TODO file. Introduce a small bug in the previous change. Fixed. Fix 64-bit compiler warnings. Cleanup. Add ivtv_xv.h, cleanup header guards and a few 'fbdev' leftovers. Re-added Imakefile for X11R6 support. Update README. Oops, shouldn't have renamed that option. Reverted that change. Fix breakage. Removed some dead code. Fix 64-bit compile problem. Add info on how to install the xorg-server-sdk package. Fix from Ian Armstrong fixing the bug I managed to introduce in the Imakefile. Put in correct licenses and (hopefully) correct copyrights. Add copyright Matthias (hope I've got this right) jharvey (1): Add software scaling for larger images than the 350 can cope with jpharvey (35): Initial revision V04 of the driver v05 of the driver version 06 of the driver uses ivtv installed header file probe tries to do ivtv specific ioctl to ensure we actually have an ivtv frame buffer clear out some gcc flags since they strict ansi doesnt work with ivtv header file use more standard pci card initialisation v0.7 changelog last minute change to Changelog use fbdev all the time 1st attempt a Xv support. Needs lots of tidying up workign version of xv support v0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelogv0.9 changelog try to cope with any screen size 0.9 version adding xv support 0.9 version layout change add xv support revert to correct version to ship ensure at least v 3.6.X ivtv make v 10.2 and test make NTSC work build correct files add notes for 0.10.1 0.10.2 increase version number to 0.10.5 add colorkey and autpaintcolorkey support add comments for 0.10.4 0.10.5 versions Change Region initisation code when compiling with XORG de_macro routines now just munge the correct amount of data move version to 0.10.6 added changes for 0.10.6 test Changes from Ian Armstrong (at last) remove redundant XF86ModuleVersionInfo and associated global variables. rename XF86ModuleData variable now that driver has been renamed so X finds it and loads the driver. --- .gitignore |4 COPYING | 12 ChangeLog | 39 Changelog | 47 Makefile.am |2 Makefile.in | 363 README | 26 aclocal.m4 | 3840 + autogen.sh | 12 config.sub |6 configure |13054 +++- configure.ac| 19
Bug#441275: [Pkg-mythtv-maintainers] Bug#441275: ivtv-source: ivtv-fb and the X driver ivtvdev don't work any more
On Sat, 2007-09-08 at 17:10 +0200, Jonas Meurer wrote: On 08/09/2007 Ian Campbell wrote: Hey, since I upgraded my kernel to 2.6.22, my Xserver doesn't start on TVout anymore. I don't know whether this is a bug in ivtv-fb or in the Xserver driver ivtvdev (I'm using 0.10.6-1). I have a sneaking suspicion you might need a newer Xserver driver. I've put some work-in-progress packages of the newer version 1.0.0~svn4027-1 at http://www.hellion.org.uk/ivtv/debian/ could you give them a go? You're correct. Thanks a lot. The new packages of ivtvdev fix this problem. Thanks, looks like I need finalise this new version and get it uploaded ASAP. This email should reassign the bug from ivtv-source to xserver-xorg-video-ivtv. Wonderful, ta! Ian. -- Ian Campbell Go to Heaven for the climate, Hell for the company. -- Mark Twain -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'upstream-trunk'
Changelog |9 README|6 configure.ac |8 src/Makefile.am |3 src/TODO |3 src/ivtv_xv.c | 1585 -- src/ivtvcompat.h | 77 src/ivtvdev.c | 945 +- src/ivtvdev.h | 29 src/ivtvhw.c | 1276 +++--- src/ivtvhw.h | 103 - xc/programs/Xserver/hw/xfree86/drivers/ivtv/Imakefile | 55 xc/programs/Xserver/hw/xfree86/drivers/ivtv/Makefile |6 xc/programs/Xserver/hw/xfree86/drivers/ivtv/TODO | 11 xc/programs/Xserver/hw/xfree86/drivers/ivtv/ivtv_xv.c | 994 --- xc/programs/Xserver/hw/xfree86/drivers/ivtv/ivtvdev.c | 605 -- xc/programs/Xserver/hw/xfree86/drivers/ivtv/ivtvdev.h | 17 xc/programs/Xserver/hw/xfree86/drivers/ivtv/ivtvhw.c | 819 - xc/programs/Xserver/hw/xfree86/drivers/ivtv/ivtvhw.h | 86 19 files changed, 2115 insertions(+), 4522 deletions(-) New commits: commit d6a3ad7ae2af80470d52e07ab1db0032e0cc418d Author: hverkuil [EMAIL PROTECTED] Date: Fri Aug 3 18:06:35 2007 + Remove obsolete text from the README. git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/README b/README index e8333e5..13fc4a1 100644 --- a/README +++ b/README @@ -1,9 +1,3 @@ -This version should now build and run with both new Xorg servers based on the 7.x -modular architecture. - -The source code is now in the src directory the old xc directory should be ignored -and will be removed soon. - Xorg 7.x Servers === commit 2ec471fbe0d82cd33e64fe81607417d215352040 Author: hverkuil [EMAIL PROTECTED] Date: Fri Aug 3 18:04:16 2007 + Delete obsolete xc directory. git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ivtv/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/ivtv/Imakefile deleted file mode 100644 index 6701ff3..000 --- a/xc/programs/Xserver/hw/xfree86/drivers/ivtv/Imakefile +++ /dev/null @@ -1,55 +0,0 @@ -XCOMM -XCOMM This is an Imakefile for the fbdev driver. -XCOMM -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/Imakefile,v 1.10 2001/04/06 18:16:30 dawes Exp $ -#undef DefaultCCOptions -#define DefaultCCOptions -#define IHaveModules -#include Server.tmpl - -SRCS = ivtvdev.c ivtvhw.c ivtv_xv.c -OBJS = ivtvdev.o ivtvhw.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(ivtvdev,$(OBJS)) - -InstallObjectModule(ivtvdev,$(MODULEDIR),drivers) - - -DependTarget() - -InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/ivtvdev) -InstallDriverSDKNonExecFile(ivtvdev.c,$(DRIVERSDKDIR)/drivers/ivtvdev) - -InstallDriverSDKObjectModule(ivtvdev,$(DRIVERSDKMODULEDIR),drivers) diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ivtv/Makefile b/xc/programs/Xserver/hw/xfree86/drivers/ivtv/Makefile deleted file mode 100644 index a4d5ecf..000 --- a/xc/programs/Xserver/hw/xfree86/drivers/ivtv/Makefile +++ /dev/null @@ -1,6 +0,0 @@ - - -all: - echo Run xmkmf /PATH_TO_X_SOURCE/ - - diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ivtv/TODO b/xc/programs/Xserver/hw/xfree86/drivers/ivtv/TODO deleted file mode 100644 index 6a04e20..000 --- a/xc/programs/Xserver/hw/xfree86/drivers/ivtv/TODO +++ /dev/null @@ -1,11 +0,0 @@ - DONE write to 82c registers from driver - DONE open /dev/video0 if 48 returns ENODEV and check id. - DONE Try to fail sensibly in PutImage - DONE define better structure for ioctl - DONE Buffer allocation for stream in driver - DONE Compiler warnings - DONE Apply to latest ivtv source - DONE
xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'
.gitignore| 10
Changelog |9
README|6
configure.ac |8
debian/changelog |8
debian/patches/configure-correct-version |12142 ++
debian/patches/remove-xf86_ansic.h| 25
debian/patches/series |1
src/Makefile.am |3
src/TODO |3
src/ivtv_xv.c | 1585 +-
src/ivtvcompat.h | 77
src/ivtvdev.c | 945 -
src/ivtvdev.h | 29
src/ivtvhw.c | 1276 +
src/ivtvhw.h | 103
xc/programs/Xserver/hw/xfree86/drivers/ivtv/Imakefile | 55
xc/programs/Xserver/hw/xfree86/drivers/ivtv/Makefile |6
xc/programs/Xserver/hw/xfree86/drivers/ivtv/TODO | 11
xc/programs/Xserver/hw/xfree86/drivers/ivtv/ivtv_xv.c | 994 -
xc/programs/Xserver/hw/xfree86/drivers/ivtv/ivtvdev.c | 605
xc/programs/Xserver/hw/xfree86/drivers/ivtv/ivtvdev.h | 17
xc/programs/Xserver/hw/xfree86/drivers/ivtv/ivtvhw.c | 819 -
xc/programs/Xserver/hw/xfree86/drivers/ivtv/ivtvhw.h | 86
24 files changed, 14295 insertions(+), 4528 deletions(-)
New commits:
commit 7731fbd49b107416bc93623ca4c33282c7f3251f
Author: Ian Campbell [EMAIL PROTECTED]
Date: Sun Aug 12 15:11:37 2007 +0100
Add .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..b3548cd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+.pc
+stampdir
+patches
+debian/tmp
+debian/files
+debian/*.substvars
+debian/xserver-xorg-video-ivtv
+obj-*
+*~
+build-stamp
commit a7d9434c6b3865eab8e76889beff9d0814fc3ef0
Author: Ian Campbell [EMAIL PROTECTED]
Date: Sun Aug 12 15:07:35 2007 +0100
Updates for upstream r3991.
Fixed version in configure (should be 0.10.8 not 0.3.1).
Updated remove-xf86-ansic.h patch to fix build.
diff --git a/debian/changelog b/debian/changelog
index f690fb8..6609fd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-ivtvdev (0.10.8~svn3991-1) unstable; urgency=low
+
+ * Import upstream subversion revision 3991.
+ * correct upstream version in configure{,.ac} (0.3.1=0.10.8)
+ * Switch to using ~ for svn revision so they sort correctly.
+
+ -- Ian Campbell [EMAIL PROTECTED] Sun, 12 Aug 2007 14:50:02 +0100
+
xserver-xorg-video-ivtvdev (0.10.6+svn3805-1) UNRELEASED; urgency=low
* Imported upstream subversion revision 3805.
diff --git a/debian/patches/configure-correct-version
b/debian/patches/configure-correct-version
new file mode 100644
index 000..8828d02
--- /dev/null
+++ b/debian/patches/configure-correct-version
@@ -0,0 +1,12142 @@
+diff --git a/configure b/configure
+index a52860a..1b88349 100755
+--- a/configure
b/configure
+@@ -1,27 +1,56 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59 for xf86-video-ivtdev 0.3.1.
++# Generated by GNU Autoconf 2.61 for xf86-video-ivtdev 0.10.8.
+ #
+ # Report bugs to http://ivtvdriver.org/trac.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## - ##
+ ## M4sh Initialization. ##
+ ## - ##
+
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n ${ZSH_VERSION+set} (emulate sh) /dev/null 21; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+$@}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+$@}'='$@'
+-elif test -n ${BASH_VERSION+set} (set -o posix) /dev/null 21; then
+- set -o posix
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2/dev/null` in
++ *posix*) set -o posix ;;
++esac
++
++fi
++
++
++
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test ${PATH_SEPARATOR+set} != set; then
++ echo #! /bin/sh conf$$.sh
++ echo exit 0 conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH=/nonexistent;.; conf$$.sh) /dev/null 21; then
++PATH_SEPARATOR=';'
++ else
++PATH_SEPARATOR=:
++ fi
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
.gitignore | 10 ++ debian/changelog | 10 -- 2 files changed, 18 insertions(+), 2 deletions(-) New commits: commit d7a09290d6088baf5a3dc629eae479f1567ad7e2 Author: Ian Campbell [EMAIL PROTECTED] Date: Wed May 30 20:24:17 2007 +0100 Bump version number. diff --git a/debian/changelog b/debian/changelog index a25f799..a006792 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-ivtvdev (0.10.6-3) UNRELEASED; urgency=low + + * UNRELEASED + + -- Ian Campbell [EMAIL PROTECTED] Wed, 30 May 2007 20:23:53 +0100 + xserver-xorg-video-ivtvdev (0.10.6-2) unstable; urgency=low [ David Nusinow ] commit 01ad2f29e57fe693687a5d8f4f8c741ebf7ea9a2 Author: Ian Campbell [EMAIL PROTECTED] Date: Wed May 30 20:14:04 2007 +0100 Prepare for release. diff --git a/debian/changelog b/debian/changelog index 1b087ea..a25f799 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-ivtvdev (0.10.6-2) UNRELEASED; urgency=low +xserver-xorg-video-ivtvdev (0.10.6-2) unstable; urgency=low [ David Nusinow ] * Bump server version requirement to use newer server so that reportbug @@ -13,7 +13,7 @@ xserver-xorg-video-ivtvdev (0.10.6-2) UNRELEASED; urgency=low - Added XS-Vcs-* * Bumped standards version - -- Ian Campbell [EMAIL PROTECTED] Tue, 20 Feb 2007 22:09:22 + + -- Ian Campbell [EMAIL PROTECTED] Wed, 30 May 2007 20:13:22 +0100 xserver-xorg-video-ivtvdev (0.10.6-1) unstable; urgency=low commit 7638124011089d5b0d212a761cd752b0bbff949e Author: Ian Campbell [EMAIL PROTECTED] Date: Sun May 27 14:26:15 2007 +0100 Add .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..8ab6bb4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +.pc +stampdir +patches +debian/tmp +debian/files +debian/*.substvars +debian/xorg-xserver-video-ivtv +obj-* +*~ +build-stamp -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xserver-xorg-video-ivtvdev-0.10.6-2'
Tag 'xserver-xorg-video-ivtvdev-0.10.6-2' created by Ian Campbell [EMAIL PROTECTED] at 2007-05-30 19:18 + Debian release 0.10.6-2 Changes since xserver-xorg-video-ivtvdev-0.10.6-1: Branden Robinson (4): Set svn:keywords property to Id (keyword already present). Note probable out-of-dateness of maplink() function body. Add high-level documentation to XSFBS shell library, intended to reduce Test for existence of debian/patches directory before creating a symlink to it. David Nusinow (13): Move xsfbs back to its rightful place Make us error out if we call patch and don't have quilt installed Fix the last commit and fix spelling error. Thanks Brice Goglin for the spelling catch. Fix for bug #371152. Thanks Joey Hess. Pull patches from ubuntu for ARCHITECTURE, LAPTOP, RECONFIGURE, FIRSTINST, and UPGRADE variables * Bump server version requirement to use newer server so that reportbug Move the files so they'll be put in debian/xsfbs automatically when pulled Merge branch 'xsfbs' into debian-unstable Update serverabi generation to also account for driver Provides Fix name of serverminver Add support for X server input ABI versioning Fix typo that prevented the input abi versioning from working. Fix one missed bit from the serverabiver - serverminver rename Ian Campbell (8): Fix #406032 by including linux/types.h for linux/ivtv.h Imported X.org 7.0 compatible fork from http://www.mit.edu/~je18337/ivtvdev Merge branch 'upstream-xorg-7-fork' of ../imported-xorg-7-branch into debian-unstable Merge git+ssh://alioth.debian.org/git/pkg-xorg/xsfbs into debian-unstable Miscellaneous fixes to debian/control suggested by Brice Goglin Call serverabi from binary-arch so auto provides and depends work. Add .gitignore Prepare for release. Julien Cristau (2): Add new serverabi rule to generate drivers dependency on the server. Fix copy/paste typo in the input driver provides. --- .gitignore | 10 debian/changelog| 17 debian/control | 10 debian/patches/01_include_linux_types_h | 12 debian/patches/series |1 debian/rules|2 debian/xsfbs/xsfbs-autoreconf.mk| 150 + debian/xsfbs/xsfbs.mk | 379 + debian/xsfbs/xsfbs.sh | 907 9 files changed, 1483 insertions(+), 5 deletions(-) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'
debian/changelog | 13 -
debian/control | 10 ++
debian/patches/remove-xf86_ansic.h | 24
debian/patches/series |1 +
debian/rules |2 +-
debian/xsfbs/xsfbs.mk | 28
6 files changed, 68 insertions(+), 10 deletions(-)
New commits:
commit bc5e8861cca5fb3876a9cc5f6fb4439f9bdfc866
Author: Ian Campbell [EMAIL PROTECTED]
Date: Wed May 2 07:11:33 2007 +0100
Remove inclusion of xf86ansic.h from drivers targetting Xorg 7.0.
diff --git a/debian/changelog b/debian/changelog
index 4b148e1..f690fb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-ivtvdev (0.10.6+svn3805-1) UNRELEASED;
urgency=low
* Imported upstream subversion revision 3805.
* Patch 00_xorg_7_1 is no longer required.
+ * The xf86_ansic.h header is no longer required.
-- Ian Campbell [EMAIL PROTECTED] Wed, 28 Mar 2007 22:05:43 +0100
diff --git a/debian/patches/remove-xf86_ansic.h
b/debian/patches/remove-xf86_ansic.h
new file mode 100644
index 000..76d5767
--- /dev/null
+++ b/debian/patches/remove-xf86_ansic.h
@@ -0,0 +1,24 @@
+Index: xserver-xorg-video-ivtvdev.git/src/ivtvdev.c
+===
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtvdev.c 2007-05-02
06:29:59.0 +0100
xserver-xorg-video-ivtvdev.git/src/ivtvdev.c 2007-05-02
06:43:40.0 +0100
+@@ -13,7 +13,6 @@
+ /* all driver need this */
+ #include xf86.h
+ #include xf86_OSproc.h
+-#include xf86_ansic.h
+
+ #include mipointer.h
+ #include mibstore.h
+Index: xserver-xorg-video-ivtvdev.git/src/ivtvhw.c
+===
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtvhw.c 2007-05-02
06:29:59.0 +0100
xserver-xorg-video-ivtvdev.git/src/ivtvhw.c2007-05-02
06:47:45.0 +0100
+@@ -5,7 +5,6 @@
+ /* all driver need this */
+ #include xf86.h
+ #include xf86_OSproc.h
+-#include xf86_ansic.h
+
+ /* pci stuff */
+ #include xf86PciInfo.h
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..2256471 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove-xf86_ansic.h
commit a7e9ebfa148f6f0722ce405887f733864963dc0d
Author: Ian Campbell [EMAIL PROTECTED]
Date: Wed May 2 05:52:12 2007 +0100
Call serverabi from binary-arch so auto provides and depends work.
diff --git a/debian/rules b/debian/rules
index a1b28c4..d96501a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE) $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build install serverabi
dh_testdir
dh_testroot
commit 5c96e853347a5f3130c9ba5e0d4ebeebe9e0a2a3
Author: Ian Campbell [EMAIL PROTECTED]
Date: Wed May 2 05:44:03 2007 +0100
Miscellaneous fixes to debian/control suggested by Brice Goglin
diff --git a/debian/changelog b/debian/changelog
index 460abeb..1b087ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ xserver-xorg-video-ivtvdev (0.10.6-2) UNRELEASED; urgency=low
[ 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 [EMAIL PROTECTED] Tue, 20 Feb 2007 22:09:22 +
diff --git a/debian/control b/debian/control
index 7a10bf5..ba659c9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,15 @@ Section: contrib/x11
Priority: extra
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Uploaders: David Nusinow [EMAIL PROTECTED], Ian Campbell [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (=
2:1.1.1-1), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, ivtv-utils
-Standards-Version: 3.7.2
+Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (=
2:1.2.99.902), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, ivtv-utils
+Standards-Version: 3.7.2.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ivtvdev
+XS-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}, xserver-xorg-core (= 2:1.1.1-11)
-Provides: xserver-xorg-video-1.0
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Provides
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog |6 ++
debian/control| 10 ++
debian/rules |2 +-
debian/xsfbs/xsfbs.mk | 28
4 files changed, 37 insertions(+), 9 deletions(-)
New commits:
commit a7e9ebfa148f6f0722ce405887f733864963dc0d
Author: Ian Campbell [EMAIL PROTECTED]
Date: Wed May 2 05:52:12 2007 +0100
Call serverabi from binary-arch so auto provides and depends work.
diff --git a/debian/rules b/debian/rules
index a1b28c4..d96501a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE) $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build install serverabi
dh_testdir
dh_testroot
commit 5c96e853347a5f3130c9ba5e0d4ebeebe9e0a2a3
Author: Ian Campbell [EMAIL PROTECTED]
Date: Wed May 2 05:44:03 2007 +0100
Miscellaneous fixes to debian/control suggested by Brice Goglin
diff --git a/debian/changelog b/debian/changelog
index 460abeb..1b087ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ xserver-xorg-video-ivtvdev (0.10.6-2) UNRELEASED; urgency=low
[ 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 [EMAIL PROTECTED] Tue, 20 Feb 2007 22:09:22 +
diff --git a/debian/control b/debian/control
index 7a10bf5..ba659c9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,15 @@ Section: contrib/x11
Priority: extra
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Uploaders: David Nusinow [EMAIL PROTECTED], Ian Campbell [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (=
2:1.1.1-1), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, ivtv-utils
-Standards-Version: 3.7.2
+Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (=
2:1.2.99.902), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, ivtv-utils
+Standards-Version: 3.7.2.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ivtvdev
+XS-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}, xserver-xorg-core (= 2:1.1.1-11)
-Provides: xserver-xorg-video-1.0
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver: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
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson [EMAIL PROTECTED](none)
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to
it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau [EMAIL PROTECTED]
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver
2/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
0 files changed New commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'upstream-xorg-7-fork'
New branch 'upstream-xorg-7-fork' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-ivtvdev: Changes to 'upstream-trunk'
New branch 'upstream-trunk' available with the following commits: commit b5da45de984bd5f0c6a4d02ba5dc4edf4ad3c438 Author: hverkuil [EMAIL PROTECTED] Date: Sat Feb 17 13:21:08 2007 + (John Harvey asked me to commit this) First version of driver following source code re-organisation. Should now build with both 7.x Xorg servers older ones. README contains very simple instructions for now. Still need several patches to be merged before releasing properly. git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 99a19a93c24170e92d9fa4c8f492db85ea46bcb7 Author: jharvey [EMAIL PROTECTED] Date: Sat Oct 1 20:46:44 2005 + Add software scaling for larger images than the 350 can cope with git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 10e7d7744402ec21d1541661f57bdb4514257d1a Author: jpharvey [EMAIL PROTECTED] Date: Wed Aug 31 07:25:01 2005 + added changes for 0.10.6 git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit f434342ca093d82806834f222068dc087eb2a429 Author: jpharvey [EMAIL PROTECTED] Date: Tue Aug 30 20:37:24 2005 + move version to 0.10.6 git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit adcfae8acb11eef3539893dea52719032c0bf5c7 Author: jpharvey [EMAIL PROTECTED] Date: Tue Aug 30 20:36:55 2005 + de_macro routines now just munge the correct amount of data REGION_INIT works for xorg as well as XFree git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 18cd4c3c0184843ef509c833e20427bf95601dae Author: jpharvey [EMAIL PROTECTED] Date: Tue Aug 30 19:55:40 2005 + Change Region initisation code when compiling with XORG git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 951422e9fff4b3f40935edd8515818eee91983b7 Author: jpharvey [EMAIL PROTECTED] Date: Mon Jul 18 21:01:56 2005 + add comments for 0.10.4 0.10.5 versions git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit da58793dba97ba3c03d0c6a0724643c8f3e3f8c7 Author: jpharvey [EMAIL PROTECTED] Date: Mon Jul 18 21:01:03 2005 + add colorkey and autpaintcolorkey support git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 26515a4a3467045c52ac0b1b72d287d0184e500b Author: jpharvey [EMAIL PROTECTED] Date: Mon Jul 18 21:00:40 2005 + increase version number to 0.10.5 git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit b017283344219f02c27d346dc739db93b79eb5cc Author: jpharvey [EMAIL PROTECTED] Date: Sun Jun 12 21:17:40 2005 + add notes for 0.10.1 0.10.2 git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 99fbcfd6909b6a5423aca1dd6b0f03e87c160dd5 Author: jpharvey [EMAIL PROTECTED] Date: Sun Jun 12 21:05:48 2005 + build correct files git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit b3c842b45047728696a2063aec63fe5564db8ab7 Author: jpharvey [EMAIL PROTECTED] Date: Sun Jun 12 21:05:15 2005 + make NTSC work allows ivtv to do scaling by providing more correct information git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 6dad2f26c685bab5a7ffa1ec59317948ed991202 Author: jpharvey [EMAIL PROTECTED] Date: Sun Jun 12 21:04:12 2005 + make v 10.2 and test git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 19b2129f062694e782742f256bef507de272da56 Author: jpharvey [EMAIL PROTECTED] Date: Sun Jun 12 21:03:21 2005 + ensure at least v 3.6.X ivtv fix screen update fix device probing git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit a71b7229dee6eedae7459b67e8943fd25e240a5c Author: jpharvey [EMAIL PROTECTED] Date: Sun May 15 19:45:16 2005 + revert to correct version to ship git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit 77b9ae06dada723ea385c6dd4dd97a647e167407 Author: jpharvey [EMAIL PROTECTED] Date: Sun May 15 19:40:57 2005 + add xv support code tidy up git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d commit
xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'
debian/changelog |7 +++ debian/patches/series |1 - debian/rules |2 +- debian/xserver-xorg-video-ivtv.install |1 - 4 files changed, 8 insertions(+), 3 deletions(-) New commits: commit 1e5f922a30a1f2168051a15ed82de232a56b995d Author: Ian Campbell [EMAIL PROTECTED] Date: Wed Mar 28 22:13:55 2007 +0100 Really commit updates for subversion trunk revision. diff --git a/debian/changelog b/debian/changelog index a337220..1eb02a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-ivtvdev (0.10.6+svn3805-1) UNRELEASED; urgency=low + + * Imported upstream subversion revision 3805. + * Patch 00_xorg_7_1 is no longer required. + + -- Ian Campbell [EMAIL PROTECTED] Wed, 28 Mar 2007 22:05:43 +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 diff --git a/debian/patches/series b/debian/patches/series index ae0a0a9..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -00_xorg_7_1 diff --git a/debian/rules b/debian/rules index a1b28c4..6f09df5 100755 --- a/debian/rules +++ b/debian/rules @@ -74,7 +74,7 @@ binary-arch: build install dh_testroot dh_installdocs - dh_installchangelogs ChangeLog + dh_installchangelogs Changelog dh_install --sourcedir=debian/tmp --list-missing dh_link dh_strip diff --git a/debian/xserver-xorg-video-ivtv.install b/debian/xserver-xorg-video-ivtv.install index 614cfb4..daf7bfe 100644 --- a/debian/xserver-xorg-video-ivtv.install +++ b/debian/xserver-xorg-video-ivtv.install @@ -1,2 +1 @@ usr/lib/xorg/modules/drivers/*.so -usr/share/man/man4/* -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: upload of xserver-xorg-video-ivtvdev.git
On Wed, 2007-02-21 at 08:41 +, Ian Campbell wrote: Hi David, I've just pushed a fix for #406032 (FTBFS on a bunch of architectures) to xserver-xorg-video-ivtvdev.git. Thanks to whoever added me to pkg-xorg on alioth which allowed this. Would you mind doing an upload? I don't want to pester but would it be possible to upload the new ivtv X driver? If there's anything I can do to make your life easier please just shout. I'm assuming that it is simply a matter of running git-buildpackage but if you'd prefer me to generate a .diff/.dsc etc and put them somewhere I'd be happy to. Thanks, Ian. -- Ian Campbell It's a trackball for one so it's not a rodent it's a turd with a ball sticking out which you fondle constantly signature.asc Description: This is a digitally signed message part
Re: upload of xserver-xorg-video-ivtvdev.git
On Wed, 2007-02-21 at 10:57 +0100, Julien Cristau wrote: On Wed, Feb 21, 2007 at 10:23:08 +0100, Peter Baumann wrote: This should work. (But better try it out with a _copy_ of your repo. I don't know if this is the _correct_ way to do this. If someone knows a quicker/better way, please tell me) cd xserver-xorg-video-ivtvdev git checkout -b upstream # create the upstream branch : .git/refs/heads/upstream # remove the sha1 from the # upstream branch git-ls-files -z|xargs -0 rm # remove every tracked file # now remove everything which is left (objects, ignored files, etc.) rm .git/index # remove the index tar -xvzf upstream.tar.gz # unpack upstream into current directory git add . # add everything git commit The way I did it (for xterm) was something like this: $ git-clone git://git.debian.org/git/pkg-xorg/app/xterm $ tar zxf xterm-223.tar.gz $ cp -a xterm/.git xterm-223/ $ cd xterm-223 $ echo refs/heads/upstream .git/HEAD For the benefit of the archives this should be $ echo ref: refs/heads/upstream .git/HEAD $ rm .git/index $ git-add . $ git-commit This is from my memory, so I may have forgotten a step, but some use of git-status along the way might help you check this :) I guess that also doesn't qualify as a correct way to do it... Thanks guys. I managed to get one of the upstream branches imported using the above. The other upstream is an svn repo which I'd like to launder through git-svn which is going to take a little more experimentation... Cheers, Ian. -- Ian Campbell Fascinating is a word I use for the unexpected. -- Spock, The Squire of Gothos, stardate 2124.5 signature.asc Description: This is a digitally signed message part
xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog|6 +- debian/patches/01_include_linux_types_h | 12 debian/patches/series |1 + 3 files changed, 18 insertions(+), 1 deletion(-) New commits: commit b12324ef355c75d38e3e022f9cb2719db9349160 Author: Ian Campbell [EMAIL PROTECTED] Date: Tue Feb 20 22:48:59 2007 + Fix #406032 by including linux/types.h for linux/ivtv.h diff --git a/debian/changelog b/debian/changelog index 3f36452..460abeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ 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 - -- David Nusinow [EMAIL PROTECTED] Sat, 18 Nov 2006 20:41:59 -0500 + [ Ian Campbell ] + * Include linux/types.h in ivtvhw.h. (Closes: #406032) + + -- Ian Campbell [EMAIL PROTECTED] Tue, 20 Feb 2007 22:09:22 + xserver-xorg-video-ivtvdev (0.10.6-1) unstable; urgency=low diff --git a/debian/patches/01_include_linux_types_h b/debian/patches/01_include_linux_types_h new file mode 100644 index 000..b896551 --- /dev/null +++ b/debian/patches/01_include_linux_types_h @@ -0,0 +1,12 @@ +Index: xserver-xorg-video-ivtvdev.git/src/ivtvhw.h +=== +--- xserver-xorg-video-ivtvdev.git.orig/src/ivtvhw.h 2007-02-20 22:07:45.0 + xserver-xorg-video-ivtvdev.git/src/ivtvhw.h2007-02-20 22:08:05.0 + +@@ -7,6 +7,7 @@ + #include asm/ioctl.h + #undef __STRICT_ANSI__ + #include inttypes.h ++#include linux/types.h + #include linux/ivtv.h + + #define FBDEVHW_PACKED_PIXELS 0 /* Packed Pixels*/ diff --git a/debian/patches/series b/debian/patches/series index ae0a0a9..a078662 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 00_xorg_7_1 +01_include_linux_types_h -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
upload of xserver-xorg-video-ivtvdev.git
Hi David, I've just pushed a fix for #406032 (FTBFS on a bunch of architectures) to xserver-xorg-video-ivtvdev.git. Thanks to whoever added me to pkg-xorg on alioth which allowed this. Would you mind doing an upload? The repo doesn't seem to have an upstream branch (presumably because upstream isn't x.org). What's the best way to create one do you think? Perhaps something roughly like: git branch upstream rm -rf debian git commit Is there some way to create a completely empty branch rather than one parented off debian-unstable? Then I could just import the pristine upstream source into that and merge it into debian-unstable? The package currently uses a fork of upstream with X.org 7 support but I'm hoping to switch to the svn trunk at some point. Would creating two branches be acceptable/necessary? i.e. upstream-xorg-7-fork and upstream-trunk. I'd quite like to switch the debian-experiment branch over to upstream-trunk. Cheers, Ian. -- Ian Campbell One man tells a falsehood, a hundred repeat it as true. signature.asc Description: This is a digitally signed message part
Bug#406032: xserver-xorg-video-ivtvdev_0.10.6-1(ia64/unstable): FTBFS: bad includes?
There was an error while trying to autobuild your package: Sorry, I missed the original email report of this bug somehow. I'll look into it. Ian. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: IVTV X driver
Reply from the list archive, sorry if I break threading. I've subscribed to debian-x now though... David Nusinow: Sorry I took so long. I've been insanely busy with real life stuff lately. I don't know if you saw, but I made a few minor adjustments to the packaging to bring it in line with the current driver packages. Your work looked great though, so I've gone ahead and uploaded it to unstable. Now we just have to wait for it to get approved by ftpmaster, at which point it enters the archive and we don't have to worry about delays when we upload. Let me know if you need anything else, and in case I didn't mention it before, welcome to the XSF! Excellent stuff, thanks very much! Ian. -- Ian Campbell I fear explanations explanatory of things explained. signature.asc Description: This is a digitally signed message part
Re: IVTV X driver
Hi David, Are you still happy to sponsor the IVTV X driver? Is there anything you'd like me to do to make things easier for you? For example with my other package my sponsor just takes them direct from SVN but it looks like it is a bit more work for X modules since there are a few more manual steps so if you would like me to put together a .dsc/.diff.gz/.orig.tar.gz set I'm happy to do that. Cheers, Ian. On Thu, 2006-11-02 at 07:31 +, Ian Campbell wrote: Hi David, After a bit of hacking I finally got the ivtv X driver to work with X.org 7.1. The dev community have been kicking the tyres for about a week now and it seemed to work fine for everyone who tried it so I think it is ready for unstable. I've checked everything in to SVN in driver/xserver-xorg-video-ivtvdev. Currently this includes the X.org 7.1 patch but upstream has told me they will look at merging it. That might take a while though, he needs to upgrade from some ancient version of X first, so I'd rather ship the patched version for now. Thanks, Ian. -- Ian Campbell Every successful person has had failures but repeated failure is no guarantee of eventual success. signature.asc Description: This is a digitally signed message part
IVTV X driver
Hi David, After a bit of hacking I finally got the ivtv X driver to work with X.org 7.1. The dev community have been kicking the tyres for about a week now and it seemed to work fine for everyone who tried it so I think it is ready for unstable. I've checked everything in to SVN in driver/xserver-xorg-video-ivtvdev. Currently this includes the X.org 7.1 patch but upstream has told me they will look at merging it. That might take a while though, he needs to upgrade from some ancient version of X first, so I'd rather ship the patched version for now. Thanks, Ian. -- Ian Campbell It's not? Are you saying that you SHOULD allow people (other than William Wallace) to shoot lightning bolts from their arse? -- Seth Galbraith signature.asc Description: This is a digitally signed message part
Re: debian ivtv driver
Hi, I've added debian-x to the cc since others may be interested in my response. (I typo'd the list address first time round, sorry for the second copy you may receive) On Thu, 2006-10-05 at 02:58 +, Dhaval Patel wrote: Hi Ian, I saw your post on the Debian list at http://www.mail-archive.com/debian-x@lists.debian.org/msg50668.html and installed your package on my Debian testing system with the current xorg and 0.7x driver. I am trying to use the TV out of my pvr-350 card via a s-video cable. Unfortunately the picture is not like it used to be with the older Xorg and 0.4x ivtv driver. It is difficult to describe but the colors are not accurate and the picture is not smooth (the blue gradient background has diagonal lines all over it like XXX). I wonder if you have seen this problem before. Perhaps it is because you are complining for a different xorg or ivtv driver? I'm not sure about testing but in unstable the driver doesn't work at all due to incompatibilities with X.org 7.1 (testing still has 7.0). http://www.gossamer-threads.com/lists/ivtv/devel/32242 I've just committed what I've got to the XSF SVN but if there are any experienced X hackers about who could give any tips about getting it working I'd appreciate the help. When I first created the package it was against 7.0 which was still the version in unstable at the time. I'm not sure what is wrong in your case, the actual .c files in the X driver haven't changed compared to the old modular build, just the build system. Did you also upgrade the kernel driver? Ian. -- Ian Campbell Ogden's Law: The sooner you fall behind, the more time you have to catch up. signature.asc Description: This is a digitally signed message part
Re: Ivtv X driver
On Thu, 2006-09-28 at 22:50 -0400, David Nusinow wrote: Sorry I've been so busy this week myself. Please feel free to check in your driver and I'll check it over. If it all looks good, I can sponsor the upload for you as well. Brilliant, thanks. Hopefully I didn't miss all your free time this week! No worries, turns out this week was busier than I was expecting (damn deadlines ;-)). I've got some time over the weekend though. Cheers, Ian. -- Ian Campbell I want a WESSON OIL lease!! signature.asc Description: This is a digitally signed message part
Ivtv X driver
Hi David, I gather that you took off on a house move the day I sent this first time so I guess you missed it. I hope the move went relatively smoothly! I'm flying back from the travels I mention below tomorrow so I hope to have some spare time next week to work on this. Cheers, Ian. Original message: Hi David, You suggested that you wouldn't mind sponsoring my IVTV X driver packages. Branden has setup my access to the XSF SVN repository but I thought I'd just confirm everything laid out right before I started checking stuff in... I've appended some details of where the files will end up, if that's ok I'll check them in. I've also stuck the packages on my website if you'd like to look them over. You can find them at http://www.hellion.org.uk/ivtv/debian/. If anyone else fancies having a test please feel free. I'm away all weekend and travelling next week so there's no rush... Cheers Ian. $ pwd /home/ijc/development/debian/pkg-xorg/driver/xserver-xorg-video-ivtvdev $ svn info Path: . URL: svn+ssh://necrotic.deadbeast.net/var/lib/svn/xorg-x11/trunk/driver/xserver-xorg-video-ivtvdev Repository Root: svn+ssh://necrotic.deadbeast.net/var/lib/svn/xorg-x11 Revision: 0 Node Kind: directory Schedule: add $ svn status A . A mkinstalldirs A configure A Makefile.in X debian/xsfbs A debian A debian/control A debian/compat A debian/changelog A debian/copyright A debian/rules A debian/xserver-xorg-video-ivtv.install A src A src/Makefile.in A src/configure.ac A src/TODO A src/ivtv_xv.c A src/ivtvdev.c A src/ivtvhw.c A src/Makefile.am A src/ivtvdev.h A src/ivtvhw.h A ChangeLog A depcomp A config.guess A config.sub A ltmain.sh A config.h.in A configure.ac A COPYING A missing A Makefile.am A man A man/ivtvdev.man A man/Makefile.in A man/Makefile.am A aclocal.m4 A install-sh Performing status on external item at 'debian/xsfbs' -- Ian Campbell my program works if i take out the bugs. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Ivtv X driver
Hi David, You suggested that you wouldn't mind sponsoring my IVTV X driver packages. Branden has setup my access to the XSF SVN repository but I thought I'd just confirm everything laid out right before I started checking stuff in... I've appended some details of where the files will end up, if that's ok I'll check them in. I've also stuck the packages on my website if you'd like to look them over. You can find them at http://www.hellion.org.uk/ivtv/debian/. If anyone else fancies having a test please feel free. I'm away all weekend and travelling next week so there's no rush... Cheers Ian. $ pwd /home/ijc/development/debian/pkg-xorg/driver/xserver-xorg-video-ivtvdev $ svn info Path: . URL: svn+ssh://necrotic.deadbeast.net/var/lib/svn/xorg-x11/trunk/driver/xserver-xorg-video-ivtvdev Repository Root: svn+ssh://necrotic.deadbeast.net/var/lib/svn/xorg-x11 Revision: 0 Node Kind: directory Schedule: add $ svn status A . A mkinstalldirs A configure A Makefile.in X debian/xsfbs A debian A debian/control A debian/compat A debian/changelog A debian/copyright A debian/rules A debian/xserver-xorg-video-ivtv.install A src A src/Makefile.in A src/configure.ac A src/TODO A src/ivtv_xv.c A src/ivtvdev.c A src/ivtvhw.c A src/Makefile.am A src/ivtvdev.h A src/ivtvhw.h A ChangeLog A depcomp A config.guess A config.sub A ltmain.sh A config.h.in A configure.ac A COPYING A missing A Makefile.am A man A man/ivtvdev.man A man/Makefile.in A man/Makefile.am A aclocal.m4 A install-sh Performing status on external item at 'debian/xsfbs' -- Ian Campbell my program works if i take out the bugs. signature.asc Description: This is a digitally signed message part
Re: Source package naming
On Wed, 2006-08-23 at 18:12 +, David Nusinow wrote: We're not currently on alioth. We'll be moving to git there early in the post-etch cycle, but if you want access to our current svn, you need to write Branden Robinson with your public ssh key. I'll add you to our alioth project though so you'll have access to the git repo when the time comes. Thanks, I've written to Branden. I'm away over the weekend but I'll attempt to get something committed next week. Ian. -- Ian Campbell Whom the mad would destroy, first they make Gods. -- Bernard Levin signature.asc Description: This is a digitally signed message part
Re: Source package naming
(Please continue to CC me) On Wed, 2006-08-23 at 00:12 +0300, Daniel Stone wrote: On Tue, Aug 22, 2006 at 08:45:21PM +0100, Ian Campbell wrote: Is there a particular reason for this? I've tried searching the debian-x archives but I can't see it. Purely historical reasons: the binary package is named xserver-xorg-video-foo to have a clear lineage from xserver-xorg. OK, thanks for the info. David Nusinow wrote, in a message he forgot to CC me on ;-) I have xf86-video-ivtvdev_0.10.6.orig.tar.gz and I'm wondering if I should repack/rename it before upload (well, before searching for a sponsor ;-)). Don't bother repacking it. Just rename it. I can sponsor the driver if you're interested. If you want to bring the package under the maintainership of the XSF with you as the primary uploader[1], you're more than welcome to do so. Just let us know. I'm currently maintaining the kernel side of things under pkg-mythtv on Alioth but I think for this package it makes more sense to integrate it with the XSF than pkg-mythtv so I'll take you up on that kind offer. My username on alioth is ijc-guest, do you need anything else from me? ssh key perhaps? Thanks, Ian. -- Ian Campbell Most public domain software is free, at least at first glance. signature.asc Description: This is a digitally signed message part
Source package naming
Hi, Please CC me -- I am not subscribed. I am in the process of packaging the X driver for the IVTV cards[0] and I'm wondering about the correct source package name. It seems that the upstream source is named xf86-video-FOO[1] and that is repacked for Debian as xserver-xorg-video-FOO[2]. Is there a particular reason for this? I've tried searching the debian-x archives but I can't see it. I have xf86-video-ivtvdev_0.10.6.orig.tar.gz and I'm wondering if I should repack/rename it before upload (well, before searching for a sponsor ;-)). In any case the binary package will be xserver-xorg-video-ivtv as you would expect. Thanks for your advice, Ian. [0] http://www.ivtvdriver.org. the kernel side is already in Debian in the ivtv package http://packages.qa.debian.org/i/ivtv.html [1] http://xorg.freedesktop.org/releases/X11R7.1/src/everything/ [2] http://packages.qa.debian.org/x/xserver-xorg-video-i810.html -- Ian Campbell He asked me if I knew what time it was -- I said yes, but not right now. -- Steven Wright signature.asc Description: This is a digitally signed message part
