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 +0000 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 +0000 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") 2>&5 + 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") 2>&5 + { (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") 2>&5 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 $REQUIRED_MODULES") 2>&5 + { (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") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null` + pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null` else pkg_failed=yes fi @@ -20171,18 +20184,18 @@ else fi if test $pkg_failed = yes; then - XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES"` + XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"` # Put the nasty error message in config.log where it belongs echo "$XORG_PKG_ERRORS" 1>&5 - { { echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) were not met. + { { echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively you may set the XORG_CFLAGS and XORG_LIBS environment variables to avoid the need to call pkg-config. See the pkg-config man page for more details." >&5 -echo "$as_me: error: Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) were not met. +echo "$as_me: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. diff --git a/configure.ac b/configure.ac index 7cea937..acc2f8c 100644 --- a/configure.ac +++ b/configure.ac @@ -47,8 +47,11 @@ AC_ARG_WITH(xorg-module-dir, [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) +PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901], + [AC_DEFINE(X_NEW_PARMS,1,[Update some functions to new X parameter list])]) + # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for extensions diff --git a/src/ivtv.c b/src/ivtv.c index c8c0a2f..008aa5f 100644 --- a/src/ivtv.c +++ b/src/ivtv.c @@ -198,7 +198,7 @@ IVTVDevSetup(pointer module, pointer opts, int *errmaj, int *errmin) static void IVTVshadowUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf) { -#ifdef X_MODULAR +#ifdef X_NEW_PARMS RegionPtr damage = DamageRegion(pBuf->pDamage); #else RegionPtr damage = &pBuf->damage; diff --git a/src/ivtv_hw.h b/src/ivtv_hw.h index a7d0170..6ad0744 100644 --- a/src/ivtv_hw.h +++ b/src/ivtv_hw.h @@ -90,13 +90,6 @@ extern int ivtvHWPrivateIndex; # define IVTVDEVHW_BYTE_SWAP 1 #endif -/* FIXME - There must be a better way to do this..... */ -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(7,0,0,0,0) -# define X_MODULAR 1 -#elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,0,0,0,0) -# define X_MODULAR 1 -#endif - Bool ivtvHWGetRec(ScrnInfoPtr pScrn); void ivtvHWFreeRec(ScrnInfoPtr pScrn); Bool ivtvHWProbe(pciVideoPtr pPci, char *device, char **namep); diff --git a/src/ivtv_xv.c b/src/ivtv_xv.c index 1a16e69..7c54352 100644 --- a/src/ivtv_xv.c +++ b/src/ivtv_xv.c @@ -66,7 +66,7 @@ static void IVTVStopVideo(ScrnInfoPtr, pointer, Bool); static void IVTVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer); -#ifdef X_MODULAR +#ifdef X_NEW_PARMS static int IVTVPutImage(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char *, short, short, Bool, RegionPtr, pointer, DrawablePtr); @@ -676,7 +676,7 @@ IVTVHM12ScaleYUV12(unsigned char *src, unsigned char *dst, return (sc_x << 16) | sc_y; } -#ifdef X_MODULAR +#ifdef X_NEW_PARMS static int IVTVPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, 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..0000000 --- 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.000000000 +0100 -+++ xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c 2007-09-20 19:00:32.000000000 +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..0000000 --- a/debian/patches/remove-xf86_ansic.h +++ /dev/null @@ -1,46 +0,0 @@ -x86_ansic.h is deprecated upstream. - -Directly include necessary headers instead. - -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-09-18 08:24:59.000000000 +0100 -+++ xserver-xorg-video-ivtvdev.git/src/ivtv.c 2007-09-20 18:53:26.000000000 +0100 -@@ -40,7 +40,6 @@ - /* all drivers 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/ivtv_hw.c -=================================================================== ---- xserver-xorg-video-ivtvdev.git.orig/src/ivtv_hw.c 2007-09-18 08:24:59.000000000 +0100 -+++ xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c 2007-09-20 19:02:15.000000000 +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" -@@ -39,7 +48,6 @@ - /* all drivers 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 1596c0f..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +0,0 @@ -remove-xf86_ansic.h -remove-PAGE_MASK diff --git a/debian/rules b/debian/rules index 9068915..d96501a 100755 --- a/debian/rules +++ b/debian/rules @@ -74,7 +74,7 @@ binary-arch: build install serverabi dh_testroot dh_installdocs - dh_installchangelogs Changelog + dh_installchangelogs ChangeLog dh_install --sourcedir=debian/tmp --list-missing dh_link dh_strip commit 630bda6d262e226aed774c58f857c201c208ccb1 Author: hverkuil <[EMAIL PROTECTED]> Date: Sun Oct 14 17:47:44 2007 +0000 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 804d2bdd30eef9e1eaf785996928cd894a558bcc Author: hverkuil <[EMAIL PROTECTED]> Date: Sun Oct 14 17:47:01 2007 +0000 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 6bef49cd48a9b54ffdaafe7e7833ee659b2d3028 Author: hverkuil <[EMAIL PROTECTED]> Date: Sun Oct 14 16:36:10 2007 +0000 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 0000000..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..0000000 --- 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 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/Makefile.in b/Makefile.in index 341f761..ee651a5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,7 +52,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +DIST_COMMON = README ChangeLog $(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 commit bfd21e06ccdfe3e9477407bd8cd93a8bbd9bc463 Author: hverkuil <[EMAIL PROTECTED]> Date: Sun Oct 14 16:35:04 2007 +0000 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 0000000..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..0000000 --- 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 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/Makefile.in b/Makefile.in index 341f761..ee651a5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,7 +52,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +DIST_COMMON = README ChangeLog $(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 commit 7ebe05c04228bc923d4ab2d0343932fa87048ea6 Author: hverkuil <[EMAIL PROTECTED]> Date: Sun Oct 14 16:25:34 2007 +0000 Also update configure.ac git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/configure b/configure index 8fcce5c..ca8c3f7 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.61 for xf86-video-ivtv 1.0.0. +# Generated by GNU Autoconf 2.61 for xf86-video-ivtv 1.0.1. # # Report bugs to <http://ivtvdriver.org/trac>. # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xf86-video-ivtv' PACKAGE_TARNAME='xf86-video-ivtv' -PACKAGE_VERSION='1.0.0' -PACKAGE_STRING='xf86-video-ivtv 1.0.0' +PACKAGE_VERSION='1.0.1' +PACKAGE_STRING='xf86-video-ivtv 1.0.1' PACKAGE_BUGREPORT='http://ivtvdriver.org/trac' ac_unique_file="Makefile.am" @@ -1413,7 +1413,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.0.0 to adapt to many kinds of systems. +\`configure' configures xf86-video-ivtv 1.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1483,7 +1483,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-ivtv 1.0.0:";; + short | recursive ) echo "Configuration of xf86-video-ivtv 1.0.1:";; esac cat <<\_ACEOF @@ -1595,7 +1595,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-ivtv configure 1.0.0 +xf86-video-ivtv configure 1.0.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1609,7 +1609,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.0.0, which was +It was created by xf86-video-ivtv $as_me 1.0.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2304,7 +2304,7 @@ fi # Define the identity of the package. PACKAGE='xf86-video-ivtv' - VERSION='1.0.0' + VERSION='1.0.1' cat >>confdefs.h <<_ACEOF @@ -21123,7 +21123,7 @@ exec 6>&1 # 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.0.0, which was +This file was extended by xf86-video-ivtv $as_me 1.0.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21176,7 +21176,7 @@ Report bugs to <[EMAIL PROTECTED]>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-ivtv config.status 1.0.0 +xf86-video-ivtv config.status 1.0.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 9217e7e..7cea937 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-ivtv], - 1.0.0, + 1.0.1, [http://ivtvdriver.org/trac], xf86-video-ivtv) commit d7970f8f3d600b8371bd5db6e57f65eae7bb71ae Author: hverkuil <[EMAIL PROTECTED]> Date: Sun Oct 14 16:23:31 2007 +0000 Continue with 1.0.1. 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 069d439..c8c0a2f 100644 --- a/src/ivtv.c +++ b/src/ivtv.c @@ -114,7 +114,7 @@ static int pix24bpp = 0; #define IVTVDEV_DRIVER_NAME "ivtv" #define IVTVDEV_VERSION_MAJOR 1 #define IVTVDEV_VERSION_MINOR 0 -#define IVTVDEV_VERSION_PATCH 0 +#define IVTVDEV_VERSION_PATCH 1 #define IVTVDEV_VERSION ((IVTVDEV_VERSION_MAJOR << 16) | \ (IVTVDEV_VERSION_MINOR << 8) | \ (IVTVDEV_VERSION_PATCH)) commit 3d1ba92df18f45b7b518bf56093cc8aab7b0e486 Author: hverkuil <[EMAIL PROTECTED]> Date: Sun Oct 14 15:27:31 2007 +0000 Applied patch from Ian Armstrong. git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/README b/README index 3a5ee55..de38ba3 100644 --- a/README +++ b/README @@ -6,16 +6,17 @@ framebuffer driver into the kernel introduced several changes which impact how you setup the X driver and what MythTV version you can use. -This X11 driver supports all ivtv versions >= 0.10. If you are using -ivtv >= 1.0.0 and you want to use MythTV, then you need to get the -MythTV subversion trunk or the mythtv-vid branch. The current MythTV -release (0.20.2) only supports ivtv versions < 1.0.0. - -If you use ivtv < 1.0.0 and you are using MythTV <= 0.20.2 (i.e., you -are not using the MythTV subversion trunk or the mythtv-vid branch), then -you must set the osd_compat=1 option for the ivtv-fb module. This is the -only time you need to do this. See the osd_compat section at the bottom -if you need this, since it impacts the X configuration file. +This X11 driver supports all ivtv versions >= 0.2. If you are using +ivtv >= 1.0.0 and you want to use the PVR350 MPEG decoder with MythTV, +then you need to get the MythTV subversion trunk or the mythtv-vid branch. +The current MythTV release (0.20.2) only supports ivtv versions < 1.0.0. + +If you use ivtv 0.10.x and you are using the PVR350 MPEG decoder with +MythTV <= 0.20.2 (i.e., you are not using the MythTV subversion trunk or +the mythtv-vid branch), then you must set the osd_compat=1 option for the +ivtv-fb module. This is the only time you need to do this. See the osd_compat +section at the bottom if you need this, since it impacts the X configuration +file. There is a bug in the ivtv-1.0.0 driver in kernel 2.6.22 that will make MythTV from the MythTV subversion trunk or the mythtv-vid branch hit a @@ -67,7 +68,9 @@ the configuration file is /etc/X11/XF86Config. The default resolution of the framebuffer is 640x400 for NTSC and 640x480 for PAL and SECAM. So the configuration differs between -the two. +the two. (For ivtv < 0.10, the resolution is locked to 720x480 for NTSC +and 720x576 for PAL. See the osd_compat section at the bottom for +suitable screen mode entries.) For NTSC you should add the following to your X config file: @@ -249,7 +252,7 @@ you find one. ivtv-fb osd_compat option ========================= -If you are using ivtv < 1.0.0 and MythTV <= 0.20.2, then you have to set +If you are using ivtv 0.10.x and MythTV <= 0.20.2, then you have to set the osd_compat=1 option for the ivtv-fb module. This selects the framebuffer mode that MythTV expects (these MythTV versions hardcoded the framebuffer resolution and depth. If these would not match, then you would get a crash). commit b9b91b755ca4a79d0f1ab3a534111996bf12f5b2 Author: hverkuil <[EMAIL PROTECTED]> Date: Sun Oct 14 14:13:45 2007 +0000 More doc updates. git-svn-id: http://ivtvdriver.org/svn/xdriver/[EMAIL PROTECTED] f93e8361-94ff-0310-af1b-c9b61a63ab7d diff --git a/README b/README index 94a7039..3a5ee55 100644 --- a/README +++ b/README @@ -1,3 +1,35 @@ +Compatibility +============= + +Please read this carefully: the merging of ivtv and the ivtv +framebuffer driver into the kernel introduced several changes which +impact how you setup the X driver and what MythTV version you can +use. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]