diff options
| -rw-r--r-- | debian/README.Debian | 16 | ||||
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rw-r--r-- | debian/control | 9 | ||||
| -rw-r--r-- | debian/patches/15_jam.patch | 133 | ||||
| -rw-r--r-- | debian/patches/25_kfreebsd.patch | 55 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
6 files changed, 104 insertions, 131 deletions
diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..b707ba4 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,16 @@ +argyll for Debian +----------------- + +Notes for KFreeBSD-*: + +From spectro/usbio_bsd.c: + + !!!! This driver is incomplete and non-functional !!!! + BSD uses fd per end point, so simplifies things. + No clear ep or abort i/o though, so we could try clear halt, + or close fd and see if that works in aborting transaction ? + Posix aio would probably work, but it's not loaded by default :-( + Could use libusb20 API, but not backwards or cross compatible, + and is very likely to be buggy ? + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 29 Sep 2014 09:17:15 +0200 diff --git a/debian/changelog b/debian/changelog index 4c133d7..a1cc596 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,27 +4,32 @@ argyll (1.6.3-2) unstable; urgency=medium - Bump Standards-Version to 3.9.6 (no changes required). - Add Replaces: argyll (<< 1.6.3-1) and Breaks (<< 1.6.3-1) to argyll-ref (Closes: #762780). - - Change Achitecture from any to linux-any hurd-i386 to disable build - on kfreebsd-* (Closes: #762773). - At argyll move argyll-doc from Depends to Suggests (Closes: #762850). + - Remove from Build-Depends libusbhid-dev [kfreebsd-any]. + - Remove ${shlibs:Depends} from Depends on argyll-doc and argyll-ref. * debian/patches/15_jam.patch: - - Add missing multiarch directories for libtiff and libjpeg + - To avoid use of the builtin libtiff and libjpeg add multiarch directories + for searching libraries and header files by using DEB_HOST_MULTIARCH (Closes: #762772). - * New debain/patches/20_hurd_PATH_MAX.patch: + * New debian/patches/20_hurd_PATH_MAX.patch: - Add missing PATH_MAX for hurd-i386 (Closes: #762774). * debian/rules: - Remove the move of the html docs into a subdirectory (Closes: #762771). - - Remove BUILTIN_TIFF=false from JAMCMDLINE to prevent - false negative tests for libtiff + - Remove useless BUILTIN_TIFF=false from JAMCMDLINE. - Remove "-A --link-doc=argyll-doc" from dh_installdocs (Closes: #762853). * debian/*.(postinst|preinst|postrm): - - replace dpkg-maintscript-helper dir_to_symlink to sysmlink_to_dir. + - Replace dpkg-maintscript-helper dir_to_symlink to sysmlink_to_dir. * Remove useless debian/argyll.examples * Remove obsolete debian/patches/03_usb-db.diff. * New debian/patches/120_usb-db_new.patch: (Closes: #762887) - Instead of the obsolete usb-db use the builtin hwdb in the udev rules. + Thanks to Michael Biebl <biebl@debian.org> + * New debian/patches/25_kfreebsd.patch: + - Prevent build errors on kfreebsd-* (Closes: #762773). + Thanks to Steven Chamberlain <steven@pyro.eu.org> + * New debian/README.debian with notes to KFreeBSD-*. - -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 25 Sep 2014 20:49:49 +0200 + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 29 Sep 2014 09:22:15 +0200 argyll (1.6.3-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 1b498b6..01918c0 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ Build-Depends: libtiff5-dev, libtool, libusb-dev, - libusbhid-dev [kfreebsd-any], libx11-dev, libxinerama-dev, libxrandr-dev, @@ -24,7 +23,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/argyll.git Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/argyll.git Package: argyll -Architecture: linux-any hurd-i386 +Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, argyll-ref Pre-Depends: dpkg (>= 1.17.5) @@ -48,7 +47,7 @@ Description: Color Management System, calibrator and profiler Package: argyll-dbg Section: debug -Architecture: linux-any hurd-i386 +Architecture: any Depends: argyll (= ${binary:Version}), ${misc:Depends} Pre-Depends: dpkg (>= 1.17.5) @@ -62,7 +61,7 @@ Description: debugging symbols for argyll Package: argyll-ref Architecture: all -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends} Pre-Depends: dpkg (>= 1.17.5) Replaces: argyll (<< 1.6.3-1) @@ -77,7 +76,7 @@ Description: Color Management System, calibrator and profiler (data files) Package: argyll-doc Architecture: all Section: doc -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends} Pre-Depends: dpkg (>= 1.17.5) Description: Color Management System, calibrator and profiler (documentation) diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch index b8014ef..ffd9e1b 100644 --- a/debian/patches/15_jam.patch +++ b/debian/patches/15_jam.patch @@ -6,94 +6,33 @@ Last-Update: 2014-09-25 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/Jamtop =================================================================== ---- trunk.orig/Jamtop 2014-09-25 11:10:18.768548869 +0200 -+++ trunk/Jamtop 2014-09-25 11:17:03.696933742 +0200 -@@ -109,12 +109,80 @@ +--- trunk.orig/Jamtop 2014-09-28 14:35:52.016329546 +0200 ++++ trunk/Jamtop 2014-09-28 14:44:07.039261307 +0200 +@@ -109,12 +109,17 @@ # See if we have a system TIFF library. if ! $(BUILTIN_TIFF) && $(UNIX) { - if [ GLOB /usr/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ] { - if [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ] - || [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ] +- || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.so ] +- || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.a ] +- || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] { + if [ GLOB /usr/include : tiffio.h ] + || [ GLOB /usr/local/include : tiffio.h ] -+ || [ GLOB /usr/include/x86_64-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/i386-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/aarch64-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/arm-linux-gnueabi : tiffio.h ] -+ || [ GLOB /usr/include/arm-linux-gnueabihf : tiffio.h ] -+ || [ GLOB /usr/include/i386-gnu : tiffio.h ] -+ || [ GLOB /usr/include/x86_64-kfreebsd-gnu : tiffio.h ] -+ || [ GLOB /usr/include/i386-kfreebsd-gnu : tiffio.h ] -+ || [ GLOB /usr/include/mips-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/mipsel-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/powerpc-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/powerpc64le-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/s390x-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/sparc-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/alpha-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/hppa-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/m68k-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/powerpc-linux-gnuspe : tiffio.h ] -+ || [ GLOB /usr/include/sh4-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/sparc64-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/x86_64-linux-gnux32 : tiffio.h ] -+ || [ GLOB /usr/include/powerpc64-linux-gnu : tiffio.h ] { ++ || [ GLOB /usr/include/$(DEB_HOST_MULTIARCH) : tiffio.h ] { + if [ GLOB /usr/lib : libtiff.so ] + || [ GLOB /usr/lib : libtiff.a ] + || [ GLOB /usr/lib64 : libtiff.so ] + || [ GLOB /usr/lib64 : libtiff.a ] - || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.so ] - || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.a ] -- || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] { -+ || [ GLOB /usr/lib/i386-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/i386-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/aarch64-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/aarch64-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/arm-linux-gnueabi : libtiff.so ] -+ || [ GLOB /usr/lib/arm-linux-gnueabi : libtiff.a ] -+ || [ GLOB /usr/lib/arm-linux-gnueabihf : libtiff.so ] -+ || [ GLOB /usr/lib/arm-linux-gnueabihf : libtiff.a ] -+ || [ GLOB /usr/lib/i386-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/i386-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/mips-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/mips-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/mipsel-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/mipsel-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/powerpc-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/powerpc-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/s390x-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/s390x-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/sparc-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/sparc-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/alpha-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/alpha-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/hppa-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/hppa-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/m68k-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/m68k-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libtiff.so ] -+ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libtiff.a ] -+ || [ GLOB /usr/lib/sh4-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/sh4-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/sparc64-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/sparc64-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libtiff.so ] -+ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libtiff.a ] -+ || [ GLOB /usr/lib/powerpc64-linux-gnu : libtiff.so ] -+ || [ GLOB /usr/lib/powerpc64-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libtiff.so ] ++ || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libtiff.a ] + || [ GLOB /usr/local/lib : libtiff.so ] + || [ GLOB /usr/local/lib : libtiff.a ] { echo "Using system TIFF library" ; TIFFLIB = ; TIFFINC = ; -@@ -124,6 +192,7 @@ +@@ -124,6 +129,7 @@ } } @@ -101,7 +40,7 @@ Index: trunk/Jamtop # If nothing else, use Argyll supplied TIFF library if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) { echo "Using Argyll TIFF library" ; -@@ -133,12 +202,58 @@ +@@ -133,12 +139,16 @@ # See if we have a system JPEG library. if ! $(BUILTIN_JPEG) && $(UNIX) { @@ -117,50 +56,8 @@ Index: trunk/Jamtop + || [ GLOB /usr/lib : libjpeg.a ] + || [ GLOB /usr/lib64 : libjpeg.so ] + || [ GLOB /usr/lib64 : libjpeg.a ] -+ || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/i386-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/i386-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/aarch64-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/aarch64-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/arm-linux-gnueabi : libjpeg.so ] -+ || [ GLOB /usr/lib/arm-linux-gnueabi : libjpeg.a ] -+ || [ GLOB /usr/lib/arm-linux-gnueabihf : libjpeg.so ] -+ || [ GLOB /usr/lib/arm-linux-gnueabihf : libjpeg.a ] -+ || [ GLOB /usr/lib/i386-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/i386-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/mips-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/mips-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/mipsel-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/mipsel-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/powerpc-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/powerpc-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/s390x-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/s390x-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/sparc-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/sparc-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/alpha-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/alpha-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/hppa-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/hppa-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/m68k-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/m68k-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libjpeg.so ] -+ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libjpeg.a ] -+ || [ GLOB /usr/lib/sh4-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/sh4-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/sparc64-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/sparc64-linux-gnu : libjpeg.a ] -+ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libjpeg.so ] -+ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libjpeg.a ] -+ || [ GLOB /usr/lib/powerpc64-linux-gnu : libjpeg.so ] -+ || [ GLOB /usr/lib/powerpc64-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libjpeg.so ] ++ || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libjpeg.a ] + || [ GLOB /usr/local/lib : libjpeg.so ] + || [ GLOB /usr/local/lib : libjpeg.a ] { echo "Using system JPEG library" ; @@ -168,8 +65,8 @@ Index: trunk/Jamtop JPEGINC = ; Index: trunk/Jambase =================================================================== ---- trunk.orig/Jambase 2014-09-25 11:10:18.768548869 +0200 -+++ trunk/Jambase 2014-09-25 11:10:18.768548869 +0200 +--- trunk.orig/Jambase 2014-09-28 14:35:52.016329546 +0200 ++++ trunk/Jambase 2014-09-28 14:35:52.016329546 +0200 @@ -880,7 +880,7 @@ # UNIX defaults diff --git a/debian/patches/25_kfreebsd.patch b/debian/patches/25_kfreebsd.patch new file mode 100644 index 0000000..2b4b622 --- /dev/null +++ b/debian/patches/25_kfreebsd.patch @@ -0,0 +1,55 @@ +From: Steven Chamberlain <steven@pyro.eu.org> +Subject: use FreeBSD USB I/O code on GNU/kFreeBSD + +Use the FreeBSD USB I/O code not just on __FreeBSD__ itself, +but on any system having __FreeBSD_kernel__ (such as GNU/kFreeBSD). + +--- a/spectro/usbio.c ++++ b/spectro/usbio.c +@@ -94,7 +94,7 @@ + # include "usbio_ox.c" + # endif + # if defined(UNIX_X11) +-# if defined(__FreeBSD__) ++# if defined(__FreeBSD_kernel__) + # include "usbio_bsd.c" + # else + # include "usbio_lx.c" +--- a/spectro/usbio_bsd.c ++++ b/spectro/usbio_bsd.c +@@ -37,7 +37,7 @@ + #include <fcntl.h> + #include <glob.h> + #include <sys/ioctl.h> +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD_kernel__) + # include <dev/usb/usb_ioctl.h> /* Not sure what's going on with FreeBSD... */ + #else + # include <dev/usb/usb.h> /* The usual include for BSD */ +@@ -59,7 +59,7 @@ + ) { + int i, j; + char *paths[] = { +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD_kernel__) + "/dev/usb/[0-9]*.*.0", /* FreeBSD >= 8 */ + "/dev/ugen[0-9]*", /* FreeBSD < 8, but no .E */ + #else +@@ -94,7 +94,7 @@ + /* For all the nodes found by the glob */ + for (i = 0; i < g.gl_pathc; i++) { + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD_kernel__) + /* Skip anything with an end point number */ + if (j == 1 && strchr(g.gl_pathv[i], '.') != NULL) + continue; +@@ -141,7 +141,7 @@ + + /* Create the base device path */ + dpath = g.gl_pathv[i]; +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD_kernel__) + if (j == 0) { /* Remove .0 */ + if ((cp = strrchr(dpath, '.')) != NULL + && cp[1] == '0' && cp[2] == '\000') diff --git a/debian/patches/series b/debian/patches/series index 42d8b08..7c01f21 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 15_jam.patch 20_hurd_PATH_MAX.patch 120_usb-db_new.patch +25_kfreebsd.patch |