From 010257c8a50d49ff271980a8f48125c3ea2dc7d7 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 12 Mar 2000 20:36:26 +0000 Subject: - Use "pth" instead of "mit-pthreads". - Reenable "libmikmod" support. - Adapt CD-ROM driver to NetBSD. - Correct package list. --- audio/xmms/Makefile | 33 +++++---- audio/xmms/files/patch-sum | 9 ++- audio/xmms/patches/patch-aa | 164 ++++++++++++++++++++++++++++++++++++++++---- audio/xmms/patches/patch-ae | 58 ++++++++++++++-- audio/xmms/patches/patch-ai | 22 ++++++ audio/xmms/patches/patch-aj | 22 ++++++ audio/xmms/patches/patch-ak | 13 ++++ audio/xmms/pkg/PLIST | 64 ++++++++++------- 8 files changed, 327 insertions(+), 58 deletions(-) create mode 100644 audio/xmms/patches/patch-ai create mode 100644 audio/xmms/patches/patch-aj create mode 100644 audio/xmms/patches/patch-ak diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index 38b0e442281..32c98d17d51 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/03/11 16:22:04 tron Exp $ +# $NetBSD: Makefile,v 1.4 2000/03/12 20:36:26 tron Exp $ # FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp DISTNAME= xmms-1.0.1 @@ -18,24 +18,29 @@ DEPENDS+= Mesa-*:../../graphics/Mesa DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= libmikmod>=3.1.7:../libmikmod DEPENDS+= libxml>=1.8.5:../../textproc/libxml -DEPENDS+= mit-pthreads-*:../../devel/mit-pthreads +DEPENDS+= pth>=1.3.2:../../devel/pth USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-gnome -CC= ${LOCALBASE}/pthreads/bin/pgcc -LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS+= --without-gnome +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ + XML_CONFIG="${LOCALBASE}/bin/xml-config" -post-extract: +.include <../../mk/bsd.prefs.mk> + +.if (${OPSYS} == NetBSD) +CPPFLAGS+= -I${WRKDIR} + +post-patch: cd ${WRKSRC}/Input/mpg123 && \ - ${MV} decode_i586.s decode_i586.S && \ - ${MV} getbits.s getbits.S && \ - ${MV} Makefile.in Makefile.in.old && \ - ${SED} -e 's:\.s :\.S :g' Makefile.in - cd ${WRKSRC}/Visualization/blur_scope && \ - ${MV} blur_8.s blur_8.S && \ - ${MV} Makefile.in Makefile.in.old && \ - ${SED} -e 's:blur_8.s:blur_8.S:g' Makefile.in + ${MV} decode_i586.s decode_i586.s.orig && \ + ${SED} -e 's@^/@#/@g' decode_i586.s + +pre-configure: + ${MKDIR} ${WRKDIR}/sys + ${LN} -fs /usr/include/soundcard.h ${WRKDIR}/sys/soundcard.h +.endif .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms/files/patch-sum b/audio/xmms/files/patch-sum index e8d67827ec6..6c7c76d98a6 100644 --- a/audio/xmms/files/patch-sum +++ b/audio/xmms/files/patch-sum @@ -1,10 +1,13 @@ -$NetBSD: patch-sum,v 1.1 2000/03/07 23:03:13 tron Exp $ +$NetBSD: patch-sum,v 1.2 2000/03/12 20:36:26 tron Exp $ -MD5 (patch-aa) = ccac73d0e743c748cc116985cf7161cf +MD5 (patch-aa) = 6baf24a23b13f5d17300258c06b8eb7c MD5 (patch-ab) = 4030687175bf4bab9bb098150e15323a MD5 (patch-ac) = ff78dda0c8c7de0e796a04dd6ba6991c MD5 (patch-ad) = 0980675c9c1896eca7188bffd02d7cbd -MD5 (patch-ae) = d27a91e144f260c7f369f793c2da3ca1 +MD5 (patch-ae) = 55aa95366499b0f8e03d28900b2765ea MD5 (patch-af) = 0cb7493fcd03dc2e213a0c4cc0d1e63e MD5 (patch-ag) = ff4bbfada5d95d0a083cf60fdf2568bb MD5 (patch-ah) = 27624c39b2779ef2b2aaa024510c3bc0 +MD5 (patch-ai) = 0c0312b432eed6555ceb0c05edf6af90 +MD5 (patch-aj) = 190080be81a0f7b36ce304b399fdab2c +MD5 (patch-ak) = 58b8fc79c5d74b516dd481e2cd7b01f1 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 <&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lesd $LIBS" ++LIBS="`$ESD_CONFIG --libs` $LIBS" + cat > conftest.$ac_ext < ++#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 = diff --git a/audio/xmms/pkg/PLIST b/audio/xmms/pkg/PLIST index b6c8d8ee951..402fef1e4c8 100644 --- a/audio/xmms/pkg/PLIST +++ b/audio/xmms/pkg/PLIST @@ -1,37 +1,53 @@ -@comment $NetBSD: PLIST,v 1.2 2000/03/07 23:03:14 tron Exp $ -bin/xmms +@comment $NetBSD: PLIST,v 1.3 2000/03/12 20:36:27 tron Exp $ bin/wmxmms +bin/xmms bin/xmms-config include/xmms/configfile.h -include/xmms/xmmsctrl.h +include/xmms/dga.h include/xmms/dirbrowser.h -include/xmms/util.h include/xmms/fullscreen.h -include/xmms/dga.h include/xmms/plugin.h -lib/xmms/Output/libOSS.so -lib/xmms/Output/libdisk_writer.so -lib/xmms/Input/libwav.so -lib/xmms/Input/libmpg123.so -lib/xmms/Input/libcdaudio.so -lib/xmms/Input/libidcin.so -lib/xmms/Effect/libvoice.so -lib/xmms/Effect/libecho.so -lib/xmms/Effect/libstereo.so -lib/xmms/Effect/libsrndecho.so -lib/xmms/General/libir.so -lib/xmms/General/libsong_change.so -lib/xmms/Visualization/libbscope.so -lib/xmms/Visualization/libsanalyzer.so -lib/libxmms.so.1.0 +include/xmms/util.h +include/xmms/xmmsctrl.h lib/libxmms.a +lib/libxmms.so.1.0 +lib/xmms/Effect/libecho.a +lib/xmms/Effect/libecho.so.0.0 +lib/xmms/Effect/libsrndecho.a +lib/xmms/Effect/libsrndecho.so.0.0 +lib/xmms/Effect/libstereo.a +lib/xmms/Effect/libstereo.so.0.0 +lib/xmms/Effect/libvoice.a +lib/xmms/Effect/libvoice.so.0.0 +lib/xmms/General/libir.a +lib/xmms/General/libir.so.0.0 +lib/xmms/General/libsong_change.a +lib/xmms/General/libsong_change.so.0.0 +lib/xmms/Input/libcdaudio.a +lib/xmms/Input/libcdaudio.so.0.0 +lib/xmms/Input/libidcin.a +lib/xmms/Input/libidcin.so.0.0 +lib/xmms/Input/libmikmod.a +lib/xmms/Input/libmikmod.so.0.0 +lib/xmms/Input/libmpg123.a +lib/xmms/Input/libmpg123.so.0.0 +lib/xmms/Input/libwav.a +lib/xmms/Input/libwav.so.0.0 +lib/xmms/Output/libOSS.a +lib/xmms/Output/libOSS.so.0.0 +lib/xmms/Output/libdisk_writer.a +lib/xmms/Output/libdisk_writer.so.0.0 +lib/xmms/Visualization/libbscope.a +lib/xmms/Visualization/libbscope.so.0.0 +lib/xmms/Visualization/libsanalyzer.a +lib/xmms/Visualization/libsanalyzer.so.0.0 share/aclocal/xmms.m4 share/xmms/wmxmms.xpm -@dirrm include/xmms +@dirrm share/xmms +@dirrm lib/xmms/Visualization @dirrm lib/xmms/Output @dirrm lib/xmms/Input -@dirrm lib/xmms/Effect @dirrm lib/xmms/General -@dirrm lib/xmms/Visualization +@dirrm lib/xmms/Effect @dirrm lib/xmms -@dirrm share/xmms +@dirrm include/xmms -- cgit v1.2.3