From slomo at moszumanska.debian.org Mon Sep 1 06:47:35 2014 From: slomo at moszumanska.debian.org (=?UTF-8?Q?Sebastian_Dr=C3=B6ge?=) Date: Mon, 01 Sep 2014 06:47:35 +0000 Subject: [Pkg-gstreamer-commits] [gst-libav1.0] branch master updated (fc2ed40 -> 9bcf1ff) Message-ID: <20140901064730.5455.29403@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. slomo pushed a change to branch master in repository gst-libav1.0. from fc2ed40 Merge tag 'upstream/1.4.1' new 6af6912 New upstream bugfix release. new 9bcf1ff Non-maintainer upload with maintainer's consent The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 13 +++++++++++ debian/control | 6 ++--- debian/patches/03_libav11.patch | 50 +++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 debian/patches/03_libav11.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-libav1.0.git From slomo at moszumanska.debian.org Mon Sep 1 06:47:35 2014 From: slomo at moszumanska.debian.org (=?UTF-8?Q?Sebastian_Dr=C3=B6ge?=) Date: Mon, 01 Sep 2014 06:47:35 +0000 Subject: [Pkg-gstreamer-commits] [gst-libav1.0] 01/02: New upstream bugfix release. In-Reply-To: <20140901064730.5455.29403@moszumanska.debian.org> References: <20140901064730.5455.29403@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. slomo pushed a commit to branch master in repository gst-libav1.0. commit 6af69127571807b1300484442ec184a681498742 Author: Sebastian Dr?ge Date: Mon Sep 1 09:46:58 2014 +0300 New upstream bugfix release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e6b16e4..52ba310 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gst-libav1.0 (1.4.1-1) unstable; urgency=medium + + * New upstream bugfix release. + + -- Sebastian Dr?ge Wed, 27 Aug 2014 14:55:16 +0300 + gst-libav1.0 (1.4.0-1) unstable; urgency=medium * New upstream stable release. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-libav1.0.git From slomo at moszumanska.debian.org Mon Sep 1 06:47:35 2014 From: slomo at moszumanska.debian.org (=?UTF-8?Q?Sebastian_Dr=C3=B6ge?=) Date: Mon, 01 Sep 2014 06:47:35 +0000 Subject: [Pkg-gstreamer-commits] [gst-libav1.0] 02/02: Non-maintainer upload with maintainer's consent In-Reply-To: <20140901064730.5455.29403@moszumanska.debian.org> References: <20140901064730.5455.29403@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. slomo pushed a commit to branch master in repository gst-libav1.0. commit 9bcf1ff18a134d0e50b798d055f2d20fdf1be678 Author: Sebastian Dr?ge Date: Mon Sep 1 09:47:20 2014 +0300 Non-maintainer upload with maintainer's consent * Non-maintainer upload with maintainer's consent * Fix compilation against liba11 --- debian/changelog | 7 ++++++ debian/control | 6 ++--- debian/patches/03_libav11.patch | 50 +++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 61 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 52ba310..b17281f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gst-libav1.0 (1.4.1-1.1) unstable; urgency=medium + + * Non-maintainer upload with maintainer's consent + * Fix compilation against liba11 + + -- Reinhard Tartler Sat, 30 Aug 2014 16:25:21 -0400 + gst-libav1.0 (1.4.1-1) unstable; urgency=medium * New upstream bugfix release. diff --git a/debian/control b/debian/control index 3e583c7..cb45e68 100644 --- a/debian/control +++ b/debian/control @@ -21,9 +21,9 @@ Build-Depends: debhelper (>= 9), libgstreamer1.0-dev (>= 1.4.0), libgstreamer-plugins-base1.0-dev (>= 1.4.0), liborc-0.4-dev (>= 1:0.4.16), - libavcodec-dev (>= 6:10), - libavformat-dev (>= 6:10), - libswscale-dev (>= 6:10), + libavcodec-dev (>= 6:11~), + libavformat-dev (>= 6:11~), + libswscale-dev (>= 6:11~), libbz2-dev, yasm Standards-Version: 3.9.3 diff --git a/debian/patches/03_libav11.patch b/debian/patches/03_libav11.patch new file mode 100644 index 0000000..8bb1f2a --- /dev/null +++ b/debian/patches/03_libav11.patch @@ -0,0 +1,50 @@ +From 9efc92a3a1b560e2598f52c03346bfb4f18f3300 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +Date: Tue, 12 Aug 2014 16:17:11 +0300 +Subject: libav: Minor changes to build properly with v11alpha1 + + +diff --git a/configure.ac b/configure.ac +index 229ea9b..64be10b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -246,7 +246,7 @@ AC_ARG_WITH(system-libav, + [AC_HELP_STRING([--with-system-libav], [use system Libav libraries])]) + + if test "x$with_system_libav" = "xyes"; then +- PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavutil) ++ PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavresample libavutil) + PKG_CHECK_MODULES(SWSCALE, libswscale libavutil) + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS" +@@ -265,12 +265,13 @@ else + + LIBAV_DEPS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \ + \$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \ ++ \$(top_builddir)/gst-libs/ext/libav/libavresample/libavresample.a \ + \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a" + if test "x$enable_static_plugins" = xyes; then + dnl with static linking we can't use the .a archive directly as they would + dnl be included in the final libgstlibav.a as a file and won't be usable. + dnl libav*.a must be copied to the final destination too +- LIBAV_LIBS="-lavformat -lavcodec -lavutil" ++ LIBAV_LIBS="-lavformat -lavcodec -lavresample -lavutil" + else + dnl libgstlibav.la: libs to statically link to + LIBAV_LIBS="$LIBAV_DEPS" +diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c +index a635fd4..a85f547 100644 +--- a/ext/libav/gstavcfg.c ++++ b/ext/libav/gstavcfg.c +@@ -176,7 +176,7 @@ gst_ffmpeg_idct_algo_get_type (void) + {FF_IDCT_SH4, "SH4", "sh4"}, + {FF_IDCT_SIMPLEARM, "Simple ARM", "simplearm"}, + {FF_IDCT_IPP, "IPP", "ipp"}, +- {FF_IDCT_XVIDMMX, "XVID MMX", "xvidmmx"}, ++ {FF_IDCT_XVID, "XVID", "xvid"}, + {FF_IDCT_SIMPLEARMV5TE, "Simple ARMV5TE", "simplearmv5te"}, + {FF_IDCT_SIMPLEARMV6, "Simple ARMV6", "simplearmv6"}, + {FF_IDCT_SIMPLEVIS, "Simple Vis", "simplevis"}, +-- +cgit v0.10.2 + diff --git a/debian/patches/series b/debian/patches/series index 08f1029..e91e814 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 02_plugin-dependencies.patch +03_libav11.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-libav1.0.git From slomo at moszumanska.debian.org Mon Sep 1 06:47:37 2014 From: slomo at moszumanska.debian.org (=?UTF-8?Q?Sebastian_Dr=C3=B6ge?=) Date: Mon, 01 Sep 2014 06:47:37 +0000 Subject: [Pkg-gstreamer-commits] [gst-libav1.0] annotated tag debian/1.4.1-1 created (now d5fe7d8) Message-ID: <20140901064737.5640.50965@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. slomo pushed a change to annotated tag debian/1.4.1-1 in repository gst-libav1.0. at d5fe7d8 (tag) tagging 6af69127571807b1300484442ec184a681498742 (commit) replaces debian/1.4.0-1 tagged by Sebastian Dr?ge on Mon Sep 1 09:47:08 2014 +0300 - Log ----------------------------------------------------------------- gst-libav1.0 Debian release 1.4.1-1 Sebastian Dr?ge (3): Imported Upstream version 1.4.1 Merge tag 'upstream/1.4.1' New upstream bugfix release. ----------------------------------------------------------------------- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-libav1.0.git From slomo at moszumanska.debian.org Mon Sep 1 06:47:38 2014 From: slomo at moszumanska.debian.org (=?UTF-8?Q?Sebastian_Dr=C3=B6ge?=) Date: Mon, 01 Sep 2014 06:47:38 +0000 Subject: [Pkg-gstreamer-commits] [gst-libav1.0] annotated tag debian/1.4.1-1.1 created (now dbb990b) Message-ID: <20140901064737.5640.11050@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. slomo pushed a change to annotated tag debian/1.4.1-1.1 in repository gst-libav1.0. at dbb990b (tag) tagging 9bcf1ff18a134d0e50b798d055f2d20fdf1be678 (commit) replaces debian/1.4.1-1 tagged by Sebastian Dr?ge on Mon Sep 1 09:47:23 2014 +0300 - Log ----------------------------------------------------------------- gst-libav1.0 Debian release 1.4.1-1.1 Sebastian Dr?ge (1): Non-maintainer upload with maintainer's consent ----------------------------------------------------------------------- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-libav1.0.git