From 410537761b0984342865cab372ead8df6317917a Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 29 Mar 2009 16:46:50 +0000 Subject: [PATCH] Adapted to new libisofs feature iso_file_add_external_filter() --- libisoburn/trunk/xorriso/compile_xorriso.sh | 3 +++ libisoburn/trunk/xorriso/xorriso_makefile_am.txt | 2 +- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libisoburn/trunk/xorriso/compile_xorriso.sh b/libisoburn/trunk/xorriso/compile_xorriso.sh index ec4ab7df..34d2a3ea 100755 --- a/libisoburn/trunk/xorriso/compile_xorriso.sh +++ b/libisoburn/trunk/xorriso/compile_xorriso.sh @@ -11,6 +11,7 @@ # $isofs $isoburn $burn $xorr isofs=./nglibisofs-develop/libisofs/libisofs_libisofs_la- +isofs_filter=./nglibisofs-develop/libisofs/filters/libisofs_libisofs_la- burn=./libburn-develop/libburn isoburn=./libisoburn-develop/libisoburn xorr=./libisoburn-develop/xorriso @@ -85,6 +86,8 @@ libisofs="$libisofs $isofs"util_rbtree.o libisofs="$libisofs $isofs"system_area.o libisofs="$libisofs $isofs"make_isohybrid_mbr.o libisofs="$libisofs $isofs"aaip_0_2.o +libisofs="$libisofs $isofs"filter.o +libisofs="$libisofs $isofs_filter"external.o echo "Version timestamp : $(sed -e 's/#define Xorriso_timestamP "//' -e 's/"$//' "$xorr"/xorriso_timestamp.h)" diff --git a/libisoburn/trunk/xorriso/xorriso_makefile_am.txt b/libisoburn/trunk/xorriso/xorriso_makefile_am.txt index 9bf97ed7..b2b7b78e 100644 --- a/libisoburn/trunk/xorriso/xorriso_makefile_am.txt +++ b/libisoburn/trunk/xorriso/xorriso_makefile_am.txt @@ -100,7 +100,7 @@ xorriso_xorriso_SOURCES = \ libisofs/find.c \ libisofs/filter.h \ libisofs/filter.c \ - libisofs/filters/xor_encrypt.c \ + libisofs/filters/external.c \ libisofs/system_area.h \ libisofs/system_area.c \ libisofs/make_isohybrid_mbr.c \ diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 2ea50d02..fee9273b 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.03.29.164411" +#define Xorriso_timestamP "2009.03.29.164703"