From b1bd54144d82d22602506895dbef448b64922c96 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 2 May 2013 17:38:46 -0400 Subject: [PATCH] Hack the gtk-doc to remove plugin docs that are not shipped - Drop mythtv, opencv sources that are no longer buildable --- ...Delete-unbuilt-plugins-from-the-docs.patch | 73 +++++++++++++++++++ gstreamer-plugins-bad-free.spec | 12 ++- 2 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 0001-Delete-unbuilt-plugins-from-the-docs.patch diff --git a/0001-Delete-unbuilt-plugins-from-the-docs.patch b/0001-Delete-unbuilt-plugins-from-the-docs.patch new file mode 100644 index 0000000..3699d9f --- /dev/null +++ b/0001-Delete-unbuilt-plugins-from-the-docs.patch @@ -0,0 +1,73 @@ +From 6bc5fda6d9914e7de31af84ccd9e843e0c1cb398 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 2 May 2013 17:04:02 -0400 +Subject: [PATCH] Delete unbuilt plugins from the docs + +So the gtk-doc builds, and life can go on. +--- + docs/plugins/Makefile.am | 1 - + docs/plugins/gst-plugins-bad-plugins-docs.sgml | 2 -- + docs/plugins/gst-plugins-bad-plugins-sections.txt | 15 --------------- + 3 files changed, 0 insertions(+), 18 deletions(-) + +diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am +index 99f280d..e8c7434 100644 +--- a/docs/plugins/Makefile.am ++++ b/docs/plugins/Makefile.am +@@ -103,7 +103,6 @@ EXTRA_HFILES = \ + $(top_srcdir)/ext/timidity/gsttimidity.h \ + $(top_srcdir)/ext/timidity/gstwildmidi.h \ + $(top_srcdir)/ext/voaacenc/gstvoaacenc.h \ +- $(top_srcdir)/ext/voamrwbenc/gstvoamrwbenc.h \ + $(top_srcdir)/ext/vp8/gstvp8enc.h \ + $(top_srcdir)/ext/vp8/gstvp8dec.h \ + $(top_srcdir)/ext/zbar/gstzbar.h \ +diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml +index 07fcdaa..10e7b5b 100644 +--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml ++++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml +@@ -127,7 +127,6 @@ + + + +- + + + +@@ -221,7 +220,6 @@ + + + +- + + + +diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt +index d7fc96e..6ddc81d 100644 +--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt ++++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt +@@ -1667,21 +1667,6 @@ GST_TYPE_VOAACENC + gst_voaacenc_get_type + + +-
+-element-voamrwbenc +-voamrwbenc +-GstVoAmrwbEnc +- +-GstVoAmrwbEncClass +-GST_VOAMRWBENC +-GST_VOAMRWBENC_CLASS +-GST_IS_VOAMRWBENC +-GST_IS_VOAMRWBENC_CLASS +-GST_TYPE_VOAMRWBENC +-gst_voamrwbenc_get_type +-
+- +-
+ element-vp8dec + vp8dec + GstVP8Dec +-- +1.7.1 + diff --git a/gstreamer-plugins-bad-free.spec b/gstreamer-plugins-bad-free.spec index 2fde75b..5300646 100644 --- a/gstreamer-plugins-bad-free.spec +++ b/gstreamer-plugins-bad-free.spec @@ -14,7 +14,7 @@ Summary: GStreamer streaming media framework "bad" plug-ins Name: gstreamer-plugins-bad-free Version: 0.10.23 -Release: 16%{?dist} +Release: 17%{?dist} # The freeze and nfs plugins are LGPLv2 (only) License: LGPLv2+ and LGPLv2 Group: Applications/Multimedia @@ -34,6 +34,7 @@ Patch4: 0004-camerabin-Set-src_filter-and-zoom_src_filter-caps-wh.patch # Cherry picked from upstream git for rhbz#820959 Patch5: 0005-geometrictransform-crash-fix1.patch Patch6: 0006-geometrictransform-crash-fix2.patch +Patch7: 0001-Delete-unbuilt-plugins-from-the-docs.patch Requires: %{gstreamer} >= %{gst_minver} BuildRequires: %{gstreamer}-devel >= %{gst_minver} @@ -166,6 +167,7 @@ aren't tested well enough, or the code is not of good enough quality. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 sed -i 's/opencv <= 2.3.1/opencv <= 2.4.3/g' configure @@ -320,8 +322,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/gstreamer-%{majorminor}/libgstkate.so %{_libdir}/gstreamer-%{majorminor}/libgstlv2.so %{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so -%{_libdir}/gstreamer-%{majorminor}/libgstmythtvsrc.so -%{_libdir}/gstreamer-%{majorminor}/libgstopencv.so %{_libdir}/gstreamer-%{majorminor}/libgstschro.so %{_libdir}/gstreamer-%{majorminor}/libgstsdl.so %{_libdir}/gstreamer-%{majorminor}/libgstteletextdec.so @@ -365,7 +365,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %changelog -* Thu May 10 2013 Colin Walters 0.10.23-16 +* Thu May 02 2013 Colin Walters 0.10.23-17 +- Hack the gtk-doc to remove plugin docs that are not shipped +- Drop mythtv, opencv sources that are no longer buildable + +* Thu May 02 2013 Colin Walters 0.10.23-16 - Drop PyXML BR (#914060) * Thu Mar 07 2013 Bastien Nocera 0.10.23-15