From f10bf61870742fbc66291c88134576990505e526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 3 May 2014 19:34:29 +0200 Subject: Imported Upstream version 1.3.1 --- ChangeLog | 420 +++++++++--------- Makefile.in | 1 - NEWS | 110 ++++- README | 2 +- RELEASE | 48 +- aclocal.m4 | 1 - autogen.sh | 8 +- common/Makefile.in | 1 - common/gst-autogen.sh | 1 + common/gst.supp | 41 +- common/gstdoc-scangobj | 18 +- common/m4/Makefile.am | 1 - common/m4/Makefile.in | 2 - common/m4/as-scrub-include.m4 | 36 -- common/m4/gst-error.m4 | 4 +- common/m4/gst-gettext.m4 | 7 + common/m4/gst-glib2.m4 | 3 - common/m4/gst-parser.m4 | 4 +- compile | 99 ++--- config.guess | 184 ++++---- config.sub | 106 ++--- configure | 59 ++- configure.ac | 8 +- depcomp | 487 ++++++++------------- docs/Makefile.am | 12 +- docs/Makefile.in | 10 +- docs/plugins/Makefile.in | 1 - docs/plugins/gst-plugins-ugly-plugins.args | 8 +- docs/plugins/gst-plugins-ugly-plugins.hierarchy | 1 + .../html/gst-plugins-ugly-plugins-1.0.devhelp2 | 16 +- .../gst-plugins-ugly-plugins-plugin-a52dec.html | 2 +- .../gst-plugins-ugly-plugins-plugin-amrnb.html | 2 +- .../gst-plugins-ugly-plugins-plugin-amrwbdec.html | 2 +- .../html/gst-plugins-ugly-plugins-plugin-asf.html | 2 +- .../html/gst-plugins-ugly-plugins-plugin-cdio.html | 2 +- ...gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html | 2 +- .../gst-plugins-ugly-plugins-plugin-dvdread.html | 2 +- .../gst-plugins-ugly-plugins-plugin-dvdsub.html | 2 +- .../html/gst-plugins-ugly-plugins-plugin-lame.html | 2 +- .../html/gst-plugins-ugly-plugins-plugin-mad.html | 2 +- .../gst-plugins-ugly-plugins-plugin-mpeg2dec.html | 2 +- .../gst-plugins-ugly-plugins-plugin-realmedia.html | 2 +- .../gst-plugins-ugly-plugins-plugin-siddec.html | 2 +- .../gst-plugins-ugly-plugins-plugin-twolame.html | 2 +- .../html/gst-plugins-ugly-plugins-plugin-x264.html | 2 +- .../html/gst-plugins-ugly-plugins-rademux.html | 5 +- .../html/gst-plugins-ugly-plugins-rdtmanager.html | 5 +- .../html/gst-plugins-ugly-plugins-rtspreal.html | 5 +- .../html/gst-plugins-ugly-plugins-rtspwms.html | 5 +- .../html/gst-plugins-ugly-plugins-x264enc.html | 8 +- .../html/gst-plugins-ugly-plugins-xingmux.html | 2 +- docs/plugins/html/index.html | 2 +- docs/plugins/inspect/plugin-a52dec.xml | 2 +- docs/plugins/inspect/plugin-amrnb.xml | 2 +- docs/plugins/inspect/plugin-amrwbdec.xml | 2 +- docs/plugins/inspect/plugin-asf.xml | 2 +- docs/plugins/inspect/plugin-cdio.xml | 2 +- docs/plugins/inspect/plugin-dvdlpcmdec.xml | 2 +- docs/plugins/inspect/plugin-dvdread.xml | 2 +- docs/plugins/inspect/plugin-dvdsub.xml | 2 +- docs/plugins/inspect/plugin-lame.xml | 2 +- docs/plugins/inspect/plugin-mad.xml | 2 +- docs/plugins/inspect/plugin-mpeg2dec.xml | 2 +- docs/plugins/inspect/plugin-realmedia.xml | 2 +- docs/plugins/inspect/plugin-siddec.xml | 2 +- docs/plugins/inspect/plugin-twolame.xml | 2 +- docs/plugins/inspect/plugin-x264.xml | 2 +- docs/plugins/inspect/plugin-xingmux.xml | 4 +- ext/Makefile.in | 1 - ext/a52dec/Makefile.in | 1 - ext/amrnb/Makefile.in | 1 - ext/amrnb/amrnbdec.c | 12 +- ext/amrwbdec/Makefile.in | 1 - ext/amrwbdec/amrwbdec.c | 12 +- ext/cdio/Makefile.in | 1 - ext/dvdread/Makefile.in | 1 - ext/dvdread/dvdreadsrc.c | 7 +- ext/lame/Makefile.in | 1 - ext/mad/Makefile.in | 1 - ext/mpeg2dec/Makefile.in | 1 - ext/mpeg2dec/gstmpeg2dec.c | 1 + ext/sidplay/Makefile.in | 1 - ext/sidplay/gstsiddec.cc | 2 - ext/twolame/Makefile.in | 1 - ext/x264/Makefile.in | 1 - ext/x264/gstx264enc.c | 10 +- gst-libs/Makefile.in | 1 - gst-libs/gst/Makefile.in | 1 - gst-plugins-ugly.doap | 38 +- gst-plugins-ugly.spec | 2 +- gst/Makefile.in | 1 - gst/asfdemux/Makefile.in | 1 - gst/asfdemux/gstasfdemux.c | 57 +-- gst/asfdemux/gstrtspwms.c | 2 - gst/dvdlpcmdec/Makefile.in | 1 - gst/dvdsub/Makefile.in | 1 - gst/dvdsub/gstdvdsubdec.c | 1 + gst/realmedia/Makefile.in | 1 - gst/realmedia/rademux.c | 2 - gst/realmedia/rdtmanager.c | 2 - gst/realmedia/rtspreal.c | 2 - gst/xingmux/Makefile.in | 1 - gst/xingmux/gstxingmux.c | 2 +- gst/xingmux/plugin.c | 2 +- install-sh | 14 +- m4/Makefile.in | 1 - missing | 414 +++++++++++------- pkgconfig/Makefile.in | 1 - po/Makefile.in.in | 3 - po/Makevars | 2 +- po/af.gmo | Bin 530 -> 530 bytes po/af.po | 2 +- po/az.gmo | Bin 588 -> 588 bytes po/az.po | 2 +- po/bg.gmo | Bin 2666 -> 2666 bytes po/bg.po | 2 +- po/ca.gmo | Bin 2144 -> 2144 bytes po/ca.po | 2 +- po/cs.gmo | Bin 2374 -> 2374 bytes po/cs.po | 2 +- po/da.gmo | Bin 2156 -> 2156 bytes po/da.po | 2 +- po/de.gmo | Bin 2504 -> 2504 bytes po/de.po | 2 +- po/el.gmo | Bin 2876 -> 2876 bytes po/el.po | 2 +- po/en_GB.gmo | Bin 529 -> 529 bytes po/en_GB.po | 2 +- po/eo.gmo | Bin 2088 -> 2088 bytes po/eo.po | 2 +- po/es.gmo | Bin 2147 -> 2147 bytes po/es.po | 2 +- po/eu.gmo | Bin 1862 -> 1862 bytes po/eu.po | 2 +- po/fi.gmo | Bin 1776 -> 1776 bytes po/fi.po | 2 +- po/fr.gmo | Bin 2119 -> 2119 bytes po/fr.po | 2 +- po/gl.gmo | Bin 2416 -> 2416 bytes po/gl.po | 2 +- po/gst-plugins-ugly-1.0.pot | 8 +- po/hr.gmo | Bin 2089 -> 2089 bytes po/hr.po | 2 +- po/hu.gmo | Bin 2326 -> 2326 bytes po/hu.po | 2 +- po/id.gmo | Bin 2134 -> 2134 bytes po/id.po | 2 +- po/it.gmo | Bin 1776 -> 1776 bytes po/it.po | 2 +- po/ja.gmo | Bin 2733 -> 2733 bytes po/ja.po | 2 +- po/lt.gmo | Bin 1332 -> 1332 bytes po/lt.po | 2 +- po/lv.gmo | Bin 2128 -> 2369 bytes po/lv.po | 37 +- po/ms.gmo | Bin 1701 -> 1701 bytes po/ms.po | 2 +- po/mt.gmo | Bin 1690 -> 1690 bytes po/mt.po | 2 +- po/nb.gmo | Bin 2194 -> 2194 bytes po/nb.po | 2 +- po/nl.gmo | Bin 2307 -> 2307 bytes po/nl.po | 2 +- po/or.gmo | Bin 604 -> 604 bytes po/or.po | 2 +- po/pl.gmo | Bin 2359 -> 2359 bytes po/pl.po | 2 +- po/pt_BR.gmo | Bin 2436 -> 2436 bytes po/pt_BR.po | 2 +- po/ro.gmo | Bin 1913 -> 1913 bytes po/ro.po | 2 +- po/ru.gmo | Bin 2863 -> 2863 bytes po/ru.po | 2 +- po/sk.gmo | Bin 2446 -> 2446 bytes po/sk.po | 2 +- po/sl.gmo | Bin 2288 -> 2288 bytes po/sl.po | 2 +- po/sq.gmo | Bin 538 -> 538 bytes po/sq.po | 2 +- po/sr.gmo | Bin 2891 -> 2891 bytes po/sr.po | 2 +- po/sv.gmo | Bin 1727 -> 1727 bytes po/sv.po | 2 +- po/tr.gmo | Bin 2248 -> 2248 bytes po/tr.po | 2 +- po/uk.gmo | Bin 3031 -> 3031 bytes po/uk.po | 2 +- po/vi.gmo | Bin 2573 -> 2573 bytes po/vi.po | 2 +- po/zh_CN.gmo | Bin 1878 -> 1878 bytes po/zh_CN.po | 2 +- tests/Makefile.in | 1 - tests/check/Makefile.am | 8 +- tests/check/Makefile.in | 6 +- win32/common/config.h | 8 +- 195 files changed, 1225 insertions(+), 1325 deletions(-) delete mode 100644 common/m4/as-scrub-include.m4 diff --git a/ChangeLog b/ChangeLog index 2f6a35a..ec50188 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,65 +1,11 @@ -=== release 1.2.4 === +=== release 1.3.1 === -2014-04-18 Sebastian Dröge +2014-05-03 Sebastian Dröge * configure.ac: - releasing 1.2.4 + releasing 1.3.1 -2014-01-17 10:46:50 +0000 Vincent Penquerc'h - - * ext/mpeg2dec/gstmpeg2dec.c: - mpeg2dec: do not reset the whole video info when setting size - New changes to gstvideo will reset all the video info state - when calling _set_format, overwriting what was previously set - in the preceding code. - The comment says the following code is meant to preserve the - pre-crop size, so let's just keep the size and related data - as this does not seem to break anything else (this is what - the _set_format call would have set before the change that - reset all data, except the colorimetry). - -2014-02-20 21:08:08 +0100 Edward Hervey - - * m4/a52.m4: - m4: Remove extra check for 11+ year old a52 release - You deserve a build failure if you still have that version - If someone wants to completely remove this m4 to replace it with the - generic AS_GST_CHECK_LIBHEADER() it would be appreciated. - -2014-02-19 21:11:55 +0100 Rico Tzschichholz - - * m4/a52.m4: - m4: Fix multiple tests in AC_CHECK_A52DEC - -=== release 1.2.3 === - -2014-02-08 12:34:23 +0100 Sebastian Dröge - - * ChangeLog: - * NEWS: - * RELEASE: - * configure.ac: - * docs/plugins/inspect/plugin-a52dec.xml: - * docs/plugins/inspect/plugin-amrnb.xml: - * docs/plugins/inspect/plugin-amrwbdec.xml: - * docs/plugins/inspect/plugin-asf.xml: - * docs/plugins/inspect/plugin-cdio.xml: - * docs/plugins/inspect/plugin-dvdlpcmdec.xml: - * docs/plugins/inspect/plugin-dvdread.xml: - * docs/plugins/inspect/plugin-dvdsub.xml: - * docs/plugins/inspect/plugin-lame.xml: - * docs/plugins/inspect/plugin-mad.xml: - * docs/plugins/inspect/plugin-mpeg2dec.xml: - * docs/plugins/inspect/plugin-realmedia.xml: - * docs/plugins/inspect/plugin-siddec.xml: - * docs/plugins/inspect/plugin-twolame.xml: - * docs/plugins/inspect/plugin-x264.xml: - * docs/plugins/inspect/plugin-xingmux.xml: - * gst-plugins-ugly.doap: - * win32/common/config.h: - Release 1.2.3 - -2014-02-08 12:34:07 +0100 Sebastian Dröge +2014-05-03 18:21:01 +0200 Sebastian Dröge * po/af.po: * po/az.po: @@ -103,83 +49,185 @@ * po/zh_CN.po: Update .po files -2014-02-04 16:23:20 +0100 Sebastian Dröge +2014-05-03 17:23:39 +0200 Sebastian Dröge + * po/de.po: * po/id.po: + * po/lv.po: * po/sk.po: + * po/sr.po: po: Update translations -2013-12-26 17:55:07 +0100 Sebastian Dröge +2014-05-03 10:15:28 +0200 Sebastian Dröge - * ChangeLog: - * NEWS: - * RELEASE: - * configure.ac: - * docs/plugins/inspect/plugin-a52dec.xml: - * docs/plugins/inspect/plugin-amrnb.xml: - * docs/plugins/inspect/plugin-amrwbdec.xml: - * docs/plugins/inspect/plugin-asf.xml: - * docs/plugins/inspect/plugin-cdio.xml: - * docs/plugins/inspect/plugin-dvdlpcmdec.xml: - * docs/plugins/inspect/plugin-dvdread.xml: - * docs/plugins/inspect/plugin-dvdsub.xml: - * docs/plugins/inspect/plugin-lame.xml: - * docs/plugins/inspect/plugin-mad.xml: - * docs/plugins/inspect/plugin-mpeg2dec.xml: - * docs/plugins/inspect/plugin-realmedia.xml: - * docs/plugins/inspect/plugin-siddec.xml: - * docs/plugins/inspect/plugin-twolame.xml: - * docs/plugins/inspect/plugin-x264.xml: - * docs/plugins/inspect/plugin-xingmux.xml: - * gst-plugins-ugly.doap: - * win32/common/config.h: - Release 1.2.2 + * common: + Automatic update of common submodule + From bcb1518 to 211fa5f + +2014-04-27 00:29:16 +0100 Tim-Philipp Müller + + * ext/sidplay/gstsiddec.cc: + * gst/asfdemux/gstrtspwms.c: + * gst/realmedia/rademux.c: + * gst/realmedia/rdtmanager.c: + * gst/realmedia/rtspreal.c: + docs: remove outdated and pointless 'Last reviewed' lines from docs + They are very confusing for people, and more often than not + also just not very accurate. Seeing 'last reviewed: 2005' in + your docs is not very confidence-inspiring. Let's just remove + those comments. -=== release 1.2.2 === +2014-04-10 17:29:30 +0100 Vincent Penquerc'h -2013-12-26 17:54:21 +0100 Sebastian Dröge + * gst/dvdsub/gstdvdsubdec.c: + dvdsubdec: fix spurious rejection of 0 time offset commands + Coverity 206168 - * po/af.po: - * po/az.po: - * po/bg.po: - * po/ca.po: - * po/cs.po: - * po/da.po: - * po/de.po: - * po/el.po: - * po/en_GB.po: - * po/eo.po: - * po/es.po: - * po/eu.po: - * po/fi.po: - * po/fr.po: - * po/gl.po: - * po/hr.po: - * po/hu.po: - * po/id.po: - * po/it.po: - * po/ja.po: - * po/lt.po: - * po/lv.po: - * po/ms.po: - * po/mt.po: - * po/nb.po: - * po/nl.po: - * po/or.po: - * po/pl.po: - * po/pt_BR.po: - * po/ro.po: - * po/ru.po: - * po/sk.po: - * po/sl.po: - * po/sq.po: - * po/sr.po: - * po/sv.po: - * po/tr.po: - * po/uk.po: - * po/vi.po: - * po/zh_CN.po: - Update .po files +2014-04-10 16:53:25 +0100 Vincent Penquerc'h + + * ext/dvdread/dvdreadsrc.c: + dvdread: avoid intermediate promotion to signed + We should not reach the dangerous range here, though. + Coverity 206491, 206492, 1139856 + +2014-01-17 10:46:50 +0000 Vincent Penquerc'h + + * ext/mpeg2dec/gstmpeg2dec.c: + mpeg2dec: do not reset the whole video info when setting size + New changes to gstvideo will reset all the video info state + when calling _set_format, overwriting what was previously set + in the preceding code. + The comment says the following code is meant to preserve the + pre-crop size, so let's just keep the size and related data + as this does not seem to break anything else (this is what + the _set_format call would have set before the change that + reset all data, except the colorimetry). + +2014-04-03 15:06:22 +0200 Edward Hervey + + * gst/asfdemux/gstasfdemux.c: + asfdemux: Fix payloads check + Don't iterate stream->payloads if ... it doesn't exist + CID #1139846 + +2014-03-02 05:11:10 +0100 Sebastian Rasmussen + + * .gitignore: + .gitignore: Ignore gcov intermediate files + https://bugzilla.gnome.org/show_bug.cgi?id=725483 + +2014-02-28 09:35:10 +0100 Sebastian Dröge + + * common: + Automatic update of common submodule + From fe1672e to bcb1518 + +2014-02-26 22:12:50 +0100 Stefan Sauer + + * common: + Automatic update of common submodule + From 1a07da9 to fe1672e + +2014-02-26 11:31:03 +0100 Stefan Sauer + + * docs/Makefile.am: + docs: install prebuilt plugin docs if gtk-doc is disabled + Sync to the Makefile.am from gst-plugin-base where it is done right. + Fixes #725034 + +2014-02-13 09:39:04 +0100 Stefan Sauer + + * gst/xingmux/gstxingmux.c: + * gst/xingmux/plugin.c: + xingmux: add muxer category and make element plugable + This is required to make encodebin consider the element. Yet it is not enough to + have it plugged it has a lower priority than most mp3encoders and no different + caps. + +2014-02-24 11:42:00 +0100 Dirk Van Haerenborgh + + * ext/x264/gstx264enc.c: + x264enc: allow lossless compression (qp=0) + https://bugzilla.gnome.org/show_bug.cgi?id=725051 + +2014-02-20 21:08:08 +0100 Edward Hervey + + * m4/a52.m4: + m4: Remove extra check for 11+ year old a52 release + You deserve a build failure if you still have that version + If someone wants to completely remove this m4 to replace it with the + generic AS_GST_CHECK_LIBHEADER() it would be appreciated. + +2014-02-19 21:11:55 +0100 Rico Tzschichholz + + * m4/a52.m4: + m4: Fix multiple tests in AC_CHECK_A52DEC + +2014-02-09 23:41:36 +0100 Sebastian Dröge + + * gst/asfdemux/gstasfdemux.c: + asfdemux: Remove unused function + +2014-02-06 19:22:47 +0100 Edward Hervey + + * tests/check/Makefile.am: + check: Fix test location + +2014-02-03 02:06:11 +0100 Sebastian Rasmussen + + * tests/check/Makefile.am: + tests: Don't build disabled plugins' check tests + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=723505 + +2014-01-30 10:44:29 +0100 Edward Hervey + + * common: + Automatic update of common submodule + From d48bed3 to 1a07da9 + +2014-01-03 16:20:11 +0000 Tim-Philipp Müller + + * gst/asfdemux/gstasfdemux.c: + asfdemux: only add "format" field with fourcc to WMV caps + Doesn't make sense for e.g. H264 or MJPEG. + +2013-12-22 22:34:03 +0000 Tim-Philipp Müller + + * autogen.sh: + * common: + Automatic update of common submodule + From dbedaa0 to d48bed3 + +2013-12-22 21:56:03 +0000 Tim-Philipp Müller + + * po/Makevars: + po: set gettext domain in Makevars so we don't have to patch the generated Makefile.in.in + https://bugzilla.gnome.org/show_bug.cgi?id=705455 + +2013-12-05 12:16:45 +0100 Sebastian Dröge + + * ext/amrwbdec/amrwbdec.c: + amrwbdec: Remove some dead code + +2013-12-05 12:16:38 +0100 Sebastian Dröge + + * ext/amrnb/amrnbdec.c: + amrnbdec: Remove some dead code + +2013-12-05 12:09:04 +0100 Sebastian Dröge + + * ext/amrnb/amrnbdec.c: + amrnbdec: Use gst_audio_decoder_set_needs_format() instead of custom code + +2013-12-05 12:08:46 +0100 Sebastian Dröge + + * ext/amrwbdec/amrwbdec.c: + amrwbdec: Use gst_audio_decoder_set_needs_format() instead of custom code + +2013-12-05 11:44:10 +0100 Sebastian Dröge + + * ext/mpeg2dec/gstmpeg2dec.c: + mpeg2dec: Use new gst_video_decoder_set_needs_format() API 2013-11-29 15:51:49 +0000 Tim-Philipp Müller @@ -198,83 +246,19 @@ * ext/mpeg2dec/gstmpeg2dec.c: mpeg2dec: graceful degradation for badly parsed input -=== release 1.2.1 === - -2013-11-09 15:58:12 +0100 Sebastian Dröge - - * ChangeLog: - * NEWS: - * RELEASE: - * configure.ac: - * docs/plugins/inspect/plugin-a52dec.xml: - * docs/plugins/inspect/plugin-amrnb.xml: - * docs/plugins/inspect/plugin-amrwbdec.xml: - * docs/plugins/inspect/plugin-asf.xml: - * docs/plugins/inspect/plugin-cdio.xml: - * docs/plugins/inspect/plugin-dvdlpcmdec.xml: - * docs/plugins/inspect/plugin-dvdread.xml: - * docs/plugins/inspect/plugin-dvdsub.xml: - * docs/plugins/inspect/plugin-lame.xml: - * docs/plugins/inspect/plugin-mad.xml: - * docs/plugins/inspect/plugin-mpeg2dec.xml: - * docs/plugins/inspect/plugin-realmedia.xml: - * docs/plugins/inspect/plugin-siddec.xml: - * docs/plugins/inspect/plugin-twolame.xml: - * docs/plugins/inspect/plugin-x264.xml: - * docs/plugins/inspect/plugin-xingmux.xml: - * gst-plugins-ugly.doap: - * win32/common/config.h: - Release 1.2.1 - -2013-11-09 15:58:08 +0100 Sebastian Dröge +2013-11-05 11:20:20 +0000 Tim-Philipp Müller - * po/af.po: - * po/az.po: - * po/bg.po: - * po/ca.po: - * po/cs.po: - * po/da.po: - * po/de.po: - * po/el.po: - * po/en_GB.po: - * po/eo.po: - * po/es.po: - * po/eu.po: - * po/fi.po: - * po/fr.po: - * po/gl.po: - * po/hr.po: - * po/hu.po: - * po/id.po: - * po/it.po: - * po/ja.po: - * po/lt.po: - * po/lv.po: - * po/ms.po: - * po/mt.po: - * po/nb.po: - * po/nl.po: - * po/or.po: - * po/pl.po: - * po/pt_BR.po: - * po/ro.po: - * po/ru.po: - * po/sk.po: - * po/sl.po: - * po/sq.po: - * po/sr.po: - * po/sv.po: - * po/tr.po: - * po/uk.po: - * po/vi.po: - * po/zh_CN.po: - Update .po files + * common: + Automatic update of common submodule + From 865aa20 to dbedaa0 -2013-11-09 12:02:38 +0100 Sebastian Dröge +2013-10-22 16:02:04 +0900 HyeJin Choi - * po/de.po: - * po/sr.po: - po: Update translations + * gst/asfdemux/asfpacket.c: + asfdemux: mo_size check bug fix. mo_size is not mandatory field. + So, don't need to check previous payload's mo_size and current + payload's mo_size when merging it. + https://bugzilla.gnome.org/show_bug.cgi?id=710609 2013-10-22 15:03:15 -0300 Thiago Santos @@ -293,27 +277,12 @@ otherwise we end with 0-sized buffers https://bugzilla.gnome.org/show_bug.cgi?id=684942 -2013-10-22 16:02:04 +0900 HyeJin Choi - - * gst/asfdemux/asfpacket.c: - asfdemux: mo_size check bug fix. mo_size is not mandatory field. - So, don't need to check previous payload's mo_size and current - payload's mo_size when merging it. - https://bugzilla.gnome.org/show_bug.cgi?id=710609 - 2013-09-27 08:05:25 -0700 Michael Esemplare * ext/x264/gstx264enc.c: x264enc: If FPS is available, set VFR to false https://bugzilla.gnome.org/show_bug.cgi?id=708940 -2013-09-24 10:07:25 -0700 Thiago Santos - - * gst/asfdemux/gstasfdemux.c: - asfdemux: Parse last simple index entry - The entry size is fixed at 6, fix typo to finish parsing the index - correctly until the last sample - 2013-09-24 10:08:10 -0700 Thiago Santos * gst/asfdemux/gstasfdemux.c: @@ -328,12 +297,29 @@ keyframe, meaning a few seconds of video will still be played, which should not be the desired behavior when seeking beyong file limits. -2013-09-24 17:25:01 +0100 Tim-Philipp Müller +2013-09-24 10:07:25 -0700 Thiago Santos + + * gst/asfdemux/gstasfdemux.c: + asfdemux: Parse last simple index entry + The entry size is fixed at 6, fix typo to finish parsing the index + correctly until the last sample + +2013-09-24 18:32:31 +0100 Tim-Philipp Müller * README: * common: Automatic update of common submodule - From 6b03ba7 to 7412249 + From 6b03ba7 to 865aa20 + +2013-09-24 15:05:36 +0200 Sebastian Dröge + + * configure.ac: + configure: Actually use 1.3.0.1 as version to make configure happy + +2013-09-24 15:00:30 +0200 Sebastian Dröge + + * configure.ac: + Back to development === release 1.2.0 === diff --git a/Makefile.in b/Makefile.in index 059fb89..955ee09 100644 --- a/Makefile.in +++ b/Makefile.in @@ -104,7 +104,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/NEWS b/NEWS index abb0c6d..e988468 100644 --- a/NEWS +++ b/NEWS @@ -1,2 +1,110 @@ -This is GStreamer Ugly Plugins 1.2.4 +This is GStreamer Ugly Plugins 1.3.1 + +Changes since 1.2: + +New API: + • GstMessageType has GST_MESSAGE_EXTENDED added. All types before + that can be used together as a flags type as before, but from + that message onwards the types are just counted incrementally. + This was necessary to be able to add more message types. + In 2.0 GstMessageType will just become an enum and not a flags + type anymore. + • GstDeviceMonitor for device probing, e.g. to list all available + audio or video capture devices. This is the replacement for + GstPropertyProbe from 0.10. + • Events accumulate the running-time offset now when travelling + through pads, as set by the gst_pad_set_offset() function. This + allows to compensate for this in the QOS event for example. + • GstBuffer has a new flag "tag-memory" that is set automatically + when memory is added or removed to a buffer. This allows buffer + pools to detect if they can recycle a buffer or need to reset + it first. + • GstToc has new API to mark GstTocEntries as loops. + • A not-authorized resource error has been defined to notify + applications that accessing the resource has failed because + of missing authorization and to distinguish this case from others. + This change is actually already in 1.2.4. + • GstPad has a new flag "accept-intersect", that will let the default + ACCEPT_CAPS query handler do an intersection instead of subset check. + This is interesting for parser elements that can handle incomplete + caps. + • GstCollectPads has support for flushing and a default handler for + SEEK events now. + • GstSegment has new API to offset the running time by a specific + value and this is used in GstPad to allow positive and negative + offsets in gst_pad_set_offset() in all situations. + • Support for h265/HEVC and VP8 has been added to the codec utils and codec + parsers library, and was integrated into various elements. + • API for adjusting the TLS validation of RTSP connection has been added. + • The RTSP and SDP library has MIKEY (RFC 3830) support now, and + there is API to distinguish between the different RTSP profiles. + • API to access RTP time information and statistics. + • Support for auxiliary streams was added to rtpbin. + • Support for tiled, raw video formats has been added. + • GstVideoDecoder and GstAudioDecoder have API to help aggregating tag + events and merge custom tags into them consistently. + • playbin/playsink has support for application provided audio and video + filters. + • The GL library was merged from gst-plugins-gl to gst-plugins-bad, + providing a generic infrastructure for handling GL inside GStreamer + pipelines and a plugin with some elements using these, especially + a video sink. Supported platforms currently are Android, Cocoa (OS X), + DispManX (Raspberry Pi), EAGL (iOS), WGL (Windows) and generic X11, + Wayland and EGL platforms. + This replaces eglglessink and also is supposed to replace osxvideosink. + + +Major changes: + • New plugins and elements: + ∘ v4l2videodec element for accessing hardware codecs on + platforms that make them accessible via V4L2, e.g. + Samsung Exynos. This comes together with major refactoring + of the existing V4L2 elements and the corresponding + infrastructure. + The v4l2videodec element replaces the mfcdec element. + ∘ rtpstreampay and rtpstreamdepay elements for transmitting + RTP packets over a stream API (e.g. TCP) according to + RFC 4571. + ∘ rtprtx elements for standard compliant implementation of + retransmissions, integrated into the rtpmanager plugin. + ∘ audiomixer element that mixes multiple audio streams together + into a single one while keeping synchronization. This is + planned to become the replacement of the adder element. + ∘ OpenNI2 plugin for 3D cameras like the Kinect camera. + ∘ OpenEXR plugin for decoding high-dynamic-range EXR images. + ∘ curlsshsink and curlsftpsink to write files via SSH/SFTP. + ∘ videosignal, ivfparse and sndfile plugins ported from 0.10. + ∘ avfvideosrc, vtdec and other elements were ported from 0.10 and + are available on OS X and iOS now. + + • Other changes: + ∘ gst-libav now uses libav 10, and gained support for H265/HEVC. + ∘ Support for hardware codecs and special memory types has been + improved with bugfixes and feature additions in various plugins + and base classes. + ∘ Various bugfixes and improvements to buffering in queue2 and + multiqueue elements. + ∘ dvbsrc supports more delivery mechanisms and other features + now, including DVB S2 and T2 support. + ∘ The MPEGTS library has support for many more descriptors. + ∘ Major improvements to tsdemux, especially time related. + ∘ souphttpsrc now has support for keep-alive connections, + compression, configurable number of retries and configuration + for SSL certificate validation. + ∘ hlsdemux has undergone major refactoring and works more + reliable now and supports more HLS features like trick modes. + Also fragments are pushed downstream while they're downloaded + now instead of waiting for each fragment to finish. + ∘ videoflip can automatically flip based on the orientation tag. + ∘ openjpeg supports the OpenJPEG2 API. + ∘ gst-rtsp-server supports SRTP and MIKEY now. + ∘ Lots of fixes for coverity warnings all over the place. + ∘ 400+ fixed bug reports, and many other bug fixes and other + improvements everywhere that had no bug report. + +Things to look out for: + • The eglglessink element was removed and replaced by the glimagesink + element. + • The mfcdec element was removed and replaced by v4l2videodec. + • osxvideosink is only available in OS X 10.6 or newer. diff --git a/README b/README index a8f26f0..da0cab4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -GStreamer 1.2.x stable series +GStreamer 1.3.x development series WHAT IT IS ---------- diff --git a/RELEASE b/RELEASE index 2b842e4..de1015c 100644 --- a/RELEASE +++ b/RELEASE @@ -1,15 +1,29 @@ -Release notes for GStreamer Ugly Plugins 1.2.4 +Release notes for GStreamer Ugly Plugins 1.3.1 -The GStreamer team is proud to announce a new bug-fix release -in the 1.x stable series of the -core of the GStreamer streaming media framework. +The GStreamer team is pleased to announce the first release of the unstable +1.3 release series. The 1.3 release series is adding new features on top of +the 1.0 and 1.2 series and is part of the API and ABI-stable 1.x release +series of the GStreamer multimedia framework. The unstable 1.3 release series +will lead to the stable 1.4 release series in the next weeks, and newly added +API can still change until that point. -The 1.x series is a stable series targeted at end users. -It is not API or ABI compatible with the stable 0.10.x series. -It is, however, parallel installable with the 0.10.x series and -will not affect an existing 0.10.x installation. + + +Binaries for Android, iOS, Mac OS X and Windows will be provided separately +during the unstable 1.3 release series. + + + +The versioning scheme that is used in general is that 1.x.y is API and +ABI backwards compatible with previous 1.x.y releases. If x is an even +number it is a stable release series and all releases in this series +will only contain important bugfixes, e.g. the 1.0 series with 1.0.7. If +x is odd it is a development release series that will lead to the next +stable release series 1.x+1 and contains new features and bigger +changes. During the development release series, new API can still +change. @@ -56,8 +70,13 @@ contains a set of codecs plugins based on libav (formerly gst-ffmpeg) -There were no bugs fixed in this release - +Bugs fixed in this release + + * 708598 : asfdemux: when seek to end of file, some asf recieve EOS and then finished. But some asf file play from beginning. + * 722291 : mpeg2dec: deinterlace no longer automatically deinterlaces mpeg2dec output + * 723505 : gst-plugins-ugly: Do not build check tests for disabled plugins + * 725051 : x264enc: allow lossless compression (qp=0) + * 725483 : gst-plugins-ugly: Ignore gcov intermediate files ==== Download ==== @@ -94,7 +113,16 @@ subscribe to the gstreamer-devel list. Contributors to this release + * Dirk Van Haerenborgh * Edward Hervey + * HyeJin Choi + * Mark Nauwelaerts + * Michael Esemplare * Rico Tzschichholz + * Sebastian Dröge + * Sebastian Rasmussen + * Stefan Sauer + * Thiago Santos + * Tim-Philipp Müller * Vincent Penquerc'h   \ No newline at end of file diff --git a/aclocal.m4 b/aclocal.m4 index 0b74b54..bc4f5ff 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1455,7 +1455,6 @@ m4_include([common/m4/as-ac-expand.m4]) m4_include([common/m4/as-auto-alt.m4]) m4_include([common/m4/as-compiler-flag.m4]) m4_include([common/m4/as-libtool.m4]) -m4_include([common/m4/as-scrub-include.m4]) m4_include([common/m4/as-version.m4]) m4_include([common/m4/ax_create_stdint_h.m4]) m4_include([common/m4/gst-arch.m4]) diff --git a/autogen.sh b/autogen.sh index 9fb9af1..3836018 100755 --- a/autogen.sh +++ b/autogen.sh @@ -87,14 +87,8 @@ fi toplevel_check $srcfile # autopoint -# first remove patch if necessary, then run autopoint, then reapply if test -d po ; then - if test -f po/Makefile.in.in; - then - patch -p0 -R --forward < common/gettext.patch - fi - tool_run "$autopoint" "--force" "patch -p0 < common/gettext.patch" - patch -p0 < common/gettext.patch + tool_run "$autopoint" "--force" fi # aclocal diff --git a/common/Makefile.in b/common/Makefile.in index d39c116..cb5a200 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -86,7 +86,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/common/gst-autogen.sh b/common/gst-autogen.sh index e54dbcf..78cab66 100644 --- a/common/gst-autogen.sh +++ b/common/gst-autogen.sh @@ -29,6 +29,7 @@ version_get () { COMMAND=$1 VARPREFIX=`echo $2 | tr .,- _` + local ${VARPREFIX}_VERSION # strip everything that's not a digit, then use cut to get the first field pkg_version=`$COMMAND --version|head -n 1|sed 's/^.*)[^0-9]*//'|cut -d' ' -f1` diff --git a/common/gst.supp b/common/gst.supp index 8a3617f..2c60392 100644 --- a/common/gst.supp +++ b/common/gst.supp @@ -1297,6 +1297,15 @@ fun:snd_config_update_r fun:snd_config_update } +{ + + Memcheck:Leak + fun:*alloc + fun:_dl_close_worker + ... + fun:snd_config_searcha_hooks +} + { Memcheck:Leak @@ -2528,41 +2537,13 @@ } -## Leak of property_list in gstffmpegcfg.c -## This list is created in gst_ffmpegcsp_init(), called from -## gst_ffmpegenc_register. -{ - - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:g_datalist_id_set_data_full - fun:gst_ffmpeg_cfg_init - fun:gst_ffmpegenc_register - fun:plugin_init -} -{ - - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:g_datalist_id_set_data_full - fun:g_param_spec_set_qdata_full - fun:gst_ffmpeg_cfg_init - fun:gst_ffmpegenc_register - fun:plugin_init -} - - +## Leak of everything allocated by gst-libav plugin init { Memcheck:Leak fun:*alloc - fun:* + ... fun:gst_ffmpeg_cfg_init - fun:gst_ffmpegenc_register } ## Leak of GIO module through gnomevfs diff --git a/common/gstdoc-scangobj b/common/gstdoc-scangobj index 09039a5..4ad9786 100755 --- a/common/gstdoc-scangobj +++ b/common/gstdoc-scangobj @@ -150,7 +150,18 @@ print OUTPUT < #include -$includes +#include +EOT + +if ($includes) { + print OUTPUT $includes; +} else { + for (@types) { + print OUTPUT "extern GType $_ (void);\n"; + } +} + +print OUTPUT < @@ -453,11 +464,8 @@ static void output_args (void); static void output_object_args (FILE *fp, GType object_type); int -main (int argc, char *argv[]) +main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[]) { - /* Silence the compiler: */ - if (argv != argv) argc = argc; - $TYPE_INIT_FUNC; get_object_types (); diff --git a/common/m4/Makefile.am b/common/m4/Makefile.am index 856d6e3..3d387ee 100644 --- a/common/m4/Makefile.am +++ b/common/m4/Makefile.am @@ -9,7 +9,6 @@ EXTRA_DIST = \ as-libtool.m4 \ as-libtool-tags.m4 \ as-python.m4 \ - as-scrub-include.m4 \ as-version.m4 \ ax_create_stdint_h.m4 \ glib-gettext.m4 \ diff --git a/common/m4/Makefile.in b/common/m4/Makefile.in index f298f81..ec66c73 100644 --- a/common/m4/Makefile.in +++ b/common/m4/Makefile.in @@ -85,7 +85,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ @@ -413,7 +412,6 @@ EXTRA_DIST = \ as-libtool.m4 \ as-libtool-tags.m4 \ as-python.m4 \ - as-scrub-include.m4 \ as-version.m4 \ ax_create_stdint_h.m4 \ glib-gettext.m4 \ diff --git a/common/m4/as-scrub-include.m4 b/common/m4/as-scrub-include.m4 deleted file mode 100644 index 3ed49b0..0000000 --- a/common/m4/as-scrub-include.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl as-scrub-include.m4 0.0.4 - -dnl autostars m4 macro for scrubbing CFLAGS of system include dirs -dnl because gcc 3.x complains about including system including dirs - -dnl Thomas Vander Stichele - -dnl $Id: as-scrub-include.m4,v 1.7 2004/06/12 08:30:20 thomasvs Exp $ - -dnl This macro uses output of cpp -v and expects it to contain text that -dnl looks a little bit like this: -dnl #include <...> search starts here: -dnl /usr/local/include -dnl /usr/lib/gcc-lib/i386-redhat-linux/3.2/include -dnl /usr/include -dnl End of search list. - -dnl AS_SCRUB_INCLUDE(VAR) -dnl example -dnl AS_SCRUB_INCLUDE(CFLAGS) -dnl will remove all system include dirs from the given CFLAGS - -AC_DEFUN([AS_SCRUB_INCLUDE], -[ - GIVEN_CFLAGS=$[$1] - INCLUDE_DIRS=`echo | cpp -v 2>&1` - - dnl remove everything from this output between the "starts here" and "End of" - dnl line - INCLUDE_DIRS=`echo $INCLUDE_DIRS | sed -e 's/.*<...> search starts here://' | sed -e 's/End of search list.*//'` - for dir in $INCLUDE_DIRS; do - dnl use "" as the sed script so $dir gets expanded - GIVEN_CFLAGS=`echo $GIVEN_CFLAGS | sed -e "s#-I$dir ##"` - done - [$1]=$GIVEN_CFLAGS -]) diff --git a/common/m4/gst-error.m4 b/common/m4/gst-error.m4 index e12a04c..bce80d2 100644 --- a/common/m4/gst-error.m4 +++ b/common/m4/gst-error.m4 @@ -169,7 +169,7 @@ AC_DEFUN([AG_GST_SET_ERROR_CXXFLAGS], 'no%E_MACRO_REDEFINED' \ 'no%E_LOOP_NOT_ENTERED_AT_TOP' do - AS_CXX_COMPILER_FLAG([-errwarn=%all,$f], ERROR_CXXFLAGS="$ERROR_CXXFLAGS,$f") + AS_CXX_COMPILER_FLAG([-errwarn=%all,$f], [ERROR_CXXFLAGS="$ERROR_CXXFLAGS,$f"]) done fi fi @@ -254,7 +254,7 @@ AC_DEFUN([AG_GST_SET_ERROR_OBJCFLAGS], 'no%E_MACRO_REDEFINED' \ 'no%E_LOOP_NOT_ENTERED_AT_TOP' do - AS_OBJC_COMPILER_FLAG([-errwarn=%all,$f], ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS,$f") + AS_OBJC_COMPILER_FLAG([-errwarn=%all,$f], [ERROR_OBJCFLAGS="$ERROR_OBJCFLAGS,$f"]) done fi fi diff --git a/common/m4/gst-gettext.m4 b/common/m4/gst-gettext.m4 index a63651b..df817eb 100644 --- a/common/m4/gst-gettext.m4 +++ b/common/m4/gst-gettext.m4 @@ -14,6 +14,13 @@ AC_DEFUN([AG_GST_GETTEXT], AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [gettext package name]) + dnl make sure po/Makevars is kept in sync with GETTEXT_PACKAGE + if test -e "${srcdir}/po/Makevars"; then + if ! grep -e "$1" "${srcdir}/po/Makevars"; then + AC_MSG_ERROR([DOMAIN in po/Makevars does not match GETTEXT_PACKAGE $1]) + fi + fi + dnl define LOCALEDIR in config.h AS_AC_EXPAND(LOCALEDIR, $datadir/locale) AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR", diff --git a/common/m4/gst-glib2.m4 b/common/m4/gst-glib2.m4 index 3af5547..63f0f46 100644 --- a/common/m4/gst-glib2.m4 +++ b/common/m4/gst-glib2.m4 @@ -106,9 +106,6 @@ AC_DEFUN([AG_GST_GLIB_CHECK], fi AC_SUBST(GLIB_MKENUMS) - dnl for the poor souls who for example have glib in /usr/local - AS_SCRUB_INCLUDE(GLIB_CFLAGS) - AC_SUBST(GLIB_EXTRA_CFLAGS) dnl Now check for GIO diff --git a/common/m4/gst-parser.m4 b/common/m4/gst-parser.m4 index 710da89..b002047 100644 --- a/common/m4/gst-parser.m4 +++ b/common/m4/gst-parser.m4 @@ -8,10 +8,10 @@ AC_DEFUN([AG_GST_BISON_CHECK], fi dnl check bison version - dnl we need version >= 1.875 for the reentrancy support + dnl we need version >= 2.4 for the '<>' support dnl in the parser. dnl First lines observed: 'bison (GNU Bison) 2.3' or 'GNU Bison version 1.28' - bison_min_version=1.875 + bison_min_version=2.4 bison_version=`$BISON_PATH --version | head -n 1 | sed 's/^[[^0-9]]*//' | sed 's/[[^0-9]]*$//' | cut -d' ' -f1` AC_MSG_CHECKING([bison version $bison_version >= $bison_min_version]) diff --git a/compile b/compile index 531136b..b1f4749 100755 --- a/compile +++ b/compile @@ -1,9 +1,10 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2012-01-04.17; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free +# Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -78,53 +79,6 @@ func_file_conv () esac } -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - # func_cl_wrapper cl arg... # Adjust compile command to suit cl func_cl_wrapper () @@ -155,34 +109,43 @@ func_cl_wrapper () ;; esac ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; -I*) func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" + lib=${1#-l} + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + set x "$@" "$dir/$lib.dll.lib" + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + set x "$@" "$dir/$lib.lib" + break + fi + done + IFS=$save_IFS + + test "$found" != yes && set x "$@" "$lib.lib" shift ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; -L*) - func_cl_dashL "${1#-L}" + func_file_conv "${1#-L}" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" ;; -static) shared=false diff --git a/config.guess b/config.guess index b79252d..d622a44 100755 --- a/config.guess +++ b/config.guess @@ -1,12 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -20,17 +22,19 @@ timestamp='2013-06-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # -# Originally written by Per Bothner. +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -# -# Please send patches with a ChangeLog entry to config-patches@gnu.org. - me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +54,9 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,27 +138,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - ;; -esac - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -215,10 +200,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -321,7 +302,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) + arm:riscos:*:*|arm:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -820,9 +801,6 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -874,21 +852,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -901,54 +879,59 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo ${UNAME_MACHINE}-unknown-linux-gnueabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -967,63 +950,54 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-gnu exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1227,9 +1201,6 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1256,21 +1227,19 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1287,7 +1256,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-*:NONSTOP_KERNEL:*:*) + NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1361,6 +1330,9 @@ EOF exit ;; esac +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + eval $set_cc_for_build cat >$dummy.c <. @@ -20,12 +26,11 @@ timestamp='2013-08-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). +# the same distribution terms that you use for the rest of that program. -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . Submit a context +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +73,9 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -116,7 +123,7 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -149,7 +156,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; @@ -218,12 +225,6 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; -lynx*) os=-lynxos ;; @@ -252,12 +253,10 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | c8051 | clipper \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -268,7 +267,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -286,17 +285,16 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ + | nios | nios2 \ | ns16k | ns32k \ | open8 \ - | or1k | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -366,13 +364,13 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -385,8 +383,7 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -404,13 +401,12 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -786,15 +782,11 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze*) + microblaze) basic_machine=microblaze-xilinx ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; mingw32) - basic_machine=i686-pc + basic_machine=i386-pc os=-mingw32 ;; mingw32ce) @@ -830,7 +822,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i686-pc + basic_machine=i386-pc os=-msys ;; mvs) @@ -1021,11 +1013,7 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) + rdos) basic_machine=i386-pc os=-rdos ;; @@ -1352,21 +1340,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1498,6 +1486,9 @@ case $os in -aros*) os=-aros ;; + -kaos*) + os=-kaos + ;; -zvmoe) os=-zvmoe ;; @@ -1546,12 +1537,6 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; - c8051-*) - os=-elf - ;; - hexagon-*) - os=-elf - ;; tic54x-*) os=-coff ;; @@ -1592,9 +1577,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff --git a/configure b/configure index 75620d5..d839c53 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GStreamer Ugly Plug-ins 1.2.4. +# Generated by GNU Autoconf 2.69 for GStreamer Ugly Plug-ins 1.3.1. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GStreamer Ugly Plug-ins' PACKAGE_TARNAME='gst-plugins-ugly' -PACKAGE_VERSION='1.2.4' -PACKAGE_STRING='GStreamer Ugly Plug-ins 1.2.4' +PACKAGE_VERSION='1.3.1' +PACKAGE_STRING='GStreamer Ugly Plug-ins 1.3.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer' PACKAGE_URL='' @@ -1647,7 +1647,7 @@ if test "$ac_init_help" = "long"; then # 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. cat <<_ACEOF -\`configure' configures GStreamer Ugly Plug-ins 1.2.4 to adapt to many kinds of systems. +\`configure' configures GStreamer Ugly Plug-ins 1.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1719,7 +1719,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GStreamer Ugly Plug-ins 1.2.4:";; + short | recursive ) echo "Configuration of GStreamer Ugly Plug-ins 1.3.1:";; esac cat <<\_ACEOF @@ -1950,7 +1950,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GStreamer Ugly Plug-ins configure 1.2.4 +GStreamer Ugly Plug-ins configure 1.3.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2856,7 +2856,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GStreamer Ugly Plug-ins $as_me 1.2.4, which was +It was created by GStreamer Ugly Plug-ins $as_me 1.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3835,7 +3835,7 @@ fi # Define the identity of the package. PACKAGE='gst-plugins-ugly' - VERSION='1.2.4' + VERSION='1.3.1' cat >>confdefs.h <<_ACEOF @@ -4046,9 +4046,9 @@ fi - PACKAGE_VERSION_MAJOR=$(echo 1.2.4 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.2.4 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.2.4 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.3.1 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.3.1 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.3.1 | cut -d'.' -f3) @@ -4059,7 +4059,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.2.4 | cut -d'.' -f4) + NANO=$(echo 1.3.1 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -8708,10 +8708,10 @@ fi done - GST_CURRENT=204 + GST_CURRENT=301 GST_REVISION=0 - GST_AGE=204 - GST_LIBVERSION=204:0:204 + GST_AGE=301 + GST_LIBVERSION=301:0:301 @@ -13036,8 +13036,8 @@ CC="$lt_save_CC" -GST_REQ=1.2.0 -GSTPB_REQ=1.2.0 +GST_REQ=1.3.1 +GSTPB_REQ=1.3.1 @@ -15025,6 +15025,12 @@ cat >>confdefs.h <<_ACEOF _ACEOF + if test -e "${srcdir}/po/Makevars"; then + if ! grep -e "gst-plugins-ugly-$GST_API_VERSION" "${srcdir}/po/Makevars"; then + as_fn_error $? "DOMAIN in po/Makevars does not match GETTEXT_PACKAGE gst-plugins-ugly-$GST_API_VERSION" "$LINENO" 5 + fi + fi + EXP_VAR=LOCALEDIR FROM_VAR=$datadir/locale @@ -22802,17 +22808,6 @@ $as_echo "$as_me: WARNING: $GLIB_MKENUMS does not seem to work!" >&2;} - GIVEN_CFLAGS=$GLIB_CFLAGS - INCLUDE_DIRS=`echo | cpp -v 2>&1` - - INCLUDE_DIRS=`echo $INCLUDE_DIRS | sed -e 's/.*<...> search starts here://' | sed -e 's/End of search list.*//'` - for dir in $INCLUDE_DIRS; do - GIVEN_CFLAGS=`echo $GIVEN_CFLAGS | sed -e "s#-I$dir ##"` - done - GLIB_CFLAGS=$GIVEN_CFLAGS - - - pkg_failed=no @@ -24576,10 +24571,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$save_CPPFLAGS" if test "X$flag_ok" = Xyes ; then - ERROR_CXXFLAGS="$ERROR_CXXFLAGS + ERROR_CXXFLAGS="$ERROR_CXXFLAGS,$f" true else - $f" + true fi @@ -28114,7 +28109,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GStreamer Ugly Plug-ins $as_me 1.2.4, which was +This file was extended by GStreamer Ugly Plug-ins $as_me 1.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28180,7 +28175,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GStreamer Ugly Plug-ins config.status 1.2.4 +GStreamer Ugly Plug-ins config.status 1.3.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 6224973..d2c3826 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file dnl initialize autoconf dnl releases only do -Wall, cvs and prerelease does -Werror too dnl use a three digit version number for releases, and four for cvs/prerelease -AC_INIT([GStreamer Ugly Plug-ins],[1.2.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-ugly]) +AC_INIT([GStreamer Ugly Plug-ins],[1.3.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-ugly]) AG_GST_INIT @@ -42,11 +42,11 @@ AC_SUBST(GST_API_VERSION) AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION", [GStreamer API Version]) -AS_LIBTOOL(GST, 204, 0, 204) +AS_LIBTOOL(GST, 301, 0, 301) dnl *** required versions of GStreamer stuff *** -GST_REQ=1.2.0 -GSTPB_REQ=1.2.0 +GST_REQ=1.3.1 +GSTPB_REQ=1.3.1 dnl *** autotools stuff **** diff --git a/depcomp b/depcomp index 4ebd5b3..bd0ac08 100755 --- a/depcomp +++ b/depcomp @@ -1,9 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 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 @@ -27,9 +28,9 @@ scriptversion=2013-05-30.07; # UTC case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -39,8 +40,8 @@ as side-effects. 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. @@ -56,66 +57,6 @@ EOF ;; esac -# Get the directory component of the given path, and save it in the -# global variables '$dir'. Note that this directory component will -# be either empty or ending with a '/' character. This is deliberate. -set_dir_from () -{ - case $1 in - */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; - *) dir=;; - esac -} - -# Get the suffix-stripped basename of the given path, and save it the -# global variable '$base'. -set_base_from () -{ - base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` -} - -# If no dependency file was actually created by the compiler invocation, -# we still have to create a dummy depfile, to avoid errors with the -# Makefile "include basename.Plo" scheme. -make_dummy_depfile () -{ - echo "#dummy" > "$depfile" -} - -# Factor out some common post-processing of the generated depfile. -# Requires the auxiliary global variable '$tmpdepfile' to be set. -aix_post_process_depfile () -{ - # If the compiler actually managed to produce a dependency file, - # post-process it. - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependency.h'. - # Do two passes, one to just change these to - # $object: dependency.h - # and one to simply output - # dependency.h: - # which is needed to avoid the deleted-header problem. - { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" - sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" - } > "$depfile" - rm -f "$tmpdepfile" - else - make_dummy_depfile - fi -} - -# A tabulation character. -tab=' ' -# A newline character. -nl=' -' -# Character ranges might be problematic outside the C locale. -# These definitions help. -upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ -lower=abcdefghijklmnopqrstuvwxyz -digits=0123456789 -alpha=${upper}${lower} - 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 @@ -128,9 +69,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" -# Avoid interferences from the environment. -gccflag= dashmflag= - # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -142,32 +80,26 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 -fi - -if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi case "$depmode" in @@ -190,7 +122,8 @@ gcc3) done "$@" stat=$? - if test $stat -ne 0; then + if test $stat -eq 0; then : + else rm -f "$tmpdepfile" exit $stat fi @@ -198,17 +131,13 @@ gcc3) ;; gcc) -## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. -## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. -## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). Also, it might not be -## supported by the other compilers which use the 'gcc' depmode. +## -MM, not -M (despite what the docs say). ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -216,31 +145,33 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -ne 0; then + if test $stat -eq 0; then : + else rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - # The second -e expression handles DOS-style file names with drive - # letters. + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## 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. -## Some versions of gcc put a space before the ':'. On the theory + tr ' ' ' +' < "$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. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -258,7 +189,8 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -ne 0; then + if test $stat -eq 0; then : + else rm -f "$tmpdepfile" exit $stat fi @@ -266,41 +198,43 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" + # Clip off the initial element (the dependent). Don't try to be # 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 ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ - | tr "$nl" ' ' >> "$depfile" + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> "$depfile" echo >> "$depfile" + # The second pass generates a dummy entry for each header file. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - make_dummy_depfile + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" fi 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. - set_dir_from "$object" - set_base_from "$object" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -313,7 +247,9 @@ aix) "$@" -M fi stat=$? - if test $stat -ne 0; then + + if test $stat -eq 0; then : + else rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -322,100 +258,44 @@ aix) do test -f "$tmpdepfile" && break done - aix_post_process_depfile - ;; - -tcc) - # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 - # FIXME: That version still under development at the moment of writing. - # Make that this statement remains true also for stable, released - # versions. - # It will wrap lines (doesn't matter whether long or short) with a - # trailing '\', as in: - # - # foo.o : \ - # foo.c \ - # foo.h \ - # - # It will put a trailing '\' even on the last line, and will use leading - # spaces rather than leading tabs (at least since its commit 0394caf7 - # "Emit spaces for -MD"). - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat + if test -f "$tmpdepfile"; then + # 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:'. + 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" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" fi - rm -f "$depfile" - # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. - # We have to change lines of the first kind to '$object: \'. - sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" - # And for each line of the second kind, we have to emit a 'dep.h:' - # dummy dependency, to avoid the deleted-header problem. - sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -## The order of this option in the case statement is important, since the -## shell code in configure will try each of these formats in the order -## listed in this file. A plain '-MD' option would be understood by many -## compilers, so we must ensure this comes after the gcc and icc options. -pgcc) - # Portland's C compiler understands '-MD'. - # Will always output deps to 'file.d' where file is the root name of the - # source file under compilation, even if file resides in a subdirectory. - # The object file name does not affect the name of the '.d' file. - # pgcc 10.2 will output +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -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: + # 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 ... \ # ... - set_dir_from "$object" - # Use the source, not the object, to determine the base name, since - # that's sadly what pgcc will do too. - set_base_from "$source" - tmpdepfile=$base.d - - # For projects that build the same source file twice into different object - # files, the pgcc approach of using the *source* file root name can cause - # problems in parallel builds. Use a locking strategy to avoid stomping on - # the same $tmpdepfile. - lockdir=$base.d-lock - trap " - echo '$0: caught signal, cleaning up...' >&2 - rmdir '$lockdir' - exit 1 - " 1 2 13 15 - numtries=100 - i=$numtries - while test $i -gt 0; do - # mkdir is a portable test-and-set. - if mkdir "$lockdir" 2>/dev/null; then - # This process acquired the lock. - "$@" -MD - stat=$? - # Release the lock. - rmdir "$lockdir" - break - else - # If the lock is being held by a different process, wait - # until the winning process is done or we timeout. - while test -d "$lockdir" && test $i -gt 0; do - sleep 1 - i=`expr $i - 1` - done - fi - i=`expr $i - 1` - done - trap - 1 2 13 15 - if test $i -le 0; then - echo "$0: failed to acquire lock after $numtries attempts" >&2 - echo "$0: check lockdir '$lockdir'" >&2 - exit 1 - fi - if test $stat -ne 0; then + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else rm -f "$tmpdepfile" exit $stat fi @@ -427,8 +307,8 @@ pgcc) 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" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -439,8 +319,9 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - set_dir_from "$object" - set_base_from "$object" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -451,7 +332,8 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -ne 0; then + if test $stat -eq 0; then : + else rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -461,61 +343,77 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" - # Add 'dependent.h:' lines. + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - make_dummy_depfile + echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - set_dir_from "$object" - set_base_from "$object" - - if test "$libtool" = yes; then - # Libtool generates 2 separate objects for the 2 libraries. These - # two compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir$base.o.d # libtool 1.5 - tmpdepfile2=$dir.libs/$base.o.d # Likewise. - tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - # Same post-processing that is required for AIX mode. - aix_post_process_depfile - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a + # static library. This mechanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + 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" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; msvc7) if test "$libtool" = yes; then @@ -526,7 +424,8 @@ msvc7) "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test $stat -ne 0; then + if test "$stat" = 0; then : + else rm -f "$tmpdepfile" exit $stat fi @@ -544,15 +443,14 @@ msvc7) p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/'"$tab"'\1 \\/p +s/\(.*\)/ \1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/'"$tab"'/ + s/.*/ / G p }' >> "$depfile" - echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -580,7 +478,7 @@ dashmstdout) shift fi - # Remove '-o $object'. + # Remove `-o $object'. IFS=" " for arg do @@ -600,18 +498,18 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for ':' + # Require at least two characters before searching for `:' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. "$@" $dashmflag | - sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this sed invocation - # correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -664,12 +562,11 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process the last invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed '1,2d' "$tmpdepfile" \ - | tr ' ' "$nl" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -686,7 +583,7 @@ cpp) shift fi - # Remove '-o $object'. + # Remove `-o $object'. IFS=" " for arg do @@ -705,10 +602,10 @@ cpp) esac done - "$@" -E \ - | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - | sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -740,23 +637,23 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" - echo "$tab" >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/docs/Makefile.am b/docs/Makefile.am index 3d25158..8ff41fe 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,10 +1,14 @@ if ENABLE_GTK_DOC -GTK_DOC_DIRS = plugins +if ENABLE_PLUGIN_DOCS +PLUGIN_DOCS_DIRS = plugins else -GTK_DOC_DIRS = +PLUGIN_DOCS_DIRS = +endif +else +PLUGIN_DOCS_DIRS = plugins endif -SUBDIRS = $(GTK_DOC_DIRS) +SUBDIRS = $(PLUGIN_DOCS_DIRS) DIST_SUBDIRS = plugins EXTRA_DIST = \ @@ -12,4 +16,4 @@ EXTRA_DIST = \ version.entities.in upload: - make -C plugins upload + @if test "x$(SUBDIRS)" != x; then for a in $(SUBDIRS); do cd $$a; make upload; cd ..; done; fi diff --git a/docs/Makefile.in b/docs/Makefile.in index 881d089..cf1a27f 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -86,7 +86,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ @@ -462,9 +461,10 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@ENABLE_GTK_DOC_FALSE@GTK_DOC_DIRS = -@ENABLE_GTK_DOC_TRUE@GTK_DOC_DIRS = plugins -SUBDIRS = $(GTK_DOC_DIRS) +@ENABLE_GTK_DOC_FALSE@PLUGIN_DOCS_DIRS = plugins +@ENABLE_GTK_DOC_TRUE@@ENABLE_PLUGIN_DOCS_FALSE@PLUGIN_DOCS_DIRS = +@ENABLE_GTK_DOC_TRUE@@ENABLE_PLUGIN_DOCS_TRUE@PLUGIN_DOCS_DIRS = plugins +SUBDIRS = $(PLUGIN_DOCS_DIRS) DIST_SUBDIRS = plugins EXTRA_DIST = \ random/ChangeLog-0.8 \ @@ -784,7 +784,7 @@ uninstall-am: upload: - make -C plugins upload + @if test "x$(SUBDIRS)" != x; then for a in $(SUBDIRS); do cd $$a; make upload; cd ..; done; fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/docs/plugins/Makefile.in b/docs/plugins/Makefile.in index 1c4eb38..eba97d0 100644 --- a/docs/plugins/Makefile.in +++ b/docs/plugins/Makefile.in @@ -104,7 +104,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/docs/plugins/gst-plugins-ugly-plugins.args b/docs/plugins/gst-plugins-ugly-plugins.args index 65f70f5..b374286 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.args +++ b/docs/plugins/gst-plugins-ugly-plugins.args @@ -941,7 +941,7 @@ GstX264Enc::qp-max guint -[1,51] +<= 51 rw Maximum Quantizer Maximum quantizer. @@ -951,7 +951,7 @@ GstX264Enc::qp-min guint -[1,51] +<= 51 rw Minimum Quantizer Minimum quantizer. @@ -961,7 +961,7 @@ GstX264Enc::qp-step guint -[1,50] +<= 50 rw Maximum Quantizer Difference Maximum quantizer difference between frames. @@ -971,7 +971,7 @@ GstX264Enc::quantizer guint -[1,50] +<= 50 rw Constant Quantizer Constant quantizer or quality to apply. diff --git a/docs/plugins/gst-plugins-ugly-plugins.hierarchy b/docs/plugins/gst-plugins-ugly-plugins.hierarchy index 204b80c..01fb0bf 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.hierarchy +++ b/docs/plugins/gst-plugins-ugly-plugins.hierarchy @@ -47,6 +47,7 @@ GObject GstPadTemplate GstPlugin GstPluginFeature + GstDeviceMonitorFactory GstElementFactory GstTypeFindFactory GstRegistry diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-1.0.devhelp2 b/docs/plugins/html/gst-plugins-ugly-plugins-1.0.devhelp2 index d0f2e12..24e8f6c 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-1.0.devhelp2 +++ b/docs/plugins/html/gst-plugins-ugly-plugins-1.0.devhelp2 @@ -75,14 +75,14 @@ - - + + - - + + @@ -91,11 +91,11 @@ - - + + - - + + diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html index 43e3bae..104482f 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html index 6be8ddd..ef07baf 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html index f61792c..3c6f51d 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html index 6dee717..2bf5541 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html index 5f70b0c..a964123 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html index 6a48219..369d971 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html index 9855ad2..f8c3772 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html index 138b40a..3b3b0cb 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html index 64dc99f..34485ee 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mad.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mad.html index 739fa01..671d393 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mad.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mad.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html index 2d8b9a0..c267348 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html index 9ef1af9..2cc8ded 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html index 37be3b4..c0df3e4 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html index 4afeac1..b8fa1cf 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html @@ -42,7 +42,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html index 738b0bd..5960161 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html @@ -41,7 +41,7 @@

version

-1.2.4 +1.3.1

run-time license

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-rademux.html b/docs/plugins/html/gst-plugins-ugly-plugins-rademux.html index c4a7099..e845f6b 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-rademux.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-rademux.html @@ -84,11 +84,10 @@ the ALSA element. The .ra file is assumed to contain RealAudio version 2. Stream RealAudio data containing AC3 (dnet) compressed audio and decode it and output it to the soundcard using the ALSA element. -

Last reviewed on 2006-10-24 (0.10.5)

Synopsis

-

Element Information

+

Element Information

@@ -114,7 +113,7 @@ and output it to the soundcard using the ALSA element.
-

Element Pads

+

Element Pads

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-rdtmanager.html b/docs/plugins/html/gst-plugins-ugly-plugins-rdtmanager.html index d860271..9c23d3c 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-rdtmanager.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-rdtmanager.html @@ -117,11 +117,10 @@

Description

A simple RTP session manager used internally by rtspsrc.

-

Last reviewed on 2006-06-20 (0.10.4)

Synopsis

-

Element Information

+

Element Information

@@ -147,7 +146,7 @@
-

Element Pads

+

Element Pads

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-rtspreal.html b/docs/plugins/html/gst-plugins-ugly-plugins-rtspreal.html index 273f2c6..5c7c636 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-rtspreal.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-rtspreal.html @@ -64,11 +64,10 @@ GstRTSPReal implements

Description

A RealMedia RTSP extension

-

Last reviewed on 2007-07-25 (0.10.14)

Synopsis

-

Element Information

+

Element Information

@@ -94,7 +93,7 @@ GstRTSPReal implements
-

Element Pads

+

Element Pads

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-rtspwms.html b/docs/plugins/html/gst-plugins-ugly-plugins-rtspwms.html index 4e54481..f36825d 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-rtspwms.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-rtspwms.html @@ -64,11 +64,10 @@ GstRTSPWMS implements

Description

A WMS RTSP extension

-

Last reviewed on 2007-07-25 (0.10.14)

Synopsis

-

Element Information

+

Element Information

@@ -94,7 +93,7 @@ GstRTSPWMS implements
-

Element Pads

+

Element Pads

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-x264enc.html b/docs/plugins/html/gst-plugins-ugly-plugins-x264enc.html index d12e3ac..39e7e0b 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-x264enc.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-x264enc.html @@ -518,7 +518,7 @@ GstX264Enc implements 

  “qp-max”                   guint

Maximum quantizer.

Flags: Read / Write

-

Allowed values: [1,51]

+

Allowed values: <= 51

Default value: 51

@@ -527,7 +527,7 @@ GstX264Enc implements 
  “qp-min”                   guint

Minimum quantizer.

Flags: Read / Write

-

Allowed values: [1,51]

+

Allowed values: <= 51

Default value: 10

@@ -536,7 +536,7 @@ GstX264Enc implements 
  “qp-step”                  guint

Maximum quantizer difference between frames.

Flags: Read / Write

-

Allowed values: [1,50]

+

Allowed values: <= 50

Default value: 4

@@ -545,7 +545,7 @@ GstX264Enc implements 
  “quantizer”                guint

Constant quantizer or quality to apply.

Flags: Read / Write

-

Allowed values: [1,50]

+

Allowed values: <= 50

Default value: 21

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-xingmux.html b/docs/plugins/html/gst-plugins-ugly-plugins-xingmux.html index 38edd6d..d7216cb 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-xingmux.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-xingmux.html @@ -100,7 +100,7 @@ gst-launch filesrc locationclass

- +
Formatter/MetadataFormatter/Muxer/Metadata
diff --git a/docs/plugins/html/index.html b/docs/plugins/html/index.html index 9fcc015..f92ec17 100644 --- a/docs/plugins/html/index.html +++ b/docs/plugins/html/index.html @@ -15,7 +15,7 @@

- for GStreamer Ugly Plugins 1.0 (1.2.4) + for GStreamer Ugly Plugins 1.0 (1.3.1) The latest version of this documentation can be found on-line at http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-ugly/html/.

diff --git a/docs/plugins/inspect/plugin-a52dec.xml b/docs/plugins/inspect/plugin-a52dec.xml index d96f68d..7842042 100644 --- a/docs/plugins/inspect/plugin-a52dec.xml +++ b/docs/plugins/inspect/plugin-a52dec.xml @@ -3,7 +3,7 @@ Decodes ATSC A/52 encoded audio streams ../../ext/a52dec/.libs/libgsta52dec.so libgsta52dec.so - 1.2.4 + 1.3.1 GPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-amrnb.xml b/docs/plugins/inspect/plugin-amrnb.xml index 7a8df1e..e5a18b6 100644 --- a/docs/plugins/inspect/plugin-amrnb.xml +++ b/docs/plugins/inspect/plugin-amrnb.xml @@ -3,7 +3,7 @@ Adaptive Multi-Rate Narrow-Band ../../ext/amrnb/.libs/libgstamrnb.so libgstamrnb.so - 1.2.4 + 1.3.1 unknown gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-amrwbdec.xml b/docs/plugins/inspect/plugin-amrwbdec.xml index 0870712..315e41a 100644 --- a/docs/plugins/inspect/plugin-amrwbdec.xml +++ b/docs/plugins/inspect/plugin-amrwbdec.xml @@ -3,7 +3,7 @@ Adaptive Multi-Rate Wide-Band Decoder ../../ext/amrwbdec/.libs/libgstamrwbdec.so libgstamrwbdec.so - 1.2.4 + 1.3.1 unknown gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-asf.xml b/docs/plugins/inspect/plugin-asf.xml index ce781fb..19e3c46 100644 --- a/docs/plugins/inspect/plugin-asf.xml +++ b/docs/plugins/inspect/plugin-asf.xml @@ -3,7 +3,7 @@ Demuxes and muxes audio and video in Microsofts ASF format ../../gst/asfdemux/.libs/libgstasf.so libgstasf.so - 1.2.4 + 1.3.1 LGPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-cdio.xml b/docs/plugins/inspect/plugin-cdio.xml index 0b4dc83..24ec953 100644 --- a/docs/plugins/inspect/plugin-cdio.xml +++ b/docs/plugins/inspect/plugin-cdio.xml @@ -3,7 +3,7 @@ Read audio from audio CDs ../../ext/cdio/.libs/libgstcdio.so libgstcdio.so - 1.2.4 + 1.3.1 GPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-dvdlpcmdec.xml b/docs/plugins/inspect/plugin-dvdlpcmdec.xml index c37ca4d..f7c9f9a 100644 --- a/docs/plugins/inspect/plugin-dvdlpcmdec.xml +++ b/docs/plugins/inspect/plugin-dvdlpcmdec.xml @@ -3,7 +3,7 @@ Decode DVD LPCM frames into standard PCM ../../gst/dvdlpcmdec/.libs/libgstdvdlpcmdec.so libgstdvdlpcmdec.so - 1.2.4 + 1.3.1 LGPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-dvdread.xml b/docs/plugins/inspect/plugin-dvdread.xml index 4a8acbe..026005a 100644 --- a/docs/plugins/inspect/plugin-dvdread.xml +++ b/docs/plugins/inspect/plugin-dvdread.xml @@ -3,7 +3,7 @@ Access a DVD with dvdread ../../ext/dvdread/.libs/libgstdvdread.so libgstdvdread.so - 1.2.4 + 1.3.1 GPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-dvdsub.xml b/docs/plugins/inspect/plugin-dvdsub.xml index 42ace34..2470127 100644 --- a/docs/plugins/inspect/plugin-dvdsub.xml +++ b/docs/plugins/inspect/plugin-dvdsub.xml @@ -3,7 +3,7 @@ DVD subtitle parser and decoder ../../gst/dvdsub/.libs/libgstdvdsub.so libgstdvdsub.so - 1.2.4 + 1.3.1 LGPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-lame.xml b/docs/plugins/inspect/plugin-lame.xml index 47a4dfa..5bf10ae 100644 --- a/docs/plugins/inspect/plugin-lame.xml +++ b/docs/plugins/inspect/plugin-lame.xml @@ -3,7 +3,7 @@ Encode MP3s with LAME ../../ext/lame/.libs/libgstlame.so libgstlame.so - 1.2.4 + 1.3.1 LGPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-mad.xml b/docs/plugins/inspect/plugin-mad.xml index 47651af..a685177 100644 --- a/docs/plugins/inspect/plugin-mad.xml +++ b/docs/plugins/inspect/plugin-mad.xml @@ -3,7 +3,7 @@ mp3 decoding based on the mad library ../../ext/mad/.libs/libgstmad.so libgstmad.so - 1.2.4 + 1.3.1 GPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-mpeg2dec.xml b/docs/plugins/inspect/plugin-mpeg2dec.xml index a9a77f8..b380bb8 100644 --- a/docs/plugins/inspect/plugin-mpeg2dec.xml +++ b/docs/plugins/inspect/plugin-mpeg2dec.xml @@ -3,7 +3,7 @@ LibMpeg2 decoder ../../ext/mpeg2dec/.libs/libgstmpeg2dec.so libgstmpeg2dec.so - 1.2.4 + 1.3.1 GPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-realmedia.xml b/docs/plugins/inspect/plugin-realmedia.xml index 7ff83cb..2b6ad20 100644 --- a/docs/plugins/inspect/plugin-realmedia.xml +++ b/docs/plugins/inspect/plugin-realmedia.xml @@ -3,7 +3,7 @@ RealMedia support plugins ../../gst/realmedia/.libs/libgstrmdemux.so libgstrmdemux.so - 1.2.4 + 1.3.1 LGPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-siddec.xml b/docs/plugins/inspect/plugin-siddec.xml index 94545b3..090dfd6 100644 --- a/docs/plugins/inspect/plugin-siddec.xml +++ b/docs/plugins/inspect/plugin-siddec.xml @@ -3,7 +3,7 @@ Uses libsidplay to decode .sid files ../../ext/sidplay/.libs/libgstsid.so libgstsid.so - 1.2.4 + 1.3.1 GPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-twolame.xml b/docs/plugins/inspect/plugin-twolame.xml index 7a31ddd..679c5d1 100644 --- a/docs/plugins/inspect/plugin-twolame.xml +++ b/docs/plugins/inspect/plugin-twolame.xml @@ -3,7 +3,7 @@ Encode MP2s with TwoLAME ../../ext/twolame/.libs/libgsttwolame.so libgsttwolame.so - 1.2.4 + 1.3.1 LGPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-x264.xml b/docs/plugins/inspect/plugin-x264.xml index 1ab6f08..c6a0fe6 100644 --- a/docs/plugins/inspect/plugin-x264.xml +++ b/docs/plugins/inspect/plugin-x264.xml @@ -3,7 +3,7 @@ libx264-based H264 plugins ../../ext/x264/.libs/libgstx264.so libgstx264.so - 1.2.4 + 1.3.1 GPL gst-plugins-ugly GStreamer Ugly Plug-ins source release diff --git a/docs/plugins/inspect/plugin-xingmux.xml b/docs/plugins/inspect/plugin-xingmux.xml index a20707b..526b2d5 100644 --- a/docs/plugins/inspect/plugin-xingmux.xml +++ b/docs/plugins/inspect/plugin-xingmux.xml @@ -3,7 +3,7 @@ Add XING tags to mpeg audio files ../../gst/xingmux/.libs/libgstxingmux.so libgstxingmux.so - 1.2.4 + 1.3.1 LGPL gst-plugins-ugly GStreamer Ugly Plug-ins source release @@ -12,7 +12,7 @@ xingmux MP3 Xing muxer - Formatter/Metadata + Formatter/Muxer/Metadata Adds a Xing header to the beginning of a VBR MP3 file Christophe Fergeau <teuf@gnome.org> diff --git a/ext/Makefile.in b/ext/Makefile.in index b7ef673..bfd50ab 100644 --- a/ext/Makefile.in +++ b/ext/Makefile.in @@ -91,7 +91,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/a52dec/Makefile.in b/ext/a52dec/Makefile.in index 4254ce2..e138915 100644 --- a/ext/a52dec/Makefile.in +++ b/ext/a52dec/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/amrnb/Makefile.in b/ext/amrnb/Makefile.in index 586968e..b807d3f 100644 --- a/ext/amrnb/Makefile.in +++ b/ext/amrnb/Makefile.in @@ -89,7 +89,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/amrnb/amrnbdec.c b/ext/amrnb/amrnbdec.c index f82b8cc..2388a95 100644 --- a/ext/amrnb/amrnbdec.c +++ b/ext/amrnb/amrnbdec.c @@ -143,6 +143,7 @@ gst_amrnbdec_class_init (GstAmrnbDecClass * klass) static void gst_amrnbdec_init (GstAmrnbDec * amrnbdec) { + gst_audio_decoder_set_needs_format (GST_AUDIO_DECODER (amrnbdec), TRUE); } static gboolean @@ -289,9 +290,6 @@ gst_amrnbdec_handle_frame (GstAudioDecoder * dec, GstBuffer * buffer) if (!buffer || !gst_buffer_get_size (buffer)) return GST_FLOW_OK; - if (amrnbdec->rate == 0 || amrnbdec->channels == 0) - goto not_negotiated; - gst_buffer_map (buffer, &inmap, GST_MAP_READ); /* get output */ @@ -305,12 +303,4 @@ gst_amrnbdec_handle_frame (GstAudioDecoder * dec, GstBuffer * buffer) gst_buffer_unmap (buffer, &inmap); return gst_audio_decoder_finish_frame (dec, out, 1); - - /* ERRORS */ -not_negotiated: - { - GST_ELEMENT_ERROR (amrnbdec, STREAM, TYPE_NOT_FOUND, (NULL), - ("Decoder is not initialized")); - return GST_FLOW_NOT_NEGOTIATED; - } } diff --git a/ext/amrwbdec/Makefile.in b/ext/amrwbdec/Makefile.in index d2739cd..01e36a4 100644 --- a/ext/amrwbdec/Makefile.in +++ b/ext/amrwbdec/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/amrwbdec/amrwbdec.c b/ext/amrwbdec/amrwbdec.c index 4bbed56..b6e5f98 100644 --- a/ext/amrwbdec/amrwbdec.c +++ b/ext/amrwbdec/amrwbdec.c @@ -106,6 +106,7 @@ gst_amrwbdec_class_init (GstAmrwbDecClass * klass) static void gst_amrwbdec_init (GstAmrwbDec * amrwbdec) { + gst_audio_decoder_set_needs_format (GST_AUDIO_DECODER (amrwbdec), TRUE); } static gboolean @@ -212,9 +213,6 @@ gst_amrwbdec_handle_frame (GstAudioDecoder * dec, GstBuffer * buffer) if (!buffer || !gst_buffer_get_size (buffer)) return GST_FLOW_OK; - if (amrwbdec->rate == 0 || amrwbdec->channels == 0) - goto not_negotiated; - /* the library seems to write into the source data, hence the copy. */ /* should be no problem */ gst_buffer_map (buffer, &inmap, GST_MAP_READ); @@ -232,12 +230,4 @@ gst_amrwbdec_handle_frame (GstAudioDecoder * dec, GstBuffer * buffer) /* send out */ return gst_audio_decoder_finish_frame (dec, out, 1); - - /* ERRORS */ -not_negotiated: - { - GST_ELEMENT_ERROR (amrwbdec, STREAM, TYPE_NOT_FOUND, (NULL), - ("Decoder is not initialized")); - return GST_FLOW_NOT_NEGOTIATED; - } } diff --git a/ext/cdio/Makefile.in b/ext/cdio/Makefile.in index e11af62..df4d69f 100644 --- a/ext/cdio/Makefile.in +++ b/ext/cdio/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/dvdread/Makefile.in b/ext/dvdread/Makefile.in index d6986c5..6f6b51b 100644 --- a/ext/dvdread/Makefile.in +++ b/ext/dvdread/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c index 74ee856..e928559 100644 --- a/ext/dvdread/dvdreadsrc.c +++ b/ext/dvdread/dvdreadsrc.c @@ -590,7 +590,7 @@ gst_dvd_read_src_goto_title (GstDvdReadSrc * src, gint title, gint angle) for (j = 0; j < src->vts_tmapt->tmap[i].nr_of_entries; j++) { guint64 time; - time = src->vts_tmapt->tmap[i].tmu * (j + 1) * GST_SECOND; + time = (guint64) src->vts_tmapt->tmap[i].tmu * (j + 1) * GST_SECOND; GST_LOG_OBJECT (src, "Time: %" GST_TIME_FORMAT " VOBU " "Sector: 0x%08x %s", GST_TIME_ARGS (time), src->vts_tmapt->tmap[i].map_ent[j] & 0x7fffffff, @@ -695,7 +695,7 @@ gst_dvd_read_src_get_time_for_sector (GstDvdReadSrc * src, guint sector) for (i = 0; i < src->vts_tmapt->nr_of_tmaps; ++i) { for (j = 0; j < src->vts_tmapt->tmap[i].nr_of_entries; ++j) { if ((src->vts_tmapt->tmap[i].map_ent[j] & 0x7fffffff) == sector) - return src->vts_tmapt->tmap[i].tmu * (j + 1) * GST_SECOND; + return (guint64) src->vts_tmapt->tmap[i].tmu * (j + 1) * GST_SECOND; } } @@ -718,7 +718,8 @@ gst_dvd_read_src_get_sector_from_time (GstDvdReadSrc * src, GstClockTime ts) for (j = 0; j < src->vts_tmapt->tmap[src->ttn - 1].nr_of_entries; ++j) { GstClockTime entry_time; - entry_time = src->vts_tmapt->tmap[src->ttn - 1].tmu * (j + 1) * GST_SECOND; + entry_time = + (guint64) src->vts_tmapt->tmap[src->ttn - 1].tmu * (j + 1) * GST_SECOND; if (entry_time <= ts) { sector = src->vts_tmapt->tmap[src->ttn - 1].map_ent[j] & 0x7fffffff; } diff --git a/ext/lame/Makefile.in b/ext/lame/Makefile.in index 739cc42..6689dc6 100644 --- a/ext/lame/Makefile.in +++ b/ext/lame/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/mad/Makefile.in b/ext/mad/Makefile.in index 6077b93..b26a23a 100644 --- a/ext/mad/Makefile.in +++ b/ext/mad/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/mpeg2dec/Makefile.in b/ext/mpeg2dec/Makefile.in index 5d6e006..99bafd9 100644 --- a/ext/mpeg2dec/Makefile.in +++ b/ext/mpeg2dec/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c index 55ed144..b50b475 100644 --- a/ext/mpeg2dec/gstmpeg2dec.c +++ b/ext/mpeg2dec/gstmpeg2dec.c @@ -134,6 +134,7 @@ static void gst_mpeg2dec_init (GstMpeg2dec * mpeg2dec) { gst_video_decoder_set_packetized (GST_VIDEO_DECODER (mpeg2dec), TRUE); + gst_video_decoder_set_needs_format (GST_VIDEO_DECODER (mpeg2dec), TRUE); /* initialize the mpeg2dec acceleration */ } diff --git a/ext/sidplay/Makefile.in b/ext/sidplay/Makefile.in index d17dd38..dab6356 100644 --- a/ext/sidplay/Makefile.in +++ b/ext/sidplay/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc index 2f4fabd..a7cac36 100644 --- a/ext/sidplay/gstsiddec.cc +++ b/ext/sidplay/gstsiddec.cc @@ -36,8 +36,6 @@ * gst-launch -v filesrc location=Hawkeye.sid ! siddec ! audioconvert ! alsasink * ]| Decode a sid file and play back the audio using alsasink. * - * - * Last reviewed on 2006-12-30 (0.10.5) */ #ifdef HAVE_CONFIG_H diff --git a/ext/twolame/Makefile.in b/ext/twolame/Makefile.in index 9a12a82..3017506 100644 --- a/ext/twolame/Makefile.in +++ b/ext/twolame/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/x264/Makefile.in b/ext/x264/Makefile.in index 1fc1a06..b614506 100644 --- a/ext/x264/Makefile.in +++ b/ext/x264/Makefile.in @@ -89,7 +89,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 7a2ea49..61e7698 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -213,7 +213,7 @@ gst_x264_enc_pass_get_type (void) static const GEnumValue pass_types[] = { {GST_X264_ENC_PASS_CBR, "Constant Bitrate Encoding", "cbr"}, - {GST_X264_ENC_PASS_QUANT, "Constant Quantizer (debugging only)", "quant"}, + {GST_X264_ENC_PASS_QUANT, "Constant Quantizer", "quant"}, {GST_X264_ENC_PASS_QUAL, "Constant Quality", "qual"}, {GST_X264_ENC_PASS_PASS1, "VBR Encoding - Pass 1", "pass1"}, {GST_X264_ENC_PASS_PASS2, "VBR Encoding - Pass 2", "pass2"}, @@ -720,7 +720,7 @@ gst_x264_enc_class_init (GstX264EncClass * klass) g_object_class_install_property (gobject_class, ARG_QUANTIZER, g_param_spec_uint ("quantizer", "Constant Quantizer", "Constant quantizer or quality to apply", - 1, 50, ARG_QUANTIZER_DEFAULT, + 0, 50, ARG_QUANTIZER_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, ARG_BITRATE, g_param_spec_uint ("bitrate", "Bitrate", "Bitrate in kbit/sec", 1, @@ -880,18 +880,18 @@ gst_x264_enc_class_init (GstX264EncClass * klass) g_string_append_printf (x264enc_defaults, ":cabac=%d", ARG_CABAC_DEFAULT); g_object_class_install_property (gobject_class, ARG_QP_MIN, g_param_spec_uint ("qp-min", "Minimum Quantizer", - "Minimum quantizer", 1, 51, ARG_QP_MIN_DEFAULT, + "Minimum quantizer", 0, 51, ARG_QP_MIN_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":qpmin=%d", ARG_QP_MIN_DEFAULT); g_object_class_install_property (gobject_class, ARG_QP_MAX, g_param_spec_uint ("qp-max", "Maximum Quantizer", - "Maximum quantizer", 1, 51, ARG_QP_MAX_DEFAULT, + "Maximum quantizer", 0, 51, ARG_QP_MAX_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":qpmax=%d", ARG_QP_MAX_DEFAULT); g_object_class_install_property (gobject_class, ARG_QP_STEP, g_param_spec_uint ("qp-step", "Maximum Quantizer Difference", "Maximum quantizer difference between frames", - 1, 50, ARG_QP_STEP_DEFAULT, + 0, 50, ARG_QP_STEP_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_string_append_printf (x264enc_defaults, ":qpstep=%d", ARG_QP_STEP_DEFAULT); g_object_class_install_property (gobject_class, ARG_IP_FACTOR, diff --git a/gst-libs/Makefile.in b/gst-libs/Makefile.in index a1f25d3..d92138a 100644 --- a/gst-libs/Makefile.in +++ b/gst-libs/Makefile.in @@ -85,7 +85,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst-libs/gst/Makefile.in b/gst-libs/gst/Makefile.in index a89bdbb..cd4672f 100644 --- a/gst-libs/gst/Makefile.in +++ b/gst-libs/gst/Makefile.in @@ -87,7 +87,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst-plugins-ugly.doap b/gst-plugins-ugly.doap index 544d673..2b4a33b 100644 --- a/gst-plugins-ugly.doap +++ b/gst-plugins-ugly.doap @@ -35,41 +35,11 @@ might be widely known to present patent problems. - 1.2.4 - 1.2 - - 2014-04-18 - - - - - - - 1.2.3 - 1.2 - - 2014-02-08 - - - - - - - 1.2.2 - 1.2 - - 2013-12-26 - - - - - - - 1.2.1 - 1.2 + 1.3.1 + 1.3 - 2013-11-09 - + 2014-05-03 + diff --git a/gst-plugins-ugly.spec b/gst-plugins-ugly.spec index 2ce354c..96729a4 100644 --- a/gst-plugins-ugly.spec +++ b/gst-plugins-ugly.spec @@ -4,7 +4,7 @@ %define gst_minver 0.11.0 Name: %{gstreamer}-plugins-ugly -Version: 1.2.4 +Version: 1.3.1 Release: 1.gst Summary: GStreamer streaming media framework "ugly" plug-ins diff --git a/gst/Makefile.in b/gst/Makefile.in index 0dbfc8c..6cd649a 100644 --- a/gst/Makefile.in +++ b/gst/Makefile.in @@ -91,7 +91,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/asfdemux/Makefile.in b/gst/asfdemux/Makefile.in index 2bd02e7..b64afd9 100644 --- a/gst/asfdemux/Makefile.in +++ b/gst/asfdemux/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 72f4274..07a6a71 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -155,16 +155,16 @@ gst_asf_demux_free_stream (GstASFDemux * demux, AsfStream * stream) stream->pad = NULL; } - while (stream->payloads->len > 0) { - AsfPayload *payload; - guint last; - - last = stream->payloads->len - 1; - payload = &g_array_index (stream->payloads, AsfPayload, last); - gst_buffer_replace (&payload->buf, NULL); - g_array_remove_index (stream->payloads, last); - } if (stream->payloads) { + while (stream->payloads->len > 0) { + AsfPayload *payload; + guint last; + + last = stream->payloads->len - 1; + payload = &g_array_index (stream->payloads, AsfPayload, last); + gst_buffer_replace (&payload->buf, NULL); + g_array_remove_index (stream->payloads, last); + } g_array_free (stream->payloads, TRUE); stream->payloads = NULL; } @@ -2197,32 +2197,6 @@ gst_asf_demux_get_uint64 (guint8 ** p_data, guint64 * p_size) return ret; } -static inline guint32 -gst_asf_demux_get_var_length (guint8 type, guint8 ** p_data, guint64 * p_size) -{ - switch (type) { - case 0: - return 0; - - case 1: - g_assert (*p_size >= 1); - return gst_asf_demux_get_uint8 (p_data, p_size); - - case 2: - g_assert (*p_size >= 2); - return gst_asf_demux_get_uint16 (p_data, p_size); - - case 3: - g_assert (*p_size >= 4); - return gst_asf_demux_get_uint32 (p_data, p_size); - - default: - g_assert_not_reached (); - break; - } - return 0; -} - static gboolean gst_asf_demux_get_buffer (GstBuffer ** p_buf, guint num_bytes_to_read, guint8 ** p_data, guint64 * p_size) @@ -2487,6 +2461,7 @@ gst_asf_demux_add_video_stream (GstASFDemux * demux, guint8 ** p_data, guint64 * p_size) { GstTagList *tags = NULL; + GstStructure *caps_s; GstBuffer *extradata = NULL; GstPad *src_pad; GstCaps *caps; @@ -2544,10 +2519,14 @@ gst_asf_demux_add_video_stream (GstASFDemux * demux, gst_structure_remove_field (s, "framerate"); } - /* add fourcc format to caps, some proprietary decoders seem to need it */ - str = g_strdup_printf ("%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (video->tag)); - gst_caps_set_simple (caps, "format", G_TYPE_STRING, str, NULL); - g_free (str); + caps_s = gst_caps_get_structure (caps, 0); + + /* add format field with fourcc to WMV/VC1 caps to differentiate variants */ + if (gst_structure_has_name (caps_s, "video/x-wmv")) { + str = g_strdup_printf ("%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (video->tag)); + gst_caps_set_simple (caps, "format", G_TYPE_STRING, str, NULL); + g_free (str); + } if (codec_name) { tags = gst_tag_list_new (GST_TAG_VIDEO_CODEC, codec_name, NULL); diff --git a/gst/asfdemux/gstrtspwms.c b/gst/asfdemux/gstrtspwms.c index bdcffab..c864287 100644 --- a/gst/asfdemux/gstrtspwms.c +++ b/gst/asfdemux/gstrtspwms.c @@ -22,8 +22,6 @@ * SECTION:element-rtspwms * * A WMS RTSP extension - * - * Last reviewed on 2007-07-25 (0.10.14) */ #include diff --git a/gst/dvdlpcmdec/Makefile.in b/gst/dvdlpcmdec/Makefile.in index 2b785a0..d20e1fd 100644 --- a/gst/dvdlpcmdec/Makefile.in +++ b/gst/dvdlpcmdec/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/dvdsub/Makefile.in b/gst/dvdsub/Makefile.in index 354f3db..9fd3f77 100644 --- a/gst/dvdsub/Makefile.in +++ b/gst/dvdsub/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c index 2cfff7f..2589ee6 100644 --- a/gst/dvdsub/gstdvdsubdec.c +++ b/gst/dvdsub/gstdvdsubdec.c @@ -367,6 +367,7 @@ gst_dvd_sub_dec_parse_subpic (GstDvdSubDec * dec) gst_guint64_to_gdouble (GST_SECOND)); return; } + break; } else { dec->parse_pos = NULL; dec->next_event_ts = GST_CLOCK_TIME_NONE; diff --git a/gst/realmedia/Makefile.in b/gst/realmedia/Makefile.in index 235013f..5909e4a 100644 --- a/gst/realmedia/Makefile.in +++ b/gst/realmedia/Makefile.in @@ -90,7 +90,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/realmedia/rademux.c b/gst/realmedia/rademux.c index dfa85eb..155192f 100644 --- a/gst/realmedia/rademux.c +++ b/gst/realmedia/rademux.c @@ -33,8 +33,6 @@ * ]| Stream RealAudio data containing AC3 (dnet) compressed audio and decode it * and output it to the soundcard using the ALSA element. * - * - * Last reviewed on 2006-10-24 (0.10.5) */ #ifdef HAVE_CONFIG_H diff --git a/gst/realmedia/rdtmanager.c b/gst/realmedia/rdtmanager.c index a2d1b70..39c74b2 100644 --- a/gst/realmedia/rdtmanager.c +++ b/gst/realmedia/rdtmanager.c @@ -47,8 +47,6 @@ * @see_also: GstRtspSrc * * A simple RTP session manager used internally by rtspsrc. - * - * Last reviewed on 2006-06-20 (0.10.4) */ /* #define HAVE_RTCP */ diff --git a/gst/realmedia/rtspreal.c b/gst/realmedia/rtspreal.c index c4363b8..3a7bbc7 100644 --- a/gst/realmedia/rtspreal.c +++ b/gst/realmedia/rtspreal.c @@ -22,8 +22,6 @@ * SECTION:element-rtspreal * * A RealMedia RTSP extension - * - * Last reviewed on 2007-07-25 (0.10.14) */ #ifdef HAVE_CONFIG_H diff --git a/gst/xingmux/Makefile.in b/gst/xingmux/Makefile.in index c8be046..52d03f6 100644 --- a/gst/xingmux/Makefile.in +++ b/gst/xingmux/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/xingmux/gstxingmux.c b/gst/xingmux/gstxingmux.c index dacd1ec..fd09ac0 100644 --- a/gst/xingmux/gstxingmux.c +++ b/gst/xingmux/gstxingmux.c @@ -418,7 +418,7 @@ gst_xing_mux_class_init (GstXingMuxClass * klass) GST_DEBUG_CATEGORY_INIT (xing_mux_debug, "xingmux", 0, "Xing Header Muxer"); gst_element_class_set_static_metadata (gstelement_class, "MP3 Xing muxer", - "Formatter/Metadata", + "Formatter/Muxer/Metadata", "Adds a Xing header to the beginning of a VBR MP3 file", "Christophe Fergeau "); } diff --git a/gst/xingmux/plugin.c b/gst/xingmux/plugin.c index 7cfaf58..470a24e 100644 --- a/gst/xingmux/plugin.c +++ b/gst/xingmux/plugin.c @@ -27,7 +27,7 @@ static gboolean plugin_init (GstPlugin * plugin) { - if (!gst_element_register (plugin, "xingmux", GST_RANK_NONE, + if (!gst_element_register (plugin, "xingmux", GST_RANK_MARGINAL, GST_TYPE_XING_MUX)) return FALSE; diff --git a/install-sh b/install-sh index 377bb86..a9244eb 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2011-11-20.07; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# 'make' implicit rules from creating a file called install from it +# `make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. + # Protect names problematic for `test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg - # Protect names problematic for 'test' and other utilities. + # Protect names problematic for `test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call 'install-sh -d' without argument. + # It's OK to call `install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ fi for src do - # Protect names problematic for 'test' and other utilities. + # Protect names problematic for `test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. + # other-writeable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff --git a/m4/Makefile.in b/m4/Makefile.in index f81c22e..561e3da 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -85,7 +85,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/missing b/missing index cdea514..86a8fc3 100755 --- a/missing +++ b/missing @@ -1,10 +1,11 @@ #! /bin/sh -# Common wrapper for a few potentially missing GNU programs. +# Common stub for a few missing GNU programs while installing. -scriptversion=2012-06-26.16; # UTC +scriptversion=2012-01-06.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard , 1996. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. # 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 @@ -25,40 +26,68 @@ scriptversion=2012-06-26.16; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" + echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi -case $1 in +run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; +msg="missing on your system" + +case $1 in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + yacc create \`y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. Send bug reports to ." exit $? @@ -70,141 +99,228 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" exit 1 ;; esac -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" + autoheader*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st + + automake*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te*) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison*|yacc*) + echo 1>&2 "\ +WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if test $# -ne 1; then + eval LASTARG=\${$#} + case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if test ! -f y.tab.h; then + echo >y.tab.h + fi + if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex*|flex*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if test $# -ne 1; then + eval LASTARG=\${$#} + case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit $? + fi + ;; + + makeinfo*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 + touch $file + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in index 43b37b6..dc4a513 100644 --- a/pkgconfig/Makefile.in +++ b/pkgconfig/Makefile.in @@ -86,7 +86,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 1283c32..fecf500 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -15,9 +15,6 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -# thomas: add GETTEXT_PACKAGE substitution as used in Makevars -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - SHELL = /bin/sh @SET_MAKE@ diff --git a/po/Makevars b/po/Makevars index 10ed9f6..f8eb893 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,7 +1,7 @@ # Makefile variables for PO directory in any package using GNU gettext. # Usually the message domain is the same as the package name. -DOMAIN = $(GETTEXT_PACKAGE) +DOMAIN = gst-plugins-ugly-1.0 # These two variables depend on the location of this directory. subdir = po diff --git a/po/af.gmo b/po/af.gmo index 157c8a2..036d4c8 100644 Binary files a/po/af.gmo and b/po/af.gmo differ diff --git a/po/af.po b/po/af.po index d39cb89..c9fb030 100644 --- a/po/af.po +++ b/po/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.7.6\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2004-03-18 14:16+0200\n" "Last-Translator: Petri Jooste \n" "Language-Team: Afrikaans \n" diff --git a/po/az.gmo b/po/az.gmo index 9a3c8bc..033777b 100644 Binary files a/po/az.gmo and b/po/az.gmo differ diff --git a/po/az.po b/po/az.po index 3b19612..0b3e385 100644 --- a/po/az.po +++ b/po/az.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-0.8.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2004-03-19 18:29+0200\n" "Last-Translator: Metin Amiroff \n" "Language-Team: Azerbaijani \n" diff --git a/po/bg.gmo b/po/bg.gmo index 2cc47a2..ca2524d 100644 Binary files a/po/bg.gmo and b/po/bg.gmo differ diff --git a/po/bg.po b/po/bg.po index 0385168..af987ee 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2011-04-26 22:34+0300\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" diff --git a/po/ca.gmo b/po/ca.gmo index 849d491..20a63c9 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index ec4bcc5..6f2bb34 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-01-01 14:19+0100\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" diff --git a/po/cs.gmo b/po/cs.gmo index 3a71695..acc6633 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 3b36b04..9beea43 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2013-09-07 07:06+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" diff --git a/po/da.gmo b/po/da.gmo index 9d9e011..3de5a9f 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index bfd9b3b..b09c672 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-12-09 03:56+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/po/de.gmo b/po/de.gmo index a848c1a..a963e55 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 1cf47b7..5a64fc6 100644 --- a/po/de.po +++ b/po/de.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.1.4\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2013-09-21 14:25+0100\n" "Last-Translator: Christian Kirbach \n" "Language-Team: German \n" diff --git a/po/el.gmo b/po/el.gmo index 8d6a5d8..f6506db 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index d0d391c..c7adce4 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-03-18 01:04+0100\n" "Last-Translator: Savvas Radevic \n" "Language-Team: Greek \n" diff --git a/po/en_GB.gmo b/po/en_GB.gmo index e9c5e9e..19895ca 100644 Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ diff --git a/po/en_GB.po b/po/en_GB.po index 2808c06..d8f97e9 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2004-04-26 10:41-0400\n" "Last-Translator: Gareth Owen \n" "Language-Team: English (British) \n" diff --git a/po/eo.gmo b/po/eo.gmo index f32230f..c89455a 100644 Binary files a/po/eo.gmo and b/po/eo.gmo differ diff --git a/po/eo.po b/po/eo.po index 40fb887..ff10f5c 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2011-06-04 22:24+0200\n" "Last-Translator: Kristjan SCHMIDT \n" "Language-Team: Esperanto \n" diff --git a/po/es.gmo b/po/es.gmo index 12612d3..935b006 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 8d54b52..6bfaf11 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2011-10-02 15:45+0200\n" "Last-Translator: Jorge González González \n" "Language-Team: Spanish \n" diff --git a/po/eu.gmo b/po/eu.gmo index 44cc895..41db5ef 100644 Binary files a/po/eu.gmo and b/po/eu.gmo differ diff --git a/po/eu.po b/po/eu.po index 337dffd..27571c2 100644 --- a/po/eu.po +++ b/po/eu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2010-03-07 13:12+0200\n" "Last-Translator: Mikel Olasagasti Uranga \n" "Language-Team: Basque \n" diff --git a/po/fi.gmo b/po/fi.gmo index d784231..678d576 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index 83e142a..31a5340 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.10.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2009-03-10 20:41+0200\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" diff --git a/po/fr.gmo b/po/fr.gmo index ea78ffb..f8183dc 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 1b46112..509d168 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2011-04-28 09:25+0200\n" "Last-Translator: Claude Paroz \n" "Language-Team: French \n" diff --git a/po/gl.gmo b/po/gl.gmo index 7d95ace..47a4ed3 100644 Binary files a/po/gl.gmo and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po index 7dd0753..82ca0d0 100644 --- a/po/gl.po +++ b/po/gl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-12-15 03:47+0200\n" "Last-Translator: Fran Dieguez \n" "Language-Team: Galician \n" diff --git a/po/gst-plugins-ugly-1.0.pot b/po/gst-plugins-ugly-1.0.pot index 4aadf25..31d1ca7 100644 --- a/po/gst-plugins-ugly-1.0.pot +++ b/po/gst-plugins-ugly-1.0.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: gst-plugins-ugly 1.2.4\n" +"Project-Id-Version: gst-plugins-ugly 1.3.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,13 +50,13 @@ msgid "" "element" msgstr "" -#: ext/dvdread/dvdreadsrc.c:985 +#: ext/dvdread/dvdreadsrc.c:986 msgid "" "Could not read DVD. This may be because the DVD is encrypted and a DVD " "decryption library is not installed." msgstr "" -#: ext/dvdread/dvdreadsrc.c:988 +#: ext/dvdread/dvdreadsrc.c:989 msgid "Could not read DVD." msgstr "" diff --git a/po/hr.gmo b/po/hr.gmo index 16cf842..e5aa82f 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index c34edaa..389a046 100644 --- a/po/hr.po +++ b/po/hr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-04-16 03:00+0200\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" diff --git a/po/hu.gmo b/po/hu.gmo index 35dfd17..c82dd0b 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/hu.po b/po/hu.po index 9e2ab8b..67f7e18 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-11-30 15:02+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" diff --git a/po/id.gmo b/po/id.gmo index dcb6370..4f3184d 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index cac150b..fc007ff 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.2.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2014-01-27 20:04+0700\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" diff --git a/po/it.gmo b/po/it.gmo index 63423d1..da7ad3b 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index 1707f49..2a30b33 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.11.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2009-06-14 12:31+0200\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" diff --git a/po/ja.gmo b/po/ja.gmo index 5405041..8984069 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index 0b6af41..1f8e1e4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-12-22 19:42+0900\n" "Last-Translator: Takeshi Hamasaki \n" "Language-Team: Japanese \n" diff --git a/po/lt.gmo b/po/lt.gmo index 1e3197b..849bcdf 100644 Binary files a/po/lt.gmo and b/po/lt.gmo differ diff --git a/po/lt.po b/po/lt.po index 6589e8d..9d887f6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-0.10.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2008-05-14 02:52+0300\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" diff --git a/po/lv.gmo b/po/lv.gmo index 0387266..9dd815e 100644 Binary files a/po/lv.gmo and b/po/lv.gmo differ diff --git a/po/lv.po b/po/lv.po index cd66125..5c28f45 100644 --- a/po/lv.po +++ b/po/lv.po @@ -2,23 +2,25 @@ # This file is put in the public domain. # Arvis Lācis , 2009. # Rihards Prieditis , 2011. +# Rūdolfs Mazurs , 2014. msgid "" msgstr "" -"Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" +"Project-Id-Version: gst-plugins-ugly 1.2.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" -"PO-Revision-Date: 2011-09-02 12:04-0000\n" -"Last-Translator: Rihards Priedītis \n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" +"PO-Revision-Date: 2014-04-20 16:24+0300\n" +"Last-Translator: Rihards Prieditis \n" "Language-Team: Latvian \n" "Language: lv\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" +"X-Generator: Lokalize 1.5\n" msgid "Could not read from CD." -msgstr "Nevar nolasīt no CD." +msgstr "Nevarēja nolasīt no CD." msgid "Could not open CD device for reading." msgstr "Nevarēja atvērt CD ierīci lasīšanai." @@ -27,23 +29,23 @@ msgid "Disc is not an Audio CD." msgstr "Disks nav Audio CD." msgid "Could not open DVD" -msgstr "Nevar atvērt DVD" +msgstr "Nevarēja atvērt DVD" #, c-format msgid "Could not open DVD title %d" -msgstr "Nevar atvērt DVD virsrakstu %d" +msgstr "Nevarēja atvērt DVD nosaukumu %d" #, c-format msgid "Failed to go to chapter %d of DVD title %d" -msgstr "Neizdevās pāriet uz %d nodaļu DVD virsrakstā %d" +msgstr "Neizdevās pāriet uz %d nodaļu DVD nosaukumā %d" #, c-format msgid "" "Could not open DVD title %d. Interactive titles are not supported by this " "element" msgstr "" -"Nevar atvērt DVD virsrakstu %d. Šis elements nenodrošina interaktīvos " -"virsrakstus." +"Nevarēja atvērt DVD nosaukumu %d. Šis elements nenodrošina interaktīvos " +"nosaukumus." msgid "" "Could not read DVD. This may be because the DVD is encrypted and a DVD " @@ -53,30 +55,31 @@ msgstr "" "bibliotēka nav instalēta." msgid "Could not read DVD." -msgstr "Nevar nolasīt DVD." +msgstr "Nevarēja nolasīt DVD." -#, fuzzy msgid "" "Failed to configure LAME mp3 audio encoder. Check your encoding parameters." -msgstr "Neizdevās uzstādīt LAME kodētāju. Pārbaudiet jūsu kodējuma parametrus." +msgstr "" +"Neizdevās konfigurēt LAME mp3 audio kodētāju. Pārbaudiet savus kodēšanas " +"parametrus." #, c-format msgid "" "The requested bitrate %d kbit/s for property '%s' is not allowed. The " "bitrate was changed to %d kbit/s." msgstr "" -"Pieprasītais straumēšanas ātrums %d kbiti/s nepieciešamajai īpašībai \"%s\" " +"Pieprasītais straumēšanas ātrums %d kbiti/s nepieciešamajai īpašībai “%s” " "nav atļauts. Straumēšanas ātrums tika mainīts uz %d kbitiem/s." msgid "Failed to configure TwoLAME encoder. Check your encoding parameters." msgstr "" -"Nezidevās uzstādīt TwoLAME kodētāju. Pārbaudiet jūsu kodējuma parametrus." +"Neizdevās konfigurēt TwoLAME kodētāju. Pārbaudiet savus kodēšanas parametrus." msgid "This stream contains no data." msgstr "Šī straume nesatur datus." msgid "Internal data stream error." -msgstr "Iekšējās datu plūsmas kļūda." +msgstr "Iekšēja datu plūsmas kļūda." #~ msgid "Invalid title information on DVD." #~ msgstr "Nederīga DVD virsraksta informācija." diff --git a/po/ms.gmo b/po/ms.gmo index e29b29d..0932a7b 100644 Binary files a/po/ms.gmo and b/po/ms.gmo differ diff --git a/po/ms.po b/po/ms.po index 7e71a65..a220601 100644 --- a/po/ms.po +++ b/po/ms.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-0.10.11.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2009-07-16 15:07+0800\n" "Last-Translator: Muhammad Najmi bin Ahmad Zabidi \n" "Language-Team: Malay \n" diff --git a/po/mt.gmo b/po/mt.gmo index cfa9891..b1836aa 100644 Binary files a/po/mt.gmo and b/po/mt.gmo differ diff --git a/po/mt.po b/po/mt.po index ba07d70..8d598d2 100644 --- a/po/mt.po +++ b/po/mt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-0.10.9.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2008-11-13 18:18+0100\n" "Last-Translator: Michel Bugeja \n" "Language-Team: Maltese \n" diff --git a/po/nb.gmo b/po/nb.gmo index bbf67e4..0ed8a9c 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index baac76a..45d343e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-12-21 21:38+0100\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" diff --git a/po/nl.gmo b/po/nl.gmo index d0b0951..85950c5 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index aea34ce..b9d4256 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-11-29 22:31+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" diff --git a/po/or.gmo b/po/or.gmo index 2e30d9b..3eb0145 100644 Binary files a/po/or.gmo and b/po/or.gmo differ diff --git a/po/or.po b/po/or.po index 031f4c1..080fc1c 100644 --- a/po/or.po +++ b/po/or.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-0.8.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2004-09-27 13:32+0530\n" "Last-Translator: Gora Mohanty \n" "Language-Team: Oriya \n" diff --git a/po/pl.gmo b/po/pl.gmo index c33f7b3..e16a71e 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 9a6b1cb..b5ab0c3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-11-28 19:34+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 0e4d8b3..aa87e62 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index 007fb5f..b59aa59 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2013-08-20 22:54-0300\n" "Last-Translator: Fabrício Godoy \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: Romanian \n" diff --git a/po/ru.gmo b/po/ru.gmo index f8fb130..04fe91b 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index c1abf3f..65045f6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-12-01 13:38+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" diff --git a/po/sk.gmo b/po/sk.gmo index cc48f4b..0bf9fe7 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index 3fb2379..738912f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.2.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2014-01-30 10:28+0100\n" "Last-Translator: Peter Tuharsky \n" "Language-Team: Slovak \n" diff --git a/po/sl.gmo b/po/sl.gmo index 8136c11..b1e4d62 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index 9bb9a24..82f411a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-03-26 22:48+0100\n" "Last-Translator: Klemen Košir \n" "Language-Team: Slovenian \n" diff --git a/po/sq.gmo b/po/sq.gmo index 77a1d89..1faf33f 100644 Binary files a/po/sq.gmo and b/po/sq.gmo differ diff --git a/po/sq.po b/po/sq.po index c98996e..1312b37 100644 --- a/po/sq.po +++ b/po/sq.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2004-08-07 20:29+0200\n" "Last-Translator: Laurent Dhima \n" "Language-Team: Albanian \n" diff --git a/po/sr.gmo b/po/sr.gmo index b88e5f5..8e4ae8b 100644 Binary files a/po/sr.gmo and b/po/sr.gmo differ diff --git a/po/sr.po b/po/sr.po index 57636db..fc632ad 100644 --- a/po/sr.po +++ b/po/sr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-1.1.4\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2013-10-03 22:30+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" diff --git a/po/sv.gmo b/po/sv.gmo index 6b9fa33..9c1acb5 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index 47b1d42..3f78510 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.10.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2009-03-10 16:12+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff --git a/po/tr.gmo b/po/tr.gmo index 725bd3d..5d88c48 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 2d1be8d..da97c93 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-12-01 01:19+0200\n" "Last-Translator: Server Acim \n" "Language-Team: Turkish \n" diff --git a/po/uk.gmo b/po/uk.gmo index b9c8c87..8194a2b 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index 976705b..22530b9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-11-28 20:25+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" diff --git a/po/vi.gmo b/po/vi.gmo index 014a7f5..91effc1 100644 Binary files a/po/vi.gmo and b/po/vi.gmo differ diff --git a/po/vi.po b/po/vi.po index d15946f..7593454 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2012-12-02 08:07+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index c535855..094e075 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/po/zh_CN.po b/po/zh_CN.po index 9c780b9..778f8ac 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-04-18 11:46+0200\n" +"POT-Creation-Date: 2014-05-03 18:20+0200\n" "PO-Revision-Date: 2011-12-20 10:58+0800\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" diff --git a/tests/Makefile.in b/tests/Makefile.in index 6c6137d..192de24 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -85,7 +85,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 2cb6b81..ba57b5a 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -43,6 +43,12 @@ else check_x264enc= endif +if USE_PLUGIN_XINGMUX +check_xingmux = elements/xingmux +else +check_xingmux = +endif + # generic/index check_PROGRAMS = \ generic/states \ @@ -50,7 +56,7 @@ check_PROGRAMS = \ $(LAME) \ $(MPEG2DEC) \ $(check_x264enc) \ - elements/xingmux + $(check_xingmux) # these tests don't even pass noinst_PROGRAMS = diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in index 5311727..bf52378 100644 --- a/tests/check/Makefile.in +++ b/tests/check/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(top_srcdir)/common/check.mak $(srcdir)/Makefile.in \ $(top_srcdir)/test-driver check_PROGRAMS = generic/states$(EXEEXT) $(am__EXEEXT_1) \ $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \ - elements/xingmux$(EXEEXT) + $(am__EXEEXT_5) noinst_PROGRAMS = subdir = tests/check ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -93,7 +93,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ @@ -131,6 +130,7 @@ CONFIG_CLEAN_VPATH_FILES = @USE_LAME_TRUE@am__EXEEXT_2 = pipelines/lame$(EXEEXT) @USE_MPEG2DEC_TRUE@am__EXEEXT_3 = elements/mpeg2dec$(EXEEXT) @USE_X264_TRUE@am__EXEEXT_4 = elements/x264enc$(EXEEXT) +@USE_PLUGIN_XINGMUX_TRUE@am__EXEEXT_5 = elements/xingmux$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) elements_amrnbenc_SOURCES = elements/amrnbenc.c am__dirstamp = $(am__leading_dot)dirstamp @@ -725,6 +725,8 @@ TESTS = $(check_PROGRAMS) @USE_MPEG2DEC_TRUE@MPEG2DEC = elements/mpeg2dec @USE_X264_FALSE@check_x264enc = @USE_X264_TRUE@check_x264enc = elements/x264enc +@USE_PLUGIN_XINGMUX_FALSE@check_xingmux = +@USE_PLUGIN_XINGMUX_TRUE@check_xingmux = elements/xingmux noinst_HEADERS = elements/xingmux_testdata.h AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) \ -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS diff --git a/win32/common/config.h b/win32/common/config.h index ee6bd5e..1645175 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -61,7 +61,7 @@ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2014-04-18" +#define GST_PACKAGE_RELEASE_DATETIME "2014-05-03" /* Define if static plugins should be built */ #undef GST_PLUGIN_BUILD_STATIC @@ -248,7 +248,7 @@ #define PACKAGE_NAME "GStreamer Ugly Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Ugly Plug-ins 1.2.4" +#define PACKAGE_STRING "GStreamer Ugly Plug-ins 1.3.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-ugly" @@ -257,7 +257,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.4" +#define PACKAGE_VERSION "1.3.1" /* directory where plugins are located */ #ifdef _DEBUG @@ -288,7 +288,7 @@ #undef TARGET_CPU /* Version number of package */ -#define VERSION "1.2.4" +#define VERSION "1.3.1" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ -- cgit v1.2.3