<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/46ae05f2765d70798d30e52c6cd01713d28821b8">https://github.com/macports/macports-ports/commit/46ae05f2765d70798d30e52c6cd01713d28821b8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 46ae05f argyll: update to 1.9.2 and take maintainership
</span>46ae05f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 46ae05f2765d70798d30e52c6cd01713d28821b8
</span>Author: Leonardo Brondani Schenkel <leonardo@schenkel.net>
AuthorDate: Thu Aug 3 10:53:12 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> argyll: update to 1.9.2 and take maintainership
</span>---
graphics/argyll/Portfile | 92 +++++------------
graphics/argyll/files/patch-jamfiles.diff | 122 -----------------------
graphics/argyll/files/patch-spectro_usbio.c.diff | 16 ---
3 files changed, 27 insertions(+), 203 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/argyll/Portfile b/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 04bad26..45c6ac6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,10 @@
</span> PortSystem 1.0
name argyll
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.3.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.9.2
</span> categories graphics
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {schenkel.net:leonardo @lbschenkel} openmaintainer
</span> license AGPL-3
description Argyll Color Management System
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,55 +21,39 @@ master_sites ${homepage}
</span> use_zip yes
distname Argyll_V${version}_src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 dd0b8e2da65e4bb7fc38aef377e73afd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 51af2f880fa209dbc658cedf19c11abadbdc43e6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a447041d7fb05078c627aeeeca6837f908991c76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6b316f9af4c8729ff893365cfa5ee4384d1d920c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4d61ae0b91686dea721d34df2e44eaf36c88da87086fd50ccc4e999a58e9ce90
</span>
worksrcdir Argyll_V${version}
depends_build port:jam
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libusb-compat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-jamfiles.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-spectro_usbio.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# parts of Argyll (plot and spectra) use 32-bit Carbon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs i386 ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # hard-wire libusb-compat info for now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@LIBUSBLIBDIR@,${prefix}/lib,g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Jamtop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@LIBUSBINCDIR@,${prefix}/include,g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Jamtop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@LIBUSBNAME@,libusb,g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Jamtop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix IOKit header include: G -> g, for case sensitive file systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/include/s,IOKit/Graphics/IOGraphicsLib,IOKit/graphics/IOGraphicsLib,g" ${worksrcpath}/spectro/dispwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set to install all libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fixfile [exec find ${worksrcpath} -name Jamfile] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,#InstallLib,InstallLib,g" ${fixfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix CC / CXX / LD arch flag settings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@CCFLAGS@,${configure.cc_archflags},g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Jambase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@CXXFLAGS@,${configure.cxx_archflags},g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Jambase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@LDFLAGS@,${configure.ld_archflags},g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Jambase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:jpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libpng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/libusb-1.0.pc:libusb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:tiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To make sure that in case of problems the build will fail instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # of silently falling back to the built-in versions:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/jpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/tiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/usb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/zlib
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 'destroot' actually just installed files locally to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the worksrcpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append HAVE_JPEG=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append HAVE_PNG=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append HAVE_TIFF=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append HAVE_Z=true HAVE_ZLIB=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PREF_CCFLAGS="${configure.cflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PREF_LINKFLAGS="${configure.ldflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -ljpeg -lpng -ltiff -lusb-1.0 -lz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env ${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir DESTDIR=${worksrcpath}
</span>
post-destroot {
# Install documentation.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,35 +64,14 @@ post-destroot {
</span> system "cp -r ${worksrcpath}/doc/* \
${destroot}${prefix}/share/doc/${name} && \
chmod 0644 ${destroot}${prefix}/share/doc/${name}/*"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Install binaries
delete ${worksrcpath}/bin/License.txt
xinstall -m 755 {*}[glob ${worksrcpath}/bin/*] \
${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/include/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach thisdir {cgats gamut h icc imdi jcnf numlib plot \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- render rspl scanin spectro target \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ucmm xicc} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 {*}[glob ${worksrcpath}/${thisdir}/*.h] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # correct some headers: #include <../Y/X> -> <X>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach header {scanrd_.h gam.h refi.h gamut.h} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,\.\./\[^ /\]*/,,g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}/${prefix}/include/${name}/${header}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 {*}[glob ${worksrcpath}/lib/lib*] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Install references
xinstall -m 755 -d ${destroot}${prefix}/share/${name}/ref
xinstall -m 644 {*}[glob ${worksrcpath}/ref/*] \
${destroot}${prefix}/share/${name}/ref
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # xinstall does not remove 'quarantine' attribute;
# do that manually.
fs-traverse fixfile ${destroot} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/argyll/files/patch-jamfiles.diff b/graphics/argyll/files/patch-jamfiles.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 293ae12..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/argyll/files/patch-jamfiles.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,122 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Jamfile.orig 2010-11-12 10:46:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Jamfile 2010-11-12 10:46:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,21 +31,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SubInclude tweak ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SubInclude render ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if ! $(HAVE_TIFF) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SubInclude tiff ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if $(USE_LIBUSB1) = true {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SubInclude libusb1 ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if $(NT) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SubInclude libusbw ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if $(UNIX) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SubInclude libusb ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if $(UNIX) && $(OS) != MACOSX {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SubInclude jcnf ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SubInclude ucmm ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Jambase.orig 2010-11-12 12:25:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Jambase 2010-11-12 12:26:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -856,6 +856,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCFLAGS += -Wno-sign-compare ; # supress new gcc4 warnings ?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCFLAGS += -fpascal-strings ; # for compatibility with the OSX API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINKFLAGS += -framework Carbon ; # A good default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CCFLAGS += @CCFLAGS@ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ C++FLAGS += @CXXFLAGS@ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LINKFLAGS += @LDFLAGS@ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make things work on 64 bit Linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Jamtop.orig 2010-11-12 13:28:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Jamtop 2010-11-12 13:36:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,18 +7,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tell standalone libraries that they are part of Argyll:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFINES += ARGYLLCMS ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Use libusb1 rather than libusb0 & libusb0-win32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--USE_LIBUSB1 = true ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Make the USB V1 library static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBUSB_IS_DLL = false ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Always use DLL for MSWin, because driver install expects it (.inf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if $(NT) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBUSB_IS_DLL = true ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Set the libubs1 library name.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBUSB1NAME = libusb-1.0A ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Using system LIBUSB1 library" ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HAVE_LIBUSB = true ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+USE_LIBUSB1 = false ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBUSB_IS_DLL = true ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBUSBLIBDIR = @LIBUSBLIBDIR@ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBUSBINCDIR = @LIBUSBINCDIR@ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBUSBNAME = @LIBUSBNAME@ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Information for compiling and linking GUI programs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,27 +41,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# See if we have a system TIFF library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if ! $(BUILTIN_TIFF) && $(UNIX) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ GLOB /usr/include : tiffio.h ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ GLOB /usr/lib : libtiff.so ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- || [ GLOB /usr/lib : libtiff.a ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "Using system TIFF library" ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TIFFLIB = ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TIFFINC = ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LINKFLAGS += $(LINKFLAG)tiff ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- HAVE_TIFF = true ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# If nothing else, use Argyll supplied TIFF library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "Using built in TIFF library" ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TIFFLIB = ../tiff/libtiff.lib ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# TIFFINC = ../tiff ../tiff/libtiff ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TIFFINC = ../tiff ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Using system TIFF library" ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TIFFLIB = ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TIFFINC = ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LINKFLAGS += $(LINKFLAG)tiff ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HAVE_TIFF = true ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # testing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #DSTDIR = var ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spectro/Jamfile.orig 2010-11-12 13:28:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spectro/Jamfile 2010-11-12 13:32:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,9 +38,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFINES += USE_LIBUSB1 ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBUSBDIR = ../libusb ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBUSBHDRS = ../libusb ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBUSB = libusb ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if $(HAVE_LIBUSB) = true {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBUSBDIR = $(LIBUSBLIBDIR) ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBUSBHDRS = $(LIBUSBINCDIR) ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBUSBDIR = ../libusb1 ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBUSBHDRS = ../libusb1 ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if $(LIBUSB_IS_DLL) = true {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBUSB = $(LIBUSBNAME)$(SUFIMPLIB) ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBUSBSH = $(LIBUSBNAME)$(SUFSHLIB) ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBUSB = $(LIBUSBNAME)$(SUFLIB) ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IOFILE = unixio.c ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONVFILE = pollem.c ;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/argyll/files/patch-spectro_usbio.c.diff b/graphics/argyll/files/patch-spectro_usbio.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0fb193d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/argyll/files/patch-spectro_usbio.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spectro/usbio.c.orig 2010-11-12 13:51:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spectro/usbio.c 2010-11-12 13:54:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,6 +44,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(USE_LIBUSB1) && defined(ENABLE_USB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* hack in function to make argyll happy */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int usb_argyll_patched(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef ENABLE_USB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Check a USB Vendor and product ID, and add the device */
</span></pre><pre style='margin:0'>
</pre>