diff options
author | Florian Franzmann | 2019-06-21 21:45:36 +0200 |
---|---|---|
committer | Florian Franzmann | 2019-06-21 21:45:36 +0200 |
commit | e0ea3b93ba872b50e8e0bd149595250a40b3d8b4 (patch) | |
tree | e968e6091e54bdb5a56cf9a3fccd8fe0b4a4967e /graphics | |
parent | 6fb14e162be0e30998adcaf35d8d4cfb4d36b6a1 (diff) |
graphics/argyllcms: version 2.1.1
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/argyllcms/0001-fix-compilation-with-gcc-7.patch | 98 | ||||
-rwxr-xr-x | graphics/argyllcms/DETAILS | 4 | ||||
-rw-r--r-- | graphics/argyllcms/HISTORY | 5 | ||||
-rwxr-xr-x | graphics/argyllcms/PRE_BUILD | 5 | ||||
-rw-r--r-- | graphics/argyllcms/argyllcms-1.8.0-gcc5.patch | 20 |
5 files changed, 7 insertions, 125 deletions
diff --git a/graphics/argyllcms/0001-fix-compilation-with-gcc-7.patch b/graphics/argyllcms/0001-fix-compilation-with-gcc-7.patch deleted file mode 100644 index 62efd73e68..0000000000 --- a/graphics/argyllcms/0001-fix-compilation-with-gcc-7.patch +++ /dev/null @@ -1,98 +0,0 @@ -From d0809ded29bf1dc22620b60a905e851cb4a9e0bd Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> -Date: Mon, 5 Jun 2017 15:47:55 +0200 -Subject: [PATCH] fix compilation with gcc 7 - ---- - numlib/numsup.c | 28 +++++++++++++++------------- - xml/mxml-attr.c | 2 ++ - xml/mxml-node.c | 1 + - xml/mxml-private.c | 1 + - 4 files changed, 19 insertions(+), 13 deletions(-) - -diff --git a/numlib/numsup.c b/numlib/numsup.c -index 39011ae..1bffedb 100755 ---- a/numlib/numsup.c -+++ b/numlib/numsup.c -@@ -44,6 +44,21 @@ - * can get a callback on out of memory etc. ??? - * - */ -+#ifdef UNIX -+# define A1LOG_LOCK(log, deb) \ -+ if (g_log_init == 0) { \ -+ pthread_mutex_init(&log->lock, NULL); \ -+ pthread_mutex_lock(&log->lock); \ -+ g_log_init = 1; \ -+ } else { \ -+ pthread_mutex_lock(&log->lock); \ -+ } \ -+ if (deb && !g_deb_init) { \ -+ va_loge(log, "Argyll 'V%s' Build '%s' System '%s'\n",ARGYLL_VERSION_STR,ARGYLL_BUILD_STR, get_sys_info()); \ -+ g_deb_init = 1; \ -+ } -+# define A1LOG_UNLOCK(log) pthread_mutex_unlock(&log->lock) -+#endif - - /* Globals */ - -@@ -356,19 +371,6 @@ static char *get_sys_info() { - return sysinfo; - } - --# define A1LOG_LOCK(log, deb) \ -- if (g_log_init == 0) { \ -- pthread_mutex_init(&log->lock, NULL); \ -- pthread_mutex_lock(&log->lock); \ -- g_log_init = 1; \ -- } else { \ -- pthread_mutex_lock(&log->lock); \ -- } \ -- if (deb && !g_deb_init) { \ -- va_loge(log, "Argyll 'V%s' Build '%s' System '%s'\n",ARGYLL_VERSION_STR,ARGYLL_BUILD_STR, get_sys_info()); \ -- g_deb_init = 1; \ -- } --# define A1LOG_UNLOCK(log) pthread_mutex_unlock(&log->lock) - #endif - - -diff --git a/xml/mxml-attr.c b/xml/mxml-attr.c -index 53f8076..ed755ea 100755 ---- a/xml/mxml-attr.c -+++ b/xml/mxml-attr.c -@@ -29,6 +29,8 @@ - #include "mxml-config.h" - #include "mxml.h" - -+#include <stdarg.h> -+ - - /* - * Local functions... -diff --git a/xml/mxml-node.c b/xml/mxml-node.c -index bebda10..be76335 100755 ---- a/xml/mxml-node.c -+++ b/xml/mxml-node.c -@@ -40,6 +40,7 @@ - #include "mxml-config.h" - #include "mxml.h" - -+#include <stdarg.h> - - /* - * Local functions... -diff --git a/xml/mxml-private.c b/xml/mxml-private.c -index 72f3e23..4d77156 100755 ---- a/xml/mxml-private.c -+++ b/xml/mxml-private.c -@@ -28,6 +28,7 @@ - - #include "mxml-private.h" - -+#include <stdarg.h> - - /* - * Some crazy people think that unloading a shared object is a good or safe --- -2.12.0 - diff --git a/graphics/argyllcms/DETAILS b/graphics/argyllcms/DETAILS index 5e58274e2f..2b7174dd60 100755 --- a/graphics/argyllcms/DETAILS +++ b/graphics/argyllcms/DETAILS @@ -1,8 +1,8 @@ SPELL=argyllcms - VERSION=1.9.2 + VERSION=2.1.1 SOURCE="Argyll_V${VERSION}_src.zip" SOURCE_URL[0]=http://www.${SPELL}.com/${SOURCE} - SOURCE_HASH=sha512:f21fc2385b643dd6c32d1b1b0ab208a79ad8bc4319ac644d96e69ebc4c4e333d38b41e4516742816da9a91145e4f00bffb7f8b61a827859d5e14c1a8867b5a41 + SOURCE_HASH=sha512:551b90c245d15e401c96c76ec0be66053bd75ca4d8b668a41841d72197820ed27d4d0186f903c126f7bacd667170e8e45e42ad31fcd44ec3276558b87b520565 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Argyll_V${VERSION}" WEB_SITE="http://www.argyllcms.com/" LICENSE[0]=GPL diff --git a/graphics/argyllcms/HISTORY b/graphics/argyllcms/HISTORY index f9c779734f..0a64b6ef3d 100644 --- a/graphics/argyllcms/HISTORY +++ b/graphics/argyllcms/HISTORY @@ -1,3 +1,8 @@ +2019-06-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 2.1.1 + * PRE_BUILD, 0001-fix-compilation-with-gcc-7.patch, + argyllcms-1.8.0-gcc5.patch: remove obsolete patches + 2017-06-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 1.9.2 * 0001-fix-compilation-with-gcc-7.patch, PRE_BUILD: fix compilation with gcc 7 diff --git a/graphics/argyllcms/PRE_BUILD b/graphics/argyllcms/PRE_BUILD index 95cf7d1755..92676b2409 100755 --- a/graphics/argyllcms/PRE_BUILD +++ b/graphics/argyllcms/PRE_BUILD @@ -1,11 +1,6 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && -patch -p1 < "$SPELL_DIRECTORY/argyllcms-1.8.0-gcc5.patch" && -patch -p1 < "$SPELL_DIRECTORY/0001-fix-compilation-with-gcc-7.patch" && - - - echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop && echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop && sed \ diff --git a/graphics/argyllcms/argyllcms-1.8.0-gcc5.patch b/graphics/argyllcms/argyllcms-1.8.0-gcc5.patch deleted file mode 100644 index 28067455c3..0000000000 --- a/graphics/argyllcms/argyllcms-1.8.0-gcc5.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Fix FTBFS with GCC 5 -Author: James Cowgill <james410@cowgill.org.uk> -Bug-Debian: https://bugs.debian.org/777779 -Forwarded: no ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/icc/icc.h -+++ b/icc/icc.h -@@ -100,7 +100,11 @@ - #define CF64PREC "LL" /* Constant precision specifier */ - - #ifndef ATTRIBUTE_NORETURN -+#ifdef _MSC_VER - # define ATTRIBUTE_NORETURN __declspec(noreturn) -+#else -+# define ATTRIBUTE_NORETURN __attribute__((noreturn)) -+#endif - #endif - - #else /* !__STDC_VERSION__ */ |