[Midnightbsd-cvs] mports [17370] trunk/audio/libao: libao 1.2.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Sep 19 18:46:38 EDT 2014 

Revision: 17370
          http://svnweb.midnightbsd.org/mports/?rev=17370
Author:   laffer1
Date:     2014-09-19 18:46:37 -0400 (Fri, 19 Sep 2014)
Log Message:
-----------
libao 1.2.0

Modified Paths:
--------------
    trunk/audio/libao/Makefile
    trunk/audio/libao/distinfo
    trunk/audio/libao/files/patch-configure
    trunk/audio/libao/files/patch-doc_Makefile.in
    trunk/audio/libao/files/patch-src_plugins_Makefile.in
    trunk/audio/libao/pkg-descr
    trunk/audio/libao/pkg-plist

Added Paths:
-----------
    trunk/audio/libao/files/patch-src_plugins_pulse_Makefile.in

Removed Paths:
-------------
    trunk/audio/libao/files/patch-Makefile.in

Property Changed:
----------------
    trunk/audio/libao/files/patch-configure
    trunk/audio/libao/files/patch-doc_Makefile.in
    trunk/audio/libao/files/patch-src_plugins_Makefile.in

Modified: trunk/audio/libao/Makefile
===================================================================
--- trunk/audio/libao/Makefile	2014-09-19 21:34:31 UTC (rev 17369)
+++ trunk/audio/libao/Makefile	2014-09-19 22:46:37 UTC (rev 17370)
@@ -5,7 +5,7 @@
 # $MidnightBSD$
 
 PORTNAME=	libao
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.0
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/ao/
 
@@ -14,55 +14,26 @@
 
 LICENSE=	gpl2
 
-USE_AUTOTOOLS=	libtool
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig libtool:keepla
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--enable-static \
+		--disable-arts
+# do not install
+MAKE_ARGS=	ckport_DATA=""
 
-MAN5=		libao.conf.5
+OPTIONS_DEFINE=	DOCS ESOUND NAS PULSEAUDIO
+OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	DOCS ARTS ESOUND NAS PULSEAUDIO
+NAS_LIB_DEPENDS=libaudio.so:${PORTSDIR}/audio/nas
+NAS_CONFIGURE_ENABLE=	nas
 
-.include <bsd.mport.options.mk>
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
-.if ${PORT_OPTIONS:MDOCS}
-MAKE_ENV=	DOC=doc
-.else
-MAKE_ENV=	DOC=""
-.endif
+ESOUND_CONFIGURE_ENABLE=esd
+ESOUND_USE=	GNOME=esound
 
-.if ${PORT_OPTIONS:MARTS}
-LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-PLIST_SUB+=	ARTS=""
-.else
-CONFIGURE_ARGS+=--disable-arts
-PLIST_SUB+=	ARTS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MESOUND}
-USE_GNOME+=	esound
-PLIST_SUB+=	ESOUND=""
-.else
-CONFIGURE_ARGS+=--disable-esd
-PLIST_SUB+=	ESOUND="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNAS}
-LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
-PLIST_SUB+=	NAS=""
-.else
-CONFIGURE_ARGS+=--disable-nas
-PLIST_SUB+=	NAS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse-simple.0:${PORTSDIR}/audio/pulseaudio
-PLIST_SUB+=	PULSEAUDIO=""
-.else
-CONFIGURE_ARGS+=--disable-pulse
-PLIST_SUB+=	PULSEAUDIO="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/libao.conf|${PREFIX}&|' \
 		${WRKSRC}/libao.conf.5 ${WRKSRC}/include/ao/ao_private.h \

Modified: trunk/audio/libao/distinfo
===================================================================
--- trunk/audio/libao/distinfo	2014-09-19 21:34:31 UTC (rev 17369)
+++ trunk/audio/libao/distinfo	2014-09-19 22:46:37 UTC (rev 17370)
@@ -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

Deleted: trunk/audio/libao/files/patch-Makefile.in
===================================================================
--- trunk/audio/libao/files/patch-Makefile.in	2014-09-19 21:34:31 UTC (rev 17369)
+++ trunk/audio/libao/files/patch-Makefile.in	2014-09-19 22:46:37 UTC (rev 17370)
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	2007-07-14 18:06:32.000000000 -0400
-+++ Makefile.in	2007-07-14 18:06:52.000000000 -0400
-@@ -225,7 +225,7 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
--SUBDIRS = src include doc
-+SUBDIRS = src include $(DOC)
- m4datadir = $(datadir)/aclocal
- m4data_DATA = ao.m4
- pkgconfigdir = $(prefix)/libdata/pkgconfig

Modified: trunk/audio/libao/files/patch-configure
===================================================================
--- trunk/audio/libao/files/patch-configure	2014-09-19 21:34:31 UTC (rev 17369)
+++ trunk/audio/libao/files/patch-configure	2014-09-19 22:46:37 UTC (rev 17370)
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: head/audio/libao/files/patch-configure 340725 2014-01-22 17:40:44Z mat $
 
 --- configure.orig	2011-06-08 21:32:18.000000000 +0200
 +++ configure	2011-06-08 21:32:18.000000000 +0200


Property changes on: trunk/audio/libao/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Modified: trunk/audio/libao/files/patch-doc_Makefile.in
===================================================================
--- trunk/audio/libao/files/patch-doc_Makefile.in	2014-09-19 21:34:31 UTC (rev 17369)
+++ trunk/audio/libao/files/patch-doc_Makefile.in	2014-09-19 22:46:37 UTC (rev 17370)
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: head/audio/libao/files/patch-doc_Makefile.in 340725 2014-01-22 17:40:44Z mat $
 
 --- doc/Makefile.in.orig
 +++ doc/Makefile.in


Property changes on: trunk/audio/libao/files/patch-doc_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/audio/libao/files/patch-src_plugins_Makefile.in
===================================================================
--- trunk/audio/libao/files/patch-src_plugins_Makefile.in	2014-09-19 21:34:31 UTC (rev 17369)
+++ trunk/audio/libao/files/patch-src_plugins_Makefile.in	2014-09-19 22:46:37 UTC (rev 17370)
@@ -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 \


Property changes on: trunk/audio/libao/files/patch-src_plugins_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: trunk/audio/libao/files/patch-src_plugins_pulse_Makefile.in
===================================================================
--- trunk/audio/libao/files/patch-src_plugins_pulse_Makefile.in	                        (rev 0)
+++ trunk/audio/libao/files/patch-src_plugins_pulse_Makefile.in	2014-09-19 22:46:37 UTC (rev 17370)
@@ -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 at pulseltlibs = libpulse.la
+ @HAVE_PULSE_FALSE at pulsesources = 
+ @HAVE_PULSE_TRUE at 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@

Modified: trunk/audio/libao/pkg-descr
===================================================================
--- trunk/audio/libao/pkg-descr	2014-09-19 21:34:31 UTC (rev 17369)
+++ trunk/audio/libao/pkg-descr	2014-09-19 22:46:37 UTC (rev 17370)
@@ -1,12 +1,14 @@
 libao is a cross-platform audio library that allows programs to
 output audio using a simple API on a wide variety of platforms.
-It currently supports:
+On FreeBSD, it currently supports:
    * null output
    * raw output
    * AU files
    * WAV files
    * 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/

Modified: trunk/audio/libao/pkg-plist
===================================================================
--- trunk/audio/libao/pkg-plist	2014-09-19 21:34:31 UTC (rev 17369)
+++ trunk/audio/libao/pkg-plist	2014-09-19 22:46:37 UTC (rev 17370)
@@ -5,8 +5,6 @@
 lib/libao.la
 lib/libao.so
 lib/libao.so.4
-%%ARTS%%lib/ao/plugins-4/libarts.la
-%%ARTS%%lib/ao/plugins-4/libarts.so
 lib/ao/plugins-4/liboss.la
 lib/ao/plugins-4/liboss.so
 %%ESOUND%%lib/ao/plugins-4/libesd.la
@@ -16,6 +14,7 @@
 %%PULSEAUDIO%%lib/ao/plugins-4/libpulse.la
 %%PULSEAUDIO%%lib/ao/plugins-4/libpulse.so
 libdata/pkgconfig/ao.pc
+man/man5/libao.conf.5.gz
 share/aclocal/ao.m4
 %%PORTDOCS%%%%DOCSDIR%%/ao_append_option.html
 %%PORTDOCS%%%%DOCSDIR%%/ao_close.html

More information about the Midnightbsd-cvs mailing list