commit gupnp-av for openSUSE:Factory
Hello community, here is the log from the commit of package gupnp-av for openSUSE:Factory checked in at Fri Oct 15 16:42:11 CEST 2010. -------- --- GNOME/gupnp-av/gupnp-av.changes 2010-09-17 09:36:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/gupnp-av/gupnp-av.changes 2010-10-01 20:25:39.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Oct 1 17:24:46 CEST 2010 - vuntz@opensuse.org + +- Add gupnp-av-fix-introspection-build.patch to fix build with + recent gobject-introspection. Add autoreconf call needed for this + patch. + +------------------------------------------------------------------- +Wed Sep 29 14:07:29 CEST 2010 - vuntz@opensuse.org + +- Update to version 0.6.1: + + Fix introspection build. +- Add gobject-introspection-devel BuildRequires to build + introspection data. +- Use SUSE_ASNEEDED=0 to fix the build. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gupnp-av-0.6.0.tar.bz2 New: ---- gupnp-av-0.6.1.tar.bz2 gupnp-av-fix-introspection-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gupnp-av.spec ++++++ --- /var/tmp/diff_new_pack.CjDLKA/_old 2010-10-15 16:41:58.000000000 +0200 +++ /var/tmp/diff_new_pack.CjDLKA/_new 2010-10-15 16:41:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gupnp-av (Version 0.6.0) +# spec file for package gupnp-av (Version 0.6.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,17 @@ Name: gupnp-av -Version: 0.6.0 +Version: 0.6.1 Release: 1 +# FIXME: check if SUSE_ASNEEDED=0 is still needed (added in 0.6.1) Summary: Library to ease the handling and implementation of UPnP A/V profiles License: LGPL v2 or later Group: Development/Libraries/C and C++ Url: http://www.gupnp.org/ Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gupnp-av-fix-introspection-build.patch vuntz@opensuse.org -- Rework the build system for gir. Sent to upstream by mail +Patch0: gupnp-av-fix-introspection-build.patch +BuildRequires: gobject-introspection-devel BuildRequires: libgupnp-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,8 +58,12 @@ %prep %setup -q +%patch0 -p1 %build +# needed for patch0 +autoreconf -fi +export SUSE_ASNEEDED=0 %configure --disable-static %__make %{?jobs:-j%jobs} @@ -74,12 +82,14 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/*.so.* +%{_libdir}/girepository-1.0/GUPnPAV-1.0.typelib %files -n libgupnp-av-devel %defattr(-,root,root) %{_includedir}/%{name}-1.0 %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%{_datadir}/gir-1.0/GUPnPAV-1.0.gir %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/%{name} ++++++ gupnp-av-0.6.0.tar.bz2 -> gupnp-av-0.6.1.tar.bz2 ++++++ ++++ 17119 lines of diff (skipped) ++++++ gupnp-av-fix-introspection-build.patch ++++++ Index: gupnp-av-0.6.1/configure.ac =================================================================== --- gupnp-av-0.6.1.orig/configure.ac +++ gupnp-av-0.6.1/configure.ac @@ -28,7 +28,7 @@ if test "x$enable_debug" = "xyes"; then CFLAGS="$CFLAGS -g -Wall" fi -GOBJECT_INTROSPECTION_CHECK([0.6.4]) +GOBJECT_INTROSPECTION_CHECK([0.9.5]) GTK_DOC_CHECK([1.0]) Index: gupnp-av-0.6.1/libgupnp-av/Makefile.am =================================================================== --- gupnp-av-0.6.1.orig/libgupnp-av/Makefile.am +++ gupnp-av-0.6.1/libgupnp-av/Makefile.am @@ -70,26 +70,13 @@ libgupnp_av_1_0_la_LIBADD = $(LIBGUPNP_L EXTRA_DIST = gupnp-av-marshal.list -if HAVE_INTROSPECTION +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) -GUPnPAV-1.0.gir: libgupnp-av-1.0.la $(INTROSPECTION_SCANNER) - $(AM_V_GEN) \ - $(INTROSPECTION_SCANNER) -v \ - --namespace GUPnPAV --nsversion=1.0 \ - --output $@ \ - --strip-prefix= gupnp \ - --libtool="$(LIBTOOL)" \ - --library=gupnp-av-1.0 \ - --include=GObject-2.0 \ - --include=GSSDP-1.0 \ - --include=Soup-2.4 \ - --include=libxml2-2.0 \ - --include=GUPnP-1.0 \ - --pkg libxml-2.0 \ - --pkg gobject-2.0 \ - --pkg gupnp-1.0 \ - --pkg libsoup-2.4 \ - -I$(top_srcdir) \ +if HAVE_INTROSPECTION +introspection_sources = \ $(addprefix $(top_srcdir)/libgupnp-av/, \ $(libgupnp_av_inc_HEADERS)) \ $(top_srcdir)/libgupnp-av/gupnp-didl-lite-object.c \ @@ -106,19 +93,19 @@ GUPnPAV-1.0.gir: libgupnp-av-1.0.la $(IN $(top_srcdir)/libgupnp-av/gupnp-dlna.c \ $(top_srcdir)/libgupnp-av/gupnp-av-error.c -girdir = $(datadir)/gir-1.0 -gir_DATA = GUPnPAV-1.0.gir - -typelibdir = $(libdir)/girepository-1.0/ -typelib_DATA = $(gir_DATA:.gir=.typelib) +GUPnPAV-1.0.gir: libgupnp-av-1.0.la +GUPnPAV_1_0_gir_INCLUDES = GObject-2.0 GSSDP-1.0 Soup-2.4 libxml2-2.0 GUPnP-1.0 +GUPnPAV_1_0_gir_CFLAGS = $(AM_CFLAGS) +GUPnPAV_1_0_gir_LIBS = libgupnp-av-1.0.la +GUPnPAV_1_0_gir_SCANNERFLAGS = --identifier-prefix=GUPnP --symbol-prefix=gupnp --pkg-export=gupnp-av-1.0 +GUPnPAV_1_0_gir_FILES = $(introspection_sources) +INTROSPECTION_GIRS += GUPnPAV-1.0.gir -%.typelib: %.gir $(INTROSPECTION_COMPILER) - $(AM_V_GEN) \ - $(INTROSPECTION_COMPILER) \ - --includedir=$(srcdir) \ - --includedir=. \ - $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) +girdir = $(INTROSPECTION_GIRDIR) +gir_DATA = $(INTROSPECTION_GIRS) +typelibdir = $(INTROSPECTION_TYPELIBDIR) +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) endif CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA) Index: gupnp-av-0.6.1/m4/introspection.m4 =================================================================== --- gupnp-av-0.6.1.orig/m4/introspection.m4 +++ /dev/null @@ -1,88 +0,0 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de