diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2012-07-20 03:03:56 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2012-07-20 03:03:56 +0000 |
| commit | a28a1142b4467171d6609f3ac9176c4d58c097a2 (patch) | |
| tree | c7a3e61c5c5da998dd753fb51ff00dff21e0dd68 /audio/alsa-plugins/files/alsa-plugins.patch | |
| parent | - Update to 3.11 (diff) | |
- Update to 1.0.25
- 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)
Notes
Notes:
svn path=/head/; revision=301209
Diffstat (limited to 'audio/alsa-plugins/files/alsa-plugins.patch')
| -rw-r--r-- | audio/alsa-plugins/files/alsa-plugins.patch | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/audio/alsa-plugins/files/alsa-plugins.patch b/audio/alsa-plugins/files/alsa-plugins.patch index b285aa3accf4..c7ebabd0f3ad 100644 --- a/audio/alsa-plugins/files/alsa-plugins.patch +++ b/audio/alsa-plugins/files/alsa-plugins.patch @@ -1,29 +1,5 @@ ---- jack/pcm_jack.c.orig 2009-09-16 04:33:36.000000000 +0800 -+++ jack/pcm_jack.c 2009-09-16 04:33:55.000000000 +0800 -@@ -20,7 +20,9 @@ - * - */ - -+#ifndef __FreeBSD__ - #include <byteswap.h> -+#endif - #include <sys/shm.h> - #include <sys/types.h> - #include <sys/socket.h> --- oss/ctl_oss.c.orig 2009-08-31 21:09:41.000000000 +0800 +++ oss/ctl_oss.c 2009-09-15 01:07:51.000000000 +0800 -@@ -26,7 +26,11 @@ - #include <sys/ioctl.h> - #include <alsa/asoundlib.h> - #include <alsa/control_external.h> -+#ifdef __FreeBSD__ -+#include <sys/soundcard.h> -+#else - #include <linux/soundcard.h> -+#endif - - typedef struct snd_ctl_oss { - snd_ctl_ext_t ext; @@ -362,7 +366,9 @@ { snd_config_iterator_t it, next; @@ -66,15 +42,13 @@ 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,57 @@ +@@ -22,17 +22,55 @@ #include <sys/ioctl.h> #include <alsa/asoundlib.h> #include <alsa/pcm_external.h> + #include <linux/soundcard.h> +#ifdef __FreeBSD__ +#include <sys/param.h> -+#include <sys/soundcard.h> -+#else - #include <linux/soundcard.h> +#endif + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) |