Hello community,
here is the log from the commit of package libcanberra for openSUSE:Factory
checked in at Mon Aug 9 18:02:27 CEST 2010.
--------
--- GNOME/libcanberra/libcanberra.changes 2010-05-09 22:12:50.000000000 +0200
+++ libcanberra/libcanberra.changes 2010-08-09 11:29:11.000000000 +0200
@@ -1,0 +2,40 @@
+Mon Aug 9 11:25:04 CEST 2010 - vuntz@opensuse.org
+
+- Disable the build of the GTK+ 3 support: with it,
+ canberra-gtk-play is built against GTK+ 3, which is something we
+ don't want to have at the moment. This is done with a define, so
+ it's easy to re-enable the GTK+ 3 support.
+
+-------------------------------------------------------------------
+Thu Jul 22 10:19:07 CEST 2010 - vuntz@opensuse.org
+
+- Improve summaries and descriptions.
+- Change alsa-devel, gstreamer-0_10-devel, gtk2-devel, gtk3-devel,
+ libpulse-devel, libvorbis-devel BuildRequires to pkgconfig()
+ BuildRequires for: alsa, gstreamer-0.10, gtk+-2.0, gtk+-3.0,
+ libpulse, vorbisfile.
+- Remove explicit Requires of libcanberra0 in libcanberra-gtk0.
+- Split libcanberra-gtk in libcanberra-gtk-module-common,
+ libcanberra-gtk2-module and canberra-gtk-play subpackages.
+- Rename libcanberra-gtk3 to libcanberra-gtk3-module.
+- Make libcanberra-gtk2-module and libcanberra-gtk3-module depend
+ on libcanberra-gtk-module-common, and add Supplements to install
+ them when libcanberra0 and gtk2/gtk3 are installed.
+- Add Provides/Obsoletes for libcanberra-gtk to canberra-gtk-play,
+ and add Supplements for gnome-session and gdm there too since
+ this package provides login sound.
+- Remove gtk-doc and gtk2-devel Requires in devel package: gtk-doc
+ is not needed and gtk2 will be automatically added with
+ pkgconfig() Requires.
+
+-------------------------------------------------------------------
+Tue Jul 13 16:37:13 CEST 2010 - dimstar@opensuse.org
+
+- Update to version 0.25:
+ + gtk: optionally build for both gtk2 and gtk3
+ + cache: don't use destructors unless running in valgrind
+ + build fixes
+- Add gtk3-devel BuildRequires.
+- Create gtk3-0 and gtk3 subpackages for GTK+ 3 support.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libcanberra-0.24.tar.bz2
New:
----
libcanberra-0.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcanberra.spec ++++++
--- /var/tmp/diff_new_pack.nNwrQ0/_old 2010-08-09 18:01:06.000000000 +0200
+++ /var/tmp/diff_new_pack.nNwrQ0/_new 2010-08-09 18:01:06.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libcanberra (Version 0.24)
+# spec file for package libcanberra (Version 0.25)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -16,9 +16,10 @@
#
+%define build_gtk3 0
Name: libcanberra
-Version: 0.24
+Version: 0.25
Release: 1
License: LGPLv2.0+
Summary: Portable sound event library
@@ -27,18 +28,27 @@
Source: libcanberra-%{version}.tar.bz2
Source1: libcanberra-gtk-module.sh
Source99: baselibs.conf
-BuildRequires: alsa-devel
BuildRequires: gconf2-devel
-BuildRequires: gstreamer-0_10-devel
BuildRequires: gtk-doc
-BuildRequires: gtk2-devel
-BuildRequires: libpulse-devel >= 0.9.11
-BuildRequires: libvorbis-devel
BuildRequires: lynx
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(gstreamer-0.10)
+BuildRequires: pkgconfig(gtk+-2.0)
+%if %build_gtk3
+BuildRequires: pkgconfig(gtk+-3.0)
+%endif
+BuildRequires: pkgconfig(libpulse) >= 0.9.11
+BuildRequires: pkgconfig(vorbisfile)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define debug_package_requires libcanberra0 = %{version}-%{release}
+%description
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such as
+GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
+designed to be portable.
+
%package -n libcanberra0
License: LGPLv2.0+
Summary: Portable sound event library
@@ -46,97 +56,136 @@
Requires: libpulse0 >= 0.9.11
Requires: sound-theme-freedesktop
-%description
+%description -n libcanberra0
libcanberra is an implementation of the XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops, such as
GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
-designed to be portable. It consists of the following parts:
+designed to be portable.
-1. 1. libcanberra: the main library
+This package contains the main library.
-2. 2. libcanberra-gtk: some glue code to make it easier to use
- libcanberra from Gtk+ applications
+%package gtk0
+License: LGPLv2.0+
+Summary: Portable sound event library -- GTK+ 2 Library
+Group: System/Libraries
+
+%description gtk0
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such as
+GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
+designed to be portable.
-3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
-trigger input feedback event sounds
+This package contains a library to make it easier to use
+libcanberra from GTK+ 2 applications.
-%description -n libcanberra0
+%if %build_gtk3
+
+%package gtk3-0
+
+Summary: Portable sound event library -- GTK+ 3 Library
+Group: System/Libraries
+
+%description gtk3-0
libcanberra is an implementation of the XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops, such as
GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
designed to be portable. It consists of the following parts:
-1. 1. libcanberra: the main library
+This package contains a library to make it easier to use
+libcanberra from GTK+ 3 applications.
+%endif
-2. 2. libcanberra-gtk: some glue code to make it easier to use
- libcanberra from Gtk+ applications
+%package gtk-module-common
+License: LGPLv2.0+
+Summary: Portable sound event library -- Common Files for GTK+ Modules
+Group: System/Libraries
+Recommends: %{name}-gtk2-module
+%if %build_gtk3
+Recommends: %{name}-gtk3-module
+%endif
+BuildArch: noarch
+%gconf_schemas_prereq
-3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
-trigger input feedback event sounds
+%description gtk-module-common
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such as
+GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
+designed to be portable. It consists of the following parts:
-%package gtk0
+This package contains files common to both the GTK+ 2 and GTK+ 3
+modules.
+
+%package gtk2-module
License: LGPLv2.0+
-Summary: Portable sound event library
+Summary: Portable sound event library -- GTK+ 2 Module
Group: System/Libraries
-Requires: libcanberra0 = %{version}
+Requires: %{name}-gtk-module-common = %{version}
+Supplements: packageand(libcanberra0:gtk2)
-%description gtk0
+%description gtk2-module
libcanberra is an implementation of the XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops, such as
GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
designed to be portable. It consists of the following parts:
-1. 1. libcanberra: the main library
+This package contains a GTK+ 2 module that triggers input feedback
+event sounds.
-2. 2. libcanberra-gtk: some glue code to make it easier to use
- libcanberra from Gtk+ applications
+%if %build_gtk3
-3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
-trigger input feedback event sounds
+%package gtk3-module
-%package gtk
-License: LGPLv2.0+
-Summary: Portable sound event library
+Summary: Portable sound event library -- GTK+ 3 Module
Group: System/Libraries
-Requires: libcanberra0 = %{version}
-%gconf_schemas_prereq
+Requires: %{name}-gtk-module-common = %{version}
+Supplements: packageand(libcanberra0:gtk3)
-%description gtk
+%description gtk3-module
libcanberra is an implementation of the XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops, such as
GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
designed to be portable. It consists of the following parts:
-1. 1. libcanberra: the main library
+This package contains a GTK+ 3 module that triggers input feedback
+event sounds.
+%endif
-2. 2. libcanberra-gtk: some glue code to make it easier to use
- libcanberra from Gtk+ applications
+%package -n canberra-gtk-play
+License: LGPLv2.0+
+Summary: Portable sound event library -- Utility
+Group: System/Libraries
+Provides: %{name}-gtk = %{version}
+Obsoletes: %{name}-gtk < %{version}
+# This package contains login/logout sound for GNOME
+Supplements: gnome-session
+# This package contains a ready sound for gdm
+Supplements: gdm
+
+%description -n canberra-gtk-play
+libcanberra is an implementation of the XDG Sound Theme and Name
+Specifications, for generating event sounds on free desktops, such as
+GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
+designed to be portable.
-3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
-trigger input feedback event sounds
+This package provides the canberra-gtk-play utility.
%package devel
License: LGPLv2.0+
-Summary: Portable sound event library
+Summary: Portable sound event library -- Development files
Group: Development/Libraries/C and C++
-Requires: gtk-doc
-Requires: gtk2-devel
-Requires: libcanberra-gtk0 = %{version}
Requires: libcanberra0 = %{version}
+Requires: libcanberra-gtk0 = %{version}
+%if %build_gtk3
+Requires: libcanberra-gtk3-0 = %{version}
+%endif
%description devel
libcanberra is an implementation of the XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops, such as
GNOME. It comes with several backends (ALSA, PulseAudio, null) and is
-designed to be portable. It consists of the following parts:
+designed to be portable.
-1. 1. libcanberra: the main library
-
-2. 2. libcanberra-gtk: some glue code to make it easier to use
- libcanberra from Gtk+ applications
-
-3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
-trigger input feedback event sounds
+This package provides the development files for libcanberra.
%prep
%setup -q
@@ -147,9 +196,9 @@
%install
%makeinstall
+find %{buildroot}%{_libdir} -name '*.la' -delete -print
%suse_update_desktop_file %{buildroot}%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
%suse_update_desktop_file %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
-find %{buildroot} \( -name *.a -o -name *.la \) -exec rm {} \;
install -D -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
rm %{buildroot}%{_datadir}/doc/libcanberra/README
%find_gconf_schemas
@@ -165,11 +214,18 @@
%postun gtk0 -p /sbin/ldconfig
-%pre gtk -f %{name}.schemas_pre
+%if %build_gtk3
+
+%post gtk3-0 -p /sbin/ldconfig
+
+%postun gtk3-0 -p /sbin/ldconfig
+%endif
-%preun gtk -f %{name}.schemas_preun
+%pre gtk-module-common -f %{name}.schemas_pre
-%posttrans gtk -f %{name}.schemas_posttrans
+%preun gtk-module-common -f %{name}.schemas_preun
+
+%posttrans gtk-module-common -f %{name}.schemas_posttrans
%files -n libcanberra0
%defattr(-,root,root)
@@ -187,12 +243,32 @@
%defattr(-,root,root)
%{_libdir}/libcanberra-gtk.so.*
-%files gtk -f %{name}.schemas_list
-%defattr(-,root,root)
-%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
+%if %build_gtk3
+
+%files gtk3-0
+%defattr(-, root, root)
+%{_libdir}/libcanberra-gtk3.so.*
+%endif
+
+%files gtk-module-common -f %{name}.schemas_list
+%defattr(-, root, root)
%dir %{_sysconfdir}/X11/xinit
%dir %{_sysconfdir}/X11/xinit/xinitrc.d
%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
+
+%files gtk2-module
+%defattr(-, root, root)
+%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
+
+%if %build_gtk3
+
+%files gtk3-module
+%defattr(-, root, root)
+%{_libdir}/gtk-3.0/modules/libcanberra-gtk*-module.so
+%endif
+
+%files -n canberra-gtk-play
+%defattr(-,root,root)
%{_bindir}/canberra-gtk-play
%dir %{_datadir}/gnome
%dir %{_datadir}/gnome/autostart
@@ -207,12 +283,18 @@
%files devel
%defattr(-,root,root)
%doc %{_datadir}/gtk-doc/html/libcanberra
-%{_includedir}/canberra-gtk.h
%{_includedir}/canberra.h
-%{_libdir}/libcanberra-gtk.so
+%{_includedir}/canberra-gtk.h
%{_libdir}/libcanberra.so
-%{_libdir}/pkgconfig/libcanberra-gtk.pc
+%{_libdir}/libcanberra-gtk.so
+%if %build_gtk3
+%{_libdir}/libcanberra-gtk3.so
+%endif
%{_libdir}/pkgconfig/libcanberra.pc
+%{_libdir}/pkgconfig/libcanberra-gtk.pc
+%if %build_gtk3
+%{_libdir}/pkgconfig/libcanberra-gtk3.pc
+%endif
%dir %{_datadir}/vala
%dir %{_datadir}/vala/vapi
%{_datadir}/vala/vapi/*.vapi
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.nNwrQ0/_old 2010-08-09 18:01:06.000000000 +0200
+++ /var/tmp/diff_new_pack.nNwrQ0/_new 2010-08-09 18:01:06.000000000 +0200
@@ -1,4 +1,7 @@
libcanberra0
libcanberra-gtk0
-libcanberra-gtk
- supplements "packageand(libcanberra-gtk:gtk2-<targettype>)"
+libcanberra-gtk3-0
+libcanberra-gtk2-module
+ supplements "packageand(libcanberra0:gtk2-<targettype>)"
+libcanberra-gtk3-module
+ supplements "packageand(libcanberra0:gtk3-<targettype>)"
++++++ libcanberra-0.24.tar.bz2 -> libcanberra-0.25.tar.bz2 ++++++
++++ 2332 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/Makefile.am new/libcanberra-0.25/Makefile.am
--- old/libcanberra-0.24/Makefile.am 2009-09-11 23:59:30.000000000 +0200
+++ new/libcanberra-0.25/Makefile.am 2010-06-13 20:09:32.000000000 +0200
@@ -37,20 +37,28 @@
vapidir = $(datadir)/vala/vapi
vapi_DATA = vala/libcanberra.vapi
+if HAVE_GTK_ANY
+
if HAVE_GTK
pkgconfig_DATA += libcanberra-gtk.pc
+endif
+
+if HAVE_GTK3
+pkgconfig_DATA += libcanberra-gtk3.pc
+endif
+
vapi_DATA += vala/libcanberra-gtk.vapi
-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_DATA = libcanberra.schemas
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_DATA = libcanberra.schemas
if GCONF_SCHEMAS_INSTALL
install-data-local:
- if test -z "$(DESTDIR)" ; then \
- for p in $(schemas_DATA) ; do \
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
- done \
- fi
+ if test -z "$(DESTDIR)" ; then \
+ for p in $(schemas_DATA) ; do \
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/$$p ; \
+ done ; \
+ fi
else
install-data-local:
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/README new/libcanberra-0.25/README
--- old/libcanberra-0.24/README 2010-04-19 17:10:46.000000000 +0200
+++ new/libcanberra-0.25/README 2010-06-13 20:10:43.000000000 +0200
@@ -1,4 +1,4 @@
- libcanberra 0.24
+ libcanberra 0.25
Copyright 2008-2010 Lennart Poettering
@@ -26,99 +26,104 @@
News
+ Sun 13 Jun 2010:
+
+ [10]Version 0.25 released; Optionally build with Gtk+ 3.x in addition
+ to Gtk+ 2.x.
+
Mon 19 Apr 2010:
- [10]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes
+ [11]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes
in the PulseAudio backend, other fixes.
Sat 20 Feb 2010:
- [11]Version 0.23 released; various minor fixes in the pulse and
+ [12]Version 0.23 released; various minor fixes in the pulse and
gstreamer backends as well in the Vala API. Support for the recently
standardized Vorbis 6.1/7.1 multichannel modes.
Tue 20 Oct 2009:
- [12]Version 0.22 released; small fix to make sure we don't dereference
+ [13]Version 0.22 released; small fix to make sure we don't dereference
a null pointer.
Fri 16 Oct 2009:
- [13]Version 0.21 released; suppress casting warning
+ [14]Version 0.21 released; suppress casting warning
Thu 15 Oct 2009:
- [14]Version 0.20 released; minor casting fix
+ [15]Version 0.20 released; minor casting fix
Wed 14 Oct 2009:
- [15]Version 0.19 released; some important fixes for the Gtk support
+ [16]Version 0.19 released; some important fixes for the Gtk support
Sun 20 Sep 2009:
- [16]Version 0.18 released; numerous updates for the Gtk support
+ [17]Version 0.18 released; numerous updates for the Gtk support
Fri 12 Sep 2009:
- [17]Version 0.17 released; add vala vapi file; numerous updates to Gtk
+ [18]Version 0.17 released; add vala vapi file; numerous updates to Gtk
support
Thu 27 Aug 2009:
- [18]Version 0.16 released; add new ca_context_playing() call
+ [19]Version 0.16 released; add new ca_context_playing() call
Wed 5 Aug 2009:
- [19]Version 0.15 released; bug fixes
+ [20]Version 0.15 released; bug fixes
Thu 2 Jul 2009:
- [20]Version 0.14 released; bug fixes
+ [21]Version 0.14 released; bug fixes
Tue 23 Jun 2009:
- [21]Version 0.13 released; multichannel support; gtk multihead support;
+ [22]Version 0.13 released; multichannel support; gtk multihead support;
bug fixes
Mon 13 Apr 2009:
- [22]Version 0.12 released; changes include: various fixes and updates
+ [23]Version 0.12 released; changes include: various fixes and updates
for the PulseAudio backend; detect forks and return an error for all
functions in that case
Wed 21 Jan 2009:
- [23]Version 0.11 released; changes include: major GStreamer backend
+ [24]Version 0.11 released; changes include: major GStreamer backend
fixes; update to libtool 2.2; a few other fixes
Mon 6 Oct 2008:
- [24]Version 0.10 released; changes include: install Gtk+ module using
+ [25]Version 0.10 released; changes include: install Gtk+ module using
GConf; a few other fixes
Tue 9 Sep 2008:
- [25]Version 0.9 released; changes include: GStreamer fixes, include
+ [26]Version 0.9 released; changes include: GStreamer fixes, include
(optional) libtdb based lookup cache.
Thu 28 Aug 2008:
- [26]Version 0.8 released; changes include: new OSS and GStreamer
+ [27]Version 0.8 released; changes include: new OSS and GStreamer
backend; portability fixes for FreeBSD/Solaris; the multi backend works
now
Thu 14 Aug 2008:
- [27]Version 0.7 released; changes include: documentation updates;
+ [28]Version 0.7 released; changes include: documentation updates;
various bug fixes; add this web site/README; allow playback of event
sounds with only a sound file path specified; other changes
Overview
- libcanberra is an implementation of the [28]XDG Sound Theme and Name
+ libcanberra is an implementation of the [29]XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops, such as
- [29]GNOME. It comes with several backends ([30]ALSA, [31]PulseAudio,
- OSS, [32]GStreamer, null) and is designed to be portable. It consists
+ [30]GNOME. It comes with several backends ([31]ALSA, [32]PulseAudio,
+ OSS, [33]GStreamer, null) and is designed to be portable. It consists
of the following parts:
1. libcanberra: the main library
2. libcanberra-gtk: some glue code to make it easier to use
@@ -126,14 +131,14 @@
3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
trigger input feedback event sounds
- For more information see [33]the original announcement.
+ For more information see [34]the original announcement.
Current Status
libcanberra is mostly feature complete. For now however it includes
backends only for ALSA, PulseAudio, OSS and GStreamer.
- libcanberra has been declared [34]a blessed GNOME dependency.
+ libcanberra has been declared [35]a blessed GNOME dependency.
The OSS driver is incomplete: only sound files that are in a format
natively understood by the sound card are supported. If the sample
@@ -155,7 +160,7 @@
Documentation
- You may browse the [35]gtkdoc generated [36]programing documentation of
+ You may browse the [36]gtkdoc generated [37]programing documentation of
the API.
Requirements
@@ -190,26 +195,25 @@
Download
The newest release is always available from
- [37]http://0pointer.de/lennart/projects/libcanberra/
+ [38]http://0pointer.de/lennart/projects/libcanberra/
- The current release is [38]0.24
+ The current release is [39]0.25
- Get libcanberra's development sources from the [39]GIT [40]repository
- ([41]gitweb):
+ Get libcanberra's development sources from the [40]GIT [41]repository
+ ([42]gitweb):
git clone git://git.0pointer.de/libcanberra
If you want to report bugs, have questions or want to be notified about
- new releases, please join the [42]libcanberra-discuss mailing list.
+ new releases, please join the [43]libcanberra-discuss mailing list.
If you want to be notified about new git commits, please join the
- [43]libcanberra-commits mailing list.
+ [44]libcanberra-commits mailing list.
- libcanberra's bugs are tracked at [44]bugs.freedesktop.org.
+ libcanberra's bugs are tracked at [45]bugs.freedesktop.org.
__________________________________________________________________
- Lennart Poettering , February
- 2010
+ Lennart Poettering , June 2010
References
@@ -222,38 +226,39 @@
7. README#installation
8. README#acks
9. README#download
- 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
- 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz
- 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz
- 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz
- 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz
- 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz
- 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz
- 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz
- 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
- 19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
- 20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
- 21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
- 22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
- 23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
- 24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
- 25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
- 26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
- 27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
- 28. http://freedesktop.org/wiki/Specifications/sound-theme-spec
- 29. http://www.gnome.org/
- 30. http://alsa-project.org/
- 31. http://pulseaudio.org/
- 32. http://gstreamer.org/
- 33. http://0pointer.de/blog/projects/sixfold-announcement.html
- 34. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
- 35. http://www.gtk.org/gtk-doc/
- 36. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
- 37. http://0pointer.de/lennart/projects/libcanberra/
- 38. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
- 39. http://git-scm.com/
- 40. git://git.0pointer.de/libcanberra
- 41. http://git.0pointer.de/?p=libcanberra.git
- 42. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
- 43. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/
- 44. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
+ 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
+ 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
+ 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz
+ 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz
+ 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz
+ 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz
+ 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz
+ 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz
+ 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz
+ 19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
+ 20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
+ 21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
+ 22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
+ 23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
+ 24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
+ 25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
+ 26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
+ 27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
+ 28. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
+ 29. http://freedesktop.org/wiki/Specifications/sound-theme-spec
+ 30. http://www.gnome.org/
+ 31. http://alsa-project.org/
+ 32. http://pulseaudio.org/
+ 33. http://gstreamer.org/
+ 34. http://0pointer.de/blog/projects/sixfold-announcement.html
+ 35. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
+ 36. http://www.gtk.org/gtk-doc/
+ 37. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
+ 38. http://0pointer.de/lennart/projects/libcanberra/
+ 39. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
+ 40. http://git-scm.com/
+ 41. git://git.0pointer.de/libcanberra
+ 42. http://git.0pointer.de/?p=libcanberra.git
+ 43. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
+ 44. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/
+ 45. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/config.h.in new/libcanberra-0.25/config.h.in
--- old/libcanberra-0.24/config.h.in 2010-04-19 17:10:40.000000000 +0200
+++ new/libcanberra-0.25/config.h.in 2010-06-13 20:09:53.000000000 +0200
@@ -30,6 +30,9 @@
/* Have GTK? */
#undef HAVE_GTK
+/* Have GTK3? */
+#undef HAVE_GTK3
+
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/configure.ac new/libcanberra-0.25/configure.ac
--- old/libcanberra-0.24/configure.ac 2010-04-19 17:07:05.000000000 +0200
+++ new/libcanberra-0.25/configure.ac 2010-06-13 20:09:32.000000000 +0200
@@ -20,7 +20,7 @@
# http://www.gnu.org/licenses/.
m4_define([ca_major],[0])
-m4_define([ca_minor],[24])
+m4_define([ca_minor],[25])
m4_define([ca_version],[ca_major.ca_minor])
AC_PREREQ(2.63)
@@ -33,7 +33,7 @@
AM_INIT_AUTOMAKE([foreign 1.10 -Wall])
AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libcanberra/])
-AC_SUBST(LIBCANBERRA_VERSION_INFO, [2:3:2])
+AC_SUBST(LIBCANBERRA_VERSION_INFO, [2:4:2])
AC_SUBST(LIBCANBERRA_GTK_VERSION_INFO, [1:6:1])
AC_CANONICAL_HOST
@@ -49,6 +49,7 @@
#### Checks for programs. ####
AC_PROG_MKDIR_P
+AC_PROG_LN_S
# CC
@@ -62,7 +63,7 @@
AC_PROG_CXX
-DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wno-long-long -Winline -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wpacked -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wcast-align -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option"
+DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wno-long-long -Winline -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wpacked -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wcast-align -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option -fno-strict-aliasing"
for flag in $DESIRED_FLAGS ; do
CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"])
@@ -374,13 +375,53 @@
HAVE_GTK=0
fi
-
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_MODULES_DIR)
AC_SUBST(HAVE_GTK)
AM_CONDITIONAL([HAVE_GTK], [test "x$HAVE_GTK" = x1])
+AC_ARG_ENABLE([gtk3],
+ AS_HELP_STRING([--disable-gtk3], [Disable optional GTK+ 3 support]),
+ [
+ case "${enableval}" in
+ yes) gtk3=yes ;;
+ no) gtk3=no ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-gtk3) ;;
+ esac
+ ],
+ [gtk3=auto])
+
+if test "x${gtk3}" != xno ; then
+ PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 ],
+ [
+ HAVE_GTK3=1
+ AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])
+
+ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+ AM_GCONF_SOURCE_2
+
+ GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
+ GTK3_MODULES_DIR="${libdir}/gtk-3.0/modules"
+ ],
+ [
+ HAVE_GTK3=0
+ if test "x$gtk3" = xyes ; then
+ AC_MSG_ERROR([*** GTK3 not found ***])
+ fi
+ ])
+else
+ HAVE_GTK3=0
+fi
+
+AC_SUBST(GTK3_CFLAGS)
+AC_SUBST(GTK3_LIBS)
+AC_SUBST(GTK3_MODULES_DIR)
+AC_SUBST(HAVE_GTK3)
+AM_CONDITIONAL([HAVE_GTK3], [test "x$HAVE_GTK3" = x1])
+
+AM_CONDITIONAL([HAVE_GTK_ANY], [test "x$HAVE_GTK" = x1 -o "x$HAVE_GTK3" = x1])
+
#### TDB cache support (optional) ####
AC_ARG_ENABLE([tdb],
@@ -583,6 +624,7 @@
src/Makefile
libcanberra.pc
libcanberra-gtk.pc
+libcanberra-gtk3.pc
src/canberra.h
gtkdoc/Makefile
doc/Makefile
@@ -646,6 +688,11 @@
ENABLE_GTK=yes
fi
+ENABLE_GTK3=no
+if test "x$HAVE_GTK3" = "x1" ; then
+ ENABLE_GTK3=yes
+fi
+
ENABLE_TDB=no
if test "x$HAVE_TDB" = "x1" ; then
ENABLE_TDB=yes
@@ -681,6 +728,8 @@
Enable lookup cache: ${ENABLE_CACHE}
Enable GTK+: ${ENABLE_GTK}
GTK Modules Directory: ${GTK_MODULES_DIR}
+ Enable GTK3+: ${ENABLE_GTK3}
+ GTK3 Modules Directory: ${GTK3_MODULES_DIR}
"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/doc/Makefile.am new/libcanberra-0.25/doc/Makefile.am
--- old/libcanberra-0.24/doc/Makefile.am 2008-08-14 17:13:29.000000000 +0200
+++ new/libcanberra-0.25/doc/Makefile.am 2010-06-13 20:09:32.000000000 +0200
@@ -24,7 +24,7 @@
if USE_LYNX
README: README.html
- lynx --dump $^ | sed 's,file://localhost/.*/doc/README.html,README,' > $@
+ $(AM_V_GEN)lynx --dump $^ | sed 's,file://localhost/.*/doc/README.html,README,' > $@
CLEANFILES += README
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/doc/README new/libcanberra-0.25/doc/README
--- old/libcanberra-0.24/doc/README 2010-04-19 17:10:46.000000000 +0200
+++ new/libcanberra-0.25/doc/README 2010-06-13 20:10:43.000000000 +0200
@@ -1,4 +1,4 @@
- libcanberra 0.24
+ libcanberra 0.25
Copyright 2008-2010 Lennart Poettering
@@ -26,99 +26,104 @@
News
+ Sun 13 Jun 2010:
+
+ [10]Version 0.25 released; Optionally build with Gtk+ 3.x in addition
+ to Gtk+ 2.x.
+
Mon 19 Apr 2010:
- [10]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes
+ [11]Version 0.24 released; GTK code is now fine with GSEAL. Minor fixes
in the PulseAudio backend, other fixes.
Sat 20 Feb 2010:
- [11]Version 0.23 released; various minor fixes in the pulse and
+ [12]Version 0.23 released; various minor fixes in the pulse and
gstreamer backends as well in the Vala API. Support for the recently
standardized Vorbis 6.1/7.1 multichannel modes.
Tue 20 Oct 2009:
- [12]Version 0.22 released; small fix to make sure we don't dereference
+ [13]Version 0.22 released; small fix to make sure we don't dereference
a null pointer.
Fri 16 Oct 2009:
- [13]Version 0.21 released; suppress casting warning
+ [14]Version 0.21 released; suppress casting warning
Thu 15 Oct 2009:
- [14]Version 0.20 released; minor casting fix
+ [15]Version 0.20 released; minor casting fix
Wed 14 Oct 2009:
- [15]Version 0.19 released; some important fixes for the Gtk support
+ [16]Version 0.19 released; some important fixes for the Gtk support
Sun 20 Sep 2009:
- [16]Version 0.18 released; numerous updates for the Gtk support
+ [17]Version 0.18 released; numerous updates for the Gtk support
Fri 12 Sep 2009:
- [17]Version 0.17 released; add vala vapi file; numerous updates to Gtk
+ [18]Version 0.17 released; add vala vapi file; numerous updates to Gtk
support
Thu 27 Aug 2009:
- [18]Version 0.16 released; add new ca_context_playing() call
+ [19]Version 0.16 released; add new ca_context_playing() call
Wed 5 Aug 2009:
- [19]Version 0.15 released; bug fixes
+ [20]Version 0.15 released; bug fixes
Thu 2 Jul 2009:
- [20]Version 0.14 released; bug fixes
+ [21]Version 0.14 released; bug fixes
Tue 23 Jun 2009:
- [21]Version 0.13 released; multichannel support; gtk multihead support;
+ [22]Version 0.13 released; multichannel support; gtk multihead support;
bug fixes
Mon 13 Apr 2009:
- [22]Version 0.12 released; changes include: various fixes and updates
+ [23]Version 0.12 released; changes include: various fixes and updates
for the PulseAudio backend; detect forks and return an error for all
functions in that case
Wed 21 Jan 2009:
- [23]Version 0.11 released; changes include: major GStreamer backend
+ [24]Version 0.11 released; changes include: major GStreamer backend
fixes; update to libtool 2.2; a few other fixes
Mon 6 Oct 2008:
- [24]Version 0.10 released; changes include: install Gtk+ module using
+ [25]Version 0.10 released; changes include: install Gtk+ module using
GConf; a few other fixes
Tue 9 Sep 2008:
- [25]Version 0.9 released; changes include: GStreamer fixes, include
+ [26]Version 0.9 released; changes include: GStreamer fixes, include
(optional) libtdb based lookup cache.
Thu 28 Aug 2008:
- [26]Version 0.8 released; changes include: new OSS and GStreamer
+ [27]Version 0.8 released; changes include: new OSS and GStreamer
backend; portability fixes for FreeBSD/Solaris; the multi backend works
now
Thu 14 Aug 2008:
- [27]Version 0.7 released; changes include: documentation updates;
+ [28]Version 0.7 released; changes include: documentation updates;
various bug fixes; add this web site/README; allow playback of event
sounds with only a sound file path specified; other changes
Overview
- libcanberra is an implementation of the [28]XDG Sound Theme and Name
+ libcanberra is an implementation of the [29]XDG Sound Theme and Name
Specifications, for generating event sounds on free desktops, such as
- [29]GNOME. It comes with several backends ([30]ALSA, [31]PulseAudio,
- OSS, [32]GStreamer, null) and is designed to be portable. It consists
+ [30]GNOME. It comes with several backends ([31]ALSA, [32]PulseAudio,
+ OSS, [33]GStreamer, null) and is designed to be portable. It consists
of the following parts:
1. libcanberra: the main library
2. libcanberra-gtk: some glue code to make it easier to use
@@ -126,14 +131,14 @@
3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to
trigger input feedback event sounds
- For more information see [33]the original announcement.
+ For more information see [34]the original announcement.
Current Status
libcanberra is mostly feature complete. For now however it includes
backends only for ALSA, PulseAudio, OSS and GStreamer.
- libcanberra has been declared [34]a blessed GNOME dependency.
+ libcanberra has been declared [35]a blessed GNOME dependency.
The OSS driver is incomplete: only sound files that are in a format
natively understood by the sound card are supported. If the sample
@@ -155,7 +160,7 @@
Documentation
- You may browse the [35]gtkdoc generated [36]programing documentation of
+ You may browse the [36]gtkdoc generated [37]programing documentation of
the API.
Requirements
@@ -190,26 +195,25 @@
Download
The newest release is always available from
- [37]http://0pointer.de/lennart/projects/libcanberra/
+ [38]http://0pointer.de/lennart/projects/libcanberra/
- The current release is [38]0.24
+ The current release is [39]0.25
- Get libcanberra's development sources from the [39]GIT [40]repository
- ([41]gitweb):
+ Get libcanberra's development sources from the [40]GIT [41]repository
+ ([42]gitweb):
git clone git://git.0pointer.de/libcanberra
If you want to report bugs, have questions or want to be notified about
- new releases, please join the [42]libcanberra-discuss mailing list.
+ new releases, please join the [43]libcanberra-discuss mailing list.
If you want to be notified about new git commits, please join the
- [43]libcanberra-commits mailing list.
+ [44]libcanberra-commits mailing list.
- libcanberra's bugs are tracked at [44]bugs.freedesktop.org.
+ libcanberra's bugs are tracked at [45]bugs.freedesktop.org.
__________________________________________________________________
- Lennart Poettering , February
- 2010
+ Lennart Poettering , June 2010
References
@@ -222,38 +226,39 @@
7. README#installation
8. README#acks
9. README#download
- 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
- 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz
- 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz
- 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz
- 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz
- 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz
- 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz
- 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz
- 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
- 19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
- 20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
- 21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
- 22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
- 23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
- 24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
- 25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
- 26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
- 27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
- 28. http://freedesktop.org/wiki/Specifications/sound-theme-spec
- 29. http://www.gnome.org/
- 30. http://alsa-project.org/
- 31. http://pulseaudio.org/
- 32. http://gstreamer.org/
- 33. http://0pointer.de/blog/projects/sixfold-announcement.html
- 34. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
- 35. http://www.gtk.org/gtk-doc/
- 36. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
- 37. http://0pointer.de/lennart/projects/libcanberra/
- 38. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
- 39. http://git-scm.com/
- 40. git://git.0pointer.de/libcanberra
- 41. http://git.0pointer.de/?p=libcanberra.git
- 42. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
- 43. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/
- 44. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
+ 10. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
+ 11. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz
+ 12. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.23.tar.gz
+ 13. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.22.tar.gz
+ 14. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.21.tar.gz
+ 15. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.20.tar.gz
+ 16. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.19.tar.gz
+ 17. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.18.tar.gz
+ 18. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.17.tar.gz
+ 19. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.16.tar.gz
+ 20. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.15.tar.gz
+ 21. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.14.tar.gz
+ 22. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.13.tar.gz
+ 23. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.12.tar.gz
+ 24. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.11.tar.gz
+ 25. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.10.tar.gz
+ 26. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.9.tar.gz
+ 27. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.8.tar.gz
+ 28. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.7.tar.gz
+ 29. http://freedesktop.org/wiki/Specifications/sound-theme-spec
+ 30. http://www.gnome.org/
+ 31. http://alsa-project.org/
+ 32. http://pulseaudio.org/
+ 33. http://gstreamer.org/
+ 34. http://0pointer.de/blog/projects/sixfold-announcement.html
+ 35. http://mail.gnome.org/archives/devel-announce-list/2008-August/msg00001.html
+ 36. http://www.gtk.org/gtk-doc/
+ 37. http://0pointer.de/lennart/projects/libcanberra/gtkdoc/
+ 38. http://0pointer.de/lennart/projects/libcanberra/
+ 39. http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz
+ 40. http://git-scm.com/
+ 41. git://git.0pointer.de/libcanberra
+ 42. http://git.0pointer.de/?p=libcanberra.git
+ 43. https://tango.0pointer.de/mailman/listinfo/libcanberra-discuss/
+ 44. https://tango.0pointer.de/mailman/listinfo/libcanberra-commits/
+ 45. http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/doc/README.html new/libcanberra-0.25/doc/README.html
--- old/libcanberra-0.24/doc/README.html 2010-04-19 17:10:39.000000000 +0200
+++ new/libcanberra-0.25/doc/README.html 2010-06-13 20:10:17.000000000 +0200
@@ -3,12 +3,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>libcanberra 0.24</title>
+<title>libcanberra 0.25</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
-<h1><a name="top">libcanberra 0.24</a></h1>
+<h1><a name="top">libcanberra 0.25</a></h1>
<p><i>Copyright 2008-2010 Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de></i></p>
@@ -38,6 +38,10 @@
<h2><a name="news">News</a></h2>
+<div class="news-date">Sun 13 Jun
+2010: </div> <p class="news-text"><a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz">Version
+0.25</a> released; Optionally build with Gtk+ 3.x in addition to Gtk+ 2.x.</p>
+
<div class="news-date">Mon 19 Apr
2010: </div> <p class="news-text"><a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz">Version
0.24</a> released; GTK code is now fine with GSEAL. Minor fixes in the
@@ -208,7 +212,7 @@
<p>The newest release is always available from <a href="http://0pointer.de/lennart/projects/libcanberra/">http://0pointer.de/lennart/projects/libcanberra/</a></p>
-<p>The current release is <a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.24.tar.gz">0.24</a></p>
+<p>The current release is <a href="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.25.tar.gz">0.25</a></p>
<p>Get <tt>libcanberra</tt>'s development sources from the <a href="http://git-scm.com/">GIT</a> <a href="git://git.0pointer.de/libcanberra">repository</a> (<a href="http://git.0pointer.de/?p=libcanberra.git">gitweb</a>): </p>
@@ -221,7 +225,7 @@
<p><tt>libcanberra</tt>'s bugs are tracked at <a href="http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra">bugs.freedesktop.org</a>.</p>
<hr/>
-<address class="grey">Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de>, February 2010</address>
+<address class="grey">Lennart Poettering <mzyvopnaoreen (at) 0pointer (dot) de>, June 2010</address>
</body>
</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/doc/README.html.in new/libcanberra-0.25/doc/README.html.in
--- old/libcanberra-0.24/doc/README.html.in 2010-04-19 17:06:55.000000000 +0200
+++ new/libcanberra-0.25/doc/README.html.in 2010-06-13 20:09:32.000000000 +0200
@@ -38,6 +38,10 @@
<h2><a name="news">News</a></h2>
+<div class="news-date">Sun 13 Jun
+2010: </div> <p class="news-text"><a href="@PACKAGE_URL@libcanberra-0.25.tar.gz">Version
+0.25</a> released; Optionally build with Gtk+ 3.x in addition to Gtk+ 2.x.</p>
+
<div class="news-date">Mon 19 Apr
2010: </div> <p class="news-text"><a href="@PACKAGE_URL@libcanberra-0.24.tar.gz">Version
0.24</a> released; GTK code is now fine with GSEAL. Minor fixes in the
@@ -221,7 +225,7 @@
<p><tt>libcanberra</tt>'s bugs are tracked at <a href="http://bugs.freedesktop.org/buglist.cgi?bug_status=__open__&product=libcanberra">bugs.freedesktop.org</a>.</p>
<hr/>
-<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, February 2010</address>
+<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, June 2010</address>
</body>
</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/gtkdoc/html/ch01.html new/libcanberra-0.25/gtkdoc/html/ch01.html
--- old/libcanberra-0.24/gtkdoc/html/ch01.html 2010-04-19 17:10:47.000000000 +0200
+++ new/libcanberra-0.25/gtkdoc/html/ch01.html 2010-06-13 20:10:59.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="libcanberra">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id476772"></a>libcanberra</h2></div></div></div>
+<a name="id524968"></a>libcanberra</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="libcanberra-canberra.html">canberra</a></span><span class="refpurpose"> — General libcanberra API</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/gtkdoc/html/libcanberra-canberra-gtk.html new/libcanberra-0.25/gtkdoc/html/libcanberra-canberra-gtk.html
--- old/libcanberra-0.24/gtkdoc/html/libcanberra-canberra-gtk.html 2010-04-19 17:10:47.000000000 +0200
+++ new/libcanberra-0.25/gtkdoc/html/libcanberra-canberra-gtk.html 2010-06-13 20:10:59.000000000 +0200
@@ -38,17 +38,17 @@
<a name="libcanberra-canberra-gtk.synopsis"></a><h2>Synopsis</h2>
<pre class="synopsis"><a class="link" href="libcanberra-canberra.html#ca-context" title="ca_context"><span class="returnvalue">ca_context</span></a> * <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-context-get" title="ca_gtk_context_get ()">ca_gtk_context_get</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
<span class="returnvalue">int</span> <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-proplist-set-for-widget" title="ca_gtk_proplist_set_for_widget ()">ca_gtk_proplist_set_for_widget</a> (<em class="parameter"><code><a class="link" href="libcanberra-canberra.html#ca-proplist" title="ca_proplist"><span class="type">ca_proplist</span></a> *p</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>);
-<span class="returnvalue">int</span> <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-play-for-widget" title="ca_gtk_play_for_widget ()">ca_gtk_play_for_widget</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>,
+ <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>);
+<span class="returnvalue">int</span> <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-play-for-widget" title="ca_gtk_play_for_widget ()">ca_gtk_play_for_widget</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>,
<em class="parameter"><code><span class="type">uint32_t</span> id</code></em>,
<em class="parameter"><code>...</code></em>);
<span class="returnvalue">int</span> <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-proplist-set-for-event" title="ca_gtk_proplist_set_for_event ()">ca_gtk_proplist_set_for_event</a> (<em class="parameter"><code><a class="link" href="libcanberra-canberra.html#ca-proplist" title="ca_proplist"><span class="type">ca_proplist</span></a> *p</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gdk/unstable/gdk-Event-Structures.html#GdkEvent"><span class="type">GdkEvent</span></a> *e</code></em>);
-<span class="returnvalue">int</span> <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-play-for-event" title="ca_gtk_play_for_event ()">ca_gtk_play_for_event</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gdk/unstable/gdk-Event-Structures.html#GdkEvent"><span class="type">GdkEvent</span></a> *e</code></em>,
+ <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gdk/gdk-Event-Structures.html#GdkEvent"><span class="type">GdkEvent</span></a> *e</code></em>);
+<span class="returnvalue">int</span> <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-play-for-event" title="ca_gtk_play_for_event ()">ca_gtk_play_for_event</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gdk/gdk-Event-Structures.html#GdkEvent"><span class="type">GdkEvent</span></a> *e</code></em>,
<em class="parameter"><code><span class="type">uint32_t</span> id</code></em>,
<em class="parameter"><code>...</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-widget-disable-sounds" title="ca_gtk_widget_disable_sounds ()">ca_gtk_widget_disable_sounds</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enable</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-widget-disable-sounds" title="ca_gtk_widget_disable_sounds ()">ca_gtk_widget_disable_sounds</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>,
+ <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enable</code></em>);
</pre>
</div>
<div class="refsect1" title="Description">
@@ -56,7 +56,7 @@
<p>
libcanberra-gtk provides a few functions that simplify libcanberra
usage from Gtk+ programs. It maintains a single ca_context object
-per <a href="http://library.gnome.org/devel/gdk/unstable/GdkScreen.html"><span class="type">GdkScreen</span></a> that is made accessible via
+per <a href="/usr/share/gtk-doc/html/gdk/GdkScreen.html"><span class="type">GdkScreen</span></a> that is made accessible via
<code class="function">ca_gtk_context_get_for_screen()</code>, with a shortcut <a class="link" href="libcanberra-canberra-gtk.html#ca-gtk-context-get" title="ca_gtk_context_get ()"><code class="function">ca_gtk_context_get()</code></a>
to get the context for the default screen. More importantly, it provides
a few functions
@@ -87,7 +87,7 @@
<div class="refsect2" title="ca_gtk_proplist_set_for_widget ()">
<a name="ca-gtk-proplist-set-for-widget"></a><h3>ca_gtk_proplist_set_for_widget ()</h3>
<pre class="programlisting"><span class="returnvalue">int</span> ca_gtk_proplist_set_for_widget (<em class="parameter"><code><a class="link" href="libcanberra-canberra.html#ca-proplist" title="ca_proplist"><span class="type">ca_proplist</span></a> *p</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>);</pre>
+ <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>);</pre>
<p>
Fill in a ca_proplist object for a sound event that shall originate
from the specified Gtk Widget. This will fill in properties like
@@ -117,7 +117,7 @@
<hr>
<div class="refsect2" title="ca_gtk_play_for_widget ()">
<a name="ca-gtk-play-for-widget"></a><h3>ca_gtk_play_for_widget ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span> ca_gtk_play_for_widget (<em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>,
+<pre class="programlisting"><span class="returnvalue">int</span> ca_gtk_play_for_widget (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>,
<em class="parameter"><code><span class="type">uint32_t</span> id</code></em>,
<em class="parameter"><code>...</code></em>);</pre>
<p>
@@ -162,7 +162,7 @@
<div class="refsect2" title="ca_gtk_proplist_set_for_event ()">
<a name="ca-gtk-proplist-set-for-event"></a><h3>ca_gtk_proplist_set_for_event ()</h3>
<pre class="programlisting"><span class="returnvalue">int</span> ca_gtk_proplist_set_for_event (<em class="parameter"><code><a class="link" href="libcanberra-canberra.html#ca-proplist" title="ca_proplist"><span class="type">ca_proplist</span></a> *p</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gdk/unstable/gdk-Event-Structures.html#GdkEvent"><span class="type">GdkEvent</span></a> *e</code></em>);</pre>
+ <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gdk/gdk-Event-Structures.html#GdkEvent"><span class="type">GdkEvent</span></a> *e</code></em>);</pre>
<p>
Fill in a ca_proplist object for a sound event that is being
triggered by the specified Gdk Event. This will fill in properties
@@ -194,7 +194,7 @@
<hr>
<div class="refsect2" title="ca_gtk_play_for_event ()">
<a name="ca-gtk-play-for-event"></a><h3>ca_gtk_play_for_event ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span> ca_gtk_play_for_event (<em class="parameter"><code><a href="http://library.gnome.org/devel/gdk/unstable/gdk-Event-Structures.html#GdkEvent"><span class="type">GdkEvent</span></a> *e</code></em>,
+<pre class="programlisting"><span class="returnvalue">int</span> ca_gtk_play_for_event (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gdk/gdk-Event-Structures.html#GdkEvent"><span class="type">GdkEvent</span></a> *e</code></em>,
<em class="parameter"><code><span class="type">uint32_t</span> id</code></em>,
<em class="parameter"><code>...</code></em>);</pre>
<p>
@@ -238,8 +238,8 @@
<hr>
<div class="refsect2" title="ca_gtk_widget_disable_sounds ()">
<a name="ca-gtk-widget-disable-sounds"></a><h3>ca_gtk_widget_disable_sounds ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> ca_gtk_widget_disable_sounds (<em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/unstable/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enable</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span> ca_gtk_widget_disable_sounds (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html"><span class="type">GtkWidget</span></a> *w</code></em>,
+ <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enable</code></em>);</pre>
<p>
By default sound events are automatically generated for all kinds
of input events. Use this function to disable this. This is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/libcanberra-gtk3.pc.in new/libcanberra-0.25/libcanberra-gtk3.pc.in
--- old/libcanberra-0.24/libcanberra-gtk3.pc.in 1970-01-01 01:00:00.000000000 +0100
+++ new/libcanberra-0.25/libcanberra-gtk3.pc.in 2010-06-13 20:09:32.000000000 +0200
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=@libdir@
+includedir=${prefix}/include
+
+Name: libcanberra-gtk3
+Description: Gtk3 Event Sound API
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lcanberra-gtk3 @PTHREAD_LIBS@
+Cflags: -D_REENTRANT -I${includedir}
+Requires: libcanberra gtk+-3.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/src/Makefile.am new/libcanberra-0.25/src/Makefile.am
--- old/libcanberra-0.24/src/Makefile.am 2009-10-07 00:38:46.000000000 +0200
+++ new/libcanberra-0.25/src/Makefile.am 2010-06-13 20:09:32.000000000 +0200
@@ -17,6 +17,7 @@
# http://www.gnu.org/licenses/.
gtkmoduledir = @GTK_MODULES_DIR@
+gtk3moduledir = @GTK3_MODULES_DIR@
plugindir = $(libdir)/libcanberra-@PACKAGE_VERSION@
@@ -272,20 +273,62 @@
endif
endif
-if HAVE_GTK
+if HAVE_GTK_ANY
-lib_LTLIBRARIES += \
- libcanberra-gtk.la
+bin_PROGRAMS = \
+ canberra-gtk-play
include_HEADERS += \
canberra-gtk.h
+endif
+
+if HAVE_GTK3
+
+lib_LTLIBRARIES += \
+ libcanberra-gtk3.la
+
+gtk3module_LTLIBRARIES = \
+ libcanberra-gtk3-module.la
+
+libcanberra_gtk3_la_SOURCES = \
+ canberra-gtk.h \
+ canberra-gtk.c
+libcanberra_gtk3_la_CFLAGS = \
+ $(GTK3_CFLAGS)
+libcanberra_gtk3_la_LIBADD = \
+ $(GTK3_LIBS) \
+ libcanberra.la
+libcanberra_gtk3_la_LDFLAGS = \
+ -export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
+
+libcanberra_gtk3_module_la_SOURCES = \
+ canberra-gtk-module.c
+libcanberra_gtk3_module_la_CFLAGS = \
+ $(GTK3_CFLAGS)
+libcanberra_gtk3_module_la_LIBADD = \
+ $(GTK3_LIBS) \
+ libcanberra.la \
+ libcanberra-gtk3.la
+libcanberra_gtk3_module_la_LDFLAGS = \
+ -avoid-version -module -export-dynamic
+
+install-exec-hook:
+ $(MKDIR_P) -m 755 $(DESTDIR)$(gtk3moduledir)
+ ( cd $(DESTDIR)$(gtk3moduledir) && \
+ rm -f libcanberra-gtk-module.so && \
+ $(LN_S) libcanberra-gtk3-module.so libcanberra-gtk-module.so )
+
+endif
+
+if HAVE_GTK
+
+lib_LTLIBRARIES += \
+ libcanberra-gtk.la
+
gtkmodule_LTLIBRARIES = \
libcanberra-gtk-module.la
-bin_PROGRAMS = \
- canberra-gtk-play
-
libcanberra_gtk_la_SOURCES = \
canberra-gtk.h \
canberra-gtk.c
@@ -308,8 +351,20 @@
libcanberra_gtk_module_la_LDFLAGS = \
-avoid-version -module -export-dynamic
-canberra_gtk_play_SOURCES = \
- canberra-gtk-play.c
+endif
+
+if HAVE_GTK3
+
+canberra_gtk_play_LDADD = \
+ $(GTK3_LIBS) \
+ libcanberra.la \
+ libcanberra-gtk3.la
+canberra_gtk_play_CFLAGS = \
+ $(GTK3_CFLAGS)
+
+else
+if HAVE_GTK
+
canberra_gtk_play_LDADD = \
$(GTK_LIBS) \
libcanberra.la \
@@ -317,6 +372,14 @@
canberra_gtk_play_CFLAGS = \
$(GTK_CFLAGS)
+endif
+endif
+
+if HAVE_GTK_ANY
+
+canberra_gtk_play_SOURCES = \
+ canberra-gtk-play.c
+
EXTRA_DIST += \
libcanberra-login-sound.desktop.in \
libcanberra-ready-sound.desktop.in \
@@ -337,14 +400,14 @@
libcanberra-logout-sound.sh
libcanberra-logout-sound.sh: libcanberra-logout-sound.sh.in Makefile
- sed -e 's,@bindir\@,$(bindir),g' < $< > $@
- chmod +x $@
+ $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' < $< > $@ && \
+ chmod +x $@
libcanberra-login-sound.desktop: libcanberra-login-sound.desktop.in Makefile
- sed -e 's,@bindir\@,$(bindir),g' < $< > $@
+ $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' < $< > $@
libcanberra-ready-sound.desktop: libcanberra-ready-sound.desktop.in Makefile
- sed -e 's,@bindir\@,$(bindir),g' < $< > $@
+ $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' < $< > $@
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/src/cache.c new/libcanberra-0.25/src/cache.c
--- old/libcanberra-0.24/src/cache.c 2010-02-20 00:39:40.000000000 +0100
+++ new/libcanberra-0.25/src/cache.c 2010-06-13 20:09:32.000000000 +0200
@@ -227,6 +227,10 @@
static void db_close(void) {
/* Only here to make this valgrind clean */
+
+ if (!getenv("VALGRIND"))
+ return;
+
if (mutex) {
ca_mutex_free(mutex);
mutex = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcanberra-0.24/src/canberra.h new/libcanberra-0.25/src/canberra.h
--- old/libcanberra-0.24/src/canberra.h 2010-04-19 17:10:39.000000000 +0200
+++ new/libcanberra-0.25/src/canberra.h 2010-06-13 20:10:17.000000000 +0200
@@ -48,7 +48,7 @@
*
* Evaluates to the minor version number of libcanberra.
*/
-#define CA_MINOR (24)
+#define CA_MINOR (25)
/**
* CA_CHECK_VERSION:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org