[packages/gstreamer0.10-plugins-bad] - fix building with new gtk-doc - rel 21

baggins baggins at pld-linux.org
Sat Apr 23 17:14:21 CEST 2016


commit ce155f6746b69cd955d511a0890675302913968a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Apr 23 17:14:05 2016 +0200

    - fix building with new gtk-doc
    - rel 21

 gstreamer0.10-plugins-bad.spec |  4 +++-
 gtk-doc.patch                  | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer0.10-plugins-bad.spec b/gstreamer0.10-plugins-bad.spec
index b38bde9..5fa0400 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:	20
+Release:	21
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{version}.tar.bz2
@@ -47,6 +47,7 @@ Patch7:		gstreamer-plugins-bad-opencv.patch
 Patch8:		gst-neon.patch
 Patch9:		gstreamer-plugins-bad-modplug.patch
 Patch10:	libvpx2.patch
+Patch11:	gtk-doc.patch
 URL:		http://gstreamer.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.10
@@ -874,6 +875,7 @@ Wtyczka do GStreamera skanująca kody kreskowe.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 %{__libtoolize}
diff --git a/gtk-doc.patch b/gtk-doc.patch
new file mode 100644
index 0000000..83dfb5b
--- /dev/null
+++ b/gtk-doc.patch
@@ -0,0 +1,28 @@
+--- 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)- at 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)- at 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)- at GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml
+-	@rm -f html/index.sgml.bak
++	cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)- at 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/ce155f6746b69cd955d511a0890675302913968a



More information about the pld-cvs-commit mailing list