rpms/gir-repository/devel gir-gst0.10.24buildfix.patch, NONE, 1.1 gir-repository.spec, 1.7, 1.8
Peter Robinson
pbrobinson at fedoraproject.org
Thu Jul 30 11:54:52 UTC 2009
Author: pbrobinson
Update of /cvs/pkgs/rpms/gir-repository/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2632
Modified Files:
gir-repository.spec
Added Files:
gir-gst0.10.24buildfix.patch
Log Message:
- Add patch to fix build with new gstreamer
gir-gst0.10.24buildfix.patch:
configure.ac | 18 ++++++++++++++++++
gir/Makefile.am | 39 +++++++++++++++++++++++++--------------
2 files changed, 43 insertions(+), 14 deletions(-)
--- NEW FILE gir-gst0.10.24buildfix.patch ---
>From 4e7ddca82ead3ea011637bf8ebd38d985a006972 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor at fishsoup.net>
Date: Tue, 28 Jul 2009 16:11:48 +0000
Subject: Conditionally add gstbufferlist.h, gsttaskpool.h
gstreamer-0.10.24 adds new header files with definitions needed by
other header files; check for them in configure.ac and conditionally
add them to the list of GStreamer header files that we scan.
http://bugzilla.gnome.org/show_bug.cgi?id=590031
---
diff --git a/configure.ac b/configure.ac
index 32b0825..af09164 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,6 +141,24 @@ PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.0,
have_gstreamer=true, have_gstreamer=false)
AM_CONDITIONAL(BUILD_GSTREAMER, $have_gstreamer)
+dnl gstbufferlist.h, gsttaskpool.h were added in 0.10.24 (and in
+dnl prereleases of that)
+have_gstbufferlist_h=false
+if $have_gstreamer ; then
+ save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS"
+ AC_CHECK_HEADER(gst/gstbufferlist.h, [have_gstbufferlist_h=true])
+ CPPFLAGS="$save_CPPFLAGS"
+fi
+AM_CONDITIONAL(HAVE_GSTBUFFERLIST_H, $have_gstbufferlist_h)
+
+have_gsttaskpool_h=false
+if $have_gstreamer ; then
+ save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS"
+ AC_CHECK_HEADER(gst/gsttaskpool.h, [have_gsttaskpool_h=true])
+ CPPFLAGS="$save_CPPFLAGS"
+fi
+AM_CONDITIONAL(HAVE_GSTTASKPOOL_H, $have_gsttaskpool_h)
+
dnl gstreamer
PKG_CHECK_MODULES(GSTREAMER_PLUGINS_BASE, gstreamer-plugins-base-0.10 >= 0.10.0,
have_gstreamer_plugins_base=true,
diff --git a/gir/Makefile.am b/gir/Makefile.am
index 64fa086..28389e2 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -513,19 +513,8 @@ endif BUILD_GOOCANVAS
# GStreamer
if BUILD_GSTREAMER
GST_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-0.10`
-Gst-0.10.gir: $(INTROSPECTION_SCANNER) Gst-custom.c
- $(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace Gst --nsversion=0.10 \
- --add-include-path=$(srcdir) --add-include-path=. \
- --include=GObject-2.0 \
- --include=GModule-2.0 \
- --include=libxml2-2.0 \
- --library=gstbase-0.10 \
- --libtool="$(LIBTOOL)" \
- --pkg gobject-2.0 \
- --pkg gstreamer-0.10 \
- --pkg gstreamer-base-0.10 \
- --output $@ \
- Gst-custom.c \
+
+GST_HEADER_FILES = \
$(GST_INCLUDEDIR)/gst/gstbin.h \
$(GST_INCLUDEDIR)/gst/gstbuffer.h \
$(GST_INCLUDEDIR)/gst/gstbus.h \
@@ -579,6 +568,29 @@ Gst-0.10.gir: $(INTROSPECTION_SCANNER) Gst-custom.c
$(GST_INCLUDEDIR)/gst/gstversion.h \
$(GST_INCLUDEDIR)/gst/gstxml.h \
$(GST_INCLUDEDIR)/gst/base/*.h
+
+if HAVE_GSTBUFFERLIST_H
+GST_HEADER_FILES += $(GST_INCLUDEDIR)/gst/gstbufferlist.h
+endif
+
+if HAVE_GSTTASKPOOL_H
+GST_HEADER_FILES += $(GST_INCLUDEDIR)/gst/gsttaskpool.h
+endif
+
+Gst-0.10.gir: $(INTROSPECTION_SCANNER) Gst-custom.c
+ $(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace Gst --nsversion=0.10 \
+ --add-include-path=$(srcdir) --add-include-path=. \
+ --include=GObject-2.0 \
+ --include=GModule-2.0 \
+ --include=libxml2-2.0 \
+ --library=gstbase-0.10 \
+ --libtool="$(LIBTOOL)" \
+ --pkg gobject-2.0 \
+ --pkg gstreamer-0.10 \
+ --pkg gstreamer-base-0.10 \
+ --output $@ \
+ Gst-custom.c \
+ $(GST_HEADER_FILES)
BUILT_GIRSOURCES += Gst-0.10.gir
GSTBASE_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-base-0.10`
--
cgit v0.8.2
Index: gir-repository.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gir-repository/devel/gir-repository.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gir-repository.spec 30 Jul 2009 11:12:45 -0000 1.7
+++ gir-repository.spec 30 Jul 2009 11:54:52 -0000 1.8
@@ -1,12 +1,13 @@
Name: gir-repository
Version: 0.6.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Introspection for GNOME libraries
Group: Development/Libraries
License: LGPLv2+
URL: http://live.gnome.org/GObjectIntrospection
Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
+Patch0: gir-gst0.10.24buildfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gobject-introspection-devel = %{version}
@@ -30,6 +31,13 @@ BuildRequires: unique-devel
BuildRequires: vte-devel
BuildRequires: WebKit-gtk-devel
+# Add these for autoreconf due to gst patch
+BuildRequires: intltool
+BuildRequires: gettext
+BuildRequires: libtool
+BuildRequires: automake
+BuildRequires: autoconf
+
%description
Introspection system for GNOME libraries; see the gobject-introspection package.
@@ -44,8 +52,10 @@ Libraries and headers for gir-repository
%prep
%setup -q
+%patch0 -p1 -b .gst0.10.24buildfix
%build
+autoreconf
%configure
make
@@ -75,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gir-1.0/*.gir
%changelog
+* Thu Jul 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.6.3-5
+- Add patch to fix build with new gstreamer
+
* Thu Jul 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.6.3-4
- Further updates, drop clutter as its in the clutter package now
More information about the fedora-extras-commits
mailing list