commit e9716b6c6f52e63d96e4d861a078652874c2ff0a
Author: Jakub Bogusz <[email protected]>
Date: Wed Dec 20 22:05:09 2017 +0100
- gtk-doc patch replaced by gstreamer-common-gtkdoc patch from
gstreamer0.10-plugins-ugly
- added orc patch (fixes orc file compilation)
- enhanced timidity patch to adjust for libtimidity 0.2
- release 26
gstreamer-common-gtkdoc.patch | 284 +++++++++++++++++++++++++++++++++++
gstreamer-plugins-bad-orc.patch | 137 +++++++++++++++++
gstreamer-plugins-bad-timidity.patch | 20 +++
gstreamer0.10-plugins-bad.spec | 11 +-
gtk-doc.patch | 28 ----
5 files changed, 449 insertions(+), 31 deletions(-)
---
diff --git a/gstreamer0.10-plugins-bad.spec b/gstreamer0.10-plugins-bad.spec
index d5d49be..ebfc2ce 100644
--- a/gstreamer0.10-plugins-bad.spec
+++ b/gstreamer0.10-plugins-bad.spec
@@ -31,7 +31,7 @@ Summary: Bad GStreamer Streaming-media framework plugins
Summary(pl.UTF-8): Złe wtyczki do środowiska obróbki strumieni GStreamer
Name: gstreamer0.10-plugins-bad
Version: 0.10.23
-Release: 25
+Release: 26
License: LGPL v2+
Group: Libraries
Source0:
http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{version}.tar.bz2
@@ -47,7 +47,8 @@ Patch7: gstreamer-plugins-bad-opencv.patch
Patch8: gst-neon.patch
Patch9: gstreamer-plugins-bad-modplug.patch
Patch10: libvpx2.patch
-Patch11: gtk-doc.patch
+Patch11: gstreamer-common-gtkdoc.patch
+Patch12: gstreamer-plugins-bad-orc.patch
URL: http://gstreamer.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.10
@@ -114,7 +115,7 @@ BuildRequires: libsndfile-devel >= 1.0.16
BuildRequires: libstdc++-devel
BuildRequires: libtheora-devel >= 1.0
BuildRequires: libtiger-devel >= 0.3.2
-BuildRequires: libtimidity-devel
+BuildRequires: libtimidity-devel >= 0.2
BuildRequires: libvpx-devel
BuildRequires: libx264-devel >= 0.1.2
%{?with_mjpegtools:BuildRequires: mjpegtools-devel >= 2.0.0}
@@ -754,6 +755,7 @@ Summary: timidity plugin for GStreamer
Summary(pl.UTF-8): Wtyczka timidity do GStreamera
Group: Libraries
Requires: gstreamer0.10 >= %{gst_req_ver}
+Requires: libtimidity >= 0.2
Obsoletes: gstreamer-timidity < 1.0
%description -n gstreamer0.10-timidity
@@ -875,6 +877,8 @@ Wtyczka do GStreamera skanująca kody kreskowe.
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch12 -p1
+cd common
%patch11 -p1
%build
@@ -896,6 +900,7 @@ Wtyczka do GStreamera skanująca kody kreskowe.
%{!?with_musepack:--disable-musepack} \
%{!?with_neon:--disable-neon} \
%{!?with_ofa:--disable-ofa} \
+ %{!?with_opencv:--disable-opencv} \
%{!?with_sdl:--disable-sdl} \
%{!?with_sdl:--disable-sdltest} \
%{!?with_spc:--disable-spc} \
diff --git a/gstreamer-common-gtkdoc.patch b/gstreamer-common-gtkdoc.patch
new file mode 100644
index 0000000..db34f3e
--- /dev/null
+++ b/gstreamer-common-gtkdoc.patch
@@ -0,0 +1,284 @@
+From 2de221ce94b657f9c9a75aa3cc0cb84dbb5da78b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <[email protected]>
+Date: Mon, 28 Jan 2013 20:28:09 +0100
+Subject: [PATCH] gtk-doc*.mak: Put the API version in the html book name
+
+This causes devhelp2 files to get a version. Due to that devhelp can show it
+along with the 0.10 version.
+---
+ gtk-doc-plugins.mak | 11 ++++-------
+ gtk-doc.mak | 11 ++++-------
+ 2 files changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
+index f69d9d7..f19e7d7 100644
+--- a/gtk-doc-plugins.mak
++++ b/gtk-doc-plugins.mak
+@@ -222,10 +222,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
$(content_files)
+ 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
+@@ -289,9 +286,9 @@ install-data-local:
+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ done; \
+ fi; \
+- 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)-@[email protected]' ; \
++ if test -e $(builddir)/html/$(DOC_MODULE)-@[email protected];
then \
++ $(INSTALL_DATA)
$(builddir)/html/$(DOC_MODULE)-@[email protected] \
+
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@[email protected]; \
+ fi; \
+ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR)
--html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \
+diff --git a/gtk-doc.mak b/gtk-doc.mak
+index 17cee71..9d76889 100644
+--- a/gtk-doc.mak
++++ b/gtk-doc.mak
+@@ -130,10 +130,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
$(content_files)
+ 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 $(MKHTML_OPTIONS)
$(DOC_MODULE)-@GST_MAJORMINOR@ ../$(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 +186,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)-@[email protected]' ; \
++ if test -e $(builddir)/html/$(DOC_MODULE)-@[email protected];
then \
++ $(INSTALL_DATA)
$(builddir)/html/$(DOC_MODULE)-@[email protected] \
+
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@[email protected]; \
+ fi; \
+ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR)
--html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \
+From d37af32e2d6d1b546af72978f8441a84996ab3ea Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <[email protected]>
+Date: Sun, 7 Jun 2015 20:12:05 +0200
+Subject: [PATCH] mangle-tmpl.py: generate tmpl files instead of merging
+
+We don't have any hand-written docs in tmpl files. Stop generating them with
+gtkdoc and just write the minimal files ourself.
+---
+ gtk-doc-plugins.mak | 15 +++--------
+ mangle-tmpl.py | 72 ++++++++++++-----------------------------------------
+ 2 files changed, 19 insertions(+), 68 deletions(-)
+
+diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
+index 5d9b2f9..767e55a 100644
+--- a/gtk-doc-plugins.mak
++++ b/gtk-doc-plugins.mak
+@@ -171,19 +171,10 @@ scan-build.stamp: $(HFILE_GLOB) $(EXTRA_HFILES)
$(basefiles) scanobj-build.stamp
+ --ignore-headers="$(IGNORE_HFILES)"; \
+ touch scan-build.stamp
+
+-#### update templates; done on every build ####
++#### generate templates; done on every build ####
+
+-# in a non-srcdir build, we need to copy files from the previous step
+-# and the files from previous runs of this step
+-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES)
$(DOC_MODULE)-sections.txt $(DOC_OVERRIDES)
+- @echo ' DOC Rebuilding template files'
+- @if test x"$(srcdir)" != x. ; then \
+- for f in $(SCANOBJ_FILES) $(SCAN_FILES); \
+- do \
+- if test -e $(srcdir)/$$f; then cp -u $(srcdir)/$$f . ; fi;
\
+- done; \
+- fi
+- @gtkdoc-mktmpl --module=$(DOC_MODULE)
++tmpl-build.stamp:
++ @echo ' DOC Building template files'
+ @$(PYTHON) \
+ $(top_srcdir)/common/mangle-tmpl.py $(srcdir)/$(INSPECT_DIR)
tmpl
+ @touch tmpl-build.stamp
+diff --git a/mangle-tmpl.py b/mangle-tmpl.py
+index 51ea8c2..7a92d04 100644
+--- a/mangle-tmpl.py
++++ b/mangle-tmpl.py
+@@ -2,21 +2,12 @@
+ # vi:si:et:sw=4:sts=4:ts=4
+
+ """
+-use the output from gst-xmlinspect.py to mangle tmpl/*.sgml and
+-insert/overwrite Short Description and Long Description
++use the files from inspect/*.xml to create mininal tmpl/*.sgml files
containing
++'Short Description' and 'Long Description' to inject element details into the
++docbook files produced by gtkdoc-mkdb
+ """
+
+-# FIXME: right now it uses pygst and scans on its own;
+-# we really should use inspect/*.xml instead since the result of
+-# gst-xmlinspect.py is committed by the docs maintainer, who can be
+-# expected to have pygst, but this step should be done for every docs build,
+-# so no pygst allowed
+-
+-# read in inspect/*.xml
+-# for every tmpl/element-(name).xml: mangle with details from element
+-
+ import glob
+-import re
+ import sys
+ import os
+
+@@ -28,37 +19,12 @@ def __init__(self, filename):
+ self._sectionids = []
+ self._sections = {}
+
+- def read(self):
+- """
+- Read and parse the sections from the given file.
+- """
+- lines = open(self.filename).readlines()
+- matcher = re.compile("<!-- ##### SECTION (\S+) ##### -->\n")
+- id = None
+-
+- for line in lines:
+- match = matcher.search(line)
+- if match:
+- id = match.expand("\\1")
+- self._sectionids.append(id)
+- self._sections[id] = []
+- else:
+- if not id:
+- sys.stderr.write(
+- "WARNING: line before a SECTION header: %s" % line)
+- else:
+- self._sections[id].append(line)
+-
+- def get_section(self, id):
+- """
+- Get the content from the given section.
+- """
+- return self._sections[id]
+-
+ def set_section(self, id, content):
+ """
+ Replace the given section id with the given content.
+ """
++ if not id in self._sectionids:
++ self._sectionids.append(id)
+ self._sections[id] = content
+
+ def output(self):
+@@ -73,14 +39,10 @@ def output(self):
+
+ return "".join(lines)
+
+- def write(self, backup=False):
++ def write(self):
+ """
+ Write out the template file again, backing up the previous one.
+ """
+- if backup:
+- target = self.filename + ".mangle.bak"
+- os.rename(self.filename, target)
+-
+ handle = open(self.filename, "w")
+ handle.write(self.output())
+ handle.close()
+@@ -136,30 +98,28 @@ def main():
+ inspectdir = sys.argv[1]
+ tmpldir = sys.argv[2]
+
++ if not os.path.exists (tmpldir):
++ os.mkdir(tmpldir)
++
+ # parse all .xml files; build map of element name -> short desc
+ #for file in glob.glob("inspect/plugin-*.xml"):
+ elements = {}
+ for file in glob.glob("%s/plugin-*.xml" % inspectdir):
+ elements.update(get_elements(file))
+
+- for file in glob.glob("%s/element-*.sgml" % tmpldir):
+- base = os.path.basename(file)
+- element = base[len("element-"):-len(".sgml")]
++ for element in elements.keys():
++ file = "%s/element-%s.sgml" % (tmpldir, element)
+ tmpl = Tmpl(file)
+- tmpl.read()
+- if element in elements.keys():
+- description = elements[element]['description']
+- tmpl.set_section("Short_Description", "%s\n\n" % description)
+
+- # put in an include if not yet there
++ description = elements[element]['description']
++ tmpl.set_section("Short_Description", "%s\n" % description)
++
++ # add include for details
+ line = '<include xmlns="http://www.w3.org/2003/XInclude"; href="' + \
+ 'element-' + element + '-details.xml">' + \
+ '<fallback xmlns="http://www.w3.org/2003/XInclude"; />' + \
+ '</include>\n'
+- section = tmpl.get_section("Long_Description")
+- if not section[0] == line:
+- section.insert(0, line)
+- tmpl.set_section("Long_Description", section)
++ tmpl.set_section("Long_Description", line)
+ tmpl.write()
+
+ main()
+From f363b3205658a38e84fa77f19dee218cd4445275 Mon Sep 17 00:00:00 2001
+From: Nicolas Dufresne <[email protected]>
+Date: Mon, 20 Jun 2016 15:38:01 -0400
+Subject: [PATCH] Fix handling of DOC_SOURCE_DIR list
+
+As some places we where assuming a single directory. This caused some
+plugins documentation to be ignored.
+---
+ gtk-doc-plugins.mak | 8 ++++++--
+ gtk-doc.mak | 6 +++++-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
+index fe0977c..4b5dd1b 100644
+--- a/gtk-doc-plugins.mak
++++ b/gtk-doc-plugins.mak
+@@ -179,9 +179,13 @@ sgml-build.stamp: scan-build.stamp $(CFILE_GLOB)
$(top_srcdir)/common/plugins.xs
+ $(top_srcdir)/common/plugins.xsl $$a > xml/`basename $$a`; done
+ @for f in $(EXAMPLE_CFILES); do \
+ $(PYTHON) $(top_srcdir)/common/c-to-xml.py $$f >
xml/element-`basename $$f .c`.xml; done
+- @gtkdoc-mkdb \
++ @_source_dir='' ; \
++ for i in $(DOC_SOURCE_DIR) ; do \
++ _source_dir="$${_source_dir} --source-dir=$$i" ; \
++ done ; \
++ gtkdoc-mkdb \
+ --module=$(DOC_MODULE) \
+- --source-dir=$(DOC_SOURCE_DIR) \
++ $${_source_dir} \
+ --expand-content-files="$(expand_content_files)" \
+ --main-sgml-file=$(srcdir)/$(DOC_MAIN_SGML_FILE) \
+ --output-format=xml \
+diff --git a/gtk-doc.mak b/gtk-doc.mak
+index 2aab3a9..4beebcf 100644
+--- a/gtk-doc.mak
++++ b/gtk-doc.mak
+@@ -121,7 +121,11 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES)
$(DOC_MODULE)-sections.txt $(DOC_MODULE)
+
+ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES)
$(DOC_MODULE)-sections.txt $(expand_content_files)
+ @echo ' DOC Building XML'
+- @gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
--expand-content-files="$(expand_content_files)"
--main-sgml-file=$(DOC_MAIN_SGML_FILE) --output-format=xml $(MKDB_OPTIONS)
++ @_source_dir='' ; \
++ for i in $(DOC_SOURCE_DIR) ; do \
++ _source_dir="$${_source_dir} --source-dir=$$i" ; \
++ done ; \
++ gtkdoc-mkdb --module=$(DOC_MODULE) $$(_source_dir)
--expand-content-files="$(expand_content_files)"
--main-sgml-file=$(DOC_MAIN_SGML_FILE) --output-format=xml $(MKDB_OPTIONS)
+ @cp ../version.entities xml
+ @touch sgml-build.stamp
+
diff --git a/gstreamer-plugins-bad-orc.patch b/gstreamer-plugins-bad-orc.patch
new file mode 100644
index 0000000..61626bf
--- /dev/null
+++ b/gstreamer-plugins-bad-orc.patch
@@ -0,0 +1,137 @@
+--- gst-plugins-bad-0.10.23/gst/colorspace/gstcolorspaceorc.orc.orig
2011-12-11 19:49:12.000000000 +0100
++++ gst-plugins-bad-0.10.23/gst/colorspace/gstcolorspaceorc.orc
2017-12-20 20:46:36.236765984 +0100
+@@ -116,7 +116,7 @@
+
+
+ .function cogorc_upsample_horiz_cosite_1tap
+-.dest 2 d1 guint8 guint8
++.dest 2 d1 guint8
+ .source 1 s1 guint8
+ .temp 1 t1
+
+@@ -125,7 +125,7 @@
+
+
+ .function cogorc_upsample_horiz_cosite
+-.dest 2 d1 guint8 guint8
++.dest 2 d1 guint8
+ .source 1 s1 guint8
+ .source 1 s2 guint8
+ .temp 1 t1
+@@ -173,7 +173,7 @@
+
+ .function orc_pack_yuyv
+ .dest 4 d1 guint8
+-.source 2 s1 guint8 guint8
++.source 2 s1 guint8
+ .source 1 s2 guint8
+ .source 1 s3 guint8
+ .temp 1 t1
+@@ -217,7 +217,7 @@
+
+ .function orc_pack_uyvy
+ .dest 4 d1 guint8
+-.source 2 s1 guint8 guint8
++.source 2 s1 guint8
+ .source 1 s2 guint8
+ .source 1 s3 guint8
+ .temp 1 t1
+@@ -235,9 +235,9 @@
+
+
+ .function orc_matrix2_u8
+-.dest 1 d1 guint8 guint8
+-.source 1 s1 guint8 guint8
+-.source 1 s2 guint8 guint8
++.dest 1 d1 guint8
++.source 1 s1 guint8
++.source 1 s2 guint8
+ .param 2 p1
+ .param 2 p2
+ .param 2 p3
+@@ -255,9 +255,9 @@
+
+
+ .function orc_matrix2_11_u8
+-.dest 1 d1 guint8 guint8
+-.source 1 s1 guint8 guint8
+-.source 1 s2 guint8 guint8
++.dest 1 d1 guint8
++.source 1 s1 guint8
++.source 1 s2 guint8
+ .param 2 p1
+ .param 2 p2
+ .temp 2 t1
+@@ -280,9 +280,9 @@
+
+
+ .function orc_matrix2_12_u8
+-.dest 1 d1 guint8 guint8
+-.source 1 s1 guint8 guint8
+-.source 1 s2 guint8 guint8
++.dest 1 d1 guint8
++.source 1 s1 guint8
++.source 1 s2 guint8
+ .param 2 p1
+ .param 2 p2
+ .temp 2 t1
+@@ -306,10 +306,10 @@
+
+
+ .function orc_matrix3_u8
+-.dest 1 d1 guint8 guint8
+-.source 1 s1 guint8 guint8
+-.source 1 s2 guint8 guint8
+-.source 1 s3 guint8 guint8
++.dest 1 d1 guint8
++.source 1 s1 guint8
++.source 1 s2 guint8
++.source 1 s3 guint8
+ .param 2 p1
+ .param 2 p2
+ .param 2 p3
+@@ -331,10 +331,10 @@
+
+
+ .function orc_matrix3_100_u8
+-.dest 1 d1 guint8 guint8
+-.source 1 s1 guint8 guint8
+-.source 1 s2 guint8 guint8
+-.source 1 s3 guint8 guint8
++.dest 1 d1 guint8
++.source 1 s1 guint8
++.source 1 s2 guint8
++.source 1 s3 guint8
+ .param 2 p1
+ .param 2 p2
+ .param 2 p3
+@@ -361,10 +361,10 @@
+
+
+ .function orc_matrix3_100_offset_u8
+-.dest 1 d1 guint8 guint8
+-.source 1 s1 guint8 guint8
+-.source 1 s2 guint8 guint8
+-.source 1 s3 guint8 guint8
++.dest 1 d1 guint8
++.source 1 s1 guint8
++.source 1 s2 guint8
++.source 1 s3 guint8
+ .param 2 p1
+ .param 2 p2
+ .param 2 p3
+@@ -394,10 +394,10 @@
+
+
+ .function orc_matrix3_000_u8
+-.dest 1 d1 guint8 guint8
+-.source 1 s1 guint8 guint8
+-.source 1 s2 guint8 guint8
+-.source 1 s3 guint8 guint8
++.dest 1 d1 guint8
++.source 1 s1 guint8
++.source 1 s2 guint8
++.source 1 s3 guint8
+ .param 2 p1
+ .param 2 p2
+ .param 2 p3
diff --git a/gstreamer-plugins-bad-timidity.patch
b/gstreamer-plugins-bad-timidity.patch
index dbbfc41..aeb22de 100644
--- a/gstreamer-plugins-bad-timidity.patch
+++ b/gstreamer-plugins-bad-timidity.patch
@@ -18,3 +18,23 @@
if test "x$timidity_cfg" != "x"; then
AC_MSG_RESULT($timidity_cfg)
AC_DEFINE_UNQUOTED(TIMIDITY_CFG, "$timidity_cfg", [Define location of
timidity.cfg])
+--- gst-plugins-bad-0.10.23/ext/timidity/gsttimidity.c.orig 2011-12-30
19:24:28.000000000 +0100
++++ gst-plugins-bad-0.10.23/ext/timidity/gsttimidity.c 2017-12-20
21:07:07.223418598 +0100
+@@ -405,7 +405,7 @@
+ gst_segment_set_seek (timidity->o_segment, rate, dst_format, flags,
+ start_type, start, stop_type, stop, &update);
+
+- if ((flags && GST_SEEK_FLAG_SEGMENT) == GST_SEEK_FLAG_SEGMENT) {
++ if ((flags & GST_SEEK_FLAG_SEGMENT) == GST_SEEK_FLAG_SEGMENT) {
+ GST_DEBUG_OBJECT (timidity, "received segment seek %d, %d",
+ (gint) start_type, (gint) stop_type);
+ } else {
+@@ -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);
diff --git a/gtk-doc.patch b/gtk-doc.patch
deleted file mode 100644
index 83dfb5b..0000000
--- a/gtk-doc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- gst-plugins-bad-0.10.23/common/gtk-doc.mak.orig 2016-04-23
16:55:33.528251449 +0200
-+++ gst-plugins-bad-0.10.23/common/gtk-doc.mak 2016-04-23 16:57:22.239594358
+0200
-@@ -130,10 +130,7 @@
- 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 $(MKHTML_OPTIONS)
$(DOC_MODULE)-@GST_MAJORMINOR@ ../$(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 )
---- gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak~ 2011-12-30
19:32:24.000000000 +0100
-+++ gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak 2016-04-23
17:07:38.143851580 +0200
-@@ -223,10 +223,7 @@
- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gstreamer0.10-plugins-bad.git/commitdiff/e9716b6c6f52e63d96e4d861a078652874c2ff0a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
