- move drivers order to give it a chance to actually play a sound:

use gstreamer first (which uses libsndio by default) instead of plain OSS.
(canberra should be modified to use libsndio by itlsef)
- explicitely add enable/disable switches in CONFIGURE_ARGS
- regen PLIST while here
This commit is contained in:
ajacoutot 2008-12-14 15:10:15 +00:00
parent e51ae1b18f
commit 97cb20abe7
3 changed files with 27 additions and 5 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2008/11/19 08:06:03 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2008/12/14 15:10:15 ajacoutot Exp $
COMMENT= implementation of the Freedesktop sound theme spec.
DISTNAME= libcanberra-0.10
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
SHARED_LIBS += canberra 0.1 # .1.3
SHARED_LIBS += canberra-gtk 0.0 # .0.4
CATEGORIES= audio devel
@ -40,7 +40,12 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/libcanberra \
--disable-schemas-install \
--localstatedir="/var"
--localstatedir="/var" \
--enable-gstreamer \
--enable-oss \
--disable-alsa \
--disable-pulse \
--disable-tdb
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include"

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_driver-order_c,v 1.1 2008/12/14 15:10:15 ajacoutot Exp $
--- src/driver-order.c.orig Sun Dec 14 15:02:39 2008
+++ src/driver-order.c Sun Dec 14 15:02:56 2008
@@ -34,11 +34,11 @@ const char* const ca_driver_order[] = {
#ifdef HAVE_ALSA
"alsa",
#endif
-#ifdef HAVE_OSS
- "oss",
-#endif
#ifdef HAVE_GSTREAMER
"gstreamer",
+#endif
+#ifdef HAVE_OSS
+ "oss",
#endif
/* ... */
NULL

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2008/11/19 08:06:03 jasper Exp $
@comment $OpenBSD: PLIST,v 1.4 2008/12/14 15:10:15 ajacoutot Exp $
%%SHARED%%
@bin bin/canberra-gtk-play
include/canberra-gtk.h
@ -29,7 +29,6 @@ share/gnome/autostart/
share/gnome/autostart/libcanberra-login-sound.desktop
share/gnome/shutdown/
share/gnome/shutdown/libcanberra-logout-sound.sh
share/gtk-doc/html/
share/gtk-doc/html/libcanberra/
share/gtk-doc/html/libcanberra/ch01.html
share/gtk-doc/html/libcanberra/home.png