[Pkg-gstreamer-commits] [gst-libav1.0] 03/03: New upstream GIT snapshot.

[Sebastian Dröge]

This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch debian-experimental
in repository gst-libav1.0.

commit 1a87e74036ae291d83a6a8581d6de71cafe466d3
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Tue Mar 17 10:21:33 2015 +0100

    New upstream GIT snapshot.
---
 debian/changelog                            |  6 ++++
 debian/control                              |  4 +--
 debian/patches/02_plugin-dependencies.patch | 18 -----------
 debian/patches/03_libav11.patch             | 50 -----------------------------
 debian/patches/series                       |  2 --
 5 files changed, 8 insertions(+), 72 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 431360c..85d2565 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gst-libav1.0 (1.5.0.1+git20150316-1) experimental; urgency=medium
+
+  * New upstream GIT snapshot.
+
+ -- Sebastian Dröge <slomo at debian.org>  Tue, 17 Mar 2015 10:03:03 +0100
+
 gst-libav1.0 (1.4.5-1) experimental; urgency=medium
 
   * New upstream bugfix release.
diff --git a/debian/control b/debian/control
index cb45e68..bb93fff 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends: debhelper (>= 9),
                zlib1g-dev,
                libglib2.0-dev (>= 2.32),
                pkg-config (>= 0.11.0),
-               libgstreamer1.0-dev (>= 1.4.0),
-               libgstreamer-plugins-base1.0-dev (>= 1.4.0),
+               libgstreamer1.0-dev (>= 1.5.0.1+git20150316),
+               libgstreamer-plugins-base1.0-dev (>= 1.5.0.1+git20150316),
                liborc-0.4-dev (>= 1:0.4.16),
                libavcodec-dev (>= 6:11~),
                libavformat-dev (>= 6:11~),
diff --git a/debian/patches/02_plugin-dependencies.patch b/debian/patches/02_plugin-dependencies.patch
deleted file mode 100644
index ab5dc03..0000000
--- a/debian/patches/02_plugin-dependencies.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: gst-libav1.0/ext/libav/gstav.c
-===================================================================
---- gst-libav1.0.orig/ext/libav/gstav.c	2012-09-14 12:09:56.359035020 +0200
-+++ gst-libav1.0/ext/libav/gstav.c	2012-12-18 11:40:42.190169045 +0100
-@@ -134,6 +134,13 @@
- 
-   av_register_all ();
- 
-+  gst_plugin_add_dependency_simple (plugin, NULL,
-+      "/usr/lib:/usr/local/lib",
-+      "libavcodec.so.55,"
-+      "libavformat.so.55,"
-+      "libswscale.so.2",
-+      GST_PLUGIN_DEPENDENCY_FLAG_NONE);
-+
-   gst_ffmpegaudenc_register (plugin);
-   gst_ffmpegvidenc_register (plugin);
-   gst_ffmpegauddec_register (plugin);
diff --git a/debian/patches/03_libav11.patch b/debian/patches/03_libav11.patch
deleted file mode 100644
index 8bb1f2a..0000000
--- a/debian/patches/03_libav11.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 9efc92a3a1b560e2598f52c03346bfb4f18f3300 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian at centricular.com>
-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 e91e814..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-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