diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-26 02:28:48 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-11-26 02:28:48 +0800 |
| commit | cf51f55398c42dd9bada5df6310bcac43d14863b (patch) | |
| tree | 11ce3450316db244b5d748a5744ac49ac38b77a6 /audio/gnomemedia2/files | |
| parent | b45a90ccb1d7956c11c3c0de7fa000c4bed732de (diff) | |
| download | marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar.gz marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar.bz2 marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar.lz marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar.xz marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.tar.zst marcuscom-ports-cf51f55398c42dd9bada5df6310bcac43d14863b.zip | |
Update to 2.5.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1376 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/gnomemedia2/files')
| -rw-r--r-- | audio/gnomemedia2/files/patch-ad | 31 | ||||
| -rw-r--r-- | audio/gnomemedia2/files/patch-gmix::prefs.c | 11 | ||||
| -rw-r--r-- | audio/gnomemedia2/files/patch-gmix_gmix.h | 11 |
3 files changed, 0 insertions, 53 deletions
diff --git a/audio/gnomemedia2/files/patch-ad b/audio/gnomemedia2/files/patch-ad deleted file mode 100644 index f49a888a5..000000000 --- a/audio/gnomemedia2/files/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ ---- gmix/gmix.c.orig Tue Oct 8 19:40:43 2002 -+++ gmix/gmix.c Fri Oct 11 09:20:13 2002 -@@ -60,7 +60,7 @@ - #ifdef HAVE_LINUX_SOUNDCARD_H - #include <linux/soundcard.h> - #else --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #endif - #endif - -@@ -722,6 +722,7 @@ - - cnt = 0; - devices = NULL; -+ num_mixers = 0; - device_by_name = g_hash_table_new (g_str_hash, g_str_equal); - - do { -@@ -730,9 +731,8 @@ - devices = g_list_append (devices, new_device); - g_hash_table_insert (device_by_name, new_device->info.name, new_device); - } -- } while (new_device); -- -- num_mixers = cnt - 1; -+ } while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \ -+ || new_device); - } - - device_info * diff --git a/audio/gnomemedia2/files/patch-gmix::prefs.c b/audio/gnomemedia2/files/patch-gmix::prefs.c deleted file mode 100644 index b25b42b97..000000000 --- a/audio/gnomemedia2/files/patch-gmix::prefs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gmix/prefs.c.orig Tue May 7 00:52:42 2002 -+++ gmix/prefs.c Tue May 7 00:52:54 2002 -@@ -38,7 +38,7 @@ - #ifdef HAVE_LINUX_SOUNDCARD_H - #include <linux/soundcard.h> - #else --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #endif - #endif - diff --git a/audio/gnomemedia2/files/patch-gmix_gmix.h b/audio/gnomemedia2/files/patch-gmix_gmix.h deleted file mode 100644 index 600110df6..000000000 --- a/audio/gnomemedia2/files/patch-gmix_gmix.h +++ /dev/null @@ -1,11 +0,0 @@ ---- gmix/gmix.h.orig Sat Aug 16 15:13:57 2003 -+++ gmix/gmix.h Sat Aug 16 15:14:47 2003 -@@ -25,7 +25,7 @@ - */ - #define GMIX_VERSION 0x030000 - --#if defined(ALSA) || defined(__FreeBSD__) -+#if defined(ALSA) || (defined(__FreeBSD__) && !defined(SOUND_MIXER_INFO)) - /* stolen from OSS's soundcard.h */ - typedef struct mixer_info - { |