[SCM] mplayer packaging branch, master, updated. debian/1.0.rc2+svn20090303-2-3-gbc171c9
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Mon Mar 16 11:06:03 UTC 2009
The following commit has been merged in the master branch:
commit bc171c9f8ff71f8bc93a5c66f77614b54b3e0cd3
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date: Mon Mar 16 12:06:06 2009 +0100
Rephrase most of README.Debian\* and README.source
diff --git a/debian/README.Debian b/debian/README.Debian
index 61e569a..c0b9fdd 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,41 +1,54 @@
---------------------- on mplayer configuration
-The performance of MPlayer depends heavily on hardware; this means that
-it may benefit from tweaking options for every single machine it's
-installed on.
-Please see also the documentation provided by the 'mplayer-doc' package.
+MPlayer configuration
+=====================
-Now, some configuration options will be set for the entire system in
-/etc/mplayer/mplayer.conf which may be adapted later. Any user can also
-refine options in ~/.mplayer/config.
+The performance of MPlayer depends heavily on hardware. This means that
+it may benefit from tweaking options for every single machine it is
+installed on. Please refer to the documentation provided by the 'mplayer-doc'
+package.
+Some configuration options for the entire system will be set in the file
+/etc/mplayer/mplayer.conf which may be adapted later. Each user can also
+define private options in ~/.mplayer/config.
---------------------- on debian-multimedia
-Christian Marillat offers many multimedia-related packages in his repository,
-including, for example, 'mencoder' ;
-so you may want to add in /etc/apt/sources.list the line
- deb http://www.debian-multimedia.org etch main
+Unofficial packages
+===================
-But! some packages are both in Debian and in that repository;
-If the versions of packages from that repository are newer than
-those in Debian, you will substitute them; and this is the case of
-mplayer; so, if you do not wish this to happen, you may add
-vvvvvvvvvvvv
-Package: *
-Pin: release o=Unofficial Multimedia Packages
-Pin-Priority: 450
-^^^^^^^^^^
-into /etc/apt/preferences. (This is called "apt pinning"). This will
-give preference to a Debian package. (If you want to give preference
-to Christian's package, use Pin-Priority: 550 )
+There are unofficial mplayer packages, courtesy of Christian Marillat,
+available at the following address:
+ http://www.debian-multimedia.org/
-To know if the above works, you can use the command
-$ apt-cache policy mplayer
+As there are even packages providing the 'mencoder' application as well as
+many other multimedia-related software in this repository, you may want to add
+it to your /etc/apt/sources.list file following the instructions given on the
+Debian Multimedia homepage.
+
+WARNING: Some packages are both in the official Debian and in the unofficial
+ Debian Multimedia repository.
+
+If a package has a newer version in the unofficial repository than in Debian,
+this spackage will automatically be replaced with the unofficial version. This
+may also be the case for the mplayer package!
+
+In order to prevent this situation, you may want to apply a method called
+"apt-pinning" and add the following lines to your /etc/apt/preferences file:
+
+ Package: *
+ Pin: release o=Unofficial Multimedia Packages
+ Pin-Priority: 450
+
+This will give preference to the official Debian package. Otherwise, if you
+want to give preference to the Debian Multimedia packages, choose
+'Pin-Priority: 550'.
+
+To find out if apt-pinning works for you try the following command:
+
+ apt-cache policy mplayer
mplayer:
- Installed : ....
+ Installed : ....
Candidate : 1.0~rc1-8
Table de version :
[version] [??]
@@ -44,78 +57,89 @@ $ apt-cache policy mplayer
500 http://ftp.de.debian.org ustable/main Packages
100 /var/lib/dpkg/status
-Look where the *** are, and what "Candidate:..." says.
-(But, do not trust the output [??] in that list: see bug 254820).
+The line beginning with "Candidate" and the one containing the three asterisks
+"*" indicate the prefered package version. (However, due to bug #254820 the
+output of this command may be even wrong).
+Unfortunately, (due to bug #317186) the following apt-pinning does not
+currently work:
-Unfortunately, currently (see bug 317186), the following
- "apt package pinning" does not work
-vvvvvvvvvvvv
-Package: mplayer
-Pin: release o=Unofficial Multimedia Packages
-Pin-Priority: 450
-^^^^^^^^^^
+ Package: mplayer
+ Pin: release o=Unofficial Multimedia Packages
+ Pin-Priority: 450
a.
----------------------- on performance
+
+MPlayer Performance
+===================
Most options are autodetected or configured during compilation; thus
users get a better performance if they rebuild this package themselves.
In case you would like to change the parameters passed to ./configure,
-set variable DEB_BUILD_CONFIGURE. When this binary was compiled, the
+set variable DEB_BUILD_CONFIGURE. When this binary was compiled, the
variable was set to
DEB_BUILD_CONFIGURE=@DEB_BUILD_CONFIGURE@
-So, recommended method is running
+The recommended method to rebuild the packages is running
+
+ fakeroot debian/rules DEB_BUILD_CONFIGURE="" binary
-$ fakeroot debian/rules DEB_BUILD_CONFIGURE="" binary
+in the top directory of source code. This will reset the hard-coded configure
+flags used for the official Debian package and will optimize the mplayer build
+strictly for your CPU.
-in the top directory of source code: this will reset that variable,
-and will then optimize mplayer strictly for your CPU.
-
-Dariush Pietrzak <eyck at ghost.anime.pl> Sat Jan 5 20:28:23 CET 2002
+Dariush Pietrzak <eyck at ghost.anime.pl> Sat Jan 5 20:28:23 CET 2002
--------------------- on debugging
-if you need to debug this package, you may recompile it with
- "debugging options"
+Debugging
+=========
-one way to do this is
-$ DEB_BUILD_OPTIONS=debug debuild binary
-this will compile the package passing '--enable-debug=-g3' :
-so the sources will be compiled with CFLAGS
- CFLAGS="-W -Wall -O2 -g3 ...arch.. ..cpu.. "
-this is the "upstream preferred way" of debugging mplayer.
+In order to debug the mplayer application, the entire packages need to be
+rebuilt with so called "debugging options" enabled.
-I also implemented
- DEB_BUILD_OPTIONS=noopt
-that will compile without '-O2' , as is recommended by the policy
+One way to achieve this is running
-Whereas DEB_BUILD_OPTIONS=nostrip will make sure that, in the final
-package, all binaries will be unstripped
+ DEB_BUILD_OPTIONS=debug debuild binary
-One warning: the above requires a lot of disk space! the building tree
-is ~380Mb , and the final mplayer is ~90Mb , so you need ~500Mb to
-to a successfull debug building
+which will compile the package passing '--enable-debug=-g3' to the configure
+flags. consequently the sources will be compiled with the following CFLAGS
-There is moreover 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
+ CFLAGS="-W -Wall -O2 -g3 ...arch.. ..cpu.. "
-For this reason, I have hacked up workarounds
-(reenabling optimization for files that fail w/o it)
-but your mileage may vary)
+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.
+
+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.
+
+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
+
+For this reason, I have hacked up workarounds (reenabling optimization for
+files that fail without it) but your mileage may vary...
a.
---------------
-This binary conforms to
+Compliance with the MPlayer binary packaging guide
+==================================================
+
+This binary 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!)
diff --git a/debian/README.Debian.free b/debian/README.Debian.free
index 68294fb..ede0456 100644
--- a/debian/README.Debian.free
+++ b/debian/README.Debian.free
@@ -1,61 +1,64 @@
-#this part is conditionally added if the source was DFSG free
+The following part of the document is conditionally added for packages that
+are built from stripped sources.
--------------
+Stripping of the source code
+============================
-WARNING WARNING WARNING WARNING
+WARNING: The mplayer sources as published in the Debian 'main' component have
+ some parts "stripped", i.e. disabled or removed!
-The sources as published in debian/main have some parts removed!
-
-* In order to update the package yourself and/or review the changes done
+* In order to update the package yourself and/or to review the changes done
to the source code, please see the files:
debian/README.upstream-upgrade
debian/get-orig-source.sh
debian/strip.sh
-* In particular, the mpdvdkit internal library was deleted: so
- mplayer.deb is uncapable to play encrypted DVDs ; if you want to
- play encrypted DVDs (i.e. almost all video DVDs), see the file
- /usr/share/doc/libdvdread3/README.Debian. This file contains
- up-to-date instructions on how to obtain libdvdcss2.
+* In particular, the internal mpdvdkit library was deleted, so the mplayer
+ package provided by Debian is unable to play encrypted DVDs. If you want to
+ play encrypted DVDs (i.e. almost all available Video-DVDs), please follow
+ the instructions in /usr/share/doc/libdvdread3/README.Debian on how to
+ obtain the necessary libdvdcss2 package.
+
+* Please refrain from bothering MPlayer's upstream authors with bug reports
+ and/or feature requests, but use the Debian bug tracking system instead.
+ Missing features and/or bugs may be results of Debian's stripping of the
+ source code.
+
+A. Mennucc with adaptions by Reinhard Tartler and Fabian Greffrath
-* PLEASE DO NOT BOTHER UPSTREAM MPLAYER'S AUTHORS WITH BUGS AND REQUESTS
- FOR FEATURES, but, send bugs to Debian: indeed, missing features
- and/or bugs may be due to my butchering of the upstream code
-A. Mennucc with adaptions by Reinhard Tartler
+Compliance with the GPLv2, sec 2.a
+==================================
--------------- on GPLv2 sec 2.a
+The MPlayer sources contain source code from other GPL libraries, such as
+libavcodec from the FFMpeg project, mp3lib, liba52 and others. Please see the
+file debian/copyright for detailed licensing information.
-MPlayer contains source code from other GPL libraries, such as
- FFMpeg - libavcodec
- mp3lib
- liba52
- ...
-
-See file 'Copyright'.
+During the discussions on debian-legal in 2002-03, it was pointed out
+that MPlayer may not be respecting the following section of the GPL v2:
-During the flames in 2002-03 in debian-legal, it was pointed out
-that mplayer may not be respecting the following section of the GPL v2:
+ 2. You may modify your copy or copies of the Program or any portion of
+ it, thus forming a work based on the Program, and copy and distribute
+ such modifications or work under the terms of Section 1 above, provided
+ that you also meet all of these conditions:
->2. You may modify your copy or copies of the Program or any portion of
->it, thus forming a work based on the Program, and copy and distribute
->such modifications or work under the terms of Section 1 above, provided
->that you also meet all of these conditions:
->
->a) You must cause the modified files to carry prominent notices stating
->that you changed the files and the date of any change.
+ a) You must cause the modified files to carry prominent notices stating
+ that you changed the files and the date of any change.
-this issue is e.g. pointed out in
+This issue is pointed out in detail in the following thread:
http://lists.debian.org/debian-legal/2003/debian-legal-200301/msg00231.html
-Currently mplayer ships many files such as
- liba52/liba52_changes.diff libmpdvdkit2/libdvdread_changes.diff
- libfaad2/local_changes.diff libmpeg2/libmpeg-0.4.0.diff
- libmpdvdkit2/libdvdcss_changes.diff tremor/tremor.diff
+Currently mplayer ships files such as
+ liba52/liba52_changes.diff
+ libfaad2/local_changes.diff
+ libmpdvdkit2/libdvdcss_changes.diff
+ libmpdvdkit2/libdvdread_changes.diff
+ libmpeg2/libmpeg-0.4.0.diff
+ tremor/tremor.diff
to comply with this request.
-Moreover all changes to the code are documented
-in the SVN public repository of MPlayer (that is publicly accessible).
+Moreover all changes to the code are documented in the publicly accessible SVN
+repository of MPlayer.
-A. Mennucc
+A. Mennucc with adaptions by Fabian Greffrath
diff --git a/debian/README.Debian.nonfree b/debian/README.Debian.nonfree
index fe5ddf8..d9a0bd3 100644
--- a/debian/README.Debian.nonfree
+++ b/debian/README.Debian.nonfree
@@ -1,8 +1,11 @@
-#this part is conditionally added if the source was not DFSG free
+The following part of the document is conditionally added for packages that
+are built from pristine upstream sources.
-This version of the mplayer binary and sources contains all the code
-found as published by the mplayer developer team,
+Pristine source code
+====================
-Debian has concern with distributing various bits of it, so it currently
-cannot be included into the debian archive.
+This version of the mplayer binary and source package contains the pristine
+source code as published by the MPlayer development team.
+Since Debian has concern with distributing various bits of the code, it
+cannot currently be included in the Debian 'main' component.
diff --git a/debian/README.source b/debian/README.source
index c507f22..3afcbff 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,7 +1,9 @@
-hi
+This package uses quilt to manage all modifications to the upstream source.
+The fully patched source can be generated using the patch target provided by
+`debian/rules'.
-mplayer source tree uses 'dpatch'. To see the code that is actually compiled,
-run './debian/rules patch'
+If you want to know more about how to use quilt to manage Debian patches, read
+/usr/share/doc/quilt/README.source.
-moreover, the file debian/control is generated from debian/control.in
-(by means of the command './debian/rules autocontrol' )
\ No newline at end of file
+Moreover, the debian/control file is generated from debian/control.in using
+the debian/control target provided by `debian/rules'.
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list