June 2010 - MPlayer-DOCS - lists.mplayerhq.hu

r30822 - in trunk: DOCS/man/en/mplayer.1 libvo/geometry.c
by reimar 30 Sep '10

30 Sep '10

Author: reimar Date: Wed Mar 3 21:57:56 2010 New Revision: 30822 Log: Add support for specifying window position relative to right and bottom screen borders with -geometry. Based on patch by Melchior FRANZ [melchior franz gmail com]. Modified: trunk/DOCS/man/en/mplayer.1 Changes in other areas also in this revision: Modified: trunk/libvo/geometry.c Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Wed Mar 3 21:36:35 2010 (r30821) +++ trunk/DOCS/man/en/mplayer.1 Wed Mar 3 21:57:56 2010 (r30822) @@ -3143,13 +3143,16 @@ Fixes fullscreen switching on OpenBox 1. .PD 1 . .TP -.B \-geometry x[%][:y[%]] or [WxH][+x+y] +.B \-geometry x[%][:y[%]] or [WxH][+-x+-y] Adjust where the output is on the screen initially. The x and y specifications are in pixels measured from the top-left of the screen to the top-left of the image being displayed, however if a percentage sign is given after the argument it turns the value into a percentage of the screen size in that direction. -It also supports the standard X11 \-geometry option format. +It also supports the standard X11 \-geometry option format, in which e.g. ++10-50 means "place 10 pixels from the left border and 50 pixels from the lower +border" and "--20+-10" means "place 20 pixels beyond the right and 10 pixels +beyond the top border". If an external window is specified using the \-wid option, then the x and y coordinates are relative to the top-left corner of the window rather than the screen.

3 2

r31583 - trunk/DOCS/xml/Makefile
by diego 28 Jun '10

28 Jun '10

Author: diego Date: Mon Jun 28 18:45:47 2010 New Revision: 31583 Log: Remove help target that prints available targets. The Makefile should now be simple enough to understand without it. Modified: trunk/DOCS/xml/Makefile Modified: trunk/DOCS/xml/Makefile ============================================================================== --- trunk/DOCS/xml/Makefile Mon Jun 28 18:31:11 2010 (r31582) +++ trunk/DOCS/xml/Makefile Mon Jun 28 18:45:47 2010 (r31583) @@ -11,21 +11,6 @@ CONFIGURE_GENERATED = html-chunk.xsl htm all: html-chunked html-single -help: - @echo "Targets:" - @echo "********" - @echo "all : Build everything for configured languages (default)." - @echo "html-single : HTML documentation for configured languages (single file)" - @echo "html-single-LANG : As above, but only one language." - @echo "html-chunked : HTML documentation for configured languages (multiple files)" - @echo "html-chunked-LANG : As above, but only one language." - @echo "xmllint : Check syntax of XML files for configured languages." - @echo "xmllint-LANG : Check syntax of LANG XML files." - @echo "clean : Purge the 'HTML' directory." - @echo "releaseclean : Remove generated files but keep the HTML." - @echo "distclean : Remove ALL generated files." - @echo "Substitute LANG for one of $(DOC_LANG_ALL)" - html-chunked: $(addprefix html-chunked-,$(DOC_LANGS)) html-single: $(addprefix html-single-,$(DOC_LANGS)) @@ -58,11 +43,12 @@ $(foreach lang, $(DOC_LANG_ALL),$(eval $ clean: -rm -rf $(HTML) +# Remove generated files but keep the HTML (for release tarballs). releaseclean: -rm -f $(CONFIGURE_GENERATED) -rm -f $(MAIN_XML_ALL) distclean: clean releaseclean -.PHONY: all help html-chunked html-single xmllint +.PHONY: all html-chunked html-single xmllint .PHONY: html-chunked-* html-single-* xmllint-* *clean

1 0

r31579 - in trunk: help/help_mp-bg.h help/help_mp-cs.h help/help_mp-de.h help/help_mp-dk.h help/help_mp-el.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it....
by diego 28 Jun '10

28 Jun '10

Author: diego Date: Mon Jun 28 11:25:56 2010 New Revision: 31579 Log: Remove unnecessary HELP_MP_DEFINE_STATIC #define and corresponding #ifdefs. This was attempted before and reverted due to causing warnings. No warnings appear after the removal now, so the operation should be safe this time. Modified: trunk/help/help_mp-en.h Changes in other areas also in this revision: Modified: trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-dk.h trunk/help/help_mp-el.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-ja.h trunk/help/help_mp-ko.h trunk/help/help_mp-mk.h trunk/help/help_mp-nb.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-pt_BR.h trunk/help/help_mp-ro.h trunk/help/help_mp-ru.h trunk/help/help_mp-sk.h trunk/help/help_mp-sv.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h trunk/mplayer.c Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h Mon Jun 28 10:43:05 2010 (r31578) +++ trunk/help/help_mp-en.h Mon Jun 28 11:25:56 2010 (r31579) @@ -12,7 +12,6 @@ // ========================= MPlayer help =========================== -#ifdef HELP_MP_DEFINE_STATIC static const char help_text[]= "Usage: mplayer [options] [url|path/]filename\n" "\n" @@ -52,7 +51,6 @@ static const char help_text[]= "\n" " * * * SEE THE MAN PAGE FOR DETAILS, FURTHER (ADVANCED) OPTIONS AND KEYS * * *\n" "\n"; -#endif // ========================= MPlayer messages ===========================

1 0

r31552 - trunk/DOCS/man/en/mplayer.1
by attila 24 Jun '10

24 Jun '10

Author: attila Date: Thu Jun 24 16:06:51 2010 New Revision: 31552 Log: make clear that -frames 0 surpresses all _video_ output and not the text output Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Thu Jun 24 12:19:49 2010 (r31551) +++ trunk/DOCS/man/en/mplayer.1 Thu Jun 24 16:06:51 2010 (r31552) @@ -942,7 +942,7 @@ track languages and IDs. In some cases you can get more information by using \-msglevel identify=6. For example, for a DVD it will list the chapters and time length of each title, as well as a disk ID. -Combine this with \-frames 0 to suppress all output. +Combine this with \-frames 0 to suppress all video output. The wrapper script TOOLS/\:midentify.sh suppresses the other MPlayer output and (hopefully) shellescapes the filenames. .

1 0

r31538 - in trunk/DOCS/xml: . Makefile configure
by diego 23 Jun '10

23 Jun '10

Author: diego Date: Wed Jun 23 15:36:02 2010 New Revision: 31538 Log: Get rid of xsltproc wrapper redirection; run commands directly from make. Modified: trunk/DOCS/xml/Makefile trunk/DOCS/xml/configure Changes in other areas also in this revision: Modified: trunk/DOCS/xml/ (props changed) Modified: trunk/DOCS/xml/Makefile ============================================================================== --- trunk/DOCS/xml/Makefile Wed Jun 23 15:24:53 2010 (r31537) +++ trunk/DOCS/xml/Makefile Wed Jun 23 15:36:02 2010 (r31538) @@ -7,7 +7,7 @@ include xml.mak HTML = ../HTML MAIN_XML_ALL = $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml) -CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xml.mak xsltproc.sh +CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xml.mak all: html-chunked html-single @@ -44,10 +44,10 @@ $(HTML)/$(lang)/default.css: cp -f default.css $$(@D) $(HTML)/$(lang)/dummy.html: - ./xsltproc.sh $$@ html-chunk.xsl $$< + SGML_CATALOG_FILES=$(CATALOG) $(XSLT_COMMAND) $$@ html-chunk.xsl $$< $(HTML)/$(lang)/MPlayer.html: - ./xsltproc.sh $$@ html-single.xsl $$< + SGML_CATALOG_FILES=$(CATALOG) $(XSLT_COMMAND) $$@ html-single.xsl $$< xmllint-$(lang): SGML_CATALOG_FILES=$(CATALOG) $(XMLLINT_COMMAND) $(lang)/main.xml Modified: trunk/DOCS/xml/configure ============================================================================== --- trunk/DOCS/xml/configure Wed Jun 23 15:24:53 2010 (r31537) +++ trunk/DOCS/xml/configure Wed Jun 23 15:36:02 2010 (r31538) @@ -3,8 +3,6 @@ # Script to check for catalogs, stylesheets, XSL processors and all # the other stuff necessary to convert the XML documentation. -_xsltwrapper="xsltproc.sh" - echo "Searching for XML catalogs..." for _try_catalog in \ /etc/sgml/catalog \ @@ -29,7 +27,6 @@ done if test -n "$_catalog" then echo "Found SGML catalog at $_catalog" - _sgmlcatalog="export SGML_CATALOG_FILES=$_catalog" else echo "No SGML catalog found." fi @@ -183,9 +180,9 @@ then echo "Found xsltproc. If it works, it's probably the best choice." if test -n "$_catalog" then - _xsltcommand="xsltproc --catalogs -o \$1 \$2 \$3" + _xsltcommand="xsltproc --catalogs -o \$\$1 \$\$2 \$\$3" else - _xsltcommand="xsltproc -o \$1 \$2 \$3" + _xsltcommand="xsltproc -o \$\$1 \$\$2 \$\$3" fi else echo "Found xsltproc but no stylesheets on your system." @@ -194,22 +191,6 @@ then fi - -cat > $_xsltwrapper << EOF -#!/bin/sh -# ************************************************** -# This file is generated automatically. DO NOT EDIT. -# ************************************************** -# This is a small wrapper script around many ways to call the XSLT processor. -# It accepts 3 arguments: <output_dir> <stylesheet_name> <main XML file name> - -$_sgmlcatalog -$_xsltcommand -EOF - -chmod +x $_xsltwrapper - - echo "Searching for XML checker..." for _try_xmllint in xmllint do @@ -235,4 +216,5 @@ fi cat > xml.mak << EOF CATALOG = $_catalog XMLLINT_COMMAND = $_xmllint_command +XSLT_COMMAND = $_xsltcommand EOF

1 0

r31537 - in trunk/DOCS/xml: Makefile configure
by diego 23 Jun '10

23 Jun '10

Author: diego Date: Wed Jun 23 15:24:53 2010 New Revision: 31537 Log: Move xsltproc target file hack to the Makefile. Modified: trunk/DOCS/xml/Makefile trunk/DOCS/xml/configure Modified: trunk/DOCS/xml/Makefile ============================================================================== --- trunk/DOCS/xml/Makefile Wed Jun 23 14:38:40 2010 (r31536) +++ trunk/DOCS/xml/Makefile Wed Jun 23 15:24:53 2010 (r31537) @@ -35,16 +35,16 @@ $(CONFIGURE_GENERATED) $(MAIN_XML_ALL): ./configure define lang-def -html-chunked-$(lang): $(HTML)/$(lang)/index.html +html-chunked-$(lang): $(HTML)/$(lang)/dummy.html html-single-$(lang): $(HTML)/$(lang)/MPlayer.html -$(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) html-common.xsl $(HTML)/$(lang)/default.css +$(HTML)/$(lang)/dummy.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) html-common.xsl $(HTML)/$(lang)/default.css $(HTML)/$(lang)/default.css: mkdir -p $$(@D) cp -f default.css $$(@D) -$(HTML)/$(lang)/index.html: - ./xsltproc.sh $$(@D)/ html-chunk.xsl $$< +$(HTML)/$(lang)/dummy.html: + ./xsltproc.sh $$@ html-chunk.xsl $$< $(HTML)/$(lang)/MPlayer.html: ./xsltproc.sh $$@ html-single.xsl $$< Modified: trunk/DOCS/xml/configure ============================================================================== --- trunk/DOCS/xml/configure Wed Jun 23 14:38:40 2010 (r31536) +++ trunk/DOCS/xml/configure Wed Jun 23 15:24:53 2010 (r31537) @@ -181,13 +181,11 @@ then if test -z "$_fake_chunk_xsl" then echo "Found xsltproc. If it works, it's probably the best choice." - # HACK: xslt always need a target file if a doctype is set - _xsltcommand="OUTPUT=\"\$1\"; if test -d \"\$OUTPUT\" ; then OUTPUT=\"\$OUTPUT/dummy.html\" ; fi;" if test -n "$_catalog" then - _xsltcommand="$_xsltcommand xsltproc --catalogs -o \$OUTPUT \$2 \$3" + _xsltcommand="xsltproc --catalogs -o \$1 \$2 \$3" else - _xsltcommand="$_xsltcommand xsltproc -o \$OUTPUT \$2 \$3" + _xsltcommand="xsltproc -o \$1 \$2 \$3" fi else echo "Found xsltproc but no stylesheets on your system."

1 0

r31536 - in trunk/DOCS/xml: README configure
by diego 23 Jun '10

23 Jun '10

Author: diego Date: Wed Jun 23 14:38:40 2010 New Revision: 31536 Log: Drop support for the Saxon XSLT processor. The XSLT processor detection needs to be overhauled and simplified. Since nobody appears to be using Saxon it is just a burden that hinders the simplification. It can be added back cleanly if there is popular request. Modified: trunk/DOCS/xml/README trunk/DOCS/xml/configure Modified: trunk/DOCS/xml/README ============================================================================== --- trunk/DOCS/xml/README Wed Jun 23 14:24:48 2010 (r31535) +++ trunk/DOCS/xml/README Wed Jun 23 14:38:40 2010 (r31536) @@ -13,12 +13,6 @@ ones successfully, so they are required: * xsltproc (part of libxslt1) is used for transforming XML files into HTML files. Version 1.0.18 or later is recommended. -It's also possible to use the Saxon XSLT Processor. The Russian translator -used it (version 6.4.4) for a while. If you have a suitable JavaVM and a -saxon.jar installed somewhere, configure will try to detect them. If -autodetection fails, try to tweak DOCS/xml/configure to get it working and -send us a patch :) - On Red Hat systems you need the following packages: libxml2, libxslt, docbook-dtds, docbook-style-xsl Modified: trunk/DOCS/xml/configure ============================================================================== --- trunk/DOCS/xml/configure Wed Jun 23 14:24:48 2010 (r31535) +++ trunk/DOCS/xml/configure Wed Jun 23 14:38:40 2010 (r31536) @@ -176,8 +176,6 @@ EOF done echo "Looking for a valid XSLT processor..." -# Checks for xsltproc, then checks for the Saxon processor (it needs Java). - if xsltproc --version > /dev/null 2>&1 then if test -z "$_fake_chunk_xsl" @@ -197,73 +195,6 @@ then fi fi -# xsltproc not found. -# Now try to find a good Java virtual machine. -# FIXME: We need more checks for Java virtual machines. -if test -z "$_xsltcommand" -then - #FIXME: Add more suitable machines!!! - for _try_java in java gij-3.3 gij-3.2 gij-3.1 gij-3.0 gij - do - if $_try_java --version > /dev/null 2>&1 || $_try_java -version > /dev/null 2>&1 - then - _java=$_try_java - break - fi - done - if test -z "$_java" - then - echo "Java VM not found." - else - # Try to find the right jar files for classpath. - # This must not trigger on something like saxon-fop-6.4.4.jar. - for _try_saxon_jar in \ - /usr/share/java/saxon-[0-9]*.jar \ - /usr/local/share/java/saxon-[0-9]*.jar \ - /usr/share/java/saxon.jar \ - /usr/local/share/java/saxon.jar - do - if test -f "$_try_saxon_jar" - then - _saxon_jar=$_try_saxon_jar - #Don't break to find the _latest_ saxon.jar. - fi - done - if test -n "$_saxon_jar" - then - if test -z "$_fake_chunk_xsl" - then -# _xsltcommand="cd \$1 && if test \"\`dirname \$2 | head -c 1\`\" = \".\" ; then $_java -classpath $_saxon_jar com.icl.saxon.StyleSheet \$_IN_DIR/\$3 \$_IN_DIR/\$2 ; else $_java -classpath $_saxon_jar com.icl.saxon.StyleSheet \$_IN_DIR/\$3 \$2 ;fi" - _xsltcommand=" -if test \"\`dirname \$2 | head -c 1\`\" = \".\" -then - _STYLESHEET=\$_IN_DIR/\$2 -else - _STYLESHEET=\$2 -fi - -if test -d \$1 -then - _DIRNAME=\"\$1\" - _OUTPUT=\"\" -else - _DIRNAME=\"\`dirname \$1\`\" - _OUTPUT=\"-o \`basename \$1\`\" -fi - -cd \$_DIRNAME && - java -classpath /usr/share/java/saxon.jar com.icl.saxon.StyleSheet \$_OUTPUT \$_IN_DIR/\$3 \$_STYLESHEET - " - - echo "Found the Saxon XSLT Processor ($_saxon_jar), using Java VM '$_java'." - else - echo "Found the Saxon XSLT processor but no stylesheets on your system." - echo "Saxon is unusable without stylesheets." - fi - fi - fi -fi - cat > $_xsltwrapper << EOF @@ -273,7 +204,6 @@ cat > $_xsltwrapper << EOF # ************************************************** # This is a small wrapper script around many ways to call the XSLT processor. # It accepts 3 arguments: <output_dir> <stylesheet_name> <main XML file name> -_IN_DIR=\`pwd\` $_sgmlcatalog $_xsltcommand

1 0

r31535 - trunk/DOCS/xml/configure
by diego 23 Jun '10

23 Jun '10

Author: diego Date: Wed Jun 23 14:24:48 2010 New Revision: 31535 Log: Drop configure support for Jade/OpenJade XSLT processors. Support is not functional nor is it clear it ever worked at all. Modified: trunk/DOCS/xml/configure Modified: trunk/DOCS/xml/configure ============================================================================== --- trunk/DOCS/xml/configure Wed Jun 23 14:07:29 2010 (r31534) +++ trunk/DOCS/xml/configure Wed Jun 23 14:24:48 2010 (r31535) @@ -177,8 +177,6 @@ done echo "Looking for a valid XSLT processor..." # Checks for xsltproc, then checks for the Saxon processor (it needs Java). -# Also checks for Jade/OpenJade. -#FIXME: Add support for the xalan/xalan2 XSLT processors. if xsltproc --version > /dev/null 2>&1 then @@ -266,57 +264,6 @@ cd \$_DIRNAME && fi fi -if test -z "$_xsltcommand" -then - # Java not found. - # now try openjade/jade. - for _try_jade in jade openjade - do - if command -v $_try_jade > /dev/null - then - _jade=$_try_jade - break - fi - done - if test -n "$_jade" - then - echo "xsltproc and Saxon XSLT processors not found." - echo "I will try to use OpenJade or Jade (using '$_jade')." - echo "They aren't (currently) fully supported, however." - for _try_docbook_dsl in \ - /usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl \ - /usr/local/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl - do - if test -f "$_try_docbook_dsl" - then - _docbook_dsl=$_try_docbook_dsl - break - fi - done - for _try_xml_dcl in \ - /usr/share/sgml/declaration/xml.dcl \ - /usr/local/share/sgml/declaration/xml.dcl - do - if test -f "$_try_xml_dcl" - then - _xml_dcl=$_try_xml_dcl - break - fi - done - if test "x$_docbook_dsl" = "x" -o "x$_xml_dcl" = "x" - then - echo "One of the files docbook.dsl and xml.dcl or both of them weren't found." - echo "Bailing out." - exit 1 - fi - _xsltcommand="cd \$1 && $_jade -t xml -d $_docbook_dsl $_xml_dcl \$_IN_DIR/\$3" - else - echo "No valid XSLT processor found." - echo "Bailing out." - exit 1 - fi -fi - cat > $_xsltwrapper << EOF

1 0

Fwd: translation of locale zh_TW for mplayer
by Mizda Gábor 23 Jun '10

23 Jun '10

Hi! I've received this via private mail. IMHO it can be committed, but I'm not competent to decide about it. I know it's not a patch, but that's not a big problem. -------- Eredeti üzenet -------- Tárgy: translation of locale zh_TW for mplayer Dátum: Mon, 31 May 2010 05:43:23 -0400 Feladó: gnilbeil(a)pcmail.com.tw Címzett: gnilbeil(a)pcmail.com.tw Hi, A modified help_mp-zh_TW.h is attached. Best,

2 3

r31534 - in trunk/DOCS/xml: . Makefile configure
by diego 23 Jun '10

23 Jun '10

Author: diego Date: Wed Jun 23 14:07:29 2010 New Revision: 31534 Log: Get rid of xmllint wrapper redirection; run commands directly from make. Modified: trunk/DOCS/xml/Makefile trunk/DOCS/xml/configure Changes in other areas also in this revision: Modified: trunk/DOCS/xml/ (props changed) Modified: trunk/DOCS/xml/Makefile ============================================================================== --- trunk/DOCS/xml/Makefile Wed Jun 23 13:37:26 2010 (r31533) +++ trunk/DOCS/xml/Makefile Wed Jun 23 14:07:29 2010 (r31534) @@ -1,12 +1,13 @@ # Makefile for generating the HTML documentation include ../../config.mak +include xml.mak # Generated HTML files go here. HTML = ../HTML MAIN_XML_ALL = $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml) -CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh +CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xml.mak xsltproc.sh all: html-chunked html-single @@ -48,8 +49,8 @@ $(HTML)/$(lang)/index.html: $(HTML)/$(lang)/MPlayer.html: ./xsltproc.sh $$@ html-single.xsl $$< -xmllint-$(lang): $(lang)/main.xml - ./xmllint.sh $$< +xmllint-$(lang): + SGML_CATALOG_FILES=$(CATALOG) $(XMLLINT_COMMAND) $(lang)/main.xml endef $(foreach lang, $(DOC_LANG_ALL),$(eval $(lang-def))) Modified: trunk/DOCS/xml/configure ============================================================================== --- trunk/DOCS/xml/configure Wed Jun 23 13:37:26 2010 (r31533) +++ trunk/DOCS/xml/configure Wed Jun 23 14:07:29 2010 (r31534) @@ -4,7 +4,6 @@ # the other stuff necessary to convert the XML documentation. _xsltwrapper="xsltproc.sh" -_xmllintwrapper="xmllint.sh" echo "Searching for XML catalogs..." for _try_catalog in \ @@ -358,14 +357,7 @@ then _xmllint_command=true fi -cat > $_xmllintwrapper << EOF -#!/bin/sh -# ************************************************** -# This file is generated automatically. DO NOT EDIT. -# ************************************************** -# This is a small wrapper for XML lintian programs. -$_sgmlcatalog -$_xmllint_command +cat > xml.mak << EOF +CATALOG = $_catalog +XMLLINT_COMMAND = $_xmllint_command EOF - -chmod +x $_xmllintwrapper

1 0