svn commit: r364447 - in head/audio: alsa-lib alsa-lib/files alsa-lib/files/linux alsa-plugins alsa-plugins/files alsa-utils alsa-utils/files
John Marino
marino at FreeBSD.org
Sat Aug 9 15:20:41 UTC 2014
Author: marino
Date: Sat Aug 9 15:20:35 2014
New Revision: 364447
URL: http://svnweb.freebsd.org/changeset/ports/364447
QAT: https://qat.redports.org/buildarchive/r364447/
Log:
audio/alsa-(lib|plugins|utils): Upgrade version 1.0.27.2 => 1.0.28
Also switch maintainership to submitter with blessing of former
maintainer. Other changes include:
* fix for bug 191190
* Use new options syntax
* Proper detection of PYTHON and FFMPEG
* fix leftovers
* strip libraries to satisfy stage-qa
* conf: alias surround stuff to pcm.default
* lib: split patches and refactor
* utils: rename XMLTO to MANPAGES
PR: 191524
Submitted by: Jan Beich
Approved by: former maintainer (Aragon Gouveia)
Added:
head/audio/alsa-lib/files/byteswap.h (contents, props changed)
head/audio/alsa-lib/files/linux/
head/audio/alsa-lib/files/linux/ioctl.h (contents, props changed)
head/audio/alsa-lib/files/linux/types.h (contents, props changed)
head/audio/alsa-lib/files/malloc.h (contents, props changed)
head/audio/alsa-lib/files/patch-include__pcm.h (contents, props changed)
head/audio/alsa-lib/files/patch-src__async.c (contents, props changed)
head/audio/alsa-lib/files/patch-src__pcm__pcm_direct.c (contents, props changed)
head/audio/alsa-lib/files/patch-src__timer__timer_hw.c (contents, props changed)
head/audio/alsa-utils/files/patch-alsaloop__alsaloop.c (contents, props changed)
head/audio/alsa-utils/files/patch-alsamixer__mixer_display.c (contents, props changed)
head/audio/alsa-utils/files/patch-alsamixer__volume_mapping.c (contents, props changed)
head/audio/alsa-utils/files/patch-aplay__aplay.c (contents, props changed)
head/audio/alsa-utils/files/patch-aplay__formats.h (contents, props changed)
Deleted:
head/audio/alsa-lib/files/patch-alsa-lib
head/audio/alsa-plugins/files/patch-ffmpeg-version
head/audio/alsa-plugins/files/patch-jack-pcm_jack.c
head/audio/alsa-utils/files/patch-alsa-utils
Modified:
head/audio/alsa-lib/Makefile
head/audio/alsa-lib/distinfo
head/audio/alsa-lib/files/asound.conf.sample
head/audio/alsa-lib/pkg-plist
head/audio/alsa-plugins/Makefile
head/audio/alsa-plugins/distinfo
head/audio/alsa-plugins/files/alsa-plugins.patch
head/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c
head/audio/alsa-plugins/pkg-plist
head/audio/alsa-utils/Makefile
head/audio/alsa-utils/distinfo
head/audio/alsa-utils/pkg-plist
Modified: head/audio/alsa-lib/Makefile
==============================================================================
--- head/audio/alsa-lib/Makefile Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-lib/Makefile Sat Aug 9 15:20:35 2014 (r364447)
@@ -2,35 +2,33 @@
# $FreeBSD$
PORTNAME= alsa-lib
-PORTVERSION= 1.0.27.2
-PORTREVISION= 2
+PORTVERSION= 1.0.28
CATEGORIES= audio
MASTER_SITES= ALSA/lib \
GENTOO/distfiles
-MAINTAINER= aragon at phat.za.net
+MAINTAINER= jbeich at vfemail.net
COMMENT= ALSA compatibility library
+LICENSE= LGPL21 # or any later version
+
USES= tar:bzip2 libtool:keepla
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pkgconfdir="\$${prefix}/libdata/pkgconfig"
INSTALL_TARGET= install-strip
+CPPFLAGS+= -I${FILESDIR}
OPTIONS_DEFINE= PYTHON
-OPTIONS_SUB= ${OPTIONS_DEFINE}
-
-.include <bsd.port.options.mk>
+OPTIONS_SUB= yes
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= 2
-.else
-CONFIGURE_ARGS+=--disable-python
-.endif
+PYTHON_CONFIGURE_ENABLE=python
+PYTHON_USE= PYTHON=2
post-patch: .SILENT
${REINPLACE_CMD} -e '/LIBS/ { s/-ldl//g; s/-lrt//g; }' \
-e 's/python-config/${PYTHON_CMD:T}-config/g' \
+ -e '/pythonlibs/s/--libs/--ldflags/' \
-e '/-D_GNU_SOURCE/d' \
-e '/lt_cv_dlopen/s/-ldl//g' ${WRKSRC}/configure
${REINPLACE_CMD} '/LIBADD/s/-ldl//g' \
Modified: head/audio/alsa-lib/distinfo
==============================================================================
--- head/audio/alsa-lib/distinfo Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-lib/distinfo Sat Aug 9 15:20:35 2014 (r364447)
@@ -1,2 +1,2 @@
-SHA256 (alsa-lib-1.0.27.2.tar.bz2) = 690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19
-SIZE (alsa-lib-1.0.27.2.tar.bz2) = 906844
+SHA256 (alsa-lib-1.0.28.tar.bz2) = 3c074b85dde1b30e78ef4995579765833e5b693fbbd8f834c335e080cb734a6d
+SIZE (alsa-lib-1.0.28.tar.bz2) = 903786
Modified: head/audio/alsa-lib/files/asound.conf.sample
==============================================================================
--- head/audio/alsa-lib/files/asound.conf.sample Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-lib/files/asound.conf.sample Sat Aug 9 15:20:35 2014 (r364447)
@@ -1,13 +1,9 @@
#
# FreeBSD/OSS
#
-pcm_slave.oss {
- pcm.type oss
-}
-
pcm.!default {
type plug
- slave oss
+ slave.pcm.type oss
}
ctl.!default {
@@ -15,54 +11,6 @@ ctl.!default {
}
#
-# Remap all possible surround stuffs.
-#
-pcm.!front {
- type plug
- slave oss
-}
-
-pcm.!rear {
- type plug
- slave oss
-}
-
-pcm.!center_lfe {
- type plug
- slave oss
-}
-
-pcm.!side {
- type plug
- slave oss
-}
-
-pcm.!surround40 {
- type plug
- slave oss
-}
-
-pcm.!surround41 {
- type plug
- slave oss
-}
-
-pcm.!surround50 {
- type plug
- slave oss
-}
-
-pcm.!surround51 {
- type plug
- slave oss
-}
-
-pcm.!surround71 {
- type plug
- slave oss
-}
-
-#
# Pulseaudio
#
# pcm.!default {
@@ -72,3 +20,17 @@ pcm.!surround71 {
# ctl.!default {
# type pulse
# }
+
+#
+# Remap all possible surround stuffs.
+#
+pcm.!front pcm.default
+pcm.!rear pcm.default
+pcm.!center_lfe pcm.default
+pcm.!side pcm.default
+pcm.!surround21 pcm.default
+pcm.!surround40 pcm.default
+pcm.!surround41 pcm.default
+pcm.!surround50 pcm.default
+pcm.!surround51 pcm.default
+pcm.!surround71 pcm.default
Added: head/audio/alsa-lib/files/byteswap.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-lib/files/byteswap.h Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,13 @@
+#ifndef _BYTESWAP_H
+#define _BYTESWAP_H
+
+#ifdef __OpenBSD__
+#define bswap_16(x) swap16(x)
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
+#else
+#define bswap_16(x) bswap16(x)
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+#endif
+#endif /* _BYTESWAP_H */
Added: head/audio/alsa-lib/files/linux/ioctl.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-lib/files/linux/ioctl.h Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,4 @@
+#ifndef _LINUX_IOCTL_H
+#define _LINUX_IOCTL_H
+#include <sys/ioccom.h>
+#endif /* _LINUX_IOCTL_H */
Added: head/audio/alsa-lib/files/linux/types.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-lib/files/linux/types.h Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,11 @@
+#ifndef _LINUX_TYPES_H
+#define _LINUX_TYPES_H
+
+#define __bitwise
+
+typedef int __kernel_pid_t;
+typedef off_t __kernel_off_t;
+
+typedef uint32_t __u32;
+typedef uint64_t __u64;
+#endif /* _LINUX_TYPES_H */
Added: head/audio/alsa-lib/files/malloc.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-lib/files/malloc.h Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,4 @@
+#ifndef _MALLOC_H
+#define _MALLOC_H
+#include <stdlib.h>
+#endif /* _MALLOC_H */
Added: head/audio/alsa-lib/files/patch-include__pcm.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-lib/files/patch-include__pcm.h Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,16 @@
+--- include/pcm.h~
++++ include/pcm.h
+@@ -29,6 +29,13 @@
+ #ifndef __ALSA_PCM_H
+ #define __ALSA_PCM_H
+
++#ifndef ESTRPIPE
++#define ESTRPIPE EPIPE
++#endif
++#ifndef EBADFD
++#define EBADFD EBADF
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
Added: head/audio/alsa-lib/files/patch-src__async.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-lib/files/patch-src__async.c Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,28 @@
+$NetBSD: patch-bk,v 1.1 2008/12/25 13:18:00 hasso Exp $
+
+--- src/async.c~
++++ src/async.c
+@@ -51,6 +51,15 @@ static LIST_HEAD(snd_async_handlers);
+
+ static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *siginfo, void *context ATTRIBUTE_UNUSED)
+ {
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++ /* XXX XXX XXX */
++ struct list_head *i;
++ list_for_each(i, &snd_async_handlers) {
++ snd_async_handler_t *h = list_entry(i, snd_async_handler_t, glist);
++ if (h->callback)
++ h->callback(h);
++ }
++#else
+ int fd;
+ struct list_head *i;
+ //assert(siginfo->si_code == SI_SIGIO);
+@@ -60,6 +69,7 @@ static void snd_async_handler(int signo
+ if (h->fd == fd && h->callback)
+ h->callback(h);
+ }
++#endif
+ }
+
+ /**
Added: head/audio/alsa-lib/files/patch-src__pcm__pcm_direct.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-lib/files/patch-src__pcm__pcm_direct.c Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,19 @@
+--- src/pcm/pcm_direct.c~
++++ src/pcm/pcm_direct.c
+@@ -44,12 +44,16 @@
+ *
+ */
+
++#if defined(__NetBSD__)
++typedef __semun semun;
++#elif !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+ union semun {
+ int val; /* Value for SETVAL */
+ struct semid_ds *buf; /* Buffer for IPC_STAT, IPC_SET */
+ unsigned short *array; /* Array for GETALL, SETALL */
+ struct seminfo *__buf; /* Buffer for IPC_INFO (Linux specific) */
+ };
++#endif
+
+ /*
+ * FIXME:
Added: head/audio/alsa-lib/files/patch-src__timer__timer_hw.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-lib/files/patch-src__timer__timer_hw.c Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,15 @@
+--- src/timer/timer_hw.c~
++++ src/timer/timer_hw.c
+@@ -91,10 +91,12 @@ static int snd_timer_hw_async(snd_timer_
+ }
+ if (sig < 0)
+ return 0;
++#ifdef F_SETSIG
+ if (fcntl(fd, F_SETSIG, (long)sig) < 0) {
+ SYSERR("F_SETSIG failed");
+ return -errno;
+ }
++#endif
+ if (fcntl(fd, F_SETOWN, (long)pid) < 0) {
+ SYSERR("F_SETOWN failed");
+ return -errno;
Modified: head/audio/alsa-lib/pkg-plist
==============================================================================
--- head/audio/alsa-lib/pkg-plist Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-lib/pkg-plist Sat Aug 9 15:20:35 2014 (r364447)
@@ -86,6 +86,7 @@ share/alsa/cards/ICE1724.conf
share/alsa/cards/ICH-MODEM.conf
share/alsa/cards/ICH.conf
share/alsa/cards/ICH4.conf
+share/alsa/cards/Loopback.conf
share/alsa/cards/Maestro3.conf
share/alsa/cards/NFORCE.conf
share/alsa/cards/PC-Speaker.conf
@@ -121,6 +122,7 @@ share/alsa/pcm/iec958.conf
share/alsa/pcm/modem.conf
share/alsa/pcm/rear.conf
share/alsa/pcm/side.conf
+share/alsa/pcm/surround21.conf
share/alsa/pcm/surround40.conf
share/alsa/pcm/surround41.conf
share/alsa/pcm/surround50.conf
Modified: head/audio/alsa-plugins/Makefile
==============================================================================
--- head/audio/alsa-plugins/Makefile Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-plugins/Makefile Sat Aug 9 15:20:35 2014 (r364447)
@@ -2,87 +2,64 @@
# $FreeBSD$
PORTNAME= alsa-plugins
-PORTVERSION= 1.0.27
-PORTREVISION= 3
+PORTVERSION= 1.0.28
CATEGORIES= audio
MASTER_SITES= ALSA/plugins \
GENTOO/distfiles
-MAINTAINER= aragon at phat.za.net
+MAINTAINER= jbeich at vfemail.net
COMMENT= ALSA compatibility library plugins
+LICENSE= LGPL21 # or any later version
+
LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
GNU_CONFIGURE= yes
USES= tar:bzip2 pkgconfig libtool:keepla
-LDFLAGS+= -L${LOCALBASE}/lib
EXTRA_PATCHES+= ${FILESDIR}/alsa-plugins.patch
+INSTALL_TARGET= install-strip
+CPPFLAGS+= -I${.CURDIR}/../alsa-lib/files
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_DEFAULT=BUFSZ_P2 IO_PTR
OPTIONS_DEFINE= JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX
-OPTIONS_SUB= ${OPTIONS_DEFINE}
+OPTIONS_SUB= yes
OPTIONS_GROUP= OSS
OPTIONS_GROUP_OSS=IO_PTR BLKCNT_P2 BUFSZ_P2 VERBOSE
IO_PTR_DESC= Precise playback/recording pointer
BLKCNT_P2_DESC= Restrict number of fragments to ^2 aligned
-BUFSZ_P2_DESC= Restrict buffer size to ^2 aligned (breaks aplay)
+BUFSZ_P2_DESC= Restrict buffer size to ^2 aligned
VERBOSE_DESC= Print debugging messages
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIO_PTR}
-CFLAGS+= -DFREEBSD_OSS_USE_IO_PTR
-.endif
+IO_PTR_CFLAGS= -DFREEBSD_OSS_USE_IO_PTR
+BLKCNT_P2_CFLAGS=-DFREEBSD_OSS_BLKCNT_P2
+BUFSZ_P2_CFLAGS=-DFREEBSD_OSS_BUFSZ_P2
+VERBOSE_CFLAGS= -DFREEBSD_OSS_DEBUG_VERBOSE
+
+JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
+JACK_CONFIGURE_ENABLE= jack
+
+FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_CONFIGURE_ENABLE=avcodec
+FFMPEG_CPPFLAGS= -I${LOCALBASE}/include
+
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=pulseaudio
+
+SAMPLERATE_LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_CONFIGURE_ENABLE=samplerate
+
+SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_CONFIGURE_ON= --with-speex=lib
+SPEEX_CONFIGURE_OFF= --without-speex
-.if ${PORT_OPTIONS:MBLKCNT_P2}
-CFLAGS+= -DFREEBSD_OSS_BLKCNT_P2
-.endif
-
-.if ${PORT_OPTIONS:MBUFSZ_P2}
-CFLAGS+= -DFREEBSD_OSS_BUFSZ_P2
-.endif
-
-.if ${PORT_OPTIONS:MVERBOSE}
-CFLAGS+= -DFREEBSD_OSS_DEBUG_VERBOSE
-.endif
+.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MJACK}
-.if empty(PORT_OPTIONS:MSAMPLERATE)
+.if ${PORT_OPTIONS:MJACK} && empty(PORT_OPTIONS:MSAMPLERATE)
IGNORE= JACK audio support requires SAMPLERATE
.endif
-LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack
-.else
-CONFIGURE_ARGS+= --disable-jack
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG}
-CONFIGURE_ARGS+= --enable-avcodec
-CFLAGS+= -I${LOCALBASE}/include
-LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-.else
-CONFIGURE_ARGS+= --disable-avcodec
-.endif
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio
-.else
-CONFIGURE_ARGS+= --disable-pulseaudio
-.endif
-
-.if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+= libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-.else
-CONFIGURE_ARGS+= --disable-samplerate
-.endif
-
-.if ${PORT_OPTIONS:MSPEEX}
-CONFIGURE_ARGS+= --with-speex=lib
-LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex
-.else
-CONFIGURE_ARGS+= --without-speex
-.endif
post-patch: .SILENT
${REINPLACE_CMD} -e '/LIBS/s/-ldl//g' \
Modified: head/audio/alsa-plugins/distinfo
==============================================================================
--- head/audio/alsa-plugins/distinfo Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-plugins/distinfo Sat Aug 9 15:20:35 2014 (r364447)
@@ -1,2 +1,2 @@
-SHA256 (alsa-plugins-1.0.27.tar.bz2) = 0bbd0c37c2dd7baf16363afb2e58169ffb0f9c0a70031b3b6235594630f3ab35
-SIZE (alsa-plugins-1.0.27.tar.bz2) = 363593
+SHA256 (alsa-plugins-1.0.28.tar.bz2) = 426f8af1a07ee9d8c06449524d1f0bd59a06e0331a51aa3d59d343a7c6d03120
+SIZE (alsa-plugins-1.0.28.tar.bz2) = 366023
Modified: head/audio/alsa-plugins/files/alsa-plugins.patch
==============================================================================
--- head/audio/alsa-plugins/files/alsa-plugins.patch Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-plugins/files/alsa-plugins.patch Sat Aug 9 15:20:35 2014 (r364447)
@@ -42,14 +42,11 @@
oss->ext.private_data = oss;
--- oss/pcm_oss.c.orig 2009-08-31 21:09:41.000000000 +0800
+++ oss/pcm_oss.c 2009-09-28 14:54:12.000000000 +0800
-@@ -22,17 +22,48 @@
+@@ -22,17 +22,41 @@
#include <sys/ioctl.h>
#include <alsa/asoundlib.h>
#include <alsa/pcm_external.h>
#include <linux/soundcard.h>
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#endif
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+
@@ -58,11 +55,7 @@
+#define FREEBSD_OSS_RATE_MAX 384000
+
+#define FREEBSD_OSS_CHANNELS_MIN 1
-+#ifndef __DragonFly__
+#define FREEBSD_OSS_CHANNELS_MAX 8
-+#else
-+#define FREEBSD_OSS_CHANNELS_MAX 2
-+#endif
+
+#define FREEBSD_OSS_BUFSZ_MAX 131072
+#define FREEBSD_OSS_BLKCNT_MIN 2
Modified: head/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c
==============================================================================
--- head/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c Sat Aug 9 15:20:35 2014 (r364447)
@@ -2,21 +2,11 @@ based on https://github.com/dankamongmen
--- usb_stream/pcm_usb_stream.c.orig
+++ usb_stream/pcm_usb_stream.c
-@@ -19,7 +19,9 @@
- */
-
- #define _GNU_SOURCE
-+#ifndef __FreeBSD__
- #include <byteswap.h>
-+#endif
- #include <sys/mman.h>
- #include <sys/shm.h>
- #include <sys/ioctl.h>
@@ -79,6 +81,69 @@ typedef struct {
static struct user_usb_stream *uus;
static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER;
-+#ifdef __FreeBSD__
++#ifndef __linux__
+/*
+ * Copyright (c) 2000-2011, Nick Black et al
+ * All rights reserved.
@@ -86,7 +76,7 @@ based on https://github.com/dankamongmen
}
-+#ifndef __FreeBSD__
++#ifdef __linux__
uus->s = mremap(uus->s, sizeof(struct usb_stream), uus->s->read_size, MREMAP_MAYMOVE);
+#else
+ uus->s = mremap_compat(us->pfd.fd, uus->s, sizeof(struct usb_stream), uus->s->read_size, PROT_READ, MAP_SHARED);
Modified: head/audio/alsa-plugins/pkg-plist
==============================================================================
--- head/audio/alsa-plugins/pkg-plist Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-plugins/pkg-plist Sat Aug 9 15:20:35 2014 (r364447)
@@ -40,3 +40,6 @@ lib/alsa-lib/libasound_module_pcm_vdownm
%%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate_medium.so
%%PULSEAUDIO%%share/alsa/alsa.conf.d/50-pulseaudio.conf
%%PULSEAUDIO%%share/alsa/alsa.conf.d/99-pulseaudio-default.conf.example
+%%PULSEAUDIO%%@dirrmtry share/alsa/alsa.conf.d
+%%PULSEAUDIO%%@dirrmtry share/alsa
+ at dirrmtry lib/alsa-lib
Modified: head/audio/alsa-utils/Makefile
==============================================================================
--- head/audio/alsa-utils/Makefile Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-utils/Makefile Sat Aug 9 15:20:35 2014 (r364447)
@@ -2,47 +2,37 @@
# $FreeBSD$
PORTNAME= alsa-utils
-PORTVERSION= 1.0.27.2
-PORTREVISION= 2
+PORTVERSION= 1.0.28
CATEGORIES= audio
MASTER_SITES= ALSA/utils \
GENTOO/distfiles
-MAINTAINER= aragon at phat.za.net
+MAINTAINER= jbeich at vfemail.net
COMMENT= ALSA compatibility utils
+LICENSE= GPLv2 # or any later version
+
LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
USES= gmake tar:bzip2 shebangfix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-udev-rules-dir="\$${prefix}/lib/udev"
-CFLAGS+= -I${LOCALBASE}/include
SHEBANG_FILES= alsaconf/alsaconf.in
+INSTALL_TARGET= install-strip
+CPPFLAGS+= -I${LOCALBASE}/include -I${.CURDIR}/../alsa-lib/files
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_SUB= yes
-OPTIONS_DEFINE= XMLTO NLS
-OPTIONS_DEFAULT=XMLTO
-XMLTO_DESC= Generate alsactl_init(7) man page using xmlto(1)
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MXMLTO}
-BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto
-MAN7_EN+= alsactl_init.7
-.else
-CONFIGURE_ARGS+=--disable-xmlto
-.endif
+OPTIONS_DEFINE= MANPAGES NLS
+OPTIONS_DEFAULT=MANPAGES
-.if empty(PORT_OPTIONS:MNLS)
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
-LDFLAGS+= -L${LOCALBASE}/lib -lintl
-USES+= gettext
-PLIST_SUB+= NLS=""
-.endif
+MANPAGES_BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto
+MANPAGES_CONFIGURE_ENABLE=xmlto
+
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE=nls
+NLS_LDFLAGS= -lintl
post-patch: .SILENT
${REINPLACE_CMD} -e '/LIBS/s/-ldl//g; /LIBRT/s/-lrt//g;' \
Modified: head/audio/alsa-utils/distinfo
==============================================================================
--- head/audio/alsa-utils/distinfo Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-utils/distinfo Sat Aug 9 15:20:35 2014 (r364447)
@@ -1,2 +1,2 @@
-SHA256 (alsa-utils-1.0.27.2.tar.bz2) = 02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea
-SIZE (alsa-utils-1.0.27.2.tar.bz2) = 1143802
+SHA256 (alsa-utils-1.0.28.tar.bz2) = f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc
+SIZE (alsa-utils-1.0.28.tar.bz2) = 1146887
Added: head/audio/alsa-utils/files/patch-alsaloop__alsaloop.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-utils/files/patch-alsaloop__alsaloop.c Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,14 @@
+--- alsaloop/alsaloop.c~
++++ alsaloop/alsaloop.c
+@@ -760,7 +761,11 @@ static void thread_job1(void *_data)
+ snd_output_printf(output, "pool took %lius\n", timediff(tv2, tv1));
+ }
+ if (err < 0) {
++#ifdef ERESTART
+ if (err == -EINTR || err == -ERESTART)
++#else
++ if (err == -EINTR)
++#endif
+ continue;
+ logit(LOG_CRIT, "Poll failed: %s\n", strerror(-err));
+ my_exit(thread, EXIT_FAILURE);
Added: head/audio/alsa-utils/files/patch-alsamixer__mixer_display.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-utils/files/patch-alsamixer__mixer_display.c Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,12 @@
+--- alsamixer/mixer_display.c~
++++ alsamixer/mixer_display.c
+@@ -17,7 +17,9 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#ifdef __GLIBC__
+ #define _C99_SOURCE /* lrint() */
++#endif
+ #include "aconfig.h"
+ #include <stdlib.h>
+ #include <string.h>
Added: head/audio/alsa-utils/files/patch-alsamixer__volume_mapping.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-utils/files/patch-alsamixer__volume_mapping.c Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,11 @@
+--- alsamixer/volume_mapping.c~
++++ alsamixer/volume_mapping.c
+@@ -37,7 +37,7 @@
+ #include <stdbool.h>
+ #include "volume_mapping.h"
+
+-#ifdef __UCLIBC__
++#ifndef __GLIBC__
+ /* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
+ #define exp10(x) (exp((x) * log(10)))
+ #endif /* __UCLIBC__ */
Added: head/audio/alsa-utils/files/patch-aplay__aplay.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-utils/files/patch-aplay__aplay.c Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,23 @@
+--- aplay/aplay.c~
++++ aplay/aplay.c
+@@ -48,7 +48,6 @@
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+-#include <endian.h>
+ #include "aconfig.h"
+ #include "gettext.h"
+ #include "formats.h"
+@@ -70,6 +69,12 @@
+ #define be32toh(x) __be32_to_cpu(x)
+ #endif
+
++#ifndef _LARGEFILE64_SOURCE
++/* assume modern system */
++typedef off_t off64_t;
++#define lseek64 lseek
++#endif
++
+ #define DEFAULT_FORMAT SND_PCM_FORMAT_U8
+ #define DEFAULT_SPEED 8000
+
Added: head/audio/alsa-utils/files/patch-aplay__formats.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/alsa-utils/files/patch-aplay__formats.h Sat Aug 9 15:20:35 2014 (r364447)
@@ -0,0 +1,10 @@
+--- aplay/formats.h~
++++ aplay/formats.h
+@@ -1,7 +1,6 @@
+ #ifndef FORMATS_H
+ #define FORMATS_H 1
+
+-#include <endian.h>
+ #include <byteswap.h>
+
+ /* Definitions for .VOC files */
Modified: head/audio/alsa-utils/pkg-plist
==============================================================================
--- head/audio/alsa-utils/pkg-plist Sat Aug 9 15:03:49 2014 (r364446)
+++ head/audio/alsa-utils/pkg-plist Sat Aug 9 15:20:35 2014 (r364447)
@@ -29,7 +29,7 @@ man/man1/aseqdump.1.gz
man/man1/aseqnet.1.gz
man/man1/iecset.1.gz
man/man1/speaker-test.1.gz
-%%XMLTO%%man/man7/alsactl_init.7.gz
+%%MANPAGES%%man/man7/alsactl_init.7.gz
man/man8/alsaconf.8.gz
sbin/alsaconf
sbin/alsactl
More information about the svn-ports-head
mailing list