[102155] trunk/dports/audio/libcanberra
ryandesign at macports.org
ryandesign at macports.org
Mon Jan 28 10:46:22 PST 2013
Revision: 102155
https://trac.macports.org/changeset/102155
Author: ryandesign at macports.org
Date: 2013-01-28 10:46:22 -0800 (Mon, 28 Jan 2013)
Log Message:
-----------
libcanberra: update to 0.29; use xz distfile; patch configure to work on OS X; explicitly disable features we don't need; fix livecheck
Modified Paths:
--------------
trunk/dports/audio/libcanberra/Portfile
trunk/dports/audio/libcanberra/files/LC_CTYPE.patch
trunk/dports/audio/libcanberra/files/patch-gtkquartz.diff
Added Paths:
-----------
trunk/dports/audio/libcanberra/files/patch-configure.diff
Modified: trunk/dports/audio/libcanberra/Portfile
===================================================================
--- trunk/dports/audio/libcanberra/Portfile 2013-01-28 18:42:25 UTC (rev 102154)
+++ trunk/dports/audio/libcanberra/Portfile 2013-01-28 18:46:22 UTC (rev 102155)
@@ -4,8 +4,7 @@
PortSystem 1.0
name libcanberra
-version 0.28
-revision 3
+version 0.29
license LGPL-2.1+
categories audio devel
maintainers nomaintainer
@@ -16,10 +15,10 @@
homepage http://0pointer.de/lennart/projects/libcanberra/
platforms darwin
master_sites ${homepage}
+use_xz yes
-checksums md5 c198b4811598c4c161ff505e4531b02c \
- sha1 2a41dae039df1fea98cfb71bd7ca34e57b6e8091 \
- rmd160 a351f048376d4c66bc0c1612188e8ffbfcec136b
+checksums rmd160 a1fe15a7ce0a63ab3e5cc312a34ffe575775c0c1 \
+ sha256 127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72
depends_build port:pkgconfig
@@ -28,11 +27,21 @@
port:libtool \
port:libvorbis
-patchfiles patch-gtkquartz.diff LC_CTYPE.patch
+patchfiles patch-configure.diff \
+ patch-gtkquartz.diff \
+ LC_CTYPE.patch
-configure.args --enable-gtk \
+configure.args --disable-alsa \
+ --disable-gtk-doc \
+ --disable-gtk3 \
+ --disable-oss \
+ --disable-lynx \
--disable-null \
- --disable-schemas-install
+ --disable-pulse \
+ --disable-silent-rules \
+ --disable-tdb \
+ --disable-udev \
+ --enable-gtk
post-activate {
system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
@@ -40,4 +49,4 @@
}
livecheck.type regex
-livecheck.regex {libcanberra-([0-9\.]+)\.tar\.gz}
+livecheck.regex libcanberra-(\[0-9.\]+)${extract.suffix}
Modified: trunk/dports/audio/libcanberra/files/LC_CTYPE.patch
===================================================================
--- trunk/dports/audio/libcanberra/files/LC_CTYPE.patch 2013-01-28 18:42:25 UTC (rev 102154)
+++ trunk/dports/audio/libcanberra/files/LC_CTYPE.patch 2013-01-28 18:46:22 UTC (rev 102155)
@@ -1,6 +1,5 @@
-diff -Naurp libcanberra-0.28.orig/doc/Makefile.am libcanberra-0.28/doc/Makefile.am
---- doc/Makefile.am 2010-06-13 11:09:32.000000000 -0700
-+++ doc/Makefile.am 2012-02-13 22:39:36.000000000 -0800
+--- doc/Makefile.am.orig 2010-06-13 13:09:32.000000000 -0500
++++ doc/Makefile.am 2013-01-28 00:28:46.000000000 -0600
@@ -24,7 +24,7 @@ CLEANFILES =
if USE_LYNX
@@ -10,10 +9,9 @@
CLEANFILES += README
endif
-diff -Naurp libcanberra-0.28.orig/doc/Makefile.in libcanberra-0.28/doc/Makefile.in
---- doc/Makefile.in 2011-02-24 14:06:51.000000000 -0800
-+++ doc/Makefile.in 2012-02-13 22:40:08.000000000 -0800
-@@ -449,7 +449,7 @@ uninstall-am:
+--- doc/Makefile.in.orig 2012-05-15 05:38:54.000000000 -0500
++++ doc/Makefile.in 2013-01-28 00:28:46.000000000 -0600
+@@ -455,7 +455,7 @@ uninstall-am:
@USE_LYNX_TRUE at README: README.html
Added: trunk/dports/audio/libcanberra/files/patch-configure.diff
===================================================================
--- trunk/dports/audio/libcanberra/files/patch-configure.diff (rev 0)
+++ trunk/dports/audio/libcanberra/files/patch-configure.diff 2013-01-28 18:46:22 UTC (rev 102155)
@@ -0,0 +1,51 @@
+--- configure.orig 2012-05-15 05:38:53.000000000 -0500
++++ configure 2013-01-28 12:16:16.000000000 -0600
+@@ -3323,12 +3323,6 @@
+ _ACEOF
+
+
+-if type -p stow > /dev/null && test -d /usr/local/stow ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***" >&5
+-$as_echo "$as_me: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***" >&6;}
+- ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+-fi
+-
+ #### Checks for programs. ####
+
+
+@@ -5599,9 +5593,7 @@
+
+
+
+- for flag in \
+- -Wl,--as-needed \
+- -Wl,--gc-sections; do
++ for flag in ; do
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar LDFLAGS" >&5
+ $as_echo_n "checking if $CC supports flag $flag in envvar LDFLAGS... " >&6; }
+--- configure.ac.orig 2012-05-15 05:09:53.000000000 -0500
++++ configure.ac 2013-01-28 12:16:16.000000000 -0600
+@@ -45,11 +45,6 @@
+ AC_CANONICAL_HOST
+ AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.])
+
+-if type -p stow > /dev/null && test -d /usr/local/stow ; then
+- AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
+- ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+-fi
+-
+ #### Checks for programs. ####
+
+ AC_PROG_MKDIR_P
+@@ -113,9 +108,7 @@
+ -fdata-sections])
+ AC_SUBST([WARNINGFLAGS], $with_cflags)
+
+-CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
+- -Wl,--as-needed \
+- -Wl,--gc-sections])
++CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [])
+ AC_SUBST([GCLDFLAGS], $with_ldflags)
+
+ #### libtool stuff ####
Modified: trunk/dports/audio/libcanberra/files/patch-gtkquartz.diff
===================================================================
--- trunk/dports/audio/libcanberra/files/patch-gtkquartz.diff 2013-01-28 18:42:25 UTC (rev 102154)
+++ trunk/dports/audio/libcanberra/files/patch-gtkquartz.diff 2013-01-28 18:46:22 UTC (rev 102155)
@@ -1,5 +1,5 @@
---- src/canberra-gtk-module.c
-+++ src/canberra-gtk-module.c
+--- src/canberra-gtk-module.c.orig 2012-05-15 05:23:57.000000000 -0500
++++ src/canberra-gtk-module.c 2013-01-28 00:28:46.000000000 -0600
@@ -25,8 +25,10 @@
#endif
@@ -19,7 +19,7 @@
static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
Atom type_return;
gint format_return;
-@@ -386,6 +389,19 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
+@@ -395,6 +398,19 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
return ret;
}
@@ -39,8 +39,8 @@
static void dispatch_sound_event(SoundEventData *d) {
int ret = CA_SUCCESS;
---- src/canberra-gtk.c
-+++ src/canberra-gtk.c
+--- src/canberra-gtk.c.orig 2010-09-28 08:55:03.000000000 -0500
++++ src/canberra-gtk.c 2013-01-28 00:28:46.000000000 -0600
@@ -26,8 +26,10 @@
#include <gtk/gtk.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130128/1ba1f2de/attachment.html>
More information about the macports-changes
mailing list