diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/libxine/Makefile | 2 | ||||
-rw-r--r-- | multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c | 118 |
2 files changed, 119 insertions, 1 deletions
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 1dca74c0fe56..1ec332fbe24a 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -7,7 +7,7 @@ PORTNAME= xine PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c b/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c new file mode 100644 index 000000000000..22a0dc4837db --- /dev/null +++ b/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c @@ -0,0 +1,118 @@ +--- src/audio_out/audio_oss_out.c.orig Mon Dec 13 07:01:02 2004 ++++ src/audio_out/audio_oss_out.c Mon Jan 30 03:02:46 2006 +@@ -155,7 +155,7 @@ + uint32_t bits, uint32_t rate, int mode) { + + oss_driver_t *this = (oss_driver_t *) this_gen; +- int tmp; ++ long tmp; + + xprintf(this->xine, XINE_VERBOSITY_DEBUG, + "audio_oss_out: ao_open rate=%d, mode=%d, dev=%s\n", rate, mode, this->audio_dev); +@@ -287,14 +287,14 @@ + if (bits==8) { + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: SNDCTL_DSP_SETFMT failed for AFMT_U8.\n"); + if (tmp != AFMT_U8) +- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: ioctl succeeded but set format to 0x%x.\n",tmp); ++ xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: ioctl succeeded but set format to 0x%lx.\n",tmp); + else + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: The AFMT_U8 ioctl failed.\n"); + return 0; + } else { + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: SNDCTL_DSP_SETFMT failed for AFMT_S16_NE.\n"); + if (tmp != AFMT_S16_NE) +- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: ioctl succeeded but set format to 0x%x.\n",tmp); ++ xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: ioctl succeeded but set format to 0x%lx.\n",tmp); + else + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: The AFMT_S16_NE ioctl failed.\n"); + return 0; +@@ -313,7 +313,7 @@ + tmp = AFMT_AC3; + if (ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp) < 0 || tmp != AFMT_AC3) { + xprintf(this->xine, XINE_VERBOSITY_DEBUG, +- "audio_oss_out: AC3 SNDCTL_DSP_SETFMT failed. %d. Using alternative.\n",tmp); ++ "audio_oss_out: AC3 SNDCTL_DSP_SETFMT failed. %ld. Using alternative.\n",tmp); + tmp = AFMT_S16_LE; + ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp); + } +@@ -369,7 +369,7 @@ + + count_info info; + oss_driver_t *this = (oss_driver_t *) this_gen; +- int bytes_left; ++ long bytes_left; + int frames; + struct timeval tv; + +@@ -507,7 +507,7 @@ + static int ao_oss_get_property (ao_driver_t *this_gen, int property) { + + oss_driver_t *this = (oss_driver_t *) this_gen; +- int audio_devs; ++ long audio_devs; + + switch(property) { + case AO_PROP_PCM_VOL: +@@ -515,8 +515,8 @@ + if(!this->mixer.mute) { + + if(this->mixer.fd != -1) { +- int cmd = 0; +- int v; ++ long cmd = 0; ++ long v; + + ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs); + +@@ -546,7 +546,7 @@ + static int ao_oss_set_property (ao_driver_t *this_gen, int property, int value) { + + oss_driver_t *this = (oss_driver_t *) this_gen; +- int audio_devs; ++ long audio_devs; + + switch(property) { + case AO_PROP_PCM_VOL: +@@ -554,8 +554,8 @@ + if(!this->mixer.mute) { + + if(this->mixer.fd != -1) { +- int cmd = 0; +- int v; ++ long cmd = 0; ++ long v; + + ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs); + +@@ -583,8 +583,8 @@ + if(this->mixer.mute) { + + if(this->mixer.fd != -1) { +- int cmd = 0; +- int v = 0; ++ long cmd = 0; ++ long v = 0; + + ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs); + +@@ -657,7 +657,7 @@ + static int probe_audio_devices(oss_driver_t *this) { + const char *base_names[2] = {"/dev/dsp", "/dev/sound/dsp"}; + int base_num, i; +- int audio_fd, rate; ++ long audio_fd, rate; + int best_rate; + char devname[30]; + +@@ -696,9 +696,9 @@ + oss_class_t *class = (oss_class_t *) class_gen; + config_values_t *config = class->config; + oss_driver_t *this; +- int caps; ++ long caps; + int audio_fd; +- int num_channels, status, arg; ++ long num_channels, status, arg; + static char *sync_methods[] = {"auto", "getodelay", "getoptr", "softsync", "probebuffer", NULL}; + static char *devname_opts[] = {"auto", "/dev/dsp", "/dev/sound/dsp", NULL}; + int devname_val, devname_num; |