June 2009 - MPlayer-cvslog - lists.mplayerhq.hu

r29370 - trunk/libvo/font_load_ft.c
by siretart 17 Jun '09

17 Jun '09

Author: siretart Date: Wed Jun 17 11:16:19 2009 New Revision: 29370 Log: enable fontconfig support by default. This change takes only in effect, if fontconfig support is actually compiled in. Modified: trunk/libvo/font_load_ft.c Modified: trunk/libvo/font_load_ft.c ============================================================================== --- trunk/libvo/font_load_ft.c Wed Jun 17 11:14:17 2009 (r29369) +++ trunk/libvo/font_load_ft.c Wed Jun 17 11:16:19 2009 (r29370) @@ -71,7 +71,7 @@ int vo_image_height = 0; int force_load_font; int using_freetype = 0; -int font_fontconfig = 0; +int font_fontconfig = 1; //// constants static unsigned int const colors = 256;

1 0

r29369 - trunk/etc/mplayer.desktop
by siretart 17 Jun '09

17 Jun '09

Author: siretart Date: Wed Jun 17 11:14:17 2009 New Revision: 29369 Log: Conform to the updated Desktop File Specification. Also improve the wording of the Name and Comment field. Also update the german translation. Other translations based on a suggestion from Siegfried Gevatter <rainct(a)ubuntu.com>. Modified: trunk/etc/mplayer.desktop Modified: trunk/etc/mplayer.desktop ============================================================================== --- trunk/etc/mplayer.desktop Wed Jun 17 07:18:28 2009 (r29368) +++ trunk/etc/mplayer.desktop Wed Jun 17 11:14:17 2009 (r29369) @@ -1,11 +1,12 @@ [Desktop Entry] Type=Application -Encoding=UTF-8 -Name=MPlayer +Name=MPlayer Media Player +Name[ca]=Reproductor multimèdia MPlayer GenericName=Multimedia player -Comment=Multimedia player -Comment[de]=Multimedia-Player -Comment[es]=Reproductor multimedia +Comment=Play movies and songs +Comment[ca]=Reproduïu vídeos i cançons +Comment[de]=Filme und Musik abspielen +Comment[es]=Reproduzca vídeos y canciones Comment[fr]=Lecteur multimédia Comment[it]=Lettore multimediale Comment[zh]=多媒体播放器

1 0

r29368 - trunk/etc/codecs.conf
by compn 17 Jun '09

17 Jun '09

Author: compn Date: Wed Jun 17 07:18:28 2009 New Revision: 29368 Log: add .mp1/.mp2 mov audio fourcc to ffmp2 codec Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Jun 16 19:58:12 2009 (r29367) +++ trunk/etc/codecs.conf Wed Jun 17 07:18:28 2009 (r29368) @@ -3674,6 +3674,8 @@ audiocodec ffmp2 comment "integer only" status working format 0x50 + fourcc ".mp2" ; MP2 (MOV files) + fourcc ".mp1" ; MP1 (MOV files) driver ffmpeg dll "mp2"

1 0

r29367 - trunk/libass/ass_font.c
by eugeni 16 Jun '09

16 Jun '09

Author: eugeni Date: Tue Jun 16 19:58:12 2009 New Revision: 29367 Log: Add a missing check for a NULL return value. Modified: trunk/libass/ass_font.c Modified: trunk/libass/ass_font.c ============================================================================== --- trunk/libass/ass_font.c Tue Jun 16 15:32:51 2009 (r29366) +++ trunk/libass/ass_font.c Tue Jun 16 19:58:12 2009 (r29367) @@ -127,6 +127,8 @@ static int add_face(void* fc_priv, ass_f path = fontconfig_select(fc_priv, font->desc.family, font->desc.treat_family_as_pattern, font->desc.bold, font->desc.italic, &index, ch); + if (!path) + return -1; mem_idx = find_font(font->library, path); if (mem_idx >= 0) {

1 0

r29366 - trunk/configure
by cehoyos 16 Jun '09

16 Jun '09

Author: cehoyos Date: Tue Jun 16 15:32:51 2009 New Revision: 29366 Log: Do not auto-detect old libnut installations. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jun 14 23:09:35 2009 (r29365) +++ trunk/configure Tue Jun 16 15:32:51 2009 (r29366) @@ -7287,6 +7287,7 @@ if test "$_libnut" = auto ; then #include <stdlib.h> #include <inttypes.h> #include <libnut.h> +nut_context_tt * nut; int main(void) { (void)nut_error(0); return 0; } EOF _libnut=no

1 0

r29365 - in trunk: Makefile configure
by diego 14 Jun '09

14 Jun '09

Author: diego Date: Sun Jun 14 23:09:35 2009 New Revision: 29365 Log: Rename LIBVORBIS Makefile variable to VORBIS. The latter is more clear as it can represent either Tremor or libvorbis. Modified: trunk/Makefile trunk/configure Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Jun 14 20:51:36 2009 (r29364) +++ trunk/Makefile Sun Jun 14 23:09:35 2009 (r29365) @@ -193,8 +193,6 @@ SRCS_COMMON-$(LIBNUT) += SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c -SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \ - libmpdemux/demux_ogg.c SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ libmpdemux/demux_rtp_codec.cpp \ stream/stream_live555.c @@ -288,6 +286,8 @@ SRCS_COMMON-$(TV_V4L1) += SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c SRCS_COMMON-$(VCD) += stream/stream_vcd.c +SRCS_COMMON-$(VORBIS) += libmpcodecs/ad_libvorbis.c \ + libmpdemux/demux_ogg.c SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c SRCS_COMMON-$(WIN32_EMULATION) += loader/elfdll.c \ loader/ext.c \ Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jun 14 20:51:36 2009 (r29364) +++ trunk/configure Sun Jun 14 23:09:35 2009 (r29365) @@ -8265,7 +8265,6 @@ LIBNEMESI = $_nemesi LIBNUT = $_libnut LIBSMBCLIENT = $_smb LIBTHEORA = $_theora -LIBVORBIS = $_vorbis LIRC = $_lirc LIVE555 = $_live MACOSX_BUNDLE = $_macosx_bundle @@ -8335,6 +8334,7 @@ VIDIX_S3=$_vidix_drv_s3 VIDIX_SH_VEU=$_vidix_drv_sh_veu VIDIX_SIS=$_vidix_drv_sis VIDIX_UNICHROME=$_vidix_drv_unichrome +VORBIS = $_vorbis VSTREAM = $_vstream WII = $_wii WIN32DLL = $_win32dll

1 0

r29363 - trunk/configure
by diego 14 Jun '09

14 Jun '09

Author: diego Date: Sun Jun 14 16:55:01 2009 New Revision: 29363 Log: Overhaul translation handling completely and add options to install specific documentation and man page translations. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jun 14 15:25:54 2009 (r29362) +++ trunk/configure Sun Jun 14 16:55:01 2009 (r29363) @@ -425,6 +425,20 @@ Audio output: --disable-coreaudio disable CoreAudio audio output [autodetect] --disable-select disable using select() on the audio device [enable] +Language options: + --charset=charset convert the console messages to this character set + --language-doc=lang language to use for the documentation [en] + --language-man=lang language to use for the man pages [en] + --language-msg=lang language to use for the messages and the GUI [en] + --language=lang default language to use [en] +Specific options override --language. You can pass a list of languages separated +by whitespace or commas instead of a single language. Nonexisting translations +will be dropped from each list. All documentation and man page translations +available in the list will be installed, for the messages the first available +translation will be used. The value "all" will activate all translations. The +LINGUAS environment variable is honored. In all cases the fallback is English. +Available values are: all $msg_lang_all + Miscellaneous options: --enable-runtime-cpudetection enable runtime CPU detection [disable] --enable-cross-compile enable cross-compilation [autodetect] @@ -438,12 +452,6 @@ Miscellaneous options: --windres=WINDRES windres to build MPlayer [windres] --target=PLATFORM target platform (i386-linux, arm-linux, etc) --enable-static build a statically linked binary - --charset=charset convert the console messages to this character set - --language-msg=LINGUA language used for messages and the GUI [en] - --language=list a white space or comma separated list of languages for - translated man pages (the environment variable - \$LINGUAS is also honored) [en] - (Available: all $msg_lang_all) --with-install=PATH path to a custom install program Advanced options: @@ -849,6 +857,12 @@ for ac_option do --charset=*) _charset=$(echo $ac_option | cut -d '=' -f 2) ;; + --language-doc=*) + language_doc=$(echo $ac_option | cut -d '=' -f 2) + ;; + --language-man=*) + language_man=$(echo $ac_option | cut -d '=' -f 2) + ;; --language-msg=*) language_msg=$(echo $ac_option | cut -d '=' -f 2) ;; @@ -2793,41 +2807,40 @@ echores "$_langinfo" echocheck "language" +# Set preferred languages, "all" uses English as main language. test -z "$language" && language=$LINGUAS -test -z "$language_msg" && language_msg=$LINGUAS -language=$(echo $language | tr , " ") +test -z "$language_doc" && language_doc=$language +test -z "$language_man" && language_man=$language +test -z "$language_msg" && language_msg=$language +language_doc=$(echo $language_doc | tr , " ") +language_man=$(echo $language_man | tr , " ") language_msg=$(echo $language_msg | tr , " ") -if $(echo $language | grep -q all) ; then - doc_lang=en ; doc_langs=$doc_lang_all - man_lang=en ; man_langs=$man_lang_all -else - for lang in $language ; do - if test -d DOCS/man/$lang ; then - tmp_man_langs="$tmp_man_langs $lang" - fi - if test -d DOCS/xml/$lang ; then - tmp_doc_langs="$tmp_doc_langs $lang" - fi - done - man_langs=$tmp_man_langs - doc_langs=$tmp_man_langs - for lang in $language_msg ; do - if test -f "help/help_mp-${lang}.h" ; then - msg_lang=$lang - break - else - echo ${_echo_n} "$lang not found, ${_echo_c}" - language_msg=$(echo $language_msg | sed "s/$lang *//") - fi - done -fi -test -z "$doc_langs" && doc_langs=en -test -z "$man_langs" && man_langs=en -test -z "$doc_lang" && doc_lang=$(echo $doc_langs | cut -f1 -d" ") -test -z "$man_lang" && man_lang=$(echo $man_langs | cut -f1 -d" ") -test -z "$msg_lang" && msg_lang=en -_mp_help="help/help_mp-${msg_lang}.h" -echores "messages: $msg_lang - man pages: $man_langs - documentation: $doc_langs" + +test "$language_doc" = "all" && language_doc=$doc_lang_all +test "$language_man" = "all" && language_man=$man_lang_all +test "$language_msg" = "all" && language_msg=en + +# Prune non-existing translations from language lists. +# Set message translation to the first available language. +# Fall back on English. +for lang in $language_doc ; do + test -d DOCS/xml/$lang && tmp_language_doc="$tmp_language_doc $lang" +done +language_doc=$tmp_language_doc +test -z "language_doc" && language_doc=en + +for lang in $language_man ; do + test -d DOCS/man/$lang && tmp_language_man="$tmp_language_man $lang" +done +language_man=$tmp_language_man +test -z "language_man" && language_man=en + +for lang in $language_msg ; do + test -f "help/help_mp-${lang}.h" && language_msg=$lang && break +done +test -z "language_msg" && language_msg=en +_mp_help="help/help_mp-${language_msg}.h" +echores "messages: $language_msg - man pages: $language_man - documentation: $language_doc" echocheck "enable sighandler" @@ -8113,10 +8126,8 @@ export LC_ALL = C CONFIGURATION = $_configuration CHARSET = $_charset -DOC_LANG = $doc_lang DOC_LANGS = $doc_langs DOC_LANG_ALL = $doc_lang_all -MAN_LANG = $man_lang MAN_LANGS = $man_langs MAN_LANG_ALL = $man_lang_all @@ -8910,8 +8921,9 @@ Config files successfully generated by . Optimizing for: $_optimizing Languages: - Messages/GUI: $msg_lang - Manual pages: $man_langs + Messages/GUI: $language_msg + Manual pages: $language_man + Documentation: $language_doc Enabled optional drivers: Input: $_inputmodules

3 2

r29364 - trunk/configure
by diego 14 Jun '09

14 Jun '09

Author: diego Date: Sun Jun 14 20:51:36 2009 New Revision: 29364 Log: 100l: Add missing $s to default language variable checks, which prevented fallback language settings from taking effect. patch by Francesco Lavra, francescolavra interfree it Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jun 14 16:55:01 2009 (r29363) +++ trunk/configure Sun Jun 14 20:51:36 2009 (r29364) @@ -2827,18 +2827,18 @@ for lang in $language_doc ; do test -d DOCS/xml/$lang && tmp_language_doc="$tmp_language_doc $lang" done language_doc=$tmp_language_doc -test -z "language_doc" && language_doc=en +test -z "$language_doc" && language_doc=en for lang in $language_man ; do test -d DOCS/man/$lang && tmp_language_man="$tmp_language_man $lang" done language_man=$tmp_language_man -test -z "language_man" && language_man=en +test -z "$language_man" && language_man=en for lang in $language_msg ; do test -f "help/help_mp-${lang}.h" && language_msg=$lang && break done -test -z "language_msg" && language_msg=en +test -z "$language_msg" && language_msg=en _mp_help="help/help_mp-${language_msg}.h" echores "messages: $language_msg - man pages: $language_man - documentation: $language_doc"

1 0

r29362 - trunk/configure
by diego 14 Jun '09

14 Jun '09

Author: diego Date: Sun Jun 14 15:25:54 2009 New Revision: 29362 Log: cosmetics: Drop leading underscore from _language* variables. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jun 14 14:42:06 2009 (r29361) +++ trunk/configure Sun Jun 14 15:25:54 2009 (r29362) @@ -694,7 +694,7 @@ _directfb=auto _zr=auto _bl=no _largefiles=yes -#_language=en +#language=en _shm=auto _linux_devfs=no _charset="UTF-8" @@ -850,10 +850,10 @@ for ac_option do _charset=$(echo $ac_option | cut -d '=' -f 2) ;; --language-msg=*) - _language_msg=$(echo $ac_option | cut -d '=' -f 2) + language_msg=$(echo $ac_option | cut -d '=' -f 2) ;; --language=*) - _language=$(echo $ac_option | cut -d '=' -f 2) + language=$(echo $ac_option | cut -d '=' -f 2) ;; --enable-static) @@ -2793,15 +2793,15 @@ echores "$_langinfo" echocheck "language" -test -z "$_language" && _language=$LINGUAS -test -z "$_language_msg" && _language_msg=$LINGUAS -_language=$(echo $_language | tr , " ") -_language_msg=$(echo $_language_msg | tr , " ") -if $(echo $_language | grep -q all) ; then +test -z "$language" && language=$LINGUAS +test -z "$language_msg" && language_msg=$LINGUAS +language=$(echo $language | tr , " ") +language_msg=$(echo $language_msg | tr , " ") +if $(echo $language | grep -q all) ; then doc_lang=en ; doc_langs=$doc_lang_all man_lang=en ; man_langs=$man_lang_all else - for lang in $_language ; do + for lang in $language ; do if test -d DOCS/man/$lang ; then tmp_man_langs="$tmp_man_langs $lang" fi @@ -2811,13 +2811,13 @@ else done man_langs=$tmp_man_langs doc_langs=$tmp_man_langs - for lang in $_language_msg ; do + for lang in $language_msg ; do if test -f "help/help_mp-${lang}.h" ; then msg_lang=$lang break else echo ${_echo_n} "$lang not found, ${_echo_c}" - _language_msg=$(echo $_language_msg | sed "s/$lang *//") + language_msg=$(echo $language_msg | sed "s/$lang *//") fi done fi

1 0

[propchange]: r29361 - svn:log
by diego 14 Jun '09

14 Jun '09

Author: diego Revision: 29361 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1,2 @@ Allow setting message language separately from documentation language. -patch by Steve Dibb Steve Dibb, steve.dibb gmail com +patch by Steve Dibb, steve.dibb gmail com

1 0