diff options
author | drochner <drochner@pkgsrc.org> | 2002-03-21 18:52:30 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2002-03-21 18:52:30 +0000 |
commit | 74b7beec16f713448324bd5150988dcd031bf0cd (patch) | |
tree | 8eb66e707e8af7f3d6e1a750e8ce701b962d9711 /audio | |
parent | b312df79aa49d7b4594ac332757873ddf127b71a (diff) | |
download | pkgsrc-74b7beec16f713448324bd5150988dcd031bf0cd.tar.gz |
update to 1.2.7
changes:
General:
* Replaced folder icons. New ones by Jakub Steiner.
* Don't display playlist numbers elsewhere when turned off.
* Support 32-bit and 16-bit "bitfield" bmps in skins.
CD Audio:
* Supply a dummy user and hostname to the cddb server.
* Picked up support for Darwin (from FINK cvs) and NetBSD
(from NetBSD cvs)
MPG123:
* Handle UTF-16 encoded tags.
* Major stability fixes
Translation/Internationalization:
* New translations: Basque (eu), Tajik (tg), Vietnamese (vi),
Nynorsk (nn), Thai (th).
General:
* --play-pause command to toggle playback.
* Updated README/man pages.
* Added xmms_remote_play_pause(),
xmms_remote_playlist_ins_url_string()
* Realtime priority works again, it was broken in 1.2.5.
* bzip2 skins should now work regardless of Tar version.
* Key bindings are now saved when you exit XMMS.
* NetWM support updated to the latest specs.
* Handles @ in URL's properly if username:password@host is not
used.
Playlist:
* Added 'Sort by date'
* Page Up/Down keys scrolls one page, instead of the 3 line
inheritance from Winamp.
* Extended M3U lists now supported.
* Added reading of playlist info for selection.
Equalizer:
* Added Import/WinAMP Presets to the preset menu to import an
entire set of WinAMP presets (WINAMP.q1) into the
preset list.
Vorbis:
* Fixed an endianess problem on smallendian boxes
* 1.0rc1 or higher required.
MPG123:
* Handle more broken mp3s.
* No more "-" for mp3s with ID3v2 tags that contain no usable
information.
* VBR files without XING header are now handled more gracefully.
Mikmod:
* Mikmod plugin now recognizes mod.* files.
CD Audio:
* Setting the environmental variable XMMS_CDDB_CLIENT_NAME,
will make XMMS use that instead when identifying
to CDDB servers.
* Better handling of CDDB requests.
* Don't poll current time when paused, can cause weird things
on some drives.
OSS Output:
* Do endian/sign conversion if necessary.
ESD Output:
* Will use ESD stream volume instead of the OSS mixer as default.
* Assorted bugfixes/memleaks plugged.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/xmms/Makefile | 6 | ||||
-rw-r--r-- | audio/xmms/PLIST | 11 | ||||
-rw-r--r-- | audio/xmms/distinfo | 20 | ||||
-rw-r--r-- | audio/xmms/patches/patch-aa | 184 | ||||
-rw-r--r-- | audio/xmms/patches/patch-ai | 20 | ||||
-rw-r--r-- | audio/xmms/patches/patch-ak | 10 | ||||
-rw-r--r-- | audio/xmms/patches/patch-al | 20 | ||||
-rw-r--r-- | audio/xmms/patches/patch-am | 10 | ||||
-rw-r--r-- | audio/xmms/patches/patch-an | 12 | ||||
-rw-r--r-- | audio/xmms/patches/patch-ao | 16 | ||||
-rw-r--r-- | audio/xmms/patches/patch-as | 13 |
11 files changed, 119 insertions, 203 deletions
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index 26fcfc52e75..1e2feabeb42 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2001/11/06 00:30:47 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2002/03/21 18:52:30 drochner Exp $ # FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp -DISTNAME= xmms-1.2.5 +DISTNAME= xmms-1.2.7 CATEGORIES= audio MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ \ ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/ @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 CONFIGURE_ARGS+= --without-gnome -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/bsd.prefs.mk" diff --git a/audio/xmms/PLIST b/audio/xmms/PLIST index c3554e64c92..07889f06eb1 100644 --- a/audio/xmms/PLIST +++ b/audio/xmms/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:23 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/21 18:52:31 drochner Exp $ bin/wmxmms bin/xmms bin/xmms-config @@ -13,8 +13,8 @@ include/xmms/xmmsctrl.h lib/libxmms.a lib/libxmms.la lib/libxmms.so -lib/libxmms.so.2 -lib/libxmms.so.2.0 +lib/libxmms.so.3 +lib/libxmms.so.3.1 lib/xmms/Effect/libecho.la lib/xmms/Effect/libecho.a lib/xmms/Effect/libecho.so @@ -76,6 +76,7 @@ ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xmms.mo +${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/xmms.mo @@ -83,6 +84,7 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xmms.mo +${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xmms.mo @@ -104,7 +106,10 @@ ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xmms.mo +${PKGLOCALEDIR}/locale/tg/LC_MESSAGES/xmms.mo +${PKGLOCALEDIR}/locale/th/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xmms.mo +${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xmms.mo diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo index 57131ed4ec1..4e6ffe00b06 100644 --- a/audio/xmms/distinfo +++ b/audio/xmms/distinfo @@ -1,20 +1,20 @@ -$NetBSD: distinfo,v 1.8 2001/12/24 15:13:01 mycroft Exp $ +$NetBSD: distinfo,v 1.9 2002/03/21 18:52:31 drochner Exp $ -SHA1 (xmms-1.2.5.tar.gz) = 64d64a6db0b08ba91a135229437c384da7dba1e5 -Size (xmms-1.2.5.tar.gz) = 2414840 bytes -SHA1 (patch-aa) = c876da295aab062a93dd6e1a16ef8105ff976417 +SHA1 (xmms-1.2.7.tar.gz) = 2f910d88af9bb5e8d54e796653beef969b555c68 +Size (xmms-1.2.7.tar.gz) = 2860908 bytes +SHA1 (patch-aa) = b1945d9d161cc538e5dda1014571f582be1a951c SHA1 (patch-ab) = 6f236de07dcd7ce8a2325effe038e42ea4222250 SHA1 (patch-ae) = 1e486f43bfe8dbafbbea3db3781ec08196184ee2 SHA1 (patch-af) = 472e2504fae530b34785e18d38d6f45891494a6d SHA1 (patch-ag) = 24a56ba54752994806518872d03709559f5ac620 SHA1 (patch-ah) = 1c83d665d2473692a3a9feae625f48c420849d6a -SHA1 (patch-ai) = d05ba576dc40dd29d59c571fbab369d83fbe0b06 +SHA1 (patch-ai) = 5d22db1a133b3580d6fb241835a30259567b838a SHA1 (patch-aj) = 95e965c5033dea5d2b0be2a22058f19504da0031 -SHA1 (patch-ak) = d31768078e5d35ba3a15e82a221ce6fc5f86b9ce -SHA1 (patch-al) = 969b5ff79a80f28071517b82c57cfd9d605db863 -SHA1 (patch-am) = 0de11b998fcf90f64c2e8442edc427e3bc49653c -SHA1 (patch-an) = 2a622693d825c631e36f73bc35a9639c40071564 -SHA1 (patch-ao) = 428e1083a104358d752ddc483310a97764cb6979 +SHA1 (patch-ak) = 83f26d8d0a80def2ee28aa09f3261ff97d019dbf +SHA1 (patch-al) = caae7feb9ddc7a1d51c734b5f9a1eb669279066e +SHA1 (patch-am) = eb86d881c229b73e37efc1e6fec7d806699fc2c2 +SHA1 (patch-an) = e4169817fbdd978dd8c97cafa3447df277e53ecf SHA1 (patch-ap) = 493a4d81960b4d11548b8f277c00b8315339ac02 SHA1 (patch-aq) = 3eb19fbebfc0ea68cd6703b6b3d1a706406b1aee SHA1 (patch-ar) = ef35ce733dceac323119b5bbb3065164fac87c74 +SHA1 (patch-as) = 1f62167c7901e8d2211f39a25e6f902935a413b1 diff --git a/audio/xmms/patches/patch-aa b/audio/xmms/patches/patch-aa index 21ec8131f77..4ce316e457f 100644 --- a/audio/xmms/patches/patch-aa +++ b/audio/xmms/patches/patch-aa @@ -1,150 +1,66 @@ -$NetBSD: patch-aa,v 1.5 2001/06/21 16:38:33 rh Exp $ +$NetBSD: patch-aa,v 1.6 2002/03/21 18:52:31 drochner Exp $ ---- Input/cdaudio/cdaudio.c.orig Tue Mar 13 15:16:07 2001 -+++ Input/cdaudio/cdaudio.c -@@ -96,7 +96,7 @@ - #define STOP_UNLOCK() pthread_mutex_unlock(&stop_mutex) - - --#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))) -+#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))) - static gint volume_left = 100, volume_right = 100; - #endif - -@@ -140,9 +140,13 @@ - cdda_cfg.device = g_strdup("/dev/acd0c"); - if (!cdda_cfg.directory) - cdda_cfg.directory = g_strdup("/cdrom"); --# elif defined __OpenBSD__ -+# elif defined(__NetBSD__) || defined(__OpenBSD__) - if (!cdda_cfg.device) -+# if RAW_PART == 3 -+ cdda_cfg.device = g_strdup("/dev/cd0d"); -+# else - cdda_cfg.device = g_strdup("/dev/cd0c"); -+# endif - if (!cdda_cfg.directory) - cdda_cfg.directory = g_strdup("/cdrom"); - # else -@@ -412,7 +416,7 @@ - pthread_attr_setdetachstate(attr, PTHREAD_CREATE_DETACHED); +--- Input/cdaudio/cdaudio.c.orig Tue Feb 5 15:39:11 2002 ++++ Input/cdaudio/cdaudio.c Thu Mar 21 19:08:26 2002 +@@ -398,7 +398,7 @@ + if (cdda_fd < 0) + return; + +- ioctl(cdda_fd, XMMS_PAUSE); ++ ioctl(cdda_fd, XMMS_PAUSE, 0); + close(cdda_fd); + cdda_fd = -1; + stop_timeout_id = gtk_timeout_add(STOP_DELAY * 100, stop_timeout, NULL); +@@ -409,11 +409,11 @@ + if (p) + { + pause_time = get_time(); +- ioctl(cdda_fd, XMMS_PAUSE); ++ ioctl(cdda_fd, XMMS_PAUSE, 0); } - --#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) -+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) - /* ioctl(cdda_fd, CDIOCSTOP, 0); */ - ioctl(cdda_fd, CDIOCPAUSE, 0); - #else -@@ -430,8 +434,8 @@ - - static void cdda_pause(short p) - { --#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) -- ioctl(cdda_fd, p ? CDIOCPAUSE : CDIOCRESUME); -+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) -+ ioctl(cdda_fd, p ? CDIOCPAUSE : CDIOCRESUME, 0); - #else - ioctl(cdda_fd, p ? CDROMPAUSE : CDROMRESUME); - #endif -@@ -442,7 +446,7 @@ - { - struct cdda_msf *end, start; - --#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) -+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) - struct ioc_play_msf msf; - #else - struct cdrom_msf msf; -@@ -457,7 +461,7 @@ else - end = &cd_toc.track[track + 1]; - --#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) -+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) - msf.start_m = start.minute; - msf.start_s = start.second; - msf.start_f = start.frame; -@@ -481,7 +485,7 @@ - static int get_time(void) - { - gint frame, start_frame, length; --#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) -+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) - struct ioc_read_subchannel subchnl; - struct cd_sub_channel_info subinfo; - -@@ -572,7 +576,7 @@ - if (!cdda_cfg.use_oss_mixer) - { - --#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) -+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) - struct ioc_vol vol; - - if (cdda_fd != -1) -@@ -600,7 +604,7 @@ - - static void set_volume(int l, int r) - { --#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) -+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) - struct ioc_vol vol; - #else - struct cdrom_volctrl vol; -@@ -633,7 +637,7 @@ { - if (cdda_fd != -1) - { --#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) -+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) - vol.vol[0] = vol.vol[2] = (l * 255) / 100; - vol.vol[1] = vol.vol[3] = (r * 255) / 100; - ioctl(cdda_fd, CDIOCSETVOL, &vol); -@@ -643,7 +647,7 @@ - ioctl(cdda_fd, CDROMVOLCTRL, &vol); - #endif - } --#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))) -+#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))) - volume_left = l; - volume_right = r; - #endif -@@ -654,9 +658,9 @@ +- ioctl(cdda_fd, XMMS_RESUME); ++ ioctl(cdda_fd, XMMS_RESUME, 0); + pause_time = -1; + } + is_paused = p; +@@ -554,9 +554,11 @@ + struct cd_sub_channel_info subinfo; + subchnl.address_format = CD_MSF_FORMAT; + subchnl.data_format = CD_CURRENT_POSITION; ++ subchnl.track = 0; + subchnl.data_len = sizeof(subinfo); + subchnl.data = &subinfo; +- ioctl(cdda_fd, CDIOCREADSUBCHANNEL, &subchnl); ++ if (ioctl(cdda_fd, CDIOCREADSUBCHANNEL, &subchnl)) ++ return (-1); + + return(LBA(subchnl.data->what.position.absaddr.msf)); + } +@@ -591,6 +593,7 @@ { - gboolean retv = FALSE; - --#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) -+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) struct ioc_toc_header tochdr; --#if defined(__OpenBSD__) -+#if defined(__NetBSD__) || defined(__OpenBSD__) struct ioc_read_toc_entry tocentry; - #else - struct ioc_read_toc_single_entry tocentry; -@@ -676,7 +680,7 @@ - - memset(info, 0, sizeof(cdda_disc_toc_t)); - --#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) -+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) - if ( ioctl(fd, CDIOREADTOCHEADER, &tochdr) ) - goto done; ++ struct cd_toc_entry tocentrydata; + int i; -@@ -684,7 +688,7 @@ - { + if (ioctl(fd, CDIOREADTOCHEADER, &tochdr)) +@@ -601,6 +604,8 @@ tocentry.address_format = CD_MSF_FORMAT; --#if defined(__OpenBSD__) -+#if defined(__NetBSD__) || defined(__OpenBSD__) tocentry.starting_track = i; ++ tocentry.data = &tocentrydata; ++ tocentry.data_len = sizeof(tocentrydata); if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry)) - goto done; -@@ -714,7 +718,7 @@ - /* Get the leadout track */ + return FALSE; + info->track[i].minute = +@@ -617,6 +622,8 @@ tocentry.address_format = CD_MSF_FORMAT; --#if defined(__OpenBSD__) -+#if defined(__NetBSD__) || defined(__OpenBSD__) tocentry.starting_track = 0xAA; ++ tocentry.data = &tocentrydata; ++ tocentry.data_len = sizeof(tocentrydata); if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry)) - goto done; + return FALSE; + info->leadout.minute = tocentry.data->addr.msf.minute; diff --git a/audio/xmms/patches/patch-ai b/audio/xmms/patches/patch-ai index 0181351c125..b9854e37e68 100644 --- a/audio/xmms/patches/patch-ai +++ b/audio/xmms/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.4 2001/06/21 16:38:34 rh Exp $ +$NetBSD: patch-ai,v 1.5 2002/03/21 18:52:31 drochner Exp $ ---- xmms/main.c.orig Sun Jun 17 01:05:47 2001 -+++ xmms/main.c -@@ -36,6 +36,23 @@ +--- xmms/main.c.orig Wed Feb 27 15:30:28 2002 ++++ xmms/main.c Thu Mar 21 12:58:10 2002 +@@ -37,6 +37,23 @@ #include "libxmms/dirbrowser.h" #include "xmms_mini.xpm" @@ -26,16 +26,16 @@ $NetBSD: patch-ai,v 1.4 2001/06/21 16:38:34 rh Exp $ GtkWidget *mainwin, *mainwin_url_window = NULL, *mainwin_dir_browser = NULL; GtkWidget *mainwin_jtt = NULL, *mainwin_jtf = NULL; GtkItemFactory *mainwin_options_menu, *mainwin_songname_menu, *mainwin_vis_menu; -@@ -3330,7 +3347,7 @@ +@@ -3377,7 +3394,7 @@ { gchar *filename; struct cmdlineopt options; -#if defined(HAVE_SCHED_SETSCHEDULER) && defined(HAVE_SCHED_GET_PRIORITY_MAX) +#if defined(HAVE_SCHED_SETSCHEDULER) && defined(HAVE_SCHED_GET_PRIORITY_MAX) && !defined(__NetBSD__) struct sched_param sparam; - #endif -@@ -3361,7 +3378,7 @@ + +@@ -3408,7 +3425,7 @@ if (geteuid() == 0) { @@ -44,15 +44,13 @@ $NetBSD: patch-ai,v 1.4 2001/06/21 16:38:34 rh Exp $ if (cfg.use_realtime) { sparam.sched_priority = sched_get_priority_max(SCHED_RR); -@@ -3450,6 +3467,11 @@ - +@@ -3501,6 +3518,9 @@ /* enable_x11r5_session_management(argc, argv); */ sm_init(argc, argv); -+ + GDK_THREADS_LEAVE(); +#ifdef __NetBSD__ + gtk_timeout_add (150, pth_nbschedule, NULL); +#endif -+ gtk_main(); return 0; diff --git a/audio/xmms/patches/patch-ak b/audio/xmms/patches/patch-ak index 29400de2355..bbf535dde65 100644 --- a/audio/xmms/patches/patch-ak +++ b/audio/xmms/patches/patch-ak @@ -1,13 +1,13 @@ -$NetBSD: patch-ak,v 1.4 2001/12/24 15:13:02 mycroft Exp $ +$NetBSD: patch-ak,v 1.5 2002/03/21 18:52:32 drochner Exp $ ---- wmxmms/Makefile.in.orig Mon Jun 18 21:56:09 2001 -+++ wmxmms/Makefile.in -@@ -180,7 +180,7 @@ +--- wmxmms/Makefile.in.orig Mon Mar 4 22:59:06 2002 ++++ wmxmms/Makefile.in Thu Mar 21 12:59:57 2002 +@@ -190,7 +190,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I../xmms CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ +LIBS = @LIBS@ @PTHREAD_LIBS@ @XML_LIBS@ - wmxmms_OBJECTS = getopt.o getopt1.o wmxmms.o + wmxmms_OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) wmxmms.$(OBJEXT) wmxmms_DEPENDENCIES = $(top_builddir)/libxmms/libxmms.la wmxmms_LDFLAGS = diff --git a/audio/xmms/patches/patch-al b/audio/xmms/patches/patch-al index 08fdec2a6d4..c72a1db7b20 100644 --- a/audio/xmms/patches/patch-al +++ b/audio/xmms/patches/patch-al @@ -1,22 +1,22 @@ -$NetBSD: patch-al,v 1.4 2001/12/24 15:13:03 mycroft Exp $ +$NetBSD: patch-al,v 1.5 2002/03/21 18:52:32 drochner Exp $ ---- xmms/Makefile.in.orig Mon Jun 18 19:55:30 2001 -+++ xmms/Makefile.in Mon Dec 24 14:20:38 2001 -@@ -163,7 +163,7 @@ +--- xmms/Makefile.in.orig Mon Mar 4 22:58:25 2002 ++++ xmms/Makefile.in Thu Mar 21 13:01:51 2002 +@@ -168,7 +168,7 @@ bin_PROGRAMS = xmms -xmms_LDFLAGS = -export-dynamic +xmms_LDFLAGS = -export-dynamic -Wl,--whole-archive -Wl,-lgcc -Wl,--no-whole-archive - xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ @POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @INTLLIBS@ + xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \ + @POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @INTLLIBS@ - -@@ -184,7 +184,7 @@ +@@ -235,7 +235,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ +LIBS = @LIBS@ @XML_LIBS@ - xmms_OBJECTS = bmp.o skin.o util.o output.o fft.o input.o effect.o \ - general.o visualization.o fullscreen.o pluginenum.o playlist.o \ - controlsocket.o dock.o widget.o sbutton.o pbutton.o tbutton.o textbox.o \ + xmms_OBJECTS = bmp.$(OBJEXT) skin.$(OBJEXT) util.$(OBJEXT) \ + output.$(OBJEXT) fft.$(OBJEXT) input.$(OBJEXT) effect.$(OBJEXT) \ + general.$(OBJEXT) visualization.$(OBJEXT) fullscreen.$(OBJEXT) \ diff --git a/audio/xmms/patches/patch-am b/audio/xmms/patches/patch-am index a084ab3823d..659d3e9d60e 100644 --- a/audio/xmms/patches/patch-am +++ b/audio/xmms/patches/patch-am @@ -1,11 +1,11 @@ -$NetBSD: patch-am,v 1.3 2001/08/29 22:41:02 jlam Exp $ +$NetBSD: patch-am,v 1.4 2002/03/21 18:52:32 drochner Exp $ ---- Output/OSS/Makefile.in.orig Tue Nov 28 01:56:02 2000 -+++ Output/OSS/Makefile.in -@@ -163,7 +163,7 @@ +--- Output/OSS/Makefile.in.orig Mon Mar 4 22:58:30 2002 ++++ Output/OSS/Makefile.in Thu Mar 21 13:04:20 2002 +@@ -177,7 +177,7 @@ libdir = $(plugindir)/$(OUTPUT_PLUGIN_DIR) - libOSS_la_LDFLAGS = $(ossldflags) + libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@ -libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ +libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ${LIBOSSAUDIO} libOSS_la_SOURCES = $(osssources) diff --git a/audio/xmms/patches/patch-an b/audio/xmms/patches/patch-an index e17529159d3..1fb46a3dfe1 100644 --- a/audio/xmms/patches/patch-an +++ b/audio/xmms/patches/patch-an @@ -1,11 +1,11 @@ -$NetBSD: patch-an,v 1.4 2001/08/29 22:41:02 jlam Exp $ +$NetBSD: patch-an,v 1.5 2002/03/21 18:52:32 drochner Exp $ ---- Input/cdaudio/Makefile.in.orig Mon Jun 18 21:55:46 2001 -+++ Input/cdaudio/Makefile.in -@@ -171,7 +171,7 @@ +--- Input/cdaudio/Makefile.in.orig Mon Mar 4 22:58:42 2002 ++++ Input/cdaudio/Makefile.in Thu Mar 21 13:05:43 2002 +@@ -185,7 +185,7 @@ - INCLUDES = @GTK_CFLAGS@ @XML_CFLAGS@ -I$(top_buiddir)/intl - libcdaudio_la_LDFLAGS = $(cdaudioldflags) + INCLUDES = @GTK_CFLAGS@ @XML_CFLAGS@ @OSS_CFLAGS@ -I$(top_builddir)/intl + libcdaudio_la_LDFLAGS = @PLUGIN_LDFLAGS@ -libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ +libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ ${LIBOSSAUDIO} libcdaudio_la_SOURCES = $(cdaudiosources) diff --git a/audio/xmms/patches/patch-ao b/audio/xmms/patches/patch-ao deleted file mode 100644 index 033912f89ce..00000000000 --- a/audio/xmms/patches/patch-ao +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2001/06/21 16:38:34 rh Exp $ - ---- configure.orig Mon Jun 18 21:53:50 2001 -+++ configure -@@ -7473,7 +7473,11 @@ - cat > conftest.$ac_ext <<EOF - #line 7475 "configure" - #include "confdefs.h" -+#ifdef __NetBSD__ -+#error Sorry, no native wide character support functions, yet! -+#else - #include <$ac_hdr> -+#endif - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } diff --git a/audio/xmms/patches/patch-as b/audio/xmms/patches/patch-as new file mode 100644 index 00000000000..d148227d8cb --- /dev/null +++ b/audio/xmms/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.1 2002/03/21 18:52:33 drochner Exp $ + +--- xmms/pluginenum.c.orig Thu Mar 21 17:00:30 2002 ++++ xmms/pluginenum.c Thu Mar 21 17:01:14 2002 +@@ -252,7 +252,7 @@ + gpi = NULL; + return gpi; + #else +-#ifdef SYMBOL_PREFIX ++#if defined(SYMBOL_PREFIX) && !defined(__ELF__) + char *sym = g_strconcat(SYMBOL_PREFIX, symbol, NULL); + void *symh = dlsym(handle, sym); + g_free(sym); |