diff -u xvidcap-1.1.6/debian/changelog xvidcap-1.1.6/debian/changelog --- xvidcap-1.1.6/debian/changelog +++ xvidcap-1.1.6/debian/changelog @@ -1,3 +1,11 @@ +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 diff -u xvidcap-1.1.6/debian/control xvidcap-1.1.6/debian/control --- xvidcap-1.1.6/debian/control +++ xvidcap-1.1.6/debian/control @@ -7,8 +7,8 @@ Standards-Version: 3.7.3 Build-Depends: debhelper (>> 5), libjpeg62-dev, libglade2-dev, libxt-dev, libxmu-dev, scrollkeeper, libxml-parser-perl, dpatch, - libxdamage-dev, libavcodec-dev, libswscale-dev, liblame-dev, - libavutil-dev, libavformat-dev, libgtk2.0-dev (>= 2.6.0), bc + libxdamage-dev, libavcodec-dev, libswscale-dev, libmp3lame-dev | + liblame-dev, libavutil-dev, libavformat-dev, libgtk2.0-dev (>= 2.6.0), bc Package: xvidcap Architecture: any diff -u xvidcap-1.1.6/debian/patches/00list xvidcap-1.1.6/debian/patches/00list --- xvidcap-1.1.6/debian/patches/00list +++ xvidcap-1.1.6/debian/patches/00list @@ -1,0 +2 @@ +02_xtoffmpeg_ftbfs only in patch2: unchanged: --- xvidcap-1.1.6.orig/debian/patches/02_xtoffmpeg_ftbfs.dpatch +++ xvidcap-1.1.6/debian/patches/02_xtoffmpeg_ftbfs.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_xtoffmpeg_ftbfs.dpatch by Iain Lane +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Backport some changes from xvidcap 1.1.7 to fix an FTBFS due to ffmpeg API changes + +@DPATCH@ +diff -urNad xvidcap-1.1.6~/src/xtoffmpeg.c xvidcap-1.1.6/src/xtoffmpeg.c +--- xvidcap-1.1.6~/src/xtoffmpeg.c 2007-05-12 23:24:22.000000000 +0100 ++++ xvidcap-1.1.6/src/xtoffmpeg.c 2008-09-02 13:49:41.000000000 +0100 +@@ -307,7 +307,7 @@ + + // prepare input stream + memset (ap, 0, sizeof (*ap)); +- ap->device = job->snd_device; ++ //ap->device = job->snd_device; + + if (grab_audio) { + ap->sample_rate = target->sndrate; +@@ -324,7 +324,7 @@ + } + + err = +- av_open_input_file (&ic, ap->device, (grab_audio ? grab_iformat : NULL), ++ av_open_input_file (&ic, job->snd_device, (grab_audio ? grab_iformat : NULL), + 0, ap); + if (err < 0) { + fprintf (stderr, _("%s %s: error opening input file %s: %i\n"),