From 66aab2709598aa6a7e8f5af1d561dddccb2d59eb Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 12 Jul 2009 20:00:27 +0000 Subject: [PATCH] - update to libcanberra-0.14 - take maintainer ok jasper@ --- audio/libcanberra/Makefile | 88 ++++++++++--------- audio/libcanberra/distinfo | 10 +-- audio/libcanberra/patches/patch-Makefile_am | 12 --- audio/libcanberra/patches/patch-configure_ac | 51 +++++------ .../libcanberra/patches/patch-src_Makefile_am | 8 +- audio/libcanberra/pkg/PFRAG.shared | 10 +-- audio/libcanberra/pkg/PLIST | 22 ++--- 7 files changed, 96 insertions(+), 105 deletions(-) delete mode 100644 audio/libcanberra/patches/patch-Makefile_am diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 338c3332cac..635c20cd132 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -1,14 +1,18 @@ -# $OpenBSD: Makefile,v 1.9 2009/06/11 18:27:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2009/07/12 20:00:27 ajacoutot Exp $ -COMMENT= implementation of the Freedesktop sound theme spec. +COMMENT= implementation of the Freedesktop sound theme spec. + +V= 0.14 +DISTNAME= libcanberra-${V} -DISTNAME= libcanberra-0.11 -PKGNAME= ${DISTNAME}p2 SHARED_LIBS += canberra 1.0 # .1.4 SHARED_LIBS += canberra-gtk 0.0 # .0.4 -CATEGORIES= audio devel -HOMEPAGE= http://0pointer.de/lennart/projects/libcanberra/ +CATEGORIES= audio devel + +HOMEPAGE= http://0pointer.de/lennart/projects/libcanberra/ + +MAINTAINER= Antoine Jacoutot # LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes @@ -16,49 +20,47 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${HOMEPAGE} +MASTER_SITES= ${HOMEPAGE} -WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ - Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \ - freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \ - gthread-2.0 m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - pcre pixman-1 png pthread sndio xml2 z +WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig +WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 +WANTLIB += gthread-2.0 m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB += pcre pixman-1 png pthread sndio xml2 z -MODULES= devel/gettext \ - devel/gconf2 +MODULES= devel/gettext \ + devel/gconf2 -MODGCONF2_SCHEMAS_DIR= libcanberra -MODGCONF2_LIBDEP= No +MODGCONF2_SCHEMAS_DIR= libcanberra +MODGCONF2_LIBDEP= No -AUTOCONF_VERSION= 2.62 -AUTOMAKE_VERSION= 1.9 -BUILD_DEPENDS= ${RUN_DEPENDS} \ - ${MODGNU_AUTOCONF_DEPENDS} \ - ${MODGNU_AUTOMAKE_DEPENDS} -RUN_DEPENDS= ::devel/gconf2 -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 +SUBST_VARS= V -USE_X11= Yes -USE_LIBTOOL= Yes -USE_GMAKE= Yes +AUTOCONF_VERSION= 2.62 +AUTOMAKE_VERSION= 1.9 +BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \ + ${MODGNU_AUTOMAKE_DEPENDS} +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 -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --localstatedir="/var" \ - --enable-sndio \ - --enable-gstreamer \ - --disable-oss \ - --disable-alsa \ - --disable-pulse \ - --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" +USE_X11= Yes +USE_LIBTOOL= Yes +USE_GMAKE= Yes + +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --localstatedir="/var" \ + --enable-sndio \ + --enable-gstreamer \ + --disable-oss \ + --disable-alsa \ + --disable-pulse \ + --disable-tdb +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" pre-configure: cp ${FILESDIR}/sndio.c ${WRKSRC}/src diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo index 2f126711bdf..e716520a0b8 100644 --- a/audio/libcanberra/distinfo +++ b/audio/libcanberra/distinfo @@ -1,5 +1,5 @@ -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 +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 diff --git a/audio/libcanberra/patches/patch-Makefile_am b/audio/libcanberra/patches/patch-Makefile_am deleted file mode 100644 index 1216682645e..00000000000 --- a/audio/libcanberra/patches/patch-Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ -$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 = libltdl src gtkdoc doc -+SUBDIRS = src gtkdoc doc - - MAINTAINERCLEANFILES = README - noinst_DATA = README diff --git a/audio/libcanberra/patches/patch-configure_ac b/audio/libcanberra/patches/patch-configure_ac index bd0317a425d..8ea6ae797ca 100644 --- a/audio/libcanberra/patches/patch-configure_ac +++ b/audio/libcanberra/patches/patch-configure_ac @@ -1,14 +1,14 @@ -$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 - # . +$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 +@@ -23,14 +23,14 @@ m4_define([ca_major],[0]) + m4_define([ca_minor],[14]) + m4_define([ca_version],[ca_major.ca_minor]) -AC_PREREQ(2.63) +AC_PREREQ(2.62) - AC_INIT([libcanberra], 0.11, [mzyvopnaoreen (at) 0pointer (dot) de]) + AC_INIT([libcanberra],[ca_version],[mzyvopnaoreen (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/common.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR(m4) @@ -18,15 +18,16 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libcanberra/]) -@@ -65,7 +65,6 @@ done +@@ -89,7 +89,7 @@ dnl can give the proper place to find libltdl through + dnl variables like LDFLAGS and CPPFLAGS. - #### libtool stuff #### - LT_PREREQ(2.2) --LT_CONFIG_LTDL_DIR([libltdl]) - LT_INIT([dlopen win32-dll disable-static]) - LTDL_INIT([convenience recursive]) + AC_CHECK_HEADER([ltdl.h], +- [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])], ++ [AC_CHECK_LIB([ltdl], [lt_dlopen], [LIBLTDL=-lltdl], [LIBLTDL=])], + [LIBLTDL=]) -@@ -230,6 +229,36 @@ else + AS_IF([test "x$LIBLTDL" = "x"], +@@ -244,6 +244,36 @@ else HAVE_OSS=0 fi @@ -63,7 +64,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ ### PulseAudio (optional) #### AC_ARG_ENABLE([pulse], -@@ -451,6 +480,7 @@ BUILTIN_DSO=0 +@@ -466,6 +496,7 @@ BUILTIN_DSO=0 BUILTIN_PULSE=0 BUILTIN_ALSA=0 BUILTIN_OSS=0 @@ -71,7 +72,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ BUILTIN_GSTREAMER=0 BUILTIN_NULL=0 -@@ -463,6 +493,7 @@ case "x$with_builtin" in +@@ -478,6 +509,7 @@ case "x$with_builtin" in BUILTIN_PULSE=1 HAVE_ALSA=0 HAVE_OSS=0 @@ -79,7 +80,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ HAVE_GSTREAMER=0 HAVE_NULL=0 ;; -@@ -474,6 +505,7 @@ case "x$with_builtin" in +@@ -489,6 +521,7 @@ case "x$with_builtin" in BUILTIN_ALSA=1 HAVE_OSS=0 @@ -87,7 +88,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ HAVE_PULSE=0 HAVE_GSTREAMER=0 HAVE_NULL=0 -@@ -487,6 +519,7 @@ case "x$with_builtin" in +@@ -502,6 +535,7 @@ case "x$with_builtin" in BUILTIN_GSTREAMER=1 HAVE_ALSA=0 HAVE_OSS=0 @@ -95,7 +96,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ HAVE_PULSE=0 HAVE_NULL=0 ;; -@@ -498,18 +531,32 @@ case "x$with_builtin" in +@@ -513,11 +547,25 @@ case "x$with_builtin" in BUILTIN_OSS=1 HAVE_ALSA=0 @@ -121,15 +122,15 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ xnull) if test "x$HAVE_NULL" != x1 ; then AC_MSG_ERROR([*** Null output selected for builtin driver, but not enabled. ***]) - fi +@@ -525,6 +573,7 @@ case "x$with_builtin" in BUILTIN_NULL=1 -- HAVE_PULSE=0 + HAVE_PULSE=0 + HAVE_SNDIO=0 HAVE_ALSA=0 HAVE_OSS=0 HAVE_GSTREAMER=0 -@@ -525,7 +572,7 @@ case "x$with_builtin" in +@@ -540,7 +589,7 @@ case "x$with_builtin" in AC_MSG_ERROR([*** Unknown driver $with_builtin selected for builtin ***]) esac @@ -138,7 +139,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ AC_MSG_ERROR([*** No backend enabled. ***]) fi -@@ -533,23 +580,27 @@ AC_SUBST(HAVE_DSO) +@@ -548,23 +597,27 @@ AC_SUBST(HAVE_DSO) AC_SUBST(HAVE_PULSE) AC_SUBST(HAVE_ALSA) AC_SUBST(HAVE_OSS) @@ -166,7 +167,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ AM_CONDITIONAL([BUILTIN_GSTREAMER], [test "x$BUILTIN_GSTREAMER" = x1]) AM_CONDITIONAL([BUILTIN_NULL], [test "x$BUILTIN_NULL" = x1]) -@@ -604,6 +655,15 @@ if test "x$BUILTIN_OSS" = "x1" ; then +@@ -622,6 +675,15 @@ if test "x$BUILTIN_OSS" = "x1" ; then ENABLE_BUILTIN_OSS=yes fi @@ -182,7 +183,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/03/05 08:11:56 ajacoutot Exp $ ENABLE_GSTREAMER=no if test "x$HAVE_GSTREAMER" = "x1" ; then ENABLE_GSTREAMER=yes -@@ -654,6 +714,8 @@ echo " +@@ -672,6 +734,8 @@ echo " Builtin ALSA: ${ENABLE_BUILTIN_ALSA} Enable OSS: ${ENABLE_OSS} Builtin OSS: ${ENABLE_BUILTIN_OSS} diff --git a/audio/libcanberra/patches/patch-src_Makefile_am b/audio/libcanberra/patches/patch-src_Makefile_am index 97b110adbce..26db85524ed 100644 --- a/audio/libcanberra/patches/patch-src_Makefile_am +++ b/audio/libcanberra/patches/patch-src_Makefile_am @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_am,v 1.1 2009/01/09 17:34:32 jakemsr Exp $ ---- src/Makefile.am.orig Fri Dec 26 14:40:20 2008 -+++ src/Makefile.am Fri Dec 26 15:06:49 2008 -@@ -207,6 +207,36 @@ libcanberra_oss_la_LDFLAGS = \ +$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 = \ endif endif diff --git a/audio/libcanberra/pkg/PFRAG.shared b/audio/libcanberra/pkg/PFRAG.shared index 16f2e7f247e..2c77a51fbed 100644 --- a/audio/libcanberra/pkg/PFRAG.shared +++ b/audio/libcanberra/pkg/PFRAG.shared @@ -1,8 +1,8 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2009/03/05 08:11:56 ajacoutot Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.5 2009/07/12 20:00:27 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/libcanberra-${V}/libcanberra-gstreamer.so +lib/libcanberra-${V}/libcanberra-multi.so +lib/libcanberra-${V}/libcanberra-null.so +lib/libcanberra-${V}/libcanberra-sndio.so @lib lib/libcanberra-gtk.so.${LIBcanberra-gtk_VERSION} @lib lib/libcanberra.so.${LIBcanberra_VERSION} diff --git a/audio/libcanberra/pkg/PLIST b/audio/libcanberra/pkg/PLIST index 6d9b5184fbe..877c3a94f6a 100644 --- a/audio/libcanberra/pkg/PLIST +++ b/audio/libcanberra/pkg/PLIST @@ -1,21 +1,21 @@ -@comment $OpenBSD: PLIST,v 1.7 2009/06/07 05:30:09 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.8 2009/07/12 20:00:27 ajacoutot Exp $ %%SHARED%% @bin bin/canberra-gtk-play include/canberra-gtk.h include/canberra.h lib/gtk-2.0/ lib/gtk-2.0/modules/ -lib/gtk-2.0/modules/libcanberra-gtk-module.a +@comment lib/gtk-2.0/modules/libcanberra-gtk-module.a @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-${V}/ +@comment lib/libcanberra-${V}/libcanberra-gstreamer.a +@comment lib/libcanberra-${V}/libcanberra-gstreamer.la +@comment lib/libcanberra-${V}/libcanberra-multi.a +@comment lib/libcanberra-${V}/libcanberra-multi.la +@comment lib/libcanberra-${V}/libcanberra-null.a +@comment lib/libcanberra-${V}/libcanberra-null.la +@comment lib/libcanberra-${V}/libcanberra-sndio.a +@comment lib/libcanberra-${V}/libcanberra-sndio.la lib/libcanberra-gtk.a lib/libcanberra-gtk.la lib/libcanberra.a