Re: xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'

2011-02-04 Thread Cyril Brulebois 
Hi,

Ian Campbell i...@hellion.org.uk (05/01/2011):
 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.

if that's OK with you, I'll implement the same changes in this package
as for the other ones, as part of the big plan to update dependencies
[1], and prepare its upload to unstable along with xorg-server 1.9
early next week.

 1. http://lists.debian.org/debian-x/2011/02/msg00038.html

(When I say “I will”, I've done so already; I could just avoid pushing
if you have any objections. The only bit differing from other drivers
is that I chose not to run autoreconf for this driver, the files
stored in git / gitignored make it a bit difficult. And that isn't
done already.)

KiBi.


signature.asc
Description: Digital signature

Re: xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'

2011-01-15 Thread Cyril Brulebois 
Ian Campbell i...@hellion.org.uk (05/01/2011):
 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.

Thanks for the update.  Deprecated symbols might stay a bit. It's easy
to fix anyway, so don't worry.

KiBi.


signature.asc
Description: Digital signature

Re: xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'

2011-01-05 Thread Ian Campbell 
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 'debian-experimental'

2011-01-02 Thread Ian Campbell 
 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,

Re: xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'

2010-10-17 Thread Ian Campbell 
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-experimental-2007'

2010-10-16 Thread Cyril Brulebois 
New branch 'debian-experimental-2007' 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
Archive: http://lists.debian.org/e1p79up-00089l...@alioth.debian.org

xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'

2010-10-16 Thread Cyril Brulebois 
Rebased ref, commits from common ancestor:
commit dc16e55aed305eea5f13cf8280af782cd3d4d691
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 16 18:39:56 2010 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 669222b..fc43148 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-ivtvdev (1.1.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-ivtvdev (1.1.1-3) experimental; urgency=low
 
   * Build against Xserver 1.9.1 rc1.
   * Add myself to Uploaders.
 
- -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 18:39:06 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 18:39:55 +0200
 
 xserver-xorg-video-ivtvdev (1.1.1-2) unstable; urgency=low
 

commit f44d74db4c3f7acb33add0f2ab6ddc3253047136
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 16 18:39:36 2010 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index d73e8e6..669222b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-ivtvdev (1.1.1-3) UNRELEASED; urgency=low
 
   * Build against Xserver 1.9.1 rc1.
+  * Add myself to Uploaders.
 
  -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 18:39:06 +0200
 
diff --git a/debian/control b/debian/control
index 560e00b..f91f719 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-ivtvdev
 Section: contrib/x11
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Ian Campbell 
i...@hellion.org.uk
+Uploaders: David Nusinow dnusi...@debian.org, Ian Campbell 
i...@hellion.org.uk, Cyril Brulebois k...@debian.org
 Build-Depends: debhelper (= 5), pkg-config, autotools-dev, xserver-xorg-dev 
(= 2:1.9.0.901), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ivtvdev

commit ec679cf146a945c066b491bc17d5c6d0994120eb
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 16 18:39:21 2010 +0200

Build against Xserver 1.9.1 rc1.

diff --git a/debian/changelog b/debian/changelog
index 73bb360..d73e8e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ivtvdev (1.1.1-3) UNRELEASED; urgency=low
+
+  * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 18:39:06 +0200
+
 xserver-xorg-video-ivtvdev (1.1.1-2) unstable; urgency=low
 
   [ Ian Campbell ]
diff --git a/debian/control b/debian/control
index c6b0cd8..560e00b 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 dnusi...@debian.org, Ian Campbell 
i...@hellion.org.uk
-Build-Depends: debhelper (= 5), pkg-config, autotools-dev, xserver-xorg-dev 
(= 2:1.7.6.901), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (= 5), pkg-config, autotools-dev, xserver-xorg-dev 
(= 2:1.9.0.901), x11proto-video-dev, libxvmc-dev, x11proto-fonts-dev, 
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
 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

commit 6545f9c7f679df9f407dfa220a083f92b02b2c00
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 6 18:40:59 2010 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 490a5b0..73bb360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ivtvdev (1.1.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-ivtvdev (1.1.1-2) unstable; urgency=low
 
   [ Ian Campbell ]
   * Add misc:Depends for xserver-xorg-video-ivtv-dbg.
@@ -7,7 +7,7 @@ xserver-xorg-video-ivtvdev (1.1.1-2) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Update xsfbs and use new ${xviddriver:Depends} substvar.
 
- -- Ian Campbell i...@hellion.org.uk  Sat, 16 Jan 2010 20:04:28 +
+ -- Julien Cristau jcris...@debian.org  Sun, 06 Jun 2010 18:40:53 +0200
 
 xserver-xorg-video-ivtvdev (1.1.1-1) unstable; urgency=low
 

commit 62022ebb4cf55dfc9ab3c7a360f53d13cfa4136a
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 22 15:53:55 2010 +0200

Update xsfbs and use new ${xviddriver:Depends} substvar.

diff --git a/debian/changelog b/debian/changelog
index df42401..490a5b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-video-ivtvdev (1.1.1-2) UNRELEASED; urgency=low
 
+  [ Ian Campbell ]
   * Add misc:Depends for xserver-xorg-video-ivtv-dbg.
   * Bump Standards-Version to 3.8.3 (no changes).
 
+  [ Julien Cristau ]
+  * Update xsfbs and use new ${xviddriver:Depends} substvar.
+
  -- Ian

Re: xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'

2010-10-16 Thread Cyril Brulebois 
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.

Mraw,
KiBi.


signature.asc
Description: Digital signature

xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'

2008-03-09 Thread Ian Campbell 
 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

xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'

2007-09-10 Thread Ian Campbell 
 .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)

xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'

2007-09-10 Thread Ian Campbell 
 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-experimental'

2007-08-12 Thread Ian Campbell 
 .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-experimental'

2007-05-02 Thread Ian Campbell 
 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-experimental'

2007-03-28 Thread Ian Campbell 
 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]

xserver-xorg-video-ivtvdev: Changes to 'debian-experimental'

2007-02-11 Thread David Nusinow 
New branch 'debian-experimental' available with the following commits:
commit 9d028878321ddeb47442f7c2f005dddff5529e0d
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sat Feb 10 21:25:04 2007 -0500

Prepare drivers for use with xserver 1.2, which has a new ABI (version 1.1)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]