debian/0000755000000000000000000000000012150221325007157 5ustar debian/README.Debian0000644000000000000000000000175012150206155011227 0ustar zapping for Debian ------------------ To resolve some problem with Xfree, I recommend to install the v4l module for Xfree86 4.X Below is a man 4 v4l copy and paste. Christian NAME v4l - video4linux driver SYNOPSIS Section "Module" ... Load "v4l" EndSection DESCRIPTION v4l is an XFree86 driver for video4linux cards. It provides a Xvideo extension port for video overlay. Just add the driver to the module list within the module section of your XF86Config file if you want to use it. There are no config options. Note that the the extmod module is also required for the Xvideo support (and lots of other extentions too). SUPPORTED HARDWARE The v4l driver works with every piece of hardware which is sup­ ported by a video4linux (kernel-) device driver and is able to handle video overlay. bt848/bt878-based TV cards are the most popular hardware these days. debian/changelog0000644000000000000000000004043612150206155011044 0ustar zapping (0.10~cvs6-9) unstable; urgency=low * Orphaning package, maintainer set to Debian QA Group. * Standards-Version: 3.9.4 (no changes). -- Robert Luberda Sat, 25 May 2013 21:08:30 +0200 zapping (0.10~cvs6-8) unstable; urgency=low * A few new patches: + 12-Ignore-ENUMAUDIO-failure.patch: Ignore failure of VIDIOC_ENUMAUDIO ioctl; + 13-Assertions-warnings.patch to disable 'assertions are deprecated extensions' g++ warnings; + 14-Strict-aliasing.patch to disable strict aliasing for exp-gfx.o. + 15-Misc-warings to fix several other g++ warnings. + 16-Glib-single-header.patch from Michael Biebl to fix FTBFS with development version of glib library (closes: #665620). * debian/control: + Standards-Version: 3.9.3 (no changes needed); + Bump build dependency on debhelper to (>= 9). -- Robert Luberda Sun, 15 Apr 2012 00:34:28 +0200 zapping (0.10~cvs6-7) unstable; urgency=low * 11-FTBFS-libpng1.5.patch: Fix build with libpng 1.5 (closes: #650580). -- Robert Luberda Sun, 04 Dec 2011 23:09:38 +0100 zapping (0.10~cvs6-6) unstable; urgency=low * Build-Depends on libjpeg-dev, not libjpeg62-dev (closes: #647113). * Refresh patches with gbp-pq export/import. * Switch to debhelper v9. * debian/control: + drop duplicated Priority field (lintian); + add Vcs fields. * debian/rules: Remove .pc/.dpkg-source-unapply file in configure target to fix broken behaviour of dpkg-buildpackage (see Bug#649521). -- Robert Luberda Wed, 23 Nov 2011 00:04:31 +0100 zapping (0.10~cvs6-5) unstable; urgency=low * 09_save_settings.patch: have actual volume level stored in settings file. * 10_man_typos.patch: fix man typo found by linitan. * 00_automake.patch: updated to fix warnings given by current automake. * Switch to the `3.0 (quilt)' source format. * Bump debhelper compat mode to 8. * debian/rules: + switch to using dh command and tiny rules format; + call dpkg-buildflags for intial values of CFLAGS and LDFLAGS; + use dh_autoreconf. * debian/control: + bump Standards-Version to 3.9.2 (no changes). + add zapping-dbg package with debugging symbols for zapping; + remove build dependencies on libartsc0-dev (closes: #620575), quilt, and autotools-dev, add build dependenency on dh-autoreconf, automake, and intltool. * Remove debian/README.source file. -- Robert Luberda Sat, 23 Apr 2011 10:45:41 +0200 zapping (0.10~cvs6-4) unstable; urgency=low * 07_python2.6_ftbfs.patch: patch from Jakub Wilk to fix ftbfs with python 2.6 (closes: #571516). * Modified 00_automake.patch to pass --no-add-needed and -lXext to linker (closes: #556771). * 08_spelling_typos.patch: fix typos found by lintian. * Standards-Version: 3.8.4 (no changes). -- Robert Luberda Thu, 11 Mar 2010 15:07:04 +0100 zapping (0.10~cvs6-3) unstable; urgency=low * Fix build dependencies (closes: #536980). Thanks to Simon McVittie for the patch. * 06_reqbufs_may_fail.patch: VIDIOC_REQBUFS can return a value greater then 0 on success (closes: #528167). Thanks to Chris Frey for the patch. * Rebuild with the current python-dev (closes: #485581). * debian/rules: + switch to debhelper v7; + remove deprecated calls to dh_scrollkeeper. * Standards-Version: 3.8.3. * Add debian/README.source. * Fix lintian warnings. -- Robert Luberda Sun, 30 Aug 2009 12:21:08 +0200 zapping (0.10~cvs6-2) unstable; urgency=low * 05_ftbfs_powerpc_libtv.patch: Try to fix FTBFS on powerpc. -- Robert Luberda Thu, 14 Feb 2008 12:56:23 +0100 zapping (0.10~cvs6-1) unstable; urgency=low * New maintainer (closes: #457897). * New upstream version (0.10cvs6): + No longer crashes in channel and preferences windows (closes: #456837, #344969, #457888). + Xawtv config import routines handle baseband inputs (closes: #302835). * Use quilt to manage patches. * 00_automake.patch: drop plugin symlinks, link plugins with additional libraries, add -Wl,--as-needed to LDFLAGS, remove -lpthread unless is needed, rebuild man pages from source xml files. * 01_libzvbi-ftbfs.patch: fix FTBFS with current libzvbi (closes: #456837). * 02_ftbfs_simd.patch: fix from bug #424502 (already applied in previous Debian release). * 03_desktop.patch: fix problems found by `desktop-file-validate'. * 04_schemas.patch: correct zapping.schema file (patch taken from upstream CVS). * debian/menu: change section to "Applications/TV and Radio" (lintian). * debian/copyright: recode to UTF-8 (lintian). * debian/compat: set debhelper compatibility mode to 6. * debian/rules: + update config.{guess,sub} during the build process, + hack libtool to build plugins as private libraries to avoid dpkg-shlibdeps `unknown symbol' warnings. * debian/control: + Provide homepage link. + Standards-Version: 3.7.3. + Add autotools-dev, automake1.9, quilt, libxxf86dga-dev, libxxf86vm-dev, xsltproc, libxml2-utils, docbook-xsl, dh-buildinfo to build-depends. + Don't suggest doc-base. + Remove Build-Conflicts with libarts1-dev. * Add `uversionmangle' option to debian/watch. -- Robert Luberda Sat, 09 Feb 2008 23:00:36 +0100 zapping (0.9.6-4) unstable; urgency=low * Added patch to fixe FTBFS (Closes: #424502) * Added fixe for kFreeBSD (Closes: #412760) -- Christian Marillat Wed, 27 Jun 2007 11:57:41 +0200 zapping (0.9.6-3) unstable; urgency=low * Need to Build-Depends on libxml-parser-perl (Closes: #370229) -- Christian Marillat Sun, 4 Jun 2006 12:53:24 +0200 zapping (0.9.6-2) unstable; urgency=low * Update debhelper build-dependency to 4.9.8.1 and call dh_gconf (Closes: #369869) -- Christian Marillat Fri, 2 Jun 2006 00:43:11 +0200 zapping (0.9.6-1) unstable; urgency=low * New upstream release. -- Christian Marillat Thu, 14 Jul 2005 10:42:45 +0200 zapping (0.9.5-1) unstable; urgency=low * New upstream release. -- Christian Marillat Thu, 7 Jul 2005 08:43:50 +0200 zapping (0.9.4-1) unstable; urgency=low * New upstream release. -- Christian Marillat Wed, 27 Apr 2005 14:20:39 +0200 zapping (0.9.2-2) unstable; urgency=low * Build depends on libgnomeui-dev 2.8.1-3 to remove libhowl0 dependency. -- Christian Marillat Thu, 3 Mar 2005 10:40:39 +0100 zapping (0.9.2-1) unstable; urgency=low * New upstream release. * Removed previous patch, included by upstream. -- Christian Marillat Tue, 1 Mar 2005 09:44:58 +0100 zapping (0.9.1-3) unstable; urgency=low * New patch 01_cpu.c to fix FTBFS on ppc. -- Christian Marillat Wed, 23 Feb 2005 16:26:08 +0100 zapping (0.9.1-2) unstable; urgency=low * debian/rules Install the schemas file that the Makefile doesn't install. -- Christian Marillat Tue, 22 Feb 2005 10:47:31 +0100 zapping (0.9.1-1) unstable; urgency=low * New upstream release. * Remove all patches included by upstream. -- Christian Marillat Mon, 21 Feb 2005 10:46:24 +0100 zapping (0.9.0-3) unstable; urgency=low * Another patch 02_v4l25.c to fix FTBFS on (at least) mips, sparc and hppa. * Updated French translation. -- Christian Marillat Thu, 17 Feb 2005 17:39:38 +0100 zapping (0.9.0-2) unstable; urgency=low * Forgot to register the schemas file. -- Christian Marillat Wed, 16 Feb 2005 19:07:54 +0100 zapping (0.9.0-1) unstable; urgency=low * New upstream release. * Removed patch "fix build on amd64 and gcc 4.0". * This release fix linking with non fPIC lib. (Closes: #291603) * New patch 01_settings.xml, to fix a '&' alone in the documentation. -- Christian Marillat Wed, 16 Feb 2005 18:58:19 +0100 zapping (0.8.0-2) unstable; urgency=low * Update libzvbi-dev Build-Depency to 0.2.11-2 (Closes: #288795) * New patch to fix build on amd64 and gcc 4.0 (Closes: #288749) * Add suppport for arts. -- Christian Marillat Thu, 13 Jan 2005 08:56:07 +0100 zapping (0.8.0-1) unstable; urgency=low * New upstream release. -- Christian Marillat Fri, 12 Nov 2004 15:35:46 +0100 zapping (0.7.3-1) unstable; urgency=low * New upstream release. * debian/rules Use dh_scrollkeeper -- Christian Marillat Tue, 12 Oct 2004 10:52:18 +0200 zapping (0.7.2-1) unstable; urgency=low * New upstream release. * Does not compile with arts support to move the package in sarge. I'll re-enable arts after the sarge release. * Use dh_gconf abd update debhelper Build-depency to 4.1.84 * Add libgconf2-dev in Build-Depends -- Christian Marillat Tue, 5 Oct 2004 10:21:11 +0200 zapping (0.7.1-2) unstable; urgency=low * Add intltool in Build-depends (Closes: #272851) -- Christian Marillat Thu, 23 Sep 2004 09:22:17 +0200 zapping (0.7.1-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 20 Sep 2004 10:30:09 +0200 zapping (0.7-2) unstable; urgency=low * Build against the latest GNOME libraries and uptade libgnomeui-dev Build-dependecy to 2.6.1.1-3 (Closes: #263620) -- Christian Marillat Thu, 5 Aug 2004 14:41:25 +0200 zapping (0.7-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 12 Jul 2004 15:06:55 +0200 zapping (0.6.8-1) unstable; urgency=low * New upstream release. -- Christian Marillat Tue, 11 May 2004 18:13:18 +0200 zapping (0.6.7-3) unstable; urgency=low * debian/control Builde-Conflicts against libartsc0-dev. Doesn't work with zapping -- Christian Marillat Tue, 20 Apr 2004 17:09:05 +0200 zapping (0.6.7-2) unstable; urgency=low * Rebuild for arm architecture. -- Christian Marillat Mon, 29 Sep 2003 17:45:04 +0200 zapping (0.6.7-1) unstable; urgency=low * New upstream release. -- Christian Marillat Wed, 4 Jun 2003 14:25:59 +0200 zapping (0.6.6-2) unstable; urgency=low * Update section * Build against latest libzvbi-dev (libpng10) -- Christian Marillat Sat, 10 May 2003 16:58:14 +0200 zapping (0.6.6-1) unstable; urgency=low * New upstream release (Closes: #181412) -- Christian Marillat Mon, 17 Feb 2003 23:55:37 +0100 zapping (0.6.5-1) unstable; urgency=low * New upstream release. -- Christian Marillat Fri, 4 Oct 2002 18:07:01 +0200 zapping (0.6.4-7) unstable; urgency=low * Only build s390 with gcc-3.2 * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and DEB_BUILD_OPTIONS -- Christian Marillat Sat, 28 Sep 2002 16:11:08 +0200 zapping (0.6.4-6) unstable; urgency=low * Forget to add the gcc-3.2 build-dependecy (Closes: #160185) -- Christian Marillat Sat, 14 Sep 2002 17:36:57 +0200 zapping (0.6.4-5) unstable; urgency=low * Build against gcc-3.2 (Closes: #160185) * Update to standards version 3.5.7 -- Christian Marillat Fri, 13 Sep 2002 21:27:03 +0200 zapping (0.6.4-4) unstable; urgency=low * Build against the latest libgnome-dev 1.4.2-3 -- Christian Marillat Thu, 29 Aug 2002 19:07:28 +0200 zapping (0.6.4-3) unstable; urgency=low * Use /dev/v4l instead of /dev/.devfsd in postinst (Closes: #153220) * Build against the latest libgnome-dev 1.4.1.7-3 -- Christian Marillat Fri, 16 Aug 2002 16:35:30 +0200 zapping (0.6.4-2) unstable; urgency=low * Create v4l devices in postinst (Closes: #148831) * Add libzvbi-dev in build-depends (Closes: #147944) -- Christian Marillat Wed, 12 Jun 2002 18:25:27 +0200 zapping (0.6.4-1) unstable; urgency=low * New upstream release. -- Christian Marillat Thu, 18 Apr 2002 17:09:53 +0200 zapping (0.6.2-2) unstable; urgency=low * Add a patch from cvs to fix a crash at shutdown (Closes: #126276) * Add patch from cvs to put all plugins in the same place in the configuration dialog. -- Christian Marillat Sun, 23 Dec 2001 17:37:12 +0100 zapping (0.6.2-1) unstable; urgency=low * New upstream release. -- Christian Marillat Wed, 28 Nov 2001 19:16:12 +0100 zapping (0.6.1-2) unstable; urgency=low * Patch against tveng1.c fix mute bug (Closes: #117317) -- Christian Marillat Tue, 30 Oct 2001 18:11:50 +0100 zapping (0.6.1-1) unstable; urgency=low * New upstream release. * debian/menu Change section to Viewers add a TV hints (Closes: #109126) * Close bug related to -bpp (Closes: #110269) * Remove configure patch included by upstream. -- Christian Marillat Mon, 17 Sep 2001 16:04:14 +0200 zapping (0.6.0final-1) unstable; urgency=low * New upstream release. * Add liblircclient-dev in Build-Depends * Rewrote configure patch * Remove my manpages included by upstream and remove docbook-to-man from Build-depends -- Christian Marillat Sat, 25 Aug 2001 22:50:50 +0200 zapping (0.6.0cvs-4) unstable; urgency=low * Register zapping for doc-base * Hack configure (plugins aren't build correctly) -- Christian Marillat Fri, 17 Aug 2001 17:15:49 +0200 zapping (0.6.0cvs-3) unstable; urgency=low * Build with -mcpu=i386 (Closes: #100632) -- Christian Marillat Tue, 12 Jun 2001 23:12:45 +0200 zapping (0.6.0cvs-2) unstable; urgency=low * Oops, I removed the confihure patch in the previous release (Closes: #98308) * Switch to debhelper V3 -- Christian Marillat Fri, 8 Jun 2001 08:13:47 +0200 zapping (0.6.0cvs-1) unstable; urgency=low * New upstream release. * Remove export.c patch, fixed by upstream. -- Christian Marillat Thu, 31 May 2001 20:12:30 +0200 zapping (0.5.92-4) unstable; urgency=low * Add gettext in build-depnds (Closes: #98619) -- Christian Marillat Thu, 24 May 2001 20:43:00 +0200 zapping (0.5.92-3) unstable; urgency=low * Remove ARCH_CFLAGS="-mcpu=ultrasparc -mvis" in configure (Closes: #98308) * Patch export.c to avoid a segfault with cut and paste. Thanks to Eduard Bloch (Closes: #94548) -- Christian Marillat Tue, 22 May 2001 18:04:52 +0200 zapping (0.5.92-2) unstable; urgency=low * Write manpages (Closes: #94018) * Add a menu entry. -- Christian Marillat Sun, 15 Apr 2001 17:24:36 +0200 zapping (0.5.92-1) unstable; urgency=low * First official Debian release (Closes: #93393) * New upstream release. -- Christian Marillat Fri, 23 Mar 2001 14:52:28 +0100 zapping (0.5.91-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 19 Mar 2001 19:49:53 +0100 zapping (0.5.9-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 19 Mar 2001 19:30:10 +0100 zapping (0.5.81-1) unstable; urgency=low * New upstream release. -- Christian Marillat Fri, 8 Dec 2000 11:45:17 +0100 zapping (0.5.8-1) unstable; urgency=low * New upstream release. -- Christian Marillat Tue, 5 Dec 2000 22:52:31 +0100 zapping (0.5.4-1) unstable; urgency=low * New upstream release. -- Christian Marillat Sun, 17 Sep 2000 10:03:28 +0200 zapping (0.5.3-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 11 Sep 2000 22:50:38 +0200 zapping (0.5.2-1) unstable; urgency=low * New upstream release. -- Christian Marillat Sat, 29 Jul 2000 23:42:59 +0200 zapping (0.5.1-0.0) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 19 Jun 2000 20:30:22 +0200 zapping (0.5.0-1) unstable; urgency=low * Initial Release. -- Christian Marillat Sat, 3 Jun 2000 09:05:28 +0200 debian/compat0000644000000000000000000000000212150206155010361 0ustar 9 debian/control0000644000000000000000000000404012150206155010564 0ustar Source: zapping Section: gnome Priority: extra Maintainer: Debian QA Group Standards-Version: 3.9.4 Build-Depends: automake, debhelper (>= 9), dh-autoreconf, dh-buildinfo, docbook-xsl, intltool, libesd0-dev, libgconf2-dev, libglade2-dev, libgnomeui-dev (>= 2.8.1-3), libgtk2.0-dev (>= 2.4), libjpeg-dev, liblircclient-dev, libpng-dev, libx11-dev, libxext-dev, libxinerama-dev, libxml-parser-perl, libxml2-dev, libxml2-utils, libxmu-dev, libxv-dev, libxxf86dga-dev, libxxf86vm-dev, libzvbi-dev (>= 0.2.11-2), python-dev, scrollkeeper, xsltproc Homepage: http://zapping.sourceforge.net/ Vcs-Git: git://anonscm.debian.org/users/robert/zapping.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/robert/zapping.git Package: zapping Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: television viewer for the GNOME environment It is based on plugins. This will make it easy to add functionality to the program, without making it hard to maintain, such as saving video as AVI/MPEG, viewing mirrored TV (scanning from right to left) or whatever you can imagine (and program). Package: zapping-dbg Architecture: any Section: debug Depends: zapping (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: detached debugging symbols for zapping This package contains debugging symbols for zapping, which is a television viewer for GNOME environment. . It is based on plugins. This will make it easy to add functionality to the program, without making it hard to maintain, such as saving video as AVI/MPEG, viewing mirrored TV (scanning from right to left) or whatever you can imagine (and program). debian/copyright0000644000000000000000000000121212150206155011112 0ustar This package was debianized by Christian Marillat on Sat, 3 Jun 2000 09:05:28 +0200. It was downloaded from http://zapping.sourceforge.net/ Upstream Author: Iñaki García Etxebarria Michael H. Schimek Copyright: 2000, 2001 Iñaki García Etxebarria Licence is GPL You should have received a copy of the GNU General Public License with the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. debian/docs0000644000000000000000000000004512150206155010035 0ustar BUGS NEWS README README.plugins TODO debian/gnome-television.xpm0000644000000000000000000001150312150206155013175 0ustar /* XPM */ static char *gnome-television[] = { /* columns rows colors chars-per-pixel */ "32 32 165 2", " c #000000", ". c #0B0C0B", "X c #141413", "o c #181716", "O c #1B1C1B", "+ c #22221F", "@ c #252524", "# c #262A27", "$ c #282625", "% c #292B27", "& c #2C2C2B", "* c #2E312B", "= c #293131", "- c #32312E", "; c #333431", ": c #373934", "> c #383734", ", c #3A3B3A", "< c #3E423D", "1 c #414135", "2 c #43423B", "3 c #4C4D3D", "4 c #454443", "5 c #454B43", "6 c #494743", "7 c #4A4846", "8 c #4C4B49", "9 c #4D5559", "0 c #514E4C", "q c #545246", "w c #53514E", "e c #58584F", "r c #555353", "t c #51595B", "y c #585653", "u c #5C5A55", "i c #5E5D5B", "p c #5F6151", "a c #615E54", "s c #615E5C", "d c #616452", "f c #64625D", "g c #666955", "h c #666A58", "j c #6A6A5F", "k c #6E715C", "l c #666562", "z c #6A6765", "x c #6A6C65", "c c #6F6C69", "v c #6E7068", "b c #6F7571", "n c #716A62", "m c #716E6C", "M c #727465", "N c #74736C", "B c #797C66", "V c #7B7C6D", "C c #737172", "Z c #727970", "A c #7A7672", "S c #7B7973", "D c #7E7C78", "F c #615883", "G c #756C81", "H c #7C7187", "J c #7F8664", "K c #7F817B", "L c #807E6C", "P c #807A74", "I c #827E79", "U c #8D9B53", "Y c #83876B", "T c #808867", "R c #858C6C", "E c #838673", "W c #85827C", "Q c #868974", "! c #88857E", "~ c #8B8D74", "^ c #8C8D7B", "/ c #89906F", "( c #8D9273", ") c #8F9578", "_ c #918D7D", "` c #9C847D", "' c #909576", "] c #93967C", "[ c #95997D", "{ c #999E7B", "} c #9CA27D", "| c #85888C", " . c #8A8582", ".. c #8C8A82", "X. c #8E8E8B", "o. c #888C90", "O. c #8F9082", "+. c #8E9094", "@. c #908C85", "#. c #938D89", "$. c #9A8B84", "%. c #929485", "&. c #94938C", "*. c #979887", "=. c #9C948C", "-. c #9A9D84", ";. c #9B9D8A", ":. c #919494", ">. c #989591", ",. c #9C9A94", "<. c #9D9C98", "1. c #9DA186", "2. c #9EA189", "3. c #A9968D", "4. c #A69791", "5. c #A19D96", "6. c #A19E99", "7. c #A1A684", "8. c #A3A48C", "9. c #A4A984", "0. c #A5A88E", "q. c #A7A790", "w. c #A5A39D", "e. c #A7A992", "r. c #A9A69D", "t. c #ABAC94", "y. c #ABAC9D", "u. c #ABB092", "i. c #B2B394", "p. c #A0A2A2", "a. c #ACAAA4", "s. c #AFB1A2", "d. c #AFB1B2", "f. c #B1AEA7", "g. c #B1AFAA", "h. c #B3B1A7", "j. c #B2B3AB", "k. c #B7B9A5", "l. c #B6B8AD", "z. c #B8BAA7", "x. c #BBBDAD", "c. c #B7B7B8", "v. c #B8B5B0", "b. c #BBBBB6", "n. c #B9B9B9", "m. c #BFC0B8", "M. c #C2BEB5", "N. c #C3C1B4", "B. c #C5C4BB", "V. c #CAC7BF", "C. c #C3C4C4", "Z. c #C6C6C8", "A. c #CDCBC2", "S. c #CCCCCD", "D. c #D0CFC7", "F. c #D6D4CF", "G. c #D7D8CC", "H. c #D8D5CF", "J. c #D5D5D6", "K. c #DDDAD2", "L. c #D9DADA", "P. c #E4E1D7", "I. c #E8E4DA", "U. c #F1F1F1", "Y. c None", /* pixels */ "Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.", "Y.Y.Y.Y.Y.Y.Y.Y.Y.Y. Y.Y.Y.Y.Y.Y.Y.", "Y.Y.Y.Y.Y.Y.Y.Y.Y. . . Y.Y.Y.Y.Y.Y.Y.", "Y.Y.Y.Y.Y.Y.Y. X ; O & @ . Y.Y.Y.", "Y.Y.Y.Y.Y. O 7 X & 4 . Y.", "Y.Y.Y. O ; # , X ", "Y.Y. O 7 9 i r , ", "Y. . f 5.,.,.,.>.>.<.g.j.j.a.<... .W I D S N u . ", "Y. 5 P.G.V.C.B.B.m.n.l.j.j.a.a.r.w.<.,.>.#.#.5.w ", "Y. w I.<.a.j.y.,.%.%.X.&.%.....%.%...^ ^ ^ m ! f ", "Y. w P.<.m.G.B.k.y.t.t.u.t.y.i.t.q.e.8.2.e.V A f ", "Y. w P.o.s.m.z.u.t.e.q.*.N x %.-.[ ] -.*.1.M N i ", "Y. w K...2.u.0.2.2.2.*.Z 2 # < ( -.[ 1.1.[ k m s ", "Y. 0 K...[ 1.1.) 1.) x 5 ; % * V ] ( ' ( ( d m u ", "Y. 8 H.W [ 9.2.[ 1.] Q u 2 1 2 B R R ( ) -.d z u ", "Y. 8 H.W %.1.2.1.2.2.e.^ q 1 q Y R T / J R h z u ", "Y. 8 D.W ;.u.u.8.-.t.t.-.u 1 : x [ [ / J / g f y ", "Y. 8 A.S 8.i.i.i.t.u.t.;.@.n y o.:.-.} } } k f r ", "Y. 7 V.A 8.q.3.9.9.u.l.n.c.X.p.S.+.Z } } 9.k i w ", "Y. 7 B.N ] H z _ 9.x.n.J.S.L.S.d.| t Q ' } k u w ", "Y. 6 N.v ~ G F %.9.l.Z.J.L.U.Z.+.:.9 b *.1.g y 0 ", "Y. 4 M.x Q ...] -.h.S.C.S.J.:.C +.9 9 Q ' u y 0 ", "Y. 4 N.#.A A N m n c c f l f t w w 8 4 4 2 7 m 7 ", "Y. X S h.f.f.a.r.3.4.3.$.=.$.` #. .W ~ U V C f O ", "Y. . 5 f f N S ! I S ! P P P A m c e 3 2 , = . ", "Y. . . > w f u a l s j l a f e $ . ", "Y. o x I @.....! ! W I I A A A N l y 2 . ", "Y. . # ; ; ; - - - * * - & & & $ $ + o ", "Y.Y. ", "Y.Y. ", "Y.Y.Y. ", "Y.Y.Y. Y." }; debian/links0000644000000000000000000000006312150206155010225 0ustar usr/sbin/zapping_setup_fb usr/bin/zapping_setup_fb debian/lintian-overrides0000644000000000000000000000010012150206155012533 0ustar zapping: setuid-binary usr/sbin/zapping_setup_fb 4755 root/root debian/menu0000644000000000000000000000034312150206155010052 0ustar ?package(zapping):needs="X11" \ hints="TV,Gnome" \ section="Applications/TV and Radio" \ title="zapping" \ longtitle="TV viewer" \ icon="/usr/share/pixmaps/zapping/gnome-television.xpm" \ command="/usr/bin/zapping" debian/patches/0000755000000000000000000000000012150206155010612 5ustar debian/patches/00-Automake.patch0000644000000000000000000002003512150206155013616 0ustar From: Robert Luberda Date: Thu, 7 Feb 2008 23:02:00 +0100 Subject: 00 Automake. Drop plugin symlinks, link plugins with additional libraries, add -Wl,--as-needed to LDFLAGS, rebuild man pages from source xml files. --- configure.in | 8 ++++---- help/man/Makefile.am | 17 +++-------------- help/omf.make | 2 -- plugins/alirc/Makefile.am | 5 ++++- plugins/deinterlace/Makefile.am | 6 +++++- plugins/mpeg/Makefile.am | 5 ++++- plugins/screenshot/Makefile.am | 6 +++++- plugins/subtitle/Makefile.am | 3 +++ plugins/teletext/Makefile.am | 4 ++++ po/Makefile.in.in | 1 + src/Makefile.am | 4 +++- zapping_setup_fb/Makefile.am | 2 ++ 12 files changed, 38 insertions(+), 25 deletions(-) diff --git a/configure.in b/configure.in index 72cf311..f0a20f3 100644 --- a/configure.in +++ b/configure.in @@ -26,7 +26,7 @@ AC_CHECK_FUNCS([strlcpy strndup asprintf getopt_long program_invocation_name]) SAVE_LIBS=$LIBS LIBS="$LIBS -lm" AC_LINK_IFELSE( - AC_LANG_PROGRAM([#include ], [return lrint(1.5);]), + [AC_LANG_PROGRAM([#include ], [return lrint(1.5);])], AC_DEFINE(HAVE_LRINT, 1, [Define if the lrint() function is available])) LIBS="$SAVE_LIBS" @@ -129,7 +129,7 @@ AC_DEFUN([CHECK_SIMD], [ CFLAGS="$CFLAGS $2" CAN_COMPILE_$1="yes" AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([#include <$3>], [$4]),, CAN_COMPILE_$1="no") + [AC_LANG_PROGRAM([#include <$3>], [$4])],, CAN_COMPILE_$1="no") if test x$CAN_COMPILE_$1 = xyes; then dnl Older versions of GCC and other compilers have not been tested. GCC_VERSION(0, 30200, CAN_COMPILE_$1="disabled") @@ -179,7 +179,7 @@ dnl See if we can increase inlining limits for SIMD code (GCC 3.4+). AC_MSG_CHECKING([if $CC supports --param inline-unit-growth]) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS --param inline-unit-growth=3000" -AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], [return 0;]), +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [return 0;])], [HAVE_GCC_LIMITS=yes], [HAVE_GCC_LIMITS=no]) AC_MSG_RESULT($HAVE_GCC_LIMITS) AM_CONDITIONAL(HAVE_GCC_LIMITS, test "x$HAVE_GCC_LIMITS" = "xyes") @@ -191,7 +191,7 @@ dnl --------------------------------------------------------------------------- AC_MSG_CHECKING(if $CC has __builtin_popcount) HAVE_BUILTIN_POPCOUNT="yes" -AC_LINK_IFELSE(AC_LANG_PROGRAM(, [__builtin_popcount(123)]), +AC_LINK_IFELSE([AC_LANG_PROGRAM(, [__builtin_popcount(123)])], AC_DEFINE(HAVE_BUILTIN_POPCOUNT, 1, [Define if CC has __builtin_popcount]), HAVE_BUILTIN_POPCOUNT="no") AC_MSG_RESULT($HAVE_BUILTIN_POPCOUNT) diff --git a/help/man/Makefile.am b/help/man/Makefile.am index 343ca4c..a04d5e2 100644 --- a/help/man/Makefile.am +++ b/help/man/Makefile.am @@ -7,24 +7,13 @@ MANUALS = \ man_MANS = $(MANUALS:.xml=.1) -EXTRA_DIST = $(man_MANS) $(MANUALS) +BUILT_SOURCES= $(man_MANS) + +EXTRA_DIST = $(MANUALS) -if MAINTAINER_MODE -if BUILD_MAN %.1: %.xml Makefile.am @XSLTPROC@ -nonet "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" $< -else -# $(man_MANS) are in CVS and source tarball, so BUILD_MAN is necessary -# only if $(MANUALS) changed. -%.1: %.xml - echo The xsltproc tool, DocBook XML DTD V4.1.2 or DocBook XSL - echo stylesheets are missing. Rerun autogen.sh or configure - echo when you have them. - exit 1 -endif - -endif xmlcheck: $(MANUALS) for file in $^; do \ diff --git a/help/omf.make b/help/omf.make index fc7e298..4133103 100644 --- a/help/omf.make +++ b/help/omf.make @@ -42,7 +42,6 @@ install-data-hook-omf: for file in $(omffile); do \ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ done - -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) uninstall-local-omf: -for file in $(srcdir)/*.omf; do \ @@ -50,4 +49,3 @@ uninstall-local-omf: rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ done -rmdir $(DESTDIR)$(omf_dest_dir) - -scrollkeeper-update -p $(scrollkeeper_localstate_dir) diff --git a/plugins/alirc/Makefile.am b/plugins/alirc/Makefile.am index e109abb..1317f8e 100644 --- a/plugins/alirc/Makefile.am +++ b/plugins/alirc/Makefile.am @@ -16,4 +16,7 @@ INCLUDES = \ libalirc_zapping_la_SOURCES = alirc.c -libalirc_zapping_la_LIBADD = $(LIRC_LIB) +libalirc_zapping_la_LDFLAGS = -module -avoid-version + +libalirc_zapping_la_LIBADD = $(LIRC_LIB) \ + $(PACKAGE_LIBS) diff --git a/plugins/deinterlace/Makefile.am b/plugins/deinterlace/Makefile.am index bcf640c..f117ce9 100644 --- a/plugins/deinterlace/Makefile.am +++ b/plugins/deinterlace/Makefile.am @@ -14,6 +14,7 @@ INCLUDES = \ -I$(top_srcdir) \ @COMMON_INCLUDES@ + libdeinterlace_zapping_la_SOURCES = \ DS_ApiCommon.h \ DS_Control.h \ @@ -22,6 +23,9 @@ libdeinterlace_zapping_la_SOURCES = \ preferences.c preferences.h \ windows.h +libdeinterlace_zapping_la_LDFLAGS = -module -avoid-version + libdeinterlace_zapping_la_LIBADD = \ DI_GreedyH/libDI_GreedyH.la \ - DI_Misc/libDI_Misc.la + DI_Misc/libDI_Misc.la \ + $(PACKAGE_LIBS) diff --git a/plugins/mpeg/Makefile.am b/plugins/mpeg/Makefile.am index 53f36ce..0ce725e 100644 --- a/plugins/mpeg/Makefile.am +++ b/plugins/mpeg/Makefile.am @@ -41,4 +41,7 @@ libmpeg_zapping_la_SOURCES = \ options.c \ pixmaps.h -libmpeg_zapping_la_LIBADD = $(RTE_LIBS) +libmpeg_zapping_la_LDFLAGS = -module -avoid-version + +libmpeg_zapping_la_LIBADD = $(RTE_LIBS) \ + $(PACKAGE_LIBS) diff --git a/plugins/screenshot/Makefile.am b/plugins/screenshot/Makefile.am index 4024026..40e5644 100644 --- a/plugins/screenshot/Makefile.am +++ b/plugins/screenshot/Makefile.am @@ -20,5 +20,9 @@ libscreenshot_zapping_la_SOURCES = \ deint.c \ b_jpeg.c b_ppm.c +libscreenshot_zapping_la_LDFLAGS = -module -avoid-version + libscreenshot_zapping_la_LIBADD = \ - $(JPEG_LIB) + $(JPEG_LIB) \ + -lpthread \ + $(PACKAGE_LIBS) diff --git a/plugins/subtitle/Makefile.am b/plugins/subtitle/Makefile.am index 9ef24fe..0612e55 100644 --- a/plugins/subtitle/Makefile.am +++ b/plugins/subtitle/Makefile.am @@ -17,10 +17,13 @@ libsubtitle_zapping_la_SOURCES = \ main.c main.h \ preferences.c preferences.h +libsubtitle_zapping_la_LDFLAGS = -module -avoid-version + libsubtitle_zapping_la_LIBADD = \ $(top_builddir)/libvbi/libvbi.la \ $(PTHREAD_LIB) \ $(PNG_LIB) \ + $(PACKAGE_LIBS) \ $(UNICODE_LIBS) # Must prevent link conflict with libzvbi 0.2. diff --git a/plugins/teletext/Makefile.am b/plugins/teletext/Makefile.am index 15405a4..03bf84c 100644 --- a/plugins/teletext/Makefile.am +++ b/plugins/teletext/Makefile.am @@ -24,10 +24,14 @@ libteletext_zapping_la_SOURCES = \ view.c view.h \ window.c window.h + +libteletext_zapping_la_LDFLAGS = -module -avoid-version + libteletext_zapping_la_LIBADD = \ $(top_builddir)/libvbi/libvbi.la \ $(PTHREAD_LIB) \ $(PNG_LIB) \ + $(PACKAGE_LIBS) \ $(UNICODE_LIBS) # Must prevent link conflict with libzvbi 0.2. diff --git a/po/Makefile.in.in b/po/Makefile.in.in index b7dfd61..2129975 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -70,6 +70,7 @@ EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS POTFILES = \ +debian_dummy = CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ diff --git a/src/Makefile.am b/src/Makefile.am index 0bdcb44..33a19e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -107,7 +107,9 @@ zapping_LDADD = \ @PACKAGE_LIBS@ \ @PYTHON_LIBS@ \ @X_LIBS@ \ + -lXext \ -lX11 \ + -lpthread \ @X_DPMS_LIBS@ \ @X_XINERAMA_LIBS@ \ @X_XF86DGA_LIBS@ \ @@ -119,7 +121,7 @@ zapping_LDADD = \ @ESD_LIBS@ \ @LIBXML_LIBS@ -zapping_LDFLAGS = -export-dynamic +zapping_LDFLAGS = -Wl,-z,defs -Wl,--no-add-needed -Wl,--as-needed -export-dynamic zapping_remote_SOURCES = \ zapping_remote.c diff --git a/zapping_setup_fb/Makefile.am b/zapping_setup_fb/Makefile.am index a1a6eef..4e41522 100644 --- a/zapping_setup_fb/Makefile.am +++ b/zapping_setup_fb/Makefile.am @@ -18,6 +18,8 @@ zapping_setup_fb_SOURCES = \ v4l2.c \ v4l25.c +zapping_setup_fb_LDFLAGS = -Wl,-z,defs -Wl,--no-add-needed -Wl,--as-needed + zapping_setup_fb_LDADD = \ $(top_builddir)/libtv/libtv.la \ @X_LIBS@ \ -- debian/patches/01-FTBFS-libzvbi.patch0000644000000000000000000000200412150206155014350 0ustar From: Robert Luberda Date: Thu, 7 Feb 2008 00:52:00 +0100 Subject: 01 FTBFS libzvbi. Patch for Bug#456837 (zapping: FTBFS: /usr/include/libzvbi.h:209: error: expected ';', ',' or ')' before '*' token) --- src/plugin_common.h | 6 ++++++ src/zvbi.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/plugin_common.h b/src/plugin_common.h index 0f5ab00..b41d2cf 100644 --- a/src/plugin_common.h +++ b/src/plugin_common.h @@ -28,7 +28,13 @@ #include #ifdef HAVE_LIBZVBI +# ifdef ZAPPING8 +# undef ZAPPING8 # include +# define ZAPPING8 1 +# else +# include +# endif #endif #include "tveng.h" diff --git a/src/zvbi.h b/src/zvbi.h index 797c9c9..5e89305 100644 --- a/src/zvbi.h +++ b/src/zvbi.h @@ -31,7 +31,13 @@ #ifdef HAVE_LIBZVBI #include +#ifdef ZAPPING8 +# undef ZAPPING8 +# include +# define ZAPPING8 1 +#else #include +#endif #include "tveng.h" #include "zmodel.h" -- debian/patches/02-FTBFS-simd.patch0000644000000000000000000000162012150206155013647 0ustar From: Christian Marillat Date: Wed, 27 Jun 2007 10:17:04 +0000 Subject: 02 FTBFS simd. Patch for #424502 (FTBFS: simd.c:219: error: shift must be an immediate). --- test/simd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/simd.c b/test/simd.c index beb6e9d..329ed39 100644 --- a/test/simd.c +++ b/test/simd.c @@ -216,9 +216,9 @@ SIMD_NAME (test) (void) PASS (u16, sau16 >> 7, vsru16 (vau16, 7)); #if !(SIMD & CPU_FEATURE_ALTIVEC) - PASS (16, sa16 << (sb8 & 15), vsl16 (va16, (sb8 & 15))); - PASS (16, sa16 >> (sb8 & 15), vsr16 (va16, (sb8 & 15))); - PASS (u16, sau16 >> (sb8 & 15), vsru16 (vau16, (sb8 & 15))); +// PASS (16, sa16 << (sb8 & 15), vsl16 (va16, (sb8 & 15))); +// PASS (16, sa16 >> (sb8 & 15), vsr16 (va16, (sb8 & 15))); +// PASS (u16, sau16 >> (sb8 & 15), vsru16 (vau16, (sb8 & 15))); #endif // vlsr // vshiftu2x -- debian/patches/03-Desktop.patch0000644000000000000000000000160712150206155013470 0ustar From: Robert Luberda Date: Fri, 8 Feb 2008 21:42:00 +0100 Subject: 03 Desktop. Fix desktop file problems found by `desktop-file-validate' --- zapping.desktop.in.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zapping.desktop.in.in b/zapping.desktop.in.in index c085bc9..d4b0dae 100644 --- a/zapping.desktop.in.in +++ b/zapping.desktop.in.in @@ -1,14 +1,13 @@ [Desktop Entry] -Version=0.9 -Encoding=UTF-8 +Version=1.0 _Name=Zapping TV Viewer _Comment=Lets you watch TV in a window Type=Application Exec=zapping -Icon=zapping/gnome-television.png +Icon=/usr/share/pixmaps/zapping/gnome-television.png Terminal=false StartupNotify=true -Categories=GNOME;Application;Multimedia;AudioVideo;Video;TV; +Categories=GNOME;AudioVideo;Video;TV; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=Zapping X-GNOME-Bugzilla-Version=@VERSION@ -- debian/patches/04-Schemas.patch0000644000000000000000000000157712150206155013451 0ustar From: "Michael H. Schimek" Date: Sun, 18 Jun 2006 03:45:10 +0000 Subject: 04 Schemas. Fix zapping.schemas file, taken from upstream CVS: http://zapping.cvs.sourceforge.net/zapping/zapping/zapping.schemas.in?r1=1.7&r2=1.8&sortby=rev --- zapping.schemas.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zapping.schemas.in b/zapping.schemas.in index 5a5e8ff..d26f9c5 100644 --- a/zapping.schemas.in +++ b/zapping.schemas.in @@ -816,6 +816,12 @@ tests. Zapping string disabled + + Deinterlace method. + Deinterlace method. Valid values are: disabled, VideoBob, + VideoWeave, TwoFrame, Weave, Bob, ScalerBob, EvenOnly, OddOnly, + Greedy, Greedy2Frame, GreedyH, TomsMoComp, MoComp2 + -- debian/patches/05-FTBFS-PowerPC.patch0000644000000000000000000000132412150206155014236 0ustar From: Robert Luberda Date: Thu, 14 Feb 2008 12:56:00 +0100 Subject: 05 FTBFS PowerPC. Fix FTBFS on PowerPC --- libtv/Makefile.am | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libtv/Makefile.am b/libtv/Makefile.am index 71fc049..6ed5969 100644 --- a/libtv/Makefile.am +++ b/libtv/Makefile.am @@ -79,6 +79,15 @@ libtv_SSE_la_SOURCES = \ copy_image.c copy_image.h endif +if CAN_COMPILE_ALTIVEC +SIMD_LIBS += libtv_ALTIVEC.la +libtv_ALTIVEC_la_CFLAGS = $(SIMD_CFLAGS) -maltivec -mabi=altivec -DSIMD=CPU_FEATURE_ALTIVEC +libtv_ALTIVEC_la_SOURCES = \ + clear_image.c clear_image.h \ + copy_image.c copy_image.h +endif + + libtv_la_LIBADD += $(SIMD_LIBS) noinst_LTLIBRARIES = \ -- debian/patches/06-Reqbufs-may-fail.patch0000644000000000000000000000125412150206155015164 0ustar From: Chris Frey Date: Mon, 11 May 2009 03:31:03 -0400 Subject: 06 Reqbufs may fail. Patch from Bug#528167 - it is possible that the ioctl VIDIOC_REQBUFS can return a value greater than 0 on success. --- src/tveng25.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tveng25.c b/src/tveng25.c index 5930b85..e9edcff 100644 --- a/src/tveng25.c +++ b/src/tveng25.c @@ -2575,7 +2575,7 @@ map_xbuffers (tveng_device_info * info, rb.memory = V4L2_MEMORY_MMAP; rb.count = n_buffers; - if (-1 == xioctl (info, VIDIOC_REQBUFS, &rb)) + if (xioctl_may_fail (info, VIDIOC_REQBUFS, &rb) < 0) return FALSE; if (rb.count <= 0) -- debian/patches/07-FTBFS-Python2.6.patch0000644000000000000000000000177312150206155014440 0ustar From: Jakub Wilk Date: Tue, 2 Mar 2010 20:25:43 +0100 Subject: 07 FTBFS Python2.6. Fix for bug #571516: zapping: FTBFS with Python 2.6 as default. --- acinclude.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 9118d7d..a66fd65 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -25,10 +25,9 @@ dnl The name of the python executable PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config" PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION" PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile" - PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE` PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE` PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE` - PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS" + PY_EXTRA_LIBS="$PY_BASEMODLIBS $PY_OTHER_LIBS" PYTHON_LIBS="$PY_LIB_LOC -l$PY_LIBS $PY_EXTRA_LIBS" AC_SUBST(PY_LIBS) AC_SUBST(PY_LIB_LOC) -- debian/patches/08-Spelling-typos.patch0000644000000000000000000000207012150206155015010 0ustar From: Robert Luberda Date: Thu, 11 Mar 2010 15:07:00 +0100 Subject: 08 Spelling typos. Fix spelling typos found by lintian. --- plugins/alirc/alirc.c | 2 +- src/tveng.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/alirc/alirc.c b/plugins/alirc/alirc.c index 03f2881..ceb4899 100644 --- a/plugins/alirc/alirc.c +++ b/plugins/alirc/alirc.c @@ -259,7 +259,7 @@ plugin_start (void) { printv("Couldn't read config file\n"); return FALSE; } - printv("alirc: Succesfully initialize\n"); + printv("alirc: Successfully initialize\n"); lirc_iotag = gtk_input_add_full (fd, GDK_INPUT_READ, diff --git a/src/tveng.c b/src/tveng.c index 3de22fa..8f0c3b8 100644 --- a/src/tveng.c +++ b/src/tveng.c @@ -4070,7 +4070,7 @@ p_tveng_get_display_depth(tveng_device_info * info) if (v == -1) { info -> tveng_errno = -1; - tv_error_msg(info,"Cannot find an appropiate visual"); + tv_error_msg(info,"Cannot find an appropriate visual"); XFree(visual_info); return 0; } -- debian/patches/09-Save-settings.patch0000644000000000000000000000200612150206155014613 0ustar From: Robert Luberda Date: Thu, 14 Oct 2010 15:52:14 +0200 Subject: 09 Save settings. Update control values to get actual volume level stored in settings file. --- src/cmd.c | 2 ++ src/v4linterface.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/cmd.c b/src/cmd.c index 9437588..4ec1f28 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -48,6 +48,8 @@ static PyObject* py_quit (PyObject *self _unused_, if (!zapping) py_return_false; + tveng_update_controls(zapping->info); + quit_muted = TRUE; /* Error ignored */ diff --git a/src/v4linterface.c b/src/v4linterface.c index 21346bb..fa59f28 100644 --- a/src/v4linterface.c +++ b/src/v4linterface.c @@ -1425,7 +1425,10 @@ z_switch_channel (tveng_tuned_channel * channel, { g_free(tc->controls); if (zcg_bool(NULL, "save_controls")) + { + tveng_update_controls(zapping->info); store_control_values(info, &tc->controls, &tc->num_controls); + } else { tc->num_controls = 0; -- debian/patches/10-Man-typos.patch0000644000000000000000000000141212150206155013736 0ustar From: Robert Luberda Date: Sun, 17 Apr 2011 20:10:51 +0200 Subject: 10 Man typos. Fix man page typo found by lintian. --- help/man/zapping.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help/man/zapping.xml b/help/man/zapping.xml index 65286ab..fc7a467 100644 --- a/help/man/zapping.xml +++ b/help/man/zapping.xml @@ -78,7 +78,7 @@ zapping_remote 1 instead. Only one command is - implemented. The command allows + implemented. The command allows one to change the channel by giving the channel name or RF channel number, for example: -- debian/patches/11-FTBFS-libpng1.5.patch0000644000000000000000000000124412150206155014414 0ustar From: Robert Luberda Date: Sat, 3 Dec 2011 15:19:17 +0100 Subject: 11 FTBFS libpng1.5 Fix build with libpng 1.5 (closes: #650580), the error message was: ../../libvbi/exp-gfx.c:1770:6: error: dereferencing pointer to incomplete type --- libvbi/exp-gfx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvbi/exp-gfx.c b/libvbi/exp-gfx.c index 39560b2..15869e7 100644 --- a/libvbi/exp-gfx.c +++ b/libvbi/exp-gfx.c @@ -1767,7 +1767,7 @@ write_png (vbi3_export * e, unsigned int i; unsigned int size; - if (setjmp (png_ptr->jmpbuf)) + if (setjmp (png_jmpbuf(png_ptr))) return FALSE; png_init_io (png_ptr, e->fp); -- debian/patches/12-Ignore-ENUMAUDIO-failure.patch0000644000000000000000000000105112150206155016244 0ustar From: Robert Luberda Date: Wed, 8 Feb 2012 21:29:21 +0100 Subject: 12 Ignore ENUMAUDIO failure. Ignore failure of VIDIOC_ENUMAUDIO. --- src/tveng25.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tveng25.c b/src/tveng25.c index e9edcff..c16e270 100644 --- a/src/tveng25.c +++ b/src/tveng25.c @@ -1313,7 +1313,7 @@ get_audio_input_list (tveng_device_info * info) free_audio_line_list (&info->panel.audio_inputs); - return FALSE; + return TRUE; } /* Sometimes NUL is missing. */ -- debian/patches/13-Assertions-warnings.patch0000644000000000000000000000374412150206155016044 0ustar From: Robert Luberda Date: Sun, 12 Feb 2012 11:46:19 +0100 Subject: 13 Assertions warnings. Get rid of `assertions are deprecated extensions' warnings. --- libtv/misc.h | 9 --------- libvbi/exp-gfx.c | 2 +- libvbi/hamm.h | 2 +- libvbi/misc.h | 8 -------- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/libtv/misc.h b/libtv/misc.h index 2f3791f..e54ef1a 100644 --- a/libtv/misc.h +++ b/libtv/misc.h @@ -47,15 +47,6 @@ # define unlikely(expr) __builtin_expect(expr, 0) #endif -#undef __i386__ -#undef __i686__ -#if #cpu (i386) -# define __i386__ 1 -#endif -#if #cpu (i686) -# define __i686__ 1 -#endif - /* &x == PARENT (&x.tm_min, struct tm, tm_min), safer than &x == (struct tm *) &x.tm_min. A NULL _ptr is safe and will return NULL, not -offsetof(_member). */ diff --git a/libvbi/exp-gfx.c b/libvbi/exp-gfx.c index 15869e7..bbe56c6 100644 --- a/libvbi/exp-gfx.c +++ b/libvbi/exp-gfx.c @@ -559,7 +559,7 @@ color_map_init (struct color_map * cm, ((const uint32_t *)(s))[j] : \ assert (0))))) -#if #cpu (i386) /* unaligned / little endian */ +#if Z_BYTE_ORDER == Z_LITTLE_ENDIAN #define FONT_BITS *((const uint16_t *) s) #else #define FONT_BITS (s[1] * 256 + s[0]) diff --git a/libvbi/hamm.h b/libvbi/hamm.h index 3d7dd62..fd43a7d 100644 --- a/libvbi/hamm.h +++ b/libvbi/hamm.h @@ -117,7 +117,7 @@ vbi3_inline int vbi3_unpar8 (unsigned int c) { #ifdef __GNUC__ -#if #cpu (i686) +#if 0 int r = c & 127; /* This saves cache flushes and an explicit branch. */ diff --git a/libvbi/misc.h b/libvbi/misc.h index 3d66768..e19db58 100644 --- a/libvbi/misc.h +++ b/libvbi/misc.h @@ -42,14 +42,6 @@ # define unlikely(expr) __builtin_expect(expr, 0) #endif -#undef __i386__ -#undef __i686__ -#if #cpu (i386) -# define __i386__ 1 -#endif -#if #cpu (i686) -# define __i686__ 1 -#endif /* &x == PARENT (&x.tm_min, struct tm, tm_min), safer than &x == (struct tm *) &x.tm_min. A NULL _ptr is safe and -- debian/patches/14-Strict-aliasing.patch0000644000000000000000000000103112150206155015105 0ustar From: Robert Luberda Date: Sun, 12 Feb 2012 16:29:38 +0100 Subject: 14 Strict aliasing. Disable strict aliasing for exp-gfx.o. --- libvbi/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/libvbi/Makefile.am b/libvbi/Makefile.am index c892565..6c2ce6d 100644 --- a/libvbi/Makefile.am +++ b/libvbi/Makefile.am @@ -58,6 +58,7 @@ libvbi_la_SOURCES = \ vps.c vps.h \ vt.h +exp-gfx.o exp-gfx.lo: CFLAGS += -fno-strict-aliasing exp-gfx.$(OBJEXT): wstfont2.xbm ccfont3.xbm if MAINTAINER_MODE -- debian/patches/15-Misc-warnings.patch0000644000000000000000000001101212150206155014572 0ustar From: Robert Luberda Date: Sun, 12 Feb 2012 12:50:50 +0100 Subject: 15 Misc warnings. Fix miscellaneous g++ warnings. --- libtv/screen.c | 8 ++++---- libvbi/caption_decoder.c | 2 -- libvbi/conv.c | 4 ++-- libvbi/misc.h | 2 +- libvbi/network-table.h | 2 +- libvbi/teletext.c | 2 -- libvbi/teletext_decoder.c | 2 -- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/libtv/screen.c b/libtv/screen.c index ac5c9cd..544d39e 100644 --- a/libtv/screen.c +++ b/libtv/screen.c @@ -407,7 +407,7 @@ get_display_pixfmt (tv_screen * list, #ifdef HAVE_DGA_EXTENSION /* man XF86DGA */ -#include +#include static tv_pixfmt pixfmt_from_dga_modes (Display * display, @@ -547,7 +547,7 @@ dga_query (tv_screen * list, for (; list; list = list->next) { int flags; - int start; /* physical address (?) */ + unsigned int start; /* physical address (?) */ int width; /* of root window in pixels */ int banksize; /* in bytes, usually video memory size */ int memsize; /* ? */ @@ -580,11 +580,11 @@ dga_query (tv_screen * list, if (TV_SCREEN_DGA_DEBUG) { printv ("DGA screen %d: " - "start=%p width=%d " + "start=%u width=%d " "banksize=%d (0x%x) " "memsize=%d (0x%x)\n", list->screen_number, - (void *) start, width, + start, width, banksize, banksize, memsize, memsize); } diff --git a/libvbi/caption_decoder.c b/libvbi/caption_decoder.c index 25db1ac..179d0b8 100644 --- a/libvbi/caption_decoder.c +++ b/libvbi/caption_decoder.c @@ -1973,7 +1973,6 @@ vbi3_caption_decoder_add_event_handler { unsigned int cc_mask; unsigned int add_mask; - unsigned int rem_mask; /* TODO if (!vbi3_cache_add_event_handler (cd->cache, @@ -1994,7 +1993,6 @@ vbi3_caption_decoder_add_event_handler VBI3_EVENT_PAGE_TYPE); add_mask = cc_mask & ~cd->handlers.event_mask; - rem_mask = cd->handlers.event_mask & ~event_mask; if (0 == cc_mask) { return TRUE; diff --git a/libvbi/conv.c b/libvbi/conv.c index 8d31625..ceb0e36 100644 --- a/libvbi/conv.c +++ b/libvbi/conv.c @@ -129,7 +129,7 @@ xiconv (iconv_t cd, /* iconv() source pointer may be defined as char **, should be const char ** or const void **. Ignore compiler warnings. */ - r = iconv (cd, s, sleft, d, dleft); + r = iconv (cd, (char**) s, sleft, d, dleft); if ((size_t) -1 != r) break; @@ -146,7 +146,7 @@ xiconv (iconv_t cd, sleft1 = csize; - r = iconv (cd, &s1, &sleft1, d, dleft); + r = iconv (cd, (char**) &s1, &sleft1, d, dleft); if ((size_t) -1 == r) break; diff --git a/libvbi/misc.h b/libvbi/misc.h index e19db58..1e5bc4c 100644 --- a/libvbi/misc.h +++ b/libvbi/misc.h @@ -223,7 +223,7 @@ _vbi3_asprintf (char ** dstp, ...); #endif -#define STRCOPY(d, s) (_vbi3_strlcpy (d, s, sizeof (d)) < sizeof (d)) +#define STRCOPY(d, s) (_vbi3_strlcpy (d, s, sizeof (d))) /* Copy bits through mask. */ #define COPY_SET_MASK(to, from, mask) \ diff --git a/libvbi/network-table.h b/libvbi/network-table.h index 3957999..dbd9c62 100644 --- a/libvbi/network-table.h +++ b/libvbi/network-table.h @@ -22,7 +22,7 @@ struct network { struct ttx_header { const char * name; /* UTF-8 */ - const uint8_t * header; /* raw Teletext data */ + const char * header; /* raw Teletext data */ }; static const struct country diff --git a/libvbi/teletext.c b/libvbi/teletext.c index 74f625f..2f19278 100644 --- a/libvbi/teletext.c +++ b/libvbi/teletext.c @@ -2212,12 +2212,10 @@ post_enhance (vbi3_page_priv * pgp) unsigned int row; unsigned int column; unsigned int last_row; - unsigned int last_column; acp = pgp->pg.text; last_row = (1 == pgp->pg.rows) ? 0 : 25 - 2; - last_column = pgp->pg.columns - 1; for (row = 0; row <= last_row; ++row) { for (column = 0; column < pgp->pg.columns; ++acp, ++column) { diff --git a/libvbi/teletext_decoder.c b/libvbi/teletext_decoder.c index 973b0f5..0aa72fd 100644 --- a/libvbi/teletext_decoder.c +++ b/libvbi/teletext_decoder.c @@ -2935,7 +2935,6 @@ decode_packet_27 (vbi3_teletext_decoder * td, if (designation <= 5 && (t1 & (1 << 10))) { unsigned int mag0; - unsigned int validity; /* 9.6.2 Packets X/27/4 and X/27/5 format 1. */ @@ -2947,7 +2946,6 @@ decode_packet_27 (vbi3_teletext_decoder * td, /* GPOP, POP, GDRCS, DRCS */ pn->function = PAGE_FUNCTION_GPOP + (t1 & 3); - validity = (t1 >> 2) & 3; mag0 = (cp->pgno ^ (t1 >> 3)) & 0x700; -- debian/patches/16-Glib-single-include.patch0000644000000000000000000000143012150206155015632 0ustar From: Michael Biebl Date: Sat, 31 Mar 2012 02:06:35 +0200 Subject: 16 Glib single include. Patch for Bug#665630: Including individual glib headers no longer supported. Including invidiual glib headers has been deprecated for several years. Starting with glib 2.32 it is now mandatory to include glib.h instead of individual headers, or the compiler will generate an error. --- src/zvbi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zvbi.c b/src/zvbi.c index bc1c16d..c30829e 100644 --- a/src/zvbi.c +++ b/src/zvbi.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include -- debian/patches/series0000644000000000000000000000062012150206155012025 0ustar 00-Automake.patch 01-FTBFS-libzvbi.patch 02-FTBFS-simd.patch 03-Desktop.patch 04-Schemas.patch 05-FTBFS-PowerPC.patch 06-Reqbufs-may-fail.patch 07-FTBFS-Python2.6.patch 08-Spelling-typos.patch 09-Save-settings.patch 10-Man-typos.patch 11-FTBFS-libpng1.5.patch 12-Ignore-ENUMAUDIO-failure.patch 13-Assertions-warnings.patch 14-Strict-aliasing.patch 15-Misc-warnings.patch 16-Glib-single-include.patch debian/postinst0000644000000000000000000000041412150206155010770 0ustar #!/bin/sh # $Id: postinst 47 2009-08-30 10:25:53Z robert $ set -e if [ "$1" = configure ]; then # create v4l devices ? if [ ! -d /dev/v4l ] || [ ! -c /dev/video0 ] ; then if [ -x /dev/MAKEDEV ]; then (cd /dev; ./MAKEDEV v4l) fi fi fi #DEBHELPER# exit 0 debian/preinst0000644000000000000000000000035312150206155010573 0ustar #!/bin/sh #$Id: preinst 47 2009-08-30 10:25:53Z robert $ set -e if [ "$1" = upgrade ]; then # Remove previous symlink if [ -L /usr/share/gnome/help/zapping ]; then rm -rf /usr/share/gnome/help/zapping fi fi #DEBHELPER# exit 0 debian/rules0000755000000000000000000000504512150206155010247 0ustar #!/usr/bin/make -f export BDIR := BUILD export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -Wall -I$(CURDIR) export QTDIR := /usr export DESTDIR := debian/tmp DH_AUTO_OPTIONS := -v -Sautoconf -B$(BDIR) --parallel ifeq ($(DEB_BUILD_ARCH_OS),linux) CONFIGFLAG += --enable-v4l else CONFIGFLAG += --enable-bktr endif %: force dh "$@" override_dh_auto_build: $(BDIR)/build-arch-stamp override_dh_auto_install: install-into-pkgdir override_dh_auto_configure: $(BDIR)/configure-stamp override_dh_auto_clean: rm -f $(BDIR)/build-arch-stamp $(BDIR)/build-indep-stamp $(BDIR)/configure-stamp dh_autoreconf_clean dh_auto_clean $(DH_AUTO_OPTIONS) override_dh_installdocs: dh_installdocs --link-doc=zapping dh_buildinfo override_dh_fixperms: dh_fixperms -Xzapping_setup_fb override_dh_strip: dh_strip --dbg-package=zapping-dbg $(BDIR)/configure-stamp: rm -f .pc/.*unapply # see bug#649521 dh_autoreconf -v dh_auto_configure $(DH_AUTO_OPTIONS) -- \ $(CONFIGFLAG) \ --x-libraries=/usr/X11R6/lib \ --x-includes=/usr/X11R6/include \ --enable-pam \ --enable-compile-warnings=maximum \ --disable-schemas-install \ --with-gconf-schema-file-dir=\$${prefix}/share/gconf/schemas mv $(BDIR)/libtool $(BDIR)/libtool.old sed -e '/^archive_cmds/{ s/="\\$$CC -shared /&$${wl}--as-needed /;s/ [^ ]*soname[^ ]*/ /g; }' < \ $(BDIR)/libtool.old > $(BDIR)/libtool chmod 755 $(BDIR)/libtool @echo "Config variables:" sed -ne "s/^#define \(.*\) 1 *$$/ \1/p" $(BDIR)/config.h touch "$@" $(BDIR)/build-arch-stamp: $(BDIR)/configure-stamp dh_auto_build $(DH_AUTO_OPTIONS) touch "$@" install-into-pkgdir: $(BDIR)/build-arch-stamp dh_auto_install $(DH_AUTO_OPTIONS) -- LDFLAGS+="$(LDFLAGS)" \ MKINSTALLDIRS="install -d" rm -f $(DESTDIR)/usr/lib/zapping/plugins/*.la # Install xpm icon cp -a debian/gnome-television.xpm $(DESTDIR)/usr/share/pixmaps/zapping # Install the schemas file # cp zapping.schemas $(DESTDIR)/usr/share/gconf/schemas force debian/rules: .PHONY: force debian/rules \ override_dh_auto_build override_dh_auto_clean \ override_dh_auto_configure override_dh_auto_install \ override_dh_strip override_dh_installdocs override_dh_fixperms \ install-into-pkgdir .DEFAULT_GOAL := binary debian/source/0000755000000000000000000000000012150206155010463 5ustar debian/source/format0000644000000000000000000000001412150206155011671 0ustar 3.0 (quilt) debian/source/options0000644000000000000000000000002712150206155012100 0ustar diff-ignore tar-ignore debian/watch0000644000000000000000000000013312150206155010211 0ustar version=3 opts="uversionmangle=s/cvs/~cvs/" \ http://sf.net/zapping/zapping-(.*)\.tar\.bz2 debian/zapping.install0000644000000000000000000000000512150206155012216 0ustar usr/