cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to libcanberra-0.17.

Browse Source 
* add vala vapi file
* numerous updates to Gtk support
* add new ca_context_playing() call
* several bugfixes

Makes use of newer sound-theme-freedesktop.
This commit is contained in:
ajacoutot 2009-09-17 17:43:43 +00:00
parent a67a11245d
commit 93188bbb4b
5 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
audio/libcanberra/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2009/08/10 06:29:52 kili Exp $
# $OpenBSD: Makefile,v 1.12 2009/09/17 17:43:43 ajacoutot Exp $
COMMENT= implementation of the Freedesktop sound theme spec.
V= 0.14
V= 0.17
DISTNAME= libcanberra-${V}
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += canberra 1.0 # .1.4
SHARED_LIBS += canberra-gtk 0.0 # .0.4
SHARED_LIBS += canberra 1.1 # .2.1
SHARED_LIBS += canberra-gtk 0.0 # .1.2
CATEGORIES= audio devel
@ -46,7 +45,7 @@ LIB_DEPENDS= vorbis,vorbisfile::audio/libvorbis \
ltdl::devel/libtool,-ltdl \
gstreamer-0.10::multimedia/gstreamer-0.10/core \
gdk_pixbuf-2.0.>=1400.0,gdk-x11-2.0.>=1400.0,gtk-x11-2.0.>=1400.0::x11/gtk+2
RUN_DEPENDS= ::audio/sound-theme-freedesktop
RUN_DEPENDS= :sound-theme-freedesktop->=0.6:audio/sound-theme-freedesktop
USE_X11= Yes
USE_LIBTOOL= Yes
@ -60,7 +59,8 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-oss \
--disable-alsa \
--disable-pulse \
--disable-tdb
--disable-tdb \
--enable-gtk-doc=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

10
audio/libcanberra/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libcanberra-0.14.tar.gz) = sYKrE0qRG6bELqK3J+2hPg==
RMD160 (libcanberra-0.14.tar.gz) = z2KtpjwxQ2hxfNAXPf2YY/n5/6Q=
SHA1 (libcanberra-0.14.tar.gz) = vmpw9ZfNdgTbMOjJV4/PQV6W6tI=
SHA256 (libcanberra-0.14.tar.gz) = h5+at5iuKHBIUY67VRMrurkFvqS4MKkPJ6BN9tCNKl4=
SIZE (libcanberra-0.14.tar.gz) = 451899
MD5 (libcanberra-0.17.tar.gz) = 0fXFlW1l0olWYZfmIL4aLg==
RMD160 (libcanberra-0.17.tar.gz) = 4UKN+JoXGsdk6nYRE3q3sIABuT0=
SHA1 (libcanberra-0.17.tar.gz) = TvkuJzW/KNKJI8n+FmMacpsp9L8=
SHA256 (libcanberra-0.17.tar.gz) = X0H6PMmSchcJ03YWAdzZ1X5Owm8RPhFQBf63qrmSAlc=
SIZE (libcanberra-0.17.tar.gz) = 458025

32
audio/libcanberra/patches/patch-configure_ac
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
--- configure.ac.orig Thu Jul 2 02:56:30 2009
+++ configure.ac Mon Jul 6 10:32:05 2009
$OpenBSD: patch-configure_ac,v 1.4 2009/09/17 17:43:43 ajacoutot Exp $
--- configure.ac.orig Sat Sep 12 00:04:45 2009
+++ configure.ac Thu Sep 17 18:48:39 2009
@@ -23,14 +23,14 @@ m4_define([ca_major],[0])
m4_define([ca_minor],[14])
m4_define([ca_minor],[17])
m4_define([ca_version],[ca_major.ca_minor])
-AC_PREREQ(2.63)
@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libcanberra/])
@@ -89,7 +89,7 @@ dnl can give the proper place to find libltdl through
@@ -91,7 +91,7 @@ dnl can give the proper place to find libltdl through
dnl variables like LDFLAGS and CPPFLAGS.
AC_CHECK_HEADER([ltdl.h],
@ -27,7 +27,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
[LIBLTDL=])
AS_IF([test "x$LIBLTDL" = "x"],
@@ -244,6 +244,36 @@ else
@@ -246,6 +246,36 @@ else
HAVE_OSS=0
fi
@ -64,7 +64,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
### PulseAudio (optional) ####
AC_ARG_ENABLE([pulse],
@@ -466,6 +496,7 @@ BUILTIN_DSO=0
@@ -468,6 +498,7 @@ BUILTIN_DSO=0
BUILTIN_PULSE=0
BUILTIN_ALSA=0
BUILTIN_OSS=0
@ -72,7 +72,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
BUILTIN_GSTREAMER=0
BUILTIN_NULL=0
@@ -478,6 +509,7 @@ case "x$with_builtin" in
@@ -480,6 +511,7 @@ case "x$with_builtin" in
BUILTIN_PULSE=1
HAVE_ALSA=0
HAVE_OSS=0
@ -80,7 +80,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
HAVE_GSTREAMER=0
HAVE_NULL=0
;;
@@ -489,6 +521,7 @@ case "x$with_builtin" in
@@ -491,6 +523,7 @@ case "x$with_builtin" in
BUILTIN_ALSA=1
HAVE_OSS=0
@ -88,7 +88,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
HAVE_PULSE=0
HAVE_GSTREAMER=0
HAVE_NULL=0
@@ -502,6 +535,7 @@ case "x$with_builtin" in
@@ -504,6 +537,7 @@ case "x$with_builtin" in
BUILTIN_GSTREAMER=1
HAVE_ALSA=0
HAVE_OSS=0
@ -96,7 +96,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
HAVE_PULSE=0
HAVE_NULL=0
;;
@@ -513,11 +547,25 @@ case "x$with_builtin" in
@@ -515,11 +549,25 @@ case "x$with_builtin" in
BUILTIN_OSS=1
HAVE_ALSA=0
@ -122,7 +122,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
xnull)
if test "x$HAVE_NULL" != x1 ; then
AC_MSG_ERROR([*** Null output selected for builtin driver, but not enabled. ***])
@@ -525,6 +573,7 @@ case "x$with_builtin" in
@@ -527,6 +575,7 @@ case "x$with_builtin" in
BUILTIN_NULL=1
HAVE_PULSE=0
@ -130,7 +130,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
HAVE_ALSA=0
HAVE_OSS=0
HAVE_GSTREAMER=0
@@ -540,7 +589,7 @@ case "x$with_builtin" in
@@ -542,7 +591,7 @@ case "x$with_builtin" in
AC_MSG_ERROR([*** Unknown driver $with_builtin selected for builtin ***])
esac
@ -139,7 +139,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
AC_MSG_ERROR([*** No backend enabled. ***])
fi
@@ -548,23 +597,27 @@ AC_SUBST(HAVE_DSO)
@@ -550,23 +599,27 @@ AC_SUBST(HAVE_DSO)
AC_SUBST(HAVE_PULSE)
AC_SUBST(HAVE_ALSA)
AC_SUBST(HAVE_OSS)
@ -167,7 +167,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
AM_CONDITIONAL([BUILTIN_GSTREAMER], [test "x$BUILTIN_GSTREAMER" = x1])
AM_CONDITIONAL([BUILTIN_NULL], [test "x$BUILTIN_NULL" = x1])
@@ -622,6 +675,15 @@ if test "x$BUILTIN_OSS" = "x1" ; then
@@ -624,6 +677,15 @@ if test "x$BUILTIN_OSS" = "x1" ; then
ENABLE_BUILTIN_OSS=yes
fi
@ -183,7 +183,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/12 20:00:27 ajacoutot Exp $
ENABLE_GSTREAMER=no
if test "x$HAVE_GSTREAMER" = "x1" ; then
ENABLE_GSTREAMER=yes
@@ -672,6 +734,8 @@ echo "
@@ -674,6 +736,8 @@ echo "
Builtin ALSA: ${ENABLE_BUILTIN_ALSA}
Enable OSS: ${ENABLE_OSS}
Builtin OSS: ${ENABLE_BUILTIN_OSS}

8
audio/libcanberra/patches/patch-src_Makefile_am
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_am,v 1.2 2009/07/12 20:00:27 ajacoutot Exp $
--- src/Makefile.am.orig Thu Jul 2 02:55:48 2009
+++ src/Makefile.am Mon Jul 6 10:06:54 2009
@@ -206,6 +206,36 @@ libcanberra_oss_la_LDFLAGS = \
$OpenBSD: patch-src_Makefile_am,v 1.3 2009/09/17 17:43:43 ajacoutot Exp $
--- src/Makefile.am.orig Sat Sep 12 00:13:41 2009
+++ src/Makefile.am Thu Sep 17 18:48:39 2009
@@ -208,6 +208,36 @@ libcanberra_oss_la_LDFLAGS = \
endif
endif

10
audio/libcanberra/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2009/07/12 20:00:27 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.9 2009/09/17 17:43:43 ajacoutot Exp $
%%SHARED%%
@bin bin/canberra-gtk-play
include/canberra-gtk.h
@ -24,6 +24,10 @@ lib/pkgconfig/libcanberra-gtk.pc
lib/pkgconfig/libcanberra.pc
share/doc/libcanberra/
share/doc/libcanberra/README
share/gdm/
share/gdm/autostart/
share/gdm/autostart/LoginWindow/
share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
share/gnome/
share/gnome/autostart/
share/gnome/autostart/libcanberra-login-sound.desktop
@ -42,6 +46,10 @@ share/gtk-doc/html/libcanberra/libcanberra.devhelp2
share/gtk-doc/html/libcanberra/right.png
share/gtk-doc/html/libcanberra/style.css
share/gtk-doc/html/libcanberra/up.png
share/vala/
share/vala/vapi/
share/vala/vapi/libcanberra-gtk.vapi
share/vala/vapi/libcanberra.vapi
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/libcanberra.schemas