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

- update to libcanberra-0.11

Browse Source
This commit is contained in:
ajacoutot 2009-03-05 08:11:56 +00:00
parent 98bfd8bccc
commit 125249f02d
8 changed files with 91 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
audio/libcanberra/Makefile
View File

@ -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. COMMENT= implementation of the Freedesktop sound theme spec.
DISTNAME= libcanberra-0.10 DISTNAME= libcanberra-0.11
PKGNAME= ${DISTNAME}p2 SHARED_LIBS += canberra 1.0 # .1.4
SHARED_LIBS += canberra 0.1 # .1.3
SHARED_LIBS += canberra-gtk 0.0 # .0.4 SHARED_LIBS += canberra-gtk 0.0 # .0.4
CATEGORIES= audio devel CATEGORIES= audio devel
@ -50,11 +49,15 @@ CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/libcanb
--disable-oss \ --disable-oss \
--disable-alsa \ --disable-alsa \
--disable-pulse \ --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" \ CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include" CPPFLAGS="-I${LOCALBASE}/include"
post-patch: pre-configure:
cp ${FILESDIR}/sndio.c ${WRKSRC}/src cp ${FILESDIR}/sndio.c ${WRKSRC}/src
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal -I m4 AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal -I m4

10
audio/libcanberra/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libcanberra-0.10.tar.gz) = JiM3C/zsruyuuF5exEXzQA== MD5 (libcanberra-0.11.tar.gz) = xmHbFMsLH+m2lj3vrMO7pg==
RMD160 (libcanberra-0.10.tar.gz) = m8VrBdrbai/hhMymk5bGk7mkTO4= RMD160 (libcanberra-0.11.tar.gz) = d6OOwS0Mnl8u5GD8IVApioHllcc=
SHA1 (libcanberra-0.10.tar.gz) = 3+GuQEuUlNi0sWNlittoi6AAi+w= SHA1 (libcanberra-0.11.tar.gz) = AJsMkUlwv28PoZFYSDtvff33Ah8=
SHA256 (libcanberra-0.10.tar.gz) = sOPLWeYFQSpSNSz5zzY0SxZUY9TmWRbJXetz/FGDgnI= SHA256 (libcanberra-0.11.tar.gz) = 6nwnMeMcd82qKhMZ3/O/nk7ialHprejS3sMUfCjOLm0=
SIZE (libcanberra-0.10.tar.gz) = 826222 SIZE (libcanberra-0.11.tar.gz) = 530273

2
audio/libcanberra/files/sndio.c
View File

@ -167,7 +167,7 @@ int driver_destroy(ca_context *c) {
return CA_SUCCESS; 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, CA_ERROR_INVALID);
ca_return_val_if_fail(c->private, CA_ERROR_STATE); ca_return_val_if_fail(c->private, CA_ERROR_STATE);

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

@ -1,11 +1,11 @@
$OpenBSD: patch-Makefile_am,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ $OpenBSD: patch-Makefile_am,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $
--- Makefile.am.orig Fri Dec 26 16:32:45 2008 --- Makefile.am.orig Tue Mar 3 09:16:19 2009
+++ Makefile.am Fri Dec 26 16:32:45 2008 +++ Makefile.am Tue Mar 3 09:16:33 2009
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
dist_doc_DATA = README dist_doc_DATA = README
EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
-SUBDIRS = src gtkdoc libltdl doc -SUBDIRS = libltdl src gtkdoc doc
+SUBDIRS = src gtkdoc doc +SUBDIRS = src gtkdoc doc
MAINTAINERCLEANFILES = README MAINTAINERCLEANFILES = README

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

@ -1,16 +1,32 @@
$OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $
--- configure.ac.orig Fri Dec 26 14:54:31 2008 --- configure.ac.orig Wed Jan 21 21:59:28 2009
+++ configure.ac Fri Dec 26 15:05:18 2008 +++ configure.ac Tue Mar 3 09:32:42 2009
@@ -70,7 +70,7 @@ AC_LIBTOOL_WIN32_DLL @@ -19,14 +19,14 @@
AC_PROG_LIBTOOL # License along with libcanberra. If not, see
AC_SUBST(LTDLINCL) # <http://www.gnu.org/licenses/>.
AC_SUBST(LIBLTDL)
-AC_CONFIG_SUBDIRS(libltdl)
+dnl AC_CONFIG_SUBDIRS(libltdl)
#### 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 HAVE_OSS=0
fi fi
@ -47,7 +63,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $
### PulseAudio (optional) #### ### PulseAudio (optional) ####
AC_ARG_ENABLE([pulse], AC_ARG_ENABLE([pulse],
@@ -454,6 +484,7 @@ BUILTIN_DSO=0 @@ -451,6 +480,7 @@ BUILTIN_DSO=0
BUILTIN_PULSE=0 BUILTIN_PULSE=0
BUILTIN_ALSA=0 BUILTIN_ALSA=0
BUILTIN_OSS=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_GSTREAMER=0
BUILTIN_NULL=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 BUILTIN_PULSE=1
HAVE_ALSA=0 HAVE_ALSA=0
HAVE_OSS=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_GSTREAMER=0
HAVE_NULL=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 BUILTIN_ALSA=1
HAVE_OSS=0 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_PULSE=0
HAVE_GSTREAMER=0 HAVE_GSTREAMER=0
HAVE_NULL=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 BUILTIN_GSTREAMER=1
HAVE_ALSA=0 HAVE_ALSA=0
HAVE_OSS=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_PULSE=0
HAVE_NULL=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 HAVE_NULL=0
;; ;;
@ -99,15 +121,15 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $
xnull) xnull)
if test "x$HAVE_NULL" != x1 ; then if test "x$HAVE_NULL" != x1 ; then
AC_MSG_ERROR([*** Null output selected for builtin driver, but not enabled. ***]) AC_MSG_ERROR([*** Null output selected for builtin driver, but not enabled. ***])
@@ -515,6 +562,7 @@ case "x$with_builtin" in fi
HAVE_PULSE=0
BUILTIN_NULL=1
- HAVE_PULSE=0
+ HAVE_SNDIO=0
HAVE_ALSA=0 HAVE_ALSA=0
HAVE_OSS=0 HAVE_OSS=0
+ HAVE_SNDIO=0
HAVE_GSTREAMER=0 HAVE_GSTREAMER=0
;; @@ -525,7 +572,7 @@ case "x$with_builtin" in
@@ -528,7 +576,7 @@ case "x$with_builtin" in
AC_MSG_ERROR([*** Unknown driver $with_builtin selected for builtin ***]) AC_MSG_ERROR([*** Unknown driver $with_builtin selected for builtin ***])
esac 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. ***]) AC_MSG_ERROR([*** No backend enabled. ***])
fi fi
@@ -536,23 +584,27 @@ AC_SUBST(HAVE_DSO) @@ -533,23 +580,27 @@ AC_SUBST(HAVE_DSO)
AC_SUBST(HAVE_PULSE) AC_SUBST(HAVE_PULSE)
AC_SUBST(HAVE_ALSA) AC_SUBST(HAVE_ALSA)
AC_SUBST(HAVE_OSS) 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_GSTREAMER], [test "x$BUILTIN_GSTREAMER" = x1])
AM_CONDITIONAL([BUILTIN_NULL], [test "x$BUILTIN_NULL" = 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 ENABLE_BUILTIN_OSS=yes
fi fi
@ -160,7 +182,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/01/09 17:34:32 jakemsr Exp $
ENABLE_GSTREAMER=no ENABLE_GSTREAMER=no
if test "x$HAVE_GSTREAMER" = "x1" ; then if test "x$HAVE_GSTREAMER" = "x1" ; then
ENABLE_GSTREAMER=yes ENABLE_GSTREAMER=yes
@@ -656,6 +717,8 @@ echo " @@ -654,6 +714,8 @@ echo "
Builtin ALSA: ${ENABLE_BUILTIN_ALSA} Builtin ALSA: ${ENABLE_BUILTIN_ALSA}
Enable OSS: ${ENABLE_OSS} Enable OSS: ${ENABLE_OSS}
Builtin OSS: ${ENABLE_BUILTIN_OSS} Builtin OSS: ${ENABLE_BUILTIN_OSS}

15
audio/libcanberra/patches/patch-gtk-doc_make → audio/libcanberra/patches/patch-gtkdoc_gtk-doc_make
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gtk-doc_make,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ $OpenBSD: patch-gtkdoc_gtk-doc_make,v 1.1 2009/03/05 08:11:56 ajacoutot Exp $
--- gtk-doc.make.orig Wed Aug 13 10:54:07 2008 --- gtkdoc/gtk-doc.make.orig Wed Jan 21 22:02:53 2009
+++ gtk-doc.make Fri Dec 26 16:30:26 2008 +++ gtkdoc/gtk-doc.make Tue Mar 3 09:27:23 2009
@@ -4,13 +4,13 @@ @@ -4,15 +4,15 @@
# Everything below here is generic # # 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 +#if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +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_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN = $(LIBTOOL) --mode=execute
-else -else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = sh -c
-endif -endif
+#else +#else
+#GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +#GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+#GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +#GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+#GTKDOC_RUN = sh -c
+#endif +#endif
# We set GPATH here; this gives us semantics for GNU make # We set GPATH here; this gives us semantics for GNU make
# which are more like other make's VPATH, when it comes to # 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) 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 docs: html-build.stamp
@@ -134,13 +134,13 @@ uninstall-local: @@ -157,13 +157,13 @@ uninstall-local:
# #
# Require gtk-doc when making dist # Require gtk-doc when making dist
# #

10
audio/libcanberra/pkg/PFRAG.shared
View File

@ -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/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-gtk.so.${LIBcanberra-gtk_VERSION}
@lib lib/libcanberra.so.${LIBcanberra_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

22
audio/libcanberra/pkg/PLIST
View File

@ -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%% %%SHARED%%
@bin bin/canberra-gtk-play @bin bin/canberra-gtk-play
include/canberra-gtk.h include/canberra-gtk.h
@ -6,20 +6,20 @@ include/canberra.h
lib/gtk-2.0/ lib/gtk-2.0/
lib/gtk-2.0/modules/ lib/gtk-2.0/modules/
lib/gtk-2.0/modules/libcanberra-gtk-module.a lib/gtk-2.0/modules/libcanberra-gtk-module.a
lib/gtk-2.0/modules/libcanberra-gtk-module.la @comment lib/gtk-2.0/modules/libcanberra-gtk-module.la
lib/libcanberra/ 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.a
lib/libcanberra-gtk.la lib/libcanberra-gtk.la
lib/libcanberra.a lib/libcanberra.a
lib/libcanberra.la 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-gtk.pc
lib/pkgconfig/libcanberra.pc lib/pkgconfig/libcanberra.pc
share/doc/libcanberra/ share/doc/libcanberra/