[MPlayer-dev-eng] [PATCH] debian/ dir revisited
Gabucino
gabucino at mplayerhq.hu
Sun Nov 24 22:37:56 CET 2002
I just installed Debian and took a look at mplayer's debian/ dir.
I want opinions of Debian packagers about the attached patch. It
should be self explanatory, I'm going to sleep now.
--
Gabucino
-------------- next part --------------
diff -Naur debian/TODO.Debian debian.new/TODO.Debian
--- debian/TODO.Debian Tue Aug 28 21:34:32 2001
+++ debian.new/TODO.Debian Sun Nov 24 17:41:59 2002
@@ -1,12 +1,12 @@
-- create packages of mp_font3 and win32codecs, depend/recommend them.
-- fibmap_mplayer - figure out what to do with suid.
+- create packages of mp_font (TTF? BITMAP? AND HOW?), depend/recommend them.
+- create package for win32codecs (WHY?)
- global configuration
( /etc/mplayer/mplayer.conf
/etc/mplayer/codecs.conf
/usr/lib/mplayer/font )
-- Add script for copying *.dlls from users windows directory,
+- OBSOLETED: fibmap_mplayer - figure out what to do with suid.
+- OBSOLETED: create package with odivx and make this one depend/recommend it
+- OBSOLETED: Add script for copying *.dlls from users windows directory,
or figure out some other way of satisfying other dependencies
like *.dlls and fonts.
In other words - automate win32dll.zip installation.
-
-- create package with odivx and make this one depend/recommend it
diff -Naur debian/changelog debian.new/changelog
--- debian/changelog Mon Oct 21 22:43:35 2002
+++ debian.new/changelog Sun Nov 24 20:24:50 2002
@@ -1,3 +1,15 @@
+mplayer (0.90pre10-0) unstable; urgency=low
+
+ * new release.
+ * now compiled with --enable-runtime-cpudetection for safety reasons.
+ Disable it for slightly better performance, but the package will run only
+ on the CPU the build machine had.
+ * updated package description
+ * we can now use several default -vo and -ao options, in priority order
+ (thus libvo device selection is obsoleted -> DELETED)
+
+ -- Gabucino <gabucino at mplayerhq.hu> Sun, 24 Nov 2002 17:01:12 +0100
+
mplayer (0.90pre9-0) unstable; urgency=low
* new release.
diff -Naur debian/config debian.new/config
--- debian/config Wed Aug 28 18:09:15 2002
+++ debian.new/config Thu Jan 1 01:00:00 1970
@@ -1,99 +0,0 @@
-#!/usr/bin/perl -w
-
-# Script to configure mplayer
-# based on etherconf by John Goerzen <jgoerzen at progenylinux.com>
-
-use Debconf::Client::ConfModule qw(:all);
-
-
-my $version = version(2.0);
-title('MPlayer Configuration');
-my $PRIORITY = 'high';
-#TODO: 'medium'
-my $next = 'mainmenu';
-my $isediting = 0;
-
-my @nextargs = ();
-
-checkupgrade(); # Find out if we have to upgrade.
-mainloop(letsgo());
-
-sub checkupgrade {
- open(MCFG, "</etc/mplayer/mplayer.conf") || return 1;
- my $line = <MCFG>;
- return 1 if ($line =~ /mplayer DEBCONF AREA/);
- exit(0) if (input($PRIORITY, 'mplayer/replace-existing-files') eq "question skipped");
- go();
- if (get('mplayer/replace-existing-files') eq 'false') {
- input($PRIORITY, 'mplayer/replace-existing-files-bail');
- go();
- exit();
- }
- close MCFG;
-}
-
-sub mainloop {
- $next = shift @_;
- do {
- my @retval = &$next(@nextargs);
- # if ($retval[0] eq 'BACK') {
- # $retval[0] = $backups{$next};
- # }
- ($next, @nextargs) = @retval;
- } while ($next ne 'Exit');
-}
-
-sub letsgo {
-#useless!
- return "configure";
-}
-
-sub configure {
- subst("mplayer/voutput", "vochoices", "xv, xmga, mga, x11, gl, sdl, xvidix");
- # db_subst mplayer/output vo xc,xmga,mga,x11,gl,sdl
- exit(0) if (input($PRIORITY, "mplayer/voutput") eq "question skipped");
- go();
- exit 0 unless (get("mplayer/voutput") eq 'true');
- #return 'audioout';
- return 'mainmenu';
-}
-
-sub mainmenu {
- go(); # To catch spare things from before
- my @choices = (
- 'Video Output: ' . scalar(get("mplayer/voutput")));
- #,
- $choices = join(', ', @choices);
- $isediting = 1;
-
- subst('mplayer/mainmenu', 'choices', $choices);
- input($PRIORITY, 'mplayer/mainmenu');
- go();
-
- my $selection = get('mplayer/mainmenu');
- if ($selection =~ /^Exit/) {
- return 'Exit';
- }
-
- # Set to redisplay.
- fset('mplayer/mainmenu', 'isdefault', 'true');
-
- $_ = $selection;
-
- return 'configure' if /^Video/;
-# return 'aoutput' if /^Aoutput/;
- return 'Exit';
-}
-
-sub editreturn {
- my @args = @_;
- return 'mainmenu' if $isediting;
- return @args;
-}
-
-sub editfix {
- my $template = shift @_;
- if ($isediting) {
- fset($template, 'isdefault', 'true');
- }
-}
diff -Naur debian/control debian.new/control
--- debian/control Mon Oct 21 22:43:35 2002
+++ debian.new/control Sun Nov 24 17:27:44 2002
@@ -9,16 +9,23 @@
Architecture: any
Depends: ${shlibs:Depends},debconf,libconfhelper-perl
Description: The Ultimate Movie Player
- MPlayer is a movie player for Un*x. It plays most MPEG, AVI and ASF files,
- supported by many native and Win32 DLL codecs. You can watch VCD, DVD and even
- DivX movies with MPlayer.
+ MPlayer is a movie player for LINUX (runs on many other Unices, and non-x86
+ CPUs, see the ports section). It plays most MPEG, VOB, AVI, OGG/OGM, VIVO,
+ ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
+ supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. You can
+ watch VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies too (and you don't
+ need the avifile library at all!).
.
- MPlayer supports a wide range of output drivers: X11, Xv, DGA, OpenGL,
- SVGAlib, fbdev, AAlib, GGI, SDL . You can use SDL and thus all the SDL
- drivers. Same goes for GGI.
- There are some low-level card-specific drivers (e.g. Matrox). Most of the
- drivers support either software or hardware scaling, so you can enjoy
- movies in full screen mode.
+ Another big feature of MPlayer is the wide range of supported output drivers.
+ It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but you
+ can also use GGI and SDL (and this way all their drivers) and some lowlevel
+ card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64, Permedia3) too!
+ Most of them supports software or hardware scaling, so you can enjoy movies in
+ fullscreen.
.
- MPlayer has nice, big antialiased shaded subtitles (7 supported types!)
- with Hungarian, English, Cyrillic, Czech and Korean fonts, and OSD.
+ MPlayer supports displaying through some hardware MPEG decoder boards, such as
+ the DVB and DXR3/Hollywood+.
+ .
+ And what about the nice big antialiased shaded subtitles (10 supported types)
+ with European/ISO 8859-1,2 (Hungarian, English, Czech, etc), Cyrillic, Korean
+ fonts, and the onscreen display (OSD)?
diff -Naur debian/postinst debian.new/postinst
--- debian/postinst Wed Aug 28 18:09:15 2002
+++ debian.new/postinst Sun Nov 24 19:57:56 2002
@@ -15,27 +15,16 @@
my $mcfg = new ConfHelper('mplayer', "/etc/mplayer/mplayer.conf");
$mcfg->setconfarea("
-#MPlayer config file generated by .deb package.
-#ffactor = 0.9
-#fs = yes
+# MPlayer config file generated by .deb package.
+vo = xmga,mga,xvidix,xv,x11,fbdev,svga,aa
+ao = alsa9,oss,sdl
+framedrop = yes
+fs = yes
+autoq = 6
+cache = 2048
");
###########################################################################
-
-debug("Configuring video output driver...");
-
-my $dcarea = <<"EOF";
-# MPlayer video output driver, configured by mplayer.deb
-EOF
-
- $dcarea .= "vo=" . scalar(get("mplayer/voutput"));
- $dcarea .= "\n";
-
-$mcfg->setconfarea($dcarea);
-
-if ($didupgrade) {
- $mcfg->setotherarea_DANGEROUS(@savedolddata);
-}
#%###################################
diff -Naur debian/postinst.templates debian.new/postinst.templates
--- debian/postinst.templates Wed Aug 28 18:09:15 2002
+++ debian.new/postinst.templates Sun Nov 24 20:00:37 2002
@@ -1,25 +1,3 @@
-Template: mplayer/output
-Type: select
-Choices: ${vo}
-Default: xv
-Description: Which Video Output driver would you like?
- Mplayer can use very wide range of video output drivers:
- ( order aproximately by speed: )
- * mga, xmga - direct hardware access on MGA cards (G200/400/450), needs /dev/mga_vid
- this driver can work without X and display video on secondary head of matrox cards
- * xv - XVideo extensions of X 4.x ( hardware scaling, bilinear filtering )
- * sdl - SDL library, it can also use hardware scaling, filtering etc
- * dga, fsdga - DGA extension.
- * fsbdev - framebuffer device ( watching movies on text console )
- * x11 - simple x11 output.
- Please choose carefully because it has tramendous effect on speed.
-
-Template: mplayer/overwrite
-Type: boolean
-Default: false
-Description: Overwrite /etc/mplayer/mplayer.conf ?
- Should I overwrite your current /etc/mplayer/mplayer.conf with the one created on the fly based on your answers?
-
Template: mplayer/cfgnote
Type: note
Description: Create your ~/.mplayer/conf file.
diff -Naur debian/rules debian.new/rules
--- debian/rules Mon Oct 21 22:43:35 2002
+++ debian.new/rules Sun Nov 24 17:28:11 2002
@@ -20,7 +20,7 @@
dh_testdir
# Add here commands to configure the package.
$(checkdir)
- ./configure --prefix=/usr --confdir=/etc/mplayer --enable-gui $(DEB_BUILD_OPTIONS)
+ ./configure --prefix=/usr --confdir=/etc/mplayer --enable-runtime-cpudetection --enable-new-conf --enable-menu $(DEB_BUILD_OPTIONS)
touch configure-stamp
diff -Naur debian/templates debian.new/templates
--- debian/templates Fri Apr 19 21:05:31 2002
+++ debian.new/templates Sun Nov 24 20:00:58 2002
@@ -24,24 +24,6 @@
Simply select the item you'd like to change to modify it.
When you are done, select Exit.
-Template: mplayer/voutput
-Type: select
-Default: x11
-Choices: ${vochoices}
-Description: MPlayer Video Output
- Mplayer can use very wide range of video output drivers:
- ( order aproximately by speed: )
- * mga, xmga - direct hardware access on MGA cards (G200/400/450), needs /dev/mga_vid
- this driver can work without X and display video on secondary head of matrox cards
- * xv - XVideo extensions of X 4.x ( hardware scaling, bilinear filtering )
- * sdl - SDL library, it can also use hardware scaling, filtering etc
- * ggi - GGI library, it can also use hardware scaling, filtering etc
- * dga, fsdga - DGA extension.
- * fsbdev - framebuffer device ( watching movies on text console )
- * x11 - simple x11 output.
- .
- Please choose carefully because this will have a tremendous effect on speed.
-
Template: mplayer/cfgnote
Type: note
Description: Create your ~/.mplayer/conf file.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 232 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20021124/2f26b5e4/attachment.pgp>
More information about the MPlayer-dev-eng
mailing list