[SCM] FFmpeg packaging branch, master, updated. debian/0.5.1-2-3-g81c299a

[Andres Mejia]

On Sunday 09 May 2010 17:07:35 Reinhard Tartler wrote:
> On Sat, May 08, 2010 at 09:35:19 (CEST), ceros-guest at users.alioth.debian.org 
wrote:
> > The following commit has been merged in the master branch:
> > commit 81c299a45ae49fe1acd96907c81b2b66af2e922f
> > Author: Andres Mejia <mcitadel at gmail.com>
> > Date:   Sat May 8 03:34:09 2010 -0400
> > 
> >     Fix dependency problem for ffmpeg binary package when using extra
> >     ffmpeg libs.
> 
> I don't understand this patch. What is the issue here? Currently the
> ffmpeg package has dependency like these:
> 
> libavcodec52 (>= 4:0.5.1-3) | libavcodec-extra-52 (>= 4:0.5.1-3),
> libavcodec52 (<< 4:0.5.1-99) | libavcodec-extra-52 (<< 4:0.5.1-99)
> 
> If I understand this patch correctly, the ffmpeg package cannot be
> installed with the binary package from ffmpeg-extra.
> 
> Can you please elaborate on this change?

The problem is that the deb version for ffmpeg-extra might be lower than the 
deb version for main ffmpeg packages. For instance, ffmpeg would expect a 
version of libavcodec-extra-52 (>= 4:0.5.1-3), even though no such package is 
available yet.

> >     This will still leave problem with ffmpeg-dbg, but the debug package
> >     will be useless anyway when using extra ffmpeg libs.
> > 
> > diff --git a/debian/changelog b/debian/changelog
> > index 8f6eee5..60e1d73 100644
> > --- a/debian/changelog
> > +++ b/debian/changelog
> > @@ -1,3 +1,9 @@
> > +ffmpeg (4:0.5.1-4) UNRELEASED; urgency=low
> > +
> > +  * Fix dependency problem for ffmpeg so it can use extra ffmpeg libs.
> > +
> > + -- Andres Mejia <mcitadel at gmail.com>  Sat, 08 May 2010 03:19:37 -0400
> > +
> > 
> >  ffmpeg (4:0.5.1-3) unstable; urgency=low
> >  
> >    * fix ftbfs on powerpc
> 
> seperate commits please
> 
> > diff --git a/debian/rules b/debian/rules
> > index b6d2051..ca852f8 100755
> > --- a/debian/rules
> > +++ b/debian/rules
> > @@ -126,12 +126,13 @@ binary-arch: build install formats.txt
> > 
> >  	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>=
> >  	    $(DEB_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) |
> >  	    $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
> >  	
> >  	done
> >  	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
> > 
> > -	dh_shlibdeps
> > +	dh_shlibdeps -Nffmpeg
> > 
> >  # target dependencies for external packages
> >  
> >  	for pkg in $(LIB_PKGS); do \
> >  	
> >  	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
> >  	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg
> >  	    (>= $(SHLIBS_VERSION))"; \
> >  	
> >  	done
> > 
> > +	dh_shlibdeps -pffmpeg
> 
> I guess the same could have been accomplished by putting 'ffmpeg' in the
> for loop like this:
> 
> for pkg in ffmpeg $(LIB_PKGS); do \
> ...
> 
> But as stated above, I think this is wrong. Or I misunderstood something.

Actually, dh_makeshlibs and dh_shlibdeps do not do the same thing, so what you 
propose won't work. dh_shlibdeps still needs to be run for ffmpeg as well. The 
use of running dh_shlibdeps solely for ffmpeg after the creation of target 
dependencies for external packages was so that ffmpeg could make use of the 
ffmpeg-extra libs, just like any other external package.

-- 
Regards,
Andres Mejia