commit e1ac5551bc38fd172388747ce9c625a69242d250
Author: Jan Rękorajski <[email protected]>
Date: Wed Oct 6 23:33:53 2021 +0200
- rediff patches
gstreamer-common-gtkdoc.patch | 179 +++++++++++++--------------------
gstreamer-plugins-bad-divx4linux.patch | 59 +++++------
gstreamer0.10-plugins-bad.spec | 2 -
3 files changed, 101 insertions(+), 139 deletions(-)
---
diff --git a/gstreamer0.10-plugins-bad.spec b/gstreamer0.10-plugins-bad.spec
index cede317..1e42e21 100644
--- a/gstreamer0.10-plugins-bad.spec
+++ b/gstreamer0.10-plugins-bad.spec
@@ -897,9 +897,7 @@ Wtyczka do GStreamera skanująca kody kreskowe.
%patch9 -p1
%patch10 -p1
%patch12 -p1
-cd common
%patch11 -p1
-cd ..
%patch13 -p1
%patch14 -p1
%patch15 -p1
diff --git a/gstreamer-common-gtkdoc.patch b/gstreamer-common-gtkdoc.patch
index 551dfc1..5c2cb67 100644
--- a/gstreamer-common-gtkdoc.patch
+++ b/gstreamer-common-gtkdoc.patch
@@ -10,11 +10,49 @@ along with the 0.10 version.
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)
+diff -urNp -x '*.orig' gst-plugins-bad-0.10.23.org/common/gtk-doc-plugins.mak
gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak
+--- gst-plugins-bad-0.10.23.org/common/gtk-doc-plugins.mak 2011-12-30
19:32:24.000000000 +0100
++++ gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak 2021-10-06
23:28:06.340365779 +0200
+@@ -162,19 +162,10 @@ scan-build.stamp: $(HFILE_GLOB) $(EXTRA_
+ --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
+@@ -192,9 +183,13 @@ sgml-build.stamp: tmpl.stamp scan-build.
+ $(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 \
+@@ -223,10 +218,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
mkhtml_options="$$mkhtml_options --verbose"; \
fi; \
fi; \
@@ -26,7 +64,7 @@ index f69d9d7..f19e7d7 100644
@rm -f html/$(DOC_MAIN_SGML_FILE)
@rm -rf html/xml
@rm -f html/version.entities
-@@ -289,9 +286,9 @@ install-data-local:
+@@ -290,9 +282,9 @@ install-data-local:
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
fi; \
@@ -38,12 +76,24 @@ index f69d9d7..f19e7d7 100644
+ $(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)
+ (which gtkdoc-rebase >/dev/null && \
+diff -urNp -x '*.orig' gst-plugins-bad-0.10.23.org/common/gtk-doc.mak
gst-plugins-bad-0.10.23/common/gtk-doc.mak
+--- gst-plugins-bad-0.10.23.org/common/gtk-doc.mak 2011-12-30
19:32:24.000000000 +0100
++++ gst-plugins-bad-0.10.23/common/gtk-doc.mak 2021-10-06 23:28:06.340365779
+0200
+@@ -104,7 +104,11 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES)
+
+ 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
+
+@@ -130,10 +134,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
if test "$(?)" = "0"; then \
mkhtml_options=--path="$(abs_srcdir)"; \
fi; \
@@ -55,7 +105,7 @@ index 17cee71..9d76889 100644
@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:
+@@ -189,9 +190,9 @@ install-data-local:
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
@@ -67,50 +117,10 @@ index 17cee71..9d76889 100644
+ $(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
+ (which gtkdoc-rebase >/dev/null && \
+diff -urNp -x '*.orig' gst-plugins-bad-0.10.23.org/common/mangle-tmpl.py
gst-plugins-bad-0.10.23/common/mangle-tmpl.py
+--- gst-plugins-bad-0.10.23.org/common/mangle-tmpl.py 2011-12-11
20:19:22.000000000 +0100
++++ gst-plugins-bad-0.10.23/common/mangle-tmpl.py 2021-10-06
23:28:06.340365779 +0200
@@ -2,21 +2,12 @@
# vi:si:et:sw=4:sts=4:ts=4
@@ -136,7 +146,7 @@ index 51ea8c2..7a92d04 100644
import sys
import os
-@@ -28,37 +19,12 @@ def __init__(self, filename):
+@@ -26,37 +17,12 @@ class Tmpl:
self._sectionids = []
self._sections = {}
@@ -176,7 +186,7 @@ index 51ea8c2..7a92d04 100644
self._sections[id] = content
def output(self):
-@@ -73,14 +39,10 @@ def output(self):
+@@ -71,14 +37,10 @@ class Tmpl:
return "".join(lines)
@@ -192,7 +202,7 @@ index 51ea8c2..7a92d04 100644
handle = open(self.filename, "w")
handle.write(self.output())
handle.close()
-@@ -136,30 +98,28 @@ def main():
+@@ -134,30 +96,28 @@ def main():
inspectdir = sys.argv[1]
tmpldir = sys.argv[2]
@@ -233,52 +243,3 @@ index 51ea8c2..7a92d04 100644
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-divx4linux.patch
b/gstreamer-plugins-bad-divx4linux.patch
index 06e278d..73606da 100644
--- a/gstreamer-plugins-bad-divx4linux.patch
+++ b/gstreamer-plugins-bad-divx4linux.patch
@@ -1,30 +1,9 @@
---- gst-plugins-bad-0.10.1/ext/divx/gstdivxdec.h.orig 2005-12-19
15:40:22.000000000 +0100
-+++ gst-plugins-bad-0.10.1/ext/divx/gstdivxdec.h 2006-02-25
01:04:28.560232500 +0100
-@@ -21,7 +21,7 @@
- #define __GST_DIVXDEC_H__
-
- #include <gst/gst.h>
--#include <decore.h>
-+#include <divx/decore.h>
-
- #ifdef __cplusplus
- extern "C" {
---- gst-plugins-bad-0.10.1/ext/divx/gstdivxenc.c.orig 2005-12-19
15:40:22.000000000 +0100
-+++ gst-plugins-bad-0.10.1/ext/divx/gstdivxenc.c 2006-02-25
01:04:46.369345500 +0100
-@@ -24,7 +24,7 @@
- #include <string.h>
- #include "gstdivxenc.h"
- #include <gst/video/video.h>
--#include <encore2.h>
-+#include <divx/encore2.h>
-
- /* elementfactory information */
- GstElementDetails gst_divxenc_details = {
---- gst-plugins-bad-0.10.3/configure.ac.orig 2006-05-21 20:22:12.474199250
+0200
-+++ gst-plugins-bad-0.10.3/configure.ac 2006-05-21 20:23:11.165867250
+0200
-@@ -317,14 +317,14 @@
+diff -urNp -x '*.orig' gst-plugins-bad-0.10.23.org/configure.ac
gst-plugins-bad-0.10.23/configure.ac
+--- gst-plugins-bad-0.10.23.org/configure.ac 2021-10-06 23:27:49.797106808
+0200
++++ gst-plugins-bad-0.10.23/configure.ac 2021-10-06 23:27:50.470437101
+0200
+@@ -840,14 +840,14 @@ dnl *** DIVX ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DIVX, true)
- GST_CHECK_FEATURE(DIVX, [divx plugins], divx, [
+ AG_GST_CHECK_FEATURE(DIVX, [divx plugins], divx, [
HAVE_DIVX=yes
- AC_CHECK_HEADER(encore2.h, , [
+ AC_CHECK_HEADER(divx/encore2.h, , [
@@ -39,7 +18,7 @@
#if ENCORE_VERSION != 20021024
#error Wrong version of divx encore libraries
#endif
-@@ -340,7 +340,7 @@
+@@ -861,7 +861,7 @@ return 0;
])
fi
if [ test x$HAVE_DIVX = xyes ]; then
@@ -48,7 +27,7 @@
AC_MSG_WARN([Divx4linux decoder headers not found])
HAVE_DIVX=no
])
-@@ -348,7 +348,7 @@
+@@ -869,7 +869,7 @@ return 0;
if [ test x$HAVE_DIVX = xyes ]; then
AC_MSG_CHECKING([Checking for valid divx4linux decore version])
AC_TRY_COMPILE([
@@ -57,3 +36,27 @@
#if DECORE_VERSION != 20021112
#error Wrong version of divx decore libraries
#endif
+diff -urNp -x '*.orig' gst-plugins-bad-0.10.23.org/ext/divx/gstdivxdec.h
gst-plugins-bad-0.10.23/ext/divx/gstdivxdec.h
+--- gst-plugins-bad-0.10.23.org/ext/divx/gstdivxdec.h 2011-12-11
19:49:11.000000000 +0100
++++ gst-plugins-bad-0.10.23/ext/divx/gstdivxdec.h 2021-10-06
23:27:50.470437101 +0200
+@@ -21,7 +21,7 @@
+ #define __GST_DIVXDEC_H__
+
+ #include <gst/gst.h>
+-#include <decore.h>
++#include <divx/decore.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+diff -urNp -x '*.orig' gst-plugins-bad-0.10.23.org/ext/divx/gstdivxenc.c
gst-plugins-bad-0.10.23/ext/divx/gstdivxenc.c
+--- gst-plugins-bad-0.10.23.org/ext/divx/gstdivxenc.c 2011-12-30
19:24:28.000000000 +0100
++++ gst-plugins-bad-0.10.23/ext/divx/gstdivxenc.c 2021-10-06
23:27:50.470437101 +0200
+@@ -24,7 +24,7 @@
+ #include <string.h>
+ #include "gstdivxenc.h"
+ #include <gst/video/video.h>
+-#include <encore2.h>
++#include <divx/encore2.h>
+
+ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+ GST_PAD_SINK,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gstreamer0.10-plugins-bad.git/commitdiff/e1ac5551bc38fd172388747ce9c625a69242d250
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
