[Midnightbsd-cvs] mports [16106] alsa lib 1.0.27.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 23 14:46:00 EDT 2014
Revision: 16106
http://svnweb.midnightbsd.org/mports/?rev=16106
Author: laffer1
Date: 2014-03-23 14:45:59 -0400 (Sun, 23 Mar 2014)
Log Message:
-----------
alsa lib 1.0.27.2
Modified Paths:
--------------
trunk/audio/alsa-lib/Makefile
trunk/audio/alsa-lib/distinfo
trunk/audio/alsa-lib/files/asound.conf.sample
trunk/audio/alsa-lib/files/patch-alsa-lib
trunk/audio/alsa-lib/pkg-plist
Property Changed:
----------------
trunk/audio/alsa-lib/files/asound.conf.sample
trunk/audio/alsa-lib/files/patch-alsa-lib
Modified: trunk/audio/alsa-lib/Makefile
===================================================================
--- trunk/audio/alsa-lib/Makefile 2014-03-23 18:43:41 UTC (rev 16105)
+++ trunk/audio/alsa-lib/Makefile 2014-03-23 18:45:59 UTC (rev 16106)
@@ -1,7 +1,8 @@
# $MidnightBSD$
PORTNAME= alsa-lib
-PORTVERSION= 1.0.26
+PORTVERSION= 1.0.27.2
+PORTREVISION= 0
CATEGORIES= audio
MASTER_SITES= ALSA/lib \
GENTOO/distfiles
Modified: trunk/audio/alsa-lib/distinfo
===================================================================
--- trunk/audio/alsa-lib/distinfo 2014-03-23 18:43:41 UTC (rev 16105)
+++ trunk/audio/alsa-lib/distinfo 2014-03-23 18:45:59 UTC (rev 16106)
@@ -1,2 +1,2 @@
-SHA256 (alsa-lib-1.0.26.tar.bz2) = 8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d
-SIZE (alsa-lib-1.0.26.tar.bz2) = 883076
+SHA256 (alsa-lib-1.0.27.2.tar.bz2) = 690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19
+SIZE (alsa-lib-1.0.27.2.tar.bz2) = 906844
Modified: trunk/audio/alsa-lib/files/asound.conf.sample
===================================================================
--- trunk/audio/alsa-lib/files/asound.conf.sample 2014-03-23 18:43:41 UTC (rev 16105)
+++ trunk/audio/alsa-lib/files/asound.conf.sample 2014-03-23 18:45:59 UTC (rev 16106)
@@ -1,42 +1,65 @@
#
# FreeBSD/OSS
#
+pcm_slave.oss {
+ pcm.type oss
+}
+
pcm.!default {
- type oss
- device /dev/dsp
+ type plug
+ slave oss
}
ctl.!default {
type oss
- device /dev/mixer
}
#
# 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 oss
- device /dev/dsp
+ type plug
+ slave oss
}
pcm.!surround41 {
- type oss
- device /dev/dsp
+ type plug
+ slave oss
}
pcm.!surround50 {
- type oss
- device /dev/dsp
+ type plug
+ slave oss
}
pcm.!surround51 {
- type oss
- device /dev/dsp
+ type plug
+ slave oss
}
pcm.!surround71 {
- type oss
- device /dev/dsp
+ type plug
+ slave oss
}
#
Property changes on: trunk/audio/alsa-lib/files/asound.conf.sample
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/audio/alsa-lib/files/patch-alsa-lib
===================================================================
--- trunk/audio/alsa-lib/files/patch-alsa-lib 2014-03-23 18:43:41 UTC (rev 16105)
+++ trunk/audio/alsa-lib/files/patch-alsa-lib 2014-03-23 18:45:59 UTC (rev 16106)
@@ -4,7 +4,7 @@
#include <string.h>
#include <fcntl.h>
#include <assert.h>
-+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
++#ifdef __FreeBSD__
+#include <sys/endian.h>
+#else
#include <endian.h>
@@ -17,7 +17,7 @@
#include <alsa/error.h>
#include <alsa/conf.h>
+
-+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
++#ifdef __FreeBSD__
+
+#define ESTRPIPE 0x7a69 /* Linux PCM suspend errno, fehh?! */
+#define EBADFD EBADF
@@ -51,13 +51,13 @@
int snd_user_file(const char *file, char **result);
-#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE)
-+#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE) && !defined(__FreeBSD__) && !defined(__MidnightBSD__)
++#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE) && !defined(__FreeBSD__)
struct timeval {
time_t tv_sec; /* seconds */
long tv_usec; /* microseconds */
--- include/local.h.orig 2009-09-09 20:34:54.000000000 +0800
+++ include/local.h 2009-09-15 00:26:08.000000000 +0800
-@@ -28,7 +28,11 @@
+@@ -28,11 +28,19 @@
#include <string.h>
#include <fcntl.h>
#include <assert.h>
@@ -69,6 +69,14 @@
#include <stdarg.h>
#include <sys/poll.h>
#include <errno.h>
++#ifdef __linux__
+ #include <linux/ioctl.h>
++#else
++#include <sys/ioctl.h>
++#endif
+
+ #include "config.h"
+ #ifdef SUPPORT_RESMGR
--- include/search.h.orig 2009-09-09 20:34:54.000000000 +0800
+++ include/search.h 2009-09-15 00:49:10.000000000 +0800
@@ -20,7 +20,9 @@
@@ -102,10 +110,19 @@
typedef __compar_fn_t comparison_fn_t;
--- include/sound/asound.h.orig 2009-09-09 20:34:54.000000000 +0800
+++ include/sound/asound.h 2009-09-15 00:44:37.000000000 +0800
-@@ -62,6 +62,33 @@
- #include <sys/ioctl.h>
- #endif
+@@ -23,9 +23,42 @@
+ #ifndef _UAPI__SOUND_ASOUND_H
+ #define _UAPI__SOUND_ASOUND_H
++#ifdef __linux__
+ #include <linux/types.h>
++#else
++#define __bitwise
++typedef uint32_t __u32;
++typedef int __kernel_pid_t;
++#endif
++
+
+#ifdef __FreeBSD__
+#define ESTRPIPE 0x7a69 /* Linux PCM suspend errno, fehh?! */
+#define EBADFD EBADF
@@ -127,7 +144,7 @@
+#define __cpu_to_le16(x) bswap_16(x)
+#define __cpu_to_be16(x) (x)
+#endif
-+
+
+#define __le32_to_cpu __cpu_to_le32
+#define __be32_to_cpu __cpu_to_be32
+#define __le16_to_cpu __cpu_to_le16
Property changes on: trunk/audio/alsa-lib/files/patch-alsa-lib
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/audio/alsa-lib/pkg-plist
===================================================================
--- trunk/audio/alsa-lib/pkg-plist 2014-03-23 18:43:41 UTC (rev 16105)
+++ trunk/audio/alsa-lib/pkg-plist 2014-03-23 18:45:59 UTC (rev 16106)
@@ -125,9 +125,39 @@
share/alsa/pcm/surround71.conf
share/alsa/smixer.conf
share/alsa/sndo-mixer.alisp
+share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf
+share/alsa/ucm/DAISY-I2S/HiFi.conf
+share/alsa/ucm/PandaBoard/FMAnalog
+share/alsa/ucm/PandaBoard/PandaBoard.conf
+share/alsa/ucm/PandaBoard/hifi
+share/alsa/ucm/PandaBoard/hifiLP
+share/alsa/ucm/PandaBoard/record
+share/alsa/ucm/PandaBoard/voice
+share/alsa/ucm/PandaBoard/voiceCall
+share/alsa/ucm/PandaBoardES/FMAnalog
+share/alsa/ucm/PandaBoardES/PandaBoardES.conf
+share/alsa/ucm/PandaBoardES/hifi
+share/alsa/ucm/PandaBoardES/hifiLP
+share/alsa/ucm/PandaBoardES/record
+share/alsa/ucm/PandaBoardES/voice
+share/alsa/ucm/PandaBoardES/voiceCall
+share/alsa/ucm/SDP4430/FMAnalog
+share/alsa/ucm/SDP4430/SDP4430.conf
+share/alsa/ucm/SDP4430/hifi
+share/alsa/ucm/SDP4430/hifiLP
+share/alsa/ucm/SDP4430/record
+share/alsa/ucm/SDP4430/voice
+share/alsa/ucm/SDP4430/voiceCall
+share/alsa/ucm/tegraalc5632/tegraalc5632.conf
@unexec if cmp -s %D/etc/asound.conf.sample %D/etc/asound.conf; then rm -f %D/etc/asound.conf; else echo "If permanently deleting this package, %D/etc/asound.conf must be removed manually."; fi
etc/asound.conf.sample
@exec [ -f %B/asound.conf ] || cp -p %B/%f %B/asound.conf
+ at dirrm share/alsa/ucm/PandaBoardES
+ at dirrm share/alsa/ucm/SDP4430
+ at dirrm share/alsa/ucm/DAISY-I2S
+ at dirrm share/alsa/ucm/tegraalc5632
+ at dirrm share/alsa/ucm/PandaBoard
+ at dirrm share/alsa/ucm
@dirrm share/alsa/pcm
@dirrm share/alsa/cards/SI7018
@dirrm share/alsa/cards
@@ -135,6 +165,6 @@
@dirrm share/alsa
@dirrm lib/alsa-lib/smixer
@dirrm lib/alsa-lib
- at dirrm include/sys
+ at dirrmtry include/sys
@dirrm include/alsa/sound
@dirrm include/alsa
More information about the Midnightbsd-cvs
mailing list