diff options
author | tron <tron@pkgsrc.org> | 2000-03-12 20:36:26 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2000-03-12 20:36:26 +0000 |
commit | 1c58c8d49f0275b4e0e3d28dcbb6fe548838ae51 (patch) | |
tree | 09ed5b1926f4a11e2b10e1b6ad10615bc1ffaa02 /audio/xmms/patches | |
parent | 9635b7a556f586b0b143a12fdf2495ae1d462009 (diff) | |
download | pkgsrc-1c58c8d49f0275b4e0e3d28dcbb6fe548838ae51.tar.gz |
- Use "pth" instead of "mit-pthreads".
- Reenable "libmikmod" support.
- Adapt CD-ROM driver to NetBSD.
- Correct package list.
Diffstat (limited to 'audio/xmms/patches')
-rw-r--r-- | audio/xmms/patches/patch-aa | 164 | ||||
-rw-r--r-- | audio/xmms/patches/patch-ae | 58 | ||||
-rw-r--r-- | audio/xmms/patches/patch-ai | 22 | ||||
-rw-r--r-- | audio/xmms/patches/patch-aj | 22 | ||||
-rw-r--r-- | audio/xmms/patches/patch-ak | 13 |
5 files changed, 262 insertions, 17 deletions
diff --git a/audio/xmms/patches/patch-aa b/audio/xmms/patches/patch-aa index d1d7c3cd886..3e51f7a928e 100644 --- a/audio/xmms/patches/patch-aa +++ b/audio/xmms/patches/patch-aa @@ -1,13 +1,153 @@ -$NetBSD: patch-aa,v 1.2 2000/03/07 23:03:13 tron Exp $ +$NetBSD: patch-aa,v 1.3 2000/03/12 20:36:27 tron Exp $ ---- Input/Makefile.in.orig Mon Jan 31 19:44:35 2000 -+++ Input/Makefile.in Tue Mar 7 23:25:17 2000 -@@ -125,7 +125,7 @@ - sidplay_library = @sidplay_library@ - xmmsdir = @xmmsdir@ - --SUBDIRS = wav mpg123 mikmod cdaudio idcin -+SUBDIRS = wav mpg123 cdaudio idcin - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = +--- Input/cdaudio/cdaudio.c.orig Thu Jan 27 21:30:36 2000 ++++ Input/cdaudio/cdaudio.c Sun Mar 12 18:00:27 2000 +@@ -113,10 +113,21 @@ + if (!cdda_cfg.directory) + cdda_cfg.directory = g_strdup("/cdrom"); + # else ++# ifdef __NetBSD__ ++ if (!cdda_cfg.device) ++# if RAW_PART == 3 ++ cdda_cfg.device = g_strdup("/dev/rcd0d"); ++# else ++ cdda_cfg.device = g_strdup("/dev/rcd0c"); ++# endif ++ if (!cdda_cfg.directory) ++ cdda_cfg.directory = g_strdup("/cdrom"); ++# else + if (!cdda_cfg.device) + cdda_cfg.device = g_strdup("/vol/dev/aliases/cdrom0"); + if (!cdda_cfg.directory) + cdda_cfg.directory = g_strdup("/cdrom/cdrom0"); ++# endif + # endif + #else + if (!cdda_cfg.device) +@@ -280,7 +291,7 @@ + { + if (cdda_fd < 0) + return; +-#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__) ++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__)) + ioctl(cdda_fd, CDIOCSTOP, 0); + #else + ioctl(cdda_fd, CDROMSTOP, 0); +@@ -291,8 +302,8 @@ + + static void cdda_pause(short p) + { +-#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__) +- ioctl(cdda_fd, p ? CDIOCPAUSE : CDIOCRESUME); ++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__)) ++ ioctl(cdda_fd, p ? CDIOCPAUSE : CDIOCRESUME, 0); + #else + ioctl(cdda_fd, p ? CDROMPAUSE : CDROMRESUME); + #endif +@@ -303,7 +314,7 @@ + { + struct cdda_msf *end, start; + +-#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__) ++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__)) + struct ioc_play_msf msf; + #else + struct cdrom_msf msf; +@@ -318,7 +329,7 @@ + else + end = &cd_toc.track[track + 1]; + +-#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__) ++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__)) + msf.start_m = start.minute; + msf.start_s = start.second; + msf.start_f = start.frame; +@@ -342,7 +353,7 @@ + static int get_time(void) + { + gint frame, start_frame, length; +-#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__) ++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__)) + struct ioc_read_subchannel subchnl; + struct cd_sub_channel_info subinfo; + +@@ -436,7 +447,7 @@ + if (!cdda_cfg.use_oss_mixer) + { + +-#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__) ++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__)) + struct ioc_vol vol; + + if (cdda_fd != -1) +@@ -464,7 +475,7 @@ + + static void set_volume(int l, int r) + { +-#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__) ++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__)) + struct ioc_vol vol; + #else + struct cdrom_volctrl vol; +@@ -497,7 +508,7 @@ + { + if (cdda_fd != -1) + { +-#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__) ++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__)) + vol.vol[0] = vol.vol[2] = (l * 255) / 100; + vol.vol[1] = vol.vol[3] = (r * 255) / 100; + ioctl(cdda_fd, CDIOCSETVOL, &vol); +@@ -521,6 +532,10 @@ + #if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__) + struct ioc_toc_header tochdr; + struct ioc_read_toc_single_entry tocentry; ++#elif defined(__NetBSD__) ++ struct ioc_toc_header tochdr; ++ struct ioc_read_toc_entry tocentry; ++ struct cd_toc_entry entry; + #else + struct cdrom_tochdr tochdr; + struct cdrom_tocentry tocentry; +@@ -564,6 +579,41 @@ + info->leadout.minute = tocentry.entry.addr.msf.minute; + info->leadout.second = tocentry.entry.addr.msf.second; + info->leadout.frame = tocentry.entry.addr.msf.frame; ++ ++ info->first_track = tochdr.starting_track; ++ info->last_track = tochdr.ending_track; ++ retv = TRUE; ++ ++#elif defined(HAVE_SYS_CDIO_H) && defined(__NetBSD__) ++ if ( ioctl(fd, CDIOREADTOCHEADER, &tochdr) ) ++ goto done; ++ ++ for (i = tochdr.starting_track; i <= tochdr.ending_track; i++) ++ { ++ tocentry.address_format = CD_MSF_FORMAT; ++ tocentry.starting_track = i; ++ tocentry.data_len = sizeof(entry); ++ tocentry.data = &entry; ++ if (ioctl(fd, CDIOREADTOCENTRIES, &tocentry)) ++ goto done; ++ info->track[i].minute = ++ entry.addr.msf.minute; ++ info->track[i].second = ++ entry.addr.msf.second; ++ info->track[i].frame = ++ entry.addr.msf.frame; ++ info->track[i].flags.data_track = ++ entry.control & 4 == 4; ++ } ++ ++ /* Get the leadout track */ ++ tocentry.starting_track = tochdr.ending_track + 1; ++ tocentry.address_format = CD_MSF_FORMAT; ++ if (ioctl(fd, CDIOREADTOCENTRIES, &tocentry)) ++ goto done; ++ info->leadout.minute = entry.addr.msf.minute; ++ info->leadout.second = entry.addr.msf.second; ++ info->leadout.frame = entry.addr.msf.frame; + + info->first_track = tochdr.starting_track; + info->last_track = tochdr.ending_track; diff --git a/audio/xmms/patches/patch-ae b/audio/xmms/patches/patch-ae index fcf15e24004..dc34f212bbb 100644 --- a/audio/xmms/patches/patch-ae +++ b/audio/xmms/patches/patch-ae @@ -1,15 +1,15 @@ -$NetBSD: patch-ae,v 1.1 2000/03/07 23:03:13 tron Exp $ +$NetBSD: patch-ae,v 1.2 2000/03/12 20:36:27 tron Exp $ --- configure.orig Mon Jan 31 19:43:50 2000 -+++ configure Tue Mar 7 23:25:18 2000 -@@ -1340,6 +1340,7 @@ ++++ configure Sun Mar 12 21:20:08 2000 +@@ -1339,6 +1339,7 @@ + fi - # Check for any special flags to pass to ltconfig. +if false; then + # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" - test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" @@ -1492,6 +1493,7 @@ # Always use our own libtool. @@ -18,3 +18,51 @@ $NetBSD: patch-ae,v 1.1 2000/03/07 23:03:13 tron Exp $ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. +@@ -3017,7 +3019,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lxml -lz $LIBS" ++LIBS="`$XML_CONFIG --libs` -lz $LIBS" + cat > conftest.$ac_ext <<EOF + #line 3023 "configure" + #include "confdefs.h" +@@ -3295,7 +3297,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lesd $LIBS" ++LIBS="`$ESD_CONFIG --libs` $LIBS" + cat > conftest.$ac_ext <<EOF + #line 3301 "configure" + #include "confdefs.h" +@@ -5311,10 +5313,10 @@ + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac ++# case "$ac_given_INSTALL" in ++# [/$]*) INSTALL="$ac_given_INSTALL" ;; ++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++# esac + + echo creating "$ac_file" + rm -f "$ac_file" +@@ -5535,10 +5537,10 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac ++# case "$ac_given_INSTALL" in ++# [/$]*) INSTALL="$ac_given_INSTALL" ;; ++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++# esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/audio/xmms/patches/patch-ai b/audio/xmms/patches/patch-ai new file mode 100644 index 00000000000..a1e1ce16587 --- /dev/null +++ b/audio/xmms/patches/patch-ai @@ -0,0 +1,22 @@ +$NetBSD: patch-ai,v 1.1 2000/03/12 20:36:27 tron Exp $ + +--- xmms/main.c.orig Mon Jan 31 19:35:16 2000 ++++ xmms/main.c Sun Mar 12 14:58:05 2000 +@@ -2945,7 +2945,7 @@ + gchar *filename; + gint i; + gboolean have_display = FALSE; +-#ifdef HAVE_SCHED_SETSCHEDULER ++#if defined(HAVE_SCHED_SETSCHEDULER) && !defined(__NetBSD__) + struct sched_param sparam; + + #endif +@@ -2988,7 +2988,7 @@ + + if (geteuid() == 0) + { +-#ifdef HAVE_SCHED_SETSCHEDULER ++#if defined(HAVE_SCHED_SETSCHEDULER) && !defined(__NetBSD__) + if (cfg.use_realtime) + { + sparam.sched_priority = sched_get_priority_max(SCHED_RR); diff --git a/audio/xmms/patches/patch-aj b/audio/xmms/patches/patch-aj new file mode 100644 index 00000000000..bc129701825 --- /dev/null +++ b/audio/xmms/patches/patch-aj @@ -0,0 +1,22 @@ +$NetBSD: patch-aj,v 1.1 2000/03/12 20:36:27 tron Exp $ +--- Input/cdaudio/cdaudio.h.orig Tue Jan 18 20:48:52 2000 ++++ Input/cdaudio/cdaudio.h Sun Mar 12 16:46:40 2000 +@@ -56,7 +56,7 @@ + #define CD_FRAMES 75 + #endif + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__NetBSD__) + /* + * FreeBSD won't be able to detect media changes if using O_NONBLOCK + */ +@@ -65,6 +65,9 @@ + #define CDOPENFLAGS (O_RDONLY | O_NONBLOCK) + #endif + ++#ifdef __NetBSD__ ++#include <machine/disklabel.h> ++#endif + + #define CDDB_DEFAULT_SERVER "freedb.freedb.org" + diff --git a/audio/xmms/patches/patch-ak b/audio/xmms/patches/patch-ak new file mode 100644 index 00000000000..e38671dbc9c --- /dev/null +++ b/audio/xmms/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2000/03/12 20:36:27 tron Exp $ + +--- wmxmms/Makefile.in.orig Mon Jan 31 19:44:47 2000 ++++ wmxmms/Makefile.in Sun Mar 12 20:58:15 2000 +@@ -148,7 +148,7 @@ + DEFS = @DEFS@ -I. -I$(srcdir) -I.. + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ @PTHREAD_LIBS@ + wmxmms_OBJECTS = getopt.o getopt1.o wmxmms.o + wmxmms_DEPENDENCIES = $(top_builddir)/libxmms/libxmms.la + wmxmms_LDFLAGS = |