[Pkg-gstreamer-commits] [SCM] GStreamer libav plugin 1.0 Packaging branch, debian-experimental, updated. debian/1.0.3-2-6-g160fb1a
Sebastian Dröge
sebastian.droege at collabora.co.uk
Wed Dec 19 10:03:46 UTC 2012
The following commit has been merged in the debian-experimental branch:
commit 160fb1a4f53fdc3bb3e3d4a3c8884f0a181c5e53
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date: Wed Dec 19 10:45:17 2012 +0100
Upload of new version using libav 9.
diff --git a/debian/changelog b/debian/changelog
index 60db322..19e5caf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-gst-libav1.0 (1.0.4-2) UNRELEASED; urgency=low
+gst-libav1.0 (1.0.4-2) experimental; urgency=low
* debian/patches/02_plugin-dependencies.patch:
+ Update for new libav sonames.
+ * Upload of new version using libav 9.
-- Sebastian Dröge <slomo at debian.org> Tue, 18 Dec 2012 12:01:15 +0100
diff --git a/debian/patches/03_git-2012-12-18.patch b/debian/patches/03_git-2012-12-19.patch
similarity index 98%
rename from debian/patches/03_git-2012-12-18.patch
rename to debian/patches/03_git-2012-12-19.patch
index cc6468f..7a75824 100644
--- a/debian/patches/03_git-2012-12-18.patch
+++ b/debian/patches/03_git-2012-12-19.patch
@@ -1,7 +1,7 @@
Index: gst-libav1.0/ext/libav/Makefile.am
===================================================================
---- gst-libav1.0.orig/ext/libav/Makefile.am 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libav/Makefile.am 2012-12-18 11:40:28.506169306 +0100
+--- gst-libav1.0.orig/ext/libav/Makefile.am 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/Makefile.am 2012-12-19 10:46:06.515992803 +0100
@@ -10,9 +10,9 @@
gstavprotocol.c \
gstavcodecmap.c \
@@ -27,8 +27,8 @@ Index: gst-libav1.0/ext/libav/Makefile.am
gstavpipe.h
Index: gst-libav1.0/ext/libav/gstav.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstav.c 2012-12-18 11:37:41.518172475 +0100
-+++ gst-libav1.0/ext/libav/gstav.c 2012-12-18 11:40:28.506169306 +0100
+--- gst-libav1.0.orig/ext/libav/gstav.c 2012-12-19 10:45:25.000000000 +0100
++++ gst-libav1.0/ext/libav/gstav.c 2012-12-19 10:46:06.515992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -70,8 +70,8 @@ Index: gst-libav1.0/ext/libav/gstav.c
}
Index: gst-libav1.0/ext/libav/gstav.h
===================================================================
---- gst-libav1.0.orig/ext/libav/gstav.h 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstav.h 2012-12-18 11:40:28.506169306 +0100
+--- gst-libav1.0.orig/ext/libav/gstav.h 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/gstav.h 2012-12-19 10:46:06.515992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -112,7 +112,7 @@ Index: gst-libav1.0/ext/libav/gstav.h
Index: gst-libav1.0/ext/libav/gstavauddec.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gst-libav1.0/ext/libav/gstavauddec.c 2012-12-18 11:40:28.506169306 +0100
++++ gst-libav1.0/ext/libav/gstavauddec.c 2012-12-19 10:46:06.515992803 +0100
@@ -0,0 +1,887 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega at cse.ogi.edu>
@@ -1004,7 +1004,7 @@ Index: gst-libav1.0/ext/libav/gstavauddec.c
Index: gst-libav1.0/ext/libav/gstavauddec.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gst-libav1.0/ext/libav/gstavauddec.h 2012-12-18 11:40:28.506169306 +0100
++++ gst-libav1.0/ext/libav/gstavauddec.h 2012-12-19 10:46:06.515992803 +0100
@@ -0,0 +1,73 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega at cse.ogi.edu>
@@ -1082,7 +1082,7 @@ Index: gst-libav1.0/ext/libav/gstavauddec.h
Index: gst-libav1.0/ext/libav/gstavaudenc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gst-libav1.0/ext/libav/gstavaudenc.c 2012-12-18 11:40:28.506169306 +0100
++++ gst-libav1.0/ext/libav/gstavaudenc.c 2012-12-19 10:46:06.515992803 +0100
@@ -0,0 +1,741 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega at cse.ogi.edu>
@@ -1828,7 +1828,7 @@ Index: gst-libav1.0/ext/libav/gstavaudenc.c
Index: gst-libav1.0/ext/libav/gstavaudenc.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gst-libav1.0/ext/libav/gstavaudenc.h 2012-12-18 11:40:28.506169306 +0100
++++ gst-libav1.0/ext/libav/gstavaudenc.h 2012-12-19 10:46:06.519992803 +0100
@@ -0,0 +1,77 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega at cse.ogi.edu>
@@ -1909,8 +1909,8 @@ Index: gst-libav1.0/ext/libav/gstavaudenc.h
+#endif /* __GST_FFMPEGAUDENC_H__ */
Index: gst-libav1.0/ext/libav/gstavcfg.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavcfg.c 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstavcfg.c 2012-12-18 11:40:28.506169306 +0100
+--- gst-libav1.0.orig/ext/libav/gstavcfg.c 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/gstavcfg.c 2012-12-19 10:46:06.519992803 +0100
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -1985,8 +1985,8 @@ Index: gst-libav1.0/ext/libav/gstavcfg.c
for (list = property_list; list; list = list->next) {
Index: gst-libav1.0/ext/libav/gstavcfg.h
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavcfg.h 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstavcfg.h 2012-12-18 11:40:28.510169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavcfg.h 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/gstavcfg.h 2012-12-19 10:46:06.519992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -2000,8 +2000,8 @@ Index: gst-libav1.0/ext/libav/gstavcfg.h
Index: gst-libav1.0/ext/libav/gstavcodecmap.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavcodecmap.c 2012-11-21 15:10:58.230244282 +0100
-+++ gst-libav1.0/ext/libav/gstavcodecmap.c 2012-12-18 11:40:28.510169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavcodecmap.c 2012-12-19 10:41:47.607997717 +0100
++++ gst-libav1.0/ext/libav/gstavcodecmap.c 2012-12-19 10:46:06.523992803 +0100
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -3806,7 +3806,7 @@ Index: gst-libav1.0/ext/libav/gstavcodecmap.c
return caps;
}
-@@ -1887,50 +2172,12 @@
+@@ -1887,53 +2172,15 @@
if (context) {
caps = gst_ffmpeg_pixfmt_to_caps (context->pix_fmt, context, codec_id);
} else {
@@ -3823,10 +3823,15 @@ Index: gst-libav1.0/ext/libav/gstavcodecmap.c
- gst_caps_append (caps, temp);
- }
- }
-- }
-- return caps;
--}
--
++ caps =
++ gst_ff_vid_caps_new (context, codec, codec_id, encode, "video/x-raw",
++ NULL);
++ if (!caps_has_field (caps, "format"))
++ gst_ffmpeg_video_set_pix_fmts (caps, codec ? codec->pix_fmts : NULL);
+ }
+ return caps;
+ }
+
-/* Convert a FFMPEG codec Type and optional AVCodecContext
- * to a GstCaps. If the context is ommitted, no fixed values
- * for video/audio size will be included in the GstCaps
@@ -3852,16 +3857,14 @@ Index: gst-libav1.0/ext/libav/gstavcodecmap.c
- default:
- caps = NULL;
- break;
-+ caps =
-+ gst_ff_vid_caps_new (context, codec, codec_id, encode, "video/x-raw",
-+ NULL);
-+ if (!caps_has_field (caps, "format"))
-+ gst_ffmpeg_video_set_pix_fmts (caps, codec ? codec->pix_fmts : NULL);
- }
+- }
-
- return caps;
- }
-
+- return caps;
+-}
+-
+ /* Convert a GstCaps (audio/raw) to a FFMPEG SampleFmt
+ * and other audio properties in a AVCodecContext.
+ *
@@ -2033,8 +2280,6 @@
context->sample_aspect_ratio.num);
}
@@ -3996,22 +3999,10 @@ Index: gst-libav1.0/ext/libav/gstavcodecmap.c
/* Convert a GstCaps and a FFMPEG codec Type to a
* AVCodecContext. If the context is ommitted, no fixed values
* for video/audio size will be included in the context
-@@ -2608,6 +2964,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;
- }
Index: gst-libav1.0/ext/libav/gstavcodecmap.h
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavcodecmap.h 2012-09-14 12:09:56.359035020 +0200
-+++ gst-libav1.0/ext/libav/gstavcodecmap.h 2012-12-18 11:40:28.510169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavcodecmap.h 2012-12-18 11:50:11.630158238 +0100
++++ gst-libav1.0/ext/libav/gstavcodecmap.h 2012-12-19 10:46:06.523992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -4082,7 +4073,7 @@ Index: gst-libav1.0/ext/libav/gstavcodecmap.h
#endif /* __GST_FFMPEG_CODECMAP_H__ */
Index: gst-libav1.0/ext/libav/gstavdec.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavdec.c 2012-09-14 12:09:56.000000000 +0200
+--- gst-libav1.0.orig/ext/libav/gstavdec.c 2012-12-18 11:50:11.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1457 +0,0 @@
-/* GStreamer
@@ -5544,8 +5535,8 @@ Index: gst-libav1.0/ext/libav/gstavdec.c
-}
Index: gst-libav1.0/ext/libav/gstavdeinterlace.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavdeinterlace.c 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstavdeinterlace.c 2012-12-18 11:40:28.510169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavdeinterlace.c 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/gstavdeinterlace.c 2012-12-19 10:46:06.523992803 +0100
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -5568,8 +5559,8 @@ Index: gst-libav1.0/ext/libav/gstavdeinterlace.c
ctx->pix_fmt = PIX_FMT_NB;
Index: gst-libav1.0/ext/libav/gstavdemux.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavdemux.c 2012-10-08 11:21:10.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstavdemux.c 2012-12-18 11:40:28.510169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavdemux.c 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/gstavdemux.c 2012-12-19 10:46:06.527992803 +0100
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -5631,7 +5622,7 @@ Index: gst-libav1.0/ext/libav/gstavdemux.c
goto open_failed;
Index: gst-libav1.0/ext/libav/gstavenc.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavenc.c 2012-09-14 12:09:56.000000000 +0200
+--- gst-libav1.0.orig/ext/libav/gstavenc.c 2012-12-18 11:50:11.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,825 +0,0 @@
-/* GStreamer
@@ -6461,7 +6452,7 @@ Index: gst-libav1.0/ext/libav/gstavenc.c
-}
Index: gst-libav1.0/ext/libav/gstavenc.h
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavenc.h 2012-09-14 12:09:56.000000000 +0200
+--- gst-libav1.0.orig/ext/libav/gstavenc.h 2012-12-18 11:50:11.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-/* GStreamer
@@ -6548,8 +6539,8 @@ Index: gst-libav1.0/ext/libav/gstavenc.h
-#endif /* __GST_FFMPEGAUDENC_H__ */
Index: gst-libav1.0/ext/libav/gstavmux.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavmux.c 2012-09-14 12:09:56.359035020 +0200
-+++ gst-libav1.0/ext/libav/gstavmux.c 2012-12-18 11:40:28.514169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavmux.c 2012-12-18 11:50:11.630158238 +0100
++++ gst-libav1.0/ext/libav/gstavmux.c 2012-12-19 10:46:06.527992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -6720,8 +6711,8 @@ Index: gst-libav1.0/ext/libav/gstavmux.c
case GST_STATE_CHANGE_READY_TO_NULL:
Index: gst-libav1.0/ext/libav/gstavpipe.h
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavpipe.h 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstavpipe.h 2012-12-18 11:40:28.514169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavpipe.h 2012-12-19 10:41:47.000000000 +0100
++++ gst-libav1.0/ext/libav/gstavpipe.h 2012-12-19 10:46:06.527992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -6733,19 +6724,10 @@ Index: gst-libav1.0/ext/libav/gstavpipe.h
*/
-@@ -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
-
Index: gst-libav1.0/ext/libav/gstavprotocol.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavprotocol.c 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstavprotocol.c 2012-12-18 11:40:28.514169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavprotocol.c 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/gstavprotocol.c 2012-12-19 10:46:06.527992803 +0100
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -7189,8 +7171,8 @@ Index: gst-libav1.0/ext/libav/gstavprotocol.c
+}
Index: gst-libav1.0/ext/libav/gstavutils.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavutils.c 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstavutils.c 2012-12-18 11:40:28.514169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavutils.c 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/gstavutils.c 2012-12-19 10:46:06.531992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -7238,8 +7220,8 @@ Index: gst-libav1.0/ext/libav/gstavutils.c
default:
Index: gst-libav1.0/ext/libav/gstavutils.h
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavutils.h 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstavutils.h 2012-12-18 11:40:28.514169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavutils.h 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/gstavutils.h 2012-12-19 10:46:06.531992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -7253,8 +7235,8 @@ Index: gst-libav1.0/ext/libav/gstavutils.h
#ifndef __GST_FFMPEG_UTILS_H__
Index: gst-libav1.0/ext/libav/gstavviddec.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavviddec.c 2012-10-08 11:21:10.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstavviddec.c 2012-12-18 11:40:28.514169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavviddec.c 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/gstavviddec.c 2012-12-19 10:46:06.531992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -7503,7 +7485,7 @@ Index: gst-libav1.0/ext/libav/gstavviddec.c
Index: gst-libav1.0/ext/libav/gstavviddec.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gst-libav1.0/ext/libav/gstavviddec.h 2012-12-18 11:40:28.514169305 +0100
++++ gst-libav1.0/ext/libav/gstavviddec.h 2012-12-19 10:46:06.531992803 +0100
@@ -0,0 +1,93 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega at cse.ogi.edu>
@@ -7600,8 +7582,8 @@ Index: gst-libav1.0/ext/libav/gstavviddec.h
+#endif
Index: gst-libav1.0/ext/libav/gstavvidenc.c
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavvidenc.c 2012-10-08 11:21:10.081027829 +0200
-+++ gst-libav1.0/ext/libav/gstavvidenc.c 2012-12-18 11:40:28.514169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavvidenc.c 2012-12-18 11:50:11.634158239 +0100
++++ gst-libav1.0/ext/libav/gstavvidenc.c 2012-12-19 10:46:06.531992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -8024,8 +8006,8 @@ Index: gst-libav1.0/ext/libav/gstavvidenc.c
/* FIXME : We should have a method to know cheaply whether we have a mapping
Index: gst-libav1.0/ext/libav/gstavvidenc.h
===================================================================
---- gst-libav1.0.orig/ext/libav/gstavvidenc.h 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libav/gstavvidenc.h 2012-12-18 11:40:28.514169305 +0100
+--- gst-libav1.0.orig/ext/libav/gstavvidenc.h 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libav/gstavvidenc.h 2012-12-19 10:46:06.531992803 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -8057,8 +8039,8 @@ Index: gst-libav1.0/ext/libav/gstavvidenc.h
#define GST_TYPE_FFMPEGVIDENC \
Index: gst-libav1.0/ext/libswscale/gstffmpegscale.c
===================================================================
---- gst-libav1.0.orig/ext/libswscale/gstffmpegscale.c 2012-09-14 12:09:56.000000000 +0200
-+++ gst-libav1.0/ext/libswscale/gstffmpegscale.c 2012-12-18 11:40:28.514169305 +0100
+--- gst-libav1.0.orig/ext/libswscale/gstffmpegscale.c 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/ext/libswscale/gstffmpegscale.c 2012-12-19 10:46:06.535992803 +0100
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -8070,10 +8052,41 @@ Index: gst-libav1.0/ext/libswscale/gstffmpegscale.c
*/
#ifdef HAVE_CONFIG_H
+Index: gst-libav1.0/gst-libav.doap
+===================================================================
+--- gst-libav1.0.orig/gst-libav.doap 2012-12-19 10:41:47.607997717 +0100
++++ gst-libav1.0/gst-libav.doap 2012-12-19 10:46:06.535992803 +0100
+@@ -34,26 +34,6 @@
+
+ <release>
+ <Version>
+- <revision>1.0.4</revision>
+- <branch>1.0</branch>
+- <name></name>
+- <created>2012-12-18</created>
+- <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.0.4.tar.xz" />
+- </Version>
+- </release>
+-
+- <release>
+- <Version>
+- <revision>1.0.3</revision>
+- <branch>1.0</branch>
+- <name></name>
+- <created>2012-11-21</created>
+- <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.0.3.tar.xz" />
+- </Version>
+- </release>
+-
+- <release>
+- <Version>
+ <revision>1.0.2</revision>
+ <branch>1.0</branch>
+ <name></name>
Index: gst-libav1.0/gst-libs/ext/Makefile.am
===================================================================
---- gst-libav1.0.orig/gst-libs/ext/Makefile.am 2012-11-21 15:10:58.000000000 +0100
-+++ gst-libav1.0/gst-libs/ext/Makefile.am 2012-12-18 11:40:28.518169305 +0100
+--- gst-libav1.0.orig/gst-libs/ext/Makefile.am 2012-12-18 11:50:11.000000000 +0100
++++ gst-libav1.0/gst-libs/ext/Makefile.am 2012-12-19 10:46:06.535992803 +0100
@@ -36,7 +36,7 @@
maintainerclean: maintainer-clean
@@ -8085,8 +8098,8 @@ Index: gst-libav1.0/gst-libs/ext/Makefile.am
sed -e '/Unknown option/ {N;N;s/exit 1//; }' $(TMP_DIST_DIR)/libav/configure > $(TMP_DIST_DIR)/libav/configure.tmp
Index: gst-libav1.0/tests/check/elements/avdec_adpcm.c
===================================================================
---- gst-libav1.0.orig/tests/check/elements/avdec_adpcm.c 2012-09-25 00:30:25.000000000 +0200
-+++ gst-libav1.0/tests/check/elements/avdec_adpcm.c 2012-12-18 11:40:28.518169305 +0100
+--- gst-libav1.0.orig/tests/check/elements/avdec_adpcm.c 2012-12-18 11:50:11.634158239 +0100
++++ gst-libav1.0/tests/check/elements/avdec_adpcm.c 2012-12-19 10:46:06.535992803 +0100
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -8100,8 +8113,8 @@ Index: gst-libav1.0/tests/check/elements/avdec_adpcm.c
#include <gst/check/gstcheck.h>
Index: gst-libav1.0/tests/check/elements/avdemux_ape.c
===================================================================
---- gst-libav1.0.orig/tests/check/elements/avdemux_ape.c 2012-09-25 00:30:25.000000000 +0200
-+++ gst-libav1.0/tests/check/elements/avdemux_ape.c 2012-12-18 11:40:28.518169305 +0100
+--- gst-libav1.0.orig/tests/check/elements/avdemux_ape.c 2012-12-18 11:50:11.634158239 +0100
++++ gst-libav1.0/tests/check/elements/avdemux_ape.c 2012-12-19 10:46:06.535992803 +0100
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -8115,8 +8128,8 @@ Index: gst-libav1.0/tests/check/elements/avdemux_ape.c
#include <gst/check/gstcheck.h>
Index: gst-libav1.0/tests/check/generic/libavcodec-locking.c
===================================================================
---- gst-libav1.0.orig/tests/check/generic/libavcodec-locking.c 2012-04-26 10:12:10.000000000 +0200
-+++ gst-libav1.0/tests/check/generic/libavcodec-locking.c 2012-12-18 11:40:28.518169305 +0100
+--- gst-libav1.0.orig/tests/check/generic/libavcodec-locking.c 2012-12-18 11:50:11.634158239 +0100
++++ gst-libav1.0/tests/check/generic/libavcodec-locking.c 2012-12-19 10:46:06.535992803 +0100
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU Library General Public
@@ -8130,8 +8143,8 @@ Index: gst-libav1.0/tests/check/generic/libavcodec-locking.c
Index: gst-libav1.0/tests/check/generic/plugin-test.c
===================================================================
---- gst-libav1.0.orig/tests/check/generic/plugin-test.c 2012-04-26 10:12:10.000000000 +0200
-+++ gst-libav1.0/tests/check/generic/plugin-test.c 2012-12-18 11:40:28.518169305 +0100
+--- gst-libav1.0.orig/tests/check/generic/plugin-test.c 2012-12-18 11:50:11.634158239 +0100
++++ gst-libav1.0/tests/check/generic/plugin-test.c 2012-12-19 10:46:06.535992803 +0100
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU Library General Public
diff --git a/debian/patches/series b/debian/patches/series
index 87e1275..cfa3387 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
02_plugin-dependencies.patch
-03_git-2012-12-18.patch
+03_git-2012-12-19.patch
04_gstreamer-1.0.patch
99_ltmain_as-needed.patch
--
GStreamer libav plugin 1.0 Packaging
More information about the Pkg-gstreamer-commits
mailing list