diff --git a/audio/libao/Makefile b/audio/libao/Makefile index d5c60ed0cb93..1a8a54c2fd43 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -2,19 +2,20 @@ # $FreeBSD$ PORTNAME= libao -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/ao/ MAINTAINER= naddy@FreeBSD.org COMMENT= Portable audio output library -USES= pathfix pkgconfig -USE_AUTOTOOLS= libtool +USES= libtool:keepla pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-arts +CONFIGURE_ARGS= --enable-static \ + --disable-arts +# do not install +MAKE_ARGS= ckport_DATA="" OPTIONS_DEFINE= DOCS ESOUND NAS PULSEAUDIO OPTIONS_SUB= yes diff --git a/audio/libao/distinfo b/audio/libao/distinfo index 45310e5b94f7..ea8ad2db4aa2 100644 --- a/audio/libao/distinfo +++ b/audio/libao/distinfo @@ -1,2 +1,2 @@ -SHA256 (libao-1.1.0.tar.gz) = 29de5bb9b1726ba890455ef7e562d877df87811febb0d99ee69164b88c171bd4 -SIZE (libao-1.1.0.tar.gz) = 397102 +SHA256 (libao-1.2.0.tar.gz) = 03ad231ad1f9d64b52474392d63c31197b0bc7bd416e58b1c10a329a5ed89caf +SIZE (libao-1.2.0.tar.gz) = 464596 diff --git a/audio/libao/files/patch-src_plugins_Makefile.in b/audio/libao/files/patch-src_plugins_Makefile.in index c61a61fb9a23..46544fb0962f 100644 --- a/audio/libao/files/patch-src_plugins_Makefile.in +++ b/audio/libao/files/patch-src_plugins_Makefile.in @@ -1,12 +1,11 @@ -$FreeBSD$ ---- src/plugins/Makefile.in.orig 2010-06-05 15:49:54.000000000 +0200 -+++ src/plugins/Makefile.in 2010-06-05 15:50:28.000000000 +0200 -@@ -295,7 +295,7 @@ $(RECURSIVE_TARGETS): +--- src/plugins/Makefile.in.orig 2014-05-28 16:19:02.000000000 +0200 ++++ src/plugins/Makefile.in 2014-05-28 16:25:33.000000000 +0200 +@@ -388,7 +388,7 @@ $(am__recursive_targets): else \ local_target="$$target"; \ fi; \ -- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) LIBTOOL="$(LIBTOOL) --tag=disable-static" $$local_target) \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) AM_LIBTOOLFLAGS="--tag=disable-static" $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ diff --git a/audio/libao/files/patch-src_plugins_pulse_Makefile.in b/audio/libao/files/patch-src_plugins_pulse_Makefile.in new file mode 100644 index 000000000000..4bb6c61f7a9d --- /dev/null +++ b/audio/libao/files/patch-src_plugins_pulse_Makefile.in @@ -0,0 +1,11 @@ +--- src/plugins/pulse/Makefile.in.orig 2014-05-28 17:53:30.000000000 +0200 ++++ src/plugins/pulse/Makefile.in 2014-05-28 17:58:05.000000000 +0200 +@@ -348,7 +348,7 @@ AUTOMAKE_OPTIONS = foreign + @HAVE_PULSE_TRUE@pulseltlibs = libpulse.la + @HAVE_PULSE_FALSE@pulsesources = + @HAVE_PULSE_TRUE@pulsesources = ao_pulse.c +-INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include ++INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include @PULSE_CFLAGS@ + lib_LTLIBRARIES = $(pulseltlibs) + libpulse_la_LDFLAGS = @PLUGIN_LDFLAGS@ + libpulse_la_LIBADD = @PULSE_LIBS@ diff --git a/audio/libao/pkg-descr b/audio/libao/pkg-descr index 24468732d9d0..977a7cf2c607 100644 --- a/audio/libao/pkg-descr +++ b/audio/libao/pkg-descr @@ -8,8 +8,7 @@ On FreeBSD, it currently supports: * OSS (Open Sound System) And optionally: * ESD (ESounD or Enlightened Sound Daemon) - * aRts (KDE sound server) * NAS (Network Audio System) * PulseAudio -WWW: http://www.xiph.org/ao/ +WWW: https://www.xiph.org/ao/ diff --git a/audio/libao/pkg-plist b/audio/libao/pkg-plist index a9f2129135d1..0c970c3f07de 100644 --- a/audio/libao/pkg-plist +++ b/audio/libao/pkg-plist @@ -5,6 +5,7 @@ lib/libao.a lib/libao.la lib/libao.so lib/libao.so.4 +lib/libao.so.4.1.0 lib/ao/plugins-4/liboss.la lib/ao/plugins-4/liboss.so %%ESOUND%%lib/ao/plugins-4/libesd.la