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

Made number transition to 0.7.4

Browse Source
This commit is contained in:
Thomas Schmitt 2009-12-06 17:02:09 +00:00
parent 402da8dc3d
commit 2e5e4ec336
9 changed files with 70 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -70,9 +70,6 @@ libburn_libburn_la_SOURCES = \
libburn/write.h \
version.h
## libburn/lec.c \
## libburn/lec.h \
## libburn/sg-@ARCH@.c \
libinclude_HEADERS = \
@ -113,9 +110,9 @@ test_structest_CPPFLAGS = -Ilibburn
test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
test_structest_SOURCES = test/structest.c
## cdrskin construction site - ts A60816 - A91012
## cdrskin construction site - ts A60816 - A91206
cdrskin_cdrskin_CPPFLAGS = -Ilibburn
cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_7_3
cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_7_4
# cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
# ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking

11
README
View File

@ -11,7 +11,7 @@ Still containing parts of Libburn. By Derek Foreman <derek@signalmarketing.com>
and Ben Jansens <xor@orodu.net>
Copyright (C) 2002-2006 Derek Foreman and Ben Jansens
http://files.libburnia-project.org/releases/libburn-0.7.2.pl00.tar.gz
http://files.libburnia-project.org/releases/libburn-0.7.4.pl00.tar.gz
------------------------------------------------------------------------------
@ -19,10 +19,10 @@ Copyright (C) 2002-2006 Derek Foreman and Ben Jansens
From tarball
Obtain libburn-0.7.2.pl00.tar.gz, take it to a directory of your choice and do:
Obtain libburn-0.7.4.pl00.tar.gz, take it to a directory of your choice and do:
tar xzf libburn-0.7.2.pl00.tar.gz
cd libburn-0.7.2
tar xzf libburn-0.7.4.pl00.tar.gz
cd libburn-0.7.4
./configure --prefix=/usr
make
@ -472,6 +472,9 @@ Project history as far as known to me:
- 12 Nov 2009 libburn-0.7.2.pl01 works around problems with Pioneer DVR-216D.
DVD-R runs made the drive stuck. Ejecting the tray did not work properly.
- 06 Dec 2009 libburn-0.7.4 works around problems with newer DVD burners,
provides throughput enhancements with hampered busses on Linux, and new
API calls to log SCSI commands and to control the libburn fifo.
------------------------------------------------------------------------------

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.3.tar.gz
http://scdbackup.sourceforge.net/cdrskin-0.7.4.pl00.tar.gz
Copyright (C) 2006-2009 Thomas Schmitt, provided under GPL version 2.
------------------------------------------------------------------------------
@ -24,10 +24,10 @@ By using this software you agree to the disclaimer at the end of this text
Compilation, First Glimpse, Installation
Obtain cdrskin-0.7.3.tar.gz, take it to a directory of your choice and do:
Obtain cdrskin-0.7.4.pl00.tar.gz, take it to a directory of your choice and do:
tar xzf cdrskin-0.7.3.tar.gz
cd cdrskin-0.7.3
tar xzf cdrskin-0.7.4.pl00.tar.gz
cd cdrskin-0.7.4
Within that directory execute:

42
cdrskin/cdrskin.c
View File

@ -88,7 +88,7 @@ or
/** The official program version */
#ifndef Cdrskin_prog_versioN
#define Cdrskin_prog_versioN "0.7.3"
#define Cdrskin_prog_versioN "0.7.4"
#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 3
#define Cdrskin_libburn_micrO 4
#endif
@ -135,49 +135,43 @@ or
#endif /* Cdrskin_libburn_cvs_A60220_tS */
#ifdef Cdrskin_libburn_0_7_2
#define Cdrskin_libburn_versioN "0.7.2"
#ifdef Cdrskin_libburn_0_7_4
#define Cdrskin_libburn_versioN "0.7.4"
#define Cdrskin_libburn_from_pykix_svN 1
#endif /* Cdrskin_libburn_0_7_2 */
#endif /* Cdrskin_libburn_0_7_4 */
#ifdef Cdrskin_libburn_0_7_3
#define Cdrskin_libburn_versioN "0.7.3"
#ifdef Cdrskin_libburn_0_7_5
#define Cdrskin_libburn_versioN "0.7.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
*/
/* burn_write_opts_set_dvd_obs() and burn_write_opts_set_stdio_fsync()
*/
#define Cdrskin_libburn_has_fsync_obS 1
/* >>> do not forget to remove Libburn_has_open_trac_srC at release of 0.7.4 */
#endif /* Cdrskin_libburn_0_7_3 */
#endif /* Cdrskin_libburn_0_7_5 */
#ifndef Cdrskin_libburn_versioN
#define Cdrskin_libburn_0_7_2
#define Cdrskin_libburn_versioN "0.7.2"
#define Cdrskin_libburn_0_7_4
#define Cdrskin_libburn_versioN "0.7.4"
#define Cdrskin_libburn_from_pykix_svN 1
#endif
#ifdef Cdrskin_libburn_0_7_2
#ifdef Cdrskin_libburn_0_7_4
#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 2
#define Cdrskin_libburn_micrO 4
#endif
#ifdef Cdrskin_libburn_0_7_3
#ifdef Cdrskin_libburn_0_7_5
#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 3
#define Cdrskin_libburn_micrO 5
#endif
@ -1463,14 +1457,12 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
if(is_wav==-3)
return(0);
if(is_wav==0) {
#ifdef Libburn_has_open_trac_srC
if(track->track_type != BURN_MODE1 ||
(track->cdxa_conversion & 0x7fffffff))
flag&= ~4; /* Better avoid O_DIRECT with odd sectors */
if(flag & 4)
*fd= burn_os_open_track_src(track->source_path, O_RDONLY, 0);
else
#endif
*fd= open(track->source_path, O_RDONLY);
}
if(*fd==-1) {
@ -2880,11 +2872,9 @@ set_dev:;
printf(
" --drive_scsi_exclusive try to exclusively reserve device files\n");
printf(" /dev/srN, /dev/scdM, /dev/stK of drive.\n");
#ifdef Cdrskin_libburn_has_fsync_obS
printf(" dvd_obs=\"default\"|number\n");
printf(
" set number of bytes per DVD/BD write: 32k or 64k\n");
#endif
#ifdef Cdrskin_burn_drive_eject_brokeN
printf(
" eject_device=<path> set the device address for command eject\n");
@ -2935,13 +2925,11 @@ set_dev:;
printf(
" byte addresses below that number.\n");
#endif
#ifdef Cdrskin_libburn_has_fsync_obS
printf(" stdio_sync=\"default\"|\"off\"|number\n");
printf(
" set number of bytes after which to force output\n");
printf(
" to drives with prefix \"stdio:\".\n");
#endif
#ifdef Cdrskin_allow_libburn_taO
printf(
@ -7218,7 +7206,6 @@ burn_failed:;
#ifdef Cdrskin_libburn_has_stream_recordinG
burn_write_opts_set_stream_recording(o, skin->stream_recording_is_set);
#endif
#ifdef Cdrskin_libburn_has_fsync_obS
#ifdef Cdrskin_dvd_obs_default_64K
if(skin->dvd_obs == 0)
burn_write_opts_set_dvd_obs(o, 64 * 1024);
@ -7226,7 +7213,6 @@ burn_failed:;
#endif
burn_write_opts_set_dvd_obs(o, skin->dvd_obs);
burn_write_opts_set_stdio_fsync(o, skin->stdio_sync);
#endif /* Cdrskin_libburn_has_fsync_obS */
if(skin->dummy_mode) {
fprintf(stderr,

55
cdrskin/cdrskin_eng.html
View File

@ -61,7 +61,7 @@ via SCSI, PATA (aka IDE, ATA), USB, or SATA.
GPL software included:<BR>
</H2>
<DL>
<DT>libburn-0.7.2</DT>
<DT>libburn-0.7.4</DT>
<DD>(founded by Derek Foreman and Ben Jansens,
developed and maintained since August 2006 by
Thomas Schmitt from team of libburnia-project.org)
@ -193,8 +193,8 @@ 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.2.pl01.tar.gz">cdrskin-0.7.2.pl01.tar.gz</A>
(780 KB).
<DD><A HREF="cdrskin-0.7.4.pl00.tar.gz">cdrskin-0.7.4.pl00.tar.gz</A>
(810 KB).
</DD>
<DD>
The cdrskin tarballs are source code identical with libburn releases
@ -245,18 +245,11 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
<P>
Enhancements towards previous stable version cdrskin-0.7.0.pl00:
<UL>
<LI>Better interpretation of options -mode2, -xa, -xa1, -xa2</LI>
<LI>New option --xa1-ignore</LI>
<LI>New -atip report lines "Product Id:" and "Producer:"</LI>
<LI>Emulation of some -minfo output</LI>
<!--
<LI>none</LI>
-->
</UL>
Bug fixes towards cdrskin-0.7.0.pl00:
<UL>
<LI>CD TAO sessions with multiple tracks did not work in -dummy mode</LI>
<LI>Implemented option -V for logging of SCSI commands</LI>
<LI>New options dvd_obs= and stdio_fsync=</LI>
<LI>New ./configure options --enable-track-src-odirect, --enable-dvd-obs-64k
</LI>
<LI>New compile_cdrskin.sh option -dvd_obs_64k</LI>
<!--
<LI>none</LI>
-->
@ -266,40 +259,40 @@ Bug fixes towards cdrskin-0.7.2.pl00:
<UL>
<LI>Workaround for Pioneer DVR-216D which got stuck on DVD-R burns.</LI>
<LI>Workaround for Pioneer DVR-216D which did not always eject the tray.</LI>
<LI>DVD DAO track size was rounded up much too generously</LI>
<LI>SIGSEGV from NULL pointer with media product id inquiry on LG GH22LS30</LI>
<!--
<LI>none</LI>
-->
</UL>
<HR>
<P>
<DL>
<DT><H3>Development snapshot, version 0.7.3 :</H3></DT>
<DD>Enhancements towards current stable version 0.7.2.pl00:
<DT><H3>Development snapshot, version 0.7.5 :</H3></DT>
<DD>Enhancements towards current stable version 0.7.4.pl00:
<UL>
<LI>Implemented option -V for logging of SCSI commands</LI>
<LI>New options dvd_obs= and stdio_fsync=</LI>
<LI>New compile_cdrskin.sh options -o_direct (Linux only), -dvd_obs_64k</LI>
<!--
<LI>none yet</LI>
<!--
-->
</UL>
</DD>
<DD>Bug fixes towards cdrskin-0.7.2.pl00:
<DD>Bug fixes towards cdrskin-0.7.4.pl00:
<UL>
<LI>Workaround for Pioneer DVR-216D which got stuck on DVD-R burns.</LI>
<LI>Workaround for Pioneer DVR-216D which did not always eject the tray.</LI>
<!--
<LI>none yet</LI>
<!--
-->
</UL>
</DD>
<DD>&nbsp;</DD>
<DD><A HREF="README_cdrskin_devel">README 0.7.3</A>
<DD><A HREF="cdrskin__help_devel">cdrskin_0.7.3 --help</A></DD>
<DD><A HREF="cdrskin_help_devel">cdrskin_0.7.3 -help</A></DD>
<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.7.3)</A></DD>
<DD><A HREF="README_cdrskin_devel">README 0.7.5</A>
<DD><A HREF="cdrskin__help_devel">cdrskin_0.7.5 --help</A></DD>
<DD><A HREF="cdrskin_help_devel">cdrskin_0.7.5 -help</A></DD>
<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.7.5)</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>
@ -319,8 +312,8 @@ admins with full system souvereignty.</DT>
<A HREF="README_cdrskin_devel">upcoming README</A> ):
</DD>
<DD>
<A HREF="cdrskin-0.7.3.tar.gz">cdrskin-0.7.3.tar.gz</A>
(800 KB).
<A HREF="cdrskin-0.7.5.tar.gz">cdrskin-0.7.5.tar.gz</A>
(810 KB).
</DD>
<!-- This is not offered any more since spring 2008

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2009.12.06.093847"
#define Cdrskin_timestamP "2009.12.06.160001"

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="-DCdrskin_use_libburn_fifO"
libvers="-DCdrskin_libburn_0_7_3"
libvers="-DCdrskin_libburn_0_7_4"
# To be used if Makefile.am uses libburn_libburn_la_CFLAGS
# burn="libburn/libburn_libburn_la-"
@ -39,15 +39,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_2"
elif test "$i" = "-libburn_0_7_4"
then
libvers="-DCdrskin_libburn_0_7_2"
libvers="-DCdrskin_libburn_0_7_4"
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_3"
libvers="-DCdrskin_libburn_0_7_5"
libdax_audioxtr_o="$burn"libdax_audioxtr.o
libdax_msgs_o="$burn"libdax_msgs.o
cleanup_src_or_obj="$burn"cleanup.o
@ -94,7 +94,7 @@ do
echo "Options:"
echo " -compile_cdrfifo compile program cdrskin/cdrfifo."
echo " -compile_dewav compile program test/dewav without libburn."
echo " -libburn_0_7_2 set macro to match libburn-0.7.2"
echo " -libburn_0_7_4 set macro to match libburn-0.7.4"
echo " -libburn_svn set macro to match current libburn-SVN."
echo " -dvd_obs_64k 64 KB default size for DVD/BD writing."
echo " -do_not_compile_cdrskin omit compilation of cdrskin/cdrskin."

23
configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([libburn], [0.7.3], [http://libburnia-project.org])
AC_INIT([libburn], [0.7.4], [http://libburnia-project.org])
AC_PREREQ([2.50])
dnl AC_CONFIG_HEADER([config.h])
@ -75,6 +75,7 @@ dnl 0.6.6 = libburn.so.4.31.0
dnl 0.6.8 = libburn.so.4.33.0
dnl 0.7.0 = libburn.so.4.35.0
dnl 0.7.2 = libburn.so.4.37.0
dnl 0.7.4 = libburn.so.4.39.0
dnl
dnl So LT_CURRENT, LT_REVISION and LT_AGE get set directly here.
dnl SONAME of the emerging library is LT_CURRENT - LT_AGE.
@ -100,7 +101,7 @@ dnl
dnl As said: Only copies. Original in libburn/libburn.h : burn_header_version_*
BURN_MAJOR_VERSION=0
BURN_MINOR_VERSION=7
BURN_MICRO_VERSION=3
BURN_MICRO_VERSION=4
BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
AC_SUBST(BURN_MAJOR_VERSION)
@ -111,15 +112,15 @@ AC_SUBST(BURN_VERSION)
dnl Libtool versioning
LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
dnl
dnl ts A91116
dnl ### This is the release version libburn-0.7.2 = libburn.so.4.37.0
dnl This is the development version after above release version
dnl ### LT_CURRENT++, LT_AGE++ has not yet happened.
dnl LT_CURRENT++, LT_AGE++ has happened meanwhile.
dnl ts A91206
dnl This is the release version libburn-0.7.4 = libburn.so.4.39.0
dnl ### This is the development version after above release version
dnl LT_CURRENT++, LT_AGE++ has not yet happened.
dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
dnl
dnl SONAME = 42 - 38 = 4 . Linux library name = libburn.so.4.38.0
LT_CURRENT=42
LT_AGE=38
dnl SONAME = 43 - 39 = 4 . Linux library name = libburn.so.4.39.0
LT_CURRENT=43
LT_AGE=39
LT_REVISION=0
LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
@ -196,7 +197,7 @@ CFLAGS="$CFLAGS $LIBBURN_O_DIRECT_DEF"
dnl ts A91116
AC_ARG_ENABLE(dvd-obs-64k,
[ --enable-dvd-obs-64k 64 KB default size for DVD/BD writing, default=no],
[ --enable-dvd-obs-64k 64 KB default size for DVD/BD writing, default=no],
, enable_fifo_odirect=no)
if test x$enable_dvd_obs_64k = xyes; then
LIBBURN_DVD_OBS_64K="-DLibburn_dvd_obs_default_64K"

9
libburn/libburn.h
View File

@ -767,9 +767,6 @@ void burn_set_verbosity(int level);
This call can be made at any time - even before burn_initialize().
It is in effect for all active drives and currently not very thread
safe for multiple drives.
>>> ??? Shouldn't the file path with bit1 be adjustable ?
@param flag Bitfield for control purposes. The default is 0.
bit0= log to file /tmp/libburn_sg_command_log
bit1= log to stderr
@ -1796,10 +1793,6 @@ struct burn_source *burn_file_source_new(const char *path,
/* ts A91122 : An interface to open(O_DIRECT) or similar OS tricks. */
/* <<< temporary indicator until release 0.7.4
*/
#define Libburn_has_open_trac_srC 1
/** Opens a file with eventual acceleration preparations which may depend
on the operating system and on compile time options of libburn.
You may use this call instead of open(2) for opening file descriptors
@ -2609,7 +2602,7 @@ void burn_version(int *major, int *minor, int *micro);
*/
#define burn_header_version_major 0
#define burn_header_version_minor 7
#define burn_header_version_micro 3
#define burn_header_version_micro 4
/** Note:
Above version numbers are also recorded in configure.ac because libtool
wants them as parameters at build time.