From 451dd1136edd443813e42291554978941b430095 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 6 Dec 2009 09:37:33 +0000 Subject: [PATCH] Now default in cdrskin: use of libburn fifo with DVD and BD single track --- libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/cdrskin/compile_cdrskin.sh | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index 18ef4afa..b31db719 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2009.12.06.074622" +#define Cdrskin_timestamP "2009.12.06.093847" diff --git a/libburn/trunk/cdrskin/compile_cdrskin.sh b/libburn/trunk/cdrskin/compile_cdrskin.sh index f1794710..2e215525 100755 --- a/libburn/trunk/cdrskin/compile_cdrskin.sh +++ b/libburn/trunk/cdrskin/compile_cdrskin.sh @@ -7,6 +7,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" # To be used if Makefile.am uses libburn_libburn_la_CFLAGS @@ -76,11 +77,14 @@ do do_strip=1 elif test "$i" = "-use_libburn_fifo" then - def_opts="$def_opts -DCdrskin_use_libburn_fifO" + fifo_opts="-DCdrskin_use_libburn_fifO" + elif test "$i" = "-use_no_libburn_fifo" + then + fifo_opts="" elif test "$i" = "-use_no_cdrfifo" then fifo_source= - def_opts="$def_opts -DCdrskin_use_libburn_fifO -DCdrskin_no_cdrfifO" + fifo_opts="-DCdrskin_use_libburn_fifO -DCdrskin_no_cdrfifO" elif test "$i" = "-g" then debug_opts="-g" @@ -94,8 +98,8 @@ do 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." - echo " -use_libburn_fifo use fifo of libburn for single track non-CD" - echo " -use_no_cdrfifo use fifo of libburn and never cdrfifo" + echo " -use_no_libburn_fifo use cdrfifo even for single track non-CD" + echo " -use_no_cdrfifo always use fifo of libburn and never cdrfifo" echo " -experimental use newly introduced libburn features." echo " -oldfashioned use pre-0.2.2 libburn features only." echo " -do_diet produce capability reduced lean version." @@ -116,13 +120,14 @@ echo "Build timestamp : $timestamp" if test "$compile_cdrskin" then - echo "compiling program cdrskin/cdrskin.c $fifo_source $static_opts $debug_opts $libvers $def_opts $cleanup_src_or_obj" + echo "compiling program cdrskin/cdrskin.c $fifo_source $static_opts $debug_opts $libvers $fifo_opts $def_opts $cleanup_src_or_obj" cc -I. \ $warn_opts \ $static_opts \ $debug_opts \ $libvers \ $largefile_opts \ + $fifo_opts \ $def_opts \ \ -DCdrskin_build_timestamP='"'"$timestamp"'"' \