From 57ea9cc375650d19321939a52ea421b1af23e4c1 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt
Date: Mon, 12 Mar 2007 15:58:19 +0000
Subject: [PATCH] Made number transition to 0.3.5
---
libburn/trunk/Makefile.am | 4 +-
libburn/trunk/README | 5 +-
libburn/trunk/cdrskin/README | 12 +--
libburn/trunk/cdrskin/cdrskin.c | 37 ++++---
libburn/trunk/cdrskin/cdrskin_eng.html | 120 ++++++++++------------
libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +-
libburn/trunk/cdrskin/compile_cdrskin.sh | 10 +-
libburn/trunk/configure.ac | 4 +-
8 files changed, 99 insertions(+), 95 deletions(-)
diff --git a/libburn/trunk/Makefile.am b/libburn/trunk/Makefile.am
index 016a96ae..1cc89b67 100644
--- a/libburn/trunk/Makefile.am
+++ b/libburn/trunk/Makefile.am
@@ -101,9 +101,9 @@ test_structest_CPPFLAGS = -Ilibburn
test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
test_structest_SOURCES = test/structest.c
-## cdrskin construction site - ts A60816 - A70210
+## cdrskin construction site - ts A60816 - A70312
cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_3_3
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_3_5
cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h cdrskin/cdrskin_timestamp.h
##
diff --git a/libburn/trunk/README b/libburn/trunk/README
index 1aec3844..a30bd1e1 100644
--- a/libburn/trunk/README
+++ b/libburn/trunk/README
@@ -192,7 +192,10 @@ Project history as far as known to me:
- 11th February 2007 version 0.3.2 covers sequential DVD-RW and DVD-R with
multi-session and with DAO.
- This means all single layer DVD media except DVD+R are supported now.
+
+- 12th March 2007 version 0.3.4 supports DVD+R and thus covers all single layer
+ DVD media. Code for double layer DVD+/-R is implemented but awaits a tester
+ yet.
------------------------------------------------------------------------------
diff --git a/libburn/trunk/cdrskin/README b/libburn/trunk/cdrskin/README
index f074ae32..fc3fd7fd 100644
--- a/libburn/trunk/cdrskin/README
+++ b/libburn/trunk/cdrskin/README
@@ -26,12 +26,12 @@ following possible.
cdrskin. By Thomas Schmitt
Integrated sub project of libburnia.pykix.org but also published via:
http://scdbackup.sourceforge.net/cdrskin_eng.html
-http://scdbackup.sourceforge.net/cdrskin-0.3.3.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-0.3.5.tar.gz
Copyright (C) 2006-2007 Thomas Schmitt
------------------------------------------------------------------------------
-On top of libburn there is implemented cdrskin 0.3.3, a limited cdrecord
+On top of libburn there is implemented cdrskin 0.3.5, a limited cdrecord
compatibility wrapper which allows to use some libburn features from
the command line.
Interested users of cdrecord are invited to participate in the development
@@ -59,16 +59,16 @@ systems, including 64 bit systems. (Further reports are welcome.)
Compilation, First Glimpse, Installation
-Obtain cdrskin-0.3.3.tar.gz, take it to a directory of your choice and do:
+Obtain cdrskin-0.3.5.tar.gz, take it to a directory of your choice and do:
- tar xzf cdrskin-0.3.3.tar.gz
- cd cdrskin-0.3.3
+ tar xzf cdrskin-0.3.5.tar.gz
+ cd cdrskin-0.3.5
Or obtain a libburnia.pykix.org SVN snapshot,
go into the toplevel directory of the snapshot (e.g. cd libburn_pykix ),
and execute the autotools script ./bootstrap . Use autools version >= 1.7 .
-Within that toplevel directory of either cdrskin-0.3.3 or libburn then execute:
+Within that toplevel directory of either cdrskin-0.3.5 or libburn then execute:
./configure
make
diff --git a/libburn/trunk/cdrskin/cdrskin.c b/libburn/trunk/cdrskin/cdrskin.c
index 1208c593..4d170ac5 100644
--- a/libburn/trunk/cdrskin/cdrskin.c
+++ b/libburn/trunk/cdrskin/cdrskin.c
@@ -86,7 +86,7 @@ or
/** The official program version */
#ifndef Cdrskin_prog_versioN
-#define Cdrskin_prog_versioN "0.3.3"
+#define Cdrskin_prog_versioN "0.3.5"
#endif
/** The source code release timestamp */
@@ -119,39 +119,37 @@ or
#endif /* Cdrskin_libburn_cvs_A60220_tS */
-#ifdef Cdrskin_libburn_0_3_2
-#define Cdrskin_libburn_versioN "0.3.2"
+#ifdef Cdrskin_libburn_0_3_4
+#define Cdrskin_libburn_versioN "0.3.4"
#define Cdrskin_libburn_from_pykix_svN 1
-#endif /* Cdrskin_libburn_0_3_2 */
+#endif /* Cdrskin_libburn_0_3_4 */
-#ifdef Cdrskin_libburn_0_3_3
-#define Cdrskin_libburn_versioN "0.3.3"
+#ifdef Cdrskin_libburn_0_3_5
+#define Cdrskin_libburn_versioN "0.3.5"
#define Cdrskin_libburn_from_pykix_svN 1
/* Place novelty switch macros here.
Move them down to Cdrskin_libburn_from_pykix_svN on version leap
*/
-#define Cdrskin_libburn_has_set_filluP 1
-#define Cdrskin_libburn_has_get_spacE 1
-#define Cdrskin_libburn_write_mode_ruleS 1
-#define Cdrskin_libburn_has_allow_untested_profileS 1
-#define Cdrskin_libburn_has_set_forcE 1
-#endif /* Cdrskin_libburn_0_3_3 */
+#endif /* Cdrskin_libburn_0_3_5 */
#ifndef Cdrskin_libburn_versioN
-#define Cdrskin_libburn_versioN "0.3.2"
+#define Cdrskin_libburn_versioN "0.3.4"
#define Cdrskin_libburn_from_pykix_svN 1
#endif
#ifdef Cdrskin_libburn_from_pykix_svN
#ifndef Cdrskin_oldfashioned_api_usE
+/* 0.2.2 */
#define Cdrskin_libburn_does_ejecT 1
#define Cdrskin_libburn_has_drive_get_adR 1
#define Cdrskin_progress_track_does_worK 1
#define Cdrskin_is_erasable_on_load_does_worK 1
#define Cdrskin_grab_abort_does_worK 1
+
+/* 0.2.4 */
#define Cdrskin_allow_libburn_taO 1
#define Cdrskin_libburn_has_is_enumerablE 1
#define Cdrskin_libburn_has_convert_fs_adR 1
@@ -164,19 +162,32 @@ or
#define Cdrskin_libburn_has_burn_disc_unsuitablE 1
#define Cdrskin_libburn_has_read_atiP 1
#define Cdrskin_libburn_has_buffer_progresS 1
+
+/* 0.2.6 */
#define Cdrskin_libburn_has_pretend_fulL 1
#define Cdrskin_libburn_has_multI 1
#define Cdrskin_libburn_has_buffer_min_filL 1
+
+/* 0.3.0 */
#define Cdrskin_atip_speed_is_oK 1
#define Cdrskin_libburn_has_get_profilE 1
#define Cdrskin_libburn_has_set_start_bytE 1
#define Cdrskin_libburn_has_wrote_welL 1
#define Cdrskin_libburn_has_bd_formattinG 1
#define Cdrskin_libburn_has_burn_disc_formaT 1
+
+/* 0.3.2 */
#define Cdrskin_libburn_has_get_msc1 1
#define Cdrskin_libburn_has_toc_entry_extensionS 1
#define Cdrskin_libburn_has_get_multi_capS 1
+/* 0.3.4 */
+#define Cdrskin_libburn_has_set_filluP 1
+#define Cdrskin_libburn_has_get_spacE 1
+#define Cdrskin_libburn_write_mode_ruleS 1
+#define Cdrskin_libburn_has_allow_untested_profileS 1
+#define Cdrskin_libburn_has_set_forcE 1
+
#ifdef Cdrskin_new_api_tesT
/* put macros under test caveat here */
diff --git a/libburn/trunk/cdrskin/cdrskin_eng.html b/libburn/trunk/cdrskin/cdrskin_eng.html
index 3cd9257b..013cba37 100644
--- a/libburn/trunk/cdrskin/cdrskin_eng.html
+++ b/libburn/trunk/cdrskin/cdrskin_eng.html
@@ -2,7 +2,7 @@
-
+
cdrskin homepage english
@@ -24,9 +24,8 @@
Purpose:
-
-- Burns preformatted data to CD-R, CD-RW, DVD-R, DVD-RW, DVD-RAM, DVD+RW
-
+Burns preformatted data to CD and single layer DVD media:
+CD-R, DVD-R, DVD+R, CD-RW, DVD-RW, DVD-RAM, DVD+RW
@@ -35,8 +34,9 @@
Hardware requirements:
A CD/DVD recorder suitable for
-libburnia.pykix.org
-(SCSI or IDE/ATAPI writers compliant to standard MMC-3 or higher).
+libburnia.pykix.org
+(SCSI , ATA , USB , or SATA writers compliant to standard MMC-3 for CD
+and to MMC-5 for DVD).
@@ -44,7 +44,7 @@ A CD/DVD recorder suitable for
Software requirements :
- Linux kernel 2.4 or higher
-- With kernel 2.4 the drive has to be under ide-scsi emulation.
+- With kernel 2.4 an ATA drive has to be under ide-scsi emulation.
- With kernel 2.6 the drive should not be under ide-scsi.
- libpthread
- is supposed to be a standard system component.
@@ -56,7 +56,7 @@ A CD/DVD recorder suitable for
GPL software included:
-- libburn-0.3.2
+- libburn-0.3.4
- (by Derek Foreman, Ben Jansens, and team of libburnia.pykix.org)
- transfers data to CD
@@ -94,10 +94,15 @@ can use this write mode, too.
Further enhancements depend on people who can describe and discuss their
wishes as well as on the development of libburn.
-- Get an overview of drives and their addresses:
-- $ cdrskin -scanbus
-- $ cdrskin dev=ATA -scanbus
-- $ cdrskin --devices
+- Get an overview of drives and their addresses
+- # cdrskin -scanbus
+- # cdrskin dev=ATA -scanbus
+- # cdrskin --devices
+- Being superuser avoids permission problems with /dev/sgN resp. /dev/hdX .
+
+- Ordinary users should then get granted rw access to the /dev files
+as listed by option --devices.
+-
- Get info about a particular drive or loaded media:
- $ cdrskin dev=0,1,0 -checkdrive
@@ -124,7 +129,7 @@ wishes as well as on the development of libburn.
- cdrskin -v dev=0,1,0 fs=32m speed=8 \
- -tao padsize=300k -
-- Write several sessions to the same CD or DVD-R[W]:
+- Write several sessions to the same CD, DVD-R[W] or DVD+R:
- $ cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 1.iso
- $ cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 2.iso
@@ -133,10 +138,15 @@ wishes as well as on the development of libburn.
- $ cdrskin dev=/dev/hdc -v padsize=300k -tao 4.iso
-- Get CD or DVD-R[W] multi-session info for option -C of program mkisofs:
+- Get multi-session info for option -C of program mkisofs:
- $ c_values=$(cdrskin dev=/dev/sr0 -msinfo 2>/dev/null)
- $ mkisofs ... -C "$c_values" ...
+- Inquire free space on media for a -tao -multi run:
+- $ x=$(cdrskin dev=/dev/sr0 -tao -multi \
+- --tell_media_space 2>/dev/null)
+- $ echo "Available: $x blocks of 2048 data bytes"
+
- Write audio tracks to CD:
- $ cdrskin -v dev=ATA:1,0,0 speed=48 -sao \
- track1.wav track2.au -audio -swab track3.raw
@@ -163,34 +173,12 @@ man cdrecord
-
-
Known deficiencies:
-
-
--
-Appending sessions to unclosed media is restricted to write mode TAO.
-
--
-cdrskin -scanbus or --devices hangs for quite a while if there is
-a CD drive which does not work properly (e.g. because it has individual
-problems with DMA).
-So if the superuser gets no result with cdrskin --devices then one should
-disable DMA with the problematic CD drives
-(like: hdparm -d0 /dev/hdd )
-and try again.
-In severe cases it might be necessary to guess the device name /dev/sgN resp.
-/dev/hdX of the non-ill burner if it cannot be found otherwise among its
-ill peers. Alternatively one can guess the address of the ill device, remove
-rw-permissions and retry the bus scan as non-superuser.
-
-
-
- Download as source code (see README):
-- cdrskin-0.3.2.pl01.tar.gz
+
- cdrskin-0.3.4.pl00.tar.gz
(570 KB).
-
@@ -201,14 +189,14 @@ cdrskin is part of libburn - full libburn is provided with cdrskin releases.
-
- Download as single x86 binaries (untar and move to /usr/bin/cdrskin):
--
-cdrskin_0.3.2.pl01-x86-suse9_0.tar.gz, (80 KB),
+
-
+cdrskin_0.3.4.pl00-x86-suse9_0.tar.gz, (80 KB),
- runs on SuSE 9.0 (2.4.21) , RIP-14.4 (2.6.14) ,
Gentoo (2.6.15 x86_64 Athlon).
--
-cdrskin_0.3.2.pl01-x86-suse9_0-static.tar.gz, (285 KB), -static compiled,
+
-
+cdrskin_0.3.4.pl00-x86-suse9_0-static.tar.gz, (285 KB), -static compiled,
- runs on SuSE 7.2 (2.4.4), and on the systems above.
@@ -235,36 +223,38 @@ cdrskin_0.3.2.pl01-x86-suse9_0-static.tar.gz, (285 KB), -static compiled,
-Enhancements towards previous stable version cdrskin-0.3.0:
+Enhancements towards previous stable version cdrskin-0.3.2:
-- Burnfree enabled by default
-- Multi-session burning to DVD-R
-and sequential (i.e. unformatted) DVD-RW
-- Option -toc with sequential DVD-R[W]
-- Options -msinfo and msifile= with appendable DVD-R[W]
-- Single session DAO write mode with DVD-R[W]
+- Multi-session burning to DVD+R
+- New option --tell_media_space tells the maximum size for the next burn
+- New option assert_write_lba= prevents inadverted writing to appendable
+
- Bug fix: Multi-track runs with fifo could stall in rare cases
-Bug fixes towards cdrskin-0.3.2.pl00:
+
+
+
-Development snapshot, version 0.3.3 :
-- Enhancements towards stable version 0.3.2:
+
Development snapshot, version 0.3.5 :
+- Enhancements towards stable version 0.3.4.pl00:
-- New option --tell_media_space tells the maximum size for the next burn
+- none yet
-
-- README 0.3.3
-
- cdrskin_0.3.3 --help
-- cdrskin_0.3.3 -help
-- man cdrskin (as of 0.3.3)
+- README 0.3.5
+
- cdrskin_0.3.5 --help
+- cdrskin_0.3.5 -help
+- man cdrskin (as of 0.3.5)
-
- Maintainers of cdrskin unstable packages please use SVN of
libburnia.pykix.org
@@ -284,15 +274,15 @@ admins with full system souvereignty.
upcoming README ):
-
-cdrskin-0.3.3.tar.gz
+cdrskin-0.3.5.tar.gz
(570 KB).
- Binary (untar and move to /usr/bin/cdrskin):
--
-cdrskin_0.3.3-x86-suse9_0.tar.gz, (80 KB).
+
-
+cdrskin_0.3.5-x86-suse9_0.tar.gz, (80 KB).
--
-cdrskin_0.3.3-x86-suse9_0-static.tar.gz, (280 KB)
+
-
+cdrskin_0.3.5-x86-suse9_0-static.tar.gz, (280 KB)
@@ -363,7 +353,7 @@ is a GUI frontend which uses cdrecord for CD burning.)
$ export SCDBACKUP_USE_CDRSKIN=1
$ ./CONFIGURE_CD
...
-cdrskin 0.3.2 : limited cdrecord compatibility wrapper for libburn
+cdrskin 0.3.4 : limited cdrecord compatibility wrapper for libburn
If your system is stricken with some ill CD device then this can stall
and you will have to press Ctrl+C to abort.
@@ -422,8 +412,8 @@ Contact me. Let's see what we can achieve.
libburn and cdrskin are now mature enough to substitute cdrecord in its
-major use cases of CD burning. It is possible to foist cdrskin on various
-software packages if it gets falsely named "cdrecord".
+major use cases of CD and DVD burning. It is possible to foist cdrskin on
+various software packages if it gets falsely named "cdrecord".
I do not encourage this approach, but of course such a replacement
opportunity is the goal of a cdrecord compatibility wrapper.
diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h
index de26adf5..50170ed4 100644
--- a/libburn/trunk/cdrskin/cdrskin_timestamp.h
+++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2007.03.09.134622"
+#define Cdrskin_timestamP "2007.03.12.155600"
diff --git a/libburn/trunk/cdrskin/compile_cdrskin.sh b/libburn/trunk/cdrskin/compile_cdrskin.sh
index 72fd9fc5..77b50125 100755
--- a/libburn/trunk/cdrskin/compile_cdrskin.sh
+++ b/libburn/trunk/cdrskin/compile_cdrskin.sh
@@ -7,7 +7,7 @@
debug_opts=
def_opts=
largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
-libvers="-DCdrskin_libburn_0_3_3"
+libvers="-DCdrskin_libburn_0_3_5"
cleanup_src_or_obj="libburn/cleanup.o"
libdax_msgs_o="libburn/libdax_msgs.o"
libdax_audioxtr_o="libburn/libdax_audioxtr.o"
@@ -33,15 +33,15 @@ do
libdax_audioxtr_o=
libdax_msgs_o="libburn/message.o"
cleanup_src_or_obj="-DCleanup_has_no_libburn_os_H cdrskin/cleanup.c"
- elif test "$i" = "-libburn_0_3_2"
+ elif test "$i" = "-libburn_0_3_4"
then
- libvers="-DCdrskin_libburn_0_3_2"
+ libvers="-DCdrskin_libburn_0_3_4"
libdax_audioxtr_o="libburn/libdax_audioxtr.o"
libdax_msgs_o="libburn/libdax_msgs.o"
cleanup_src_or_obj="libburn/cleanup.o"
elif test "$i" = "-libburn_svn"
then
- libvers="-DCdrskin_libburn_0_3_3"
+ libvers="-DCdrskin_libburn_0_3_5"
libdax_audioxtr_o="libburn/libdax_audioxtr.o"
libdax_msgs_o="libburn/libdax_msgs.o"
cleanup_src_or_obj="libburn/cleanup.o"
@@ -79,7 +79,7 @@ do
echo " -compile_cdrfifo compile program cdrskin/cdrfifo."
echo " -compile_dewav compile program test/dewav without libburn."
echo " -cvs_A60220 set macro to match libburn-CVS of 20 Feb 2006."
- echo " -libburn_0_3_2 set macro to match libburn-0.3.2."
+ echo " -libburn_0_3_4 set macro to match libburn-0.3.4."
echo " -libburn_svn set macro to match current libburn-SVN."
echo " -no_largefile do not use 64 bit off_t (must match libburn)."
echo " -do_not_compile_cdrskin omit compilation of cdrskin/cdrskin."
diff --git a/libburn/trunk/configure.ac b/libburn/trunk/configure.ac
index dad0ced7..f8801be0 100644
--- a/libburn/trunk/configure.ac
+++ b/libburn/trunk/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libburn], [0.3.3], [http://libburnia.pykix.org])
+AC_INIT([libburn], [0.3.5], [http://libburnia.pykix.org])
AC_PREREQ([2.50])
dnl AC_CONFIG_HEADER([config.h])
@@ -19,7 +19,7 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
dnl
BURN_MAJOR_VERSION=0
BURN_MINOR_VERSION=3
-BURN_MICRO_VERSION=3
+BURN_MICRO_VERSION=5
BURN_INTERFACE_AGE=0
BURN_BINARY_AGE=0
BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION