xserver-xorg-video-ivtvdev: Changes to 'upstream/trunk'

2010-01-16 Thread Ian Campbell 
 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 'upstream/trunk'

2008-03-09 Thread Ian Campbell 
 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 'upstream/trunk'

2007-11-01 Thread Ian Campbell 
 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/trunk'

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

2007-10-18 Thread Ian Campbell 
 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 'upstream-trunk'

2007-10-14 Thread Ian Campbell 
 ChangeLog |   47 ++
 Changelog |   47 --
 Makefile.in   |2 
 README|  263 ++
 src/ivtv.c|1 
 src/ivtv_hw.c |   20 +++-
 6 files changed, 325 insertions(+), 55 deletions(-)

New commits:
commit 630bda6d262e226aed774c58f857c201c208ccb1
Author: hverkuil [EMAIL PROTECTED]
Date:   Sun Oct 14 17:47:44 2007 +

Add late-breaking note on MythTV interlacing.


git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/tags/[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 6bef49cd48a9b54ffdaafe7e7833ee659b2d3028
Author: hverkuil [EMAIL PROTECTED]
Date:   Sun Oct 14 16:36:10 2007 +

Changelog - ChangeLog
Add ChangeLog to dist target.


git-svn-id: http://ivtvdriver.org/svn/xdriver/tags/[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

xserver-xorg-video-ivtvdev: Changes to 'upstream-trunk'

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

2007-08-12 Thread Ian Campbell 
 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 'upstream-trunk'

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