diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-01-08 13:58:22 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-01-08 13:58:22 +0100 |
| commit | 8238c0aa6a13ad4be43b1346396d53354545e594 (patch) | |
| tree | 5d74d03e143b012e98d3f0dbb70e56fa67175046 | |
| parent | addc7f72541eaa534e1f0f85666f16ba0ccd4cca (diff) | |
Imported Upstream version 1.0.5upstream/1.0.5
| -rw-r--r-- | ChangeLog | 28 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | aclocal.m4 | 12 | ||||
| -rwxr-xr-x | configure | 54 | ||||
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | gst-libav.doap | 10 | ||||
| -rw-r--r-- | gst-libav.spec | 2 |
7 files changed, 102 insertions, 36 deletions
@@ -1,9 +1,33 @@ +=== release 1.0.5 === + +2013-01-08 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * configure.ac: + releasing 1.0.5 + +2012-12-31 00:32:41 +0000 Tim-Philipp Müller <tim@centricular.net> + + * configure.ac: + configure: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + AM_CONFIG_HEADER has been removed in the just-released automake 1.13: + https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html + https://bugzilla.gnome.org/show_bug.cgi?id=690881 + +2012-12-21 14:28:57 +0100 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * configure.ac: + configure: Pass CC, LD, AS, AR and NM to the libav configure if set + === release 1.0.4 === -2012-12-18 Tim-Philipp Müller <tim@centricular.net> +2012-12-18 21:30:43 +0000 Tim-Philipp Müller <tim@centricular.net> + * ChangeLog: + * NEWS: + * RELEASE: * configure.ac: - releasing 1.0.4 + * gst-libav.doap: + Release 1.0.4 2012-12-12 17:01:28 +0100 Wim Taymans <wim.taymans@collabora.co.uk> @@ -1,4 +1,8 @@ -This is GStreamer Libav Plugins 1.0.4 +This is GStreamer Libav Plugins 1.0.5 + +Changes since 1.0.4: + + * Pass CC, LD, AS, AR and NM to the libav configure if set Changes since 1.0.3: @@ -416,18 +416,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GStreamer libav 1.0.4. +# Generated by GNU Autoconf 2.69 for GStreamer libav 1.0.5. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GStreamer libav' PACKAGE_TARNAME='gst-libav' -PACKAGE_VERSION='1.0.4' -PACKAGE_STRING='GStreamer libav 1.0.4' +PACKAGE_VERSION='1.0.5' +PACKAGE_STRING='GStreamer libav 1.0.5' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer' PACKAGE_URL='' @@ -1505,7 +1505,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 libav 1.0.4 to adapt to many kinds of systems. +\`configure' configures GStreamer libav 1.0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1576,7 +1576,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GStreamer libav 1.0.4:";; + short | recursive ) echo "Configuration of GStreamer libav 1.0.5:";; esac cat <<\_ACEOF @@ -1738,7 +1738,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GStreamer libav configure 1.0.4 +GStreamer libav configure 1.0.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2153,7 +2153,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 libav $as_me 1.0.4, which was +It was created by GStreamer libav $as_me 1.0.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3083,7 +3083,7 @@ fi # Define the identity of the package. PACKAGE='gst-libav' - VERSION='1.0.4' + VERSION='1.0.5' cat >>confdefs.h <<_ACEOF @@ -3206,9 +3206,9 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } - PACKAGE_VERSION_MAJOR=$(echo 1.0.4 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.0.4 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.0.4 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.0.5 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.0.5 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.0.5 | cut -d'.' -f3) @@ -3219,7 +3219,7 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.0.4 | cut -d'.' -f4) + NANO=$(echo 1.0.5 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -7806,10 +7806,10 @@ fi done - GST_CURRENT=4 + GST_CURRENT=5 GST_REVISION=0 - GST_AGE=4 - GST_LIBVERSION=4:0:4 + GST_AGE=5 + GST_LIBVERSION=5:0:5 @@ -17118,6 +17118,26 @@ fi ;; esac + if test x"$AR" != x; then + emblibav_configure_args="$emblibav_configure_args --ar=\\\"\\\$AR\\\"" + fi + + if test x"$AS" != x; then + emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$AS\\\"" + fi + + if test x"$CC" != x; then + emblibav_configure_args="$emblibav_configure_args --cc=\\\"\\\$CC\\\"" + fi + + if test x"$LD" != x; then + emblibav_configure_args="$emblibav_configure_args --ld=\\\"\\\$CC\\\"" + fi + + if test x"$NM" != x; then + emblibav_configure_args="$emblibav_configure_args --nm=\\\"\\\$NM\\\"" + fi + LIBAV_OPTS="(cd $srcdir/gst-libs/ext/libav && ./configure --help)" # Let's check if we can disable the building of the libav binary can_disable=`echo "$LIBAV_OPTS" | grep 'disable-ffmpeg'` @@ -17818,7 +17838,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 libav $as_me 1.0.4, which was +This file was extended by GStreamer libav $as_me 1.0.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17884,7 +17904,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 libav config.status 1.0.4 +GStreamer libav config.status 1.0.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index cd1c44f..b9ac2ee 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.62) dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AC_INIT(GStreamer libav, 1.0.4, +AC_INIT(GStreamer libav, 1.0.5, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gst-libav) @@ -22,7 +22,7 @@ dnl can autoconf find the source ? AC_CONFIG_SRCDIR([ext/libav/gstav.c]) dnl define the output header for config -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) dnl AM_MAINTAINER_MODE only provides the option to configure to enable it AM_MAINTAINER_MODE([enable]) @@ -42,7 +42,7 @@ GST_API_VERSION=1.0 AC_SUBST(GST_API_VERSION) AG_GST_LIBTOOL_PREPARE -AS_LIBTOOL(GST, 4, 0, 4) +AS_LIBTOOL(GST, 5, 0, 5) dnl *** required versions of GStreamer stuff *** GST_REQ=1.0.0 @@ -337,6 +337,26 @@ else ;; esac + if test x"$AR" != x; then + emblibav_configure_args="$emblibav_configure_args --ar=\\\"\\\$AR\\\"" + fi + + if test x"$AS" != x; then + emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$AS\\\"" + fi + + if test x"$CC" != x; then + emblibav_configure_args="$emblibav_configure_args --cc=\\\"\\\$CC\\\"" + fi + + if test x"$LD" != x; then + emblibav_configure_args="$emblibav_configure_args --ld=\\\"\\\$CC\\\"" + fi + + if test x"$NM" != x; then + emblibav_configure_args="$emblibav_configure_args --nm=\\\"\\\$NM\\\"" + fi + dnl checks for extra enable/disable flags LIBAV_OPTS="(cd $srcdir/gst-libs/ext/libav && ./configure --help)" # Let's check if we can disable the building of the libav binary diff --git a/gst-libav.doap b/gst-libav.doap index ded998d..a90b9c8 100644 --- a/gst-libav.doap +++ b/gst-libav.doap @@ -34,6 +34,16 @@ colorspace conversion elements. <release> <Version> + <revision>1.0.5</revision> + <branch>1.0</branch> + <name></name> + <created>2013-01-08</created> + <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.0.5.tar.xz" /> + </Version> + </release> + + <release> + <Version> <revision>1.0.4</revision> <branch>1.0</branch> <name></name> diff --git a/gst-libav.spec b/gst-libav.spec index c8b68b0..7ea58ab 100644 --- a/gst-libav.spec +++ b/gst-libav.spec @@ -4,7 +4,7 @@ %define gst_majorminor 1.0 Name: %{gstreamer}-libav -Version: 1.0.4 +Version: 1.0.5 Release: 1 Summary: GStreamer Streaming-media framework plug-in using libav (FFmpeg). Group: Libraries/Multimedia |