Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 16

bino.changes Changed

bino.spec Changed

@@ -13,18 +13,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 Name: bino
-Version: 1.4.1
-Release: 0.pm.1
+Version: 1.4.2
+Release: 0
 Summary: Video Player with 3D and Multi-Display Video Support
 Source: http://download-mirror.savannah.gnu.org/releases/bino/bino-%{version}.tar.xz
-Source1: bino.desktop
-Patch1: bino-backport-qvariant.patch
+Patch1: bino-1.4.2-openal-fix.patch
 URL: http://www.nongnu.org/bino/
 Group: Productivity/Multimedia/Video/Players
 License: GPL-2.0+
 BuildRoot: %{_tmppath}/build-%{name}-%{version}
 BuildRequires: libqt4-devel
-BuildRequires: glew-devel >= 1.5.0
+BuildRequires: glew-devel >= 1.6.0
+%if 0%{?suse_version} > 1220
+BuildRequires: pkgconfig(glu)
+%endif
 BuildRequires: ffmpeg-devel
 BuildRequires: libass-devel
 BuildRequires: openal-devel
@@ -44,14 +46,18 @@
 
 %prep
 %setup -q
-%if 0%{?suse_version} < 1130
-%patch1
+%if 0%{?suse_version} < 1220
+%patch1 -p1
 %endif
 
 %build
+%if 0%{?suse_version} >= 1230
+# hangle 'multiple definition of'
+export LDFLAGS="%{optflags} -zmuldefs"
+%endif
 %configure \
 --with-equalizer \
- --disable-silent-rules
+ --disable-silent-rules 
 
 %__make %{?_smp_flags}
 
@@ -60,7 +66,6 @@
 
 %__rm -rf "%{buildroot}%{_datadir}/doc"
 
-%__install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
 %suse_update_desktop_file -r "%{name}" AudioVideo Player
 %find_lang "%{name}" || echo -n >"%{name}.lang"

bino-1.4.2-openal-fix.patch Added

@@ -0,0 +1,35 @@
+From 2f7a9ff7f2444c0f4d477a5aaf980b887871e1c4 Mon Sep 17 00:00:00 2001
+From: Martin Lambers <marlam@marlam.de>
+Date: Tue, 29 Jan 2013 10:31:51 +0000
+Subject: Audio output: include AL/alext.h
+
+This is for older versions of OpenAL, e.g. the one on Ubuntu 12.04, to provide
+ALC_ALL_DEVICES_SPECIFIER. Reported by Vittorio Giovara.
+---
+diff --git a/src/audio_output.h b/src/audio_output.h
+index 99d8367..1203f4a 100644
+--- a/src/audio_output.h
++++ b/src/audio_output.h
+@@ -1,7 +1,7 @@
+ /*
+ * This file is part of bino, a 3D video player.
+ *
+- * Copyright (C) 2010, 2011, 2012
++ * Copyright (C) 2010, 2011, 2012, 2013
+ * Martin Lambers <marlam@marlam.de>
+ * Gabriele Greco <gabrielegreco@gmail.com>
+ * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
+@@ -29,9 +29,11 @@
+ #if !defined(__APPLE__) || defined(HAVE_AL_AL_H)
+ # include <AL/al.h>
+ # include <AL/alc.h>
++# include <AL/alext.h>
+ #else
+ # include <OpenAL/al.h>
+ # include <OpenAL/alc.h>
++# include <OpenAL/alext.h>
+ #endif
+ 
+ #include "dispatch.h"
+--
+cgit v0.9.0.2

bino-backport-qvariant.patch Deleted

@@ -1,63 +0,0 @@
---- src/player_qt.cpp.orig	2011-05-10 09:31:04.000000000 +0200
-+++ src/player_qt.cpp	2011-05-10 09:32:17.000000000 +0200
-@@ -1856,31 +1856,31 @@
- _settings->beginGroup("Session");
- if (!(_init_data.params.contrast >= -1.0f && _init_data.params.contrast <= +1.0f))
- {
-- _init_data.params.contrast = _settings->value("contrast", QString("0")).toFloat();
-+ _init_data.params.contrast = _settings->value("contrast", QString("0")).toString().toFloat();
- }
- if (!(_init_data.params.brightness >= -1.0f && _init_data.params.brightness <= +1.0f))
- {
-- _init_data.params.brightness = _settings->value("brightness", QString("0")).toFloat();
-+ _init_data.params.brightness = _settings->value("brightness", QString("0")).toString().toFloat();
- }
- if (!(_init_data.params.hue >= -1.0f && _init_data.params.hue <= +1.0f))
- {
-- _init_data.params.hue = _settings->value("hue", QString("0")).toFloat();
-+ _init_data.params.hue = _settings->value("hue", QString("0")).toString().toFloat();
- }
- if (!(_init_data.params.saturation >= -1.0f && _init_data.params.saturation <= +1.0f))
- {
-- _init_data.params.saturation = _settings->value("saturation", QString("0")).toFloat();
-+ _init_data.params.saturation = _settings->value("saturation", QString("0")).toString().toFloat();
- }
- if (!(_init_data.params.crosstalk_r >= 0.0f && _init_data.params.crosstalk_r <= 1.0f))
- {
-- _init_data.params.crosstalk_r = _settings->value("crosstalk_r", QString("0")).toFloat();
-+ _init_data.params.crosstalk_r = _settings->value("crosstalk_r", QString("0")).toString().toFloat();
- }
- if (!(_init_data.params.crosstalk_g >= 0.0f && _init_data.params.crosstalk_g <= 1.0f))
- {
-- _init_data.params.crosstalk_g = _settings->value("crosstalk_g", QString("0")).toFloat();
-+ _init_data.params.crosstalk_g = _settings->value("crosstalk_g", QString("0")).toString().toFloat();
- }
- if (!(_init_data.params.crosstalk_b >= 0.0f && _init_data.params.crosstalk_b <= 1.0f))
- {
-- _init_data.params.crosstalk_b = _settings->value("crosstalk_b", QString("0")).toFloat();
-+ _init_data.params.crosstalk_b = _settings->value("crosstalk_b", QString("0")).toString().toFloat();
- }
- if (_init_data.params.subtitle_encoding.length() == 1 && _init_data.params.subtitle_encoding[0] == '\0')
- {
-@@ -1896,7 +1896,7 @@
- }
- if (_init_data.params.subtitle_scale < 0.0f)
- {
-- _init_data.params.subtitle_scale = _settings->value("subtitle-scale", QString("-1")).toFloat();
-+ _init_data.params.subtitle_scale = _settings->value("subtitle-scale", QString("-1")).toString().toFloat();
- }
- if (_init_data.params.subtitle_color > std::numeric_limits<uint32_t>::max())
- {
-@@ -2349,9 +2349,9 @@
- _init_data.audio_stream = std::max(0, std::min(_init_data.audio_stream, _player->get_media_input().audio_streams() - 1));
- _init_data.subtitle_stream = QVariant(_settings->value("subtitle-stream", QVariant(_init_data.subtitle_stream)).toString()).toInt();
- _init_data.subtitle_stream = std::max(-1, std::min(_init_data.subtitle_stream, _player->get_media_input().subtitle_streams() - 1));
-- _init_data.params.parallax = QVariant(_settings->value("parallax", QVariant(_init_data.params.parallax)).toString()).toFloat();
-- _init_data.params.ghostbust = QVariant(_settings->value("ghostbust", QVariant(_init_data.params.ghostbust)).toString()).toFloat();
-- _init_data.params.subtitle_parallax = QVariant(_settings->value("subtitle-parallax", QVariant(_init_data.params.parallax)).toString()).toFloat();
-+ _init_data.params.parallax = QVariant(_settings->value("parallax", QVariant(_init_data.params.parallax)).toString()).toString().toFloat();
-+ _init_data.params.ghostbust = QVariant(_settings->value("ghostbust", QVariant(_init_data.params.ghostbust)).toString()).toString().toFloat();
-+ _init_data.params.subtitle_parallax = QVariant(_settings->value("subtitle-parallax", QVariant(_init_data.params.parallax)).toString()).toString().toFloat();
- _settings->endGroup();
- // Get stereo mode
- QString mode_fallback = QString(parameters::stereo_mode_to_string(

bino-1.4.1.tar.xz/ChangeLog -> bino-1.4.2.tar.xz/ChangeLog Changed

@@ -1,4 +1,104 @@
-commit 3969d378bfd286a5703b95369a984ed844a5ee01
+commit ce01b3761eb2f546246286fba044365c9d6045b8
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2013-01-27 21:59:01 +0100
+
+ Update year in copyright messages.
+
+ po/bg.po | 8 ++++----
+ po/de.po | 8 ++++----
+ po/fr.po | 8 ++++----
+ po/ru.po | 8 ++++----
+ po/zh_cn.po | 8 ++++----
+ src/gui.cpp | 4 ++--
+ src/main.cpp | 4 ++--
+ 7 files changed, 24 insertions(+), 24 deletions(-)
+
+commit a2fa985e77bcfffb05f5986d3cc11d0721db4e77
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2013-01-27 21:56:29 +0100
+
+ Bump version to 1.4.2.
+
+ configure.ac | 4 ++--
+ doc/bino.1 | 4 ++--
+ doc/bino.texi | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 5b60ee56a52bb196802db84bc75dbc9bce2d26cd
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2013-01-27 21:55:26 +0100
+
+ Windows: update build instructions.
+
+ README.Windows | 21 ++++++---------------
+ 1 file changed, 6 insertions(+), 15 deletions(-)
+
+commit 5ed03099442b94eb88e1c5c6a91af64254695563
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2013-01-27 19:33:12 +0100
+
+ Audio output: update device enumeration code.
+
+ src/audio_output.cpp | 31 ++++++++++++++++++-------------
+ 1 file changed, 18 insertions(+), 13 deletions(-)
+
+commit 671c5d20aacb031c4cb602de4bd817624a04e81e
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2013-01-27 11:08:23 +0100
+
+ Media object: chase FFmpeg interface changes.
+ 
+ FFmpeg now produces planar audio with some decoders, and we have to convert
+ that to interleaved ourselves. This requires updating to
+ avcodec_decode_audio4().
+ 
+ A few other minor updates were made.
+
+ src/media_object.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 42 insertions(+), 15 deletions(-)
+
+commit 4a8fd8c14e34b970aca326c86fb2e599dce7c44d
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2013-01-03 09:32:25 +0100
+
+ Subtitle rendering: truncate large subtitle boxes.
+ 
+ Fixes a problem where LibASS requests subtitle bounding boxes that do not fit
+ into the video area.
+
+ src/video_output.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit a1a53501ea31b891daf23610aa3def9f756e3aa5
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-11-27 19:27:46 +0100
+
+ Fix --list-audio-devices option.
+ 
+ Creating the audio output object requires the dispatch to be initialized.
+
+ src/main.cpp | 41 ++++++++++++++++++++++-------------------
+ 1 file changed, 22 insertions(+), 19 deletions(-)
+
+commit a15114ea898f466ab62bae977c4b870cdd0f4d12
+Author: Reinhard Tartler <siretart@tauware.de>
+Date: 2012-11-11 12:42:56 +0100
+
+ Fix build failure with libav 0.9~beta
+
+ src/media_object.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 64879ab2550e4b2c3c5fa71836b979a4a4595d1c
+Author: Daniel Schaal <farbing@web.de>
+Date: 2012-11-11 13:09:31 +0100
+
+ Documentation: fix hyphen-as-minus in man page.
+
+ doc/bino.1 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 8def3ff4235c211e792a3789730812c6c81b4647
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2012-10-13 10:06:00 +0200
 
@@ -7,7 +107,7 @@
 src/video_output_qt.cpp | 6 ++++++
 1 file changed, 6 insertions(+)
 
-commit b85cddadab2c64f901be00f303cd8f5d37338b3b
+commit d0d6ac1502459c5d6fdc9d183ddd10dc4a2dce61
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2012-10-13 08:51:16 +0200
 
@@ -16,7 +116,7 @@
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 98e3f2101850300e8f7b949ae4cdae1233a549e4
+commit 25ce7609adf3c6c3594c03e350b7b2bf4d332f04
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2012-10-13 08:40:03 +0200
 
@@ -28,7 +128,7 @@
 src/video_output_qt.cpp | 7 +++++++
 1 file changed, 7 insertions(+)
 
-commit ecc109ec3f1fd5cf586c5764fd1bc2ac0f726917
+commit 511e90d4f0d1893345bbb06165d299cedacd50a8
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2012-10-13 07:06:29 +0200
 
@@ -37,7 +137,7 @@
 pkg/w32/bino.nsi | 3 +++
 1 file changed, 3 insertions(+)
 
-commit 6e5c6e6ab6401c2083703aff090c5125553f8ab3
+commit 218645244e2f82867a66fe7781cd665f161ef310
 Author: Krasimir S. Stefanov <lokiisyourmaster@gmail.com>
 Date: 2012-10-13 06:27:02 +0200
 
@@ -45,9 +145,16 @@
 
 AUTHORS | 3 +-
 po/LINGUAS | 1 +
- po/bg.po | 1880 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/bg.po | 1880 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1883 insertions(+), 1 deletion(-)
 
+commit 0ee85bcc330037c29544afd68717debc5af9c9af
+Merge: 194b2d4 7c36876
+Author: Martin Lambers <marlam@marlam.de>
+Date: 2012-09-27 23:05:50 +0200
+
+ Merge branch 'bino-1.4' of git.sv.gnu.org:/srv/git/bino into bino-1.4
+
 commit 194b2d4a7c3284ac5f5d2138b7fef30485ab7543
 Author: Martin Lambers <marlam@marlam.de>
 Date: 2012-09-27 08:51:16 +0200
@@ -106,20 +213,20 @@
 
 .gitignore | 6 +
 Makefile.am | 2 -
- build-aux/config.guess | 1530 -----------------------------------------
- build-aux/config.sub | 1773 ------------------------------------------------
- build-aux/depcomp | 688 -------------------
- build-aux/install-sh | 527 --------------
- build-aux/mdate-sh | 225 ------
- build-aux/missing | 331 ---------
- m4/gettext.m4 | 383 -----------
- m4/iconv.m4 | 214 ------
- m4/lib-ld.m4 | 110 ---
- m4/lib-link.m4 | 774 ---------------------
- m4/lib-prefix.m4 | 224 ------
- m4/nls.m4 | 32 -
- m4/po.m4 | 449 ------------
- m4/progtest.m4 | 92 ---
+ build-aux/config.guess | 1530 ------------------------------------------------------------------------------------------------------------
+ build-aux/config.sub | 1773 ------------------------------------------------------------------------------------------------------------------------------
+ build-aux/depcomp | 688 -------------------------------------------------
+ build-aux/install-sh | 527 --------------------------------------
+ build-aux/mdate-sh | 225 ----------------
+ build-aux/missing | 331 ------------------------
+ m4/gettext.m4 | 383 ----------------------------
+ m4/iconv.m4 | 214 ----------------
+ m4/lib-ld.m4 | 110 --------
+ m4/lib-link.m4 | 774 -------------------------------------------------------
+ m4/lib-prefix.m4 | 224 ----------------
+ m4/nls.m4 | 32 ---
+ m4/po.m4 | 449 --------------------------------
+ m4/progtest.m4 | 92 -------
 16 files changed, 6 insertions(+), 7354 deletions(-)
 
 commit 9d253d51eb041434893f2886c2eba409021f3cfc
@@ -131,6 +238,17 @@
 configure.ac | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)
 
+commit 7c3687684013bcbf918a2607c8c51c436a212561

bino-1.4.1.tar.xz/Makefile.in -> bino-1.4.2.tar.xz/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23,6 +23,23 @@
 # permitted in any medium without royalty provided the copyright notice and this
 # notice are preserved. This file is offered as-is, without any warranty.
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -75,6 +92,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -516,13 +538,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -611,7 +630,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)

bino-1.4.1.tar.xz/README.Windows -> bino-1.4.2.tar.xz/README.Windows Changed

@@ -5,18 +5,17 @@
 version of gcc as a cross compiler, but also all required libraries, and the
 nsis package to build an installer.
 
-The current stable version of MXE should work fine.
+The stable version of MXE is now far too old to be useful, so please use the
+development version instead.
 
-Use the following steps to build Bino using MXE installed in /path/to/mxe:
-
-1. Build the required MXE packages:
+1. Build the required MXE packages in /path/to/mxe:
 
 $ cd /path/to
- $ git clone -b stable https://github.com/mxe/mxe.git
+ $ git clone -b master https://github.com/mxe/mxe.git
 $ cd mxe
 $ make gettext pthreads ffmpeg libass openal glew qt nsis
 
- (If you do not need to build a Bino installer package, you can skip nsis).
+ (Please read the MXE documentation if you have trouble with this step.)
 
 Add MXE to your PATH:
 $ export PATH="/path/to/mxe/usr/bin:$PATH"
@@ -27,16 +26,8 @@
 $ ./configure --host=i686-pc-mingw32 --build=`build-aux/config.guess`
 $ make
 
- Optionally build the installer (requires nsis):
+ Build the installer:
 $ make package-w32
 
 The installer will install the binary, the manual, and translations along with
 start menu entries, and provide uninstall functionality.
-
-You can also copy just the bino.exe binary from the src subdirectory to any
-Windows machine. If you want to have access to translations and the manual, keep
-the following directory structure:
-c:\<path_to_bino>\bin\bino.exe
-c:\<path_to_bino>\doc\bino.html
-c:\<path_to_bino>\doc\<image_files...>
-c:\<path_to_bino>\locale\<lang>\LC_MESSAGES\bino.mo

bino-1.4.1.tar.xz/aclocal.m4 -> bino-1.4.2.tar.xz/aclocal.m4 Changed

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -14,8 +14,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -2536,7 +2536,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -2552,7 +2552,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

bino-1.4.1.tar.xz/build-aux/config.sub -> bino-1.4.2.tar.xz/build-aux/config.sub Changed

bino-1.4.1.tar.xz/build-aux/depcomp -> bino-1.4.2.tar.xz/build-aux/depcomp Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2012-03-27.16; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 case $1 in
 '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
 exit 1;
 ;;
 -h | --h*)
@@ -40,8 +40,8 @@
 
 Environment variables:
 depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
+ source Source file read by 'PROGRAMS ARGS'.
+ object Object file output by 'PROGRAMS ARGS'.
 DEPDIR directory where to store dependencies.
 depfile Dependency file to output.
 tmpdepfile Temporary file to use when outputting dependencies.
@@ -57,6 +57,12 @@
 ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
 echo "depcomp: Variables source, object and depmode must be set" 1>&2
 exit 1
@@ -102,6 +108,12 @@
 depmode=msvc7
 fi
 
+if test "$depmode" = xlc; then
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+ gccflag=-qmakedep=gcc,-MF
+ depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -156,15 +168,14 @@
 ## The second -e expression handles DOS-style file names with drive letters.
 sed -e 's/^[^:]*: / /' \
 -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header). We avoid this by adding
 ## dummy dependencies for each header file. Too bad gcc doesn't do
 ## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
+ tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'. On the theory
 ## that the space means something, we add a space to the output as
 ## well. hp depmode also adds that space, but also prefixes the VPATH
 ## to the object. Take care to not repeat it in the output.
@@ -203,18 +214,15 @@
 # clever and replace this with sed code, as IRIX sed won't handle
 # lines with more than a fixed number of characters (4096 in
 # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
+ # the IRIX cc adds comments like '#:fec' to the end of the
 # dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
+ tr ' ' "$nl" < "$tmpdepfile" \
 | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> "$depfile"
+ tr "$nl" ' ' >> "$depfile"
 echo >> "$depfile"
 
 # The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
+ tr ' ' "$nl" < "$tmpdepfile" \
 | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
 >> "$depfile"
 else
@@ -226,10 +234,17 @@
 rm -f "$tmpdepfile"
 ;;
 
+xlc)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
 aix)
 # The C for AIX Compiler uses -M and outputs the dependencies
 # in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
+ # current directory. Also, the AIX compiler puts '$object:' at the
 # start of each line; $object doesn't have directory information.
 # Version 6 uses the directory in both cases.
 dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -259,12 +274,11 @@
 test -f "$tmpdepfile" && break
 done
 if test -f "$tmpdepfile"; then
- # Each line is of the form `foo.o: dependent.h'.
+ # Each line is of the form 'foo.o: dependent.h'.
 # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
+ # '$object: dependent.h' and one to simply 'dependent.h:'.
 sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
 else
 # The sourcefile does not contain any dependencies, so just
 # store a dummy comment line, to avoid errors with the Makefile
@@ -275,23 +289,26 @@
 ;;
 
 icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+ # However on
+ # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
 # ICC 7.0 will fill foo.d with something like
 # foo.o: sub/foo.c
 # foo.o: sub/foo.h
- # which is wrong. We want:
+ # which is wrong. We want
 # sub/foo.o: sub/foo.c
 # sub/foo.o: sub/foo.h
 # sub/foo.c:
 # sub/foo.h:
 # ICC 7.1 will output
 # foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
+ # and will wrap long lines using '\':
 # foo.o: sub/foo.c ... \
 # sub/foo.h ... \
 # ...
-
+ # tcc 0.9.26 (FIXME still under development at the moment of writing)
+ # will emit a similar output, but also prepend the continuation lines
+ # with horizontal tabulation characters.
 "$@" -MD -MF "$tmpdepfile"
 stat=$?
 if test $stat -eq 0; then :
@@ -300,15 +317,21 @@
 exit $stat
 fi
 rm -f "$depfile"
- # Each line is of the form `foo.o: dependent.h',
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Each line is of the form 'foo.o: dependent.h',
+ # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
 # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
+ # '$object: dependent.h' and one to simply 'dependent.h:'.
+ sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
+ < "$tmpdepfile" > "$depfile"
+ sed '
+ s/[ '"$tab"'][ '"$tab"']*/ /g
+ s/^ *//
+ s/ *\\*$//
+ s/^[^:]*: *//
+ /^$/d
+ /:$/d
+ s/$/ :/
+ ' < "$tmpdepfile" >> "$depfile"
 rm -f "$tmpdepfile"
 ;;
 
@@ -344,7 +367,7 @@
 done

bino-1.4.1.tar.xz/config.h.in -> bino-1.4.2.tar.xz/config.h.in Changed

bino-1.4.1.tar.xz/configure -> bino-1.4.2.tar.xz/configure Changed

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Bino 1.4.1.
+# Generated by GNU Autoconf 2.69 for Bino 1.4.2.
 #
 # Report bugs to <bino-list@nongnu.org>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
 emulate sh
@@ -169,7 +192,8 @@
 else
 exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@
 
 
 if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	 *v*x* | *x*v* ) as_opts=-vx ;;
-	 *v* ) as_opts=-v ;;
-	 *x* ) as_opts=-x ;;
-	 * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
 if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@
 chmod +x "$as_me.lineno" ||
 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
 # Don't try to exec as it changes $[0], causing all sort of problems
 # (the dirname of $[0] is not the place where we might find the
 # original and so on. Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@
 # ... but there are two gotchas:
 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
 as_ln_s=ln
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@
 as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -560,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='Bino'
 PACKAGE_TARNAME='bino'
-PACKAGE_VERSION='1.4.1'
-PACKAGE_STRING='Bino 1.4.1'
+PACKAGE_VERSION='1.4.2'
+PACKAGE_STRING='Bino 1.4.2'
 PACKAGE_BUGREPORT='bino-list@nongnu.org'
 PACKAGE_URL='http://bino3d.org/'
 
@@ -1294,8 +1314,6 @@
 if test "x$host_alias" != x; then
 if test "x$build_alias" = x; then
 cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
 elif test "x$build_alias" != "x$host_alias"; then
 cross_compiling=yes
 fi
@@ -1381,7 +1399,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.

bino-1.4.1.tar.xz/configure.ac -> bino-1.4.2.tar.xz/configure.ac Changed

bino-1.4.1.tar.xz/doc/Makefile.in -> bino-1.4.2.tar.xz/doc/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23,6 +23,23 @@
 # notice are preserved. This file is offered as-is, without any warranty.
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -74,6 +91,11 @@
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
 DVIPS = dvips
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(htmldir)"
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -442,9 +464,7 @@
 
 uninstall-info-am:
 	@$(PRE_UNINSTALL)
-	@if test -d '$(DESTDIR)$(infodir)' && \
-	    (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+	@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -517,11 +537,18 @@
 	done
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -553,8 +580,11 @@
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-dist_htmlDATA: $(dist_html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -685,8 +715,11 @@
 
 install-dvi-am: $(DVIS)
 	@$(NORMAL_INSTALL)
-	test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
 	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -701,8 +734,11 @@
 
 install-html-am: $(HTMLS)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  $(am__strip_dir) \
@@ -725,9 +761,12 @@
 
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
-	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
+	fi; \
 	for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -745,13 +784,7 @@
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
 	@$(POST_INSTALL)
-	@am__run_installinfo=yes; \
-	case $$AM_UPDATE_INFO_DIR in \
-	  n|no|NO) am__run_installinfo=no;; \
-	  *) (install-info --version) >/dev/null 2>&1 \
-	       || am__run_installinfo=no;; \
-	esac; \
-	if test $$am__run_installinfo = yes; then \
+	@if $(am__can_run_installinfo); then \
 	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -765,8 +798,11 @@
 
 install-pdf-am: $(PDFS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
 	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -778,8 +814,11 @@
 
 install-ps-am: $(PSS)
 	@$(NORMAL_INSTALL)
-	test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
 	@list='$(PSS)'; test -n "$(psdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \

bino-1.4.1.tar.xz/doc/bino.1 -> bino-1.4.2.tar.xz/doc/bino.1 Changed

bino-1.4.1.tar.xz/doc/bino.html -> bino-1.4.2.tar.xz/doc/bino.html Changed

@@ -1,16 +1,16 @@
 <html lang="en">
 <head>
-<title>Bino 1.4.1</title>
+<title>Bino 1.4.2</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="Bino 1.4.1">
+<meta name="description" content="Bino 1.4.2">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 </style>
 </head>
 <body>
-<h1 class="settitle">Bino 1.4.1</h1>
+<h1 class="settitle">Bino 1.4.2</h1>
 <div class="node">
 <a name="Top"></a>
 <hr>
@@ -45,10 +45,10 @@
 
 <h2 class="unnumbered">Bino</h2>
 
-This manual was last updated 13 October 2012 for version
-1.4.1 of Bino.
+This manual was last updated 27 January 2013 for version
+1.4.2 of Bino.
 
- Copyright &copy; 2011, 2012
+ Copyright &copy; 2011, 2012, 2013
 Martin Lambers (<a href="mailto:marlam@marlam.de">marlam@marlam.de</a>),
 Stefan Eilemann (<a href="mailto:eile@eyescale.ch">eile@eyescale.ch</a>),
 Frédéric Devernay (<a href="mailto:Frederic.Devernay@inrialpes.fr">Frederic.Devernay@inrialpes.fr</a>)

bino-1.4.1.tar.xz/doc/bino.info -> bino-1.4.2.tar.xz/doc/bino.info Changed

@@ -1,10 +1,10 @@
 This is ../../sources/bino/doc/bino.info, produced by makeinfo version
 4.13 from ../../sources/bino/doc/bino.texi.
 
-This manual was last updated 13 October 2012 for version 1.4.1 of Bino.
+This manual was last updated 27 January 2013 for version 1.4.2 of Bino.
 
- Copyright (C) 2011, 2012 Martin Lambers (<marlam@marlam.de>), Stefan
-Eilemann (<eile@eyescale.ch>), Frédéric Devernay
+ Copyright (C) 2011, 2012, 2013 Martin Lambers (<marlam@marlam.de>),
+Stefan Eilemann (<eile@eyescale.ch>), Frédéric Devernay
 (<Frederic.Devernay@inrialpes.fr>)
 
 Copying and distribution of this file and the accompanying media
@@ -23,10 +23,10 @@
 Bino
 ****
 
-This manual was last updated 13 October 2012 for version 1.4.1 of Bino.
+This manual was last updated 27 January 2013 for version 1.4.2 of Bino.
 
- Copyright (C) 2011, 2012 Martin Lambers (<marlam@marlam.de>), Stefan
-Eilemann (<eile@eyescale.ch>), Frédéric Devernay
+ Copyright (C) 2011, 2012, 2013 Martin Lambers (<marlam@marlam.de>),
+Stefan Eilemann (<eile@eyescale.ch>), Frédéric Devernay
 (<Frederic.Devernay@inrialpes.fr>)
 
 Copying and distribution of this file and the accompanying media
@@ -1427,23 +1427,23 @@
 
 &#x1f;
 Tag Table:
-Node: Top&#x7f;778
-Node: Introduction&#x7f;1562
-Node: Invocation&#x7f;2585
-Node: Input Layouts&#x7f;6831
-Ref: Supported Input Layouts&#x7f;7734
-Ref: File Name Conventions&#x7f;9816
-Node: Output Techniques&#x7f;10650
-Ref: Supported Output Techniques&#x7f;13374
-Ref: Crosstalk Ghostbusting&#x7f;17330
-Ref: Basic Multi Display Support&#x7f;19306
-Ref: Advanced Multi Display Support&#x7f;20437
-Node: Interactive Control&#x7f;31682
-Node: Scripting&#x7f;33607
-Ref: Script Commands&#x7f;35576
-Node: Camera Devices&#x7f;41608
-Node: Audio/Video Synchronization&#x7f;42560
-Node: Performance Tweaking&#x7f;43718
+Node: Top&#x7f;784
+Node: Introduction&#x7f;1574
+Node: Invocation&#x7f;2597
+Node: Input Layouts&#x7f;6843
+Ref: Supported Input Layouts&#x7f;7746
+Ref: File Name Conventions&#x7f;9828
+Node: Output Techniques&#x7f;10662
+Ref: Supported Output Techniques&#x7f;13386
+Ref: Crosstalk Ghostbusting&#x7f;17342
+Ref: Basic Multi Display Support&#x7f;19318
+Ref: Advanced Multi Display Support&#x7f;20449
+Node: Interactive Control&#x7f;31694
+Node: Scripting&#x7f;33619
+Ref: Script Commands&#x7f;35588
+Node: Camera Devices&#x7f;41620
+Node: Audio/Video Synchronization&#x7f;42572
+Node: Performance Tweaking&#x7f;43730
 &#x1f;
 End Tag Table

bino-1.4.1.tar.xz/doc/bino.texi -> bino-1.4.2.tar.xz/doc/bino.texi Changed

bino-1.4.1.tar.xz/doc/stamp-vti -> bino-1.4.2.tar.xz/doc/stamp-vti Changed

bino-1.4.1.tar.xz/doc/version.texi -> bino-1.4.2.tar.xz/doc/version.texi Changed

bino-1.4.1.tar.xz/po/bg.gmo -> bino-1.4.2.tar.xz/po/bg.gmo Changed

bino-1.4.1.tar.xz/po/bg.po -> bino-1.4.2.tar.xz/po/bg.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bino 1.4.0\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-10-13 10:12+0200\n"
+"POT-Creation-Date: 2013-01-27 22:06+0100\n"
 "PO-Revision-Date: 2012-10-13 00:33+0200\n"
 "Last-Translator: Krasimir S. Stefanov <lokiisyourmaster@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,84 +113,84 @@
 msgid "Cannot get time."
 msgstr "Времето не може да бъде установено."
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:93
 msgid "No OpenAL device available."
 msgstr "Няма налично OpenAL устройство."
 
-#: src/audio_output.cpp:93 src/audio_output.cpp:99
+#: src/audio_output.cpp:98 src/audio_output.cpp:104
 #, c-format
 msgid "OpenAL device '%s' is not available."
 msgstr "OpenAL ustrojstwoto '%s' не е налично."
 
-#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
 #: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
 #: src/media_data.cpp:1260
 msgid "unknown"
 msgstr "непознат"
 
-#: src/audio_output.cpp:106
+#: src/audio_output.cpp:111
 msgid "No OpenAL context available."
 msgstr "Няма наличен OpenAL контекст."
 
-#: src/audio_output.cpp:117
+#: src/audio_output.cpp:122
 msgid "Cannot create OpenAL buffers."
 msgstr "Не могат да бъдат създадени OpenAL буфери."
 
-#: src/audio_output.cpp:126
+#: src/audio_output.cpp:131
 msgid "Cannot create OpenAL source."
 msgstr "Не може да бъде създаден OpenAL източник."
 
-#: src/audio_output.cpp:139
+#: src/audio_output.cpp:144
 msgid "Cannot set OpenAL source parameters."
 msgstr "Параметрите на OpenAL източника не могат да бъдат зададени."
 
-#: src/audio_output.cpp:193
+#: src/audio_output.cpp:198
 msgid "Cannot check OpenAL source state."
 msgstr "Статуса на OpenAL източника не може да бъде проверен."
 
-#: src/audio_output.cpp:200
+#: src/audio_output.cpp:205
 msgid "Cannot restart OpenAL source playback."
 msgstr "Възпроизвеждането на OpenAL източника не може да бъде рестартирано."
 
-#: src/audio_output.cpp:353
+#: src/audio_output.cpp:358
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Няма наличен OpenAL формат за избрания звуков формат %s."
 
-#: src/audio_output.cpp:369
+#: src/audio_output.cpp:374
 msgid "Cannot set OpenAL audio volume."
 msgstr "Не може да се зададе нивото на OpenAL звука."
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:400
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Не може да се буферират началните OpenAL данни."
 
-#: src/audio_output.cpp:409
+#: src/audio_output.cpp:414
 msgid "Cannot buffer OpenAL data."
 msgstr "OpenAL данните не могат да бъдат буферирани."
 
-#: src/audio_output.cpp:434
+#: src/audio_output.cpp:439
 msgid "Cannot start OpenAL source playback."
 msgstr "Възпроизвеждането на OpenAL източника не може да се стартира."
 
-#: src/audio_output.cpp:448
+#: src/audio_output.cpp:453
 msgid "Cannot pause OpenAL source playback."
 msgstr "Възпроизвеждането на OpenAL източника не може да се спре на пауза."
 
-#: src/audio_output.cpp:457
+#: src/audio_output.cpp:462
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Възпроизвеждането на OpenAL източника не може да се пусне от пауза."
 
-#: src/audio_output.cpp:466
+#: src/audio_output.cpp:471
 msgid "Cannot stop OpenAL source playback."
 msgstr "Възпроизвеждането на OpenAL източника не може да се спре."
 
-#: src/audio_output.cpp:477
+#: src/audio_output.cpp:482
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "OpenAL буферите не могат да бъдат премахнати от опашката."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:847 src/media_object.cpp:1312
+#: src/main.cpp:374 src/media_object.cpp:850 src/media_object.cpp:1315
 #: src/video_output.cpp:419
 #, c-format
 msgid "%s: %s"
@@ -232,7 +232,7 @@
 msgid "Subtitle stream %d not found."
 msgstr "Потокът със субтитри %d не бе намерен."
 
-#: src/dispatch.cpp:555 src/main.cpp:764
+#: src/dispatch.cpp:555 src/main.cpp:767
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Тази версия на Bino е компилирана без поддръжка на Еквилайзер."
 
@@ -877,11 +877,11 @@
 msgid "Choose a device type."
 msgstr "Избор на типа на устройството."
 
-#: src/gui.cpp:2620 src/media_object.cpp:823
+#: src/gui.cpp:2620 src/media_object.cpp:826
 msgid "Firewire"
 msgstr "Firewire"
 
-#: src/gui.cpp:2621 src/media_object.cpp:824
+#: src/gui.cpp:2621 src/media_object.cpp:827
 msgid "X11"
 msgstr "X11"
 
@@ -1212,13 +1212,13 @@
 #: src/gui.cpp:3722
 #, c-format
 msgid ""
-"%s version %s.Copyright (C) 2012 the Bino developers.This "
+"%s version %s.Copyright (C) 2013 the Bino developers.This "
 "is free software. You may redistribute copies of it under the terms of the "
 "<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
 "a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
 "\"%s\">%s</a> for more information on this software."
 msgstr ""
-"%s версия %s.Всички права запазени (C) 2012 от разработчиците на "
+"%s версия %s.Всички права запазени (C) 2013 от разработчиците на "
 "Bino.Тази програма е свободен софтуер. Може да разпространявате нейни "
 "копия според условията на <a href=\"http://www.gnu.org/licenses/gpl.html"
 "\">GNU General Public License</a>. Програмата идва без НИКАКВА ГАРАНЦИЯ, "
@@ -1289,8 +1289,8 @@
 msgstr "%s версия %s"
 
 #: src/main.cpp:387
-msgid "Copyright (C) 2012 the Bino developers."
-msgstr "Всички права запазени (C) 2012 от разработчиците на Bino."
+msgid "Copyright (C) 2013 the Bino developers."
+msgstr "Всички права запазени (C) 2013 от разработчиците на Bino."
 
 #: src/main.cpp:388
 msgid ""
@@ -1549,20 +1549,20 @@
 msgid "Seek according to horizontal click position"
 msgstr "Превъртане според хоризонталната позиция на щракването"
 
-#: src/main.cpp:536
+#: src/main.cpp:598
 msgid "No audio devices known."
 msgstr "Няма познати аудио устройства."
 
-#: src/main.cpp:608
+#: src/main.cpp:613
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Режим на тестване: синхронизацията на звук и време е изключена."
 
-#: src/main.cpp:624
+#: src/main.cpp:627
 #, c-format
 msgid "Unknown mode %s."
 msgstr "Непознат режим %s."
 
-#: src/main.cpp:756
+#: src/main.cpp:759
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Тази версия на Bino е компилирана без поддръжка на LIRC."
 
@@ -1615,108 +1615,108 @@
 msgid "Stereo layout: %s"
 msgstr "Стерео разположение: %s"
 
-#: src/media_object.cpp:684
+#: src/media_object.cpp:682
 #, c-format
 msgid "%s video stream %d: Unsupported stereo layout %s."
 msgstr "%s видео поток %d: Неподдържана стереоскопична конфигурация %s."
 
-#: src/media_object.cpp:722
+#: src/media_object.cpp:720

bino-1.4.1.tar.xz/po/bino.pot -> bino-1.4.2.tar.xz/po/bino.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: bino 1.4.1\n"
+"Project-Id-Version: bino 1.4.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-10-13 10:12+0200\n"
+"POT-Creation-Date: 2013-01-27 22:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,84 +113,84 @@
 msgid "Cannot get time."
 msgstr ""
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:93
 msgid "No OpenAL device available."
 msgstr ""
 
-#: src/audio_output.cpp:93 src/audio_output.cpp:99
+#: src/audio_output.cpp:98 src/audio_output.cpp:104
 #, c-format
 msgid "OpenAL device '%s' is not available."
 msgstr ""
 
-#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
 #: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
 #: src/media_data.cpp:1260
 msgid "unknown"
 msgstr ""
 
-#: src/audio_output.cpp:106
+#: src/audio_output.cpp:111
 msgid "No OpenAL context available."
 msgstr ""
 
-#: src/audio_output.cpp:117
+#: src/audio_output.cpp:122
 msgid "Cannot create OpenAL buffers."
 msgstr ""
 
-#: src/audio_output.cpp:126
+#: src/audio_output.cpp:131
 msgid "Cannot create OpenAL source."
 msgstr ""
 
-#: src/audio_output.cpp:139
+#: src/audio_output.cpp:144
 msgid "Cannot set OpenAL source parameters."
 msgstr ""
 
-#: src/audio_output.cpp:193
+#: src/audio_output.cpp:198
 msgid "Cannot check OpenAL source state."
 msgstr ""
 
-#: src/audio_output.cpp:200
+#: src/audio_output.cpp:205
 msgid "Cannot restart OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:353
+#: src/audio_output.cpp:358
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr ""
 
-#: src/audio_output.cpp:369
+#: src/audio_output.cpp:374
 msgid "Cannot set OpenAL audio volume."
 msgstr ""
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:400
 msgid "Cannot buffer initial OpenAL data."
 msgstr ""
 
-#: src/audio_output.cpp:409
+#: src/audio_output.cpp:414
 msgid "Cannot buffer OpenAL data."
 msgstr ""
 
-#: src/audio_output.cpp:434
+#: src/audio_output.cpp:439
 msgid "Cannot start OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:448
+#: src/audio_output.cpp:453
 msgid "Cannot pause OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:457
+#: src/audio_output.cpp:462
 msgid "Cannot unpause OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:466
+#: src/audio_output.cpp:471
 msgid "Cannot stop OpenAL source playback."
 msgstr ""
 
-#: src/audio_output.cpp:477
+#: src/audio_output.cpp:482
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr ""
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:847 src/media_object.cpp:1312
+#: src/main.cpp:374 src/media_object.cpp:850 src/media_object.cpp:1315
 #: src/video_output.cpp:419
 #, c-format
 msgid "%s: %s"
@@ -232,7 +232,7 @@
 msgid "Subtitle stream %d not found."
 msgstr ""
 
-#: src/dispatch.cpp:555 src/main.cpp:764
+#: src/dispatch.cpp:555 src/main.cpp:767
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 
@@ -846,11 +846,11 @@
 msgid "Choose a device type."
 msgstr ""
 
-#: src/gui.cpp:2620 src/media_object.cpp:823
+#: src/gui.cpp:2620 src/media_object.cpp:826
 msgid "Firewire"
 msgstr ""
 
-#: src/gui.cpp:2621 src/media_object.cpp:824
+#: src/gui.cpp:2621 src/media_object.cpp:827
 msgid "X11"
 msgstr ""
 
@@ -1168,7 +1168,7 @@
 #: src/gui.cpp:3722
 #, c-format
 msgid ""
-"%s version %s.Copyright (C) 2012 the Bino developers.This "
+"%s version %s.Copyright (C) 2013 the Bino developers.This "
 "is free software. You may redistribute copies of it under the terms of the "
 "<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
 "a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
@@ -1239,7 +1239,7 @@
 msgstr ""
 
 #: src/main.cpp:387
-msgid "Copyright (C) 2012 the Bino developers."
+msgid "Copyright (C) 2013 the Bino developers."
 msgstr ""
 
 #: src/main.cpp:388
@@ -1495,20 +1495,20 @@
 msgid "Seek according to horizontal click position"
 msgstr ""
 
-#: src/main.cpp:536
+#: src/main.cpp:598
 msgid "No audio devices known."
 msgstr ""
 
-#: src/main.cpp:608
+#: src/main.cpp:613
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 
-#: src/main.cpp:624
+#: src/main.cpp:627
 #, c-format
 msgid "Unknown mode %s."
 msgstr ""
 
-#: src/main.cpp:756
+#: src/main.cpp:759
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr ""
 
@@ -1561,106 +1561,106 @@
 msgid "Stereo layout: %s"
 msgstr ""
 
-#: src/media_object.cpp:684
+#: src/media_object.cpp:682
 #, c-format
 msgid "%s video stream %d: Unsupported stereo layout %s."
 msgstr ""
 
-#: src/media_object.cpp:722
+#: src/media_object.cpp:720
 #, c-format
 msgid "%s audio stream %d: Cannot handle audio with %d channels."
 msgstr ""
 
-#: src/media_object.cpp:751
+#: src/media_object.cpp:754

bino-1.4.1.tar.xz/po/de.gmo -> bino-1.4.2.tar.xz/po/de.gmo Changed

bino-1.4.1.tar.xz/po/de.po -> bino-1.4.2.tar.xz/po/de.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 1.3.4\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-10-13 10:12+0200\n"
+"POT-Creation-Date: 2013-01-27 22:06+0100\n"
 "PO-Revision-Date: 2011-04-10 17:23+0200\n"
 "Last-Translator: Martin Lambers <marlam@marlam.de>\n"
 "Language-Team: none\n"
@@ -111,84 +111,84 @@
 msgid "Cannot get time."
 msgstr "Kann Zeit nicht abfragen."
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:93
 msgid "No OpenAL device available."
 msgstr "Kein OpenAL Gerät verfügbar."
 
-#: src/audio_output.cpp:93 src/audio_output.cpp:99
+#: src/audio_output.cpp:98 src/audio_output.cpp:104
 #, c-format
 msgid "OpenAL device '%s' is not available."
 msgstr "OpenAL Gerät '%s' ist nicht verfügbar."
 
-#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
 #: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
 #: src/media_data.cpp:1260
 msgid "unknown"
 msgstr "unbekannt"
 
-#: src/audio_output.cpp:106
+#: src/audio_output.cpp:111
 msgid "No OpenAL context available."
 msgstr "Kein OpenAL Kontext verfügbar."
 
-#: src/audio_output.cpp:117
+#: src/audio_output.cpp:122
 msgid "Cannot create OpenAL buffers."
 msgstr "Kann OpenAL Puffer nicht erzeugen."
 
-#: src/audio_output.cpp:126
+#: src/audio_output.cpp:131
 msgid "Cannot create OpenAL source."
 msgstr "Kann OpenAL Quelle nicht erzeugen."
 
-#: src/audio_output.cpp:139
+#: src/audio_output.cpp:144
 msgid "Cannot set OpenAL source parameters."
 msgstr "Kann OpenAL Quellenparameter nicht setzen."
 
-#: src/audio_output.cpp:193
+#: src/audio_output.cpp:198
 msgid "Cannot check OpenAL source state."
 msgstr "Kann OpenAL Quellenzustand nicht abfragen."
 
-#: src/audio_output.cpp:200
+#: src/audio_output.cpp:205
 msgid "Cannot restart OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht neu starten."
 
-#: src/audio_output.cpp:353
+#: src/audio_output.cpp:358
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Kein OpenAL Format vorhanden für das Audioformat %s."
 
-#: src/audio_output.cpp:369
+#: src/audio_output.cpp:374
 msgid "Cannot set OpenAL audio volume."
 msgstr "Kann OpenAL Lautstärke nicht setzen."
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:400
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Kann initiale OpenAL Daten nicht puffern."
 
-#: src/audio_output.cpp:409
+#: src/audio_output.cpp:414
 msgid "Cannot buffer OpenAL data."
 msgstr "Kann OpenAL Daten nicht puffern."
 
-#: src/audio_output.cpp:434
+#: src/audio_output.cpp:439
 msgid "Cannot start OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht starten."
 
-#: src/audio_output.cpp:448
+#: src/audio_output.cpp:453
 msgid "Cannot pause OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht unterbrechen."
 
-#: src/audio_output.cpp:457
+#: src/audio_output.cpp:462
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht fortsetzen."
 
-#: src/audio_output.cpp:466
+#: src/audio_output.cpp:471
 msgid "Cannot stop OpenAL source playback."
 msgstr "Kann das Abspielen der OpenAL Quelle nicht stoppen."
 
-#: src/audio_output.cpp:477
+#: src/audio_output.cpp:482
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Kann OpenAL Quellenpuffer nicht aus Warteschlange entfernen."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:847 src/media_object.cpp:1312
+#: src/main.cpp:374 src/media_object.cpp:850 src/media_object.cpp:1315
 #: src/video_output.cpp:419
 #, c-format
 msgid "%s: %s"
@@ -230,7 +230,7 @@
 msgid "Subtitle stream %d not found."
 msgstr "Untertitelkanal %d nicht gefunden."
 
-#: src/dispatch.cpp:555 src/main.cpp:764
+#: src/dispatch.cpp:555 src/main.cpp:767
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr ""
 "Diese Version von Bino wurde ohne Unterstützung für Equalizer erstellt."
@@ -874,11 +874,11 @@
 msgid "Choose a device type."
 msgstr "Auswahl des Kameratyps."
 
-#: src/gui.cpp:2620 src/media_object.cpp:823
+#: src/gui.cpp:2620 src/media_object.cpp:826
 msgid "Firewire"
 msgstr "Firewire"
 
-#: src/gui.cpp:2621 src/media_object.cpp:824
+#: src/gui.cpp:2621 src/media_object.cpp:827
 msgid "X11"
 msgstr "X11"
 
@@ -1207,13 +1207,13 @@
 #: src/gui.cpp:3722
 #, c-format
 msgid ""
-"%s version %s.Copyright (C) 2012 the Bino developers.This "
+"%s version %s.Copyright (C) 2013 the Bino developers.This "
 "is free software. You may redistribute copies of it under the terms of the "
 "<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
 "a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
 "\"%s\">%s</a> for more information on this software."
 msgstr ""
-"%s Version %s.Copyright (C) 2012 Die Bino Entwickler.Dies "
+"%s Version %s.Copyright (C) 2013 Die Bino Entwickler.Dies "
 "ist freie Software. Du kannst Kopien davon verteilen unter den Bedingungen "
 "der <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public "
 "License</a>. Es gibt keine Garantie.Siehe <a href=\"%s\">%s</a> für "
@@ -1284,8 +1284,8 @@
 msgstr "%s Version %s"
 
 #: src/main.cpp:387
-msgid "Copyright (C) 2012 the Bino developers."
-msgstr "Copyright (C) 2012 Die Bino Entwickler."
+msgid "Copyright (C) 2013 the Bino developers."
+msgstr "Copyright (C) 2013 Die Bino Entwickler."
 
 #: src/main.cpp:388
 msgid ""
@@ -1542,20 +1542,20 @@
 msgid "Seek according to horizontal click position"
 msgstr "Springe zur Klick-Position"
 
-#: src/main.cpp:536
+#: src/main.cpp:598
 msgid "No audio devices known."
 msgstr "Keine Audiogeräte gefunden."
 
-#: src/main.cpp:608
+#: src/main.cpp:613
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Benchmark Modus: Audio und Videosynchronisation deaktiviert."
 
-#: src/main.cpp:624
+#: src/main.cpp:627
 #, c-format
 msgid "Unknown mode %s."
 msgstr "Unbekannter Modus %s."
 
-#: src/main.cpp:756
+#: src/main.cpp:759
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Diese Version von Bino wurde ohne Unterstützung für LIRC erstellt."
 
@@ -1608,106 +1608,106 @@
 msgid "Stereo layout: %s"
 msgstr "Stereolayout: %s"
 
-#: src/media_object.cpp:684
+#: src/media_object.cpp:682
 #, c-format
 msgid "%s video stream %d: Unsupported stereo layout %s."
 msgstr "%s Videokanal %d: Stereolayout %s wird nicht unterstützt."
 
-#: src/media_object.cpp:722
+#: src/media_object.cpp:720

bino-1.4.1.tar.xz/po/fr.gmo -> bino-1.4.2.tar.xz/po/fr.gmo Changed

bino-1.4.1.tar.xz/po/fr.po -> bino-1.4.2.tar.xz/po/fr.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-10-13 10:12+0200\n"
+"POT-Creation-Date: 2013-01-27 22:06+0100\n"
 "PO-Revision-Date: 2012-06-05 10:45+0200\n"
 "Last-Translator: Frédéric Devernay <>\n"
 "Language-Team: French\n"
@@ -114,84 +114,84 @@
 msgid "Cannot get time."
 msgstr "Impossible d'obtenir l'heure."
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:93
 msgid "No OpenAL device available."
 msgstr "Aucun périphérique OpenAL disponible."
 
-#: src/audio_output.cpp:93 src/audio_output.cpp:99
+#: src/audio_output.cpp:98 src/audio_output.cpp:104
 #, c-format
 msgid "OpenAL device '%s' is not available."
 msgstr "Périphérique OpenAL '%s' non disponible."
 
-#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
 #: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
 #: src/media_data.cpp:1260
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/audio_output.cpp:106
+#: src/audio_output.cpp:111
 msgid "No OpenAL context available."
 msgstr "Aucun contexte OpenAL disponible."
 
-#: src/audio_output.cpp:117
+#: src/audio_output.cpp:122
 msgid "Cannot create OpenAL buffers."
 msgstr "Impossible de tcréer les tampons OpenAL."
 
-#: src/audio_output.cpp:126
+#: src/audio_output.cpp:131
 msgid "Cannot create OpenAL source."
 msgstr "Impossible de créer la source OpenAL."
 
-#: src/audio_output.cpp:139
+#: src/audio_output.cpp:144
 msgid "Cannot set OpenAL source parameters."
 msgstr "Impossible de régler les paramètres de la source OpenAL."
 
-#: src/audio_output.cpp:193
+#: src/audio_output.cpp:198
 msgid "Cannot check OpenAL source state."
 msgstr "Impossible de vérifier l'état de la source OpenAL."
 
-#: src/audio_output.cpp:200
+#: src/audio_output.cpp:205
 msgid "Cannot restart OpenAL source playback."
 msgstr "Impossible de redémarrer la lecture de la source OpenAL."
 
-#: src/audio_output.cpp:353
+#: src/audio_output.cpp:358
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Aucun format OpenAL disponible pour le format de données audio %s."
 
-#: src/audio_output.cpp:369
+#: src/audio_output.cpp:374
 msgid "Cannot set OpenAL audio volume."
 msgstr "Impossible de régler le volume OpenAL."
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:400
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Impossible de mettre les données initiales OpenAL en mémoire tampon."
 
-#: src/audio_output.cpp:409
+#: src/audio_output.cpp:414
 msgid "Cannot buffer OpenAL data."
 msgstr "Impossible de mettre les données OpenAL en mémoire tampon."
 
-#: src/audio_output.cpp:434
+#: src/audio_output.cpp:439
 msgid "Cannot start OpenAL source playback."
 msgstr "Impossible de démarrer la lecture de la source OpenAL."
 
-#: src/audio_output.cpp:448
+#: src/audio_output.cpp:453
 msgid "Cannot pause OpenAL source playback."
 msgstr "Impossible de mettre en pause la source OpenAL."
 
-#: src/audio_output.cpp:457
+#: src/audio_output.cpp:462
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Impossible de quitter la pause de la source OpenAL."
 
-#: src/audio_output.cpp:466
+#: src/audio_output.cpp:471
 msgid "Cannot stop OpenAL source playback."
 msgstr "Impossible d'arrêter la lecture de la source OpenAL."
 
-#: src/audio_output.cpp:477
+#: src/audio_output.cpp:482
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Impossible de vider la queue de tampons de la source OpenAL."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:847 src/media_object.cpp:1312
+#: src/main.cpp:374 src/media_object.cpp:850 src/media_object.cpp:1315
 #: src/video_output.cpp:419
 #, c-format
 msgid "%s: %s"
@@ -233,7 +233,7 @@
 msgid "Subtitle stream %d not found."
 msgstr "Flux de sous-titres %d non trouvé."
 
-#: src/dispatch.cpp:555 src/main.cpp:764
+#: src/dispatch.cpp:555 src/main.cpp:767
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Cette version de Bino a été compilée sans le support Equalizer."
 
@@ -878,11 +878,11 @@
 msgid "Choose a device type."
 msgstr "Sélectionner un type de périphérique."
 
-#: src/gui.cpp:2620 src/media_object.cpp:823
+#: src/gui.cpp:2620 src/media_object.cpp:826
 msgid "Firewire"
 msgstr "Firewire"
 
-#: src/gui.cpp:2621 src/media_object.cpp:824
+#: src/gui.cpp:2621 src/media_object.cpp:827
 msgid "X11"
 msgstr "X11"
 
@@ -1212,13 +1212,13 @@
 #: src/gui.cpp:3722
 #, c-format
 msgid ""
-"%s version %s.Copyright (C) 2012 the Bino developers.This "
+"%s version %s.Copyright (C) 2013 the Bino developers.This "
 "is free software. You may redistribute copies of it under the terms of the "
 "<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
 "a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
 "\"%s\">%s</a> for more information on this software."
 msgstr ""
-"%s version %s.Copyright (C) 2012 les développeurs Bino.Ceci "
+"%s version %s.Copyright (C) 2013 les développeurs Bino.Ceci "
 "est un logiciel libre. Vous pouvez en distribuer des copies sous les termes "
 "de la <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public "
 "License</a>. Il n'y a AUCUNE GARANTIE, dans les limites autorisées par la "
@@ -1289,8 +1289,8 @@
 msgstr "%s version %s"
 
 #: src/main.cpp:387
-msgid "Copyright (C) 2012 the Bino developers."
-msgstr "Copyright (C) 2012 les développeurs Bino."
+msgid "Copyright (C) 2013 the Bino developers."
+msgstr "Copyright (C) 2013 les développeurs Bino."
 
 #: src/main.cpp:388
 msgid ""
@@ -1548,20 +1548,20 @@
 msgid "Seek according to horizontal click position"
 msgstr "Aller à la position définie par l'abscisse du clic"
 
-#: src/main.cpp:536
+#: src/main.cpp:598
 msgid "No audio devices known."
 msgstr "Pas de périphérique audio connu."
 
-#: src/main.cpp:608
+#: src/main.cpp:613
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr "Mode banc d'essai: audio et synchronisation temporelle désactivés."
 
-#: src/main.cpp:624
+#: src/main.cpp:627
 #, c-format
 msgid "Unknown mode %s."
 msgstr "Mode %s inconnu."
 
-#: src/main.cpp:756
+#: src/main.cpp:759
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Cette version de Bino a été compilée sans le support LIRC."
 
@@ -1614,107 +1614,107 @@
 msgid "Stereo layout: %s"
 msgstr "Mode stéréo : %s"
 
-#: src/media_object.cpp:684
+#: src/media_object.cpp:682
 #, c-format
 msgid "%s video stream %d: Unsupported stereo layout %s."
 msgstr "%s flux vidéo %d : Arrangement stéréo %s non supporté."
 
-#: src/media_object.cpp:722
+#: src/media_object.cpp:720

bino-1.4.1.tar.xz/po/ru.gmo -> bino-1.4.2.tar.xz/po/ru.gmo Changed

bino-1.4.1.tar.xz/po/ru.po -> bino-1.4.2.tar.xz/po/ru.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: bino 0.9.2\n"
 "Report-Msgid-Bugs-To: bino-list@nongnu.org\n"
-"POT-Creation-Date: 2012-10-13 10:12+0200\n"
+"POT-Creation-Date: 2013-01-27 22:06+0100\n"
 "PO-Revision-Date: 2012-06-18 21:29+0600\n"
 "Last-Translator: Alexey Osipov <simba@lerlan.ru>\n"
 "Language-Team: \n"
@@ -111,84 +111,84 @@
 msgid "Cannot get time."
 msgstr "Невозможно получить время."
 
-#: src/audio_output.cpp:88
+#: src/audio_output.cpp:93
 msgid "No OpenAL device available."
 msgstr "Устройства OpenAL не доступны."
 
-#: src/audio_output.cpp:93 src/audio_output.cpp:99
+#: src/audio_output.cpp:98 src/audio_output.cpp:104
 #, c-format
 msgid "OpenAL device '%s' is not available."
 msgstr "Устройство OpenAL '%s' не доступно."
 
-#: src/audio_output.cpp:93 src/lib_versions.cpp:121 src/lib_versions.cpp:158
+#: src/audio_output.cpp:98 src/lib_versions.cpp:121 src/lib_versions.cpp:158
 #: src/media_data.cpp:1194 src/media_data.cpp:1217 src/media_data.cpp:1255
 #: src/media_data.cpp:1260
 msgid "unknown"
 msgstr "неизвестно"
 
-#: src/audio_output.cpp:106
+#: src/audio_output.cpp:111
 msgid "No OpenAL context available."
 msgstr "Контекст OpenAL не доступен."
 
-#: src/audio_output.cpp:117
+#: src/audio_output.cpp:122
 msgid "Cannot create OpenAL buffers."
 msgstr "Невозможно создать буферы OpenAL."
 
-#: src/audio_output.cpp:126
+#: src/audio_output.cpp:131
 msgid "Cannot create OpenAL source."
 msgstr "Невозможно создать источник OpenAL."
 
-#: src/audio_output.cpp:139
+#: src/audio_output.cpp:144
 msgid "Cannot set OpenAL source parameters."
 msgstr "Невозможно установить параметры источника OpenAL."
 
-#: src/audio_output.cpp:193
+#: src/audio_output.cpp:198
 msgid "Cannot check OpenAL source state."
 msgstr "Невозможно проверить состояние источника OpenAL."
 
-#: src/audio_output.cpp:200
+#: src/audio_output.cpp:205
 msgid "Cannot restart OpenAL source playback."
 msgstr "Невозможно возобновить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:353
+#: src/audio_output.cpp:358
 #, c-format
 msgid "No OpenAL format available for audio data format %s."
 msgstr "Для формата аудио %s не найдено подходящих форматов OpenAL."
 
-#: src/audio_output.cpp:369
+#: src/audio_output.cpp:374
 msgid "Cannot set OpenAL audio volume."
 msgstr "Невозможно установить громкость OpenAL."
 
-#: src/audio_output.cpp:395
+#: src/audio_output.cpp:400
 msgid "Cannot buffer initial OpenAL data."
 msgstr "Невозможно буферизировать начальные данные OpenAL."
 
-#: src/audio_output.cpp:409
+#: src/audio_output.cpp:414
 msgid "Cannot buffer OpenAL data."
 msgstr "Невозможно буферизировать данные OpenAL."
 
-#: src/audio_output.cpp:434
+#: src/audio_output.cpp:439
 msgid "Cannot start OpenAL source playback."
 msgstr "Невозможно начать воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:448
+#: src/audio_output.cpp:453
 msgid "Cannot pause OpenAL source playback."
 msgstr "Невозможно приостановить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:457
+#: src/audio_output.cpp:462
 msgid "Cannot unpause OpenAL source playback."
 msgstr "Невозможно возобновить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:466
+#: src/audio_output.cpp:471
 msgid "Cannot stop OpenAL source playback."
 msgstr "Невозможно остановить воспроизведение источника OpenAL."
 
-#: src/audio_output.cpp:477
+#: src/audio_output.cpp:482
 msgid "Cannot unqueue OpenAL source buffers."
 msgstr "Невозможно получить из очереди буферы источника OpenAL."
 
 #: src/command_file.cpp:63 src/command_file.cpp:79 src/command_file.cpp:125
-#: src/main.cpp:374 src/media_object.cpp:847 src/media_object.cpp:1312
+#: src/main.cpp:374 src/media_object.cpp:850 src/media_object.cpp:1315
 #: src/video_output.cpp:419
 #, c-format
 msgid "%s: %s"
@@ -231,7 +231,7 @@
 msgid "Subtitle stream %d not found."
 msgstr "Дорожка субтитров %d не найдена."
 
-#: src/dispatch.cpp:555 src/main.cpp:764
+#: src/dispatch.cpp:555 src/main.cpp:767
 msgid "This version of Bino was compiled without support for Equalizer."
 msgstr "Эта версия Bino была собрана без поддержки Equalizer."
 
@@ -881,11 +881,11 @@
 msgid "Choose a device type."
 msgstr "Выберите тип устройства."
 
-#: src/gui.cpp:2620 src/media_object.cpp:823
+#: src/gui.cpp:2620 src/media_object.cpp:826
 msgid "Firewire"
 msgstr "Firewire"
 
-#: src/gui.cpp:2621 src/media_object.cpp:824
+#: src/gui.cpp:2621 src/media_object.cpp:827
 msgid "X11"
 msgstr "X11"
 
@@ -1216,13 +1216,13 @@
 #: src/gui.cpp:3722
 #, c-format
 msgid ""
-"%s version %s.Copyright (C) 2012 the Bino developers.This "
+"%s version %s.Copyright (C) 2013 the Bino developers.This "
 "is free software. You may redistribute copies of it under the terms of the "
 "<a href=\"http://www.gnu.org/licenses/gpl.html\">GNU General Public License</"
 "a>. There is NO WARRANTY, to the extent permitted by law.See <a href="
 "\"%s\">%s</a> for more information on this software."
 msgstr ""
-"%s версия %s.Copyright (C) 2012 разработчики Bino.Это "
+"%s версия %s.Copyright (C) 2013 разработчики Bino.Это "
 "свободное программное обеспечение. Вы можете распространять его копии "
 "согласно требованиям <a href=\"http://www.gnu.org/licenses/gpl.html\">GNU "
 "General Public License</a>. Программное обеспечение поставляется БЕЗ КАКИХ-"
@@ -1293,8 +1293,8 @@
 msgstr "%s версия %s"
 
 #: src/main.cpp:387
-msgid "Copyright (C) 2012 the Bino developers."
-msgstr "Copyright (C) 2012 Разработчики Bino."
+msgid "Copyright (C) 2013 the Bino developers."
+msgstr "Copyright (C) 2013 Разработчики Bino."
 
 #: src/main.cpp:388
 msgid ""
@@ -1552,22 +1552,22 @@
 msgid "Seek according to horizontal click position"
 msgstr "Перемотка по горизонтальному положению курсора"
 
-#: src/main.cpp:536
+#: src/main.cpp:598
 msgid "No audio devices known."
 msgstr "Нет звуковых устройств."
 
-#: src/main.cpp:608
+#: src/main.cpp:613
 msgid "Benchmark mode: audio and time synchronization disabled."
 msgstr ""
 "Режим оценки производительности: воспроизведение аудио отключено, "
 "воспроизведение видео с максимально-возможной скоростью."
 
-#: src/main.cpp:624
+#: src/main.cpp:627
 #, c-format
 msgid "Unknown mode %s."
 msgstr "Неизвестный режим %s."
 
-#: src/main.cpp:756
+#: src/main.cpp:759
 msgid "This version of Bino was compiled without support for LIRC."
 msgstr "Эта версия Bino была собрана без поддержки LIRC."
 
@@ -1620,106 +1620,106 @@
 msgid "Stereo layout: %s"
 msgstr "Стерео раскладка: %s"
 
-#: src/media_object.cpp:684
+#: src/media_object.cpp:682
 #, c-format
 msgid "%s video stream %d: Unsupported stereo layout %s."
 msgstr "%s видео дорожка %d: Неподдерживаемая стерео раскладка %s."

bino-1.4.1.tar.xz/src/Makefile.in -> bino-1.4.2.tar.xz/src/Makefile.in Changed

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24,6 +24,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \	]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -151,6 +168,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -530,8 +552,11 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p; \
@@ -621,8 +646,11 @@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 install-dist_appdataDATA: $(dist_appdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(appdatadir)" || $(MKDIR_P) "$(DESTDIR)$(appdatadir)"
 	@list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	 echo "$$d$$p"; \
@@ -639,8 +667,11 @@
 	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
 install-dist_icons16DATA: $(dist_icons16_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icons16dir)" || $(MKDIR_P) "$(DESTDIR)$(icons16dir)"
 	@list='$(dist_icons16_DATA)'; test -n "$(icons16dir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(icons16dir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(icons16dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	 echo "$$d$$p"; \
@@ -657,8 +688,11 @@
 	dir='$(DESTDIR)$(icons16dir)'; $(am__uninstall_files_from_dir)
 install-dist_icons32DATA: $(dist_icons32_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icons32dir)" || $(MKDIR_P) "$(DESTDIR)$(icons32dir)"
 	@list='$(dist_icons32_DATA)'; test -n "$(icons32dir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(icons32dir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(icons32dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	 echo "$$d$$p"; \
@@ -675,8 +709,11 @@
 	dir='$(DESTDIR)$(icons32dir)'; $(am__uninstall_files_from_dir)
 install-dist_icons48DATA: $(dist_icons48_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icons48dir)" || $(MKDIR_P) "$(DESTDIR)$(icons48dir)"
 	@list='$(dist_icons48_DATA)'; test -n "$(icons48dir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(icons48dir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(icons48dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	 echo "$$d$$p"; \
@@ -693,8 +730,11 @@
 	dir='$(DESTDIR)$(icons48dir)'; $(am__uninstall_files_from_dir)
 install-dist_icons64DATA: $(dist_icons64_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icons64dir)" || $(MKDIR_P) "$(DESTDIR)$(icons64dir)"
 	@list='$(dist_icons64_DATA)'; test -n "$(icons64dir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(icons64dir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(icons64dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	 echo "$$d$$p"; \
@@ -711,8 +751,11 @@
 	dir='$(DESTDIR)$(icons64dir)'; $(am__uninstall_files_from_dir)
 install-dist_iconsscalDATA: $(dist_iconsscal_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(iconsscaldir)" || $(MKDIR_P) "$(DESTDIR)$(iconsscaldir)"
 	@list='$(dist_iconsscal_DATA)'; test -n "$(iconsscaldir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(iconsscaldir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(iconsscaldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	 echo "$$d$$p"; \
@@ -895,13 +938,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	 if test "$$subdir" = .; then :; else \
-	 test -d "$(distdir)/$$subdir" \
-	 || $(MKDIR_P) "$(distdir)/$$subdir" \
-	 || exit 1; \
-	 fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	 if test "$$subdir" = .; then :; else \
+	 $(am__make_dryrun) \
+	 || test -d "$(distdir)/$$subdir" \
+	 || $(MKDIR_P) "$(distdir)/$$subdir" \
+	 || exit 1; \
 	 dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	 $(am__relativize); \
 	 new_distdir=$$reldir; \

bino-1.4.1.tar.xz/src/audio_output.cpp -> bino-1.4.2.tar.xz/src/audio_output.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013
 * Martin Lambers <marlam@marlam.de>
 * Gabriele Greco <gabrielegreco@gmail.com>
 *
@@ -45,19 +45,24 @@
 
 audio_output::audio_output() : controller(), _initialized(false)
 {
- if (alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT"))
+ const char *p = NULL;
+ if (alcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT"))
 {
- const char *p = alcGetString(NULL, ALC_DEVICE_SPECIFIER);
- while (p && *p)
- {
- _devices.push_back(p);
- p += _devices.back().length() + 1;
- }
- msg::dbg("%d OpenAL devices available:", devices());
- for (size_t i = 0; i < _devices.size(); i++)
- {
- msg::dbg(4, _devices[i]);
- }
+ p = alcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
+ }
+ else if (alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT"))
+ {
+ p = alcGetString(NULL, ALC_DEVICE_SPECIFIER);
+ }
+ while (p && *p)
+ {
+ _devices.push_back(p);
+ p += _devices.back().length() + 1;
+ }
+ msg::dbg("%d OpenAL devices available:", devices());
+ for (size_t i = 0; i < _devices.size(); i++)
+ {
+ msg::dbg(4, _devices[i]);
 }
 }

bino-1.4.1.tar.xz/src/base/Makefile.in -> bino-1.4.2.tar.xz/src/base/Makefile.in Changed

bino-1.4.1.tar.xz/src/gui.cpp -> bino-1.4.2.tar.xz/src/gui.cpp Changed

bino-1.4.1.tar.xz/src/main.cpp -> bino-1.4.2.tar.xz/src/main.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013
 * Martin Lambers <marlam@marlam.de>
 * Stefan Eilemann <eile@eyescale.ch>
 * Frédéric Devernay <Frederic.Devernay@inrialpes.fr>
@@ -384,7 +384,7 @@
 if (msg::file() == stderr)
 msg::set_file(stdout);
 msg::req(_("%s version %s"), PACKAGE_NAME, VERSION);
- msg::req(4, _("Copyright (C) 2012 the Bino developers."));
+ msg::req(4, _("Copyright (C) 2013 the Bino developers."));
 msg::req_txt(4, _("This is free software. You may redistribute copies of it "
 "under the terms of the GNU General Public License. "
 "There is NO WARRANTY, to the extent permitted by law."));
@@ -528,23 +528,7 @@
 + " " + lengthen(_("Mouse click"), 25) + _("Seek according to horizontal click position") + '\n'
 + " " + lengthen(_("Media keys"), 25) + _("Media keys should work as expected"));
 }
- if (list_audio_devices.value())
- {
- audio_output ao;
- if (ao.devices() == 0)
- {
- msg::req(_("No audio devices known."));
- }
- else
- {
- msg::req("%d audio devices available:", ao.devices());
- for (int i = 0; i < ao.devices(); i++)
- {
- msg::req(4, "%d: %s", i + 1, ao.device_name(i).c_str());
- }
- }
- }
- if (version.value() || help.value() || list_audio_devices.value())
+ if (version.value() || help.value())
 {
 return 0;
 }
@@ -604,10 +588,29 @@
 dispatch_equalizer, dispatch_equalizer_3d, false,
 dispatch_gui, have_display, dispatch_log_level,
 dispatch_benchmark, dispatch_swap_interval);
- if (dispatch_benchmark)
- msg::inf(_("Benchmark mode: audio and time synchronization disabled."));
+
+ /* List audio devices and exit, if requested */
+ if (list_audio_devices.value())
+ {
+ audio_output ao;
+ if (ao.devices() == 0)
+ {
+ msg::req(_("No audio devices known."));
+ }
+ else
+ {
+ msg::req("%d audio devices available:", ao.devices());
+ for (int i = 0; i < ao.devices(); i++)
+ {
+ msg::req(4, "%d: %s", i + 1, ao.device_name(i).c_str());
+ }
+ }
+ return 0;
+ }
 
 /* Set session parameters */
+ if (dispatch_benchmark)
+ msg::inf(_("Benchmark mode: audio and time synchronization disabled."));
 if (audio_device.is_set())
 controller::send_cmd(command::set_audio_device, audio_device.value() - 1);
 if (quality.is_set())

bino-1.4.1.tar.xz/src/media_object.cpp -> bino-1.4.2.tar.xz/src/media_object.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * This file is part of bino, a 3D video player.
 *
- * Copyright (C) 2010, 2011, 2012
+ * Copyright (C) 2010, 2011, 2012, 2013
 * Martin Lambers <marlam@marlam.de>
 * Frédéric Devernay <frederic.devernay@inrialpes.fr>
 * Joe <cuchac@email.cz>
@@ -341,9 +341,7 @@
 {
 avdevice_register_all();
 av_register_all();
-#if LIBAVFORMAT_VERSION_MAJOR >= 53 && LIBAVFORMAT_VERSION_MINOR >= 13
 avformat_network_init();
-#endif
 switch (msg::level())
 {
 case msg::DBG:
@@ -724,23 +722,28 @@
 }
 audio_blob_template.channels = audio_codec_ctx->channels;
 audio_blob_template.rate = audio_codec_ctx->sample_rate;
- if (audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_U8)
+ if (audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_U8
+ || audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_U8P)
 {
 audio_blob_template.sample_format = audio_blob::u8;
 }
- else if (audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_S16)
+ else if (audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_S16
+ || audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_S16P)
 {
 audio_blob_template.sample_format = audio_blob::s16;
 }
- else if (audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_FLT)
+ else if (audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_FLT
+ || audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_FLTP)
 {
 audio_blob_template.sample_format = audio_blob::f32;
 }
- else if (audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_DBL)
+ else if (audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_DBL
+ || audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_DBLP)
 {
 audio_blob_template.sample_format = audio_blob::d64;
 }
- else if (audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_S32
+ else if ((audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_S32
+ || audio_codec_ctx->sample_fmt == AV_SAMPLE_FMT_S32P)
 && sizeof(int32_t) == sizeof(float))
 {
 // we need to convert this to AV_SAMPLE_FMT_FLT after decoding
@@ -853,7 +856,7 @@
 // For a camera device, do not read ahead multiple packets, to avoid a startup delay.
 _ffmpeg->format_ctx->max_analyze_duration = 0;
 }
- if ((e = av_find_stream_info(_ffmpeg->format_ctx)) < 0)
+ if ((e = avformat_find_stream_info(_ffmpeg->format_ctx, NULL)) < 0)
 {
 throw exc(str::asprintf(_("%s: Cannot read stream info: %s"),
 _url.c_str(), my_av_strerror(e).c_str()));
@@ -897,7 +900,7 @@
 codec_ctx->flags |= CODEC_FLAG_EMU_EDGE;
 }
 // Find and open the codec. CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data.
- if (codec_ctx->codec_id != CODEC_ID_TEXT && (!codec || (e = avcodec_open(codec_ctx, codec)) < 0))
+ if (codec_ctx->codec_id != CODEC_ID_TEXT && (!codec || (e = avcodec_open2(codec_ctx, codec, NULL)) < 0))
 {
 msg::wrn(_("%s stream %d: Cannot open %s: %s"), _url.c_str(), i,
 codec_ctx->codec_type == AVMEDIA_TYPE_VIDEO ? _("video codec")
@@ -1475,7 +1478,6 @@
 &(_ffmpeg->video_packets[_video_stream]));
 }
 while (!frame_finished);
-#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MINOR >= 8
 if (_ffmpeg->video_frames[_video_stream]->width != _ffmpeg->video_frame_templates[_video_stream].raw_width
 || _ffmpeg->video_frames[_video_stream]->height != _ffmpeg->video_frame_templates[_video_stream].raw_height)
 {
@@ -1483,7 +1485,6 @@
 _ffmpeg->video_frames[_video_stream]->width, _ffmpeg->video_frames[_video_stream]->height);
 goto read_frame;
 }
-#endif
 if (_frame.layout == video_frame::bgra32)
 {
 sws_scale(_ffmpeg->video_sws_ctxs[_video_stream],
@@ -1622,12 +1623,13 @@
 }
 
 // Decode audio data
+ AVFrame audioframe = { { 0 } };
 tmppacket = packet;
 while (tmppacket.size > 0)
 {
- int tmpbuf_size = audio_tmpbuf_size;
- int len = avcodec_decode_audio3(_ffmpeg->audio_codec_ctxs[_audio_stream],
- reinterpret_cast<int16_t *>(&(_ffmpeg->audio_tmpbufs[_audio_stream][0])), &tmpbuf_size, &tmppacket);
+ int got_frame = 0;
+ int len = avcodec_decode_audio4(_ffmpeg->audio_codec_ctxs[_audio_stream],
+ &audioframe, &got_frame, &tmppacket);
 if (len < 0)
 {
 tmppacket.size = 0;
@@ -1635,10 +1637,35 @@
 }
 tmppacket.data += len;
 tmppacket.size -= len;
- if (tmpbuf_size <= 0)
+ if (!got_frame)
 {
 continue;
 }
+ int plane_size;
+ int tmpbuf_size = av_samples_get_buffer_size(&plane_size,
+ _ffmpeg->audio_codec_ctxs[_audio_stream]->channels,
+ audioframe.nb_samples,
+ _ffmpeg->audio_codec_ctxs[_audio_stream]->sample_fmt, 1);
+ if (av_sample_fmt_is_planar(_ffmpeg->audio_codec_ctxs[_audio_stream]->sample_fmt)
+ && _ffmpeg->audio_codec_ctxs[_audio_stream]->channels > 1)
+ {
+ int dummy;
+ int sample_size = av_samples_get_buffer_size(&dummy, 1, 1,
+ _ffmpeg->audio_codec_ctxs[_audio_stream]->sample_fmt, 1);
+ uint8_t *out = reinterpret_cast<uint8_t *>(&(_ffmpeg->audio_tmpbufs[_audio_stream][0]));
+ for (int s = 0; s < audioframe.nb_samples; s++)
+ {
+ for (int c = 0; c < _ffmpeg->audio_codec_ctxs[_audio_stream]->channels; c++)
+ {
+ std::memcpy(out, audioframe.extended_data[c] + s * sample_size, sample_size);
+ out += sample_size;
+ }
+ }
+ }
+ else
+ {
+ std::memcpy(&(_ffmpeg->audio_tmpbufs[_audio_stream][0]), audioframe.extended_data[0], plane_size);
+ }
 // Put it in the decoded audio data buffer
 if (_ffmpeg->audio_codec_ctxs[_audio_stream]->sample_fmt == AV_SAMPLE_FMT_S32)
 {
@@ -2065,7 +2092,7 @@
 av_free_packet(&_ffmpeg->subtitle_packet_queues[i][j]);
 }
 }
- av_close_input_file(_ffmpeg->format_ctx);
+ avformat_close_input(&_ffmpeg->format_ctx);
 }
 delete _ffmpeg->reader;
 delete _ffmpeg;

bino-1.4.1.tar.xz/src/video_output.cpp -> bino-1.4.2.tar.xz/src/video_output.cpp Changed

bino.desktop Deleted