From dcfb6b1202b062e45bd281a57bc71be623b6451c Mon Sep 17 00:00:00 2001 From: Patryk Zawadzki Date: Tue, 24 Aug 2010 19:59:39 +0000 Subject: [PATCH] - 0.10.24 Changed files: Makefile.patch -> 1.1 gstreamer-plugins-good-libpng.patch -> 1.4 gstreamer-plugins-good.spec -> 1.53 --- Makefile.patch | 21 +++++++++++++++++++++ gstreamer-plugins-good-libpng.patch | 11 ----------- gstreamer-plugins-good.spec | 17 +++++++++-------- 3 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 Makefile.patch delete mode 100644 gstreamer-plugins-good-libpng.patch diff --git a/Makefile.patch b/Makefile.patch new file mode 100644 index 0000000..c4657b2 --- /dev/null +++ b/Makefile.patch @@ -0,0 +1,21 @@ +--- gst-plugins-good-0.10.24/common/gtk-doc.mak~ 2010-02-24 15:19:02.000000000 +0100 ++++ gst-plugins-good-0.10.24/common/gtk-doc.mak 2010-08-24 21:53:15.413733452 +0200 +@@ -232,6 +232,6 @@ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs +--- gst-plugins-good-0.10.24/common/gtk-doc-plugins.mak~ 2010-06-24 14:54:22.000000000 +0200 ++++ gst-plugins-good-0.10.24/common/gtk-doc-plugins.mak 2010-08-24 21:53:26.387065947 +0200 +@@ -332,7 +332,7 @@ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + diff --git a/gstreamer-plugins-good-libpng.patch b/gstreamer-plugins-good-libpng.patch deleted file mode 100644 index c0a5186..0000000 --- a/gstreamer-plugins-good-libpng.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gst-plugins-good-0.10.17/configure.ac~ 2010-01-29 22:06:45.798536762 +0100 -+++ gst-plugins-good-0.10.17/configure.ac 2010-01-29 22:07:06.241451973 +0100 -@@ -750,7 +750,7 @@ - dnl *** libpng *** - translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true) - AG_GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [ -- AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng12) -+ AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng) - ]) - - dnl *** pulseaudio *** diff --git a/gstreamer-plugins-good.spec b/gstreamer-plugins-good.spec index b4c0386..74aee09 100644 --- a/gstreamer-plugins-good.spec +++ b/gstreamer-plugins-good.spec @@ -18,22 +18,22 @@ %define gstname gst-plugins-good %define gst_major_ver 0.10 -%define gst_req_ver 0.10.29 -%define gstpb_req_ver 0.10.29 +%define gst_req_ver 0.10.30 +%define gstpb_req_ver 0.10.30 %include /usr/lib/rpm/macros.gstreamer Summary: Good GStreamer Streaming-media framework plugins Summary(pl.UTF-8): Dobre wtyczki do środowiska obróbki strumieni GStreamer Name: gstreamer-plugins-good -Version: 0.10.23 -Release: 2 +Version: 0.10.24 +Release: 1 License: LGPL v2+ Group: Libraries Source0: http://gstreamer.freedesktop.org/src/gst-plugins-good/%{gstname}-%{version}.tar.bz2 -# Source0-md5: 9cddbb0e7e90677f0cc05c23feffef5c +# Source0-md5: dc0de606e3e303cf378327b72a4d281f Patch0: %{name}-bashish.patch Patch1: %{name}-libcaca.patch -#Patch2: %{name}-libpng.patch +Patch2: Makefile.patch URL: http://gstreamer.freedesktop.org/ BuildRequires: autoconf >= 2.59-9 BuildRequires: automake >= 1.5 @@ -43,8 +43,8 @@ BuildRequires: gstreamer-devel >= %{gst_req_ver} BuildRequires: gstreamer-plugins-base-devel >= %{gstpb_req_ver} BuildRequires: gtk+2-devel >= 2:2.10.1 %{?with_apidocs:BuildRequires: gtk-doc >= 1.7} -BuildRequires: liboil-devel >= 0.3.6 BuildRequires: libtool >= 1.4 +BuildRequires: orc-devel >= 0.4.5 BuildRequires: pkgconfig >= 1:0.9.0 BuildRequires: python >= 2.1 BuildRequires: python-PyXML @@ -459,7 +459,7 @@ Wtyczka obsługująca bezstratny format dźwięku Wavpack. %setup -q -n %{gstname}-%{version} %patch0 -p1 %patch1 -p1 -#%%patch2 -p1 +%patch2 -p1 %build %{__libtoolize} @@ -475,6 +475,7 @@ Wtyczka obsługująca bezstratny format dźwięku Wavpack. %{!?with_esd:--disable-esd} \ --enable-experimental \ %{?with_ladspa:--enable-ladspa} \ + --enable-orc \ %{!?with_soup:--disable-soup} \ %{!?with_speex:--disable-speex} \ %{!?with_wavpack:--disable-wavpack} \ -- 2.43.0