From a1d76e9474732e15efaa3bd41cc5ed3aef587a67 Mon Sep 17 00:00:00 2001 From: shattered Date: Sat, 4 Feb 2012 21:57:54 +0000 Subject: Update to 0.72.3. Notable changes: - Blu-ray support - added CD raw reading and majority algorithm - C2 scanning support for CD media - changed treatment of CRC failures: old behaviour was to store a defective sector marker; now the actual sector contents are written to the image file. - Using the CDROM_SEND_PACKET ioctl() will hang parallel SCSI adapters. Added tests to determine the SCSI bus type, and switch to the SG_IO ioctl() when in doubt. [Linux] - fixed and documented -n command line options for RS02. --- sysutils/dvdisaster/patches/patch-ab | 14 +++++----- sysutils/dvdisaster/patches/patch-ad | 31 --------------------- sysutils/dvdisaster/patches/patch-af | 16 ----------- sysutils/dvdisaster/patches/patch-ag | 37 ------------------------- sysutils/dvdisaster/patches/patch-scsi-netbsd.c | 12 ++++++++ 5 files changed, 19 insertions(+), 91 deletions(-) delete mode 100644 sysutils/dvdisaster/patches/patch-ad delete mode 100644 sysutils/dvdisaster/patches/patch-af delete mode 100644 sysutils/dvdisaster/patches/patch-ag create mode 100644 sysutils/dvdisaster/patches/patch-scsi-netbsd.c (limited to 'sysutils/dvdisaster/patches') diff --git a/sysutils/dvdisaster/patches/patch-ab b/sysutils/dvdisaster/patches/patch-ab index d66f770230c..57233f9b231 100644 --- a/sysutils/dvdisaster/patches/patch-ab +++ b/sysutils/dvdisaster/patches/patch-ab @@ -1,14 +1,14 @@ -$NetBSD: patch-ab,v 1.3 2011/01/31 21:20:11 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2012/02/04 21:57:54 shattered Exp $ Fix build with png-1.5. ---- tools/pngpack.c.orig 2006-09-09 12:14:09.000000000 +0000 -+++ tools/pngpack.c -@@ -46,6 +46,7 @@ +--- tools/pngio.h.orig 2010-10-27 12:41:49.000000000 +0000 ++++ tools/pngio.h +@@ -21,6 +21,7 @@ + #define PNGIO_H - #include #include +#include - #include "md5.h" - + typedef struct + { char *name; diff --git a/sysutils/dvdisaster/patches/patch-ad b/sysutils/dvdisaster/patches/patch-ad deleted file mode 100644 index 561102ed778..00000000000 --- a/sysutils/dvdisaster/patches/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2008/11/23 23:40:12 heinz Exp $ - - - Honor configure option --with-embedded-src-path - (already committed in unstable version upstream) - ---- closure.c.orig 2008-03-04 10:01:15.000000000 +0000 -+++ closure.c -@@ -174,10 +174,13 @@ static void get_base_dirs() - char *appdata; - #endif - -- /*** The source directory is supposed to hold the most recent files, -+ /*** Unless completely disabled through a configure option, the -+ source directory is supposed to hold the most recent files, - so try this first. Not necessary under Windows as it will always - use the directory the binary has been called from. */ - -+#ifdef WITH_EMBEDDED_SRC_PATH_YES -+ - #ifndef SYS_MINGW - if(!stat(SRCDIR, &mystat)) - { Closure->binDir = g_strdup(SRCDIR); -@@ -187,6 +190,8 @@ static void get_base_dirs() - } - #endif - -+#endif /* WITH_EMBEDDED_SRC_PATH_YES */ -+ - /*** Otherwise try the installation directory. - On Unices this is a hardcoded directory. - Windows has binary distributions with no prior known installation place, diff --git a/sysutils/dvdisaster/patches/patch-af b/sysutils/dvdisaster/patches/patch-af deleted file mode 100644 index 9ec2582e2ea..00000000000 --- a/sysutils/dvdisaster/patches/patch-af +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-af,v 1.2 2008/11/23 23:40:12 heinz Exp $ - - - Add option "--with-embedded-src-path", default value is "yes" to keep - the current behaviour. - (already committed in unstable version upstream) - ---- configure.orig 2007-01-20 13:30:22.000000000 +0100 -+++ configure -@@ -128,6 +128,7 @@ WITH_OPTION nls yes "[yes | no]" - WITH_OPTION memdebug no "[no | yes]" - WITH_OPTION efence no "[no | yes]" - WITH_OPTION logfile no "[no | yes]" -+WITH_OPTION embedded-src-path yes "[yes | no]" - - if test "$cfg_with_efence" == "yes"; then - if ! CHECK_LIBRARY efence malloc efence; then diff --git a/sysutils/dvdisaster/patches/patch-ag b/sysutils/dvdisaster/patches/patch-ag deleted file mode 100644 index c7336444a6f..00000000000 --- a/sysutils/dvdisaster/patches/patch-ag +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2008/11/23 23:40:12 heinz Exp $ - - - Use SRCDIR only when configure option --with-embedded-src-path is set - to yes. - (already committed in unstable version upstream) - ---- dvdisaster.c.orig 2007-01-20 16:44:59.000000000 +0100 -+++ dvdisaster.c -@@ -159,10 +159,12 @@ int main(int argc, char *argv[]) - char *read_range = NULL; - #ifdef WITH_NLS_YES - char *locale_test; -- #ifndef SYS_MINGW -+ #ifdef WITH_EMBEDDED_SRC_PATH_YES -+ #ifndef SYS_MINGW - char src_locale_path[strlen(SRCDIR)+10]; -- #else -+ #else - char *bin_locale_path = NULL; -+ #endif - #endif - #endif - -@@ -245,9 +247,13 @@ int main(int argc, char *argv[]) - #ifndef SYS_MINGW - /* Try local source directory first */ - -+#ifdef WITH_EMBEDDED_SRC_PATH_YES - g_sprintf(src_locale_path,"%s/locale",SRCDIR); - bindtextdomain("dvdisaster", src_locale_path); - //printf("testing src %s\n", src_locale_path); -+ -+#endif /* WITH_EMBEDDED_SRC_PATH_YES */ -+ - /* TRANSLATORS: - This is a dummy entry which is supposed to translate into "ok". - Please do not return anything else here. */ diff --git a/sysutils/dvdisaster/patches/patch-scsi-netbsd.c b/sysutils/dvdisaster/patches/patch-scsi-netbsd.c new file mode 100644 index 00000000000..5f125db26b1 --- /dev/null +++ b/sysutils/dvdisaster/patches/patch-scsi-netbsd.c @@ -0,0 +1,12 @@ +$NetBSD: patch-scsi-netbsd.c,v 1.1 2012/02/04 21:57:54 shattered Exp $ + +--- scsi-netbsd.c.orig 2010-10-27 10:14:46.000000000 +0000 ++++ scsi-netbsd.c +@@ -165,6 +165,7 @@ int SendPacket(DeviceHandle *dh, unsigne + break; + case DATA_NONE: + sc.flags = 0; ++ break; + default: + Stop("illegal data_mode: %d", data_mode); + } -- cgit v1.2.3