[SCM] mplayer packaging branch, master, updated. debian/1.0.rc2+svn20090303-2-14-g5e0cde5

[mennucc1 at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5e0cde55e29352bd375e9980e5f02b2bfa25ac3f
Author: Andrea Mennucc <mennucc1 at debian.org>
Date:   Sun Mar 22 16:10:29 2009 +0100

    correct README.Debian where it talks of debugging;
    add recommends on ffmpeg-dbg

diff --git a/debian/README.Debian b/debian/README.Debian
index 98d0827..98ac52b 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -93,45 +93,23 @@ strictly for your CPU.
 
 Dariush Pietrzak <eyck at ghost.anime.pl> Sat Jan 5 20:28:23 CET 2002
 
+Shared linking
+==============
 
-Debugging
-=========
-
-In order to debug the mplayer application, the entire packages need to be
-rebuilt with so called "debugging options" enabled.
-
-One way to achieve this is running
-
-  DEB_BUILD_OPTIONS=debug debuild binary
-
-which will compile the package passing '--enable-debug=-g3' to the configure
-flags. consequently the sources will be compiled with the following CFLAGS
-
-  CFLAGS="-W -Wall -O2 -g3 ...arch.. ..cpu.. "
+A factor affecting performance may be also that MPlayer in Debian
+is shared-linked to FFMpeg. To avoid it, delete the line
+30link-system-ffmpeg.patch from debian/patches/series
 
-This is the method of debugging mplayer as prefered upstream.
-
-Another possible way is rebuilding with
-
-  DEB_BUILD_OPTIONS=noopt
-
-that will compile without '-O2', as recommended by the Debian policy.
-
-Whereas rebuilding with DEB_BUILD_OPTIONS=nostrip will make sure that all
-binaries will be unstripped in the resulting packages.
+a.
 
-WARNING: The above methods require a lot of disk space! The building tree will
-         be about 400 MB and the final mplayer will be about 100 MB, so about
-         500 MB of disk space will be needed for a successful debug building.
+Debugging
+=========
 
-Moreover, there is a huge catch: Some code in mplayer (particularly asm code
-for MMX/SSE) does not compile on some architectures when optimizations is
-disabled, see
-  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11203
-  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13850
+Currently MPlayer in Debian is compiled with
+ ./configure --enable-debug
 
-For this reason, I have hacked up workarounds (reenabling optimization for
-files that fail without it) but your mileage may vary...
+Debugging symbols are stored into the package 'mplayer-dbg' and
+are automatically available to 'gdb' once that package is installed.
 
 a.
 
@@ -139,11 +117,8 @@ a.
 Compliance with the MPlayer binary packaging guide
 ==================================================
 
-This binary conforms to
+This binary roughly conforms to
  http://www.mplayerhq.hu/DOCS/tech/binary-packaging.txt
-but for the following notes and exceptions:
-*E* the GUI does not come as a separate package (it would save no disk space!)
-*N* to avoid stripping, use DEB_BUILD_OPTIONS=nostrip
-    to enable debugging, use DEB_BUILD_OPTIONS=nostrip,debug
+but it may better.
 
- -- A Mennucc <mennucc1 at debian.org>, Sun, 22 Mar 2009 15:49:03 +0100
+ -- A Mennucc <mennucc1 at debian.org>, Sun, 22 Mar 2009 16:04:44 +0100
diff --git a/debian/control b/debian/control
index 3eb9e97..bce9e99 100644
--- a/debian/control
+++ b/debian/control
@@ -99,6 +99,7 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: mplayer, ${misc:Depends}
+Recommends: ffmpeg-dbg
 Description: debugging symbols for MPlayer
  This package contains the debugging symbols for MPlayer, a movie
  player for Unix-like systems. You only need these if you want to
diff --git a/debian/control.mplayer b/debian/control.mplayer
index 3eb9e97..bce9e99 100644
--- a/debian/control.mplayer
+++ b/debian/control.mplayer
@@ -99,6 +99,7 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: mplayer, ${misc:Depends}
+Recommends: ffmpeg-dbg
 Description: debugging symbols for MPlayer
  This package contains the debugging symbols for MPlayer, a movie
  player for Unix-like systems. You only need these if you want to
diff --git a/debian/control.mplayer-non-dfsg b/debian/control.mplayer-non-dfsg
index 3eb9e97..bce9e99 100644
--- a/debian/control.mplayer-non-dfsg
+++ b/debian/control.mplayer-non-dfsg
@@ -99,6 +99,7 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: mplayer, ${misc:Depends}
+Recommends: ffmpeg-dbg
 Description: debugging symbols for MPlayer
  This package contains the debugging symbols for MPlayer, a movie
  player for Unix-like systems. You only need these if you want to

-- 
mplayer packaging