diff -Nru gst-libav1.0-1.0.2/ChangeLog gst-libav1.0-1.0.5/ChangeLog --- gst-libav1.0-1.0.2/ChangeLog 2012-10-25 00:14:46.000000000 +0000 +++ gst-libav1.0-1.0.5/ChangeLog 2013-01-08 10:50:12.000000000 +0000 @@ -1,9 +1,94 @@ +=== release 1.0.5 === + +2013-01-08 Tim-Philipp Müller + + * configure.ac: + releasing 1.0.5 + +2012-12-31 00:32:41 +0000 Tim-Philipp Müller + + * 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 + + * configure.ac: + configure: Pass CC, LD, AS, AR and NM to the libav configure if set + +=== release 1.0.4 === + +2012-12-18 21:30:43 +0000 Tim-Philipp Müller + + * ChangeLog: + * NEWS: + * RELEASE: + * configure.ac: + * gst-libav.doap: + Release 1.0.4 + +2012-12-12 17:01:28 +0100 Wim Taymans + + * ext/libav/gstavcodecmap.c: + avcodec: set bits_per_coded_sample for G726 + Use the bitrate and the samplerate to set the bits_per_coded_sample for G726 + because the decoder needs this. + +2012-12-10 14:54:03 +0100 Rasmus Rohde + + * ext/libav/gstavpipe.h: + Fix incorrect use of object in log statement. We are given a pointer to the object and should not try to take the address of it. + +2012-11-21 13:05:54 +0000 Tim-Philipp Müller + + * configure.ac: + Back to development (bug fixing) + +=== release 1.0.3 === + +2012-11-21 11:13:07 +0000 Tim-Philipp Müller + + * ChangeLog: + * NEWS: + * RELEASE: + * configure.ac: + * gst-libav.doap: + Release 1.0.3 + +2012-11-21 11:10:49 +0000 Tim-Philipp Müller + + * gst-libs/ext/Makefile.am: + Revert "Revert "ffmpeg: Fix make dist"" + This reverts commit 2aab13b9aed1ff7e9a17be07b3184ebd0869afe0. + +2012-11-19 14:10:23 +0100 Sebastian Dröge + + * ext/libav/gstavcodecmap.c: + avcodecmap: Y41B is YUV411P, not YUV410P + +2012-10-29 14:12:03 +0100 Sebastian Dröge + + * ext/libav/gstavcodecmap.c: + avcodecmap: Remove redundant function to map PixelFormat to GstVideoFormat + And merge everything into a single one. + +2012-10-25 12:54:40 +0100 Tim-Philipp Müller + + * configure.ac: + Back to development (bug fixing) + === release 1.0.2 === -2012-10-25 Tim-Philipp Müller +2012-10-25 01:34:32 +0100 Tim-Philipp Müller + * ChangeLog: + * NEWS: + * RELEASE: * configure.ac: - releasing 1.0.2 + * gst-libav.doap: + Release 1.0.2 2012-10-24 16:01:36 +0200 Sebastian Dröge diff -Nru gst-libav1.0-1.0.2/NEWS gst-libav1.0-1.0.5/NEWS --- gst-libav1.0-1.0.2/NEWS 2012-10-25 00:26:30.000000000 +0000 +++ gst-libav1.0-1.0.5/NEWS 2013-01-08 10:54:51.000000000 +0000 @@ -1,4 +1,20 @@ -This is GStreamer Libav Plugins 1.0.2 +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: + + * G.726 decoder fixes + +Bugs fixed since 1.0.3: + + * 689975 : Incorrect use of object in log statement + +Changes since 1.0.2: + + * avcodecmap: Y41B is YUV411P, not YUV410P Changes since 1.0.1: diff -Nru gst-libav1.0-1.0.2/aclocal.m4 gst-libav1.0-1.0.5/aclocal.m4 --- gst-libav1.0-1.0.2/aclocal.m4 2012-10-24 16:57:27.000000000 +0000 +++ gst-libav1.0-1.0.5/aclocal.m4 2013-01-04 15:08:25.000000000 +0000 @@ -416,18 +416,6 @@ [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, diff -Nru gst-libav1.0-1.0.2/configure gst-libav1.0-1.0.5/configure --- gst-libav1.0-1.0.2/configure 2012-10-24 16:57:29.000000000 +0000 +++ gst-libav1.0-1.0.5/configure 2013-01-04 15:08:27.000000000 +0000 @@ -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.2. +# Generated by GNU Autoconf 2.69 for GStreamer libav 1.0.5. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='GStreamer libav' PACKAGE_TARNAME='gst-libav' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='GStreamer libav 1.0.2' +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 @@ # 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.2 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 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GStreamer libav 1.0.2:";; + short | recursive ) echo "Configuration of GStreamer libav 1.0.5:";; esac cat <<\_ACEOF @@ -1738,7 +1738,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GStreamer libav configure 1.0.2 +GStreamer libav configure 1.0.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2153,7 +2153,7 @@ 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.2, 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 @@ # Define the identity of the package. PACKAGE='gst-libav' - VERSION='1.0.2' + VERSION='1.0.5' cat >>confdefs.h <<_ACEOF @@ -3206,9 +3206,9 @@ - PACKAGE_VERSION_MAJOR=$(echo 1.0.2 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.0.2 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.0.2 | 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 "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.0.2 | 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 @@ -5118,7 +5118,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -6649,7 +6650,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -7798,10 +7806,10 @@ done - GST_CURRENT=2 + GST_CURRENT=5 GST_REVISION=0 - GST_AGE=2 - GST_LIBVERSION=2:0:2 + GST_AGE=5 + GST_LIBVERSION=5:0:5 @@ -17110,6 +17118,26 @@ ;; 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'` @@ -17810,7 +17838,7 @@ # 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.2, 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 @@ -17876,7 +17904,7 @@ 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.2 +GStreamer libav config.status 1.0.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru gst-libav1.0-1.0.2/configure.ac gst-libav1.0-1.0.5/configure.ac --- gst-libav1.0-1.0.2/configure.ac 2012-10-24 16:56:46.000000000 +0000 +++ gst-libav1.0-1.0.5/configure.ac 2013-01-04 15:07:34.000000000 +0000 @@ -3,7 +3,7 @@ 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.2, +AC_INIT(GStreamer libav, 1.0.5, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gst-libav) @@ -22,7 +22,7 @@ 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 @@ AC_SUBST(GST_API_VERSION) AG_GST_LIBTOOL_PREPARE -AS_LIBTOOL(GST, 2, 0, 2) +AS_LIBTOOL(GST, 5, 0, 5) dnl *** required versions of GStreamer stuff *** GST_REQ=1.0.0 @@ -337,6 +337,26 @@ ;; 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 -Nru gst-libav1.0-1.0.2/debian/changelog gst-libav1.0-1.0.5/debian/changelog --- gst-libav1.0-1.0.2/debian/changelog 2012-10-25 12:31:36.000000000 +0000 +++ gst-libav1.0-1.0.5/debian/changelog 2013-01-22 00:41:23.000000000 +0000 @@ -1,3 +1,27 @@ +gst-libav1.0 (1.0.5-1~ubuntu12.10.1~ppa1) quantal; urgency=low + + * No-change backport to quantal + + -- Jason Gerard DeRose Mon, 21 Jan 2013 17:41:23 -0700 + +gst-libav1.0 (1.0.5-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Tue, 08 Jan 2013 14:00:08 +0100 + +gst-libav1.0 (1.0.4-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Wed, 19 Dec 2012 10:38:34 +0100 + +gst-libav1.0 (1.0.3-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Wed, 21 Nov 2012 15:11:25 +0100 + gst-libav1.0 (1.0.2-1) unstable; urgency=low * New upstream bugfix release. diff -Nru gst-libav1.0-1.0.2/ext/libav/gstavcodecmap.c gst-libav1.0-1.0.5/ext/libav/gstavcodecmap.c --- gst-libav1.0-1.0.2/ext/libav/gstavcodecmap.c 2012-10-22 23:03:13.000000000 +0000 +++ gst-libav1.0-1.0.5/ext/libav/gstavcodecmap.c 2012-12-18 13:53:08.000000000 +0000 @@ -1757,76 +1757,6 @@ return caps; } -/* Convert a FFMPEG Pixel Format to a GStreamer VideoFormat */ -GstVideoFormat -gst_ffmpeg_pixfmt_to_video_format (enum PixelFormat pix_fmt) -{ - GstVideoFormat fmt; - - switch (pix_fmt) { - case PIX_FMT_YUVJ420P: - case PIX_FMT_YUV420P: - fmt = GST_VIDEO_FORMAT_I420; - break; - case PIX_FMT_YUVA420P: - fmt = GST_VIDEO_FORMAT_A420; - break; - case PIX_FMT_YUYV422: - fmt = GST_VIDEO_FORMAT_YUY2; - break; - case PIX_FMT_RGB24: - fmt = GST_VIDEO_FORMAT_RGB; - break; - case PIX_FMT_BGR24: - fmt = GST_VIDEO_FORMAT_BGR; - break; - case PIX_FMT_YUVJ422P: - case PIX_FMT_YUV422P: - fmt = GST_VIDEO_FORMAT_Y42B; - break; - case PIX_FMT_YUVJ444P: - case PIX_FMT_YUV444P: - fmt = GST_VIDEO_FORMAT_Y444; - break; - case PIX_FMT_RGB32: -#if (G_BYTE_ORDER == G_BIG_ENDIAN) - fmt = GST_VIDEO_FORMAT_xRGB; -#else - fmt = GST_VIDEO_FORMAT_BGRx; -#endif - break; - case PIX_FMT_YUV410P: - fmt = GST_VIDEO_FORMAT_YUV9; - break; - case PIX_FMT_YUV411P: - fmt = GST_VIDEO_FORMAT_Y41B; - break; - case PIX_FMT_RGB565: - fmt = GST_VIDEO_FORMAT_RGB16; - break; - case PIX_FMT_RGB555: - fmt = GST_VIDEO_FORMAT_RGB15; - break; - case PIX_FMT_PAL8: - fmt = GST_VIDEO_FORMAT_RGB8P; - break; - case PIX_FMT_GRAY8: - fmt = GST_VIDEO_FORMAT_GRAY8; - break; - case PIX_FMT_YUV420P10LE: - fmt = GST_VIDEO_FORMAT_I420_10LE; - break; - case PIX_FMT_YUV420P10BE: - fmt = GST_VIDEO_FORMAT_I420_10BE; - break; - default: - /* give up ... */ - fmt = GST_VIDEO_FORMAT_UNKNOWN; - break; - } - return fmt; -} - /* Convert a FFMPEG Pixel Format and optional AVCodecContext * to a GstCaps. If the context is ommitted, no fixed values * for video/audio size will be included in the GstCaps @@ -1841,7 +1771,7 @@ GstCaps *caps = NULL; GstVideoFormat format; - format = gst_ffmpeg_pixfmt_to_video_format (pix_fmt); + format = gst_ffmpeg_pixfmt_to_videoformat (pix_fmt); if (format != GST_VIDEO_FORMAT_UNKNOWN) { caps = gst_ff_vid_caps_new (context, codec_id, TRUE, "video/x-raw", @@ -2195,17 +2125,19 @@ /* GST_VIDEO_FORMAT_xRGB, */ /* GST_VIDEO_FORMAT_xBGR, */ /* GST_VIDEO_FORMAT_RGBA, */ - {GST_VIDEO_FORMAT_RGBA, PIX_FMT_RGB32}, + {GST_VIDEO_FORMAT_RGBA, PIX_FMT_RGBA}, /* GST_VIDEO_FORMAT_BGRA, */ - {GST_VIDEO_FORMAT_BGRA, PIX_FMT_BGR32}, + {GST_VIDEO_FORMAT_BGRA, PIX_FMT_BGRA}, /* GST_VIDEO_FORMAT_ARGB, */ + {GST_VIDEO_FORMAT_ARGB, PIX_FMT_ARGB}, /* GST_VIDEO_FORMAT_ABGR, */ + {GST_VIDEO_FORMAT_ABGR, PIX_FMT_ABGR}, /* GST_VIDEO_FORMAT_RGB, */ {GST_VIDEO_FORMAT_RGB, PIX_FMT_RGB24}, /* GST_VIDEO_FORMAT_BGR, */ {GST_VIDEO_FORMAT_BGR, PIX_FMT_BGR24}, /* GST_VIDEO_FORMAT_Y41B, */ - {GST_VIDEO_FORMAT_Y41B, PIX_FMT_YUV410P}, + {GST_VIDEO_FORMAT_Y41B, PIX_FMT_YUV411P}, /* GST_VIDEO_FORMAT_Y42B, */ {GST_VIDEO_FORMAT_Y42B, PIX_FMT_YUV422P}, {GST_VIDEO_FORMAT_Y42B, PIX_FMT_YUVJ422P}, @@ -2240,11 +2172,14 @@ /* GST_VIDEO_FORMAT_RGB8_PALETTED, */ {GST_VIDEO_FORMAT_RGB8P, PIX_FMT_PAL8}, /* GST_VIDEO_FORMAT_YUV9, */ + {GST_VIDEO_FORMAT_YUV9, PIX_FMT_YUV410P}, /* GST_VIDEO_FORMAT_YVU9, */ /* GST_VIDEO_FORMAT_IYU1, */ /* GST_VIDEO_FORMAT_ARGB64, */ /* GST_VIDEO_FORMAT_AYUV64, */ /* GST_VIDEO_FORMAT_r210, */ + {GST_VIDEO_FORMAT_I420_10LE, PIX_FMT_YUV420P10LE}, + {GST_VIDEO_FORMAT_I420_10BE, PIX_FMT_YUV420P10BE}, {GST_VIDEO_FORMAT_I422_10LE, PIX_FMT_YUV422P10LE}, {GST_VIDEO_FORMAT_I422_10BE, PIX_FMT_YUV422P10BE}, }; @@ -2673,6 +2608,11 @@ /* QCELP is always mono, no matter what the caps say */ context->channels = 1; break; + case CODEC_ID_ADPCM_G726: + if (context->sample_rate && context->bit_rate) + context->bits_per_coded_sample = + context->bit_rate / context->sample_rate; + break; default: break; } diff -Nru gst-libav1.0-1.0.2/ext/libav/gstavpipe.h gst-libav1.0-1.0.5/ext/libav/gstavpipe.h --- gst-libav1.0-1.0.2/ext/libav/gstavpipe.h 2012-09-12 23:04:08.000000000 +0000 +++ gst-libav1.0-1.0.5/ext/libav/gstavpipe.h 2012-12-10 15:19:02.000000000 +0000 @@ -34,7 +34,7 @@ } G_STMT_END #define GST_FFMPEG_PIPE_MUTEX_UNLOCK(m) G_STMT_START { \ - GST_LOG_OBJECT (&m, "unlocking tlock from thread %p", g_thread_self ()); \ + GST_LOG_OBJECT (m, "unlocking tlock from thread %p", g_thread_self ()); \ g_mutex_unlock (&m->tlock); \ } G_STMT_END diff -Nru gst-libav1.0-1.0.2/gst-libav.doap gst-libav1.0-1.0.5/gst-libav.doap --- gst-libav1.0-1.0.2/gst-libav.doap 2012-10-25 00:32:00.000000000 +0000 +++ gst-libav1.0-1.0.5/gst-libav.doap 2013-01-08 00:59:01.000000000 +0000 @@ -34,6 +34,36 @@ + 1.0.5 + 1.0 + + 2013-01-08 + + + + + + + 1.0.4 + 1.0 + + 2012-12-18 + + + + + + + 1.0.3 + 1.0 + + 2012-11-21 + + + + + + 1.0.2 1.0 diff -Nru gst-libav1.0-1.0.2/gst-libav.spec gst-libav1.0-1.0.5/gst-libav.spec --- gst-libav1.0-1.0.2/gst-libav.spec 2012-10-24 16:57:42.000000000 +0000 +++ gst-libav1.0-1.0.5/gst-libav.spec 2013-01-04 15:08:39.000000000 +0000 @@ -4,7 +4,7 @@ %define gst_majorminor 1.0 Name: %{gstreamer}-libav -Version: 1.0.2 +Version: 1.0.5 Release: 1 Summary: GStreamer Streaming-media framework plug-in using libav (FFmpeg). Group: Libraries/Multimedia diff -Nru gst-libav1.0-1.0.2/gst-libs/ext/Makefile.am gst-libav1.0-1.0.5/gst-libs/ext/Makefile.am --- gst-libav1.0-1.0.2/gst-libs/ext/Makefile.am 2012-10-25 00:32:18.000000000 +0000 +++ gst-libav1.0-1.0.5/gst-libs/ext/Makefile.am 2013-01-08 10:54:56.000000000 +0000 @@ -36,7 +36,7 @@ maintainerclean: maintainer-clean dist-local: - GIT_DIR=libav/.git git checkout-index --prefix=$(TMP_DIST_DIR)/libav/ -a + GIT_DIR=libav/.git git checkout-index --prefix=../$(TMP_DIST_DIR)/libav/ -a touch $(TMP_DIST_DIR)/libav/config.mak echo "Patching libav ./configure" sed -e '/Unknown option/ {N;N;s/exit 1//; }' $(TMP_DIST_DIR)/libav/configure > $(TMP_DIST_DIR)/libav/configure.tmp diff -Nru gst-libav1.0-1.0.2/gst-libs/ext/Makefile.in gst-libav1.0-1.0.5/gst-libs/ext/Makefile.in --- gst-libav1.0-1.0.2/gst-libs/ext/Makefile.in 2012-10-25 00:32:18.000000000 +0000 +++ gst-libav1.0-1.0.5/gst-libs/ext/Makefile.in 2013-01-08 10:54:56.000000000 +0000 @@ -669,7 +669,7 @@ maintainerclean: maintainer-clean dist-local: - GIT_DIR=libav/.git git checkout-index --prefix=$(TMP_DIST_DIR)/libav/ -a + GIT_DIR=libav/.git git checkout-index --prefix=../$(TMP_DIST_DIR)/libav/ -a touch $(TMP_DIST_DIR)/libav/config.mak echo "Patching libav ./configure" sed -e '/Unknown option/ {N;N;s/exit 1//; }' $(TMP_DIST_DIR)/libav/configure > $(TMP_DIST_DIR)/libav/configure.tmp diff -Nru gst-libav1.0-1.0.2/ltmain.sh gst-libav1.0-1.0.5/ltmain.sh --- gst-libav1.0-1.0.2/ltmain.sh 2012-10-24 16:57:23.000000000 +0000 +++ gst-libav1.0-1.0.5/ltmain.sh 2013-01-04 15:08:20.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.1" +VERSION="2.4.2 Debian-2.4.2-1.2" TIMESTAMP="" package_revision=1.3337 diff -Nru gst-libav1.0-1.0.2/m4/libtool.m4 gst-libav1.0-1.0.5/m4/libtool.m4 --- gst-libav1.0-1.0.2/m4/libtool.m4 2012-10-24 16:57:23.000000000 +0000 +++ gst-libav1.0-1.0.5/m4/libtool.m4 2013-01-04 15:08:20.000000000 +0000 @@ -1324,7 +1324,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -1688,7 +1695,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else