--- xvidcap-1.1.7.orig/debian/watch +++ xvidcap-1.1.7/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/xvidcap/xvidcap-([\d.]*).tar.gz --- xvidcap-1.1.7.orig/debian/control +++ xvidcap-1.1.7/debian/control @@ -0,0 +1,23 @@ +Source: xvidcap +Section: x11 +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Christian Marillat +Bugs: mailto:marillat@debian.org +Homepage: http://xvidcap.sourceforge.net/ +Standards-Version: 3.8.0 +Build-Depends: debhelper (>> 7), libjpeg62-dev, libglade2-dev, libxt-dev, + libxmu-dev, scrollkeeper, libxml-parser-perl, quilt, libxdamage-dev, + libavcodec-dev (>= 3:0.svn20080414-0.2), libswscale-dev (>= 3:0.svn20080414-0.2), + libmp3lame-dev, libavformat-dev (>= 3:0.svn20080414-0.2), libgtk2.0-dev (>= 2.6.0), + libavdevice-dev (>= 3:0.svn20080414-0.2), libdbus-glib-1-dev + +Package: xvidcap +Architecture: any +Depends: ${shlibs:Depends}, imagemagick, dbus-x11 +Description: Screen video capture for X + A screen capture enabling you to capture videos off your X-Window desktop + for illustration or documentation purposes. It is intended to be a + standards-based alternative to tools like Lotus ScreenCam. + . + Video can be saved in MPEG or AVI files format. --- xvidcap-1.1.7.orig/debian/compat +++ xvidcap-1.1.7/debian/compat @@ -0,0 +1 @@ +6 --- xvidcap-1.1.7.orig/debian/rules +++ xvidcap-1.1.7/debian/rules @@ -0,0 +1,102 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) + +ifeq ($(NCPUS),-1) + NCPUS:=1 +endif + +ifeq ($(NCPUS),0) + NCPUS:=1 +endif + +CFLAGS += -I/usr/include/ffmpeg + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else + CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + +configure: configure-stamp +configure-stamp: debian/stamp-patched + dh_testdir + + ./configure --prefix=/usr $(CROSS) --mandir=\$${prefix}/share/man \ + --without-forced-embedded-ffmpeg LDFLAGS="-Wl,--as-needed" \ + CFLAGS="$(CFLAGS)" LIBS="-lavdevice" + + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + $(MAKE) -j $(NCPUS) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + [ ! -f config.mak: ] || [ ! -f ffmpeg/common.mak ] || $(MAKE) -C ffmpeg distclean + + -rm ffmpeg/*.pc + find -name *.omf.out | xargs -r rm + find -name *.o | xargs -r rm + find -name *.a | xargs -r rm + -rm ffmpeg/config.{log,h,err} + + find ffmpeg -type l | xargs -r rm + + debian/rules unpatch + + dh_clean intltool-extract intltool-update intltool-merge \ + ffmpeg/version.h net.jarre_de_the.Xvidcap.service + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install prefix=$(CURDIR)/debian/xvidcap/usr + + rm debian/xvidcap/usr/share/doc/xvidcap/ChangeLog + rm debian/xvidcap/usr/share/doc/xvidcap/COPYING + +# Prune empty directories + find debian -type d | xargs rmdir -p --ignore-fail-on-non-empty + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installmenu + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- xvidcap-1.1.7.orig/debian/changelog +++ xvidcap-1.1.7/debian/changelog @@ -0,0 +1,181 @@ +xvidcap (1.1.7-0.2ubuntu2) karmic; urgency=low + + * No-change rebuild to pick up new shlibs file of ffmpeg. + + -- Stefan Potyra Thu, 27 Aug 2009 22:28:43 +0200 + +xvidcap (1.1.7-0.2ubuntu1) jaunty; urgency=low + + [ Andrew Starr-Bochicchio ] + * Merge from debian-multimedia (LP: #298547), Ubuntu Changes: + - For ffmpeg-related build-deps, fix versionized dependencies + as the ubuntu versioning is different than debian-multimedia's. + + [ Lionel Le Folgoc ] + * LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision. + * debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API + change (cherry-pick from Gentoo #234383). + + -- Lionel Le Folgoc Fri, 26 Dec 2008 00:10:06 +0100 + +xvidcap (1.1.7-0.2) unstable; urgency=low + + * Should depends on dbus-x11. + + -- Christian Marillat Sun, 19 Oct 2008 10:32:10 +0200 + +xvidcap (1.1.7-0.1) unstable; urgency=low + + * Depend on imagemagick since 'animate' is used to create animations + from ppm files. + + -- Christian Marillat Thu, 28 Aug 2008 12:08:32 +0200 + +xvidcap (1.1.7-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 15 Jul 2008 08:35:50 +0200 + +xvidcap (1.1.7~rc1-0.3) unstable; urgency=low + + * Rebuild against the new libmp3lame package. + * New patch 04_av_free_static to not call the deprecated av_free_static + ffmpeg function. + + -- Christian Marillat Sun, 06 Jul 2008 18:19:00 +0200 + +xvidcap (1.1.7~rc1-0.2) unstable; urgency=low + + * Rebuild against latest ffmpeg libraries. + + -- Christian Marillat Wed, 21 May 2008 13:53:25 +0200 + +xvidcap (1.1.7~rc1-0.1) unstable; urgency=low + + * Updated upstream patch for new ffmpeg includes path. + + -- Christian Marillat Wed, 16 Apr 2008 11:10:31 +0200 + +xvidcap (1.1.7~rc1-0.0) unstable; urgency=low + + * New upstream RC release with patch to build with latest ffmepg. + * Added Homepage field. + * Added libdbus-glib-1-dev in Build-depdens. + * Updated Standards-Version to 3.7.3 (no changes). + + -- Christian Marillat Thu, 20 Mar 2008 12:13:23 +0100 + +xvidcap (1.1.6-0.2) unstable; urgency=low + + * Removed bc from Build-Depends. + + -- Christian Marillat Sat, 02 Jun 2007 11:16:40 +0200 + +xvidcap (1.1.6-0.1ubuntu3) intrepid; urgency=low + + * Rebuild against libmp3lame-dev as part of ongoing transition (LP: #263876) + * debian/patches/02_xtoffmpeg_ftbfs.dpatch: Backport a couple of changes + from upstream to resolve FTBFS due to ffmpeg API changes (LP: #250054) + + -- Iain Lane Tue, 02 Sep 2008 14:09:10 +0100 + +xvidcap (1.1.6-0.1ubuntu2) intrepid; urgency=low + + * No-change rebuild against new ffmpeg + + -- Reinhard Tartler Mon, 09 Jun 2008 14:23:18 +0200 + +xvidcap (1.1.6-0.1ubuntu1) hardy; urgency=low + + * Merge from debian-multimedia (LP: #120003), Ubuntu Changes: + - For ffmpeg-related build-deps, remove cvs from package names. + - Standards-Version 3.7.3 + - Maintainer Spec + + -- John Dong Mon, 25 Feb 2008 15:47:12 -0500 + +xvidcap (1.1.6-0.1) unstable; urgency=low + + * Update libswscale-dev to libswscalecvs0-dev in Build-Depends + + -- Christian Marillat Sat, 02 Jun 2007 09:44:46 +0200 + +xvidcap (1.1.6-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 01 Jun 2007 17:14:44 +0200 + +xvidcap (1.1.5-0.1) unstable; urgency=low + + * Add bc in Build-Depends. + + -- Christian Marillat Fri, 27 Apr 2007 08:58:29 +0200 + +xvidcap (1.1.5-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 26 Apr 2007 10:33:50 +0200 + +xvidcap (1.1.5~rc3-0.0) unstable; urgency=low + + * New upstream release. + * Replace xterm by x-terminal-emulator. + + -- Christian Marillat Wed, 18 Apr 2007 10:44:08 +0200 + +xvidcap (1.1.4-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 5 Dec 2006 11:02:26 +0100 + +xvidcap (1.1.3+1.1.4pre3-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 11 Jul 2006 14:28:35 +0200 + +xvidcap (1.1.3-0.2) unstable; urgency=low + + * Build with -DHAVE_FFMPEG_AUDIO to enable audio in avi files. Thanks to + Emil Nowak. + + -- Christian Marillat Wed, 27 Apr 2005 22:19:06 +0200 + +xvidcap (1.1.3-0.1) unstable; urgency=low + + * debian/control Added libxt-dev | xlibs-dev, libxmu-dev | xlibs-dev in + Build-Depends. + + -- Christian Marillat Thu, 3 Feb 2005 22:38:58 +0100 + +xvidcap (1.1.3-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 29 Aug 2004 10:53:42 +0200 + +xvidcap (1.1.2-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 21 Dec 2003 15:34:42 +0100 + +xvidcap (1.0.9-2) unstable; urgency=low + + * Updated to Standards-Version 3.5.8 + + -- Christian Marillat Sat, 23 Nov 2002 15:46:35 +0100 + +xvidcap (1.0.9-1) unstable; urgency=low + + * Initial Release. + + -- Christian Marillat Sun, 1 Jul 2001 17:46:17 +0200 + +Local variables: +mode: debian-changelog +End: --- xvidcap-1.1.7.orig/debian/copyright +++ xvidcap-1.1.7/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Christian Marillat on +Sun, 1 Jul 2001 17:46:17 +0200. + +It was downloaded from http://xvidcap.sourceforge.net/ + +Upstream Author: Rasca + Karl H. Beckers + +Copyright: 1998, 1999 Rasca 2003 Karl H. Beckers + + 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. --- xvidcap-1.1.7.orig/debian/patches/02_xterm.diff +++ xvidcap-1.1.7/debian/patches/02_xterm.diff @@ -0,0 +1,15 @@ +--- xvidcap-1.1.4p1.orig/src/app_data.c 2007-04-18 10:28:17.000000000 +0200 ++++ xvidcap-1.1.4p1/src/app_data.c 2007-04-18 10:29:08.000000000 +0200 +@@ -375,10 +375,10 @@ + lapp->multi_frame.file = "test-%04d.mpeg"; + + lapp->multi_frame.edit_cmd = +- _("xterm -e \"echo none specified; echo hit enter to dismiss; read\""); ++ _("x-terminal-emulator -e \"echo none specified; echo hit enter to dismiss; read\""); + lapp->multi_frame.video_cmd = + _ +- ("xterm -e \"echo not needed for multi-frame capture; echo hit enter to dismiss; read\""); ++ ("x-terminal-emulator -e \"echo not needed for multi-frame capture; echo hit enter to dismiss; read\""); + lapp->multi_frame.play_cmd = "mplayer \"${XVFILE}\" &"; + #endif // USE_FFMPEG + lapp->single_frame.play_cmd = --- xvidcap-1.1.7.orig/debian/patches/series +++ xvidcap-1.1.7/debian/patches/series @@ -0,0 +1,3 @@ +01_configure.diff +02_xterm.diff +03_ffmpeg.diff \ No newline at end of file --- xvidcap-1.1.7.orig/debian/patches/01_configure.diff +++ xvidcap-1.1.7/debian/patches/01_configure.diff @@ -0,0 +1,31 @@ +--- xvidcap-1.1.7~rc1.orig/configure ++++ xvidcap-1.1.7~rc1/configure +@@ -13481,7 +13481,7 @@ + + + +-ac_config_files="$ac_config_files doc/Makefile doc/xvidcap/Makefile doc/xvidcap/C/Makefile doc/xvidcap/de/Makefile doc/xvidcap/it/Makefile doc/xvidcap/es/Makefile doc/man/Makefile doc/man/C/Makefile doc/man/de/Makefile doc/man/it/Makefile doc/man/es/Makefile po/Makefile.in debian/Makefile src/Makefile Makefile" ++ac_config_files="$ac_config_files doc/Makefile doc/xvidcap/Makefile doc/xvidcap/C/Makefile doc/xvidcap/de/Makefile doc/xvidcap/it/Makefile doc/xvidcap/es/Makefile doc/man/Makefile doc/man/C/Makefile doc/man/de/Makefile doc/man/it/Makefile doc/man/es/Makefile po/Makefile.in src/Makefile Makefile" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -14210,7 +14210,6 @@ + "doc/man/it/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/it/Makefile" ;; + "doc/man/es/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/es/Makefile" ;; + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; +- "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; +--- xvidcap-1.1.7~rc1.orig/Makefile.in ++++ xvidcap-1.1.7~rc1/Makefile.in +@@ -242,8 +242,7 @@ + doc_SUBDIRS = doc + SUBDIRS = $(doc_SUBDIRS) \ + src \ +- po \ +- debian ++ po + + pkgdata_DATA = xvidcap.desktop \ + xvidcap.png \ --- xvidcap-1.1.7.orig/debian/patches/03_ffmpeg.diff +++ xvidcap-1.1.7/debian/patches/03_ffmpeg.diff @@ -0,0 +1,65 @@ +--- ./src/xtoffmpeg.c.orig 2008-07-15 08:39:14.000000000 +0200 ++++ ./src/xtoffmpeg.c 2008-07-15 08:42:30.000000000 +0200 +@@ -56,13 +56,12 @@ + #include "xvidcap-intl.h" + + // ffmpeg stuff +-#include +-#include +-#include ++#include ++#include ++#include + //#include +-#include +-#include +-#include ++#include ++#include + #define swscale_isRGB(x) ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24 \ + || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \ + || (x)==PIX_FMT_RGB8 || (x)==PIX_FMT_RGB4 \ +@@ -1248,7 +1248,11 @@ + st->codec->flags |= CODEC_FLAG2_FAST; + // there is no trellis quantiser in libav* for mjpeg + if (st->codec->codec_id != CODEC_ID_MJPEG) ++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + st->codec->flags |= CODEC_FLAG_TRELLIS_QUANT; ++#else ++ st->codec->trellis = 1; ++#endif + st->codec->flags &= ~CODEC_FLAG_OBMC; + // some formats want stream headers to be seperate + if (oc->oformat->flags & AVFMT_GLOBALHEADER) +--- ./src/codecs.c.orig 2008-07-15 08:43:19.000000000 +0200 ++++ ./src/codecs.c 2008-07-15 08:43:51.000000000 +0200 +@@ -43,8 +43,8 @@ + #include + + #ifdef USE_FFMPEG +-#include +-#include ++#include ++#include + #endif // USE_FFMPEG + + #include "app_data.h" +--- ./src/main.c.orig 2008-07-15 08:48:33.000000000 +0200 ++++ ./src/main.c 2008-07-15 08:49:06.000000000 +0200 +@@ -45,7 +45,7 @@ + #include + + #ifdef USE_FFMPEG +-#include ++#include + #endif // USE_FFMPEG + + #include "control.h" +@@ -218,7 +218,4 @@ + if (app) + xvc_appdata_free (app); +-#ifdef USE_FFMPEG +- av_free_static (); +-#endif + } +