7:55 a.m.
commit 16e16b484f510e6fbabd20dcae49441f53dd44d0
Author: Wim Taymans <wtaymans(a)redhat.com>
Date: Tue Dec 6 18:03:01 2016 +0100
typefind: bounds check windows ico detection
(rhbz#1401949)
- fix build of docs and gir files
fix-docs.patch | 57 +++++++++++++++++++++
fix-gst-init.patch | 120 ++++++++++++++++++++++++++++++++++++++++++++
gstreamer-plugins-base.spec | 5 ++
3 files changed, 182 insertions(+)
---
diff --git a/fix-docs.patch b/fix-docs.patch
new file mode 100644
index 0000000..0fbc741
--- /dev/null
+++ b/fix-docs.patch
@@ -0,0 +1,57 @@
+diff -ru gst-plugins-base-0.10.36/docs/libs/Makefile.in
gst-plugins-base-0.10.36.new/docs/libs/Makefile.in
+--- gst-plugins-base-0.10.36/docs/libs/Makefile.in 2012-02-21 00:33:11.000000000 +0100
++++ gst-plugins-base-0.10.36.new/docs/libs/Makefile.in 2016-12-06 17:58:11.897962358
+0100
+@@ -852,10 +852,7 @@
+ @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
$(MKHTML_OPTIONS) $(DOC_MODULE)-@GST_MAJORMINOR@ ../$(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 )
+@@ -909,9 +906,9 @@
+ 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 -ru gst-plugins-base-0.10.36/docs/plugins/Makefile.in
gst-plugins-base-0.10.36.new/docs/plugins/Makefile.in
+--- gst-plugins-base-0.10.36/docs/plugins/Makefile.in 2012-02-21 00:33:11.000000000
+0100
++++ gst-plugins-base-0.10.36.new/docs/plugins/Makefile.in 2016-12-06 17:58:46.370177477
+0100
+@@ -994,10 +994,7 @@
+ @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
+@@ -1057,9 +1054,9 @@
+ $(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)-@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 && \
+Only in gst-plugins-base-0.10.36.new/docs: version.entities
diff --git a/fix-gst-init.patch b/fix-gst-init.patch
new file mode 100644
index 0000000..e0a1621
--- /dev/null
+++ b/fix-gst-init.patch
@@ -0,0 +1,120 @@
+diff -ru gst-plugins-base-0.10.36/gst-libs/gst/app/Makefile.in
gst-plugins-base-0.10.36.new/gst-libs/gst/app/Makefile.in
+--- gst-plugins-base-0.10.36/gst-libs/gst/app/Makefile.in 2012-02-21 00:33:14.000000000
+0100
++++ gst-plugins-base-0.10.36.new/gst-libs/gst/app/Makefile.in 2016-12-06
17:50:34.225382882 +0100
+@@ -973,7 +973,7 @@
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-base-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-app-@GST_MAJORMINOR@ \
+-@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \
++@HAVE_INTROSPECTION_TRUE@ --add-init-section="void gst_init(void*,void*);
gst_init(NULL,NULL);" \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_headers) \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_sources)
+diff -ru gst-plugins-base-0.10.36/gst-libs/gst/audio/Makefile.in
gst-plugins-base-0.10.36.new/gst-libs/gst/audio/Makefile.in
+--- gst-plugins-base-0.10.36/gst-libs/gst/audio/Makefile.in 2012-02-21 00:33:15.000000000
+0100
++++ gst-plugins-base-0.10.36.new/gst-libs/gst/audio/Makefile.in 2016-12-06
17:50:39.471263440 +0100
+@@ -1134,7 +1134,7 @@
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-base-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-interfaces-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-audio-@GST_MAJORMINOR@ \
+-@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \
++@HAVE_INTROSPECTION_TRUE@ --add-init-section="void gst_init(void*,void*);
gst_init(NULL,NULL);" \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_headers) \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_sources)
+diff -ru gst-plugins-base-0.10.36/gst-libs/gst/interfaces/Makefile.in
gst-plugins-base-0.10.36.new/gst-libs/gst/interfaces/Makefile.in
+--- gst-plugins-base-0.10.36/gst-libs/gst/interfaces/Makefile.in 2012-02-21
00:33:16.000000000 +0100
++++ gst-plugins-base-0.10.36.new/gst-libs/gst/interfaces/Makefile.in 2016-12-06
17:50:53.306948423 +0100
+@@ -1142,7 +1142,7 @@
+ @HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-interfaces-@GST_MAJORMINOR@ \
+-@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \
++@HAVE_INTROSPECTION_TRUE@ --add-init-section="void gst_init(void*,void*);
gst_init(NULL,NULL);" \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_headers) \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_sources)
+diff -ru gst-plugins-base-0.10.36/gst-libs/gst/netbuffer/Makefile.in
gst-plugins-base-0.10.36.new/gst-libs/gst/netbuffer/Makefile.in
+--- gst-plugins-base-0.10.36/gst-libs/gst/netbuffer/Makefile.in 2012-02-21
00:33:16.000000000 +0100
++++ gst-plugins-base-0.10.36.new/gst-libs/gst/netbuffer/Makefile.in 2016-12-06
17:50:57.476853480 +0100
+@@ -863,7 +863,7 @@
+ @HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-netbuffer-@GST_MAJORMINOR@ \
+-@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \
++@HAVE_INTROSPECTION_TRUE@ --add-init-section="void gst_init(void*,void*);
gst_init(NULL,NULL);" \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_headers) \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_sources)
+diff -ru gst-plugins-base-0.10.36/gst-libs/gst/pbutils/Makefile.in
gst-plugins-base-0.10.36.new/gst-libs/gst/pbutils/Makefile.in
+--- gst-plugins-base-0.10.36/gst-libs/gst/pbutils/Makefile.in 2012-02-21
00:33:16.000000000 +0100
++++ gst-plugins-base-0.10.36.new/gst-libs/gst/pbutils/Makefile.in 2016-12-06
17:51:02.673735155 +0100
+@@ -1116,7 +1116,7 @@
+ @HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-pbutils-@GST_MAJORMINOR@ \
+-@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \
++@HAVE_INTROSPECTION_TRUE@ --add-init-section="void gst_init(void*,void*);
gst_init(NULL,NULL);" \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_headers) \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_sources)
+diff -ru gst-plugins-base-0.10.36/gst-libs/gst/riff/Makefile.in
gst-plugins-base-0.10.36.new/gst-libs/gst/riff/Makefile.in
+--- gst-plugins-base-0.10.36/gst-libs/gst/riff/Makefile.in 2012-02-21 00:33:16.000000000
+0100
++++ gst-plugins-base-0.10.36.new/gst-libs/gst/riff/Makefile.in 2016-12-06
17:51:07.250630948 +0100
+@@ -906,7 +906,7 @@
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-audio-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-interfaces-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-riff-@GST_MAJORMINOR@ \
+-@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \
++@HAVE_INTROSPECTION_TRUE@ --add-init-section="void gst_init(void*,void*);
gst_init(NULL,NULL);" \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_headers) \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_sources)
+diff -ru gst-plugins-base-0.10.36/gst-libs/gst/rtp/Makefile.in
gst-plugins-base-0.10.36.new/gst-libs/gst/rtp/Makefile.in
+--- gst-plugins-base-0.10.36/gst-libs/gst/rtp/Makefile.in 2012-02-21 00:33:17.000000000
+0100
++++ gst-plugins-base-0.10.36.new/gst-libs/gst/rtp/Makefile.in 2016-12-06
17:51:11.867525826 +0100
+@@ -922,7 +922,7 @@
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-base-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-rtp-@GST_MAJORMINOR@ \
+-@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \
++@HAVE_INTROSPECTION_TRUE@ --add-init-section="void gst_init(void*,void*);
gst_init(NULL,NULL);" \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_headers) \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_sources)
+diff -ru gst-plugins-base-0.10.36/gst-libs/gst/rtsp/Makefile.in
gst-plugins-base-0.10.36.new/gst-libs/gst/rtsp/Makefile.in
+--- gst-plugins-base-0.10.36/gst-libs/gst/rtsp/Makefile.in 2012-02-21 00:33:17.000000000
+0100
++++ gst-plugins-base-0.10.36.new/gst-libs/gst/rtsp/Makefile.in 2016-12-06
17:51:15.858434959 +0100
+@@ -1068,7 +1068,7 @@
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-sdp-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-rtsp-@GST_MAJORMINOR@ \
+-@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \
++@HAVE_INTROSPECTION_TRUE@ --add-init-section="void gst_init(void*,void*);
gst_init(NULL,NULL);" \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_headers) \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_sources)
+diff -ru gst-plugins-base-0.10.36/gst-libs/gst/tag/Makefile.in
gst-plugins-base-0.10.36.new/gst-libs/gst/tag/Makefile.in
+--- gst-plugins-base-0.10.36/gst-libs/gst/tag/Makefile.in 2012-02-21 00:33:18.000000000
+0100
++++ gst-plugins-base-0.10.36.new/gst-libs/gst/tag/Makefile.in 2016-12-06
17:51:21.977295644 +0100
+@@ -1081,7 +1081,7 @@
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-base-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-tag-@GST_MAJORMINOR@ \
+-@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \
++@HAVE_INTROSPECTION_TRUE@ --add-init-section="void gst_init(void*,void*);
gst_init(NULL,NULL);" \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_headers) \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_sources)
+diff -ru gst-plugins-base-0.10.36/gst-libs/gst/video/Makefile.in
gst-plugins-base-0.10.36.new/gst-libs/gst/video/Makefile.in
+--- gst-plugins-base-0.10.36/gst-libs/gst/video/Makefile.in 2012-02-21 00:33:18.000000000
+0100
++++ gst-plugins-base-0.10.36.new/gst-libs/gst/video/Makefile.in 2016-12-06
17:51:30.387104159 +0100
+@@ -1132,7 +1132,7 @@
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-base-@GST_MAJORMINOR@ \
+ @HAVE_INTROSPECTION_TRUE@ --pkg-export gstreamer-video-@GST_MAJORMINOR@ \
+-@HAVE_INTROSPECTION_TRUE@ --add-init-section="gst_init(NULL,NULL);" \
++@HAVE_INTROSPECTION_TRUE@ --add-init-section="void gst_init(void*,void*);
gst_init(NULL,NULL);" \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_headers) \
+ @HAVE_INTROSPECTION_TRUE@ $(gir_sources)
diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec
index 8c0a815..6561a89 100644
--- a/gstreamer-plugins-base.spec
+++ b/gstreamer-plugins-base.spec
@@ -47,6 +47,8 @@ Patch0: 0001-missing-plugins-Remove-the-mpegaudioversion-field.patch
Patch1: 0001-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
Patch2: 0002-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch
Patch3: 0001-typefind-bounds-check-windows-ico-detection.patch
+Patch4: fix-gst-init.patch
+Patch5: fix-docs.patch
%description
GStreamer is a streaming media framework, based on graphs of filters which
@@ -64,6 +66,8 @@ This package contains a set of well-maintained base plug-ins.
%patch1 -p1 -b .0001
%patch2 -p1 -b .0002
%patch3 -p1 -b .0003
+%patch4 -p1 -b .0004
+%patch5 -p1 -b .0005
%build
%configure \
@@ -361,6 +365,7 @@ library.
* Tue Dec 06 2016 Wim Taymans <wtaymans(a)redhat.com> - 0.10.36-15
- typefind: bounds check windows ico detection
(rhbz#1401949)
+- fix build of docs and gir files
* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.10.36-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
1642
days inactive
1642
days old
rpmfusion-commits@lists.rpmfusion.org
0 comments
1 participants
participants (1)
-
Dominik Mierzejewski