Compare commits
3 Commits
| Author | SHA1 | Date |
|---|---|---|
Wim Taymans
|
fdf0595fe2 | |
|
Wim Taymans
|
d930d1b842 | |
|
Wim Taymans
|
cedec754aa |
|
|
@ -1,12 +0,0 @@
|
|||
diff -uNr gst-plugins-bad-0.10.23/ext/timidity/gsttimidity.c gst-plugins-bad-0.10.23.timidity/ext/timidity/gsttimidity.c
|
||||
--- gst-plugins-bad-0.10.23/ext/timidity/gsttimidity.c 2011-12-30 19:24:28.000000000 +0100
|
||||
+++ gst-plugins-bad-0.10.23.timidity/ext/timidity/gsttimidity.c 2016-10-06 10:37:54.076801395 +0200
|
||||
@@ -615,7 +615,7 @@
|
||||
GST_DEBUG_OBJECT (timidity, "Parsing song");
|
||||
|
||||
stream =
|
||||
- mid_istream_open_mem (timidity->mididata, timidity->mididata_size, 0);
|
||||
+ mid_istream_open_mem (timidity->mididata, timidity->mididata_size);
|
||||
|
||||
timidity->song = mid_song_load (stream, timidity->song_options);
|
||||
mid_istream_close (stream);
|
||||
|
|
@ -14,13 +14,13 @@
|
|||
Summary: GStreamer streaming media framework "bad" plug-ins
|
||||
Name: gstreamer-plugins-bad-free
|
||||
Version: 0.10.23
|
||||
Release: 45%{?dist}
|
||||
Release: 34%{?dist}
|
||||
# The freeze and nfs plugins are LGPLv2 (only)
|
||||
License: LGPLv2+ and LGPLv2
|
||||
Group: Applications/Multimedia
|
||||
URL: http://gstreamer.freedesktop.org/
|
||||
# The source is:
|
||||
# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{version}.tar.xz
|
||||
# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
|
||||
# modified with gst-p-bad-cleanup.sh from SOURCE1
|
||||
Source: gst-plugins-bad-free-%{version}.tar.xz
|
||||
Source1: gst-p-bad-cleanup.sh
|
||||
|
|
@ -38,12 +38,9 @@ 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
|
||||
# Fix building docs
|
||||
Patch10: gst-plugins-bad-0.10.23-docbuild.patch
|
||||
# Fix for libtimidity-0.2.x
|
||||
Patch11: gst-plugins-bad-0.10.23-timidity2.diff
|
||||
Patch12: 0001-vmncdec-Sanity-check-width-height-before-using-it.patch
|
||||
Patch13: 0002-h264parse-Ensure-codec_data-has-the-required-size-wh.patch
|
||||
Patch10: put-api-version-in-html-book-name.patch
|
||||
Patch11: 0001-vmncdec-Sanity-check-width-height-before-using-it.patch
|
||||
Patch12: 0002-h264parse-Ensure-codec_data-has-the-required-size-wh.patch
|
||||
|
||||
Requires: %{gstreamer} >= %{gst_minver}
|
||||
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
|
||||
|
|
@ -166,7 +163,20 @@ aren't tested well enough, or the code is not of good enough quality.
|
|||
|
||||
|
||||
%prep
|
||||
%autosetup -n gst-plugins-bad-%{version} -p1
|
||||
%setup -q -n gst-plugins-bad-%{version}
|
||||
%patch0 -p1 -b .vp8enc_bitrate
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
sed -i 's/opencv <= 2.3.1/opencv <= 2.4.3/g' configure
|
||||
|
||||
|
||||
|
|
@ -175,12 +185,10 @@ sed -i 's/opencv <= 2.3.1/opencv <= 2.4.3/g' configure
|
|||
--with-package-name="Fedora gstreamer-plugins-bad package" \
|
||||
--with-package-origin="http://download.fedora.redhat.com/fedora" \
|
||||
%{!?with_extras:--disable-fbdev --disable-decklink --disable-linsys} \
|
||||
--enable-debug --disable-static --disable-gtk-doc --enable-experimental \
|
||||
--enable-debug --disable-static --enable-gtk-doc --enable-experimental \
|
||||
--disable-divx --disable-dts --disable-faac --disable-faad --disable-nas \
|
||||
--disable-mimic --disable-libmms --disable-mpeg2enc --disable-mplex \
|
||||
--disable-neon --disable-openal --disable-rtmp --disable-xvid \
|
||||
--disable-gme --disable-voamrwbenc --disable-nsf --disable-apexsink \
|
||||
--disable-voaacenc
|
||||
--disable-neon --disable-openal --disable-rtmp --disable-xvid --disable-nsf
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
|
|
@ -203,7 +211,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
|||
|
||||
%files -f gst-plugins-bad-%{majorminor}.lang
|
||||
%doc AUTHORS COPYING README REQUIREMENTS
|
||||
#%%{_datadir}/gstreamer-%%{majorminor}
|
||||
#%{_datadir}/gstreamer-%{majorminor}
|
||||
%{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so.*
|
||||
%{_libdir}/libgstbasevideo-%{majorminor}.so.*
|
||||
%{_libdir}/libgstcodecparsers-%{majorminor}.so.*
|
||||
|
|
@ -288,7 +296,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
|||
%{_libdir}/gstreamer-%{majorminor}/libgstvcdsrc.so
|
||||
|
||||
# Plugins with external dependencies
|
||||
#%%{_libdir}/gstreamer-%%{majorminor}/libgstapexsink.so
|
||||
%{_libdir}/gstreamer-%{majorminor}/libgstapexsink.so
|
||||
%{_libdir}/gstreamer-%{majorminor}/libgstbz2.so
|
||||
%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
|
||||
%{_libdir}/gstreamer-%{majorminor}/libgstjp2k.so
|
||||
|
|
@ -358,58 +366,19 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
|||
%{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
|
||||
|
||||
%files devel-docs
|
||||
%doc %{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{majorminor}
|
||||
%doc %{_datadir}/gtk-doc/html/gst-plugins-bad-libs-%{majorminor}
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.23-45
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Feb 2 2018 Tom Callaway <spot@fedoraproject.org> - 0.10.23-44
|
||||
- again.
|
||||
|
||||
* Fri Jan 26 2018 Tom Callaway <spot@fedoraproject.org> - 0.10.23-43
|
||||
- rebuild for new libvpx
|
||||
|
||||
* Fri Oct 13 2017 Hans de Goede <hdegoede@redhat.com> - 0.10.23-42
|
||||
- Rebuild for new soundtouch
|
||||
- Regenerating the (old) gtk-doc docs is broken, use only the pre-generated
|
||||
ones from the source-tarbal (People should not be developing new software
|
||||
against gst-0.10 anyways)
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.23-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.23-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.23-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Dec 07 2016 Wim Taymans <wtaymans@redhat.com> - 0.10.23-38
|
||||
* Wed Dec 07 2016 Wim Taymans <wtaymans@redhat.com> - 0.10.23-34
|
||||
- vmncdec: Sanity-check width/height before using it
|
||||
- h264parse: Ensure codec_data has the required size when reading number of SPS
|
||||
(#1401945)
|
||||
|
||||
* Sat Dec 03 2016 Rex Dieter <rdieter@fedoraproject.org> - 0.10.23-37
|
||||
- rebuild (jasper)
|
||||
|
||||
* Wed Nov 30 2016 Wim Taymans <wtaymans@redhat.com> - 0.10.23-36
|
||||
* Wed Nov 30 2016 Wim Taymans <wtaymans@redhat.com> - 0.10.23-33
|
||||
- Remove insecure nsf plugin (#1395126)
|
||||
- Disable broken apexsink
|
||||
|
||||
* Thu Oct 06 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.10.23-35
|
||||
- rebuild for libtimidity 0.2.x
|
||||
|
||||
* Fri Aug 26 2016 Hans de Goede <hdegoede@redhat.com> - 0.10.23-34
|
||||
- Rebuild for new wildmidi
|
||||
|
||||
* Tue Aug 09 2016 Nils Philippsen <nils@redhat.com> - 0.10.23-33
|
||||
- fix bogus dates in changelog
|
||||
- fix building docs
|
||||
|
||||
* Fri Jul 22 2016 Tom Callaway <spot@fedoraproject.org> - 0.10.23-33
|
||||
- rebuild for libvpx 1.6.0
|
||||
- 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)
|
||||
|
|
@ -592,7 +561,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
|||
* Mon May 31 2010 Benjamin Otte <otte@redhat.com> 0.10.19-1
|
||||
- Update to 0.10.19
|
||||
|
||||
* Wed May 26 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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +1,19 @@
|
|||
diff -up gst-plugins-bad-0.10.23/common/gtk-doc.mak.docbuild gst-plugins-bad-0.10.23/common/gtk-doc.mak
|
||||
--- gst-plugins-bad-0.10.23/common/gtk-doc.mak.docbuild 2011-12-30 19:32:24.000000000 +0100
|
||||
+++ gst-plugins-bad-0.10.23/common/gtk-doc.mak 2016-08-09 15:51:04.821382866 +0200
|
||||
@@ -121,19 +121,17 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
|
||||
@cp ../version.entities ./
|
||||
@mkhtml_options=""; \
|
||||
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
|
||||
- if test "$(?)" = "0"; then \
|
||||
+ if test "$$? = "0"; then \
|
||||
if test "x$(V)" = "x1"; then \
|
||||
mkhtml_options="$$mkhtml_options --verbose"; \
|
||||
fi; \
|
||||
fi; \
|
||||
- @gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
|
||||
- if test "$(?)" = "0"; then \
|
||||
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
|
||||
+ if test "$$? = "0"; then \
|
||||
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 $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE)
|
||||
+ @rm -f html/$(DOC_MAIN_SGML_FILE)
|
||||
+ 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 +187,9 @@ install-data-local:
|
||||
@@ -189,9 +186,9 @@
|
||||
echo '-- Installing '$$i ; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
|
||||
done; \
|
||||
|
|
@ -35,20 +22,14 @@ diff -up gst-plugins-bad-0.10.23/common/gtk-doc.mak.docbuild gst-plugins-bad-0.1
|
|||
- $(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 \
|
||||
+ $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \
|
||||
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
|
||||
fi; \
|
||||
(which gtkdoc-rebase >/dev/null && \
|
||||
diff -up gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak.docbuild gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak
|
||||
--- gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak.docbuild 2011-12-30 19:32:24.000000000 +0100
|
||||
+++ gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak 2016-08-09 15:59:02.264160398 +0200
|
||||
@@ -218,15 +218,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
|
||||
@cp ../version.entities html
|
||||
@mkhtml_options=""; \
|
||||
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
|
||||
- if test "$(?)" = "0"; then \
|
||||
+ if test "$$?" = "0"; then \
|
||||
if test "x$(V)" = "x1"; then \
|
||||
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; \
|
||||
|
|
@ -60,35 +41,35 @@ diff -up gst-plugins-bad-0.10.23/common/gtk-doc-plugins.mak.docbuild gst-plugins
|
|||
@rm -f html/$(DOC_MAIN_SGML_FILE)
|
||||
@rm -rf html/xml
|
||||
@rm -f html/version.entities
|
||||
diff -up gst-plugins-bad-0.10.23/docs/libs/Makefile.in.docbuild gst-plugins-bad-0.10.23/docs/libs/Makefile.in
|
||||
--- gst-plugins-bad-0.10.23/docs/libs/Makefile.in.docbuild 2012-02-28 20:13:59.000000000 +0100
|
||||
+++ gst-plugins-bad-0.10.23/docs/libs/Makefile.in 2016-08-09 15:56:57.850520970 +0200
|
||||
@@ -933,19 +933,17 @@ upload: $(FORMATS)
|
||||
@ENABLE_GTK_DOC_TRUE@ @cp ../version.entities ./
|
||||
@ENABLE_GTK_DOC_TRUE@ @mkhtml_options=""; \
|
||||
@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
|
||||
-@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \
|
||||
+@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \
|
||||
@ENABLE_GTK_DOC_TRUE@ if test "x$(V)" = "x1"; then \
|
||||
@ENABLE_GTK_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \
|
||||
@ENABLE_GTK_DOC_TRUE@ fi; \
|
||||
@ENABLE_GTK_DOC_TRUE@ fi; \
|
||||
-@ENABLE_GTK_DOC_TRUE@ @gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
|
||||
-@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \
|
||||
+@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
|
||||
+@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \
|
||||
@@ -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 $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE)
|
||||
+@ENABLE_GTK_DOC_TRUE@ @rm -f html/$(DOC_MAIN_SGML_FILE)
|
||||
+@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 +997,9 @@ install-data-local:
|
||||
@@ -999,9 +996,9 @@
|
||||
echo '-- Installing '$$i ; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
|
||||
done; \
|
||||
|
|
@ -97,20 +78,14 @@ diff -up gst-plugins-bad-0.10.23/docs/libs/Makefile.in.docbuild gst-plugins-bad-
|
|||
- $(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 \
|
||||
+ $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \
|
||||
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
|
||||
fi; \
|
||||
(which gtkdoc-rebase >/dev/null && \
|
||||
diff -up gst-plugins-bad-0.10.23/docs/plugins/Makefile.in.docbuild gst-plugins-bad-0.10.23/docs/plugins/Makefile.in
|
||||
--- gst-plugins-bad-0.10.23/docs/plugins/Makefile.in.docbuild 2012-02-28 20:13:59.000000000 +0100
|
||||
+++ gst-plugins-bad-0.10.23/docs/plugins/Makefile.in 2016-08-09 15:54:00.964455982 +0200
|
||||
@@ -1374,15 +1374,12 @@ update:
|
||||
@ENABLE_GTK_DOC_TRUE@ @cp ../version.entities html
|
||||
@ENABLE_GTK_DOC_TRUE@ @mkhtml_options=""; \
|
||||
@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
|
||||
-@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \
|
||||
+@ENABLE_GTK_DOC_TRUE@ if test "$$?" = "0"; then \
|
||||
@ENABLE_GTK_DOC_TRUE@ if test "x$(V)" = "x1"; then \
|
||||
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; \
|
||||
|
|
@ -122,3 +97,16 @@ diff -up gst-plugins-bad-0.10.23/docs/plugins/Makefile.in.docbuild gst-plugins-b
|
|||
@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