-
Notifications
You must be signed in to change notification settings - Fork 309
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sane_backends: Add recipe for version 1.0.25
- Loading branch information
1 parent
8368e2f
commit bcdfb33
Showing
2 changed files
with
248 additions
and
0 deletions.
There are no files selected for viewing
126 changes: 126 additions & 0 deletions
126
media-gfx/sane_backends/patches/sane_backends-1.0.25.patchset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,126 @@ | ||
From a3963c94ca858b1232d8b7fa36166e6e18ebeddd Mon Sep 17 00:00:00 2001 | ||
From: Gerasim Troeglazov <3dEyes@gmail.com> | ||
Date: Fri, 13 Nov 2015 11:26:01 +0000 | ||
Subject: Fix build | ||
|
||
|
||
diff --git a/backend/epsonds-jpeg.c b/backend/epsonds-jpeg.c | ||
index 76a52cb..cb01bd4 100644 | ||
--- a/backend/epsonds-jpeg.c | ||
+++ b/backend/epsonds-jpeg.c | ||
@@ -13,6 +13,10 @@ | ||
|
||
#define DEBUG_DECLARE_ONLY | ||
|
||
+#ifdef __HAIKU__ | ||
+#define _STDLIB_H_ | ||
+#endif | ||
+ | ||
#include <math.h> | ||
|
||
#include "epsonds.h" | ||
@@ -47,8 +51,8 @@ jpeg_term_source(j_decompress_ptr UNUSEDARG cinfo) | ||
METHODDEF(boolean) | ||
jpeg_fill_input_buffer(j_decompress_ptr cinfo) | ||
{ | ||
- epsonds_src_mgr *src = (epsonds_src_mgr *)cinfo->src; | ||
int avail, size; | ||
+ epsonds_src_mgr *src = (epsonds_src_mgr *)cinfo->src; | ||
|
||
/* read from the scanner or the ring buffer */ | ||
|
||
diff --git a/backend/pixma_bjnp.c b/backend/pixma_bjnp.c | ||
index 7d2d541..b21bc97 100644 | ||
--- a/backend/pixma_bjnp.c | ||
+++ b/backend/pixma_bjnp.c | ||
@@ -106,6 +106,10 @@ | ||
# define SSIZE_MAX LONG_MAX | ||
#endif | ||
|
||
+#ifdef __HAIKU__ | ||
+#undef HAVE_IFADDRS_H | ||
+#endif | ||
+ | ||
/* static data */ | ||
static bjnp_device_t device[BJNP_NO_DEVICES]; | ||
static int bjnp_no_devices = 0; | ||
diff --git a/sanei/sanei_ir.c b/sanei/sanei_ir.c | ||
index 42e82ba..f2971f3 100644 | ||
--- a/sanei/sanei_ir.c | ||
+++ b/sanei/sanei_ir.c | ||
@@ -29,7 +29,9 @@ | ||
|
||
#include <stdlib.h> | ||
#include <string.h> | ||
+#ifndef __HAIKU__ | ||
#include <values.h> | ||
+#endif | ||
#include <math.h> | ||
|
||
#define BACKEND_NAME sanei_ir /* name of this module for debugging */ | ||
diff --git a/sanei/sanei_thread.c b/sanei/sanei_thread.c | ||
index 8db4a21..56444c2 100644 | ||
--- a/sanei/sanei_thread.c | ||
+++ b/sanei/sanei_thread.c | ||
@@ -487,6 +487,7 @@ SANE_Pid | ||
sanei_thread_waitpid( SANE_Pid pid, int *status ) | ||
{ | ||
#ifdef USE_PTHREAD | ||
+ int rc; | ||
int *ls; | ||
#else | ||
int ls; | ||
@@ -499,7 +500,6 @@ sanei_thread_waitpid( SANE_Pid pid, int *status ) | ||
DBG(2, "sanei_thread_waitpid() - %ld\n", | ||
sanei_thread_pid_to_long(pid)); | ||
#ifdef USE_PTHREAD | ||
- int rc; | ||
rc = pthread_join( (pthread_t)pid, (void*)&ls ); | ||
|
||
if( 0 == rc ) { | ||
diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c | ||
index f210d4f..9c07d22 100644 | ||
--- a/sanei/sanei_usb.c | ||
+++ b/sanei/sanei_usb.c | ||
@@ -2185,6 +2185,7 @@ sanei_usb_clear_halt (SANE_Int dn) | ||
return SANE_STATUS_INVAL; | ||
} | ||
|
||
+#ifndef __HAIKU__ | ||
#ifdef HAVE_LIBUSB | ||
|
||
/* This call seems to be required by Linux xhci driver | ||
@@ -2227,7 +2228,7 @@ sanei_usb_clear_halt (SANE_Int dn) | ||
#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */ | ||
DBG (1, "sanei_usb_clear_halt: libusb support missing\n"); | ||
#endif /* HAVE_LIBUSB || HAVE_LIBUSB_1_0 */ | ||
- | ||
+#endif | ||
return SANE_STATUS_GOOD; | ||
} | ||
|
||
-- | ||
2.2.2 | ||
|
||
|
||
From 1e17da6b666d2b438bfd0a3b7007421c51788312 Mon Sep 17 00:00:00 2001 | ||
From: Gerasim Troeglazov <3dEyes@gmail.com> | ||
Date: Fri, 13 Nov 2015 11:38:32 +0000 | ||
Subject: Disable IPV6 for pixma_bjnp | ||
|
||
|
||
diff --git a/backend/pixma_bjnp.c b/backend/pixma_bjnp.c | ||
index b21bc97..b8e3f7c 100644 | ||
--- a/backend/pixma_bjnp.c | ||
+++ b/backend/pixma_bjnp.c | ||
@@ -108,6 +108,7 @@ | ||
|
||
#ifdef __HAIKU__ | ||
#undef HAVE_IFADDRS_H | ||
+#undef ENABLE_IPV6 | ||
#endif | ||
|
||
/* static data */ | ||
-- | ||
2.2.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
SUMMARY="Scanner Access Now Easy (SANE)" | ||
DESCRIPTION=" | ||
SANE stands for \"Scanner Access Now Easy\" and is an application programming \ | ||
interface (API) that provides standardized access to any raster image scanner \ | ||
hardware (flatbed scanner, hand-held scanner, video- and still-cameras, frame-\ | ||
grabbers, etc.). | ||
The SANE standard is free and its discussion and development \ | ||
are open to everybody. The current source code is written to support several \ | ||
operating systems, including GNU/Linux, OS/2, Win32 and various Unices and is \ | ||
available under the GNU General Public License (commercial applications and \ | ||
backends are welcome, too, however). | ||
This package includes the command line frontend scanimage, the saned server \ | ||
and the sane-find-scanner utility, along with their documentation. | ||
" | ||
|
||
HOMEPAGE="http://www.sane-project.org" | ||
LICENSE="GNU LGPL v2" | ||
COPYRIGHT="David Mosberger-Tang, Andy Beck" | ||
SOURCE_URI="https://alioth.debian.org/frs/download.php/file/4146/sane-backends-$portVersion.tar.gz" | ||
CHECKSUM_SHA256="a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c" | ||
SOURCE_DIR="sane-backends-$portVersion" | ||
REVISION="1" | ||
|
||
ARCHITECTURES="x86_gcc2 x86 x86_64" | ||
SECONDARY_ARCHITECTURES="x86_gcc2 x86" | ||
|
||
GLOBAL_WRITABLE_FILES=" | ||
settings/sane.d directory keep-old | ||
" | ||
|
||
PROVIDES=" | ||
sane_backends$secondaryArchSuffix = $portVersion | ||
cmd:gamma4scanimage$secondaryArchSuffix = $portVersion | ||
cmd:sane_config$secondaryArchSuffix = $portVersion | ||
cmd:sane_find_scanner$secondaryArchSuffix = $portVersion | ||
cmd:saned$secondaryArchSuffix = $portVersion | ||
cmd:scanimage$secondaryArchSuffix = $portVersion | ||
lib:libsane$secondaryArchSuffix = $portVersion | ||
This comment has been minimized.
Sorry, something went wrong. |
||
" | ||
REQUIRES=" | ||
haiku$secondaryArchSuffix | ||
lib:libz$secondaryArchSuffix | ||
lib:libusb_1.0$secondaryArchSuffix | ||
lib:libjpeg$secondaryArchSuffix | ||
lib:libtiff$secondaryArchSuffix | ||
" | ||
|
||
BUILD_REQUIRES=" | ||
devel:libz$secondaryArchSuffix | ||
devel:libusb_1.0$secondaryArchSuffix | ||
devel:libjpeg$secondaryArchSuffix | ||
devel:libtiff$secondaryArchSuffix | ||
" | ||
BUILD_PREREQUIRES=" | ||
haiku${secondaryArchSuffix}_devel | ||
cmd:aclocal | ||
cmd:autoconf | ||
cmd:automake | ||
cmd:libtoolize | ||
cmd:awk | ||
cmd:find | ||
cmd:gcc$secondaryArchSuffix | ||
cmd:libtoolize | ||
This comment has been minimized.
Sorry, something went wrong. |
||
cmd:make | ||
cmd:pkg_config$secondaryArchSuffix | ||
" | ||
|
||
PATCHES="sane_backends-$portVersion.patchset" | ||
|
||
BUILD() | ||
{ | ||
libtoolize --force --copy --install | ||
aclocal | ||
autoconf | ||
automake | ||
|
||
runConfigure configure \ | ||
--prefix=$prefix \ | ||
--bindir=$binDir \ | ||
--sbindir=$binDir \ | ||
--libdir=$libDir \ | ||
--includedir=$includeDir \ | ||
--datadir=$dataDir \ | ||
--with-docdir=$docDir \ | ||
--enable-pthread \ | ||
--disable-latex \ | ||
--disable-translations \ | ||
--enable-libusb_1_0 \ | ||
--enable-rpath \ | ||
LIBS=-lnetwork | ||
|
||
make | ||
} | ||
|
||
INSTALL() | ||
{ | ||
make install | ||
|
||
# prepare develop/lib | ||
prepareInstalledDevelLibs libsane | ||
fixPkgconfig | ||
|
||
# hack for old BeOS apps (Sanity) | ||
ln -s $libDir/libsane.so.1 $libDir/libsane.so | ||
|
||
# devel package | ||
packageEntries devel \ | ||
$developDir | ||
|
||
} | ||
|
||
# ----- devel package ------------------------------------------------------- | ||
|
||
PROVIDES_devel=" | ||
sane_backends${secondaryArchSuffix}_devel = $portVersion | ||
devel:libsane$secondaryArchSuffix = portVersion compat >= 0 | ||
This comment has been minimized.
Sorry, something went wrong.
korli
Contributor
|
||
" | ||
REQUIRES_devel=" | ||
sane_backends$secondaryArchSuffix == $portVersion base | ||
" |
Please provide a compat string.