Compare commits

..

5 Commits
master ... f14

Author SHA1 Message Date
Jesse Keating 277014dcbe - Rebuilt for gcc bug 634757 2010-09-29 22:29:21 -07:00
Hans de Goede 1c9bea1c0c - Rebuild for new wildmidi 2010-09-15 20:15:30 +02:00
Dan Horák 4c8c36593c - no Firewire on s390(x) 2010-09-13 11:55:22 +02:00
Benjamin Otte ff056aa6b4 Update to 0.10.20
Reenable celt, too.
2010-09-06 17:00:51 +02:00
Benjamin Otte 3991664f33 Disable NAS now that it's obsolete 2010-08-06 17:27:05 +02:00
19 changed files with 86 additions and 1223 deletions

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
/gst-plugins-bad-free-0.10.22.tar.bz2
/gst-plugins-bad-free-0.10.23.tar.xz
gst-plugins-bad-free-0.10.19.tar.bz2
/gst-plugins-bad-free-0.10.20.tar.bz2

View File

@ -1,73 +0,0 @@
From 6bc5fda6d9914e7de31af84ccd9e843e0c1cb398 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 2 May 2013 17:04:02 -0400
Subject: [PATCH] Delete unbuilt plugins from the docs
So the gtk-doc builds, and life can go on.
---
docs/plugins/Makefile.am | 1 -
docs/plugins/gst-plugins-bad-plugins-docs.sgml | 2 --
docs/plugins/gst-plugins-bad-plugins-sections.txt | 15 ---------------
3 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 99f280d..e8c7434 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -103,7 +103,6 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/timidity/gsttimidity.h \
$(top_srcdir)/ext/timidity/gstwildmidi.h \
$(top_srcdir)/ext/voaacenc/gstvoaacenc.h \
- $(top_srcdir)/ext/voamrwbenc/gstvoamrwbenc.h \
$(top_srcdir)/ext/vp8/gstvp8enc.h \
$(top_srcdir)/ext/vp8/gstvp8dec.h \
$(top_srcdir)/ext/zbar/gstzbar.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 07fcdaa..10e7b5b 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -127,7 +127,6 @@
<xi:include href="xml/element-wildmidi.xml" />
<xi:include href="xml/element-zbar.xml" />
<xi:include href="xml/element-voaacenc.xml" />
- <xi:include href="xml/element-voamrwbenc.xml" />
<xi:include href="xml/element-vp8dec.xml" />
<xi:include href="xml/element-vp8enc.xml" />
<xi:include href="xml/element-wavescope.xml" />
@@ -221,7 +220,6 @@
<xi:include href="xml/plugin-wildmidi.xml" />
<xi:include href="xml/plugin-xvid.xml" />
<xi:include href="xml/plugin-voaacenc.xml" />
- <xi:include href="xml/plugin-voamrwbenc.xml" />
<xi:include href="xml/plugin-vp8.xml" />
<xi:include href="xml/plugin-zbar.xml" />
</chapter>
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index d7fc96e..6ddc81d 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -1667,21 +1667,6 @@ GST_TYPE_VOAACENC
gst_voaacenc_get_type
</SECTION>
-<SECTION>
-<FILE>element-voamrwbenc</FILE>
-<TITLE>voamrwbenc</TITLE>
-GstVoAmrwbEnc
-<SUBSECTION Standard>
-GstVoAmrwbEncClass
-GST_VOAMRWBENC
-GST_VOAMRWBENC_CLASS
-GST_IS_VOAMRWBENC
-GST_IS_VOAMRWBENC_CLASS
-GST_TYPE_VOAMRWBENC
-gst_voamrwbenc_get_type
-</SECTION>
-
-<SECTION>
<FILE>element-vp8dec</FILE>
<TITLE>vp8dec</TITLE>
GstVP8Dec
--
1.7.1

View File

@ -1,26 +0,0 @@
From 62c58f011e7069aa45e980930cdfa2d937920a77 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 8 Jun 2012 10:57:54 +0200
Subject: [PATCH 1/4] gstcamerabin: Fix spelling error in debug logging
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
gst/camerabin/gstcamerabin.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c
index a17e02c..8a36970 100644
--- a/gst/camerabin/gstcamerabin.c
+++ b/gst/camerabin/gstcamerabin.c
@@ -1517,7 +1517,7 @@ gst_camerabin_set_capsfilter_caps (GstCameraBin * camera, GstCaps * new_caps)
if (camera->src_zoom_filter)
g_object_set (G_OBJECT (camera->src_zoom_filter), "caps", new_caps, NULL);
gst_camerabin_update_aspect_filter (camera, new_caps);
- GST_INFO_OBJECT (camera, "udpated");
+ GST_INFO_OBJECT (camera, "updated");
}
/*
--
1.7.10.2

View File

@ -1,29 +0,0 @@
From fd4cb22ae42b146e327b12aa0507b59520ba1db2 Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane@canonical.com>
Date: Tue, 10 Sep 2013 08:48:32 +0000
Subject: [PATCH] modplug: Specify directory when including stdafx.h
modplug stopped exposing their directory in their pcfile, meaining
consumers accessing the headers directly fail to build.
http://sourceforge.net/p/modplug-xmms/git/ci/75e9b166982ed637b59ef7cbc1835a09f768923e/
---
ext/modplug/gstmodplug.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/modplug/gstmodplug.cc b/ext/modplug/gstmodplug.cc
index 47154cf..a968c4a 100644
--- a/ext/modplug/gstmodplug.cc
+++ b/ext/modplug/gstmodplug.cc
@@ -54,7 +54,7 @@
#define WORDS_BIGENDIAN 0
#endif
-#include <stdafx.h>
+#include <libmodplug/stdafx.h>
#include <libmodplug/sndfile.h>
#include "gstmodplug.h"
--
1.8.5.3

View File

@ -1,50 +0,0 @@
From 26f4b2c203d6d0ef0c8204a48dba504870c2cfdf Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 6 Dec 2016 10:24:03 +0100
Subject: [PATCH 1/2] vmncdec: Sanity-check width/height before using it
We will allocate a screen area of width*height*bpp bytes, however this
calculation can easily overflow if too high width or height are given
inside the stream. Nonetheless we would just assume that enough memory
was allocated, try to fill it and overwrite as much memory as wanted.
Also allocate the screen area filled with zeroes to ensure that we start
with full-black and not any random (or not so random) data.
https://scarybeastsecurity.blogspot.gr/2016/11/0day-poc-risky-design-decisions-in.html
Ideally we should just remove this plugin in favour of the one in
gst-libav, which generally seems to be of better code quality.
https://bugzilla.gnome.org/show_bug.cgi?id=774533
---
gst/vmnc/vmncdec.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gst/vmnc/vmncdec.c b/gst/vmnc/vmncdec.c
index 08085b5..c83e315 100644
--- a/gst/vmnc/vmncdec.c
+++ b/gst/vmnc/vmncdec.c
@@ -370,7 +370,7 @@ vmnc_handle_wmvi_rectangle (GstVMncDec * dec, struct RfbRectangle *rect,
if (dec->imagedata)
g_free (dec->imagedata);
- dec->imagedata = g_malloc (dec->format.width * dec->format.height *
+ dec->imagedata = g_malloc0 (dec->format.width * dec->format.height *
dec->format.bytes_per_pixel);
GST_DEBUG_OBJECT (dec, "Allocated image data at %p", dec->imagedata);
@@ -901,6 +901,10 @@ vmnc_handle_packet (GstVMncDec * dec, const guint8 * data, int len,
GST_WARNING_OBJECT (dec, "Rectangle out of range, type %d", r.type);
return ERROR_INVALID;
}
+ } else if (r.width > 16384 || r.height > 16384) {
+ GST_WARNING_OBJECT (dec, "Width or height too high: %ux%u", r.width,
+ r.height);
+ return ERROR_INVALID;
}
switch (r.type) {
--
2.9.3

View File

@ -1,121 +0,0 @@
From a07a1138a8cf8ad1029845dfe4cfdf5a0a36e670 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 8 Jun 2012 11:31:05 +0200
Subject: [PATCH 2/4] camerabin: Add a camerabin_create_view_finder_caps()
helper function
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
gst/camerabin/gstcamerabin.c | 72 +++++++++++++++++++++++-------------------
1 file changed, 40 insertions(+), 32 deletions(-)
diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c
index 8a36970..3f87ff9 100644
--- a/gst/camerabin/gstcamerabin.c
+++ b/gst/camerabin/gstcamerabin.c
@@ -505,22 +505,15 @@ GST_BOILERPLATE_FULL (GstCameraBin, gst_camerabin, GstPipeline,
*/
/*
- * camerabin_setup_src_elements:
+ * camerabin_create_view_finder_caps:
* @camera: camerabin object
*
- * This function updates camerabin capsfilters according
- * to fps, resolution and zoom that have been configured
- * to camerabin.
+ * This function creates new view_finder_caps, according to
+ * fps and resolution that have been configured to camerabin.
*/
-static void
-camerabin_setup_src_elements (GstCameraBin * camera)
+static GstCaps *camerabin_create_view_finder_caps (GstCameraBin * camera)
{
GstStructure *st;
- GstCaps *new_caps;
- gboolean detect_framerate = FALSE;
-
- /* clear video update status */
- camera->video_capture_caps_update = FALSE;
if (!camera->view_finder_caps) {
st = gst_structure_from_string (CAMERABIN_DEFAULT_VF_CAPS, NULL);
@@ -529,39 +522,54 @@ camerabin_setup_src_elements (GstCameraBin * camera)
0));
}
- gst_camerabin_monitor_video_source_properties (camera);
-
if (camera->app_width > 0 && camera->app_height > 0) {
gst_structure_set (st,
"width", G_TYPE_INT, camera->app_width,
"height", G_TYPE_INT, camera->app_height, NULL);
}
- if (camera->app_fps_n > 0 && camera->app_fps_d > 0) {
- if (camera->night_mode) {
- GST_INFO_OBJECT (camera, "night mode, lowest allowed fps will be forced");
- camera->pre_night_fps_n = camera->app_fps_n;
- camera->pre_night_fps_d = camera->app_fps_d;
- detect_framerate = TRUE;
- } else {
- gst_structure_set (st,
- "framerate", GST_TYPE_FRACTION, camera->app_fps_n,
- camera->app_fps_d, NULL);
- new_caps = gst_caps_new_full (st, NULL);
- }
+ if (!camera->night_mode && camera->app_fps_n > 0 && camera->app_fps_d > 0) {
+ gst_structure_set (st,
+ "framerate", GST_TYPE_FRACTION, camera->app_fps_n,
+ camera->app_fps_d, NULL);
} else {
- GST_DEBUG_OBJECT (camera, "no framerate specified");
- detect_framerate = TRUE;
- }
-
- if (detect_framerate) {
- GST_DEBUG_OBJECT (camera, "detecting allowed framerate");
/* Remove old framerate if any */
if (gst_structure_has_field (st, "framerate")) {
gst_structure_remove_field (st, "framerate");
}
- new_caps = gst_caps_new_full (st, NULL);
+ }
+
+ /* The returned caps take ownership of the structure st */
+ return gst_caps_new_full (st, NULL);
+}
+/*
+ * camerabin_setup_src_elements:
+ * @camera: camerabin object
+ *
+ * This function updates camerabin capsfilters according
+ * to fps, resolution and zoom that have been configured
+ * to camerabin.
+ */
+static void
+camerabin_setup_src_elements (GstCameraBin * camera)
+{
+ GstCaps *new_caps;
+
+ /* clear video update status */
+ camera->video_capture_caps_update = FALSE;
+
+ gst_camerabin_monitor_video_source_properties (camera);
+
+ new_caps = camerabin_create_view_finder_caps (camera);
+
+ if (camera->night_mode || camera->app_fps_n <= 0 || camera->app_fps_d <= 0) {
+ if (camera->night_mode) {
+ GST_INFO_OBJECT (camera, "night mode, lowest allowed fps will be forced");
+ camera->pre_night_fps_n = camera->app_fps_n;
+ camera->pre_night_fps_d = camera->app_fps_d;
+ }
+ GST_DEBUG_OBJECT (camera, "detecting allowed framerate");
/* Set allowed framerate for the resolution */
gst_camerabin_set_allowed_framerate (camera, new_caps);
}
--
1.7.10.2

View File

@ -1,28 +0,0 @@
From 3003cbe1624cc6daa416caba9c1dce0180f3837c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 7 Dec 2016 09:37:10 +0100
Subject: [PATCH 2/2] h264parse: Ensure codec_data has the required size when
reading number of SPS
https://bugzilla.gnome.org/show_bug.cgi?id=774896
---
gst/videoparsers/gsth264parse.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c
index cf81657..4c14f2b 100644
--- a/gst/videoparsers/gsth264parse.c
+++ b/gst/videoparsers/gsth264parse.c
@@ -1605,6 +1605,9 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
off = nalu.offset + nalu.size;
}
+ if (off >= size) {
+ goto avcc_too_small;
+ }
num_pps = data[off];
off++;
--
2.9.3

View File

@ -1,97 +0,0 @@
From 1ef6977002ef18631f81646f198ef6a667ef8f73 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 8 Jun 2012 11:41:17 +0200
Subject: [PATCH 3/4] camerabin: Add
gst_camerabin_get_video_source_properties() helper
function
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
gst/camerabin/gstcamerabin.c | 31 +++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c
index 3f87ff9..a36d5b5 100644
--- a/gst/camerabin/gstcamerabin.c
+++ b/gst/camerabin/gstcamerabin.c
@@ -347,6 +347,7 @@ static void gst_camerabin_scene_mode_notify_cb (GObject * video_source,
GParamSpec * pspec, gpointer user_data);
static void gst_camerabin_zoom_notify_cb (GObject * video_source,
GParamSpec * pspec, gpointer user_data);
+static void gst_camerabin_get_video_source_properties (GstCameraBin * camera);
static void gst_camerabin_monitor_video_source_properties (GstCameraBin *
camera);
static void gst_camerabin_configure_format (GstCameraBin * camera,
@@ -528,6 +529,8 @@ static GstCaps *camerabin_create_view_finder_caps (GstCameraBin * camera)
"height", G_TYPE_INT, camera->app_height, NULL);
}
+ gst_camerabin_get_video_source_properties (camera);
+
if (!camera->night_mode && camera->app_fps_n > 0 && camera->app_fps_d > 0) {
gst_structure_set (st,
"framerate", GST_TYPE_FRACTION, camera->app_fps_n,
@@ -559,8 +562,6 @@ camerabin_setup_src_elements (GstCameraBin * camera)
/* clear video update status */
camera->video_capture_caps_update = FALSE;
- gst_camerabin_monitor_video_source_properties (camera);
-
new_caps = camerabin_create_view_finder_caps (camera);
if (camera->night_mode || camera->app_fps_n <= 0 || camera->app_fps_d <= 0) {
@@ -574,6 +575,8 @@ camerabin_setup_src_elements (GstCameraBin * camera)
gst_camerabin_set_allowed_framerate (camera, new_caps);
}
+ gst_camerabin_monitor_video_source_properties (camera);
+
/* Set default zoom method */
if (camera->src_zoom_scale) {
g_object_set (camera->src_zoom_scale, "method",
@@ -2660,6 +2663,26 @@ gst_camerabin_zoom_notify_cb (GObject * video_source, GParamSpec * pspec,
}
/*
+ * gst_camerabin_monitor_get_video_source_properties:
+ * @camera: camerabin object
+ *
+ * Get properties from video source photography interface property scene mode.
+ *
+ */
+static void
+gst_camerabin_get_video_source_properties (GstCameraBin * camera)
+{
+ if (GST_IS_ELEMENT (camera->src_vid_src) &&
+ gst_element_implements_interface (camera->src_vid_src,
+ GST_TYPE_PHOTOGRAPHY)) {
+ gint scene_mode;
+ g_object_get (G_OBJECT (camera->src_vid_src), "scene-mode", &scene_mode,
+ NULL);
+ camera->night_mode = scene_mode == GST_PHOTOGRAPHY_SCENE_MODE_NIGHT;
+ }
+}
+
+/*
* gst_camerabin_monitor_video_source_properties:
* @camera: camerabin object
*
@@ -2674,15 +2697,11 @@ gst_camerabin_monitor_video_source_properties (GstCameraBin * camera)
if (GST_IS_ELEMENT (camera->src_vid_src) &&
gst_element_implements_interface (camera->src_vid_src,
GST_TYPE_PHOTOGRAPHY)) {
- gint scene_mode;
GST_DEBUG_OBJECT (camera,
"connecting to %" GST_PTR_FORMAT " - notify::scene-mode",
camera->src_vid_src);
g_signal_connect (G_OBJECT (camera->src_vid_src), "notify::scene-mode",
(GCallback) gst_camerabin_scene_mode_notify_cb, camera);
- g_object_get (G_OBJECT (camera->src_vid_src), "scene-mode", &scene_mode,
- NULL);
- camera->night_mode = scene_mode == GST_PHOTOGRAPHY_SCENE_MODE_NIGHT;
GST_DEBUG_OBJECT (camera,
"connecting to %" GST_PTR_FORMAT " - notify::zoom",
--
1.7.10.2

View File

@ -1,74 +0,0 @@
From 9ea00bf5e7043cab7da93abcb345b2f5c65285de Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 8 Jun 2012 13:39:37 +0200
Subject: [PATCH 4/4] camerabin: Set src_filter and zoom_src_filter caps while
creating the pipeline
We (Fedora) have been receiving bug reports for cheese, about cheese
taking 30-60 seconds before showing video, and pausing the same amount of
time when changing the resolution for example.
I've managed to reproduce this with a Logitech Webcam Pro 9000, which
supports a large list of resolutions at about 5 different framerates /
resolution, in my case with an unmodified gst-plugins-bad-0.10.23, the
camerabin_create_src_elements function takes approx 7 seconds.
Running under gdb and interrupting the execution during these 7 seconds
consistenly points to gst_caps_intersect_full.
Part of the problem is cheese setting the
GST_CAMERABIN_FLAG_SOURCE_COLOR_CONVERSION flag, which means that after
the first ffmpegcsp element in the pipe the total number of caps is
x resolutions * y framerates * z formats, where both x (due to the camera)
and z (due to ffmpegcsp) being large. intersecting this with the capabilities
of other parts of the pipeline simply leads to an explosion of combinations
which pegs my core i5 CPU @3.1GHz for 7 seconds!
This patch fixes this issue by setting up the capsfilter elements in the pipe
with an initial filter, greatly reducing the number of combinations when doing
cap intersecting.
This reduces the time spend in camerabin_create_src_elements from approx 7
to 0.2 seconds. And when patching cheese to use the default camerabin flags,
(so removing the first ffmpegcsp element) from approx 0.7 to 0.04 seconds
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
gst/camerabin/gstcamerabin.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c
index a36d5b5..6d7d30f 100644
--- a/gst/camerabin/gstcamerabin.c
+++ b/gst/camerabin/gstcamerabin.c
@@ -606,6 +606,7 @@ camerabin_create_src_elements (GstCameraBin * camera)
gboolean ret = FALSE;
GstBin *cbin = GST_BIN (camera);
gchar *driver_name = NULL;
+ GstCaps *filter_caps;
/* Add application set or default video src element */
if (!(camera->src_vid_src = gst_camerabin_setup_default_element (cbin,
@@ -625,6 +626,10 @@ camerabin_create_src_elements (GstCameraBin * camera)
gst_camerabin_create_and_add_element (cbin, "capsfilter",
"src-capsfilter")))
goto done;
+
+ filter_caps = camerabin_create_view_finder_caps (camera);
+ g_object_set (G_OBJECT (camera->src_filter), "caps", filter_caps, NULL);
+
if (camera->flags & GST_CAMERABIN_FLAG_SOURCE_RESIZE) {
if (!(camera->src_zoom_crop =
gst_camerabin_create_and_add_element (cbin, "videocrop",
@@ -638,6 +643,8 @@ camerabin_create_src_elements (GstCameraBin * camera)
gst_camerabin_create_and_add_element (cbin, "capsfilter",
"src-resize-capsfilter")))
goto done;
+ g_object_set (G_OBJECT (camera->src_zoom_filter), "caps", filter_caps,
+ NULL);
}
if (camera->app_video_filter) {
if (!gst_camerabin_add_element (cbin, camera->app_video_filter)) {
--
1.7.10.2

View File

@ -1,37 +0,0 @@
From 4e7edb2778f85a5475ffe9c782c91d86a7b902ca Mon Sep 17 00:00:00 2001
From: Oleksij Rempel (Alexey Fisher) <bug-track@fisher-privat.net>
Date: Mon, 12 Mar 2012 14:42:04 +0000
Subject: geometrictransform: make sure gt->map not freed twice
current cheese can create situation where gt->map is freed twice.
This patch set map to null to avoid it.
https://bugzilla.gnome.org/show_bug.cgi?id=671910
diff --git a/gst/geometrictransform/gstgeometrictransform.c b/gst/geometrictransform/gstgeometrictransform.c
index 8e78de7..274d483 100644
--- a/gst/geometrictransform/gstgeometrictransform.c
+++ b/gst/geometrictransform/gstgeometrictransform.c
@@ -143,9 +143,10 @@ gst_geometric_transform_generate_map (GstGeometricTransform * gt)
}
end:
- if (!ret)
+ if (!ret) {
g_free (gt->map);
- else
+ gt->map = NULL;
+ } else
gt->needs_remap = FALSE;
return ret;
}
@@ -348,6 +349,7 @@ gst_geometric_transform_stop (GstBaseTransform * trans)
GstGeometricTransform *gt = GST_GEOMETRIC_TRANSFORM_CAST (trans);
g_free (gt->map);
+ gt->map = NULL;
return TRUE;
}
--
cgit v0.9.0.2-2-gbebe

View File

@ -1,36 +0,0 @@
From 7dd5b2002abf516ebdf92696c57a9a7692c166e9 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.com>
Date: Tue, 20 Mar 2012 23:07:11 +0000
Subject: geometrictransform: Prevent access to the transform map when it is null
Check if the map doesn't exist when receiving a new caps and create
a new one. This prevents that the transform functions try to access
the map when it doesn't exist.
diff --git a/gst/geometrictransform/gstgeometrictransform.c b/gst/geometrictransform/gstgeometrictransform.c
index be651a4..a1ec3ab 100644
--- a/gst/geometrictransform/gstgeometrictransform.c
+++ b/gst/geometrictransform/gstgeometrictransform.c
@@ -178,8 +178,8 @@ gst_geometric_transform_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
/* regenerate the map */
GST_OBJECT_LOCK (gt);
- if (old_width == 0 || old_height == 0 || gt->width != old_width ||
- gt->height != old_height) {
+ if (gt->map == NULL || old_width == 0 || old_height == 0
+ || gt->width != old_width || gt->height != old_height) {
if (klass->prepare_func)
if (!klass->prepare_func (gt)) {
GST_OBJECT_UNLOCK (gt);
@@ -352,6 +352,9 @@ gst_geometric_transform_stop (GstBaseTransform * trans)
{
GstGeometricTransform *gt = GST_GEOMETRIC_TRANSFORM_CAST (trans);
+ gt->width = 0;
+ gt->height = 0;
+
g_free (gt->map);
gt->map = NULL;
--
cgit v0.9.0.2-2-gbebe

View File

@ -11,7 +11,7 @@
SOURCE="$1"
NEW_SOURCE=`echo $SOURCE | sed 's/bad-/bad-free-/'`
DIRECTORY=`echo $SOURCE | sed 's/\.tar\.xz//'`
DIRECTORY=`echo $SOURCE | sed 's/\.tar\.bz2//'`
ALLOWED="
aacparse
@ -20,82 +20,62 @@ adpcmenc
aiff
aiffparse
amrparse
asfmux
audioparsers
audiovisualizers
autoconvert
bayer
camerabin
camerabin2
cdxaparse
coloreffects
colorspace
dataurisrc
dccp
debugutils
dtmf
faceoverlay
festival
fieldanalysis
freeverb
freeze
frei0r
gaudieffects
geometrictransform
h264parse
hdvparse
hls
id3tag
inter
interlace
invtelecine
ivfparse
jpegformat
jp2kdecimator
legacyresample
librfb
liveadder
mve
mpegdemux
mpeg4videoparse
mpegpsmux
mpegtsdemux
mpegtsmux
mpegvideoparse
mxf
nsf
nuvdemux
patchdetect
pcapparse
pnm
qtmux
rawparse
removesilence
rtpmux
rtpvp8
scaletempo
sdi
sdp
segmentclip
selector
smooth
speed
stereo
subenc
tta
valve
videofilters
videomaxrate
videomeasure
videoparsers
videosignal
vmnc
y4m
"
NOT_ALLOWED="
dvbsuboverlay
asfmux
dvdspu
mpegpsmux
mpegtsmux
qtmux
real
siren
"
@ -132,10 +112,9 @@ check_not_allowed()
}
rm -rf $DIRECTORY
tar xJf $SOURCE || error "Cannot unpack $SOURCE"
tar xjf $SOURCE || error "Cannot unpack $SOURCE"
pushd $DIRECTORY > /dev/null || error "Cannot open directory \"$DIRECTORY\""
unknown=""
for subdir in gst ext sys; do
for dir in $subdir/* ; do
# Don't touch non-directories
@ -154,6 +133,9 @@ for subdir in gst ext sys; do
echo "Removing Makefile generation for $MODULE"
grep -v "$dir/Makefile" configure.ac > configure.ac.new && mv configure.ac.new configure.ac
# Urgh
if test $MODULE = mpegtsmux ; then
grep -v "gst/mpegtsmux/tsmux/Makefile" configure.ac > configure.ac.new && mv configure.ac.new configure.ac
fi
if test $MODULE = real ; then
grep -v "AG_GST_DISABLE_PLUGIN(real)" configure.ac > configure.ac.new && mv configure.ac.new configure.ac
fi
@ -167,23 +149,15 @@ for subdir in gst ext sys; do
continue;
elif ! ( check_allowed $MODULE ) ; then
echo "Unknown module in $dir"
unknown="$unknown $dir"
exit 1
fi
done
done
echo
if test "x$unknown" != "x"; then
echo -n "Aborting due to unkown modules: "
echo "$unknown" | sed "s/ /\n /g"
exit 1
fi
autoreconf
popd > /dev/null
tar cJf $NEW_SOURCE $DIRECTORY
tar cjf $NEW_SOURCE $DIRECTORY
echo "$NEW_SOURCE is ready to use"

View File

@ -1,124 +0,0 @@
diff -up gst-plugins-bad-0.10.23/common/gtk-doc.mak.docbuild gst-plugins-bad-0.10.23/common/gtk-doc.mak
--- gst-plugins-bad-0.10.23/common/gtk-doc.mak.docbuild 2011-12-30 19:32:24.000000000 +0100
+++ gst-plugins-bad-0.10.23/common/gtk-doc.mak 2016-08-09 15:51:04.821382866 +0200
@@ -121,19 +121,17 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
@cp ../version.entities ./
@mkhtml_options=""; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$(?)" = "0"; then \
+ if test "$$? = "0"; then \
if test "x$(V)" = "x1"; then \
mkhtml_options="$$mkhtml_options --verbose"; \
fi; \
fi; \
- @gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$(?)" = "0"; then \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$$? = "0"; then \
mkhtml_options=--path="$(abs_srcdir)"; \
fi; \
- cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- @mv html/index.sgml html/index.sgml.bak
- @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
- @rm -f html/index.sgml.bak
+ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE)
+ @rm -f html/$(DOC_MAIN_SGML_FILE)
@rm -rf html/xml
@rm -f version.entities
@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html )
@@ -189,9 +187,9 @@ install-data-local:
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
- echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
- if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
- $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
+ echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \
+ if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \
+ $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
fi; \
(which gtkdoc-rebase >/dev/null && \
diff -up gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak.docbuild gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak
--- gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak.docbuild 2011-12-30 19:32:24.000000000 +0100
+++ gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak 2016-08-09 15:59:02.264160398 +0200
@@ -218,15 +218,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
@cp ../version.entities html
@mkhtml_options=""; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$(?)" = "0"; then \
+ if test "$$?" = "0"; then \
if test "x$(V)" = "x1"; then \
mkhtml_options="$$mkhtml_options --verbose"; \
fi; \
fi; \
- cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
- @mv html/index.sgml html/index.sgml.bak
- @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
- @rm -f html/index.sgml.bak
+ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE)
@rm -f html/$(DOC_MAIN_SGML_FILE)
@rm -rf html/xml
@rm -f html/version.entities
diff -up gst-plugins-bad-0.10.23/docs/libs/Makefile.in.docbuild gst-plugins-bad-0.10.23/docs/libs/Makefile.in
--- gst-plugins-bad-0.10.23/docs/libs/Makefile.in.docbuild 2012-02-28 20:13:59.000000000 +0100
+++ gst-plugins-bad-0.10.23/docs/libs/Makefile.in 2016-08-09 15:56:57.850520970 +0200
@@ -933,19 +933,17 @@ upload: $(FORMATS)
@ENABLE_GTK_DOC_TRUE@ @cp ../version.entities ./
@ENABLE_GTK_DOC_TRUE@ @mkhtml_options=""; \
@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
-@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \
+@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ if test "x$(V)" = "x1"; then \
@ENABLE_GTK_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \
@ENABLE_GTK_DOC_TRUE@ fi; \
@ENABLE_GTK_DOC_TRUE@ fi; \
-@ENABLE_GTK_DOC_TRUE@ @gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
-@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \
+@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ mkhtml_options=--path="$(abs_srcdir)"; \
@ENABLE_GTK_DOC_TRUE@ fi; \
-@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-@ENABLE_GTK_DOC_TRUE@ @mv html/index.sgml html/index.sgml.bak
-@ENABLE_GTK_DOC_TRUE@ @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
-@ENABLE_GTK_DOC_TRUE@ @rm -f html/index.sgml.bak
+@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE)
+@ENABLE_GTK_DOC_TRUE@ @rm -f html/$(DOC_MAIN_SGML_FILE)
@ENABLE_GTK_DOC_TRUE@ @rm -rf html/xml
@ENABLE_GTK_DOC_TRUE@ @rm -f version.entities
@ENABLE_GTK_DOC_TRUE@ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html )
@@ -999,9 +997,9 @@ install-data-local:
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
- echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \
- if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
- $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
+ echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \
+ if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \
+ $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
fi; \
(which gtkdoc-rebase >/dev/null && \
diff -up gst-plugins-bad-0.10.23/docs/plugins/Makefile.in.docbuild gst-plugins-bad-0.10.23/docs/plugins/Makefile.in
--- gst-plugins-bad-0.10.23/docs/plugins/Makefile.in.docbuild 2012-02-28 20:13:59.000000000 +0100
+++ gst-plugins-bad-0.10.23/docs/plugins/Makefile.in 2016-08-09 15:54:00.964455982 +0200
@@ -1374,15 +1374,12 @@ update:
@ENABLE_GTK_DOC_TRUE@ @cp ../version.entities html
@ENABLE_GTK_DOC_TRUE@ @mkhtml_options=""; \
@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
-@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \
+@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \
@ENABLE_GTK_DOC_TRUE@ if test "x$(V)" = "x1"; then \
@ENABLE_GTK_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \
@ENABLE_GTK_DOC_TRUE@ fi; \
@ENABLE_GTK_DOC_TRUE@ fi; \
-@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
-@ENABLE_GTK_DOC_TRUE@ @mv html/index.sgml html/index.sgml.bak
-@ENABLE_GTK_DOC_TRUE@ @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
-@ENABLE_GTK_DOC_TRUE@ @rm -f html/index.sgml.bak
+@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE)
@ENABLE_GTK_DOC_TRUE@ @rm -f html/$(DOC_MAIN_SGML_FILE)
@ENABLE_GTK_DOC_TRUE@ @rm -rf html/xml
@ENABLE_GTK_DOC_TRUE@ @rm -f html/version.entities

View File

@ -1,27 +0,0 @@
diff -up gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h.drop-compat-defines gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h
--- gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h.drop-compat-defines 2015-04-07 09:28:01.637679239 -0400
+++ gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h 2015-04-07 09:28:10.397622550 -0400
@@ -25,23 +25,6 @@
G_BEGIN_DECLS
-/* Some compatibility defines for older libvpx versions */
-#ifndef VPX_IMG_FMT_I420
-#define VPX_IMG_FMT_I420 IMG_FMT_I420
-#endif
-
-#ifndef VPX_PLANE_Y
-#define VPX_PLANE_Y PLANE_Y
-#endif
-
-#ifndef VPX_PLANE_U
-#define VPX_PLANE_U PLANE_U
-#endif
-
-#ifndef VPX_PLANE_V
-#define VPX_PLANE_V PLANE_V
-#endif
-
const char * gst_vpx_error_name (vpx_codec_err_t status);
G_END_DECLS

View File

@ -1,12 +0,0 @@
diff -uNr gst-plugins-bad-0.10.23/ext/timidity/gsttimidity.c gst-plugins-bad-0.10.23.timidity/ext/timidity/gsttimidity.c
--- gst-plugins-bad-0.10.23/ext/timidity/gsttimidity.c 2011-12-30 19:24:28.000000000 +0100
+++ gst-plugins-bad-0.10.23.timidity/ext/timidity/gsttimidity.c 2016-10-06 10:37:54.076801395 +0200
@@ -615,7 +615,7 @@
GST_DEBUG_OBJECT (timidity, "Parsing song");
stream =
- mid_istream_open_mem (timidity->mididata, timidity->mididata_size, 0);
+ mid_istream_open_mem (timidity->mididata, timidity->mididata_size);
timidity->song = mid_song_load (stream, timidity->song_options);
mid_istream_close (stream);

View File

@ -1,84 +0,0 @@
From 1eb3f7f41fdbef005a62b3f03fdfd373f93c83ed Mon Sep 17 00:00:00 2001
From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Wed, 02 Mar 2011 22:43:42 +0000
Subject: celtenc: Fix compilation with celt >= 0.11.0
Fixes bug #643607.
---
diff --git a/configure.ac b/configure.ac
index a2a38bc..374c7aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -639,6 +639,13 @@ AG_GST_CHECK_FEATURE(CELT, [celt], celt, [
dnl to prevent an error
true
])
+
+ PKG_CHECK_MODULES(CELT_0_11, celt >= 0.11.0, [
+ AC_DEFINE([HAVE_CELT_0_11], 1, [Define if libcelt 0.11 is installed])
+ ], [
+ dnl to prevent an error
+ true
+ ])
AC_SUBST(CELT_CFLAGS)
AC_SUBST(CELT_LIBS)
])
diff --git a/ext/celt/gstceltdec.c b/ext/celt/gstceltdec.c
index 1b3f4eb..66c829e 100644
--- a/ext/celt/gstceltdec.c
+++ b/ext/celt/gstceltdec.c
@@ -510,11 +510,16 @@ celt_dec_chain_parse_header (GstCeltDec * dec, GstBuffer * buf)
goto mode_init_failed;
/* initialize the decoder */
+#ifdef HAVE_CELT_0_11
+ dec->state =
+ celt_decoder_create_custom (dec->mode, dec->header.nb_channels, &error);
+#else
#ifdef HAVE_CELT_0_7
dec->state = celt_decoder_create (dec->mode, dec->header.nb_channels, &error);
#else
dec->state = celt_decoder_create (dec->mode);
#endif
+#endif
if (!dec->state)
goto init_failed;
diff --git a/ext/celt/gstceltenc.c b/ext/celt/gstceltenc.c
index 4fd9ee8..7481579 100644
--- a/ext/celt/gstceltenc.c
+++ b/ext/celt/gstceltenc.c
@@ -629,11 +629,15 @@ gst_celt_enc_setup (GstCeltEnc * enc)
if (!enc->mode)
goto mode_initialization_failed;
+#ifdef HAVE_CELT_0_11
+ celt_header_init (&enc->header, enc->mode, enc->frame_size, enc->channels);
+#else
#ifdef HAVE_CELT_0_7
celt_header_init (&enc->header, enc->mode, enc->channels);
#else
celt_header_init (&enc->header, enc->mode);
#endif
+#endif
enc->header.nb_channels = enc->channels;
#ifdef HAVE_CELT_0_8
@@ -642,11 +646,15 @@ gst_celt_enc_setup (GstCeltEnc * enc)
celt_mode_info (enc->mode, CELT_GET_FRAME_SIZE, &enc->frame_size);
#endif
+#ifdef HAVE_CELT_0_11
+ enc->state = celt_encoder_create_custom (enc->mode, enc->channels, &error);
+#else
#ifdef HAVE_CELT_0_7
enc->state = celt_encoder_create (enc->mode, enc->channels, &error);
#else
enc->state = celt_encoder_create (enc->mode);
#endif
+#endif
if (!enc->state)
goto encoder_creation_failed;
--
cgit v0.8.3-6-g21f6

View File

@ -1,49 +1,23 @@
%define majorminor 0.10
%define gstreamer gstreamer
%define gst_minver 0.10.36
%define gstpb_minver %{gst_minver}
# Turn of extras package on RHEL.
%if ! 0%{?rhel}
%bcond_without extras
%else
%bcond_with extras
%endif
%define gst_minver 0.10.30
%define gstpb_minver 0.10.30
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad-free
Version: 0.10.23
Release: 45%{?dist}
Version: 0.10.20
Release: 3%{?dist}.1
# The freeze and nfs plugins are LGPLv2 (only)
License: LGPLv2+ and LGPLv2
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
# The source is:
# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{version}.tar.xz
# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.bz2
# modified with gst-p-bad-cleanup.sh from SOURCE1
Source: gst-plugins-bad-free-%{version}.tar.xz
Source: gst-plugins-bad-free-%{version}.tar.bz2
Source1: gst-p-bad-cleanup.sh
# Based on upstream 04909e2c50e68
Patch0: vp8enc-bitrate-fix.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=677698 / rhbz#797188
Patch1: 0001-gstcamerabin-Fix-spelling-error-in-debug-logging.patch
Patch2: 0002-camerabin-Add-a-camerabin_create_view_finder_caps-he.patch
Patch3: 0003-camerabin-Add-gst_camerabin_get_video_source_propert.patch
Patch4: 0004-camerabin-Set-src_filter-and-zoom_src_filter-caps-wh.patch
# Cherry picked from upstream git for rhbz#820959
Patch5: 0005-geometrictransform-crash-fix1.patch
Patch6: 0006-geometrictransform-crash-fix2.patch
Patch7: 0001-Delete-unbuilt-plugins-from-the-docs.patch
Patch8: 0001-modplug-Specify-directory-when-including-stdafx.h.patch
# No longer needed, actually break build if we have them now.
Patch9: gst-plugins-bad-0.10.23-drop-vpx-compat-defines.patch
# Fix building docs
Patch10: gst-plugins-bad-0.10.23-docbuild.patch
# Fix for libtimidity-0.2.x
Patch11: gst-plugins-bad-0.10.23-timidity2.diff
Patch12: 0001-vmncdec-Sanity-check-width-height-before-using-it.patch
Patch13: 0002-h264parse-Ensure-codec_data-has-the-required-size-wh.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{gstreamer} >= %{gst_minver}
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
@ -51,51 +25,46 @@ BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
BuildRequires: check
BuildRequires: gettext-devel
BuildRequires: PyXML
BuildRequires: libXt-devel
BuildRequires: gtk-doc
BuildRequires: bzip2-devel
BuildRequires: celt-devel
BuildRequires: dirac-devel
BuildRequires: exempi-devel
BuildRequires: gmyth-devel >= 0.4
BuildRequires: gsm-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: jasper-devel
BuildRequires: ladspa-devel
BuildRequires: libass-devel
BuildRequires: libcdaudio-devel
%ifnarch s390 s390x
BuildRequires: libdc1394-devel
%endif
BuildRequires: libdvdnav-devel
BuildRequires: libexif-devel
BuildRequires: libiptcdata-devel
BuildRequires: libkate-devel
BuildRequires: libmodplug-devel
BuildRequires: libmpcdec-devel
BuildRequires: libofa-devel
BuildRequires: liboil-devel
BuildRequires: librsvg2-devel
BuildRequires: libsndfile-devel
BuildRequires: libtimidity-devel
BuildRequires: libvpx-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: openssl-devel
BuildRequires: orc-devel
Buildrequires: wavpack-devel
BuildRequires: chrpath
BuildRequires: opus-devel
BuildRequires: soundtouch-devel
%if %{with extras}
BuildRequires: dirac-devel
BuildRequires: libass-devel
BuildRequires: libcdaudio-devel
BuildRequires: libcurl-devel
%ifnarch s390 s390x
BuildRequires: libdc1394-devel
%endif
BuildRequires: libkate-devel
BuildRequires: libmodplug-devel
BuildRequires: libtimidity-devel
BuildRequires: libvdpau-devel
BuildRequires: opencv-devel
BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
BuildRequires: slv2-devel
BuildRequires: soundtouch-devel
Buildrequires: wavpack-devel
BuildRequires: wildmidi-devel
BuildRequires: zbar-devel
BuildRequires: zvbi-devel
%endif
Obsoletes: gstreamer-plugins-flumpegdemux < 0.10.15-9
Provides: gstreamer-plugins-flumpegdemux = %{version}-%{release}
@ -113,7 +82,6 @@ This package contains plug-ins that aren't tested
well enough, or the code is not of good enough quality.
%if %{with extras}
%package extras
Summary: Extra GStreamer "bad" plugins (less often used "bad" plugins)
Group: Applications/Multimedia
@ -129,9 +97,8 @@ gstreamer-plugins-bad contains plug-ins that aren't
tested well enough, or the code is not of good enough quality.
This package (gstreamer-plugins-bad-extras) contains extra "bad" plugins for
sources (mythtv), sinks (fbdev) and effects (pitch) which are not used
sources (mythtv), sinks (jack) and effects (pitch) which are not used
very much and require additional libraries to be installed.
%endif
%package devel
@ -166,34 +133,29 @@ aren't tested well enough, or the code is not of good enough quality.
%prep
%autosetup -n gst-plugins-bad-%{version} -p1
sed -i 's/opencv <= 2.3.1/opencv <= 2.4.3/g' configure
%setup -q -n gst-plugins-bad-%{version}
%build
%configure \
--with-package-name="Fedora gstreamer-plugins-bad package" \
--with-package-origin="http://download.fedora.redhat.com/fedora" \
%{!?with_extras:--disable-fbdev --disable-decklink --disable-linsys} \
--enable-debug --disable-static --disable-gtk-doc --enable-experimental \
--disable-divx --disable-dts --disable-faac --disable-faad --disable-nas \
--disable-mimic --disable-libmms --disable-mpeg2enc --disable-mplex \
--disable-neon --disable-openal --disable-rtmp --disable-xvid \
--disable-gme --disable-voamrwbenc --disable-nsf --disable-apexsink \
--disable-voaacenc
make %{?_smp_mflags}
--enable-debug --disable-static --enable-gtk-doc --enable-experimental \
--disable-divx
%{__make} %{?_smp_mflags}
%install
make install DESTDIR="$RPM_BUILD_ROOT"
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR="%{buildroot}"
%find_lang gst-plugins-bad-%{majorminor}
# Some of the plugins somehow get an rpath embedded ??
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.so
# Clean out files that should not be part of the rpm.
rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la
rm $RPM_BUILD_ROOT%{_libdir}/*.la
%{__rm} -f %{buildroot}%{_libdir}/gstreamer-%{majorminor}/*.la
%{__rm} -f %{buildroot}%{_libdir}/*.la
%clean
%{__rm} -rf %{buildroot}
%post -p /sbin/ldconfig
@ -202,38 +164,27 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
%files -f gst-plugins-bad-%{majorminor}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README REQUIREMENTS
#%%{_datadir}/gstreamer-%%{majorminor}
%{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so.*
#%{_datadir}/gstreamer-%{majorminor}
%{_libdir}/libgstbasevideo-%{majorminor}.so.*
%{_libdir}/libgstcodecparsers-%{majorminor}.so.*
%{_libdir}/libgstphotography-%{majorminor}.so.*
%{_libdir}/libgstsignalprocessor-%{majorminor}.so.*
%if %{with extras}
%{_libdir}/libgstvdp-%{majorminor}.so.*
%endif
# Plugins without external dependencies
%{_libdir}/gstreamer-%{majorminor}/libgstadpcmdec.so
%{_libdir}/gstreamer-%{majorminor}/libgstadpcmenc.so
%{_libdir}/gstreamer-%{majorminor}/libgstaiff.so
%{_libdir}/gstreamer-%{majorminor}/libgstasfmux.so
%{_libdir}/gstreamer-%{majorminor}/libgstaudiovisualizers.so
%{_libdir}/gstreamer-%{majorminor}/libgstaudioparsersbad.so
%{_libdir}/gstreamer-%{majorminor}/libgstautoconvert.so
%{_libdir}/gstreamer-%{majorminor}/libgstbayer.so
%{_libdir}/gstreamer-%{majorminor}/libgstcamerabin.so
%{_libdir}/gstreamer-%{majorminor}/libgstcamerabin2.so
%{_libdir}/gstreamer-%{majorminor}/libgstcdxaparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstcog.so
%{_libdir}/gstreamer-%{majorminor}/libgstcoloreffects.so
%{_libdir}/gstreamer-%{majorminor}/libgstcolorspace.so
%{_libdir}/gstreamer-%{majorminor}/libgstdataurisrc.so
%{_libdir}/gstreamer-%{majorminor}/libgstdccp.so
%{_libdir}/gstreamer-%{majorminor}/libgstdtmf.so
%{_libdir}/gstreamer-%{majorminor}/libgstfaceoverlay.so
%{_libdir}/gstreamer-%{majorminor}/libgstfestival.so
%{_libdir}/gstreamer-%{majorminor}/libgstfieldanalysis.so
%{_libdir}/gstreamer-%{majorminor}/libgstfragmented.so
%{_libdir}/gstreamer-%{majorminor}/libgstfreeverb.so
%{_libdir}/gstreamer-%{majorminor}/libgstfreeze.so
%{_libdir}/gstreamer-%{majorminor}/libgstfrei0r.so
%{_libdir}/gstreamer-%{majorminor}/libgstgaudieffects.so
@ -242,326 +193,105 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/gstreamer-%{majorminor}/libgsth264parse.so
%{_libdir}/gstreamer-%{majorminor}/libgsthdvparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstid3tag.so
%{_libdir}/gstreamer-%{majorminor}/libgstinter.so
%{_libdir}/gstreamer-%{majorminor}/libgstinterlace.so
%{_libdir}/gstreamer-%{majorminor}/libgstinvtelecine.so
%{_libdir}/gstreamer-%{majorminor}/libgstivfparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstjpegformat.so
%{_libdir}/gstreamer-%{majorminor}/libgstjp2kdecimator.so
%{_libdir}/gstreamer-%{majorminor}/libgstlegacyresample.so
%{_libdir}/gstreamer-%{majorminor}/libgstliveadder.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpeg4videoparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegdemux.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegpsmux.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegtsdemux.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegtsmux.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegvideoparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstmve.so
%{_libdir}/gstreamer-%{majorminor}/libgstmxf.so
%{_libdir}/gstreamer-%{majorminor}/libgstnsf.so
%{_libdir}/gstreamer-%{majorminor}/libgstnuvdemux.so
%{_libdir}/gstreamer-%{majorminor}/libgstpatchdetect.so
%{_libdir}/gstreamer-%{majorminor}/libgstpcapparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstpnm.so
%{_libdir}/gstreamer-%{majorminor}/libgstrawparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstremovesilence.so
%{_libdir}/gstreamer-%{majorminor}/libgstrfbsrc.so
%{_libdir}/gstreamer-%{majorminor}/libgstrtpmux.so
%{_libdir}/gstreamer-%{majorminor}/libgstrtpvp8.so
%{_libdir}/gstreamer-%{majorminor}/libgstscaletempoplugin.so
%{_libdir}/gstreamer-%{majorminor}/libgstsdi.so
%{_libdir}/gstreamer-%{majorminor}/libgstsdpelem.so
%{_libdir}/gstreamer-%{majorminor}/libgstsegmentclip.so
%{_libdir}/gstreamer-%{majorminor}/libgstselector.so
%{_libdir}/gstreamer-%{majorminor}/libgstrawparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstscaletempoplugin.so
%{_libdir}/gstreamer-%{majorminor}/libgstshm.so
%{_libdir}/gstreamer-%{majorminor}/libgstsmooth.so
%{_libdir}/gstreamer-%{majorminor}/libgstsdpelem.so
%{_libdir}/gstreamer-%{majorminor}/libgstspeed.so
%{_libdir}/gstreamer-%{majorminor}/libgststereo.so
%{_libdir}/gstreamer-%{majorminor}/libgstsubenc.so
%{_libdir}/gstreamer-%{majorminor}/libgsttta.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideofiltersbad.so
%{_libdir}/gstreamer-%{majorminor}/libgstvalve.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideosignal.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideomaxrate.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideomeasure.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideoparsersbad.so
%{_libdir}/gstreamer-%{majorminor}/libgstvmnc.so
%{_libdir}/gstreamer-%{majorminor}/libgsty4mdec.so
# System (Linux) specific plugins
%{_libdir}/gstreamer-%{majorminor}/libgstdvb.so
%{_libdir}/gstreamer-%{majorminor}/libgstvcdsrc.so
# Plugins with external dependencies
#%%{_libdir}/gstreamer-%%{majorminor}/libgstapexsink.so
%{_libdir}/gstreamer-%{majorminor}/libgstalsaspdif.so
%{_libdir}/gstreamer-%{majorminor}/libgstapexsink.so
%{_libdir}/gstreamer-%{majorminor}/libgstassrender.so
%{_libdir}/gstreamer-%{majorminor}/libgstbz2.so
%{_libdir}/gstreamer-%{majorminor}/libgstcdaudio.so
%{_libdir}/gstreamer-%{majorminor}/libgstcelt.so
%ifnarch s390 s390x
%{_libdir}/gstreamer-%{majorminor}/libgstdc1394.so
%endif
%{_libdir}/gstreamer-%{majorminor}/libgstdirac.so
%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
%{_libdir}/gstreamer-%{majorminor}/libgstjp2k.so
%{_libdir}/gstreamer-%{majorminor}/libgstkate.so
%{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
%{_libdir}/gstreamer-%{majorminor}/libgstlv2.so
%{_libdir}/gstreamer-%{majorminor}/libgstmetadata.so
%{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so
%{_libdir}/gstreamer-%{majorminor}/libgstmusepack.so
%{_libdir}/gstreamer-%{majorminor}/libgstofa.so
%{_libdir}/gstreamer-%{majorminor}/libresindvd.so
%{_libdir}/gstreamer-%{majorminor}/libgstrsvg.so
%{_libdir}/gstreamer-%{majorminor}/libgstschro.so
%{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
%{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so
%{_libdir}/gstreamer-%{majorminor}/libgstvp8.so
%{_libdir}/gstreamer-%{majorminor}/libgstopus.so
#debugging plugin
%{_libdir}/gstreamer-%{majorminor}/libgstdebugutilsbad.so
#data for plugins
%{_datadir}/glib-2.0/schemas/org.freedesktop.gstreamer-%{majorminor}.default-elements.gschema.xml
%{_datadir}/glib-2.0/schemas/org.freedesktop.gstreamer-0.10.default-elements.gschema.xml
%if %{with extras}
%files extras
%defattr(-,root,root,-)
# Plugins with external dependencies
%{_libdir}/gstreamer-%{majorminor}/libgstassrender.so
%{_libdir}/gstreamer-%{majorminor}/libgstcdaudio.so
%{_libdir}/gstreamer-%{majorminor}/libgstcurl.so
%ifnarch s390 s390x
%{_libdir}/gstreamer-%{majorminor}/libgstdc1394.so
%endif
%{_libdir}/gstreamer-%{majorminor}/libgstdirac.so
%{_libdir}/gstreamer-%{majorminor}/libgstkate.so
%{_libdir}/gstreamer-%{majorminor}/libgstlv2.so
%{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so
%{_libdir}/gstreamer-%{majorminor}/libgstschro.so
%{_libdir}/gstreamer-%{majorminor}/libgstjack.so
%{_libdir}/gstreamer-%{majorminor}/libgstmythtvsrc.so
%{_libdir}/gstreamer-%{majorminor}/libgstsdl.so
%{_libdir}/gstreamer-%{majorminor}/libgstteletextdec.so
%{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so
%{_libdir}/gstreamer-%{majorminor}/libgsttimidity.so
%{_libdir}/gstreamer-%{majorminor}/libgstvdpau.so
%{_libdir}/gstreamer-%{majorminor}/libgstwildmidi.so
%{_libdir}/gstreamer-%{majorminor}/libgstzbar.so
# Linux specific plugins
%{_libdir}/gstreamer-%{majorminor}/libgstdecklink.so
%{_libdir}/gstreamer-%{majorminor}/libgstfbdevsink.so
%{_libdir}/gstreamer-%{majorminor}/libgstlinsys.so
%endif
%files devel
%{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so
%defattr(-,root,root,-)
%{_libdir}/libgstbasevideo-%{majorminor}.so
%{_libdir}/libgstcodecparsers-%{majorminor}.so
%{_libdir}/libgstphotography-%{majorminor}.so
%{_libdir}/libgstsignalprocessor-%{majorminor}.so
%if %{with extras}
%{_libdir}/libgstvdp-%{majorminor}.so
%endif
%{_includedir}/gstreamer-%{majorminor}/gst/basecamerabinsrc
%{_includedir}/gstreamer-%{majorminor}/gst/codecparsers
%{_includedir}/gstreamer-%{majorminor}/gst/interfaces/photography*
%{_includedir}/gstreamer-%{majorminor}/gst/signalprocessor
%{_includedir}/gstreamer-%{majorminor}/gst/video
%if %{with extras}
%{_includedir}/gstreamer-%{majorminor}/gst/vdpau
%endif
# pkg-config files
%{_libdir}/pkgconfig/gstreamer-basevideo-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-codecparsers-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
%files devel-docs
%doc %{_datadir}/gtk-doc/html/gst-plugins-bad-libs-%{majorminor}
%defattr(-,root,root,-)
%doc %{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{majorminor}
%changelog
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.23-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Feb 2 2018 Tom Callaway <spot@fedoraproject.org> - 0.10.23-44
- again.
* Fri Jan 26 2018 Tom Callaway <spot@fedoraproject.org> - 0.10.23-43
- rebuild for new libvpx
* Fri Oct 13 2017 Hans de Goede <hdegoede@redhat.com> - 0.10.23-42
- Rebuild for new soundtouch
- Regenerating the (old) gtk-doc docs is broken, use only the pre-generated
ones from the source-tarbal (People should not be developing new software
against gst-0.10 anyways)
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.23-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.23-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.23-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Dec 07 2016 Wim Taymans <wtaymans@redhat.com> - 0.10.23-38
- vmncdec: Sanity-check width/height before using it
- h264parse: Ensure codec_data has the required size when reading number of SPS
(#1401945)
* Sat Dec 03 2016 Rex Dieter <rdieter@fedoraproject.org> - 0.10.23-37
- rebuild (jasper)
* Wed Nov 30 2016 Wim Taymans <wtaymans@redhat.com> - 0.10.23-36
- Remove insecure nsf plugin (#1395126)
- Disable broken apexsink
* Thu Oct 06 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.10.23-35
- rebuild for libtimidity 0.2.x
* Fri Aug 26 2016 Hans de Goede <hdegoede@redhat.com> - 0.10.23-34
- Rebuild for new wildmidi
* Tue Aug 09 2016 Nils Philippsen <nils@redhat.com> - 0.10.23-33
- fix bogus dates in changelog
- fix building docs
* Fri Jul 22 2016 Tom Callaway <spot@fedoraproject.org> - 0.10.23-33
- rebuild for libvpx 1.6.0
* Thu Feb 25 2016 Wim Taymans <wtaymans@redhat.com> - 0.10.23-32
- rebuild for soundtouch (#1311323)
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.23-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Dec 1 2015 Tom Callaway <spot@fedoraproject.org> - 0.10.23-30
- rebuild for libvpx 1.5.0
* Thu Oct 22 2015 Wim Taymans <wtaymans@redhat.com> - 0.10.23-29
- Remove musicbrainz dependency, the package is dead
- Also remove .so file for musicbrainz
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.23-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.10.23-27
- Rebuilt for GCC 5 C++11 ABI change
* Mon Apr 6 2015 Tom Callaway <spot@fedoraproject.org> - 0.10.23-25
- rebuild for libvpx 1.4.0
- fix build against libvpx 1.4.0
* Tue Aug 26 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.10.23-24
- Drop celt as it's long dead, should be using opus now
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.23-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.23-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Mar 19 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.10.23-21
- Bump (libass)
* Thu Mar 13 2014 Wim Taymans <wtaymans@redhat.com> - 0.10.23-20
- Rebuild for libvpx ABI break. See #1068664
- Fix modplug include
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.23-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sat May 04 2013 Colin Walters <walters@verbum.org> 0.10.23-18
- Move soundtouch-devel BR to outside RHEL conditional, since
it is available there.
* Thu May 02 2013 Colin Walters <walters@verbum.org> 0.10.23-17
- Hack the gtk-doc to remove plugin docs that are not shipped
- Drop mythtv, opencv sources that are no longer buildable
* Thu May 02 2013 Colin Walters <walters@verbum.org> 0.10.23-16
- Drop PyXML BR (#914060)
* Thu Mar 07 2013 Bastien Nocera <bnocera@redhat.com> 0.10.23-15
- Remove gmyth plugin
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.23-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sat Dec 08 2012 Kalev Lember <kalevlember@gmail.com> - 0.10.23-13
- Fix the opencv sed magic for opencv 2.4.3
* Fri Nov 30 2012 Tom Callaway <spot@fedoraproject.org> - 0.10.23-12
- rebuild for opencv
* Wed Sep 12 2012 Fabian Deutsch <fabiand@fedoraproject.org> - 0.10.23-11
- Add opus plugin
* Fri Aug 03 2012 Adam Jackson <ajax@redhat.com> 0.10.23-10
- Fix the opencv sed magic to hit a pattern that actually exists
- Rebuild for new opencv
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.23-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Thu Jun 28 2012 Bastien Nocera <bnocera@redhat.com> 0.10.23-8
- Move the soundtouch plugin to the main package (as Totem 3.5 will
depend on it)
* Mon Jun 18 2012 Hans de Goede <hdegoede@redhat.com> - 0.10.23-7
- Cherry pick 2 patches from upstream fixing cheese crashing (rhbz#820959)
* Fri Jun 08 2012 Hans de Goede <hdegoede@redhat.com> - 0.10.23-6
- Speedup camerabin pipeline element creation (rhbz#797188, gnome#677698)
- Re-enable building of -extras package accidentally disabled by the spec-file
re-organization done in 0.10.23-3
- Add teletextdec and musicbrainz plugins to -extras
- Minor spec-file cleanups
* Fri Jun 01 2012 Karsten Hopp <karsten@redhat.com> 0.10.23-5
- bump release and rebuild (linked with old libs on PPC)
* Tue May 29 2012 Adel Gadllah <adel.gadllah@gmail.com> 0.10.23-4
- Backport upstream patch to fix vp8enc (GNOME #676653, #676245)
* Mon Mar 05 2012 Benjamin Otte <otte@redhat.com> 0.10.23-3
- Reorganize spec file to optionally build without extras package
* Wed Feb 29 2012 Benjamin Otte <otte@redhat.com> 0.10.23-2
- Enable libvdpau
* Tue Feb 28 2012 Benjamin Otte <otte@redhat.com> 0.10.23-1
- Update to 0.10.23
* Mon Jan 30 2012 Tom Callaway <spot@fedoraproject.org> 0.10.22-5
- rebuild for new libvpx
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.22-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Dec 05 2011 Adam Jackson <ajax@redhat.com> 0.10.22-3
- Rebuild for new libpng
* Wed Aug 31 2011 Rex Dieter <rdieter@fedoraproject.org> 0.10.22-2.1
- rebuild (opencv), for real this time. :)
* Sat Aug 27 2011 Hans de Goede <hdegoede@redhat.com> 0.10.22-2
- Rebuild for new opencv
* Wed May 11 2011 Benjamin Otte <otte@redhat.com> 0.10.22-1
- Update to 0.10.22
* Fri May 06 2011 Benjamin Otte <otte@redhat.com> 0.10.21.4-2
- Enable opencv plugin
* Tue May 03 2011 Benjamin Otte <otte@redhat.com> 0.10.21.4-1
- Update prerelease
* Tue Apr 19 2011 Benjamin Otte <otte@redhat.com> 0.10.21.2-1
- Update to prerelease
* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 0.10.21-5
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
* Thu Mar 03 2011 Mamoru Tasaka <mtasaka@fedorapeoject.org> - 0.10.21-4
- Patch from the upstream to fix build with newer celt
(bug 681150, GNOME bug 643607)
* Wed Feb 16 2011 Peter Robinson <pbrobinson@gmail.com> - 0.10.21-3
- Rebuilt for new celt
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Jan 26 2011 Benjamin Otte <otte@redhat.com> 0.10.21-1
- Update to 0.10.21
* Wed Jan 12 2011 Benjamin Otte <otte@redhat.com> 0.10.20.3-1
- Update to prerelease
* Wed Sep 29 2010 jkeating - 0.10.20-4
* Wed Sep 29 2010 jkeating - 0.10.20-3.1
- Rebuilt for gcc bug 634757
* Wed Sep 15 2010 Hans de Goede <hdegoede@redhat.com> 0.10.20-3
@ -577,7 +307,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
* Fri Aug 06 2010 Benjamin Otte <otte@redhat.com> 0.10.19-6
- Disable NAS now that it's obsolete
* Sun Jul 04 2010 Benjamin Otte <otte@redhat.com> 0.10.19-5
* Thu Jul 04 2010 Benjamin Otte <otte@redhat.com> 0.10.19-5
- Disable celt now that an update broke it
* Thu Jun 17 2010 Benjamin Otte <otte@redhat.com> 0.10.19-4
@ -592,11 +322,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
* Mon May 31 2010 Benjamin Otte <otte@redhat.com> 0.10.19-1
- Update to 0.10.19
* Wed May 26 2010 Benjamin Otte <otte@redhat.com> 0.10.18.3-1
* Fri May 15 2010 Benjamin Otte <otte@redhat.com> 0.10.18.3-1
- Update pre-release
- Add vp8 elements
* Sat May 15 2010 Benjamin Otte <otte@redhat.com> 0.10.18.2-1
* Fri May 15 2010 Benjamin Otte <otte@redhat.com> 0.10.18.2-1
- Update to pre-release
* Thu Apr 15 2010 Benjamin Otte <otte@redhat.com> 0.10.18-2

View File

@ -1 +1 @@
6a693a60ab61e53f4a223fe2e65e3b62 gst-plugins-bad-free-0.10.23.tar.xz
6577a5f63ba05aab29e43a296f38442e gst-plugins-bad-free-0.10.20.tar.bz2

View File

@ -1,23 +0,0 @@
diff -ru gst-plugins-bad-0.10.23.orign/ext/vp8/gstvp8enc.c gst-plugins-bad-0.10.23/ext/vp8/gstvp8enc.c
--- gst-plugins-bad-0.10.23.orign/ext/vp8/gstvp8enc.c 2012-01-25 18:10:21.000000000 +0100
+++ gst-plugins-bad-0.10.23/ext/vp8/gstvp8enc.c 2012-05-28 14:21:16.552995768 +0200
@@ -732,6 +732,11 @@
return FALSE;
}
+ /* Scale default bitrate to our size */
+ cfg.rc_target_bitrate = gst_util_uint64_scale (cfg.rc_target_bitrate,
+ state->width * state->height,
+ cfg.g_w * cfg.g_h);
+
cfg.g_w = state->width;
cfg.g_h = state->height;
cfg.g_timebase.num = state->fps_d;
@@ -755,7 +760,6 @@
} else {
cfg.rc_min_quantizer = (gint) (63 - encoder->quality * 6.2);
cfg.rc_max_quantizer = (gint) (63 - encoder->quality * 6.2);
- cfg.rc_target_bitrate = encoder->bitrate;
}
cfg.rc_dropframe_thresh = encoder->drop_frame;
cfg.rc_resize_allowed = encoder->resize_allowed;