-@@ -187,10 +187,10 @@ - of the chart are visible within the image, and if the image is cropped - to exclude the chart edges, it may well not recognize the chart - properly. It is designed to cope with a variety of resolutions, and --will cope with some degree of noise in the scan (due to screening -+will cope with some degree of noise in the acquisition (due to screening - artefacts on the original, or film grain), but it isn't really designed - to accept very high resolution input. For anything over 600DPI, you --should consider down sampling the scan using a filtering downsample, -+should consider down sampling the image using a filtering downsample, - before submitting the file to scanin.
-
- There are 5 basic modes that scanin operates in.
-@@ -199,7 +199,7 @@ - assumed to be parsing an input device characterization chart (ie. an - IT8.7/2 chart), for the purpose of creating a .ti3 data file containing --the CIE test values and the corresponding RGB scanner values. The .ti3 file can then be used for - creating - an input profile using colprof. The file -@@ -221,7 +221,7 @@ - file in - this situation, should be a good quality image, perhaps synthetically - generated --(rather than being scanned), and perfectly oriented, to make -+(rather than being parsed), and perfectly oriented, to make - specification - of the patch locations easier. The file arguments are: The - TIFF file that -@@ -245,7 +245,7 @@ - input devices to be used as a crude replacement for a color measuring - instrument. The icc profile has - (presumably) been --created by scanning an IT8.7/2 chart (or similar) through the RGB input -+created with an image of a IT8.7/2 chart (or similar) through the RGB input - device, - and - then using scanin to create the .ti3 file needed to feed to colprof to -@@ -267,7 +267,7 @@ - The resulting .ti3 file will have the same base name as the input TIFF - file. - If there is more than one page in the test chart, then scanin will need --to be run multiple times, once for each scan file made from each test -+to be run multiple times, once for each image file made from each test - chart. The -ca flag combination should be - used - for all pages after the first, -@@ -339,7 +339,7 @@ -
- By default the automatic chart recognition copes with - rotation, scale and stretch in the chart image, making it suitable for --charts that have been scanned, or shot squarely with a camera. If a -+charts that have been acquired, or shot squarely with a camera. If a - chart has been shot not exactly facing the camera (perhaps to avoid - reflection, or to get more even lighting), then it will suffer from - perspective distortion as well. The Normally scanin computes an average of the pixel values - within a sample square, using a "robust" mean, that discards pixel - values that are too far from the average ("outlier" pixel values). This --is done in an attempt to discard value that are due to scanning -+is done in an attempt to discard value that are due to acquisition - artefacts such as dust, scratches etc. You can force scanin to return - the true mean values for the sample squares that includes all the pixel - values, by using the -m flag.
-@@ -357,9 +357,9 @@ - Normally scanin has reasonably robust feature - recognition, but the default assumption is that the input chart has an - approximately even visual distribution of patch values, and has been --scanned and converted to a typical gamma 2.2 corrected image, meaning -+acquired and converted to a typical gamma 2.2 corrected image, meaning - that the average patch pixel value is expected to be about 50%. If this --is not the case (for instance if the input chart has been scanned with -+is not the case (for instance if the input chart has been processed with - linear light or "raw" encoding), then it may enhance the image - recognition to provide the approximate gamma encoding of the image. For - instance, if linear light encoding ("Raw") is used, a Installing a - display profile -
--Profiling Scanners
-+Profiling Acquisition Devices
- Types of test charts
--Taking readings from a scanner
--Creating a scanner profile
-+Taking readings from an acquisition device
-+Creating an acquisition device profile
-
- Profiling Printers
- Creating a print test chart
-Reading a print test chart - using an instrument
-Reading a print test chart --using a scanner
-+using an acquisition device --
Creating a printer profile
-
-@@ -353,14 +353,14 @@
- the connected display.-
-
--
Profiling Scanners
--Because a scanner is an input device, it is necessary to go about -+Profiling Acquisition Devices
-+Because a acquisition device is an input device, it is necessary to go about - profiling it in quite a different way to an output device. To profile --it, a test chart is needed to exercise the scanner response, to which -+it, a test chart is needed to exercise the device response, to which - the CIE values for each test patch is known. Generally standard - reflection or transparency test charts are used for this purpose.-
Types of test charts
--The most common and popular test chart for scanner profiling is the -+The most common and popular test chart for acquisiton device profiling is the - IT8.7/2 chart. This is a standard format chart generally reproduced on - photographic film, containing about 264 test patches. The Kodak Q-60 - Color Input Target is a typical example:-@@ -400,18 +400,18 @@ -
-
--
Taking readings from a scanner
--The test chart you are using needs to be placed on the scanner, and the --scanner needs to be configured to a suitable state, and restored to -+Taking readings from an acquisition device
-+The test chart you are using needs to be exposed to the device, and the -+acquisition device needs to be configured to a suitable state, and restored to - that - same state when used subsequently with the resulting profile. The chart - should - be scanned, and saved to a TIFF format file. I will assume the - resulting --file is called scanner.tif. The raster file need only be roughly -+file is called device.tif. The raster file need only be roughly - cropped so as to contain the test chart (including the charts edges).-
--The second step is to extract the RGB values from the scanner.tif file, -+The second step is to extract the RGB values from the device.tif file, - and match then to the reference CIE values. - To locate the patch values in the scan, the scanin utility - needs to -@@ -485,32 +485,32 @@ - chart recognition template file will need to be created (this is beyond - the scope of the current documentation).
-
--To create the scanner .ti3 file, run the scanin utility as -+To create the device .ti3 file, run the scanin utility as - follows - (assuming an IT8 chart is being used):
-
-- scanin -v scanner.tif It8.cht It8ref.txt
-+ scanin -v device.tif It8.cht It8ref.txt
-
- "It8ref.txt" is assumed to be the name of the CIE reference file --supplied by the chart manufacturer. The resulting file will be named "scanner.ti3".
-+supplied by the chart manufacturer. The resulting file will be named "device.ti3".
-
- scanin will process 16 bit per --component .tiff files, which (if the scanner is capable of creating -+component .tiff files, which (if the device is capable of creating - such files), may improve the quality of the profile.
-
- If you have any doubts about the correctness of the chart recognition, - or the subsequent profile's delta E report is unusual, then use the - scanin diagnostic flags -dipn and examine - the diag.tif diagnostic file.
--
Creating a scanner profile
--Similar to a display profile, a scanner profile can be either a --shaper/matrix or LUT based profile. Well behaved scanners will -+Creating an acquisition device profile
-+Similar to a display profile, an acquisition device profile can be either a -+shaper/matrix or LUT based profile. Well behaved devices will - probably give the best results - with a shaper/matrix profile, but if the fit is poor, consider using a - LUT - type profile.-
--If the purpose of the scanner profile is to use it as a substitute for -+If the purpose of the device profile is to use it as a substitute for - a - colorimeter, then the -u flag should be used to avoid clipping - values above the white point. Unless the shaper/matrix type profile is -@@ -520,24 +520,24 @@ - To create a matrix/shaper profile, the following suffices:
-
- colprof -v -D"Scanner A" -D"Device A" -qm -as --scanner
-+device
-
- For a LUT based profile then the following would be used:
-
- colprof -v -D"Scanner A" -+ href="colprof.html#E">-D"Device A" - -qm --scanner
-+device
-
- For the purposes of a poor mans colorimeter, the following would - generally be used:
-
- colprof -v -D"Scanner A" -+ href="colprof.html#E">-D"Device A" - -qm -u --scanner
-+device
-
- Make sure you check the delta E report at the end of the profile - creation, to see if the profile is behaving reasonably.
-@@ -703,7 +703,7 @@ - -ii1 -pA4 - PrinterA
-
--For using with a scanner as a colorimeter, the Gretag Spectroscan -+For using with an acquisition device as a colorimeter, the Gretag Spectroscan - layout is suitable, but the -s flag - should be used so as to generate a layout suitable for scan - recognition, as well as generating the scan recognition template -@@ -804,28 +804,27 @@ - for each type of instrument. Continue with Creating - a printer profile.
-
--
Reading a print test chart using a scanner or
--camera
-+Reading a print test chart using an acquisition device
-
-
--Argyll supports using a scanner or even a camera as a substitute for a
-+Argyll supports using any acquisition device as a substitute for a
- colorimeter.
--While a scanner or camera is no replacement for a color measurement
-+While most are no replacement for a color measurement
- instrument, it may give acceptable results in some situations, and may
- give better results than a generic profile for a printing device.
-
--The main limitation of the scanner-as-colorimeter approach are:
-+The main limitation of the any-device-as-colorimeter approach are:
-
--* The scanner dynamic range and/or precision may not match the printers
-+* The acquisition device dynamic range and/or precision may not match the printers
- or what is required for a good profile.
--* The spectral interaction of the scanner test chart and printer test
--chart with the scanner
-+* The spectral interaction of the device test chart and printer test
-+chart with the device
- spectral response can cause color errors.
- * Spectral differences caused by different black amounts in the print
- test chart can cause
- color errors.
- * The IT8 chart gamut may be so much smaller than the printers that the
--scanner profile is too inaccurate.
-+acquisition device profile is too inaccurate.
-
- As well as some of the above, a camera may not be suitable if it
- automatically adjusts exposure or white point when taking a picture,
-@@ -834,23 +833,23 @@
- The end result is often a profile that has a slight color cast to,
- compared to a profile created using a colorimeter or spectrometer..
-
--It is assumed that you have created a scanner or camera profile
-+It is assumed that you have created an acquisition device profile
- following the procedure
- outline above. For best possible results it
--is advisable to both profile the scanner or camera, and use it in
-+is advisable to both profile the acquisition device, and use it in
- scanning the
- printed test chart, in as "raw" mode as possible (i.e. using 16 bits
--per component images, if the scanner or camera is
-+per component images, if the acquisition device is
- capable of doing so; not setting white or black points, using a fixed
- exposure etc.). It is
- generally advisable to create a LUT type input profile, and use the -u flag to
- avoid clipping scanned value whiter than the input calibration chart.
-
--Scan or photograph your printer chart (or charts) on the scanner or
--camera previously profiled.
-+Scan or photograph your printer chart (or charts) on the acquisition device
-+previously profiled.
- The
--scanner or camera must be configured and used exactly the same as it
-+acquisition device must be configured and used exactly the same as it
- was when it
- was profiled.
-
-@@ -858,21 +857,21 @@
- style="font-weight: bold;">PrinterB.tif
(or PrinterB1.tif, PrinterB2.tif etc. in the case of
--multiple charts). As with profiling the scanner or camera, the raster
-+multiple charts). As with profiling the acquisition device, the raster
- file need
- only be roughly cropped so as to contain the test chart.-
-
--The scanner recognition files -+The acquisition device recognition files - created when printtarg was run - is assumed to be called PrinterB.cht. --Using the scanner profile created previously (assumed to be called scanner.icm), the printer test chart -+Using the device profile created previously (assumed to be called device.icm), the printer test chart - scan patches are converted to CIE values using the scanin utility:
-
- scanin -v -c PrinterB.tif --PrinterB.cht scanner.icm -+PrinterB.cht device.icm - PrinterB
-
- If there were multiple test chart pages, the results would be -@@ -881,15 +880,15 @@ -
- scanin -v -c PrinterB1.tif --PrinterB1.cht scanner.icm -+PrinterB1.cht device.icm - PrinterB
- scanin -v -ca PrinterB2.tif --PrinterB2.cht scanner.icm -+PrinterB2.cht device.icm - PrinterB
- scanin -v -ca PrinterB3.tif --PrinterB3.cht scanner.icm -+PrinterB3.cht device.icm - PrinterB
-
- Now that the PrinterB.ti3 data -diff -uNr Argyll_V1.0.1.orig/doc/targen.html Argyll_V1.0.1/doc/targen.html ---- Argyll_V1.0.1.orig/doc/targen.html 2008-07-27 11:18:52.000000000 +0200 -+++ Argyll_V1.0.1/doc/targen.html 2008-07-27 11:53:34.000000000 +0200 -@@ -615,7 +615,7 @@ - 3 x Letter 1386
- 4 x Letter 1848
-
-- Scanner (printtarg with -iSS -s options):
-+ Acquisition device (printtarg with -iSS -s options):
-
- 1 x A4R 1014
- 2 x A4R 2028
-diff -uNr Argyll_V1.0.1.orig/doc/ti3_format.html Argyll_V1.0.1/doc/ti3_format.html ---- Argyll_V1.0.1.orig/doc/ti3_format.html 2008-07-27 11:18:52.000000000 +0200 -+++ Argyll_V1.0.1/doc/ti3_format.html 2008-07-27 11:42:04.000000000 +0200 -@@ -173,7 +173,7 @@ - or "RGB_LAB" for an RGB printer - or display, "CMYK_XYZ" for a - printer, "XYZ_RGB" for an RGB --scanner.
-+acquisition device.
-
- If spectral values are going to be included in the file, the following - keywords and values shall be used:
-diff -uNr Argyll_V1.0.1.orig/doc/ucmm.html Argyll_V1.0.1/doc/ucmm.html ---- Argyll_V1.0.1.orig/doc/ucmm.html 2008-07-27 11:18:52.000000000 +0200 -+++ Argyll_V1.0.1/doc/ucmm.html 2008-07-27 11:41:27.000000000 +0200 -@@ -13,7 +13,7 @@ - designed just to handle the necessary configuration needed to track the - installation and association of ICC profiles with Unix/Linux X11 - displays. It could be expanded at some point to also hold the --associations for other devices such as scanner and printers.
-+associations for other devices such as acquisition devices and printers.
-
- It consists primarily of a small configuration database that associates - a display monitor (identified by its EDID or the X11 display name if an -diff -uNr Argyll_V1.0.1.orig/log.txt Argyll_V1.0.1/log.txt ---- Argyll_V1.0.1.orig/log.txt 2008-07-27 11:18:52.000000000 +0200 -+++ Argyll_V1.0.1/log.txt 2008-07-27 11:35:38.000000000 +0200 -@@ -1648,7 +1648,7 @@ - - * Added shaper/matrix input profile support. - (profile/profin.c, xicc/xmatrix.c) -- This may be more accurate for scanner profiles, -+ This may be more accurate for device profiles, - given the poor coverage of test points provided - by an IT8 chart (but doesn't appear to be in practice). - -@@ -1659,7 +1659,7 @@ - - * Added support in scanin.c and scanrd.c for - using a scan of a print test chart, plus a -- profile for the scanner, to be able to measure -+ profile for the device, to be able to measure - color for printer calibration. This - new mode handles multi-page test charts. - -@@ -1689,13 +1689,13 @@ - patch spacer contrast determination. - Also added an XYZ to sRGB conversion - function to support RGB previews of N color -- devices, as well as scanner recognition template files. -+ devices, as well as device recognition template files. - - * Expanded xicc/xcolorants.c to incorporate - an approximate device model for arbitrary - colorant combinations. This is used to - be able to approximate expected density readings, -- as well as preview colors and scanner recognition templates. -+ as well as preview colors and device recognition templates. - - * Create a new test point creation module, - target/simplat.c, to create higher dimentional, -@@ -1793,7 +1793,7 @@ - - * Added preliminary support in printtarg for the SpectroScan - spectrodensitometer. Also added preliminary support for -- scanner recognisable test charts. -+ device recognisable test charts. - - * Added option to icclink to turn off the use of linearisation - curves in the output link, since this sometimes seems to -@@ -1960,7 +1960,7 @@ - Cleaned up build automation somewhat. - - Added RGB output device profile generation support. -- Added RGB scanner device profile generation support. -+ Added RGB device profile generation support. - - Added a couple of spectrometer conversion utilities for - raw data files from other CMSs. -diff -uNr Argyll_V1.0.1.orig/profile/profcheck.c Argyll_V1.0.1/profile/profcheck.c ---- Argyll_V1.0.1.orig/profile/profcheck.c 2008-07-27 11:18:52.000000000 +0200 -+++ Argyll_V1.0.1/profile/profcheck.c 2008-07-27 11:54:01.000000000 +0200 -@@ -360,7 +360,7 @@ - devchan = 3; - isLab = 1; - isAdditive = 1; -- /* Scanner .ti3 files: */ -+ /* Acquisition Device .ti3 files: */ - } else if (strcmp(icg->t[0].kdata[ti],"XYZ_RGB") == 0) { - devspace = icSigRgbData; - devchan = 3; -diff -uNr Argyll_V1.0.1.orig/profile/profin.c Argyll_V1.0.1/profile/profin.c ---- Argyll_V1.0.1.orig/profile/profin.c 2008-07-27 11:18:52.000000000 +0200 -+++ Argyll_V1.0.1/profile/profin.c 2008-07-27 11:53:08.000000000 +0200 -@@ -49,7 +49,7 @@ - /* - Basic algorithm outline: - -- Scanner: -+ Acquisition Device: - - Figure out the input curves to give - the flattest grid. -diff -uNr Argyll_V1.0.1.orig/scanin/scanin.c Argyll_V1.0.1/scanin/scanin.c ---- Argyll_V1.0.1.orig/scanin/scanin.c 2008-07-27 11:18:53.000000000 +0200 -+++ Argyll_V1.0.1/scanin/scanin.c 2008-07-27 11:26:37.000000000 +0200 -@@ -2,7 +2,7 @@ - /* - * Argyll Color Correction System - * -- * Scanin: Input the scan of a test chart, and output cgats data -+ * Scanin: Input the image of a test chart, and output cgats data - * Uses scanrd to do the hard work. - * - * Author: Graeme W. Gill -@@ -72,7 +72,7 @@ - fprintf(stderr,"Author: Graeme W. Gill, licensed under the GPL Version 3\n"); - fprintf(stderr,"\n"); - fprintf(stderr,"usage: scanin [options] input.tif recogin.cht valin.cie [diag.tif]\n"); -- fprintf(stderr," :- inputs 'input.tif' and outputs scanner 'input.ti3', or\n"); -+ fprintf(stderr," :- inputs 'input.tif' and outputs device 'input.ti3', or\n"); - fprintf(stderr,"\n"); - fprintf(stderr,"usage: scanin -g [options] input.tif recogout.cht [diag.tif]\n"); - fprintf(stderr," :- outputs file 'recogout.cht', or\n"); -@@ -92,7 +92,7 @@ - fprintf(stderr," -ca Same as -c, but accumulates more values to .ti3\n"); - fprintf(stderr," from subsequent pages\n"); - fprintf(stderr," -r Replace device values in .ti2/.ti3\n"); -- fprintf(stderr," Default is to create a scanner .ti3 file\n"); -+ fprintf(stderr," Default is to create a device .ti3 file\n"); - fprintf(stderr," -F x1,y1,x2,y2,x3,y3,x4,y4\n"); - fprintf(stderr," Don't auto recognize, locate using four fiducual marks\n"); - fprintf(stderr," -p Compensate for perspective distortion\n"); -@@ -127,12 +127,12 @@ - static char datin_name[200] = { 0 }; /* Data input name (.cie/.q60) */ - static char datout_name[200] = { 0 }; /* Data output name (.ti3/.val) */ - static char recog_name[200] = { 0 }; /* Reference chart name (.cht) */ -- static char prof_name[200] = { 0 }; /* scanner profile name (.cht) */ -+ static char prof_name[200] = { 0 }; /* device profile name (.cht) */ - static char diag_name[200] = { 0 }; /* Diagnostic Output (.tif) name, if used */ - int verb = 1; - int tmean = 0; /* Return true mean, rather than robust mean */ - int repl = 0; /* Replace .ti3 device values from raster file */ -- int outo = 0; /* Output the values read, rather than creating scanner .ti3 */ -+ int outo = 0; /* Output the values read, rather than creating device .ti3 */ - int colm = 0; /* Use inage values to measure color for print profile. > 1 == append */ - int flags = SI_GENERAL_ROT; /* Default allow all rotations */ - -@@ -153,7 +153,7 @@ - scanrd *sr; /* Scanrd object */ - int err; - char *errm; -- int pnotscan = 0; /* Number of patches that wern't scanned */ -+ int pnotscan = 0; /* Number of patches that weren't processed */ - - if (argc <= 1) - usage(); -diff -uNr Argyll_V1.0.1.orig/target/printtarg.c Argyll_V1.0.1/target/printtarg.c ---- Argyll_V1.0.1.orig/target/printtarg.c 2008-07-27 11:18:52.000000000 +0200 -+++ Argyll_V1.0.1/target/printtarg.c 2008-07-27 11:37:20.000000000 +0200 -@@ -3252,7 +3252,7 @@ - } - - /******************************************************************/ --/* Edge tracking support, for generating the scanner image */ -+/* Edge tracking support, for generating the device image */ - /* recognition reference chart file. */ - - /* Establish width and height to convert between topleft and */ -diff -uNr Argyll_V1.0.1.orig/ttbd.txt Argyll_V1.0.1/ttbd.txt ---- Argyll_V1.0.1.orig/ttbd.txt 2008-07-27 11:18:54.000000000 +0200 -+++ Argyll_V1.0.1/ttbd.txt 2008-07-27 11:54:46.000000000 +0200 -@@ -123,7 +123,7 @@ - - * Should create a .ti2 template file for some standard charts, - such as an IT8.7/3, ECI2002 random and non-random etc. -- Scanner recognition files too ?? -+ Device recognition files too ?? - - * Add an option to targen, that allows generation of - test points down the neutral axis (how does this work -@@ -293,7 +293,7 @@ - patch variance is too high (probable faulty read). - - * Add spectral fix options to scanin code to allow compensation -- for scanner and media errors when using a scanned image to -+ for device and media errors when using an acquired image to - measure color. - This means figuring out how it will work, as well as creating - to tools to create the spectral fix data (or just add general diff --git a/argyllcms-1.0.3-autotools.patch b/argyllcms-1.0.3-autotools.patch deleted file mode 100644 index 0a00a0c..0000000 --- a/argyllcms-1.0.3-autotools.patch +++ /dev/null @@ -1,26 +0,0 @@ -=== modified file 'gamut/Makefile.am' ---- gamut/Makefile.am 2008-11-16 13:51:27 +0000 -+++ gamut/Makefile.am 2009-04-16 07:52:09 +0000 -@@ -6,8 +6,7 @@ - - libgammap_a_SOURCES = gammap.h gammap.c nearsmth.c nearsmth.h - --LDADD=./libgamut.a ./libgammap.a ../numlib/libargyllnum.a ../icc/libicc.a \ -- ../cgats/libcgats.a ../rspl/librspl.a ../plot/libvrml.a ../xicc/libxicc.a -+LDADD=./libgamut.a ./libgammap.a ../icc/libicc.a ../cgats/libcgats.a ../rspl/librspl.a ../plot/libvrml.a ../xicc/libxicc.a ../numlib/libargyllnum.a - - bin_PROGRAMS = viewgam - check_PROGRAMS = smthtest GenRMGam GenVisGam maptest surftest - -=== modified file 'imdi/Makefile.am' ---- imdi/Makefile.am 2008-11-16 13:51:27 +0000 -+++ imdi/Makefile.am 2009-04-16 07:54:07 +0000 -@@ -13,6 +13,7 @@ - greytiff_LDFLAGS=$(BINLDFLAGS) - - check_PROGRAMS = ctest -+ctest_SOURCES = ctest.c cgen.c - - noinst_PROGRAMS = imdi_make - imdi_make_SOURCES = imdi_make.c imdi_gen.c cgen.c - diff --git a/argyllcms-1.0.3-remove-libusb-fork-check.patch b/argyllcms-1.0.3-remove-libusb-fork-check.patch deleted file mode 100644 index 5fbf3bc..0000000 --- a/argyllcms-1.0.3-remove-libusb-fork-check.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -uNr Argyll_V1.0.3.orig/spectro/usbio.c Argyll_V1.0.3/spectro/usbio.c ---- Argyll_V1.0.3.orig/spectro/usbio.c 2008-09-03 02:10:32.000000000 +0200 -+++ Argyll_V1.0.3/spectro/usbio.c 2008-09-03 22:27:19.000000000 +0200 -@@ -102,9 +102,6 @@ - #ifdef ENABLE_USB - struct usb_bus *bus; - -- /* Check that we've got an up to date version of libusb */ -- if (usb_argyll_patched() < 2) -- error("usblib isn't up to date to work with this version of Argyll"); - - // ~~99 - // if (p->debug) diff --git a/argyllcms-1.0.4-dispwin-randr-fix.patch b/argyllcms-1.0.4-dispwin-randr-fix.patch deleted file mode 100644 index 5584748..0000000 --- a/argyllcms-1.0.4-dispwin-randr-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up Argyll_V1.0.4/spectro/dispwin.c.jx Argyll_V1.0.4/spectro/dispwin.c ---- Argyll_V1.0.4/spectro/dispwin.c.jx 2009-06-23 02:27:04.000000000 -0400 -+++ Argyll_V1.0.4/spectro/dispwin.c 2009-11-09 16:35:42.000000000 -0500 -@@ -545,7 +545,8 @@ disppath **get_displays() { - return NULL; - } - -- if (outi->connection == RR_Disconnected) { -+ if (outi->connection == RR_Disconnected || -+ outi->crtc == None) { - continue; - } - diff --git a/argyllcms-1.0.4-remove-mode-666-ttys-and-use-acl-manage.patch b/argyllcms-1.0.4-remove-mode-666-ttys-and-use-acl-manage.patch deleted file mode 100644 index 9e2b0eb..0000000 --- a/argyllcms-1.0.4-remove-mode-666-ttys-and-use-acl-manage.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -urNp Argyll_V1.0.4.old/libusb/55-Argyll.rules Argyll_V1.0.4/libusb/55-Argyll.rules ---- Argyll_V1.0.4.old/libusb/55-Argyll.rules 2010-02-01 08:54:08.000000000 +0000 -+++ Argyll_V1.0.4/libusb/55-Argyll.rules 2010-02-01 08:56:09.000000000 +0000 -@@ -1,38 +1,48 @@ - # udev rule to recognize instruments and make them accessible to user applications. --# Copy to /etc/udev/rules.d/55-Argyll.rules - --# Enable serial port connected instruments connected on first two ports. --KERNEL=="ttyS[01]", MODE="666" -+# Skip all this to speed things up if it'a not a usb add. -+ACTION!="add", GOTO="argyll_rules_end" -+SUBSYSTEM!="usb", GOTO="argyll_rules_end" - --# Enable serial port connected instruments on USB serial converteds connected on first two ports. --KERNEL=="ttyUSB[01]", MODE="666" -+# Recognize the color measurement devices - - # DTP20 --SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d020", MODE="666" -+ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d020", ENV{COLOR_MEASUREMENT_DEVICE}="1" - - # DTP92Q (not testedt) --SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d092", MODE="666" -+ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d092", ENV{COLOR_MEASUREMENT_DEVICE}="1" - - # DTP94 --SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d094", MODE="666" -+ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d094", ENV{COLOR_MEASUREMENT_DEVICE}="1" - - # MonacoOPTIX (Same as i1 Display 1) --SYSFS{idVendor}=="0670", SYSFS{idProduct}=="0001", MODE="666" -+ATTRS{idVendor}=="0670", ATTRS{idProduct}=="0001", ENV{COLOR_MEASUREMENT_DEVICE}="1" - - # i1Display --SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2003", MODE="666" -+ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2003", ENV{COLOR_MEASUREMENT_DEVICE}="1" - - # i1Monitor --SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2001", MODE="666" -+ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2001", ENV{COLOR_MEASUREMENT_DEVICE}="1" - - # i1Pro --SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2000", MODE="666" -+ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2000", ENV{COLOR_MEASUREMENT_DEVICE}="1" -+ -+# ColorMunki -+ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2007", ENV{COLOR_MEASUREMENT_DEVICE}="1" - - # Colorimtre HCFR --SYSFS{idVendor}=="04db", SYSFS{idProduct}=="005b", MODE="666" -+ATTRS{idVendor}=="04db", ATTRS{idProduct}=="005b", ENV{COLOR_MEASUREMENT_DEVICE}="1" - - # Spyder 2 --SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0200", MODE="666" -+ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0200", ENV{COLOR_MEASUREMENT_DEVICE}="1" -+ -+# Spyder 3 -+ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0300", ENV{COLOR_MEASUREMENT_DEVICE}="1" - - # Huey --SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2005", MODE="666" -+ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2005", ENV{COLOR_MEASUREMENT_DEVICE}="1" -+ -+# color calibration device -+ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1", IMPORT{program}="usb-db %p" -+ -+LABEL="argyll_rules_end" diff --git a/argyllcms.spec b/argyllcms.spec index ec0de82..4fa57ce 100644 --- a/argyllcms.spec +++ b/argyllcms.spec @@ -1,22 +1,20 @@ -%define alphatag 20100201 - Name: argyllcms -Version: 1.1.0 -Release: 0.2.%{?alphatag}git%{?dist} - +Version: 1.3.5 +Release: 1%{?dist} Summary: ICC compatible color management system Group: User Interface/X License: GPLv3 and MIT -URL: http://github.com/hughsie/hargyllcms - -#Source0: http://people.freedesktop.org/~hughsient/releases/hargyllcms-%{version}-%{?alphatag}.tar.gz -Source0: http://people.freedesktop.org/~hughsient/releases/hargyllcms-%{version}-%{?alphatag}.tar.gz - -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: libtiff-devel, libusb-devel -BuildRequires: libX11-devel, libXext-devel, libXxf86vm-devel, libXinerama-devel -BuildRequires: libXScrnSaver-devel, libXrandr-devel - +URL: http://gitorious.org/hargyllcms +Source0: http://people.freedesktop.org/~hughsient/releases/hargyllcms-%{version}.tar.xz +BuildRequires: libtiff-devel +BuildRequires: libusb1-devel +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXxf86vm-devel +BuildRequires: libXinerama-devel +BuildRequires: libXScrnSaver-devel +BuildRequires: libXrandr-devel +BuildRequires: yajl-devel Requires: udev %description @@ -48,8 +46,7 @@ of displays. This package contains the Argyll color management system documentation. %prep -#%setup -q -n hargyllcms-%{version} -%setup -q -n hargyllcms-%{?version}-%{?alphatag} +%setup -q -n hargyllcms-%{version} # we're not allowed to refer to acquisition devices as scanners ./legal.sh @@ -70,7 +67,6 @@ rm -rf %{buildroot} %attr(0755,root,root) %{_bindir}/* %{_datadir}/color/argyll -%{_datadir}/color/argyll/ref /lib/udev/rules.d/55-Argyll.rules %exclude %{_datadir}/doc @@ -80,6 +76,9 @@ rm -rf %{buildroot} %doc doc/*.html doc/*.jpg doc/*.txt %changelog +* Thu Dec 01 2011 Richard Hughes