libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made number transition to 0.7.9

Browse Source
This commit is contained in:
Thomas Schmitt
2010-03-10 13:56:58 +00:00
parent 196ef37108
commit 3289ffd1e6
9 changed files with 73 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cdrskin/README
View File

@ -4,7 +4,7 @@
cdrskin. By Thomas Schmitt <scdbackup@gmx.net>
Integrated sub project of libburnia-project.org but also published via:
http://scdbackup.sourceforge.net/cdrskin_eng.html
http://scdbackup.sourceforge.net/cdrskin-0.7.7.tar.gz
http://scdbackup.sourceforge.net/cdrskin-0.7.9.tar.gz
Copyright (C) 2006-2010 Thomas Schmitt, provided under GPL version 2 or later.
------------------------------------------------------------------------------
@ -25,10 +25,10 @@ By using this software you agree to the disclaimer at the end of this text
Compilation, First Glimpse, Installation
Obtain cdrskin-0.7.7.tar.gz, take it to a directory of your choice and do:
Obtain cdrskin-0.7.9.tar.gz, take it to a directory of your choice and do:
tar xzf cdrskin-0.7.7.tar.gz
cd cdrskin-0.7.7
tar xzf cdrskin-0.7.9.tar.gz
cd cdrskin-0.7.9
Within that directory execute:

53
cdrskin/cdrskin.c
View File

@ -88,7 +88,7 @@ or
/** The official program version */
#ifndef Cdrskin_prog_versioN
#define Cdrskin_prog_versioN "0.7.7"
#define Cdrskin_prog_versioN "0.7.9"
#endif
/** The official libburn interface revision to use.
@ -101,7 +101,7 @@ or
#define Cdrskin_libburn_minoR 7
#endif
#ifndef Cdrskin_libburn_micrO
#define Cdrskin_libburn_micrO 7
#define Cdrskin_libburn_micrO 9
#endif
@ -135,13 +135,13 @@ or
#endif /* Cdrskin_libburn_cvs_A60220_tS */
#ifdef Cdrskin_libburn_0_7_6
#define Cdrskin_libburn_versioN "0.7.6"
#ifdef Cdrskin_libburn_0_7_8
#define Cdrskin_libburn_versioN "0.7.8"
#define Cdrskin_libburn_from_pykix_svN 1
#endif /* Cdrskin_libburn_0_7_6 */
#endif /* Cdrskin_libburn_0_7_8 */
#ifdef Cdrskin_libburn_0_7_7
#define Cdrskin_libburn_versioN "0.7.7"
#ifdef Cdrskin_libburn_0_7_9
#define Cdrskin_libburn_versioN "0.7.9"
#define Cdrskin_libburn_from_pykix_svN 1
/* Place novelty switch macros here.
@ -151,32 +151,31 @@ or
/* Do not stay in signal handler but only cancel and set Cdrskin_abort_leveL.
Make use of burn_is_aborting() to detect pending libburn aborts.
*/
#define Cdrskin_signal_handler_return_2 1
#endif /* Cdrskin_libburn_0_7_7 */
#endif /* Cdrskin_libburn_0_7_9 */
#ifndef Cdrskin_libburn_versioN
#define Cdrskin_libburn_0_7_6
#define Cdrskin_libburn_versioN "0.7.6"
#define Cdrskin_libburn_0_7_8
#define Cdrskin_libburn_versioN "0.7.8"
#define Cdrskin_libburn_from_pykix_svN 1
#endif
#ifdef Cdrskin_libburn_0_7_6
#ifdef Cdrskin_libburn_0_7_8
#undef Cdrskin_libburn_majoR
#undef Cdrskin_libburn_minoR
#undef Cdrskin_libburn_micrO
#define Cdrskin_libburn_majoR 0
#define Cdrskin_libburn_minoR 7
#define Cdrskin_libburn_micrO 6
#define Cdrskin_libburn_micrO 8
#endif
#ifdef Cdrskin_libburn_0_7_7
#ifdef Cdrskin_libburn_0_7_9
#undef Cdrskin_libburn_majoR
#undef Cdrskin_libburn_minoR
#undef Cdrskin_libburn_micrO
#define Cdrskin_libburn_majoR 0
#define Cdrskin_libburn_minoR 7
#define Cdrskin_libburn_micrO 7
#define Cdrskin_libburn_micrO 9
#endif
@ -4157,11 +4156,7 @@ int Cdrskin__is_aborting(int flag)
{
if(Cdrskin_abort_leveL)
return(-1);
#ifdef Cdrskin_signal_handler_return_2
return(burn_is_aborting(0));
#else
return 0;
#endif
return(burn_is_aborting(0));
}
@ -4192,11 +4187,7 @@ int Cdrskin_abort(struct CdrskiN *skin, int flag)
int Cdrskin_abort_handler(struct CdrskiN *skin, int signum, int flag)
{
#ifdef Cdrskin_libburn_has_burn_aborT
int ret;
#else
#ifndef Cdrskin_libburn_has_burn_aborT
int wait_grain= 100000,first_status= 1;
double start_time,last_time,current_time;
@ -4251,8 +4242,6 @@ int Cdrskin_abort_handler(struct CdrskiN *skin, int signum, int flag)
if(skin->verbosity>=Cdrskin_verbose_debuG)
ClN(fprintf(stderr,"cdrskin_debug: ABORT : Calling burn_abort()\n"));
#ifdef Cdrskin_signal_handler_return_2
Cdrskin_abort_leveL= -1;
if (!(flag & 1))
burn_abort(-1, burn_abort_pacifier, "cdrskin: ");
@ -4260,16 +4249,6 @@ int Cdrskin_abort_handler(struct CdrskiN *skin, int signum, int flag)
"cdrskin: ABORT : Urged drive worker threads to do emergency halt.\n");
return -2;
#endif /* Cdrskin_signal_handler_return_2 */
ret= burn_abort(skin->abort_max_wait, burn_abort_pacifier, "cdrskin: ");
if(ret<=0) {
fprintf(stderr,
"\ncdrskin: ABORT : Cannot cancel burn session and release drive.\n");
return(0);
}
fprintf(stderr,"\n");
#else /* Cdrskin_libburn_has_burn_aborT */
if(skin->grabbed_drive!=NULL) {

36
cdrskin/cdrskin_eng.html
View File

@ -62,7 +62,7 @@ via SCSI, PATA (aka IDE, ATA), USB, or SATA.
GPL software included:<BR>
</H2>
<DL>
<DT>libburn-0.7.6</DT>
<DT>libburn-0.7.8</DT>
<DD>(founded by Derek Foreman and Ben Jansens,
developed and maintained since August 2006 by
Thomas Schmitt from team of libburnia-project.org)
@ -194,7 +194,7 @@ Standalone ISO 9660 multi-session CD/DVD/BD tool
<P>
<DL>
<DT>Download as source code (see README):</DT>
<DD><A HREF="cdrskin-0.7.6.pl00.tar.gz">cdrskin-0.7.6.pl00.tar.gz</A>
<DD><A HREF="cdrskin-0.7.8.pl00.tar.gz">cdrskin-0.7.8.pl00.tar.gz</A>
(820 KB).
</DD>
<DD>
@ -244,22 +244,26 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
<HR>
<P>
Enhancements towards previous stable version cdrskin-0.7.4.pl00:
Enhancements towards previous stable version cdrskin-0.7.6.pl00:
<UL>
<LI>
Made FreeBSD system adapter safe from mutal burn spoiling and drive deadlock
Abort handling is more suitable for FreeBSD now.
</LI>
<LI>Experimental system adapter via GNU libcdio on X/Open systems</LI>
<LI>Experimentally using FreeBSD system adapter for Debian kfreebsd</LI>
<!--
<LI>none</LI>
-->
</UL>
Bug fixes towards cdrskin-0.7.4.pl00:
Bug fixes towards cdrskin-0.7.6.pl00:
<UL>
<LI>none</LI>
<LI>
On FreeBSD: Piped input was falsely attributed a small fixed size
</LI>
<LI>
cdrskin fs=0 led to SIGSEGV. Regression introduced by version 0.7.4.
</LI>
<!--
<LI>none</LI>
-->
</UL>
@ -267,8 +271,8 @@ Bug fixes towards cdrskin-0.7.4.pl00:
<P>
<DL>
<DT><H3>Development snapshot, version 0.7.7 :</H3></DT>
<DD>Enhancements towards current stable version 0.7.6.pl00:
<DT><H3>Development snapshot, version 0.7.9 :</H3></DT>
<DD>Enhancements towards current stable version 0.7.8.pl00:
<UL>
<LI>none yet</LI>
<!--
@ -286,10 +290,10 @@ Bug fixes towards cdrskin-0.7.4.pl00:
</DD>
<DD>&nbsp;</DD>
<DD><A HREF="README_cdrskin_devel">README 0.7.7</A>
<DD><A HREF="cdrskin__help_devel">cdrskin_0.7.7 --help</A></DD>
<DD><A HREF="cdrskin_help_devel">cdrskin_0.7.7 -help</A></DD>
<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.7.7)</A></DD>
<DD><A HREF="README_cdrskin_devel">README 0.7.9</A>
<DD><A HREF="cdrskin__help_devel">cdrskin_0.7.9 --help</A></DD>
<DD><A HREF="cdrskin_help_devel">cdrskin_0.7.9 -help</A></DD>
<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.7.9)</A></DD>
<DD>&nbsp;</DD>
<DT>Maintainers of cdrskin unstable packages please use SVN of
<A HREF="http://libburnia-project.org"> libburnia-project.org</A></DT>
@ -309,8 +313,8 @@ admins with full system souvereignty.</DT>
<A HREF="README_cdrskin_devel">upcoming README</A> ):
</DD>
<DD>
<A HREF="cdrskin-0.7.7.tar.gz">cdrskin-0.7.7.tar.gz</A>
(820 KB).
<A HREF="cdrskin-0.7.9.tar.gz">cdrskin-0.7.9.tar.gz</A>
(840 KB).
</DD>
<!-- This is not offered any more since spring 2008

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2010.03.09.140341"
#define Cdrskin_timestamP "2010.03.10.134802"

10
cdrskin/compile_cdrskin.sh
View File

@ -8,7 +8,7 @@ debug_opts="-O2"
def_opts=
largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
fifo_opts=""
libvers="-DCdrskin_libburn_0_7_7"
libvers="-DCdrskin_libburn_0_7_9"
# To be used if Makefile.am uses libburn_libburn_la_CFLAGS
# burn="libburn/libburn_libburn_la-"
@ -47,15 +47,15 @@ do
libdax_audioxtr_o=
libdax_msgs_o="$burn"message.o
cleanup_src_or_obj="-DCleanup_has_no_libburn_os_H cdrskin/cleanup.c"
elif test "$i" = "-libburn_0_7_6"
elif test "$i" = "-libburn_0_7_8"
then
libvers="-DCdrskin_libburn_0_7_6"
libvers="-DCdrskin_libburn_0_7_8"
libdax_audioxtr_o="$burn"libdax_audioxtr.o
libdax_msgs_o="$burn"libdax_msgs.o
cleanup_src_or_obj="$burn"cleanup.o
elif test "$i" = "-libburn_svn"
then
libvers="-DCdrskin_libburn_0_7_7"
libvers="-DCdrskin_libburn_0_7_9"
libdax_audioxtr_o="$burn"libdax_audioxtr.o
libdax_msgs_o="$burn"libdax_msgs.o
cleanup_src_or_obj="$burn"cleanup.o
@ -109,7 +109,7 @@ do
echo "Options:"
echo " -compile_cdrfifo compile program cdrskin/cdrfifo."
echo " -compile_dewav compile program test/dewav without libburn."
echo " -libburn_0_7_6 set macro to match libburn-0.7.6"
echo " -libburn_0_7_8 set macro to match libburn-0.7.8"
echo " -libburn_svn set macro to match current libburn-SVN."
echo " -dvd_obs_64k 64 KB default size for DVD/BD writing."
echo " -use_libcdio link with -lcdio because libburn uses it."