diff options
author | drochner <drochner@pkgsrc.org> | 2004-07-06 20:57:45 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2004-07-06 20:57:45 +0000 |
commit | 047e5eb7c3f0117624dafc5dcfcafbb393d6c039 (patch) | |
tree | 3b7884abe1121831939f36e3f1ee35738fb896b3 /sysutils/gcdmaster | |
parent | b959ea947ceb228a3d073572508e0e673ff3728a (diff) | |
download | pkgsrc-047e5eb7c3f0117624dafc5dcfcafbb393d6c039.tar.gz |
adapt this to the cdrdao-1.1.9 update:
-use gtkmm2.0/2.2
-use the solaris audio output module on NetBSD
Diffstat (limited to 'sysutils/gcdmaster')
-rw-r--r-- | sysutils/gcdmaster/Makefile | 16 | ||||
-rw-r--r-- | sysutils/gcdmaster/PLIST | 25 | ||||
-rw-r--r-- | sysutils/gcdmaster/distinfo | 16 | ||||
-rw-r--r-- | sysutils/gcdmaster/patches/patch-ac | 64 | ||||
-rw-r--r-- | sysutils/gcdmaster/patches/patch-ad | 28 | ||||
-rw-r--r-- | sysutils/gcdmaster/patches/patch-ae | 20 | ||||
-rw-r--r-- | sysutils/gcdmaster/patches/patch-af | 24 | ||||
-rw-r--r-- | sysutils/gcdmaster/patches/patch-ag | 33 | ||||
-rw-r--r-- | sysutils/gcdmaster/patches/patch-ah | 21 |
9 files changed, 105 insertions, 142 deletions
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile index 420e3c3df29..b42c8dd0291 100644 --- a/sysutils/gcdmaster/Makefile +++ b/sysutils/gcdmaster/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2004/04/26 22:15:28 snj Exp $ +# $NetBSD: Makefile,v 1.19 2004/07/06 20:57:45 drochner Exp $ # -DISTNAME= cdrdao-1.1.7.src -PKGNAME= gcdmaster-1.1.7 -PKGREVISION= 4 +DISTNAME= cdrdao-1.1.9 +PKGNAME= gcdmaster-1.1.9 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/} @@ -11,9 +10,9 @@ MAINTAINER= david@maxwell.net HOMEPAGE= http://cdrdao.sourceforge.net/gcdmaster/index.html COMMENT= GUI for cdrdao with some editing capability -DEPENDS+= cdrdao-1.1.7:../../sysutils/cdrdao +DEPENDS+= cdrdao-1.1.9:../../sysutils/cdrdao -WRKSRC= ${WRKDIR}/cdrdao-1.1.7 +WRKSRC= ${WRKDIR}/cdrdao-1.1.9 USE_X11BASE= YES GNU_CONFIGURE= YES USE_BUILDLINK3= YES @@ -36,6 +35,7 @@ post-configure: .include "../../devel/libglade/buildlink3.mk" .include "../../devel/pccts/buildlink3.mk" -.include "../../x11/gnome--/buildlink3.mk" -.include "../../x11/gtk--/buildlink3.mk" +# gtkmm must be 2.0/2.2 +.include "../../x11/gtkmm/buildlink3.mk" +.include "../../devel/libgnomeuimm20/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gcdmaster/PLIST b/sysutils/gcdmaster/PLIST index 0a5f409300c..ff5dec7b5e4 100644 --- a/sysutils/gcdmaster/PLIST +++ b/sysutils/gcdmaster/PLIST @@ -1,22 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2004/03/08 19:40:42 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.5 2004/07/06 20:57:45 drochner Exp $ bin/gcdmaster -man/man1/xcdrdao.1 -share/pixmaps/gcdmaster/gcdmaster.png -share/pixmaps/gcdmaster/pixmap_audiocd.png -share/pixmaps/gcdmaster/pixmap_copycd.png -share/pixmaps/gcdmaster/pixmap_cursor-tool.xpm -share/pixmaps/gcdmaster/pixmap_datacd.png -share/pixmaps/gcdmaster/pixmap_dumpcd.png -share/pixmaps/gcdmaster/pixmap_help.png -share/pixmaps/gcdmaster/pixmap_mixedcd.png -share/pixmaps/gcdmaster/pixmap_open.png -share/pixmaps/gcdmaster/pixmap_play-pause.xpm -share/pixmaps/gcdmaster/pixmap_play-start.xpm -share/pixmaps/gcdmaster/pixmap_play-stop.xpm -share/pixmaps/gcdmaster/pixmap_zoom-fit.xpm -share/pixmaps/gcdmaster/pixmap_zoom-in.xpm -share/pixmaps/gcdmaster/pixmap_zoom-out.xpm -share/pixmaps/gcdmaster/pixmap_zoom-selection.xpm -share/pixmaps/gcdmaster/pixmap_zoom-tool.xpm -share/gnome/apps/Applications/gcdmaster.desktop -@dirrm share/pixmaps/gcdmaster +man/man1/gcdmaster.1 +share/applications/gcdmaster.desktop +share/pixmaps/gcdmaster.png diff --git a/sysutils/gcdmaster/distinfo b/sysutils/gcdmaster/distinfo index c655efc21a4..5bd6124ba07 100644 --- a/sysutils/gcdmaster/distinfo +++ b/sysutils/gcdmaster/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.2 2002/10/29 16:50:14 drochner Exp $ +$NetBSD: distinfo,v 1.3 2004/07/06 20:57:45 drochner Exp $ -SHA1 (cdrdao-1.1.7.src.tar.gz) = d688f8b117de367841958f1ca977100fc4e8484b -Size (cdrdao-1.1.7.src.tar.gz) = 1433366 bytes +SHA1 (cdrdao-1.1.9.tar.gz) = e406940bbc2784ba249e3b7198ac7834ebda18f7 +Size (cdrdao-1.1.9.tar.gz) = 1581717 bytes SHA1 (patch-ab) = 071fedfbc598400d9d41e050aa01c5902e97caaa -SHA1 (patch-ac) = 7392aad2b18b670023396b47715b292d8046b495 -SHA1 (patch-ad) = 914ee4ce9a22a9b47748c206f96666552bc9bc1e -SHA1 (patch-ae) = 20c1ae7a24751a01454573ee029ca2c7ad484903 -SHA1 (patch-af) = 51df1d3323a238280bb218a124db583a5c70345f -SHA1 (patch-ag) = 1f98efd2c8ea46bc4ec148fb7170e192d94b7780 +SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f +SHA1 (patch-ad) = dd79dc63180e9e0d53406b61a940de7c9fecc7be +SHA1 (patch-ae) = 464a8efdfb2b69c4c2abee4bee902a4795f955b0 +SHA1 (patch-ag) = 0d9b97563e05b113354a37bab78a2f0e579f9844 +SHA1 (patch-ah) = 233ffacfe7ccecba0ac6118b18357771465a20dd diff --git a/sysutils/gcdmaster/patches/patch-ac b/sysutils/gcdmaster/patches/patch-ac index 3ae84979e99..30a1b106e23 100644 --- a/sysutils/gcdmaster/patches/patch-ac +++ b/sysutils/gcdmaster/patches/patch-ac @@ -1,49 +1,23 @@ -$NetBSD: patch-ac,v 1.2 2002/10/29 16:50:14 drochner Exp $ +$NetBSD: patch-ac,v 1.3 2004/07/06 20:57:45 drochner Exp $ ---- ./scsilib/include/btorder.h.orig Sun Nov 25 16:35:10 2001 -+++ ./scsilib/include/btorder.h Tue Oct 29 09:33:02 2002 -@@ -63,35 +63,21 @@ +--- scsilib/include/btorder.h.orig 2004-02-10 00:34:00.000000000 +0100 ++++ scsilib/include/btorder.h +@@ -28,6 +28,9 @@ + #include <sys/types.h> /* try to load isa_defs.h on Solaris */ + #define _INCL_SYS_TYPES_H #endif ++#ifdef __NetBSD__ ++#include <machine/endian.h> ++#endif + #ifndef _MCONFIG_H + #include <mconfig.h> /* load bit/byte-oder from xmconfig.h*/ +@@ -108,7 +111,7 @@ error Only one of _BIT_FIELDS_LTOH or _ + # if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ + defined(__PPC) || defined(powerpc) || defined(__powerpc__) --/* -- * Convert byte-order definitions from xconfig.h into our values -- * and verify them. -- */ --#if defined(HAVE_C_BIGENDIAN) && \ -- !defined(WORDS_BIGENDIAN) --#define WORDS_LITTLEENDIAN --#define _LITTLE_ENDIAN --#endif -- --#if defined(HAVE_C_BIGENDIAN) && \ -- defined(WORDS_BIGENDIAN) --#define _BIG_ENDIAN --#endif -- --#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) --/* -- * #error will not work for all compilers (e.g. sunos4) -- * The following line will abort compilation on all compilers -- * if none of the above is defines. And that's what we want. -- */ --error Only one of _LITTLE_ENDIAN or _BIG_ENDIAN may be defined --#endif - - - #if defined(_BIT_FIELDS_LTOH) || defined(_BIT_FIELDS_HTOL) - /* - * Bitorder is already known. - */ -+ -+#elif defined(__NetBSD__) -+#include <machine/endian.h> -+#if BYTE_ORDER == LITTLE_ENDIAN -+#define _BIT_FIELDS_LTOH -+#else -+#define _BIT_FIELDS_HTOL -+#endif /* BYTE_ORDER == LITTLE_ENDIAN */ -+ - #else - /* - * Bitorder not yet known. +-# if defined(__BIG_ENDIAN__) ++# if defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN + # define _BIT_FIELDS_HTOL + # else + # define _BIT_FIELDS_LTOH diff --git a/sysutils/gcdmaster/patches/patch-ad b/sysutils/gcdmaster/patches/patch-ad index 8d9152ccfc1..287b0adb7bd 100644 --- a/sysutils/gcdmaster/patches/patch-ad +++ b/sysutils/gcdmaster/patches/patch-ad @@ -1,15 +1,15 @@ -$NetBSD: patch-ad,v 1.2 2002/10/29 16:50:15 drochner Exp $ +$NetBSD: patch-ad,v 1.3 2004/07/06 20:57:45 drochner Exp $ ---- Makefile.in.orig Sun Oct 6 20:53:55 2002 -+++ Makefile.in Tue Oct 29 14:09:07 2002 -@@ -41,8 +41,8 @@ - # - # - # --SUBDIRS = @pccts_target@ @scsilib_dir@ trackdb paranoia dao utils @xdao@ --SUBDIRSINST = trackdb dao utils @xdao@ -+SUBDIRS = @scsilib_dir@ trackdb paranoia dao @xdao@ -+SUBDIRSINST = @xdao@ - - all: - for d in $(SUBDIRS) ; do \ +--- Makefile.in.orig 2004-06-07 01:57:20.000000000 +0200 ++++ Makefile.in +@@ -195,8 +195,8 @@ thread_libs = @thread_libs@ + @COND_SCSILIB_TRUE@MAYBE_SCSILIB = scsilib + @COND_PCCTS_FALSE@MAYBE_PCCTS = + @COND_PCCTS_TRUE@MAYBE_PCCTS = pccts +-SUBDIRS = $(MAYBE_SCSILIB) $(MAYBE_PCCTS) trackdb utils paranoia dao $(MAYBE_XDAO) +-DIST_SUBDIRS = trackdb utils paranoia dao xdao ++SUBDIRS = $(MAYBE_SCSILIB) trackdb paranoia dao $(MAYBE_XDAO) ++DIST_SUBDIRS = xdao + EXTRA_DIST = \ + AUTHORS \ + ChangeLog \ diff --git a/sysutils/gcdmaster/patches/patch-ae b/sysutils/gcdmaster/patches/patch-ae index 1802f51df1d..d7188ab6d92 100644 --- a/sysutils/gcdmaster/patches/patch-ae +++ b/sysutils/gcdmaster/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.2 2002/10/29 16:50:15 drochner Exp $ +$NetBSD: patch-ae,v 1.3 2004/07/06 20:57:45 drochner Exp $ ---- xdao/Makefile.in.orig Sun Sep 15 18:34:48 2002 -+++ xdao/Makefile.in Tue Oct 29 13:00:56 2002 -@@ -58,7 +58,7 @@ - DeviceList.cc RecordTocSource.cc RecordCDSource.cc \ - RecordHDTarget.cc AudioCDView.cc TocEditView.cc GenericChild.cc \ - GenericView.cc CdTextDialog.cc \ -- @sound_if_src@ -+ SoundIF-linux.cc +--- configure.orig 2004-07-04 21:55:27.000000000 +0200 ++++ configure +@@ -9885,7 +9885,7 @@ case "$host" in + sound_if_obj=SoundIF-linux.o + ;; - OBJ = $(SRC:%.cc=%.o) +- *-solaris*) ++ *-solaris* | *-netbsd*) + sound_if_obj=SoundIF-solaris.o + ;; diff --git a/sysutils/gcdmaster/patches/patch-af b/sysutils/gcdmaster/patches/patch-af deleted file mode 100644 index 475fb17d7a8..00000000000 --- a/sysutils/gcdmaster/patches/patch-af +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2001/05/19 13:02:23 drochner Exp $ - ---- xdao/SoundIF-linux.cc.orig Sat May 19 00:12:28 2001 -+++ xdao/SoundIF-linux.cc Sat May 19 00:16:47 2001 -@@ -34,7 +34,7 @@ - * - */ - --#include <linux/soundcard.h> -+#include <soundcard.h> - - #include <stdio.h> - #include <assert.h> -@@ -167,8 +167,8 @@ - if (dspFd_ >= 0) - return 0; // already open - -- if ((dspFd_ = open("/dev/dsp", O_WRONLY | O_NONBLOCK)) < 0) { -- message(-1, "Cannot open \"/dev/dsp\": %s", strerror(errno)); -+ if ((dspFd_ = open("/dev/sound", O_WRONLY | O_NONBLOCK)) < 0) { -+ message(-1, "Cannot open \"/dev/sound\": %s", strerror(errno)); - return 1; - } - diff --git a/sysutils/gcdmaster/patches/patch-ag b/sysutils/gcdmaster/patches/patch-ag index 50d0a8f30ea..96b33fc71f0 100644 --- a/sysutils/gcdmaster/patches/patch-ag +++ b/sysutils/gcdmaster/patches/patch-ag @@ -1,13 +1,22 @@ -$NetBSD: patch-ag,v 1.1.1.1 2001/05/19 13:02:23 drochner Exp $ +$NetBSD: patch-ag,v 1.2 2004/07/06 20:57:45 drochner Exp $ ---- dao/Makefile.in.orig Sat May 19 14:32:30 2001 -+++ dao/Makefile.in Sat May 19 14:34:00 2001 -@@ -16,7 +16,7 @@ - # Installation directories for binaries and manual pages - # - bindir = @bindir@ --datadir = @datadir@ -+datadir = ${LOCALBASE}/share - mandir = @mandir@ - man1dir = $(mandir)/man1 - # +--- dao/Makefile.in.orig 2004-07-04 21:35:51.000000000 +0200 ++++ dao/Makefile.in +@@ -598,7 +598,7 @@ distdir: $(DISTFILES) + done + check-am: all-am + check: check-am +-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(DATA) ++all-am: Makefile $(LIBRARIES) #$(PROGRAMS) $(MANS) $(DATA) + installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(drivertabledir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ +@@ -609,7 +609,7 @@ install-data: install-data-am + uninstall: uninstall-am + + install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++# @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + + installcheck: installcheck-am + install-strip: diff --git a/sysutils/gcdmaster/patches/patch-ah b/sysutils/gcdmaster/patches/patch-ah new file mode 100644 index 00000000000..f92d6695499 --- /dev/null +++ b/sysutils/gcdmaster/patches/patch-ah @@ -0,0 +1,21 @@ +$NetBSD: patch-ah,v 1.1 2004/07/06 20:57:45 drochner Exp $ + +--- xdao/SoundIF-solaris.cc.orig 2004-07-04 22:05:21.000000000 +0200 ++++ xdao/SoundIF-solaris.cc +@@ -42,6 +42,7 @@ + * Sound interface for Solaris. Thanks to Tobias Oetiker <oetiker@ee.ethz.ch>. + */ + ++#include <sys/types.h> + #include <sys/audioio.h> + #include <stdio.h> + #include <assert.h> +@@ -194,7 +195,7 @@ int SoundIFImpl::setupDevice() + auinf.play.sample_rate=44100; + auinf.play.channels=2; + auinf.play.precision=16; +- auinf.play.encoding=AUDIO_ENCODING_LINEAR; ++ auinf.play.encoding=AUDIO_ENCODING_SLINEAR_BE; + + if (ioctl(dspFd_, AUDIO_SETINFO, &auinf) < 0) { + message(-1, _("Cannot setup audio interface: %s"), strerror(errno)); |