cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.98alpha13 for compatibility with cdrtools 2.0.

Browse Source 
From: Jolan Luff <jolan@cryptonomicon.org>
This commit is contained in:
naddy 2003-02-17 18:10:35 +00:00
parent 22b099d797
commit 47cc535720
11 changed files with 124 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
misc/xcdroast/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.3 2002/10/13 22:39:45 pvalchev Exp $
# $OpenBSD: Makefile,v 1.4 2003/02/17 18:10:35 naddy Exp $
COMMENT= "gtk-based frontend to cdrtools"
DISTNAME= xcdroast-0.98alpha9
PKGNAME= xcdroast-0.98a9p1
DISTNAME= xcdroast-0.98alpha13
PKGNAME= xcdroast-0.98a13
CATEGORIES= misc x11
HOMEPAGE= http://www.xcdroast.org
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcdroast/}
HOMEPAGE= http://www.xcdroast.org/
MAINTAINER= Jolan Luff <jolan@cryptonomicon.org>
# GPL
@ -17,24 +16,17 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
RUN_DEPENDS= :cdrtools->=1.10:sysutils/cdrtools
RUN_DEPENDS= :cdrtools->=2.0:sysutils/cdrtools
LIB_DEPENDS= gtk.1.2,glib.1.2::x11/gtk+ \
Imlib.19,gdk_imlib.19::graphics/imlib
gdk_pixbuf.2::graphics/gdk-pixbuf
USE_X11= Yes
NO_REGRESS= Yes
post-patch:
@perl -pi -e 's,/etc,${SYSCONFDIR},g; \
s,/usr/local,${LOCALBASE},g;' \
${WRKSRC}/xcdroast.h
USE_X11= Yes
CONFIGURE_STYLE=gnu
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xcdroast
${INSTALL_DATA} ${WRKSRC}/README.nonroot \
${PREFIX}/share/doc/xcdroast
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/xpms/xcdricon.xpm \
${INSTALL_DATA} ${WRKSRC}/src/xpms/xcdricon.xpm \
${PREFIX}/share/pixmaps/xcdricon.xpm
.include <bsd.port.mk>

6
misc/xcdroast/distinfo
View File

@ -1,3 +1,3 @@
MD5 (xcdroast-0.98alpha9.tar.gz) = 543d3237e7109572f5fcb6bdc6cf3e44
RMD160 (xcdroast-0.98alpha9.tar.gz) = e686cfa97c4f13376bb74898d6da5a1422b4a2b4
SHA1 (xcdroast-0.98alpha9.tar.gz) = 7994b54ce0a0b55fe140f4b2ba14e0d1317d5d52
MD5 (xcdroast-0.98alpha13.tar.gz) = ba5d006cc8a9d13c223ccc11c2fc088a
RMD160 (xcdroast-0.98alpha13.tar.gz) = 9c5e8bb86cf3c4a5961e629683b8c35d51255b1c
SHA1 (xcdroast-0.98alpha13.tar.gz) = c73eadd0bd1958eb99c2c2908e27e3aea79dd66b

67
misc/xcdroast/patches/patch-Makefile
View File

@ -1,67 +0,0 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2002/07/14 19:34:28 wilfried Exp $
--- Makefile.orig Tue Jul 17 23:46:26 2001
+++ Makefile Sun Jul 14 10:54:28 2002
@@ -6,7 +6,7 @@
# Installation prefix directory:
#PREFIX=/usr
-PREFIX=/usr/local
+PREFIX=${LOCALBASE}
PRE_LIBDIR=$(PREFIX)/lib/xcdroast-0.98
# put here the prefix where you want xcdroast to look for
@@ -23,29 +23,17 @@ INSTALL=/usr/bin/install -c
#---
-CFLAGS=-Wall `gtk-config --cflags` `imlib-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
+CFLAGS1=-Wall `gtk-config --cflags` `imlib-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
CFLAGS2=-Wall `glib-config --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
LIBS=`gtk-config --libs` `imlib-config --libs` -lgdk_imlib
TOOLLIBS=`gtk-config --libs`
-CC=gcc
OBJ = main.o language.o init.o tools.o xtools.o menus.o setup.o io.o duplicate.o wav_frontend.o wav_id.o create.o
all: xcdroast wavplay rmtool vrfytool cddbtool xcdrwrap
- @echo
- @echo "***********************************************************"
- @echo " Please don't forget to install now \"cdrecord-1.10\" as"
- @echo " described in the README. Before doing a \"make install\""
- @echo " I recommend to do a \"make deinstall\" if you already"
- @echo " had a prior alpha of X-CD-Roast 0.98 installed."
- @echo
- @echo " Check out \"README.nonroot\" now."
- @echo "***********************************************************"
- @echo
-
.c.o: xcdroast.h main.h
- $(CC) $(CFLAGS) -c $<
+ $(CC) $(CFLAGS) $(CFLAGS1) -c $<
xcdroast: $(OBJ)
$(CC) $(OBJ) $(LIBS) -o xcdroast
@@ -67,7 +55,7 @@ cddbtool: cddbtool.o tools.o
cp cddbtool lib/bin
xcdrwrap: xcdrwrap.c tools.o
- $(CC) $(CFLAGS2) xcdrwrap.c tools.o -o xcdrwrap
+ $(CC) $(CFLAGS) $(CFLAGS2) xcdrwrap.c tools.o -o xcdrwrap
cp xcdrwrap lib/bin
install:
@@ -82,13 +70,6 @@ install:
$(INSTALL) -m 0644 ./lib/icons/* $(DESTDIR)/$(PRE_LIBDIR)/icons
$(INSTALL) -m 0644 ./lib/lang/* $(DESTDIR)/$(PRE_LIBDIR)/lang
$(INSTALL) -m 0644 ./lib/sound/* $(DESTDIR)/$(PRE_LIBDIR)/sound
- @echo
- @echo "***********************************************************"
- @echo " Now don't forget to set the permissions according to "
- @echo " \"README.nonroot\" before starting X-CD-Roast by typing"
- @echo " \"xcdroast\"."
- @echo "***********************************************************"
- @echo
perms:
chown root:cdwrite $(DESTDIR)/$(PRE_LIBDIR)/bin/xcdrwrap

59
misc/xcdroast/patches/patch-init_c
View File

@ -1,59 +0,0 @@
$OpenBSD: patch-init_c,v 1.1.1.1 2002/07/14 19:34:28 wilfried Exp $
--- init.c.orig Tue Jul 17 13:39:11 2001
+++ init.c Fri Jun 7 09:07:00 2002
@@ -323,7 +323,8 @@ gint stat;
get_spawn_path(CDRECORD,tmp);
check_executable(tmp,NULL,1);
- suid_set(tmp);
+ if (!isroot())
+ suid_set(tmp);
stat = check_version_cdrecord(CDRECORD_VERSION,ver);
if (stat == 1 && !noversioncheck) {
g_warning("Invalid cdrecord version %s found. Expecting version %s\n", ver, CDRECORD_VERSION);
@@ -337,7 +338,8 @@ gint stat;
get_spawn_path(MKISOFS,tmp);
check_executable(tmp,NULL,1);
- suid_set(tmp);
+ if (!isroot())
+ suid_set(tmp);
stat = check_version_mkisofs(MKISOFS_VERSION,ver);
if (stat == 1 && !noversioncheck) {
g_warning("Invalid mkisofs version %s found. Expecting version %s\n", ver, MKISOFS_VERSION);
@@ -350,7 +352,8 @@ gint stat;
get_spawn_path(READCD,tmp);
check_executable(tmp,NULL,1);
- suid_set(tmp);
+ if (!isroot())
+ suid_set(tmp);
stat = check_version_readcd(READCD_VERSION,ver);
if (stat == 1 && !noversioncheck) {
g_warning("Invalid readcd version %s found. Expecting version %s\n", ver, READCD_VERSION);
@@ -364,7 +367,8 @@ gint stat;
get_spawn_path(CDDA2WAV,tmp);
check_executable(tmp,NULL,1);
- suid_set(tmp);
+ if (!isroot())
+ suid_set(tmp);
stat = check_version_cdda2wav(CDDA2WAV_VERSION,ver);
if (stat == 1 && !noversioncheck) {
g_warning("Invalid cdda2wav version %s found. Expecting version %s\n", ver, CDDA2WAV_VERSION);
@@ -393,12 +397,13 @@ gint stat;
gint check_wrapper_binary() {
gchar tmp[MAXLINE];
-gid_t wrap_gid;
+gid_t wrap_gid=0;
gint stat;
g_snprintf(tmp,MAXLINE,"%s/%s", sharedir, WRAPPER);
check_executable(tmp,NULL,1);
- wrap_gid = sgid_set(tmp);
+ if (!isroot())
+ wrap_gid = sgid_set(tmp);
/* security check. If this fails then the wrapper is wrong */
stat = check_version_wrapper(tmp);

95
misc/xcdroast/patches/patch-io_c
View File

@ -1,95 +0,0 @@
$OpenBSD: patch-io_c,v 1.2 2002/10/13 22:39:45 pvalchev Exp $
--- io.c.orig Tue May 14 08:37:51 2002
+++ io.c Tue May 14 08:38:12 2002
@@ -20,7 +20,8 @@
# include <sys/soundcard.h>
# include <sys/ioctl.h>
#endif
-#ifdef sun
+#if defined(sun) || defined (__OpenBSD__)
+# include <sys/ioctl.h>
# include <sys/audioio.h>
#endif
#ifdef hpux
@@ -996,7 +997,7 @@ GList *get_dsp_devices() {
GList *dsp;
GList *loop;
struct stat buf;
-#ifdef sun
+#if defined(sun) || defined(__OpenBSD__)
gchar *audiodev;
#endif
dsp = NULL;
@@ -1011,7 +1012,7 @@ gchar *audiodev;
dsp = g_list_append(dsp,"/dev/dsp1");
}
#endif
-#ifdef sun
+#if defined(sun) || defined(__OpenBSD__)
/* check if the user has any special audio-hardware running,
which set the AUDIODEV-environment-variable */
audiodev = getenv("AUDIODEV");
@@ -1084,7 +1085,7 @@ gchar tmp2[MAXLINE];
}
}
#endif
-#ifdef sun
+#if defined(sun) || defined(__OpenBSD__)
g_snprintf(tmp,MAXLINE,"%s%s",dsp,"ctl");
@@ -1991,7 +1992,7 @@ pid_t pid;
}
/* startup child */
- if (execl("/bin/sh", "sh", "-c", cmd ,NULL) < 0) {
+ if (execl("/bin/sh", "sh", "-c", cmd ,(void*)NULL) < 0) {
g_error("execl error\n");
}
@@ -2365,7 +2366,7 @@ gint mix;
#if defined(linux) || defined(__FreeBSD__)
gint val;
#endif
-#ifdef sun
+#if defined(sun) || defined(__OpenBSD__)
audio_info_t ainfo;
#endif
#ifdef hpux
@@ -2400,7 +2401,7 @@ struct audio_gains again;
return ((val & 0x7f) + ((val >> 8) & 0x7f))/2;
#endif
-#ifdef sun
+#if defined(sun) || defined(__OpenBSD__)
dodebug(10,"quering mixer %s\n", setupdata.mix_device);
mix = open(setupdata.mix_device, O_RDONLY);
@@ -2450,7 +2451,7 @@ struct audio_gains again;
gint set_mixer(gint val) {
gint mix;
-#ifdef sun
+#if defined(sun) || defined(__OpenBSD__)
audio_info_t ainfo;
#endif
#ifdef hpux
@@ -2482,7 +2483,7 @@ struct audio_gains again;
close(mix);
#endif
-#ifdef sun
+#if defined(sun) || defined(__OpenBSD__)
dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
mix = open(setupdata.mix_device, O_WRONLY);
@@ -3275,6 +3276,9 @@ gint ret,found;
/* got the message that no medium is present?
in this case, ignore return code */
if (strstr(line,"medium not present")) {
+ found = 1;
+ }
+ if (strstr(line,"Device not ready")) {
found = 1;
}
}

12
misc/xcdroast/patches/patch-src_tools_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_tools_c,v 1.1 2003/02/17 18:10:35 naddy Exp $
--- src/tools.c.orig Wed Jan 1 08:49:38 2003
+++ src/tools.c Wed Feb 5 18:06:13 2003
@@ -924,7 +924,7 @@ gchar tmp[1024];
gint isroot() {
- if (getuid() == 0) {
+ if (geteuid() == 0) {
return 1;
} else {
return 0;

13
misc/xcdroast/patches/patch-xtools_c → misc/xcdroast/patches/patch-src_xtools_c
View File

@ -1,16 +1,15 @@
$OpenBSD: patch-xtools_c,v 1.1.1.1 2002/07/14 19:34:28 wilfried Exp $
--- xtools.c.orig Tue Jul 17 13:39:15 2001
+++ xtools.c Fri Jun 7 08:27:41 2002
@@ -2264,7 +2264,7 @@ gint count;
$OpenBSD: patch-src_xtools_c,v 1.1 2003/02/17 18:10:35 naddy Exp $
--- src/xtools.c.orig Tue Dec 31 08:29:27 2002
+++ src/xtools.c Wed Feb 5 18:06:51 2003
@@ -2559,6 +2559,7 @@ gint count;
/* do change the group rights for nonroot mode */
/* this seems only be required with /bin/sh being bash2 */
-
+#if 0
void fix_guid() {
dodebug(3,"Current gid/egid = %d/%d\n", getgid(), getegid());
@@ -2276,7 +2276,7 @@ void fix_guid() {
@@ -2570,7 +2571,7 @@ void fix_guid() {
setregid(getegid(), getgid());
dodebug(3,"Current gid/egid after setregid = %d/%d\n", getgid(), getegid());
}

12
misc/xcdroast/patches/patch-tools_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-tools_c,v 1.1.1.1 2002/07/14 19:34:28 wilfried Exp $
--- tools.c.orig Tue Jul 17 13:39:13 2001
+++ tools.c Fri Jun 7 08:23:17 2002
@@ -677,7 +677,7 @@ gchar tmp[1024];
gint isroot() {
- if (getuid() == 0) {
+ if (geteuid() == 0) {
return 1;
} else {
return 0;

41
misc/xcdroast/patches/patch-wavplay_c
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-wavplay_c,v 1.1.1.1 2002/07/14 19:34:28 wilfried Exp $
--- wavplay.c.orig Tue May 14 08:37:58 2002
+++ wavplay.c Tue May 14 08:38:08 2002
@@ -22,7 +22,8 @@
#include <sys/soundcard.h>
#include <sys/ioctl.h>
#endif
-#ifdef sun
+#if defined(sun) || defined(__OpenBSD__)
+#include <sys/ioctl.h>
#include <sys/audioio.h>
#endif
#ifdef hpux
@@ -110,7 +111,7 @@ gint flags;
#endif
-#ifdef sun
+#if defined(sun) || defined(__OpenBSD__)
/* open the sound-device of solaris and set cd-quality */
@@ -137,7 +138,9 @@ gint flags;
info.play.precision = 16;
info.play.encoding = AUDIO_ENCODING_LINEAR;
info.play.buffer_size = abuf_size;
+#ifndef __OpenBSD__
info.output_muted = 0;
+#endif
if (ioctl(audio, AUDIO_SETINFO, &info) == -1) {
g_warning("Unable to set audio parameters\n");
@@ -335,7 +338,7 @@ gchar tmpswap;
#if defined(linux) || defined(__FreeBSD__)
audio = open_linux_audio(audio_dev);
#endif
-#ifdef sun
+#if defined(sun) || defined(__OpenBSD__)
audio = open_solaris_audio(audio_dev);
#endif
#ifdef hpux

22
misc/xcdroast/pkg/MESSAGE
View File

@ -5,17 +5,17 @@ Due to cdrecord's -scanbus option being wholly unusable under
OpenBSD, you will need to manually specify the device by using the
-f option of xcdroast.
Find your CD device:
dmesg |grep cd0
cd0 at scsibus0 targ 0 lun 0: <PLEXTOR, CD-R PX-W8432T, 1.07> <snip>
Find your CD device(s), e.g.:
dmesg |egrep "cd0|cd1"
cd0 at scsibus0 targ 0 lun 0: <HITACHI, DVD-ROM GD-5000, 0213>
cd1 at scsibus1 targ 0 lun 0: <PLEXTOR, CD-R PX-W8432T, 1.09>
Specify the device (:bus,targ,lun is optional):
"xcdroast -f /dev/rcd0c"
Specify your devices (:bus,targ,lun is optional):
# xcdroast -f /dev/rcd0c,/dev/rcd1c
To begin generating a configuration file, simply run xcdroast with
the above option as root. If you wish to learn how to configure
your system to allow for non-root cd-burning, please consult the
installed documentation at:
${PREFIX}/share/doc/xcdroast/README.nonroot
To begin generating a configuration file, simply run xcdroast as root
with the correct options. If you wish to enable CD burning for
non-root users, click the "Activate Non-Root-Mode" button. You will be
presented with the list of commands that are to be executed and
have the opportunity to cancel.

88
misc/xcdroast/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2002/07/14 19:34:28 wilfried Exp $
@comment $OpenBSD: PLIST,v 1.2 2003/02/17 18:10:35 naddy Exp $
bin/xcdroast
lib/xcdroast-0.98/bin/cddbtool
lib/xcdroast-0.98/bin/rmtool
@ -12,16 +12,90 @@ lib/xcdroast-0.98/icons/dialog_error.png
lib/xcdroast-0.98/icons/dialog_information.png
lib/xcdroast-0.98/icons/dialog_question.png
lib/xcdroast-0.98/icons/dialog_warning.png
lib/xcdroast-0.98/icons/xcdricon.gif
lib/xcdroast-0.98/icons/xcdricon.png
lib/xcdroast-0.98/icons/xcdrlogo.gif
lib/xcdroast-0.98/lang/lang_extract.sh
lib/xcdroast-0.98/lang/langhelp.def
lib/xcdroast-0.98/lang/language.def
lib/xcdroast-0.98/sound/test.wav
share/doc/xcdroast/README.nonroot
man/man1/xcdroast.1
share/locale/bg/LC_MESSAGES/xcdroast.mo
share/locale/ca/LC_MESSAGES/xcdroast.mo
share/locale/cs/LC_MESSAGES/xcdroast.mo
share/locale/da/LC_MESSAGES/xcdroast.mo
share/locale/de/LC_MESSAGES/xcdroast.mo
share/locale/es/LC_MESSAGES/xcdroast.mo
share/locale/et/LC_MESSAGES/xcdroast.mo
share/locale/fi/LC_MESSAGES/xcdroast.mo
share/locale/fr/LC_MESSAGES/xcdroast.mo
share/locale/gl/LC_MESSAGES/xcdroast.mo
share/locale/hr/LC_MESSAGES/xcdroast.mo
share/locale/hu/LC_MESSAGES/xcdroast.mo
share/locale/id/LC_MESSAGES/xcdroast.mo
share/locale/it/LC_MESSAGES/xcdroast.mo
share/locale/ja/LC_MESSAGES/xcdroast.mo
share/locale/nl/LC_MESSAGES/xcdroast.mo
share/locale/no/LC_MESSAGES/xcdroast.mo
share/locale/pl/LC_MESSAGES/xcdroast.mo
share/locale/pt_BR/LC_MESSAGES/xcdroast.mo
share/locale/ru/LC_MESSAGES/xcdroast.mo
share/locale/sk/LC_MESSAGES/xcdroast.mo
share/locale/sv/LC_MESSAGES/xcdroast.mo
share/locale/tr/LC_MESSAGES/xcdroast.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/xcdroast.mo
share/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo
share/pixmaps/xcdricon.xpm
@dirrm share/doc/xcdroast
@comment @dirrm share/pixmaps
@comment @dirrm share/locale/zh_TW.Big5/LC_MESSAGES
@comment @dirrm share/locale/zh_TW.Big5
@comment @dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
@comment @dirrm share/locale/zh_CN.GB2312
@comment @dirrm share/locale/tr/LC_MESSAGES
@comment @dirrm share/locale/tr
@comment @dirrm share/locale/sv/LC_MESSAGES
@comment @dirrm share/locale/sv
@comment @dirrm share/locale/sk/LC_MESSAGES
@comment @dirrm share/locale/sk
@comment @dirrm share/locale/ru/LC_MESSAGES
@comment @dirrm share/locale/ru
@comment @dirrm share/locale/pt_BR/LC_MESSAGES
@comment @dirrm share/locale/pt_BR
@comment @dirrm share/locale/pl/LC_MESSAGES
@comment @dirrm share/locale/pl
@comment @dirrm share/locale/no/LC_MESSAGES
@comment @dirrm share/locale/no
@comment @dirrm share/locale/nl/LC_MESSAGES
@comment @dirrm share/locale/nl
@comment @dirrm share/locale/ja/LC_MESSAGES
@comment @dirrm share/locale/ja
@comment @dirrm share/locale/it/LC_MESSAGES
@comment @dirrm share/locale/it
@comment @dirrm share/locale/id/LC_MESSAGES
@comment @dirrm share/locale/id
@comment @dirrm share/locale/hu/LC_MESSAGES
@comment @dirrm share/locale/hu
@comment @dirrm share/locale/hr/LC_MESSAGES
@comment @dirrm share/locale/hr
@comment @dirrm share/locale/gl/LC_MESSAGES
@comment @dirrm share/locale/gl
@comment @dirrm share/locale/fr/LC_MESSAGES
@comment @dirrm share/locale/fr
@comment @dirrm share/locale/fi/LC_MESSAGES
@comment @dirrm share/locale/fi
@comment @dirrm share/locale/et/LC_MESSAGES
@comment @dirrm share/locale/et
@comment @dirrm share/locale/es/LC_MESSAGES
@comment @dirrm share/locale/es
@comment @dirrm share/locale/de/LC_MESSAGES
@comment @dirrm share/locale/de
@comment @dirrm share/locale/da/LC_MESSAGES
@comment @dirrm share/locale/da
@comment @dirrm share/locale/cs/LC_MESSAGES
@comment @dirrm share/locale/cs
@comment @dirrm share/locale/ca/LC_MESSAGES
@comment @dirrm share/locale/ca
@comment @dirrm share/locale/bg/LC_MESSAGES
@comment @dirrm share/locale/bg
@comment @dirrm share/locale
@dirrm lib/xcdroast-0.98/sound
@dirrm lib/xcdroast-0.98/lang
@dirrm lib/xcdroast-0.98/icons
@dirrm lib/xcdroast-0.98/bin
@dirrm lib/xcdroast-0.98