Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (971fe72ae67496ddbdd20a27690575ab7a225873)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (971fe72ae67496ddbdd20a27690575ab7a225873)
  • Date: Sat, 10 Nov 2012 05:03:46 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 4 ++++
graphics/argyllcms/04_CVE-2012-4405.diff | 14 ++++++++++++++
graphics/argyllcms/BUILD | 3 +++
graphics/argyllcms/DEPENDS | 11 +++++++++++
graphics/argyllcms/DETAILS | 25
+++++++++++++++++++++++++
graphics/argyllcms/HISTORY | 5 +++++
graphics/argyllcms/INSTALL | 3 +++
graphics/argyllcms/PRE_BUILD | 6 ++++++
graphics/argyllcms/argyllcms-1.4.0-jpeg.patch | 21 +++++++++++++++++++++
9 files changed, 92 insertions(+)

New commits:
commit 971fe72ae67496ddbdd20a27690575ab7a225873
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/argyllcms: new spell, software for creating color profiles for
devices

diff --git a/ChangeLog b/ChangeLog
index dab879d..fcc140b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * graphics/argyllcms: new spell, software for creating color profiles
for
+ devices
+
2012-11-07 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/redis-py: new spell, Python interface to the Redis
key-value store
diff --git a/graphics/argyllcms/04_CVE-2012-4405.diff
b/graphics/argyllcms/04_CVE-2012-4405.diff
new file mode 100644
index 0000000..af1157d
--- /dev/null
+++ b/graphics/argyllcms/04_CVE-2012-4405.diff
@@ -0,0 +1,14 @@
+--- a/icc/icc.c
++++ b/icc/icc.c
+@@ -6065,6 +6065,11 @@ static int icmLut_read(
+ p->clutPoints = read_UInt8Number(bp+10);
+
+ /* Sanity check */
++ if (p->inputChan < 1) {
++ sprintf(icp->err,"icmLut_read: No input channels!");
++ return icp->errc = 1;
++ }
++
+ if (p->inputChan > MAX_CHAN) {
+ sprintf(icp->err,"icmLut_read: Can't handle > %d input
channels\n",MAX_CHAN);
+ return icp->errc = 1;
diff --git a/graphics/argyllcms/BUILD b/graphics/argyllcms/BUILD
new file mode 100755
index 0000000..8124035
--- /dev/null
+++ b/graphics/argyllcms/BUILD
@@ -0,0 +1,3 @@
+jam -q -fJambase -j${MAKE_NJOBS} &&
+jam -fJambase install &&
+rm ${SOURCE_DIRECTORY}/bin/License.txt
diff --git a/graphics/argyllcms/DEPENDS b/graphics/argyllcms/DEPENDS
new file mode 100755
index 0000000..071f74a
--- /dev/null
+++ b/graphics/argyllcms/DEPENDS
@@ -0,0 +1,11 @@
+depends jam &&
+depends JPEG &&
+depends libx11 &&
+depends libxau &&
+depends libxdmcp &&
+depends libxext &&
+depends libxinerama &&
+depends libxrandr &&
+depends libxscrnsaver &&
+depends libxxf86vm &&
+depends tiff
diff --git a/graphics/argyllcms/DETAILS b/graphics/argyllcms/DETAILS
new file mode 100755
index 0000000..fe66b99
--- /dev/null
+++ b/graphics/argyllcms/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=argyllcms
+ VERSION=1.4.0
+ SOURCE="Argyll_V${VERSION}_src.zip"
+ SOURCE_URL[0]=http://www.${SPELL}.com/${SOURCE}
+
SOURCE_HASH=sha512:edb9ff1b0a965e79a26c0138afe16472fd18236b55b7262135d70bfc7405001a55d2ada4251111fcbaa0b6f73a3fa2faa2cfe07b3413c8a5ecea04c87e5646ae
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Argyll_V${VERSION}"
+ WEB_SITE="http://www.argyllcms.com/";
+ LICENSE[0]=GPL
+ ENTERED=20121009
+ SHORT="an ICC compatible color management system"
+cat << EOF
+ArgyllCMS is an ICC compatible color management system, available as
+Open Source under the AGPL. It supports accurate ICC profile creation
+for scanners, cameras and film recorders, and calibration and profiling of
+displays and RGB & CMYK printers. Spectral sample data is supported, allowing
+a selection of illuminants observer types, and paper fluorescent whitener
+additive compensation. Profiles can also incorporate source specific gamut
+mappings for perceptual and saturation intents. Gamut mapping and profile
+linking uses the CIECAM02 appearance model, a unique gamut mapping algorithm,
+and a wide selection of rendering intents. Device Link can be created with
+a wide variety of advanced options. It also includes code for the fastest
+portable 8 bit raster color conversion engine available anywhere, as well
+as support for fast, fully accurate 16 bit conversion. Device color gamuts
+can also be viewed and compared using a VRML viewer.
+EOF
diff --git a/graphics/argyllcms/HISTORY b/graphics/argyllcms/HISTORY
new file mode 100644
index 0000000..8bed4e0
--- /dev/null
+++ b/graphics/argyllcms/HISTORY
@@ -0,0 +1,5 @@
+2012-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 04_CVE-2012-4405.diff, argyllcms-1.4.0-jpeg.patch, BUILD,
+ DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
+ patches are from Ubuntu and Gentoo respectively
+
diff --git a/graphics/argyllcms/INSTALL b/graphics/argyllcms/INSTALL
new file mode 100755
index 0000000..7b37cfb
--- /dev/null
+++ b/graphics/argyllcms/INSTALL
@@ -0,0 +1,3 @@
+mkdir -p ${INSTALL_ROOT}/usr/share/argyllcms/ref
&&
+install -m644 ${SOURCE_DIRECTORY}/ref/*
${INSTALL_ROOT}/usr/share/argyllcms/ref/ &&
+install -m755 ${SOURCE_DIRECTORY}/bin/* ${INSTALL_ROOT}/usr/bin/
diff --git a/graphics/argyllcms/PRE_BUILD b/graphics/argyllcms/PRE_BUILD
new file mode 100755
index 0000000..2a388f7
--- /dev/null
+++ b/graphics/argyllcms/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SCRIPT_DIRECTORY/04_CVE-2012-4405.diff &&
+patch -p1 < $SCRIPT_DIRECTORY/argyllcms-1.4.0-jpeg.patch &&
+echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop &&
+echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau
-lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
diff --git a/graphics/argyllcms/argyllcms-1.4.0-jpeg.patch
b/graphics/argyllcms/argyllcms-1.4.0-jpeg.patch
new file mode 100644
index 0000000..d523481
--- /dev/null
+++ b/graphics/argyllcms/argyllcms-1.4.0-jpeg.patch
@@ -0,0 +1,21 @@
+diff -ruN Argyll_V1.4.0.orig/Jamtop Argyll_V1.4.0/Jamtop
+--- Argyll_V1.4.0.orig/Jamtop 2012-04-19 09:50:31.000000000 +0200
++++ Argyll_V1.4.0/Jamtop 2012-05-07 02:18:37.000000000 +0200
+@@ -113,13 +113,13 @@
+ # See if we have a system JPEG library.
+ if ! $(BUILTIN_JPEG) && $(UNIX) {
+ if [ GLOB /usr/include : jpeglib.h ] {
+- if ! $(HOST64) && ( [ GLOB /usr/lib : libjpg.so ] || [ GLOB
/usr/lib : libjpg.a ] )
+- || $(HOST64) && ( [ GLOB /usr/lib64 : libjpg.so ] || [
GLOB /usr/lib64 : libjpg.a ] )
+- || $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu :
libjpg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.a ] ) {
++ if ! $(HOST64) && ( [ GLOB /usr/lib : libjpeg.so ] || [ GLOB
/usr/lib : libjpeg.a ] )
++ || $(HOST64) && ( [ GLOB /usr/lib64 : libjpeg.so ] || [
GLOB /usr/lib64 : libjpeg.a ] )
++ || $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu :
libjpeg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] ) {
+ echo "Using system JPEG library" ;
+ JPEGLIB = ;
+ JPEGINC = ;
+- LINKFLAGS += $(LINKFLAG)tiff ;
++ LINKFLAGS += $(LINKFLAG)jpeg ;
+ HAVE_JPEG = true ;
+ }
+ }



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (971fe72ae67496ddbdd20a27690575ab7a225873), Florian Franzmann, 11/10/2012

Archive powered by MHonArc 2.6.24.

Top of Page