[Bug 829849] [NEW] [FFe] Sync mplayer 2:1.0~rc4.dfsg1+svn33713-1 from Debian experimental

[Launchpad Bug Tracker]

You have been subscribed to a public bug by Colin Watson (cjwatson):

Dear Ubuntu release team,

As you may know, I've been trying to finish off the libav 0.7 transition
in Oneiric, and finally steeled myself to look at mplayer.  At first
sight, I thought that it might be possible to apply some light API
tweaks to port it to libav 0.7; after all, it uses the system libraries
so the older code in the source tree wouldn't be a problem, right?

Wrong.

The current version of mplayer in Oneiric does *build* against libav 0.7
with only four lines of source code that need to be changed.
Unfortunately, it segfaults when you try to *run* it.  After some
investigation, I realised that this is because, even if you build it
against a system libav, it still uses the headers from its own source
tree, so if those headers are based on a version of ffmpeg/libav whose
ABI is out of sync with that of the system libav, then structure sizes
aren't going to match up and so of course everything will go wrong.

There is a version of mplayer in Debian experimental which is built
against libav 0.7.  The diff from what we currently have is fairly
gigantic: 64MB!  If I filter out all the built-in ffmpeg/libav changes,
libfaad2, and documentation, it comes down to a more manageable 6MB.
I've attached the gzipped result of that to this bug report.

The upstream changelog diff reads as follows:

+  rc5:
+
+    Decoders:
+    * FFmpeg AAC decoder is now preferred over libfaad2 and the internal
+      libfaad2 forked copy has been removed in its favor
+
+    Demuxers:
+    * experimental support for using binary Quicktime codecs with -demuxer lavf.
+
+    Filters:
+    * delogo: allow to change the rectangle based on the time.
+
+    Other:
+    * experimental support for PGS (BluRay-compatible), DVB and XSUB subtitles.
+    * experimental af_cmdline slave command to change e.g. audio equalizer options at runtime.
+
+    MEncoder:
+    * -force-key-frames option to set explicit seek points.

And here's the debian/changelog diff:

+mplayer (2:1.0~rc4.dfsg1+svn33713-1) experimental; urgency=low
+
+  * New upstream snapshot
+    - update 23mplayer-debug-printf.patch
+    - fixes miscompilation with gcc 4.6, Closes: #623304
+    - improved internal mkv demuxer, Closes: #595452
+    - Fixed segfault due to missing sanitation on playlist files,
+      Closes: #591525
+    - Fixed byteorder on 16-bit displays, Closes: #594093
+    - tighten build depends on libav
+    - --enable-largefile switch has been dropped
+    - add build dependency on yasm
+  * Fix build dependency on libjpeg-dev, Closes: #634277
+  * rewrite debian/copyright in DEP5 format
+  * fix clean target
+  * don't remove snapshot_version file
+  * enable XVID, MP3 and X264 encoders
+  * simply architecture specific dependencies, Closes: #634773
+  * make buildlogs verbose
+  * unbreak building mplayer-doc package
+  * don't fail debian package build if not all shlibdeps information could be retrieved
+  * update configure flags for static libav* libraries
+  * fix spelling in mplayer-dbg description, Closes: #617826
+  * enable blueray support, Closes: #577761
+
+  [ Robert Millan ]
+  * Select oss as default audio output module on kFreeBSD, Closes: #598431
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 25 Jun 2011 09:05:54 +0200
+
+mplayer (2:1.0~rc4.dfsg1-2) unstable; urgency=low
+
+  [ Fabian Greffrath ]
+  * Update documentation with regard to our modifications to the upstream tarball.
+
+  [ Reinhard Tartler ]
+  * really no longer build mplayer-gui, Closes: #612473
+  * simplify/remove instruction to get upstream sources
+  * normalize debian/{control,copyright,mplayer.install} with wrap-and-sort
+  * bump standards version
+
+ -- Reinhard Tartler <siretart at tauware.de>  Thu, 03 Mar 2011 18:04:07 +0100

On the plus side, as far as I can see, the entire Debian->Ubuntu diff
has been integrated into the package in experimental, so we could simply
sync this without needing to worry about an outstanding Ubuntu delta.
These were the outstanding changes (discounting 2:1.0~rc4.dfsg1-1ubuntu3
which was a no-change upload), all of which were merged:

mplayer (2:1.0~rc4.dfsg1-1ubuntu2) natty; urgency=low

  * Finish Merge from debian/unstable. Remaining changes:
    - Build depend on lame, x264, xvidcore and libbluray

 -- Reinhard Tartler <siretart at tauware.de>  Sat, 26 Feb 2011 14:37:59
+0100

mplayer (2:1.0~rc4.dfsg1-1ubuntu1) natty; urgency=low

  * Merge from debian unstable. Remaining changes:
    - build depend against, lame, x264, xvid
  * Dropped changes, applied upstream:
    - debian/patches/60eval-api.patch, backport patch from upstream to
      unbreak compilation for eval.h move not yet in 0.6

 -- Angel Abad <angelabad at ubuntu.com>  Mon, 07 Feb 2011 15:21:29 +0100

I think there is probably very little alternative to syncing this, but
it clearly needs a feature freeze exception, so if anyone thinks that
they can fix things up less invasively then do speak up now.  If we're
going to sync it, the sooner the better.  I've built it in pbuilder and
given it a brief try, and it seems to be working fine.

** Affects: mplayer (Ubuntu)
     Importance: Medium
         Status: Confirmed

-- 
[FFe] Sync mplayer 2:1.0~rc4.dfsg1+svn33713-1 from Debian experimental
https://bugs.launchpad.net/bugs/829849
You received this bug notification because you are a member of Ubuntu Package Archive Administrators, which is subscribed to the bug report.