diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 61a82e569f7..31ac5a2ae9e 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2009/01/09 17:34:32 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.6 2009/03/05 08:11:56 ajacoutot Exp $ COMMENT= implementation of the Freedesktop sound theme spec. -DISTNAME= libcanberra-0.10 -PKGNAME= ${DISTNAME}p2 -SHARED_LIBS += canberra 0.1 # .1.3 +DISTNAME= libcanberra-0.11 +SHARED_LIBS += canberra 1.0 # .1.4 SHARED_LIBS += canberra-gtk 0.0 # .0.4 CATEGORIES= audio devel @@ -50,11 +49,15 @@ CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/libcanb --disable-oss \ --disable-alsa \ --disable-pulse \ - --disable-tdb + --disable-tdb \ + --with-ltdl-include=${LOCALBASE}/include \ + --with-ltdl-lib=${LOCALBASE}/lib \ + --disable-ltdl-install \ + --without-included-ltdl CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" -post-patch: +pre-configure: cp ${FILESDIR}/sndio.c ${WRKSRC}/src cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal -I m4 diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo index 316daf06172..2f126711bdf 100644 --- a/audio/libcanberra/distinfo +++ b/audio/libcanberra/distinfo @@ -1,5 +1,5 @@ -MD5 (libcanberra-0.10.tar.gz) = JiM3C/zsruyuuF5exEXzQA== -RMD160 (libcanberra-0.10.tar.gz) = m8VrBdrbai/hhMymk5bGk7mkTO4= -SHA1 (libcanberra-0.10.tar.gz) = 3+GuQEuUlNi0sWNlittoi6AAi+w= -SHA256 (libcanberra-0.10.tar.gz) = sOPLWeYFQSpSNSz5zzY0SxZUY9TmWRbJXetz/FGDgnI= -SIZE (libcanberra-0.10.tar.gz) = 826222 +MD5 (libcanberra-0.11.tar.gz) = xmHbFMsLH+m2lj3vrMO7pg== +RMD160 (libcanberra-0.11.tar.gz) = d6OOwS0Mnl8u5GD8IVApioHllcc= +SHA1 (libcanberra-0.11.tar.gz) = AJsMkUlwv28PoZFYSDtvff33Ah8= +SHA256 (libcanberra-0.11.tar.gz) = 6nwnMeMcd82qKhMZ3/O/nk7ialHprejS3sMUfCjOLm0= +SIZE (libcanberra-0.11.tar.gz) = 530273 diff --git a/audio/libcanberra/files/sndio.c b/audio/libcanberra/files/sndio.c index fbd0a109541..eab01413083 100644 --- a/audio/libcanberra/files/sndio.c +++ b/audio/libcanberra/files/sndio.c @@ -167,7 +167,7 @@ int driver_destroy(ca_context *c) { return CA_SUCCESS; } -int driver_change_device(ca_context *c, char *device) { +int driver_change_device(ca_context *c, const char *device) { ca_return_val_if_fail(c, CA_ERROR_INVALID); ca_return_val_if_fail(c->private, CA_ERROR_STATE); diff --git a/audio/libcanberra/patches/patch-Makefile_am b/audio/libcanberra/patches/patch-Makefile_am index f9338e44eaa..1216682645e 100644 --- a/audio/libcanberra/patches/patch-Makefile_am +++ b/audio/libcanberra/patches/patch-Makefile_am @@ -1,11 +1,11 @@ -$OpenBSD: patch-Makefile_am,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ ---- Makefile.am.orig Fri Dec 26 16:32:45 2008 -+++ Makefile.am Fri Dec 26 16:32:45 2008 +$OpenBSD: patch-Makefile_am,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ +--- Makefile.am.orig Tue Mar 3 09:16:19 2009 ++++ Makefile.am Tue Mar 3 09:16:33 2009 @@ -19,7 +19,7 @@ dist_doc_DATA = README EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas --SUBDIRS = src gtkdoc libltdl doc +-SUBDIRS = libltdl src gtkdoc doc +SUBDIRS = src gtkdoc doc MAINTAINERCLEANFILES = README diff --git a/audio/libcanberra/patches/patch-configure_ac b/audio/libcanberra/patches/patch-configure_ac index a2c73928c3b..bd0317a425d 100644 --- a/audio/libcanberra/patches/patch-configure_ac +++ b/audio/libcanberra/patches/patch-configure_ac @@ -1,16 +1,32 @@ -$OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ ---- configure.ac.orig Fri Dec 26 14:54:31 2008 -+++ configure.ac Fri Dec 26 15:05:18 2008 -@@ -70,7 +70,7 @@ AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL - AC_SUBST(LTDLINCL) - AC_SUBST(LIBLTDL) --AC_CONFIG_SUBDIRS(libltdl) -+dnl AC_CONFIG_SUBDIRS(libltdl) +$OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ +--- configure.ac.orig Wed Jan 21 21:59:28 2009 ++++ configure.ac Tue Mar 3 09:32:42 2009 +@@ -19,14 +19,14 @@ + # License along with libcanberra. If not, see + # . - #### Determine build environment #### +-AC_PREREQ(2.63) ++AC_PREREQ(2.62) -@@ -233,6 +233,36 @@ else + AC_INIT([libcanberra], 0.11, [mzyvopnaoreen (at) 0pointer (dot) de]) + AC_CONFIG_SRCDIR([src/common.c]) + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR(m4) + +-AM_INIT_AUTOMAKE([foreign 1.10 -Wall]) ++AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) + + AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libcanberra/]) + +@@ -65,7 +65,6 @@ done + + #### libtool stuff #### + LT_PREREQ(2.2) +-LT_CONFIG_LTDL_DIR([libltdl]) + LT_INIT([dlopen win32-dll disable-static]) + LTDL_INIT([convenience recursive]) + +@@ -230,6 +229,36 @@ else HAVE_OSS=0 fi @@ -47,7 +63,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ ### PulseAudio (optional) #### AC_ARG_ENABLE([pulse], -@@ -454,6 +484,7 @@ BUILTIN_DSO=0 +@@ -451,6 +480,7 @@ BUILTIN_DSO=0 BUILTIN_PULSE=0 BUILTIN_ALSA=0 BUILTIN_OSS=0 @@ -55,7 +71,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ BUILTIN_GSTREAMER=0 BUILTIN_NULL=0 -@@ -466,6 +497,7 @@ case "x$with_builtin" in +@@ -463,6 +493,7 @@ case "x$with_builtin" in BUILTIN_PULSE=1 HAVE_ALSA=0 HAVE_OSS=0 @@ -63,7 +79,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ HAVE_GSTREAMER=0 HAVE_NULL=0 ;; -@@ -477,6 +509,7 @@ case "x$with_builtin" in +@@ -474,6 +505,7 @@ case "x$with_builtin" in BUILTIN_ALSA=1 HAVE_OSS=0 @@ -71,7 +87,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ HAVE_PULSE=0 HAVE_GSTREAMER=0 HAVE_NULL=0 -@@ -490,6 +523,7 @@ case "x$with_builtin" in +@@ -487,6 +519,7 @@ case "x$with_builtin" in BUILTIN_GSTREAMER=1 HAVE_ALSA=0 HAVE_OSS=0 @@ -79,7 +95,13 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ HAVE_PULSE=0 HAVE_NULL=0 ;; -@@ -506,6 +540,19 @@ case "x$with_builtin" in +@@ -498,18 +531,32 @@ case "x$with_builtin" in + + BUILTIN_OSS=1 + HAVE_ALSA=0 ++ HAVE_SNDIO=0 + HAVE_PULSE=0 + HAVE_GSTREAMER=0 HAVE_NULL=0 ;; @@ -99,15 +121,15 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ xnull) if test "x$HAVE_NULL" != x1 ; then AC_MSG_ERROR([*** Null output selected for builtin driver, but not enabled. ***]) -@@ -515,6 +562,7 @@ case "x$with_builtin" in - HAVE_PULSE=0 + fi + + BUILTIN_NULL=1 +- HAVE_PULSE=0 ++ HAVE_SNDIO=0 HAVE_ALSA=0 HAVE_OSS=0 -+ HAVE_SNDIO=0 HAVE_GSTREAMER=0 - ;; - -@@ -528,7 +576,7 @@ case "x$with_builtin" in +@@ -525,7 +572,7 @@ case "x$with_builtin" in AC_MSG_ERROR([*** Unknown driver $with_builtin selected for builtin ***]) esac @@ -116,7 +138,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ AC_MSG_ERROR([*** No backend enabled. ***]) fi -@@ -536,23 +584,27 @@ AC_SUBST(HAVE_DSO) +@@ -533,23 +580,27 @@ AC_SUBST(HAVE_DSO) AC_SUBST(HAVE_PULSE) AC_SUBST(HAVE_ALSA) AC_SUBST(HAVE_OSS) @@ -144,7 +166,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ AM_CONDITIONAL([BUILTIN_GSTREAMER], [test "x$BUILTIN_GSTREAMER" = x1]) AM_CONDITIONAL([BUILTIN_NULL], [test "x$BUILTIN_NULL" = x1]) -@@ -606,6 +658,15 @@ if test "x$BUILTIN_OSS" = "x1" ; then +@@ -604,6 +655,15 @@ if test "x$BUILTIN_OSS" = "x1" ; then ENABLE_BUILTIN_OSS=yes fi @@ -160,7 +182,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ ENABLE_GSTREAMER=no if test "x$HAVE_GSTREAMER" = "x1" ; then ENABLE_GSTREAMER=yes -@@ -656,6 +717,8 @@ echo " +@@ -654,6 +714,8 @@ echo " Builtin ALSA: ${ENABLE_BUILTIN_ALSA} Enable OSS: ${ENABLE_OSS} Builtin OSS: ${ENABLE_BUILTIN_OSS} diff --git a/audio/libcanberra/patches/patch-gtk-doc_make b/audio/libcanberra/patches/patch-gtkdoc_gtk-doc_make similarity index 79% rename from audio/libcanberra/patches/patch-gtk-doc_make rename to audio/libcanberra/patches/patch-gtkdoc_gtk-doc_make index 2aecd0c26cc..2b4fe126fe2 100644 --- a/audio/libcanberra/patches/patch-gtk-doc_make +++ b/audio/libcanberra/patches/patch-gtkdoc_gtk-doc_make @@ -1,7 +1,7 @@ -$OpenBSD: patch-gtk-doc_make,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ ---- gtk-doc.make.orig Wed Aug 13 10:54:07 2008 -+++ gtk-doc.make Fri Dec 26 16:30:26 2008 -@@ -4,13 +4,13 @@ +$OpenBSD: patch-gtkdoc_gtk-doc_make,v 1.1 2009/03/05 08:11:56 ajacoutot Exp $ +--- gtkdoc/gtk-doc.make.orig Wed Jan 21 22:02:53 2009 ++++ gtkdoc/gtk-doc.make Tue Mar 3 09:27:23 2009 +@@ -4,15 +4,15 @@ # Everything below here is generic # #################################### @@ -10,18 +10,21 @@ $OpenBSD: patch-gtk-doc_make,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ +#if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + GTKDOC_RUN = $(LIBTOOL) --mode=execute -else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-GTKDOC_RUN = sh -c -endif +#else +#GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +#GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++#GTKDOC_RUN = sh -c +#endif # We set GPATH here; this gives us semantics for GNU make # which are more like other make's VPATH, when it comes to -@@ -45,11 +45,11 @@ REPORT_FILES = \ +@@ -47,11 +47,11 @@ REPORT_FILES = \ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @@ -37,7 +40,7 @@ $OpenBSD: patch-gtk-doc_make,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ docs: html-build.stamp -@@ -134,13 +134,13 @@ uninstall-local: +@@ -157,13 +157,13 @@ uninstall-local: # # Require gtk-doc when making dist # diff --git a/audio/libcanberra/pkg/PFRAG.shared b/audio/libcanberra/pkg/PFRAG.shared index 32997fb67ad..16f2e7f247e 100644 --- a/audio/libcanberra/pkg/PFRAG.shared +++ b/audio/libcanberra/pkg/PFRAG.shared @@ -1,8 +1,8 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2009/01/09 17:34:32 jakemsr Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.4 2009/03/05 08:11:56 ajacoutot Exp $ lib/gtk-2.0/modules/libcanberra-gtk-module.so +lib/libcanberra-0.11/libcanberra-gstreamer.so +lib/libcanberra-0.11/libcanberra-multi.so +lib/libcanberra-0.11/libcanberra-null.so +lib/libcanberra-0.11/libcanberra-sndio.so @lib lib/libcanberra-gtk.so.${LIBcanberra-gtk_VERSION} @lib lib/libcanberra.so.${LIBcanberra_VERSION} -lib/libcanberra/libcanberra-gstreamer.so -lib/libcanberra/libcanberra-multi.so -lib/libcanberra/libcanberra-null.so -lib/libcanberra/libcanberra-sndio.so diff --git a/audio/libcanberra/pkg/PLIST b/audio/libcanberra/pkg/PLIST index b5f370f816c..4973951412e 100644 --- a/audio/libcanberra/pkg/PLIST +++ b/audio/libcanberra/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2009/01/09 17:34:32 jakemsr Exp $ +@comment $OpenBSD: PLIST,v 1.6 2009/03/05 08:11:56 ajacoutot Exp $ %%SHARED%% @bin bin/canberra-gtk-play include/canberra-gtk.h @@ -6,20 +6,20 @@ include/canberra.h lib/gtk-2.0/ lib/gtk-2.0/modules/ lib/gtk-2.0/modules/libcanberra-gtk-module.a -lib/gtk-2.0/modules/libcanberra-gtk-module.la -lib/libcanberra/ +@comment lib/gtk-2.0/modules/libcanberra-gtk-module.la +lib/libcanberra-0.11/ +lib/libcanberra-0.11/libcanberra-gstreamer.a +@comment lib/libcanberra-0.11/libcanberra-gstreamer.la +lib/libcanberra-0.11/libcanberra-multi.a +@comment lib/libcanberra-0.11/libcanberra-multi.la +lib/libcanberra-0.11/libcanberra-null.a +@comment lib/libcanberra-0.11/libcanberra-null.la +lib/libcanberra-0.11/libcanberra-sndio.a +@comment lib/libcanberra-0.11/libcanberra-sndio.la lib/libcanberra-gtk.a lib/libcanberra-gtk.la lib/libcanberra.a lib/libcanberra.la -lib/libcanberra/libcanberra-gstreamer.a -lib/libcanberra/libcanberra-gstreamer.la -lib/libcanberra/libcanberra-multi.a -lib/libcanberra/libcanberra-multi.la -lib/libcanberra/libcanberra-null.a -lib/libcanberra/libcanberra-null.la -lib/libcanberra/libcanberra-sndio.a -lib/libcanberra/libcanberra-sndio.la lib/pkgconfig/libcanberra-gtk.pc lib/pkgconfig/libcanberra.pc share/doc/libcanberra/