From a4b96a6a90419bbeaffe72e1ec9932b7518bc88e Mon Sep 17 00:00:00 2001 From: drochner Date: Mon, 25 Mar 2002 11:24:28 +0000 Subject: initial import of gnometoaster, another cd recording frontend --- sysutils/gnometoaster/DESCR | 5 ++ sysutils/gnometoaster/Makefile | 24 ++++++ sysutils/gnometoaster/PLIST | 9 +++ sysutils/gnometoaster/distinfo | 8 ++ sysutils/gnometoaster/patches/patch-aa | 144 +++++++++++++++++++++++++++++++++ sysutils/gnometoaster/patches/patch-ab | 13 +++ sysutils/gnometoaster/patches/patch-ac | 31 +++++++ sysutils/gnometoaster/patches/patch-ad | 13 +++ 8 files changed, 247 insertions(+) create mode 100644 sysutils/gnometoaster/DESCR create mode 100644 sysutils/gnometoaster/Makefile create mode 100644 sysutils/gnometoaster/PLIST create mode 100644 sysutils/gnometoaster/distinfo create mode 100644 sysutils/gnometoaster/patches/patch-aa create mode 100644 sysutils/gnometoaster/patches/patch-ab create mode 100644 sysutils/gnometoaster/patches/patch-ac create mode 100644 sysutils/gnometoaster/patches/patch-ad (limited to 'sysutils/gnometoaster') diff --git a/sysutils/gnometoaster/DESCR b/sysutils/gnometoaster/DESCR new file mode 100644 index 00000000000..1b91e97b868 --- /dev/null +++ b/sysutils/gnometoaster/DESCR @@ -0,0 +1,5 @@ +This is an early alpha archive of the 'Gnome Toaster' package, +a cdrecord/mkisofs/cdda2wav frontend for creating data,audio +and mixed mode cd's both from other cds or from self compiled data. +Although it does not have all of it's planned functionality,it is yet +quite usable. diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile new file mode 100644 index 00000000000..7e0b43f1352 --- /dev/null +++ b/sysutils/gnometoaster/Makefile @@ -0,0 +1,24 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $ +# + +DISTNAME= gtoaster1.0Beta5 +PKGNAME= gnometoaster-1.0Beta5 +CATEGORIES= sysutils +MASTER_SITES= http://gnometoaster.rulez.org/archive/ +EXTRACT_SUFX= .tgz + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://gnometoaster.rulez.org/ +COMMENT= cd recording frontend for X/Gtk + +WRKSRC= ${WRKDIR}/gtoaster +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --with-oss --without-esd +CONFIGURE_ARGS+= --without-gnome --without-orbit +USE_LIBINTL= yes +USE_GMAKE= yes +USE_BUILDLINK_ONLY= yes + +.include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnometoaster/PLIST b/sysutils/gnometoaster/PLIST new file mode 100644 index 00000000000..90c4287b193 --- /dev/null +++ b/sysutils/gnometoaster/PLIST @@ -0,0 +1,9 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $ +bin/gtoaster +share/locale/de/LC_MESSAGES/gtoaster.mo +share/locale/fi/LC_MESSAGES/gtoaster.mo +share/locale/fr/LC_MESSAGES/gtoaster.mo +share/locale/hu/LC_MESSAGES/gtoaster.mo +share/locale/ja/LC_MESSAGES/gtoaster.mo +share/locale/no/LC_MESSAGES/gtoaster.mo +share/locale/ro/LC_MESSAGES/gtoaster.mo diff --git a/sysutils/gnometoaster/distinfo b/sysutils/gnometoaster/distinfo new file mode 100644 index 00000000000..491a670b1bd --- /dev/null +++ b/sysutils/gnometoaster/distinfo @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $ + +SHA1 (gtoaster1.0Beta5.tgz) = c55bf7e8e532956a8907cd29cbfb98a721c5bb3a +Size (gtoaster1.0Beta5.tgz) = 781796 bytes +SHA1 (patch-aa) = fd411be3c18c91347cbc7c596c7cd153a6ea694b +SHA1 (patch-ab) = 89baa0e8a6d30bc1cbfe5cbb86ddecd905d5f653 +SHA1 (patch-ac) = 21a2b627a656d5e61a3dd06f615c15e3f41a89c3 +SHA1 (patch-ad) = 4c382424ace0dadfd34354e48ba5fb48b632baef diff --git a/sysutils/gnometoaster/patches/patch-aa b/sysutils/gnometoaster/patches/patch-aa new file mode 100644 index 00000000000..b704445f181 --- /dev/null +++ b/sysutils/gnometoaster/patches/patch-aa @@ -0,0 +1,144 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $ + +--- cdromlow.c.orig Sat Mar 23 19:48:00 2002 ++++ cdromlow.c Sat Mar 23 20:10:30 2002 +@@ -9,7 +9,7 @@ + #include + #include + #include +-#if !defined( __FreeBSD__) && !defined(__svr4__ ) ++#if !defined( __FreeBSD__) && !defined(__svr4__ ) && !defined(__NetBSD__) + # include + #else + # include +@@ -37,7 +37,7 @@ + + /* we provide some macro mappings here. FreeBSD structs are a bit + * different to those used by Linux so we will use macros to compensate that */ +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__NetBSD__) + + /* Needed by FreeBSD */ + # define CDROM_DATA_TRACK 4 +@@ -46,19 +46,35 @@ + # define CD_FRAMESIZE_RAW 2352 + # define CDROM_LBA CD_LBA_FORMAT + # define CDROMREADTOCHDR CDIOREADTOCHEADER ++#ifdef __NetBSD__ ++# define CDROMREADTOCENTRY CDIOREADTOCENTRIES ++#else + # define CDROMREADTOCENTRY CDIOREADTOCENTRY ++#endif + + # define cdromlow_definecdromheader struct ioc_toc_header ++#ifdef __NetBSD__ ++# define cdromlow_definecdromhentry struct ioc_read_toc_entry ++#else + # define cdromlow_definecdromhentry struct ioc_read_toc_single_entry ++#endif + + /* referencing the TOC header */ + # define cdromlow_tochdr_firstt starting_track + # define cdromlow_tochdr_lastt ending_track + + /* referencing TOC entries */ ++#ifdef __NetBSD__ ++# define cdromlow_tocent_track starting_track ++#else + # define cdromlow_tocent_track track ++#endif + # define cdromlow_tocent_format address_format ++#ifdef __NetBSD__ ++# define cdromlow_tocent_addr data->addr ++#else + # define cdromlow_tocent_addr entry.addr ++#endif + #elif __svr4__ + # define CD_FRAMESIZE 2048 + # define CD_FRAMESIZE_RAW 2352 +@@ -138,6 +154,11 @@ + + int x; + int hasdatatrack=-1; ++#ifdef __NetBSD__ ++ struct cd_toc_entry entrydata; ++ entry.data = &entrydata; ++ entry.data_len = sizeof(entrydata); ++#endif + + if (info->filedescriptor!=-1) + { +@@ -148,7 +169,11 @@ + entry.cdromlow_tocent_format=CDROM_LBA; + ioctl(info->filedescriptor,CDROMREADTOCENTRY,&entry); + #ifndef __FreeBSD__ ++#ifdef __NetBSD__ ++ if (entry.data->control & CDROM_DATA_TRACK) ++#else + if (entry.cdte_ctrl&CDROM_DATA_TRACK) ++#endif + #else + if (entry.entry.control & CDROM_DATA_TRACK) + #endif +@@ -191,6 +216,11 @@ + cdromlow_tochandle *info=(cdromlow_tochandle*)handle; + cdromlow_definecdromhentry entry; + int offset=-1; ++#ifdef __NetBSD__ ++ struct cd_toc_entry entrydata; ++ entry.data = &entrydata; ++ entry.data_len = sizeof(entrydata); ++#endif + + if (info->filedescriptor!=-1) + { +@@ -223,6 +253,13 @@ + cdromlow_definecdromhentry tracknext; + int tracksize; + int ok=1; ++#ifdef __NetBSD__ ++ struct cd_toc_entry trackdata, tracknextdata; ++ track.data = &trackdata; ++ track.data_len = sizeof(trackdata); ++ tracknext.data = &tracknextdata; ++ tracknext.data_len = sizeof(tracknextdata); ++#endif + + tracksize=0; + if (info->filedescriptor!=-1) +@@ -278,6 +315,11 @@ + cdromlow_definecdromhentry entry; + int x,secs; + int cddbnum=0; ++#ifdef __NetBSD__ ++ struct cd_toc_entry entrydata; ++ entry.data = &entrydata; ++ entry.data_len = sizeof(entrydata); ++#endif + + cddbnum=0; + if (info->filedescriptor!=-1) +@@ -317,6 +359,11 @@ + cdromlow_definecdromhentry track; + int ok=1; + cdromlow_tracktype result=TRACKTYPE_UNKNOWN; ++#ifdef __NetBSD__ ++ struct cd_toc_entry trackdata; ++ track.data = &trackdata; ++ track.data_len = sizeof(trackdata); ++#endif + + if (info->filedescriptor!=-1) + { +@@ -325,7 +372,11 @@ + if (ioctl(info->filedescriptor,CDROMREADTOCENTRY,&track)==-1) + ok=0; + #ifndef __FreeBSD__ ++#ifdef __NetBSD__ ++ if (track.data->control & CDROM_DATA_TRACK) ++#else + if (track.cdte_ctrl&CDROM_DATA_TRACK) ++#endif + #else + if (track.entry.control & CDROM_DATA_TRACK) + #endif diff --git a/sysutils/gnometoaster/patches/patch-ab b/sysutils/gnometoaster/patches/patch-ab new file mode 100644 index 00000000000..0cfbd813e98 --- /dev/null +++ b/sysutils/gnometoaster/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/03/25 11:24:29 drochner Exp $ + +--- cddb.c.orig Wed Jun 6 00:47:58 2001 ++++ cddb.c Sat Mar 23 20:13:05 2002 +@@ -45,7 +45,7 @@ + #include + #include + #include +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) + # include + #else + # include diff --git a/sysutils/gnometoaster/patches/patch-ac b/sysutils/gnometoaster/patches/patch-ac new file mode 100644 index 00000000000..1002a06df93 --- /dev/null +++ b/sysutils/gnometoaster/patches/patch-ac @@ -0,0 +1,31 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/03/25 11:24:29 drochner Exp $ + +--- audio_oss.c.orig Sat Dec 9 12:12:15 2000 ++++ audio_oss.c Sat Mar 23 21:32:08 2002 +@@ -13,7 +13,11 @@ + #include + #include + #ifndef __FreeBSD__ ++#ifdef __NetBSD__ ++#include ++#else + #include ++#endif + #else + #include + #define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO +@@ -42,12 +46,12 @@ + + if (driver->descriptor==-1) + { +- driver->descriptor=open("/dev/dsp",O_WRONLY); ++ driver->descriptor=open("/dev/sound",O_WRONLY); + if (driver->descriptor!=-1) + { + int format_mask=0; + +- ioctl(driver->descriptor,SNDCTL_DSP_RESET); ++ ioctl(driver->descriptor,SNDCTL_DSP_RESET, 0); + ioctl(driver->descriptor,SNDCTL_DSP_SPEED,&speed); + ioctl(driver->descriptor,SNDCTL_DSP_CHANNELS,&channels); + ioctl(driver->descriptor,SNDCTL_DSP_GETFMTS,&format_mask); diff --git a/sysutils/gnometoaster/patches/patch-ad b/sysutils/gnometoaster/patches/patch-ad new file mode 100644 index 00000000000..e972210118b --- /dev/null +++ b/sysutils/gnometoaster/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/03/25 11:24:29 drochner Exp $ + +--- Makefile.in.orig Sat Mar 23 21:07:07 2002 ++++ Makefile.in Sat Mar 23 21:10:34 2002 +@@ -117,7 +117,7 @@ + + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lossaudio + gtoaster_OBJECTS = main.o destcontrol.o fsedit.o getdir.o source.o \ + filelist.o menubar.o menufunc.o trackedit.o isotrack.o record.o \ + piping.o dirlow.o dndsetup.o selectlist.o colors.o rterm.o tracks.o \ -- cgit v1.2.3