xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'experimental/master'

Browse Source
This commit is contained in:
TANIGUCHI Takaki
2017-08-07 17:30:46 +09:00
parent a8579f2310 1b266ccbde
commit 1a3b3cbfa7
29 changed files with 572 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
debian/changelog vendored
View File

@@ -1,3 +1,17 @@
dvdisaster (0.79.5-2) experimental; urgency=medium
* Team upload.
* Bump Standards Version to 4.0.0.
* Remove unnecessary calls to dpkg-parsechangelog from debian/rules.
* debian/watch: Avoid repacking upstream tarballs unnecessarily.
* Fix more typos in error messages and docs.
* Fix FTBFS on Hurd and kFreeBSD.
* Remove incorrect use of 'Origin: vendor' from DEP-3 patch headers.
* Improve support for Hurd and kFreeBSD systems, although Hurd still
builds without SCSI.
-- Carlos Maddela <e7appew@gmail.com> Mon, 07 Aug 2017 14:26:01 +1000
dvdisaster (0.79.5-1) unstable; urgency=medium
[ Carlos Maddela ]

4
debian/control vendored
View File

@@ -9,16 +9,18 @@ Build-Depends: debhelper (>= 10),
dpkg-dev (>= 1.16.1.1),
gettext,
libbz2-dev,
libcam-dev [kfreebsd-any],
libgtk2.0-dev,
libpng-dev,
pkg-config
# Build-Depends-Indep: texlive-fonts-recommended,
# texlive-latex-base,
# texlive-latex-extra
Standards-Version: 3.9.8
Standards-Version: 4.0.0
Vcs-Browser: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git
Vcs-Git: https://anonscm.debian.org/git/pkg-opt-media/dvdisaster.git
Homepage: http://dvdisaster.net/
Testsuite: autopkgtest
Package: dvdisaster
Architecture: any

1
debian/patches/08-fix-gnu-make-detection.patch vendored
View File

@@ -10,7 +10,6 @@ Description: Fix GNU Make detection.
This change allows for more predictable behaviour: grep returns an
error code of 0 or 1.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Bug-Debian: https://bugs.debian.org/848811
Forwarded: no
Last-Update: 2016-12-18

1
debian/patches/10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch vendored
View File

@@ -4,7 +4,6 @@ Subject: Use non-size-specific icon and add keywords to desktop file.
Description: Use non-size-specific icon and add keywords to desktop file.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: no
Last-Update: 2016-12-19
---

1
debian/patches/11-no-cruft.patch vendored
View File

@@ -4,7 +4,6 @@ Subject: Do not install cruft.
Description: Do not install cruft.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2017-01-05
---

1
debian/patches/12-fix-spelling-of-up-to.patch vendored
View File

@@ -4,7 +4,6 @@ Subject: Fix spelling: upto -> up to
Description: Fix spelling: upto -> up to
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: no
Last-Update: 2017-01-05
---

1
debian/patches/13-fix-missing-language-field-in-po-files.patch vendored
View File

@@ -4,7 +4,6 @@ Subject: Fix missing language fields in PO files.
Description: Fix missing language fields in PO files.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: no
Last-Update: 2017-01-05
---

1
debian/patches/14-make-builds-reproducible.patch vendored
View File

@@ -6,7 +6,6 @@ Description: Make builds reproducible.
Use the Debian changelog details to derive a build number and date,
so that we can make reproducible binaries.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2016-12-19
---

1
debian/patches/15-show-new-pkg-tracker.patch vendored
View File

@@ -5,7 +5,6 @@ Subject: Update help dialog to show link to the new Debian package tracker.
Description: Update help dialog to show link to the new Debian
package tracker.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2016-12-19
---

1
debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch vendored
View File

@@ -5,7 +5,6 @@ Subject: Don't build and install documentation automatically.
Description: Don't build and install documentation automatically.
This allows for better control over binary-arch and binary-indep builds.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2017-01-05
---

1
debian/patches/17-fix-all-but-deprecated-api-warnings.patch vendored
View File

@@ -4,7 +4,6 @@ Subject: Fix all warnings except for those related to deprecated API.
Description: Fix all warnings except for those related to deprecated API.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Bug-Debian: https://bugs.debian.org/748416
Forwarded: no
Last-Update: 2017-01-05

1
debian/patches/18-update-copyright-in-about-dialog.patch vendored
View File

@@ -4,7 +4,6 @@ Subject: Update copyright notice in about dialog.
Description: Update copyright notice in about dialog.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2017-01-05
---

1
debian/patches/19-show-text-files-with-abs-path.patch vendored
View File

@@ -4,7 +4,6 @@ Subject: Allow ShowTextFile() to work with absolute path names.
Description: Allow ShowTextFile() to work with absolute path names.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: no
Last-Update: 2016-12-21
---

1
debian/patches/20-display-changelog-credits-and-todo.patch vendored
View File

@@ -7,7 +7,6 @@ Description: Fix display of changelog, credits and to-do files.
duplicates in /usr/share/doc/dvdisaster-doc or build with source
path embedded anymore.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2017-01-05
---

1
debian/patches/22-fix-hurd-i386-ftbfs.patch vendored
View File

@@ -6,7 +6,6 @@ Description: Fix FTBFS for hurd-i386.
Hurd does not have path length restrictions, so doesn't define
PATH_MAX. Assuming a PATH_MAX of 4096 as a quick workaround.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: no
Last-Update: 2017-01-04
---

2
debian/patches/23-add-bdrom-support.patch vendored
View File

@@ -7,7 +7,7 @@ Description: Add support for BD-ROM media-type.
media-type. This allows dvdisaster to scan and read (ie create ISO
images of) BD-ROM media.
Author: Corey Write <undefined@pobox.com>
Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849518;filename=dvdisaster-add_bdrom_support.patch;msg=5
Origin: other, https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849518;filename=dvdisaster-add_bdrom_support.patch;msg=5
Bug-Debian: https://bugs.debian.org/849518
Forwarded: no
Last-Update: 2016-12-27

1
debian/patches/24-show-gpl3-license.patch vendored
View File

@@ -4,7 +4,6 @@ Subject: Update help dialog to show GPL-3 license.
Description: Update help dialog to show GPL-3 license.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2017-01-05
---

1
debian/patches/25-fix-man-pages.patch vendored
View File

@@ -6,7 +6,6 @@ Description: Fix generated man pages.
The generated man pages incorrectly direct users to the directory of
the old HTML documentation, which is no longer available.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: no
Last-Update: 2016-12-21
---

1
debian/patches/26-fix-display-of-manual.pdf.patch vendored
View File

@@ -6,7 +6,6 @@ Description: Fix display of manual.pdf.
The PDF file is automatically compressed by Debhelper, so we need to
account for this.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2017-01-05
---

1
debian/patches/27-allow-opening-in-browser-again.patch vendored
View File

@@ -4,7 +4,6 @@ Subject: Resurrect old code to support opening URLs in a browser.
Description: Resurrect old code to support opening URLs in a browser.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2016-12-21
---

1
debian/patches/28-fudge-pdf-doc-ids.patch vendored
View File

@@ -4,7 +4,6 @@ Subject: Generate the same PDF document IDs for build reproducibility.
Description: Generate the same PDF IDs for build reproducibility.
Author: Carlos Maddela <e7appew@gmail.com>
Origin: vendor
Forwarded: not-needed
Last-Update: 2016-12-21
---

173
debian/patches/29-fix-more-typos.patch vendored Normal file
View File

@@ -0,0 +1,173 @@
From: Carlos Maddela <e7appew@gmail.com>
Date: Sun, 6 Aug 2017 02:16:17 +1000
Subject: Fix more typos in error messages and docs.
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Description: Fix more typos in error messages and docs.
'sucessful' → 'successful'
'improvment' → 'improvement'
Author: Carlos Maddela <e7appew@gmail.com>
Last-Update: 2017-08-06
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
documentation/user-manual/howtos.tex | 2 +-
locale/cs.po | 2 +-
locale/de.po | 2 +-
locale/it.po | 2 +-
locale/pt_BR.po | 2 +-
locale/ru.po | 2 +-
locale/sv.po | 2 +-
preferences.c | 4 ++--
regtest/rs01.bash | 2 +-
scsi-layer.c | 2 +-
smart-lec.c | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/documentation/user-manual/howtos.tex b/documentation/user-manual/howtos.tex
index 51ff827..80fe9d3 100644
--- a/documentation/user-manual/howtos.tex
+++ b/documentation/user-manual/howtos.tex
@@ -1822,7 +1822,7 @@ process of creating error correction files using these options. The
first option marked green lets dvdisaster create the error correction
file immediately after the medium has been (completely) read.
The second option marked green deletes the image when the error correction
-file has been sucessfully created.
+file has been successfully created.
\bigskip
diff --git a/locale/cs.po b/locale/cs.po
index ed1fc65..9010d21 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1903,7 +1903,7 @@ msgid "Media ejection"
msgstr "Vysunutí disku"
#: preferences.c:2064 preferences.c:2065
-msgid "Eject medium after sucessful read"
+msgid "Eject medium after successful read"
msgstr "Po úspěšném načtení vysunout disk"
#: preferences.c:2091
diff --git a/locale/de.po b/locale/de.po
index bbbfdcc..bb5baa6 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1959,7 +1959,7 @@ msgid "Media ejection"
msgstr "Datenträger auswerfen"
#: preferences.c:2064 preferences.c:2065
-msgid "Eject medium after sucessful read"
+msgid "Eject medium after successful read"
msgstr "Datenträger nach erfolgreichem Lesen auswerfen"
#: preferences.c:2091
diff --git a/locale/it.po b/locale/it.po
index a074339..000d5c3 100644
--- a/locale/it.po
+++ b/locale/it.po
@@ -1749,7 +1749,7 @@ msgid "Media ejection"
msgstr ""
#: preferences.c:2064 preferences.c:2065
-msgid "Eject medium after sucessful read"
+msgid "Eject medium after successful read"
msgstr ""
#: preferences.c:2091
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 04b33b5..00bcaee 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1839,7 +1839,7 @@ msgid "Media ejection"
msgstr "Ejeção da mídia"
#: preferences.c:2064 preferences.c:2065
-msgid "Eject medium after sucessful read"
+msgid "Eject medium after successful read"
msgstr "Ejetar mídia após uma leitura completa"
#: preferences.c:2091
diff --git a/locale/ru.po b/locale/ru.po
index 6cd3789..1c677d4 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1841,7 +1841,7 @@ msgid "Media ejection"
msgstr "Извлечь носитель"
#: preferences.c:2064 preferences.c:2065
-msgid "Eject medium after sucessful read"
+msgid "Eject medium after successful read"
msgstr "Извлечь носитель после успешного чтения"
#: preferences.c:2091
diff --git a/locale/sv.po b/locale/sv.po
index 9f70808..5cd4927 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1755,7 +1755,7 @@ msgid "Media ejection"
msgstr ""
#: preferences.c:2064 preferences.c:2065
-msgid "Eject medium after sucessful read"
+msgid "Eject medium after successful read"
msgstr ""
#: preferences.c:2091
diff --git a/preferences.c b/preferences.c
index f5ef889..5a24200 100644
--- a/preferences.c
+++ b/preferences.c
@@ -2061,8 +2061,8 @@ void CreatePreferencesWindow(void)
frame = gtk_frame_new(_utf("Media ejection"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
- lwoh = CreateLabelWithOnlineHelp(_("Eject medium after sucessful read"),
- _("Eject medium after sucessful read"));
+ lwoh = CreateLabelWithOnlineHelp(_("Eject medium after successful read"),
+ _("Eject medium after successful read"));
RegisterPreferencesHelpWindow(lwoh);
for(i=0; i<2; i++)
diff --git a/regtest/rs01.bash b/regtest/rs01.bash
index 46bfac4..45f7611 100755
--- a/regtest/rs01.bash
+++ b/regtest/rs01.bash
@@ -1327,7 +1327,7 @@ if try "reading medium in 3 passes; 3rd pass recovers some" read_multipass_parti
run_regtest read_multipass_partial_success "--read-medium=3 --spinup-delay=0 -r" $TMPISO $ISODIR/no.ecc
fi
-# Do a second sucessful read attempt at an incomplete image;
+# Do a second successful read attempt at an incomplete image;
# see whether correct results are reported when ecc data is present
# since CRC caching is a bit complicated in this case.
diff --git a/scsi-layer.c b/scsi-layer.c
index b70a4a4..515cc93 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -2474,7 +2474,7 @@ int ReadSectors(DeviceHandle *dh, unsigned char *buf, gint64 s, int nsectors)
if(Closure->readRaw && dh->rawBuffer)
recommended_attempts = dh->rawBuffer->recommendedAttempts;
- if(status) /* current try was unsucessful */
+ if(status) /* current try was unsuccessful */
{ int last_key, last_asc, last_ascq;
if(Closure->stopActions) /* user break */
diff --git a/smart-lec.c b/smart-lec.c
index 0355879..e33ad8f 100644
--- a/smart-lec.c
+++ b/smart-lec.c
@@ -1609,7 +1609,7 @@ static int smart_lec_iteration(sh_context *shc, char *message)
shc->bestBonus = 0;
shc->bestMalus = 100000;
memcpy(shc->bestFrame, rb->recovered, rb->sampleSize);
- sprintf(shc->msg, "smart_lec: no further improvment");
+ sprintf(shc->msg, "smart_lec: no further improvement");
update_pq_state(shc);
print_pq_state(shc);

46
debian/patches/30-hurd-kfreebsd-ftbfs.patch vendored Normal file
View File

@@ -0,0 +1,46 @@
From: Carlos Maddela <e7appew@gmail.com>
Date: Sun, 6 Aug 2017 02:40:33 +1000
Subject: Fix FTBFS on Hurd and kFreeBSD.
Description: Fix FTBFS on Hurd and kFreeBSD.
Make sure MMAP_FLAGS gets defined.
Author: Carlos Maddela <e7appew@gmail.com>
Last-Update: 2017-08-06
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
rs03-create.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/rs03-create.c b/rs03-create.c
index b2c6033..b14e326 100644
--- a/rs03-create.c
+++ b/rs03-create.c
@@ -39,16 +39,19 @@
#ifdef HAVE_MMAP
#include <sys/mman.h>
-#ifdef SYS_LINUX
- #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE)
-#endif
+#if defined(SYS_LINUX)
-#ifdef SYS_FREEBSD
- #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ)
-#endif
+ #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE)
+
+#elif defined(SYS_FREEBSD)
+
+ #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ)
+
+#else
+
+ /* SYS_NETBSD and others. */
+ #define MMAP_FLAGS (MAP_SHARED)
-#ifdef SYS_NETBSD
- #define MMAP_FLAGS (MAP_SHARED)
#endif
#endif

322
debian/patches/31-improve-hurd-and-kfreebsd-support.patch vendored Normal file
View File

@@ -0,0 +1,322 @@
From: Carlos Maddela <e7appew@gmail.com>
Date: Sun, 6 Aug 2017 10:37:18 +1000
Subject: Add better support for HURD and kFreeBSD systems.
Description: Add better support for HURD and kFreeBSD systems.
Hurd still compiles without SCSI layer, however.
Author: Carlos Maddela <e7appew@gmail.com>
Last-Update: 2017-08-06
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
cacheprobe.c | 16 +++++++++-------
closure.c | 6 ++++--
rs03-create.c | 2 +-
scripts/bash-based-configure | 18 ++++++++++++++++++
scsi-freebsd.c | 4 ++--
scsi-layer.c | 10 ++++++----
scsi-layer.h | 17 +++++++++--------
scsi-unknown.c | 4 ++--
show-html.c | 15 ++++++++++-----
9 files changed, 61 insertions(+), 31 deletions(-)
diff --git a/cacheprobe.c b/cacheprobe.c
index 60c55f9..f30f5d3 100644
--- a/cacheprobe.c
+++ b/cacheprobe.c
@@ -22,7 +22,8 @@
#include "dvdisaster.h"
-#ifdef SYS_LINUX
+#if defined(SYS_LINUX)
+
int ProbeCacheLineSize()
{ int cl_size = 0;
@@ -36,9 +37,9 @@ int ProbeCacheLineSize()
return cl_size;
}
-#endif
-#ifdef SYS_FREEBSD
+#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+
#include <sys/param.h>
int ProbeCacheLineSize()
@@ -52,9 +53,9 @@ int ProbeCacheLineSize()
return cl_size;
}
-#endif
-#ifdef SYS_NETBSD
+#elif defined(SYS_NETBSD)
+
#include <sys/param.h>
int ProbeCacheLineSize()
@@ -68,13 +69,14 @@ int ProbeCacheLineSize()
return cl_size;
}
-#endif
-#ifdef SYS_UNKNOWN
+#else /* SYS_UNKNOWN and others. */
+
int ProbeCacheLineSize()
{
return 64;
}
+
#endif
diff --git a/closure.c b/closure.c
index 632c103..7c8b3bd 100644
--- a/closure.c
+++ b/closure.c
@@ -50,7 +50,8 @@ static void get_base_dirs()
/*** Otherwise try the installation directory.
On Unices this is a hardcoded directory. */
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_UNKNOWN)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD) || defined(SYS_UNKNOWN)
if(DirStat(BINDIR))
Closure->binDir = g_strdup(BINDIR);
@@ -425,7 +426,8 @@ void InitClosure()
/* Generate a more comprehensive version string */
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
#ifdef HAVE_64BIT
#define BITNESS_STRING " 64bit"
#else
diff --git a/rs03-create.c b/rs03-create.c
index b14e326..7a22bae 100644
--- a/rs03-create.c
+++ b/rs03-create.c
@@ -43,7 +43,7 @@
#define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE)
-#elif defined(SYS_FREEBSD)
+#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
#define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ)
diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
index d62f5d7..9abcf96 100644
--- a/scripts/bash-based-configure
+++ b/scripts/bash-based-configure
@@ -136,6 +136,15 @@ case "$cfg_uname" in
}
;;
+ GNU/kFreeBSD*) cfg_system=kfreebsd
+ CFG_SYS_OPTIONS="-DSYS_KFREEBSD"
+ CFG_SYS_NAME="-DSYS_NAME=\\\"GNU/kFreeBSD\\\""
+ CFG_EXE_SUFFIX=""
+ function add_linker_flags()
+ { lflags_return="-L$1 -Wl,-rpath,$1 $2"
+ }
+ ;;
+
NetBSD*) cfg_system=netbsd
CFG_SYS_OPTIONS="-DSYS_NETBSD"
CFG_SYS_NAME="-DSYS_NAME=\\\"NetBSD\\\""
@@ -146,6 +155,15 @@ case "$cfg_uname" in
}
;;
+ GNU*) cfg_system=hurd
+ CFG_SYS_OPTIONS="-DSYS_HURD"
+ CFG_SYS_NAME="-DSYS_NAME=\\\"GNU/Hurd\\\""
+ CFG_EXE_SUFFIX=""
+ function add_linker_flags()
+ { lflags_return="-L$1 -Wl,-rpath,$1 $2"
+ }
+ ;;
+
*) cfg_system=unknown-system
CFG_SYS_OPTIONS="-DSYS_UNKNOWN"
CFG_SYS_NAME="-DSYS_NAME=\\\"Unknown\\\""
diff --git a/scsi-freebsd.c b/scsi-freebsd.c
index 78d0be4..793f206 100644
--- a/scsi-freebsd.c
+++ b/scsi-freebsd.c
@@ -25,7 +25,7 @@
#include "scsi-layer.h"
#include "udf.h"
-#ifdef SYS_FREEBSD
+#if defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
/* SCSI wrappers for FreeBSD are still work in progress. */
@@ -241,4 +241,4 @@ int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char
return -1;
}
-#endif /* SYS_FREEBSD */
+#endif /* defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) */
diff --git a/scsi-layer.c b/scsi-layer.c
index 515cc93..609cb73 100644
--- a/scsi-layer.c
+++ b/scsi-layer.c
@@ -2005,12 +2005,13 @@ static gint64 query_size(Image *image)
*/
gint64 CurrentMediumSize(int get_blank_size)
-{ Image *image;
+{
+#if defined(SYS_UNKNOWN) || defined(SYS_HURD)
+ return 0;
+#else
+ Image *image;
gint64 size;
-#ifdef SYS_UNKNOWN
- return 0;
-#endif
image = OpenImageFromDevice(Closure->device);
if(!image) return 0;
@@ -2051,6 +2052,7 @@ gint64 CurrentMediumSize(int get_blank_size)
CloseImage(image);
return size;
+#endif
}
/***
diff --git a/scsi-layer.h b/scsi-layer.h
index cc7d9fc..0706a22 100644
--- a/scsi-layer.h
+++ b/scsi-layer.h
@@ -28,7 +28,7 @@
#include <linux/cdrom.h>
#endif
-#ifdef SYS_FREEBSD
+#if defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
#include <camlib.h>
#endif
@@ -49,19 +49,21 @@
* Linux already has one
*/
-#ifdef SYS_LINUX
+#if defined(SYS_LINUX)
+
#define MAX_CDB_SIZE CDROM_PACKET_SIZE
/* Now globally defined for all OSes here */
//typedef struct request_sense Sense;
-#endif
-#ifdef SYS_FREEBSD
+#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+
#define MAX_CDB_SIZE SCSI_MAX_CDBLEN
-#endif
-#if defined(SYS_UNKNOWN) || defined(SYS_NETBSD)
+#else /* SYS_UNKNOWN and others. */
+
#define MAX_CDB_SIZE 16 /* longest possible SCSI command */
+
#endif
/*
@@ -101,8 +103,7 @@ typedef struct _DeviceHandle
*/
#if defined(SYS_LINUX) || defined(SYS_NETBSD)
int fd; /* device file descriptor */
-#endif
-#ifdef SYS_FREEBSD
+#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
struct cam_device *camdev; /* camlib device handle */
union ccb *ccb;
#endif
diff --git a/scsi-unknown.c b/scsi-unknown.c
index e9183f6..ef54552 100644
--- a/scsi-unknown.c
+++ b/scsi-unknown.c
@@ -25,7 +25,7 @@
#include "scsi-layer.h"
#include "udf.h"
-#ifdef SYS_UNKNOWN
+#if defined(SYS_UNKNOWN) || defined(SYS_HURD)
/* Dummy routines so that we can compile on unknown architectures
for which we don't have SCSI support yet. */
@@ -51,4 +51,4 @@ int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char
return -1;
}
-#endif /* SYS_UNKNOWN */
+#endif /* defined(SYS_UNKNOWN) || defined(SYS_HURD) */
diff --git a/show-html.c b/show-html.c
index 608e8ec..20715f4 100644
--- a/show-html.c
+++ b/show-html.c
@@ -21,7 +21,8 @@
#include "dvdisaster.h"
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
#include <sys/wait.h>
#endif
@@ -34,7 +35,8 @@
*** Ask user to specify his browser
***/
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
#define SEARCH_BUTTON 1
@@ -173,7 +175,8 @@ static void msg_destroy_cb(GtkWidget *widget, gpointer data)
bi->msg = NULL;
}
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
/*
* The following list of browsers and html wrappers
@@ -273,7 +276,8 @@ static gboolean browser_timeout_func(gpointer data)
* Invoke the browser
*/
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
static void try_browser(browser_info *bi)
{ pid_t pid;
@@ -393,7 +397,8 @@ void ShowHTML(char *target)
g_timeout_add(1000, browser_timeout_func, (gpointer)bi);
#endif
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
+ defined(SYS_NETBSD) || defined(SYS_HURD)
/* Try the first browser */
browser_index = 0;

3
debian/patches/series vendored
View File

@@ -20,3 +20,6 @@
26-fix-display-of-manual.pdf.patch
27-allow-opening-in-browser-again.patch
28-fudge-pdf-doc-ids.patch
29-fix-more-typos.patch
30-hurd-kfreebsd-ftbfs.patch
31-improve-hurd-and-kfreebsd-support.patch

3
debian/rules vendored
View File

@@ -6,8 +6,7 @@ include /usr/share/dpkg/buildflags.mk
export DEB_CFLAGS_MAINT_APPEND = $(CPPFLAGS) -Wall -Wno-deprecated-declarations -pedantic
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export SOURCE_DATE_EPOCH := \
$(shell date --date="$$(dpkg-parsechangelog -S Date)" +%s)
include /usr/share/dpkg/pkg-info.mk
export FORCE_SOURCE_DATE = 1
MUTABLE_FILES := build.h $(wildcard locale/*.po) \

2
debian/tests/control vendored Normal file
View File

@@ -0,0 +1,2 @@
Tests: unknown-system
Depends: dvdisaster

6
debian/tests/unknown-system vendored Executable file
View File

@@ -0,0 +1,6 @@
#!/bin/sh
set -e
# Make sure we haven't built for an unknown system.
! (dvdisaster --version | grep -qiw unknown)

4
debian/watch vendored
View File

@@ -1,6 +1,4 @@
version=3
opts="pgpsigurlmangle=s/$/.gpg/, \
compression=xz, \
repack" \
opts="pgpsigurlmangle=s/$/.gpg/" \
http://dvdisaster.net/en/index.html \
(?:.*?/)?dvdisaster-(.*)\.tar\.bz2 debian uupdate