Update to 1.2.0. No user-visible changes.

This commit is contained in:
naddy 2014-05-27 19:44:56 +00:00
parent 92d2a5ad02
commit 04f5dc11d6
8 changed files with 35 additions and 43 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.51 2013/03/21 08:45:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.52 2014/05/27 19:44:56 naddy Exp $
COMMENT= portable audio output library
DISTNAME= libao-1.1.0
DISTNAME= libao-1.2.0
CATEGORIES= audio
HOMEPAGE= http://www.xiph.org/ao/
SHARED_LIBS= ao 5.0 # .4.0
HOMEPAGE= https://www.xiph.org/ao/
SHARED_LIBS= ao 5.0 # 5.0
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -27,6 +27,9 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static \
# disable sun audio detection
CONFIGURE_ENV= ac_cv_header_sys_audioio_h=no
# do not install
MAKE_FLAGS= ckport_DATA=""
pre-build:
@perl -i -pe 's:/etc/libao.conf:${SYSCONFDIR}/libao.conf:g' \
${WRKDIST}/include/ao/ao_private.h \

View File

@ -1,5 +1,2 @@
MD5 (libao-1.1.0.tar.gz) = KyUIwpvJfk3CGPoWLPiDyA==
RMD160 (libao-1.1.0.tar.gz) = N0B4r5JrsHRPsjAeEoocUnb99O4=
SHA1 (libao-1.1.0.tar.gz) = kwG8SIbxcMcSKrYmd/txzwAcBP0=
SHA256 (libao-1.1.0.tar.gz) = Kd5bubFya6iQRV735WLYd9+HgR/rsNme5pFkuIwXG9Q=
SIZE (libao-1.1.0.tar.gz) = 397102
SHA256 (libao-1.2.0.tar.gz) = A60jGtH51ktSR0OS1jwxGXsLx71BblixwQoyml7YnK8=
SIZE (libao-1.2.0.tar.gz) = 464596

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.12 2011/06/08 20:00:47 naddy Exp $
--- configure.orig Tue Feb 22 17:30:22 2011
+++ configure Wed Jun 8 15:48:58 2011
@@ -11082,9 +11082,9 @@ else
$OpenBSD: patch-configure,v 1.13 2014/05/27 19:44:56 naddy Exp $
--- configure.orig Mon Jan 27 18:10:36 2014
+++ configure Tue May 27 17:07:14 2014
@@ -12077,9 +12077,9 @@ else
PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
*)
PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
@ -14,7 +14,7 @@ $OpenBSD: patch-configure,v 1.12 2011/06/08 20:00:47 naddy Exp $
esac
fi
CFLAGS="$CFLAGS $cflags_save -DAO_BUILDING_LIBAO"
@@ -11127,8 +11127,8 @@ else
@@ -12120,8 +12120,8 @@ else
HAVE_LD_VERSION_SCRIPT_FALSE=
fi
@ -24,7 +24,7 @@ $OpenBSD: patch-configure,v 1.12 2011/06/08 20:00:47 naddy Exp $
# we link to libpthread just in case one of our plugins does
# in which case this is required to avoid problems on dlclose()
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
@@ -11176,7 +11176,7 @@ _ACEOF
@@ -12169,7 +12169,7 @@ _ACEOF
fi

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-doc_Makefile_in,v 1.10 2011/06/08 20:00:47 naddy Exp $
--- doc/Makefile.in.orig Tue Feb 22 23:54:29 2011
+++ doc/Makefile.in Wed Jun 8 15:48:58 2011
@@ -202,7 +202,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
$OpenBSD: patch-doc_Makefile_in,v 1.11 2014/05/27 19:44:56 naddy Exp $
--- doc/Makefile.in.orig Tue Jan 28 00:57:41 2014
+++ doc/Makefile.in Tue May 27 17:07:14 2014
@@ -257,7 +257,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_plugins_Makefile_in,v 1.6 2011/06/08 20:00:47 naddy Exp $
--- src/plugins/Makefile.in.orig Tue Feb 22 23:54:29 2011
+++ src/plugins/Makefile.in Wed Jun 8 15:48:58 2011
@@ -299,7 +299,7 @@ $(RECURSIVE_TARGETS):
$OpenBSD: patch-src_plugins_Makefile_in,v 1.7 2014/05/27 19:44:56 naddy Exp $
--- src/plugins/Makefile.in.orig Tue Jan 28 00:57:41 2014
+++ src/plugins/Makefile.in Tue May 27 17:06:54 2014
@@ -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) LIBTOOL="$(LIBTOOL) --tag=disable-static" $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \

View File

@ -1,15 +1,7 @@
$OpenBSD: patch-src_plugins_sndio_ao_sndio_c,v 1.2 2011/06/08 20:00:47 naddy Exp $
--- src/plugins/sndio/ao_sndio.c.orig Wed Jun 8 17:15:18 2011
+++ src/plugins/sndio/ao_sndio.c Wed Jun 8 17:27:00 2011
@@ -13,6 +13,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <string.h>
#include <sndio.h>
#include <ao/ao.h>
#include <ao/plugin.h>
@@ -97,6 +98,7 @@ int ao_plugin_set_option(ao_device *device, const char
$OpenBSD: patch-src_plugins_sndio_ao_sndio_c,v 1.3 2014/05/27 19:44:56 naddy Exp $
--- src/plugins/sndio/ao_sndio.c.orig Tue Feb 14 01:46:06 2012
+++ src/plugins/sndio/ao_sndio.c Tue May 27 17:07:14 2014
@@ -99,6 +99,7 @@ int ao_plugin_set_option(ao_device *device, const char
int ao_plugin_open(ao_device *device, ao_sample_format *format)
{
ao_sndio_internal *internal = (ao_sndio_internal *) device->internal;
@ -17,7 +9,7 @@ $OpenBSD: patch-src_plugins_sndio_ao_sndio_c,v 1.2 2011/06/08 20:00:47 naddy Exp
struct sio_par par;
if(!internal->dev && internal->id>=0){
@@ -105,21 +107,27 @@ int ao_plugin_open(ao_device *device, ao_sample_format
@@ -107,21 +108,27 @@ int ao_plugin_open(ao_device *device, ao_sample_format
internal->dev = strdup(buf);
}
@ -51,7 +43,7 @@ $OpenBSD: patch-src_plugins_sndio_ao_sndio_c,v 1.2 2011/06/08 20:00:47 naddy Exp
if(!device->inter_matrix){
/* set up matrix such that users are warned about > stereo playback */
@@ -146,9 +154,10 @@ int ao_plugin_close(ao_device *device)
@@ -148,9 +155,10 @@ int ao_plugin_close(ao_device *device)
ao_sndio_internal *internal = (ao_sndio_internal *) device->internal;
struct sio_hdl *hdl = internal->hdl;

View File

@ -1,6 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.14 2010/06/03 15:49:38 naddy Exp $
@comment $OpenBSD: PFRAG.shared,v 1.15 2014/05/27 19:44:56 naddy Exp $
lib/ao/
lib/ao/plugins-4/
@comment lib/ao/plugins-4/libsndio.la
lib/ao/plugins-4/libsndio.so
@lib lib/libao.so.${LIBao_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2008/12/30 21:59:55 naddy Exp $
@comment $OpenBSD: PLIST,v 1.11 2014/05/27 19:44:56 naddy Exp $
@pkgpath audio/libao,-main
@pkgpath audio/libao,no_arts
@pkgpath audio/libao,no_arts,no_esd
@ -9,6 +9,7 @@ include/ao/os_types.h
include/ao/plugin.h
lib/libao.a
lib/libao.la
@lib lib/libao.so.${LIBao_VERSION}
lib/pkgconfig/
lib/pkgconfig/ao.pc
@man man/man5/libao.conf.5