Remove insecure nsf plugin (#1395126)
- Put api version in doc modules to fix doc build
This commit is contained in:
parent
cedec754aa
commit
d930d1b842
@ -38,6 +38,7 @@ 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
|
||||
Patch10: put-api-version-in-html-book-name.patch
|
||||
|
||||
Requires: %{gstreamer} >= %{gst_minver}
|
||||
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
|
||||
@ -171,6 +172,7 @@ aren't tested well enough, or the code is not of good enough quality.
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
sed -i 's/opencv <= 2.3.1/opencv <= 2.4.3/g' configure
|
||||
|
||||
|
||||
@ -367,6 +369,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
%changelog
|
||||
* Wed Nov 30 2016 Wim Taymans <wtaymans@redhat.com> - 0.10.23-33
|
||||
- Remove insecure nsf plugin (#1395126)
|
||||
- Put api version in doc modules to fix doc build
|
||||
|
||||
* Thu Feb 25 2016 Wim Taymans <wtaymans@redhat.com> - 0.10.23-32
|
||||
- rebuild for soundtouch (#1311323)
|
||||
@ -391,7 +394,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
- rebuild for libvpx 1.4.0
|
||||
- fix build against libvpx 1.4.0
|
||||
|
||||
* Mon Aug 26 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.10.23-24
|
||||
* 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
|
||||
@ -463,7 +466,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
* Tue May 29 2012 Adel Gadllah <adel.gadllah@gmail.com> 0.10.23-4
|
||||
- Backport upstream patch to fix vp8enc (GNOME #676653, #676245)
|
||||
|
||||
* Tue Mar 05 2012 Benjamin Otte <otte@redhat.com> 0.10.23-3
|
||||
* 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
|
||||
@ -534,7 +537,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
|
||||
|
||||
* Thu Jul 04 2010 Benjamin Otte <otte@redhat.com> 0.10.19-5
|
||||
* Sun 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
|
||||
@ -549,11 +552,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
|
||||
|
||||
* Fri May 15 2010 Benjamin Otte <otte@redhat.com> 0.10.18.3-1
|
||||
* Sat May 15 2010 Benjamin Otte <otte@redhat.com> 0.10.18.3-1
|
||||
- Update pre-release
|
||||
- Add vp8 elements
|
||||
|
||||
* Fri May 15 2010 Benjamin Otte <otte@redhat.com> 0.10.18.2-1
|
||||
* Sat 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
|
||||
|
112
put-api-version-in-html-book-name.patch
Normal file
112
put-api-version-in-html-book-name.patch
Normal file
@ -0,0 +1,112 @@
|
||||
diff -ur gst-plugins-bad-0.10.23/common/gtk-doc.mak gst-plugins-bad-0.10.23.new/common/gtk-doc.mak
|
||||
--- gst-plugins-bad-0.10.23/common/gtk-doc.mak 2011-12-30 19:32:24.000000000 +0100
|
||||
+++ gst-plugins-bad-0.10.23.new/common/gtk-doc.mak 2016-11-30 12:17:45.944345829 +0100
|
||||
@@ -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 )
|
||||
@@ -189,9 +186,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 -ur gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak gst-plugins-bad-0.10.23.new/common/gtk-doc-plugins.mak
|
||||
--- 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.new/common/gtk-doc-plugins.mak 2016-11-30 12:19:04.598520343 +0100
|
||||
@@ -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
|
||||
@@ -290,9 +287,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 && \
|
||||
diff -ru gst-plugins-bad-0.10.23/docs/libs/Makefile.in gst-plugins-bad-0.10.23.new/docs/libs/Makefile.in
|
||||
--- gst-plugins-bad-0.10.23/docs/libs/Makefile.in 2012-02-28 20:13:59.000000000 +0100
|
||||
+++ gst-plugins-bad-0.10.23.new/docs/libs/Makefile.in 2016-11-30 12:35:40.609390956 +0100
|
||||
@@ -942,10 +942,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 )
|
||||
@@ -999,9 +996,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-bad-0.10.23/docs/plugins/Makefile.in gst-plugins-bad-0.10.23.new/docs/plugins/Makefile.in
|
||||
--- gst-plugins-bad-0.10.23/docs/plugins/Makefile.in 2012-02-28 20:13:59.000000000 +0100
|
||||
+++ gst-plugins-bad-0.10.23.new/docs/plugins/Makefile.in 2016-11-30 12:36:27.440303335 +0100
|
||||
@@ -1379,10 +1379,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
|
||||
@@ -1442,9 +1439,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 && \
|
Loading…
Reference in New Issue
Block a user