forked from Lainports/freebsd-ports
a28a1142b4
- Convert to new options framework - alsa-plugins: - Add option: ARIFF_OSS for FreeBSD-specific patch - Revert ports/165247 per regression in ports/169767 - Unbreak arcam-av and usb_stream plugins - While I'm here, pet portlint by removing ABI version number from LIB_DEPENDS Changes: http://www.alsa-project.org/main/index.php/Changes_v1.0.24_v1.0.25 http://www.alsa-project.org/main/index.php/Changes_v1.0.23_v1.0.24 PR: ports/169841 Submitted by: Jan Beich <jbeich@tormail.org> (maintainer)
136 lines
3.4 KiB
Text
136 lines
3.4 KiB
Text
--- alsaloop/alsaloop.c.orig
|
|
+++ alsaloop/alsaloop.c
|
|
@@ -30,6 +30,7 @@
|
|
#include <sys/time.h>
|
|
#include <math.h>
|
|
#include <pthread.h>
|
|
+#include <signal.h>
|
|
#include <syslog.h>
|
|
#include <sys/signal.h>
|
|
#include "alsaloop.h"
|
|
@@ -749,7 +750,11 @@ static void thread_job1(void *_data)
|
|
snd_output_printf(output, "pool took %lius\n", timediff(tv2, tv1));
|
|
}
|
|
if (err < 0) {
|
|
+#ifndef __FreeBSD__
|
|
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);
|
|
--- alsaloop/pcmjob.c.orig
|
|
+++ alsaloop/pcmjob.c
|
|
@@ -63,7 +63,11 @@ static const char *src_types[] = {
|
|
#endif
|
|
|
|
static pthread_mutex_t pcm_open_mutex =
|
|
+#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
|
|
PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
|
|
+#else
|
|
+ PTHREAD_MUTEX_INITIALIZER;
|
|
+#endif
|
|
|
|
static inline void pcm_open_lock(void)
|
|
{
|
|
--- alsamixer/mixer_display.c.orig
|
|
+++ alsamixer/mixer_display.c
|
|
@@ -17,7 +17,9 @@
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
+#ifndef __FreeBSD__
|
|
#define _C99_SOURCE /* lrint() */
|
|
+#endif
|
|
#include "aconfig.h"
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
--- alsamixer/volume_mapping.c.orig
|
|
+++ alsamixer/volume_mapping.c
|
|
@@ -37,7 +37,7 @@
|
|
#include <stdbool.h>
|
|
#include "volume_mapping.h"
|
|
|
|
-#ifdef __UCLIBC__
|
|
+#if defined(__UCLIBC__) || defined(__FreeBSD__)
|
|
/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
|
|
#define exp10(x) (exp((x) * log(10)))
|
|
#endif /* __UCLIBC__ */
|
|
--- aplay/aplay.c.orig 2010-04-16 13:11:06.000000000 +0200
|
|
+++ aplay/aplay.c 2010-04-23 04:17:13.000000000 +0200
|
|
@@ -28,7 +28,9 @@
|
|
|
|
#define _GNU_SOURCE
|
|
#include <stdio.h>
|
|
+#ifndef __FreeBSD__
|
|
#include <malloc.h>
|
|
+#endif
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
@@ -48,7 +50,11 @@
|
|
#include <sys/signal.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
+#ifdef __FreeBSD__
|
|
+#include <sys/endian.h>
|
|
+#else
|
|
#include <endian.h>
|
|
+#endif
|
|
#include "aconfig.h"
|
|
#include "gettext.h"
|
|
#include "formats.h"
|
|
@@ -116,6 +122,11 @@
|
|
static int use_strftime = 0;
|
|
volatile static int recycle_capture_file = 0;
|
|
|
|
+typedef off_t off64_t;
|
|
+
|
|
+#define lseek64 lseek
|
|
+#define open64 open
|
|
+
|
|
static int fd = -1;
|
|
static off64_t pbrec_count = LLONG_MAX, fdcount;
|
|
static int vocmajor, vocminor;
|
|
@@ -1086,8 +1097,8 @@
|
|
err = snd_pcm_hw_params_get_buffer_time_max(params,
|
|
&buffer_time, 0);
|
|
assert(err >= 0);
|
|
- if (buffer_time > 500000)
|
|
- buffer_time = 500000;
|
|
+ /* if (buffer_time > 500000) XXX WHO CARES?!?!?
|
|
+ buffer_time = 500000; */
|
|
}
|
|
if (period_time == 0 && period_frames == 0) {
|
|
if (buffer_time > 0)
|
|
--- aplay/formats.h.orig 2009-08-31 23:13:36.000000000 +0800
|
|
+++ aplay/formats.h 2009-09-15 01:22:05.000000000 +0800
|
|
@@ -1,8 +1,15 @@
|
|
#ifndef FORMATS_H
|
|
#define FORMATS_H 1
|
|
|
|
+#ifdef __FreeBSD__
|
|
+#include <sys/endian.h>
|
|
+#define bswap_16(x) bswap16(x)
|
|
+#define bswap_32(x) bswap32(x)
|
|
+#define bswap_64(x) bswap64(x)
|
|
+#else
|
|
#include <endian.h>
|
|
#include <byteswap.h>
|
|
+#endif
|
|
|
|
/* Definitions for .VOC files */
|
|
|
|
--- speaker-test/speaker-test.c.orig 2009-08-31 23:13:36.000000000 +0800
|
|
+++ speaker-test/speaker-test.c 2009-09-15 01:22:48.000000000 +0800
|
|
@@ -44,7 +44,9 @@
|
|
#include <getopt.h>
|
|
#include <inttypes.h>
|
|
#include <ctype.h>
|
|
+#ifndef __FreeBSD__
|
|
#include <byteswap.h>
|
|
+#endif
|
|
|
|
#define ALSA_PCM_NEW_HW_PARAMS_API
|
|
#define ALSA_PCM_NEW_SW_PARAMS_API
|