| 1 |
commit: 70f1e0c27a7971ae7520a4e137f642103f8a81f7 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 2 22:37:17 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 2 22:46:49 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70f1e0c2 |
| 7 |
|
| 8 |
media-gfx/sane-backends: disable test that relies on USB support |
| 9 |
|
| 10 |
.../files/sane-backends-1.0.25-disable-usb-tests.patch | 14 ++++++++++++++ |
| 11 |
.../sane-backends/sane-backends-1.0.25_pre20150628.ebuild | 3 ++- |
| 12 |
media-gfx/sane-backends/sane-backends-9999.ebuild | 1 + |
| 13 |
3 files changed, 17 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch |
| 16 |
new file mode 100644 |
| 17 |
index 0000000..217a440 |
| 18 |
--- /dev/null |
| 19 |
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch |
| 20 |
@@ -0,0 +1,14 @@ |
| 21 |
+do not let the tests try reading/locking usb hardware. we also disable |
| 22 |
+this because the test will abort() if no usb support is found at all. |
| 23 |
+ |
| 24 |
+--- a/testsuite/sanei/sanei_usb_test.c |
| 25 |
++++ b/testsuite/sanei/sanei_usb_test.c |
| 26 |
+@@ -832,6 +832,8 @@ main (int argc, char **argv) |
| 27 |
+ int detected, opened, i; |
| 28 |
+ SANE_Int dn[MAX_DEVICES]; |
| 29 |
+ |
| 30 |
++ return 77; |
| 31 |
++ |
| 32 |
+ #ifdef HAVE_LIBUSB |
| 33 |
+ printf ("\n%s built with old libusb\n\n", argv[0]); |
| 34 |
+ #endif |
| 35 |
|
| 36 |
diff --git a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild |
| 37 |
index d8cec10..61a6e8f 100644 |
| 38 |
--- a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild |
| 39 |
+++ b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild |
| 40 |
@@ -197,7 +197,8 @@ src_prepare() { |
| 41 |
"${FILESDIR}"/${PN}-1.0.24-automagic_systemd.patch \ |
| 42 |
"${FILESDIR}"/${PN}-1.0.24-systemd_pkgconfig.patch \ |
| 43 |
"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch \ |
| 44 |
- "${FILESDIR}"/${PN}-1.0.24-cross-compile.patch |
| 45 |
+ "${FILESDIR}"/${PN}-1.0.24-cross-compile.patch \ |
| 46 |
+ "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch |
| 47 |
# Fix for "make check". |
| 48 |
sed -i -e 's/sane-backends 1.0.24/sane-backends 1.0.25git/' testsuite/tools/data/html* |
| 49 |
mv configure.{in,ac} || die |
| 50 |
|
| 51 |
diff --git a/media-gfx/sane-backends/sane-backends-9999.ebuild b/media-gfx/sane-backends/sane-backends-9999.ebuild |
| 52 |
index b636bf1..9743a91 100644 |
| 53 |
--- a/media-gfx/sane-backends/sane-backends-9999.ebuild |
| 54 |
+++ b/media-gfx/sane-backends/sane-backends-9999.ebuild |
| 55 |
@@ -190,6 +190,7 @@ src_prepare() { |
| 56 |
epkowa |
| 57 |
EOF |
| 58 |
epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch |
| 59 |
+ epatch "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch |
| 60 |
mv configure.{in,ac} || die |
| 61 |
AT_NOELIBTOOLIZE=yes eautoreconf |
Archives