diff --git a/Makefile.am b/Makefile.am index f62f0cc..63886a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,7 +103,7 @@ test_structest_SOURCES = test/structest.c ## cdrskin construction site - ts A60816 cdrskin_cdrskin_CPPFLAGS = -Ilibburn -cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_2_3 +cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_2_6 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/cdrskin/README b/cdrskin/README index 755d326..41d6665 100644 --- a/cdrskin/README +++ b/cdrskin/README @@ -26,12 +26,12 @@ following possible. cdrskin. By Thomas Schmitt Integrated sub project of libburn.pykix.org but also published via: http://scdbackup.sourceforge.net/cdrskin_eng.html -http://scdbackup.sourceforge.net/cdrskin-0.2.5.tar.gz +http://scdbackup.sourceforge.net/cdrskin-0.2.6.pl01.tar.gz Copyright (C) 2006 Thomas Schmitt ------------------------------------------------------------------------------ -On top of libburn there is implemented cdrskin 0.2.5, a limited cdrecord +On top of libburn there is implemented cdrskin 0.2.6, 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.2.5.tar.gz , take it to a directory of your choice and do: +Obtain cdrskin-0.2.6.pl01.tar.gz, take it to a directory of your choice and do: - tar xzf cdrskin-0.2.5.tar.gz - cd cdrskin-0.2.5 + tar xzf cdrskin-0.2.6.pl01.tar.gz + cd cdrskin-0.2.6 Or obtain a libburn.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.2.5 or libburn then execute: +Within that toplevel directory of either cdrskin-0.2.6 or libburn then execute: ./configure make diff --git a/cdrskin/add_ts_changes_to_libburn_0_2_4 b/cdrskin/add_ts_changes_to_libburn_0_2_6 similarity index 97% rename from cdrskin/add_ts_changes_to_libburn_0_2_4 rename to cdrskin/add_ts_changes_to_libburn_0_2_6 index 975c565..bf09dd8 100755 --- a/cdrskin/add_ts_changes_to_libburn_0_2_4 +++ b/cdrskin/add_ts_changes_to_libburn_0_2_6 @@ -36,10 +36,13 @@ intermediate="./libburn_pykix" # My changes are in libburn-0.2.3.ts.develop , mainly in ./cdrskin changes="./libburn-0.2.3.ts.develop" -skin_rev="0.2.4" +skin_release="0.2.6" +patch_level=".pl01" +skin_rev="$skin_release""$patch_level" + # The result directory and the name of the result tarballs -target="./cdrskin-${skin_rev}" +target="./cdrskin-${skin_release}" cdrskin_tarball="./cdrskin-${skin_rev}.tar.gz" cdrskin_tarball_svn="./cdrskin-${skin_rev}.svn.tar.gz" diff --git a/cdrskin/add_ts_changes_to_libburn_0_2_5 b/cdrskin/add_ts_changes_to_libburn_0_2_7 similarity index 99% rename from cdrskin/add_ts_changes_to_libburn_0_2_5 rename to cdrskin/add_ts_changes_to_libburn_0_2_7 index 437f1e5..2d88495 100755 --- a/cdrskin/add_ts_changes_to_libburn_0_2_5 +++ b/cdrskin/add_ts_changes_to_libburn_0_2_7 @@ -36,7 +36,7 @@ intermediate="./libburn_pykix" # My changes are in libburn-0.2.3.ts.develop , mainly in ./cdrskin changes="./libburn-0.2.3.ts.develop" -skin_rev="0.2.5" +skin_rev="0.2.7" # The result directory and the name of the result tarballs target="./cdrskin-${skin_rev}" diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c index 710f9f6..0472b91 100644 --- a/cdrskin/cdrskin.c +++ b/cdrskin/cdrskin.c @@ -123,7 +123,7 @@ or /** The official program version */ #ifndef Cdrskin_prog_versioN -#define Cdrskin_prog_versioN "0.2.5" +#define Cdrskin_prog_versioN "0.2.6" #endif /** The source code release timestamp */ @@ -156,14 +156,25 @@ or #endif /* Cdrskin_libburn_cvs_A60220_tS */ -#ifdef Cdrskin_libburn_0_2_2 -#define Cdrskin_libburn_versioN "0.2.2" +#ifdef Cdrskin_libburn_0_2_6 +#define Cdrskin_libburn_versioN "0.2.6" +#define Cdrskin_libburn_from_pykix_svN 1 +#endif /* Cdrskin_libburn_0_2_6 */ + +#ifndef Cdrskin_libburn_versioN +#define Cdrskin_libburn_versioN "0.2.6" #define Cdrskin_libburn_from_pykix_svN 1 #endif -#ifdef Cdrskin_libburn_0_2_3 -#define Cdrskin_libburn_versioN "0.2.3" -#define Cdrskin_libburn_from_pykix_svN 1 +#ifdef Cdrskin_libburn_from_pykix_svN +#ifndef Cdrskin_oldfashioned_api_usE + +#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 +#define Cdrskin_allow_libburn_taO 1 #define Cdrskin_libburn_has_is_enumerablE 1 #define Cdrskin_libburn_has_convert_fs_adR 1 #define Cdrskin_libburn_has_convert_scsi_adR 1 @@ -178,21 +189,6 @@ or #define Cdrskin_libburn_has_pretend_fulL 1 #define Cdrskin_libburn_has_multI 1 #define Cdrskin_libburn_has_buffer_min_filL 1 -#endif - -#ifndef Cdrskin_libburn_versioN -#define Cdrskin_libburn_versioN "0.2.2" -#define Cdrskin_libburn_from_pykix_svN 1 -#endif - -#ifdef Cdrskin_libburn_from_pykix_svN - -#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 -#define Cdrskin_allow_libburn_taO 1 #ifdef Cdrskin_new_api_tesT @@ -204,14 +200,10 @@ or #define Cdrskin_atip_speed_is_oK 1 #endif -#endif +#endif /* Cdrskin_new_api_tesT */ -#ifdef Cdrskin_oldfashioned_api_usE - -/* switch back to pre-0.2.2 libburn usage */; - -#endif +#endif /* ! Cdrskin_oldfashioned_api_usE */ #endif /* Cdrskin_libburn_from_pykix_svN */ diff --git a/cdrskin/cdrskin_eng.html b/cdrskin/cdrskin_eng.html index 2ceb877..f88fa6b 100644 --- a/cdrskin/cdrskin_eng.html +++ b/cdrskin/cdrskin_eng.html @@ -51,7 +51,7 @@ A CD recorder suitable for GPL software included:
-
libburn-0.2.3 stabilized SVN snapshot
+
libburn-0.2.6
(by Derek Foreman, Ben Jansens, and team of libburn.pykix.org)
transfers data to CD
@@ -99,9 +99,7 @@ wishes as well as on the development of libburn.
$ cdrskin -v dev=/dev/dvd blank=fast -eject
Write ISO-9660 filesystem image:
$ cdrskin -v dev=/dev/hdc speed=12 fs=8m driveropts=burnfree -sao -eject padsize=300k my_image.iso
-
Write compressed afio archive on-the-fly via cdrskin-0.2.4 :
-
$ find . | afio -oZ - | cdrskin -v dev=0,1,0 fs=32m speed=8 driveropts=burnfree padsize=300k -sao tsize=650m -
-
Write compressed afio archive on-the-fly via cdrskin-0.2.5 :
+
Write compressed afio archive on-the-fly :
$ find . | afio -oZ - | cdrskin -v dev=0,1,0 fs=32m speed=8 driveropts=burnfree padsize=300k -tao -
Write audio tracks:
$ cdrskin -v dev=ATA:1,0,0 speed=48 driveropts=burnfree -sao track1.wav track2.au -audio -swab track3.raw @@ -125,13 +123,7 @@ wishes as well as on the development of libburn.