February 2003 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: 0_90/DOCS/tech patches.txt,1.7,1.8
by Arpi of Ize 09 Feb '03

09 Feb '03

Update of /cvsroot/mplayer/0_90/DOCS/tech In directory mail:/var/tmp.root/cvs-serv2509 Modified Files: patches.txt Log Message: warning Index: patches.txt =================================================================== RCS file: /cvsroot/mplayer/0_90/DOCS/tech/patches.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- patches.txt 24 Dec 2002 18:41:20 -0000 1.7 +++ patches.txt 9 Feb 2003 18:45:33 -0000 1.8 @@ -1,6 +1,13 @@ Sending patches: ~~~~~~~~~~~~~~~~ +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +WARNING: this file belongs to the 0.90 (stable, release) tree. +Unless you want to make bugfixes for the 0.90 release, you should get +the development tree (checkout module 'main') and follow its patches.txt, +as rules may differ! The rules bellow apply only to the 0_90 tree! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + Note: We know our rules place a burden on you, but rest assured that maintaining a big and complex software project is even harder, so please accept our rules. We cannot afford to spend our time fixing buggy, broken or

1 0

CVS: 0_90 version.sh,1.11,1.12
by Arpi of Ize 09 Feb '03

09 Feb '03

Update of /cvsroot/mplayer/0_90 In directory mail:/var/tmp.root/cvs-serv29573 Modified Files: version.sh Log Message: 0.90 Index: version.sh =================================================================== RCS file: /cvsroot/mplayer/0_90/version.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- version.sh 31 Dec 2002 18:23:52 -0000 1.11 +++ version.sh 9 Feb 2003 18:40:01 -0000 1.12 @@ -28,4 +28,4 @@ if test "$1" ; then extra="-$1" fi -echo "#define VERSION \"CVS-${last_cvs_update}${extra} \"" >version.h +echo "#define VERSION \"0.90-CVS-${last_cvs_update}${extra} \"" >version.h

1 0

CVS: main ChangeLog,1.43,1.44
by Arpi of Ize 09 Feb '03

09 Feb '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv1833 Modified Files: ChangeLog Log Message: updated Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- ChangeLog 3 Feb 2003 01:41:39 -0000 1.43 +++ ChangeLog 9 Feb 2003 17:36:20 -0000 1.44 @@ -3,15 +3,16 @@ final: "CounterCounter" - rc4: + rc4: "FlameCounter" + DOCS: * some clarification and updates in the English DOCS - * many translation and help-file updates + * massive translation and help-file updates Fixes: * -ac hwac3 fixed (was broken in rc3) * vo_svga: 4bp & 8bpp fixes - * various GUI fixes + * various GUI fixes, including some critical bugs * rage128 VIDIX PPC fixes * libmenu: one crash fixed, some cleanup * fixed ./configure --cc="ccache gcc" @@ -31,19 +32,32 @@ * ogg-in-avi (audio format 0xFFFE) demuxing fixed * vorbis decoding fixed (outer loop cleanup) * swscaler: 4bpp depth 1 pixel/byte format support for -vo svga - * various GUI fixes * missing error message in command line parser for missing parameters + * swscaler: YVU9->YV12 fixes + * -ao mpegpes + -ac hwac3 fixed + * -ao pcm bogus wav header fixed + * -vo x11 + -wid fixed + * auto-insert the 'palette' filter if needed, support fixed in filters + * the sig11 when playing second audio-only file fixed + * configure: detection of cdda, nas, i18n, svgalib, faad2, lame fixed + * -af/-af-adv support in mencoder fixed + * libmpdvdkit2: upgraded to use libdvdcss 1.2.5 Features: * raw video support (-rawvideo, similar to -rawaudio) * experimental mpeg4-ES support (enable with -demuxer 27 -fps xxx) - * new video filter: field - * dvd/vobsub improvements: positioning, gaussian blur scaler + * new video filter: field (cheap deinterlacer) + * dvd/vobsub improvements: positioning, optional gaussian blur scaler * vf_bmovl: 400% speedup :) * libavcodec: native DV audio decoder * GIF demuxer (for animated GIFs) * new noise removal filter: -vop denoise3d - * per-channel gamma and MMX-opt'ed br/co/saturation support in -vop eq2 + * per-channel gamma and MMX-opt'ed bri/cont/saturation support in -vop eq2 + * live.com lib support cleanup, support for more stream types + * importing the playtree into the Gui instead of gui's own playlist hack + * support for the xvid and divx4/5linux libraries at the same time + * -fstype option: override priority/layer of the fullscreen switch methods + * libavcodec: some B-frames related encoding failures/crashes fixed rc3: "BugfixCounter"

1 0

CVS: main/libmpdemux demux_rtp.cpp,1.10,1.11 demux_rtp_codec.cpp,1.1,1.2
by Arpi of Ize 09 Feb '03

09 Feb '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv11228/libmpdemux Modified Files: demux_rtp.cpp demux_rtp_codec.cpp Log Message: Motion-JPEG RTP streams can now be played. Some MPEG-4 ES video RTP streams can also be played. patch by Ross Finlayson <finlayson(a)live.com> Index: demux_rtp.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- demux_rtp.cpp 3 Feb 2003 10:27:50 -0000 1.10 +++ demux_rtp.cpp 9 Feb 2003 17:06:38 -0000 1.11 @@ -147,6 +147,7 @@ rtpState->sdpDescription = sdpDescription; rtpState->rtspClient = rtspClient; rtpState->mediaSession = mediaSession; + rtpState->audioBufferQueue = rtpState->videoBufferQueue = NULL; rtpState->firstSyncTime.tv_sec = rtpState->firstSyncTime.tv_usec = 0; demuxer->priv = rtpState; Index: demux_rtp_codec.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp_codec.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- demux_rtp_codec.cpp 3 Feb 2003 10:27:50 -0000 1.1 +++ demux_rtp_codec.cpp 9 Feb 2003 17:06:38 -0000 1.2 @@ -46,6 +46,16 @@ } else if (strcmp(subsession->codecName(), "H261") == 0) { bih->biCompression = sh_video->format = mmioFOURCC('H','2','6','1'); + } else if (strcmp(subsession->codecName(), "JPEG") == 0) { + bih->biCompression = sh_video->format + = mmioFOURCC('M','J','P','G'); +#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1044662400) + fprintf(stderr, "WARNING: This video stream might not play correctly. Please upgrade to version \"2003.02.08\" or later of the \"LIVE.COM Streaming Media\" libraries.\n"); +#endif + } else if (strcmp(subsession->codecName(), "MP4V-ES") == 0) { + bih->biCompression = sh_video->format + = mmioFOURCC('m','p','4','v'); + //flags |= RTPSTATE_IS_MPEG; // MPEG hdr checking in video.c doesn't work! } else if (strcmp(subsession->codecName(), "X-QT") == 0 || strcmp(subsession->codecName(), "X-QUICKTIME") == 0) { // QuickTime generic RTP format, as described in @@ -130,9 +140,6 @@ wf->cbSize = 0; } else if (strcmp(subsession->codecName(), "MP4A-LATM") == 0) { wf->wFormatTag = sh_audio->format = mmioFOURCC('m','p','4','a'); -#ifndef HAVE_FAAD - fprintf(stderr, "WARNING: Playing MPEG-4 (AAC) Audio requires the \"faad\" library!\n"); -#endif #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1042761600) fprintf(stderr, "WARNING: This audio stream might not play correctly. Please upgrade to version \"2003.01.17\" or later of the \"LIVE.COM Streaming Media\" libraries.\n"); #else

1 0

CVS: main/DOCS/tech mpcf.txt,1.12,1.13
by Michael Niedermayer CVS 09 Feb '03

09 Feb '03

Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var/tmp.root/cvs-serv5905 Modified Files: mpcf.txt Log Message: changing name to "nut" for now, we can change it again if we agree on something else index_flag so the demuxer knows if the index is missing and doesnt need to search for it adding start/end_stream_id to the info packet so it can cover individual streams too Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mpcf.txt 8 Feb 2003 09:07:13 -0000 1.12 +++ mpcf.txt 8 Feb 2003 18:50:18 -0000 1.13 @@ -1,4 +1,4 @@ - MPlayer container format draft 0.01 + nut format draft 0.02 @@ -91,7 +91,8 @@ lsb_timestamp_length v fixed_fps u(1) codec_specific_header_flag u(1) - reserved u(6) + index_flag u(1) + reserved u(5) video_stream_header: stream_header @@ -155,6 +156,8 @@ info_startcode f(64) start_time v end_time v + start_stream_id v + end_stream_id v for(;;){ type b if(type=="") break; @@ -204,6 +207,10 @@ length_in_msec length of the file in milli seconds (can be 0 if realtime or such) + +index_flag + 1 indicates that this file has an index + Note, all files MUST have an index at the end except, (realtime) streams stream_id Note: streams with a lower relative class MUST have a lower relative id @@ -330,14 +337,25 @@ the time range in msecs to which the info applies Note: can be used to mark chapters +start_stream_id / end_stream_id + the stream(s) to which the info packet applies + type the fourcc of the type - for example: "STR " -> String or "JPEG" -> jpeg image + for example: "UTF8" -> String or "JPEG" -> jpeg image 0 length means end name the name of the info entry, valid names are - "Author","Description","Copyright","Encoder","Title","CDCover" + "Author" + "Description" + "Copyright" + "Encoder" the name& version of the software used for encoding + "Title" + "CDCover" an image of he cd cover (preferable PNG or JPEG) + "Source" "DVD", "VCD", "CD", "MD", "FM radio", "VHS", "PAL-TV", + "NTSC-TV", "LD" + "CaptureDevice" "BT878", "BT848", ... (more exact names are fine too) Note: if someone needs some others, please tell us about them, so we can add them to the official standard (if they are sane)

3 3

CVS: main mplayer.c,1.679,1.680
by Zoltan Ponekker 09 Feb '03

09 Feb '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv19948 Modified Files: mplayer.c Log Message: fuckin' 10l Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.679 retrieving revision 1.680 diff -u -r1.679 -r1.680 --- mplayer.c 8 Feb 2003 21:56:52 -0000 1.679 +++ mplayer.c 9 Feb 2003 13:17:12 -0000 1.680 @@ -3339,12 +3339,14 @@ play_tree_step = 1; } else if (eof == PT_UP_NEXT || eof == PT_UP_PREV) { eof = eof == PT_UP_NEXT ? 1 : -1; - if(play_tree_iter_up_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) { - eof = 1; - } else { - play_tree_iter_free(playtree_iter); - playtree_iter = NULL; - } + if ( playtree_iter ) { + if(play_tree_iter_up_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) { + eof = 1; + } else { + play_tree_iter_free(playtree_iter); + playtree_iter = NULL; + } + } } else { // NEXT PREV SRC eof = eof == PT_PREV_SRC ? -1 : 1; }

1 0

CVS: main/TOOLS plotpsnr.pl,NONE,1.1
by Jonas Jermann CVS 09 Feb '03

09 Feb '03

Update of /cvsroot/mplayer/main/TOOLS In directory mail:/var/tmp.root/cvs-serv9003 Added Files: plotpsnr.pl Log Message: PSNR plotting tool using gnuplot (yes, it's ugly ;) --- NEW FILE --- #!/usr/bin/perl # # Licence: GPL # # 2003/02/09 Jonas Jermann <jjermann(a)gmx.net> # # Script: Draw PSNR log graphs using gnuplot # # requires: gnuplot use Getopt::Long; # MAIN my %options; my $dem_file="psnr.dem"; commandline(); demo_file(); system ("gnuplot $dem_file"); #system("rm $dem_file $options{file}.[IPB] $options{file}.diff* 2>/dev/null"); exit 0; # DEMO FILE sub demo_file { if ($options{file2}) { my @file1_cont = (); my @file2_cont = (); my $NewRow,$i,$j; open(LIST_IN, "$options{file}"); while( <LIST_IN> ) { $NewRow=[]; @$NewRow = split(/[ ,]+/, $_); push( @file1_cont, $NewRow ); } close(LIST_IN); open(LIST_IN2, "$options{file2}"); while( <LIST_IN2> ) { $NewRow=[]; @$NewRow = split(/[ ,]+/, $_); push( @file2_cont, $NewRow ); } close(LIST_IN2); open(LIST_OUT, ">$options{file}.diff"); for($i=0; $i<=$#file2_cont; $i++) { print LIST_OUT " $file2_cont[$i]->[1],\ "; for($j=2; $j<=7; $j++) { $file2_cont[$i]->[$j] -= $file1_cont[$i]->[$j]; print LIST_OUT " $file2_cont[$i]->[$j],\ "; } print LIST_OUT " $file2_cont[$i]->[8]\n"; } close(LIST_OUT); $options{file}="$options{file}.diff"; } if ($options{iframes}) { system("cat $options{file} | grep I > $options{file}.I"); } if ($options{pframes}) { system("cat $options{file} | grep P > $options{file}.P"); } if ($options{bframes}) { system("cat $options{file} | grep B > $options{file}.B"); } open(DEM_FILE,">$dem_file"); print DEM_FILE "#PSNR Statistics #--------------- set title \"PSNR Statistics\" set data style fsteps set xlabel \"Frames\" set grid "; if ($options{quant}) { print DEM_FILE "# Quantizers plot [] [0:] \\"; if ($options{pframes}) { print DEM_FILE " \"$options{file}.P\" using 1:2 t \"Quantizer: P frames\" w $options{qs}"; if ($options{bframes} || $options{iframes}) { print DEM_FILE ",\\"; } } if ($options{bframes}) { print DEM_FILE " \"$options{file}.B\" using 1:2 t \"Quantizer: B frames\" w $options{qs}"; if ($options{iframes}) { print DEM_FILE ",\\"; } } if ($options{iframes}) { print DEM_FILE " \"$options{file}.I\" using 1:2 t \"Quantizer: I frames\" w $options{qs}"; } if (!($options{pframes} || $options{bframes} || $options{iframes})) { print DEM_FILE " \"$options{file}\" using 1:2 t \"Quantizer\" w $options{qs}"; } print DEM_FILE " pause -1 "; } if ($options{size}) { print DEM_FILE "# Frame size plot \\"; if ($options{pframes}) { print DEM_FILE " \"$options{file}.P\" using 1:3 t \"Size: P frames\" w $options{ss}"; if ($options{bframes}||$options{iframes}) { print DEM_FILE ",\\"; } } if ($options{bframes}) { print DEM_FILE " \"$options{file}.B\" using 1:3 t \"Size: B frames\" w $options{ss}"; if ($options{iframes}) { print DEM_FILE ",\\"; } } if ($options{iframes}) { print DEM_FILE " \"$options{file}.I\" using 1:3 t \"Size: I frames\" w $options{ss}"; } if (!($options{pframes}||$options{bframes}||$options{iframes})) { print DEM_FILE " \"$options{file}\" using 1:3 t \"Size\" w $options{ss}"; } print DEM_FILE " pause -1 "; } if ($options{psnr}) { print DEM_FILE "# PSNR plot \\"; if ($options{pframes}) { print DEM_FILE " \"$options{file}.P\" using (\$1):(\$7) t \"PSNR (All): P frames\" w $options{ps}"; if ($options{bframes}||$options{iframes}) { print DEM_FILE ",\\"; } } if ($options{bframes}) { print DEM_FILE " \"$options{file}.B\" using (\$1):(\$7) t \"PSNR (All): B frames\" w $options{ps}"; if ($options{iframes}) { print DEM_FILE ",\\"; } } if ($options{iframes}) { print DEM_FILE " \"$options{file}.I\" using (\$1):(\$7) t \"PSNR (All): I frames\" w $options{ps}"; } if (!($options{pframes}||$options{bframes}||$options{iframes})) { print DEM_FILE " \"$options{file}\" using (\$1):(\$7) t \"PSNR (All)\" w $options{ps}"; } print DEM_FILE " #\"$options{file}\" using (\$1):(\$4) t \"PSNR (Y)\" w $options{ps} \\ #\"$options{file}\" using (\$1):(\$5) t \"PSNR (Cb)\" w $options{ps} \\ #\"$options{file}\" using (\$1):(\$6) t \"PSNR (Cr)\" w $options{ps} pause -1 "; } print DEM_FILE " reset"; close (DEM_FILE); } # USAGE sub usage { print STDERR <<EOF; Usage: plotpsnr.pl [options] 'file' Options: -h, --help Display this help message -quant Display quantizers -size Display size -psnr Display PSNR -iframes Display I frames -pframes Display P frames -bframes Display B frames -aframes Display all frames in different colors -cmp <file2> Compare two files -qs <style> Quantizer style -ss <style> Size style -ps <style> PSNR style Default: -quant -size -psnr -qs "p" -ss "i" -ps "p" Notes: Comparison is based on file2. Comparison assumes that the frame numbers of both files fit. EOF exit 1; } # COMMAND LINE sub commandline { $options{qs}="p"; $options{ss}="i"; $options{ps}="p"; GetOptions( "help|h" => \&usage, "quant" => \$options{quant}, "size" => \$options{size}, "psnr" => \$options{psnr}, "cmp=s" => \$options{file2}, "iframes" => \$options{iframes}, "pframes" => \$options{pframes}, "bframes" => \$options{bframes}, "aframes" => sub { $options{iframes} = 1; $options{pframes} = 1; $options{bframes} = 1; }, "qs=s" => \$options{qs}, "ss=s" => \$options{ss}, "ps=s" => \$options{ps}, ) || usage(); if (!($options{quant}||$options{size}||$options{psnr})) { $options{quant}=1; $options{size}=1; $options{psnr}=1; } $options{file}="@ARGV"; }

1 0

CVS: main/libmpcodecs vf_denoise3d.c,1.3,1.4
by Arpi of Ize 09 Feb '03

09 Feb '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv26920 Modified Files: vf_denoise3d.c Log Message: cleanup & more optimize Index: vf_denoise3d.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_denoise3d.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vf_denoise3d.c 9 Feb 2003 02:07:11 -0000 1.3 +++ vf_denoise3d.c 9 Feb 2003 12:51:59 -0000 1.4 @@ -68,20 +68,7 @@ free(vf->priv->Line); } -//#define LowPass(Prev, Curr, Coef) (((Prev)*Coef[Prev - Curr] + (Curr)*(65536-(Coef[Prev - Curr]))) / 65536) -//#define LowPass(Prev, Curr, Coef) (( Prev*Coef[Prev-Curr] + Curr*(65536-(Coef[Prev-Curr])) )/65536) -//#define LowPass(Prev, Curr, Coef) (( Prev*Coef[Prev-Curr] + Curr*65536 - Curr*Coef[Prev-Curr] )/65536) -//#define LowPass(Prev, Curr, Coef) (((int)(Curr)) + (( (int)Prev*Coef[Prev-Curr] - (int)Curr*Coef[Prev-Curr] )>>16) ) -//#define LowPass(Prev, Curr, Coef) (Curr + (( Prev*Coef[Prev-Curr] - Curr*Coef[Prev-Curr] )>>16) ) -//#define LowPass(Prev, Curr, Coef) (Curr + (( (Prev-Curr)*(Coef[Prev-Curr]) )>>16) ) - -//#define LowPass(Prev, Curr, Coef) (Curr + (((Prev - Curr)*Coef[Prev - Curr]) / 65536)) -#define LowPass(Prev, Curr, Coef) (Curr + ((((unsigned int)(Prev - Curr))*Coef[Prev - Curr]) / 65536)) -//#define LowPass(Prev, Curr, Coef) (Curr + ((((unsigned int)(Prev - Curr))*Coef[((unsigned int)(Prev - Curr))]) / 65536)) -//#define LowPass(Prev, Curr, Coef) (Curr + ((((unsigned char)(Prev - Curr))*Coef[Prev - Curr]) / 65536)) -//#define LowPass(Prev, Curr, Coef) (Curr + (( ((((int)(Prev))-((int)(Curr)))) *Coef[Prev - Curr]) / 65536)) -//#define LowPass(Prev, Curr, Coef) (Curr + (((unsigned int)((Prev - Curr)*Coef[Prev - Curr])) / 65536)) -//#define LowPass(Prev, Curr, Coef) (Curr + (((Prev - Curr)*Coef[Prev - Curr]) >> 16)) +#define LowPass(Prev, Curr, Coef) (Curr + Coef[Prev - Curr]) static void deNoise(unsigned char *Frame, // mpi->planes[x] unsigned char *FramePrev, // pmpi->planes[x] @@ -185,14 +172,16 @@ static void PrecalcCoefs(int *Ct, double Dist25) { int i; - double Gamma, Simil; + double Gamma, Simil, C; Gamma = log(0.25) / log(1.0 - Dist25/255.0); for (i = -256; i <= 255; i++) { Simil = 1.0 - ABS(i) / 255.0; - Ct[256+i] = pow(Simil, Gamma) * 65536; +// Ct[256+i] = lround(pow(Simil, Gamma) * (double)i); + C = pow(Simil, Gamma) * (double)i; + Ct[256+i] = (C<0) ? (C-0.5) : (C+0.5); } }

1 0

CVS: main/debian-build .cvsignore,NONE,1.1 00README,NONE,1.1 README.debian,NONE,1.1 TODO.Debian,NONE,1.1 changelog,NONE,1.1 config,NONE,1.1 control,NONE,1.1 copyright,NONE,1.1 dirs,NONE,1.1 files,NONE,1.1 menu,NONE,1.1 mplayer.postinst.debhelper,NONE,1.1 mplayer.postrm.debhelper,NONE,1.1 mplayer.prerm.debhelper,NONE,1.1 mplayer.substvars,NONE,1.1 postinst,NONE,1.1 postinst.templates,NONE,1.1 postrm,NONE,1.1 rules,NONE,1.1 templates,NONE,1.1
by Attila Kinali CVS 09 Feb '03

09 Feb '03

Update of /cvsroot/mplayer/main/debian-build In directory mail:/var/tmp.root/cvs-serv6298/debian-build Added Files: .cvsignore 00README README.debian TODO.Debian changelog config control copyright dirs files menu mplayer.postinst.debhelper mplayer.postrm.debhelper mplayer.prerm.debhelper mplayer.substvars postinst postinst.templates postrm rules templates Log Message: Adding debian-build directory by request of Deriush Pietrzak This is thought for creating debian binary packages for distribution. IMPORTANT: THIS DOESNT WORK CURRENTLY --- NEW FILE --- files mplayer mplayer.postinst.debhelper mplayer.postrm.debhelper mplayer.prerm.debhelper mplayer.substvars --- NEW FILE --- This is the debian/ directory for building mplayer packages for binary binary distribution. It's based on the debian/ directory Dariush Pietrzak made. Replace the normal debian/ with this and run dpkg-buildpackage. IMPORTANT: THIS IS NOT YET FINISHED AND DOESNT WORK AT THE MOMENT --- NEW FILE --- mplayer for Debian ---------------------- Most options are autodetected or configured during compilation thus users are supposed to build this package themselves. Recommended method is running "fakeroot debian/rules binary" in the top directory In case you would like to pass some parameters to ./configure, set variable DEB_BUILD_OPTIONS like that: eyck@ghost$ DEB_BUILD_OPTIONS="--enable-streaming" fakeroot debian/rules binary Dariush Pietrzak <eyck(a)ghost.anime.pl> Sat Jan 5 20:28:23 CET 2002 --- NEW FILE --- - 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 ) - 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. --- NEW FILE --- mplayer (0.90rc2-0) unstable; urgency=low * new release. -- Gabucino <gabucino(a)mplayerhq.hu> Mon, 16 Dec 2002 22:03:55 +0100 mplayer (0.90rc1-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 -- Gabucino <gabucino(a)mplayerhq.hu> Sun, 24 Nov 2002 17:01:12 +0100 mplayer (0.90pre9-0) unstable; urgency=low * new release. -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Mon, 21 Oct 2002 22:30:06 +0200 mplayer (0.90pre8-0) unstable; urgency=low * new release, fix version, we are not at 0.90, we're still at preX -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Thu, 19 Sep 2002 09:50:43 +0200 mplayer (0.90-4) unstable; urgency=low * Fix package building by adding BINDIR. -- Diego Biurrun <diego(a)biurrun.de> Wed, 4 Sep 2002 00:49:03 +0200 mplayer (0.90-3) unstable; urgency=low * Remove configuration files on purge. -- Diego Biurrun <diego(a)biurrun.de> Sun, 1 Sep 2002 11:03:13 +0200 mplayer (0.90-2) unstable; urgency=low * Use the confdir we compile with in the helper scripts (/etc/mplayer/mplayer.conf instead of /etc/mplayer). -- Diego Biurrun <diego(a)biurrun.de> Tue, 27 Aug 2002 11:18:50 +0200 mplayer (0.90-1) unstable; urgency=low * 0.90 release including latest alsa9 fixes -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Wed, 3 Jul 2002 23:32:49 +0200 mplayer (0.90pre5-1) unstable; urgency=low * rc1 to become 0.90 -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Fri, 7 Jun 2002 15:31:20 +0200 mplayer (0.90pre4-1) unstable; urgency=low * new pre-release -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Mon, 13 May 2002 08:06:34 +0200 mplayer (0.90pre3-1) unstable; urgency=low * new pre-release * gtk bug fixed. -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Tue, 30 Apr 2002 11:32:43 +0200 mplayer (0.90pre2-1) unstable; urgency=low * new release. -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Sun, 21 Apr 2002 12:49:35 +0200 mplayer (0.60-3) unstable; urgency=low * install xvidix correctly -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Sun, 17 Mar 2002 16:38:54 +0100 mplayer (0.60-2) unstable; urgency=low * This is meaningless, just to mark that more then 2 months have passed since last release and lots of thing in mplayer have changed. -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Thu, 7 Mar 2002 00:34:20 +0100 mplayer (0.60-1) unstable; urgency=low * Post 0.60 release. * Changed installation - make install now handles codecs.conf, manpages * and fontdir, so we now use make install for those. -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Fri, 4 Jan 2002 11:28:54 +0100 mplayer (0.60pre2-1) unstable; urgency=low * 0.60 pre2 release -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Fri, 28 Dec 2001 22:12:54 +0100 mplayer (0.60pre1-1) unstable; urgency=low * 0.60 pre-release. -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Tue, 25 Dec 2001 00:47:36 +0100 mplayer (0.50-3) unstable; urgency=low * debian/rules: improve install routine; will include mencore if it is built * debian/control: remove invalid source recommends * debian/copyright: mention that binary distribution is not allowed * debian/rules: install /usr/share/mplayer/codecs.conf; this should probably be a config file * turn on fbdev option -- Adam Di Carlo <aph(a)debian.org> Sat, 15 Dec 2001 03:33:44 -0500 mplayer (0.50-2) unstable; urgency=low * gui added to package/menu -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Wed, 7 Nov 2001 11:31:46 +0100 mplayer (0.50-1) unstable; urgency=low * 0.50 released. -- Dariush Pietrzak <eyck(a)ghost.anime.pl> Fri, 12 Oct 2001 13:26:03 +0200 mplayer (0.18-4) unstable; urgency=low * Changes to debian packaging suggested Josip Rodin -- Dariush Pietrzak <eyck(a)ghost.forumakad.pl> Wed, 22 Aug 2001 22:40:58 +0200 mplayer (0.18-3) unstable; urgency=low * fixed templates. -- Dariush Pietrzak <eyck(a)ghost.tinet.pl> Sat, 28 Jul 2001 09:45:45 +0200 mplayer (0.18-2) unstable; urgency=low * modified debian scripts -- Dariush Pietrzak <eyck(a)ghost.tinet.pl> Fri, 27 Jul 2001 09:25:52 +0200 mplayer (0.18-1) unstable; urgency=low * lots of changes in mplayer -- Dariush Pietrzak <eyck(a)incubus.ar.lublin.pl> Mon, 25 Jun 2001 15:59:18 +0200 mplayer (0.17a-2) unstable; urgency=low * mplayer.conf file, automatic menu files update -- Dariush Pietrzak <eyck(a)incubus.ar.lublin.pl> Sun, 20 May 2001 22:50:41 +0200 mplayer (0.17a-1) unstable; urgency=low * Version change, debian scripts update (rm), maintainer switch -- Dariush Pietrzak <eyck(a)incubus.ar.lublin.pl> Thu, 17 May 2001 13:25:12 +0200 mplayer (0.11pre-1) unstable; urgency=low * Initial release. -- * TeLeNiEkO * <telenieko(a)telenieko.com> Mon, 26 Feb 2001 12:24:04 +0100 --- NEW FILE --- #!/usr/bin/perl -w # Script to configure mplayer # based on etherconf by John Goerzen <jgoerzen(a)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'); } } --- NEW FILE --- Source: mplayer Section: misc Priority: optional Maintainer: Dariush Pietrzak <eyck(a)ghost.anime.pl> Standards-Version: 3.2.1 Build-Depends: libglib-dev, libgtk-dev, xlibs-dev, libpng-dev, zlib1g-dev, debhelper (>= 2) Package: mplayer Architecture: any Depends: ${shlibs:Depends},debconf,libconfhelper-perl Description: The Ultimate Movie Player 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!). . 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 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)? --- NEW FILE --- This package was debianized by * TeLeNiEkO * telenieko(a)telenieko.com on Mon, 26 Feb 2001 12:24:04 +0100. Original source can be found at: http://www.mplayerHQ.hu/homepage/ Copyrighted by various authors. Licensed under the terms of GNU GPL. See /usr/share/common-licenses/GPL for details. --- NEW FILE --- usr/bin usr/share/man/man1 usr/share/mplayer usr/lib/mplayer --- NEW FILE --- mplayer_0.90rc2-0_i386.deb misc optional --- NEW FILE --- ?package(mplayer):command=/usr/bin/gmplayer section="Apps/Viewers" needs=X11 title=gmplayer --- NEW FILE --- # Automatically added by dh_installdocs if [ "$1" = "configure" ]; then if [ -d /usr/doc -a ! -e /usr/doc/mplayer -a -d /usr/share/doc/mplayer ]; then ln -sf ../share/doc/mplayer /usr/doc/mplayer fi fi # End automatically added section # Automatically added by dh_installmenu if [ "$1" = "configure" -a -x /usr/bin/update-menus ]; then update-menus ; fi # End automatically added section --- NEW FILE --- # Automatically added by dh_installdebconf if [ "$1" = purge -a -e /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule db_purge fi # End automatically added section # Automatically added by dh_installmenu if [ -x /usr/bin/update-menus ]; then update-menus ; fi # End automatically added section --- NEW FILE --- # Automatically added by dh_installdocs if [ $ "$1" = "upgrade" -o "$1" = "remove" $ -a -L /usr/doc/mplayer ]; then rm -f /usr/doc/mplayer fi # End automatically added section --- NEW FILE --- misc:Depends=debconf (>= 0.5) perl:Depends=perl shlibs:Depends=aalib1 (>= 1.2), libaudiofile0 (>= 0.2.3-4), libc6 (>= 2.2.5-13), libesd0 (>= 0.2.23-1) | libesd-alsa0 (>= 0.2.23-1), libggi2 (>= 1:2.0.1-2), libglib1.2 (>= 1.2.0), libgtk1.2 (>= 1.2.10-4), libjpeg62, libmad0 (>= 0.14.2b), libncurses5 (>= 5.2.20020112a-1), libogg0 (>= 1.0.0), libpng2 (>=1.0.12), libsdl1.2debian (>> 1.2.3), libungif4g (>= 4.1.0b1), libvorbis0 (>= 1.0.0), svgalibg1, xlibmesa3 | libgl1, xlibs (>> 4.1.0), zlib1g (>= 1:1.1.4) --- NEW FILE --- #!/usr/bin/perl -w # mplayer postinst require ConfHelper; use Debconf::Client::ConfModule qw(:all); use IO::Handle; use Fcntl; my $version = version(1.0); my @savedolddata = (); my $didupgrade = 0; dealwithupgrades(); my $mcfg = new ConfHelper('mplayer', "/etc/mplayer/mplayer.conf"); $mcfg->setconfarea(" #MPlayer config file generated by .deb package. #ffactor = 0.9 #fs = yes "); ########################################################################### 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); } #%################################### exit unless (get("mplayer/configure") eq 'true'); exit unless (fget("mplayer/configure", "isdefault") eq 'false'); #%################################## get("mplayer/cfgnote"); sub dealwithupgrades { open(OLDCONF, "</etc/mplayer/mplayer.conf") || return 1; close OLDCONF; my $mconf = new ConfHelper("mplayer", "/etc/mplayer/mplayer.conf"); return 1 if ($mconf->hasconfarea()); undef $mconf; if ((get('mplayer/replace-existing-files') eq 'true') && (fget('mplayer/replace-existing-files', 'isdefault') eq 'false')) { print STDERR "Upgrading...\n"; #? saveolddata("/etc/network/interfaces", "pppconf"); $didupgrade = 1; for my $file ("/etc/mplayer/mplayer.conf" #, "/etc/mplayer/fonts/sth ) { debug("Deleting $file"); unlink $file; } } else { print STDERR "Upgrade refused, exiting.\n"; exit 0; } } # Gets any debconf area for other packages and saves it off. sub saveolddata { my ($file, $package) = @_; my $conf = new ConfHelper($package, $file); push(@savedolddata, $conf->{startline} . "\n"); push(@savedolddata, $conf->getconfarea()); push(@savedolddata, $conf->{endline} . "\n"); } sub debug { print STDERR @_, "\n"; } --- NEW FILE --- 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. Remember to read documentation and edit your ~/.mplayer/conf (or /etc/mplayer/mplayer.conf) file. This binary depends heavily on your hardware - which means that it needs tweaking for every single machine it's installed to. And it also it means that it will use your setup very effectively. Look at /usr/share/doc/mplayer end --- NEW FILE --- #!/bin/sh set -e if [ "$1" = "purge" ]; then if [ -d /etc/mplayer/ ]; then rm -rf /etc/mplayer/ fi fi --- NEW FILE --- #!/usr/bin/make -f # Made with the aid of debmake, by Christoph Lameter, # based on the sample debian/rules file for GNU hello by Ian Jackson. #export DH_VERBOSE=1 # This is the debhelper compatability version to use. export DH_COMPAT=3 package := mplayer prefix := $(shell pwd)/debian/$(package) arch := $(shell dpkg --print-architecture) ifeq ($(arch),powerpc) arch-conf += --disable-mp1e endif COMMON_CONFIG = --prefix=/usr \ --confdir=/etc/mplayer \ --enable-runtime-cpudetection \ --enable-termcap \ --disable-iconv \ --disable-setlocale \ --disable-lirc \ --disable-tv-v4l \ --disable-tv-bsdbt848 \ --enable-rtc \ --disable-dvdnav \ --disable-dvdread \ --enable-mpdvdkit \ --disable-css \ --disable-cdparanoia \ --disable-freetype \ --disable-gif \ --disable-png \ --disable-jpeg \ --disable-liblzo \ --enable-win32 \ --disable-xanim \ --disable-xvid \ --disable-divx4linux \ --disable-libfame \ --enable-vorbis \ --disable-faad \ --disable-libdv \ --disable-mad \ --disable-sdl \ --disable-aa \ --disable-ggi \ --disable-directx \ --disable-dvb \ --disable-dxr2 \ --disable-dxr3 \ --disable-directfb \ --disable-zr \ --disable-real \ --disable-arts \ --disable-esd \ --disable-alsa \ --disable-mencoder VARIANTS = nongui-nonx-oss gui-x-oss CONFIG_nongui-nonx-oss = --disable-gui \ --disable-gl \ --disable-dga \ --enable-vesa \ --enable-svga \ --enable-mga \ --disable-xmga \ --disable-xv \ --disable-vm \ --disable-xinerama \ --disable-x11 \ --enable-fbdev CONFIG_gui-x-oss = --enable-gui \ --enable-gl \ --enable-dga \ --enable-vesa \ --disable-svga \ --enable-mga \ --enable-xmga \ --enable-xv \ --enable-vm \ --enable-xinerama \ --enable-x11 \ --enable-fbdev configure: configure-stamp configure-stamp: $(foreach v,$(VARIANTS),configure-stamp-$(v)) configure-stamp-%: dh_testdir # Add here commands to configure the package. $(checkdir) ./configure $(COMMON_CONIG) $(CONFIG_$(*)) $(DEB_BUILD_OPTIONS) touch $@ build: build-stamp build-stamp: dh_testdir # commands to compile the package. ${MAKE} touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp # commands to clean up after the build process. -$(MAKE) distclean dh_clean # Build architecture-independent files here. binary-indep: build # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build dh_testdir dh_testroot dh_clean -k dh_installdirs # commands to install the package into debian/<packagename> $(MAKE) prefix=$(prefix)/usr BINDIR=$(prefix)/usr/bin CONFDIR=$(prefix)/etc/mplayer LIBDIR=$(prefix)/usr/lib DATADIR=$(prefix)/usr/share/mplayer MANDIR=$(prefix)/usr/share/man install dh_link usr/bin/mplayer usr/bin/gmplayer \ usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz dh_installdebconf dh_installdocs --exclude=CVS DOCS/* dh_installexamples etc/example.conf dh_installmenu # dh_installmime dh_installinfo dh_installchangelogs dh_link dh_strip dh_compress dh_fixperms # dh_makeshlibs dh_installdeb dh_perl dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb #binary-arch: checkroot build # $(checkdir) # -rm -rf debian/tmp # install -d debian/tmp # cd debian/tmp && install -d `cat ../dirs` # Must have debmake installed for this to work. Otherwise please copy # /usr/bin/debstd into the debian directory and change debstd to debian/debstd # debstd # dpkg-gencontrol -isp # chown -R root.root debian/tmp # chmod -R go=rX debian/tmp # dpkg --build debian/tmp .. binary: binary-indep binary-arch .PHONY: binary binary-arch binary-indep clean checkroot --- NEW FILE --- Template: mplayer/replace-existing-files Type: boolean Default: true Description: Upgrade existing system? It looks like you've configured your mplayer already. If you'd like to configure it with this program, I'll have to delete the old configuration. Do you want to continue configuration with this program? If you say "yes", I'll go ahead and delete your old configuration and you can create it anew with this program. Template: mplayer/replace-existing-files-bail Type: note Description: Files not replaced I'm going to exit now since you don't want me to replace your existing files. If you change your mind later, you can run dpkg-reconfigure mplayer. Template: mplayer/mainmenu Type: select Choices: ${choices}, Exit Description: MPlayer Main Menu From this menu, you can modify any of the settings for your device. 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. Remember to read documentation and edit your ~/.mplayer/conf (or /etc/mplayer.conf) file. This binary depends heavily on your hardware - which means that it needs tweaking for every single machine it's installed to. And it also it means that it will use your setup very effectively. Look at /usr/share/doc/mplayer end

1 0

CVS: main/debian-build - New directory
by Attila Kinali CVS 09 Feb '03

09 Feb '03

Update of /cvsroot/mplayer/main/debian-build In directory mail:/var/tmp.root/cvs-serv5365/debian-build Log Message: Directory /cvsroot/mplayer/main/debian-build added to the repository

1 0