diff options
author | rh <rh@pkgsrc.org> | 2001-05-14 17:09:14 +0000 |
---|---|---|
committer | rh <rh@pkgsrc.org> | 2001-05-14 17:09:14 +0000 |
commit | 91ffe9cc16123cf7dd31aceec7bc22d77a22b9bd (patch) | |
tree | 8a4d97c8703f3064f10aab10c2090d05fc004028 /audio | |
parent | ee0b109f1f9e58e5b161970908d066023abcb6db (diff) | |
download | pkgsrc-91ffe9cc16123cf7dd31aceec7bc22d77a22b9bd.tar.gz |
Update gdcd to 0.2.1. Changes are mainly bugfixes, most notably the
detection and use of /dev/cdNd (N being a number) instead of /dev/cdrom.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/gdcd/Makefile | 10 | ||||
-rw-r--r-- | audio/gdcd/distinfo | 13 | ||||
-rw-r--r-- | audio/gdcd/patches/patch-aa | 12 | ||||
-rw-r--r-- | audio/gdcd/patches/patch-ab | 25 | ||||
-rw-r--r-- | audio/gdcd/patches/patch-ad | 28 | ||||
-rw-r--r-- | audio/gdcd/patches/patch-ae | 35 | ||||
-rw-r--r-- | audio/gdcd/pkg/MESSAGE | 6 |
7 files changed, 87 insertions, 42 deletions
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile index 3355123157b..10014edc095 100644 --- a/audio/gdcd/Makefile +++ b/audio/gdcd/Makefile @@ -1,18 +1,17 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 13:30:41 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/05/14 17:09:14 rh Exp $ # -DISTNAME= gdcd-0.0.2 +DISTNAME= gdcd-0.2.1 CATEGORIES= audio MASTER_SITES= http://cdcd.undergrid.net/gdcd/source_archive/ MAINTAINER= rh@netbsd.org -HOMEPAGE= http://cdcd.undergrid.net/gdcd/ +HOMEPAGE= http://cdcd.undergrid.net/ COMMENT= CD player for the X Window System using the GIMP Tool Kit (GTK) DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= imlib-*:../../graphics/imlib -DEPENDS+= pth>=1.2.0:../../devel/pth -DEPENDS+= libcdaudio>=0.99.1:../../audio/libcdaudio +DEPENDS+= libcdaudio>0.99.4:../../audio/libcdaudio USE_X11BASE= YES GNU_CONFIGURE= YES @@ -20,6 +19,7 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" # for pth and libcdaudio CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib .include "../../mk/bsd.pkg.mk" diff --git a/audio/gdcd/distinfo b/audio/gdcd/distinfo index b3421c7c330..2b48a284b4a 100644 --- a/audio/gdcd/distinfo +++ b/audio/gdcd/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 12:14:28 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/05/14 17:09:14 rh Exp $ -SHA1 (gdcd-0.0.2.tar.gz) = 848510fe44613bf3bb54b81b14e61cc5991ca3ac -Size (gdcd-0.0.2.tar.gz) = 213410 bytes -SHA1 (patch-aa) = 98e5e77cb5d8e73cb8733fba8d69b880b7e35953 -SHA1 (patch-ab) = 3137a354ee3b10ee8888340c15be5fc4e9c68037 +SHA1 (gdcd-0.2.1.tar.gz) = 90d3a443adea4cfdfad57d254cbf4a48bac30b9f +Size (gdcd-0.2.1.tar.gz) = 244312 bytes +SHA1 (patch-aa) = 972ec8f5ca0e6c308c87d3ec9e3b774e78e726c4 +SHA1 (patch-ab) = a2d9a8c3d6d344ed84b6c64dd008f90c4a97c502 SHA1 (patch-ac) = 1a3711d8d4cadbc0d9c4f022ffa8f0c620e3660f -SHA1 (patch-ad) = a8ac6cd5ba9681dd948089bbcac4f2fbddf8ae03 +SHA1 (patch-ad) = 7fcfea1fc1f1dafcb3b921352c56d005b3d6cb8c +SHA1 (patch-ae) = 8954d5d44d01a50736e5ba191fee8f10eeb4d3bd diff --git a/audio/gdcd/patches/patch-aa b/audio/gdcd/patches/patch-aa index 719376a9e08..8ad7232f129 100644 --- a/audio/gdcd/patches/patch-aa +++ b/audio/gdcd/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/09/03 22:15:46 rh Exp $ +$NetBSD: patch-aa,v 1.2 2001/05/14 17:09:14 rh Exp $ ---- source/thread.c.orig Mon Aug 30 03:10:11 1999 -+++ source/thread.c Fri Sep 3 19:00:27 1999 -@@ -86,7 +86,12 @@ - return -1; +--- source/cddb.c.orig Sun May 6 18:16:33 2001 ++++ source/cddb.c +@@ -200,7 +200,12 @@ + return -1; } - + +#ifdef HAVE_STRERROR_R strerror_r(rc, message, 64); +#else diff --git a/audio/gdcd/patches/patch-ab b/audio/gdcd/patches/patch-ab index 3d6e3ab8454..ade7b1289bf 100644 --- a/audio/gdcd/patches/patch-ab +++ b/audio/gdcd/patches/patch-ab @@ -1,13 +1,26 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/09/03 22:15:46 rh Exp $ +$NetBSD: patch-ab,v 1.2 2001/05/14 17:09:14 rh Exp $ ---- configure.orig Fri Sep 3 19:11:40 1999 -+++ configure Fri Sep 3 19:11:56 1999 -@@ -1145,7 +1145,7 @@ - echo "$ac_t""$host" 1>&6 +--- configure.orig Sat Jan 8 06:40:45 2000 ++++ configure +@@ -1971,13 +1971,20 @@ + -IMAGE_PATH='${prefix}/share/gdcd' +IMAGE_PATH='${prefix}/share/pixmaps/gdcd' - trap '' 1 2 15 + case "$host_os" in + irix*) + cat >> confdefs.h <<\EOF + #define DEFAULT_DEVICE "default" ++EOF ++ ++ ;; ++ ++ *netbsd*) ++ cat >> confdefs.h <<\EOF ++#define DEFAULT_DEVICE "/dev/rcd0d" + EOF + + ;; diff --git a/audio/gdcd/patches/patch-ad b/audio/gdcd/patches/patch-ad index f85027a9943..4dff7f2e677 100644 --- a/audio/gdcd/patches/patch-ad +++ b/audio/gdcd/patches/patch-ad @@ -1,15 +1,17 @@ -$NetBSD: patch-ad,v 1.1 1999/10/09 16:51:11 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2001/05/14 17:09:14 rh Exp $ ---- source/Makefile.in.orig Thu Sep 2 21:56:08 1999 -+++ source/Makefile.in Sat Oct 9 03:24:15 1999 -@@ -68,8 +68,8 @@ - bin_PROGRAMS = gdcd - gdcd_SOURCES = gdcd.c thread.c cddb.c coverart.c +--- source/coverart.c.orig Sun May 6 18:18:16 2001 ++++ source/coverart.c +@@ -197,7 +197,12 @@ + return -1; + } --CFLAGS = @CFLAGS@ `gtk-config --cflags` -DIMAGE_PATH=\"@IMAGE_PATH@\" --LDFLAGS = @LDFLAGS@ `gtk-config --libs` -lcdaudio -lgdk_imlib -lpthread -+CFLAGS = @CFLAGS@ `gtk-config --cflags` `imlib-config --cflags` -DIMAGE_PATH=\"@IMAGE_PATH@\" -+LDFLAGS = @LDFLAGS@ `gtk-config --libs` `imlib-config --libs` -lcdaudio -lgdk_imlib -lpthread - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = ++#ifdef HAVE_STRERROR_R + strerror_r(rc, message, 64); ++#else ++ strncpy (message, strerror (rc), 64); ++ message[63]='\0'; ++#endif + fputs("Error invoking pthread_create: ", stderr); + fputs(message, stderr); + fputc('\n', stderr); diff --git a/audio/gdcd/patches/patch-ae b/audio/gdcd/patches/patch-ae new file mode 100644 index 00000000000..73b7cd72044 --- /dev/null +++ b/audio/gdcd/patches/patch-ae @@ -0,0 +1,35 @@ +$NetBSD: patch-ae,v 1.1 2001/05/14 17:09:14 rh Exp $ + +--- source/gdcd.c.orig Sun May 6 18:28:44 2001 ++++ source/gdcd.c +@@ -17,6 +17,19 @@ + #include "coverart.h" + #include "conf.h" + ++/* ++ * NetBSD uses non-preemptive pth, so we yield the processor periodically ++ */ ++#ifdef __NetBSD__ ++gint ++pth_nbschedule (gpointer data) ++{ ++ pthread_yield_np(); ++ return TRUE; ++} ++#endif ++ ++ + GtkWidget *window; + GdkPixmap *window_bg, *splash_pm; + GdkPixmap *play_ico, *pause_ico, *stop_ico, *error_ico, *null_ico; +@@ -1121,6 +1134,10 @@ + + free(confitem); + ++#ifdef __NetBSD__ ++ gtk_timeout_add (200, pth_nbschedule, NULL); ++#endif ++ + gtk_main(); + + return 0; diff --git a/audio/gdcd/pkg/MESSAGE b/audio/gdcd/pkg/MESSAGE deleted file mode 100644 index 138876c9aab..00000000000 --- a/audio/gdcd/pkg/MESSAGE +++ /dev/null @@ -1,6 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1 1999/10/09 16:51:11 jlam Exp $ - -Please make a symbolic link from your CD-ROM device to /dev/cdrom. - -=========================================================================== |