rpms/xsane
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix lcms2 patch

Browse Source
This commit is contained in:
Nils Philippsen 2013-09-23 16:17:26 +02:00
parent d13060f9fe
commit e92b2b861f
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1,3 +1,3 @@
bd62603e67d7472b93cee42f57ae14b8 xsane-256x256.png bd62603e67d7472b93cee42f57ae14b8 xsane-256x256.png
9927f21e1ab6ba96315e7f0e30746deb xsane-0.999.tar.gz 9927f21e1ab6ba96315e7f0e30746deb xsane-0.999.tar.gz
a6e5b3d9faa6ab53ee2509f6a673cf0e xsane-0.999-7-autoconf.patch.bz2 546080267e72a0e4fa2e4e9a61de64cd xsane-0.999-7-autoconf.patch.bz2

30
xsane-0.999-lcms2.patch
View File

@ -1,52 +1,48 @@
From 056fce58bb3ec706c7199531ac523256dc491cf3 Mon Sep 17 00:00:00 2001 From 30af0e2edbf061b71bed9536d826894449f0390d Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com> From: Nils Philippsen <nils@redhat.com>
Date: Mon, 23 Sep 2013 14:59:41 +0200 Date: Mon, 23 Sep 2013 16:11:31 +0200
Subject: [PATCH] patch: lcms2 Subject: [PATCH] patch: lcms2
Squashed commit of the following: Squashed commit of the following:
commit 7400fe13858cc5e1ce224d95948aa633e629d017 commit f975accf7e1a08438b63580ea848457d373200f5
Author: Nils Philippsen <nils@redhat.com> Author: Nils Philippsen <nils@redhat.com>
Date: Mon Sep 23 14:53:45 2013 +0200 Date: Mon Sep 23 14:53:45 2013 +0200
Add support for lcms 2.x. Add support for lcms 2.x.
--- ---
configure.in | 25 +++++++++++++++++---- configure.in | 22 ++++++++++++++----
include/config.h.in | 8 ++++++- include/config.h.in | 8 ++++++-
src/xsane-preview.c | 6 +++-- src/xsane-preview.c | 6 +++--
src/xsane-save.c | 38 ++++++++++++++++++++++++++----- src/xsane-save.c | 38 ++++++++++++++++++++++++++-----
src/xsane-viewer.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++--- src/xsane-viewer.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++---
src/xsane.h | 8 ++++++- src/xsane.h | 8 ++++++-
6 files changed, 133 insertions(+), 17 deletions(-) 6 files changed, 130 insertions(+), 17 deletions(-)
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
index df7b114..01ef391 100644 index df7b114..3659c97 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -129,8 +129,21 @@ if test "${USE_TIFF}" = "yes"; then @@ -130,7 +130,17 @@ if test "${USE_TIFF}" = "yes"; then
AC_CHECK_LIB(tiff, TIFFOpen)
fi fi
+AC_DEFINE(HAVE_LIBLCMS, [], [Define if LCMS is to be used.])
+AC_DEFINE(HAVE_LIBLCMS1, [], [Define if you have liblcms.])
+AC_DEFINE(HAVE_LIBLCMS2, [], [Define if you have liblcms2.])
+
if test "${USE_LCMS}" = "yes"; then if test "${USE_LCMS}" = "yes"; then
- AC_CHECK_LIB(lcms, cmsOpenProfileFromFile) - AC_CHECK_LIB(lcms, cmsOpenProfileFromFile)
+ AC_SEARCH_LIBS(cmsOpenProfileFromFile, [lcms2 lcms]) + AC_SEARCH_LIBS(cmsOpenProfileFromFile, [lcms2 lcms])
+ if test "${ac_cv_search_cmsOpenProfileFromFile}" != "no"; then
+ AC_DEFINE(HAVE_LIBLCMS, 1, [Define if LCMS is to be used.])
+ fi
+ if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms2"; then + if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms2"; then
+ AC_DEFINE(HAVE_LIBLCMS) + AC_DEFINE(HAVE_LIBLCMS2, 1, [Define if you have liblcms2.])
+ AC_DEFINE(HAVE_LIBLCMS2)
+ else + else
+ if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms"; then + if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms"; then
+ AC_DEFINE(HAVE_LIBLCMS) + AC_DEFINE(HAVE_LIBLCMS1, 1, [Define if you have liblcms.])
+ AC_DEFINE(HAVE_LIBLCMS1)
+ fi + fi
+ fi + fi
fi fi
dnl Checks for library functions. dnl Checks for library functions.
@@ -294,10 +307,14 @@ else @@ -294,10 +304,14 @@ else
echo "* - PNG support deactivated *" echo "* - PNG support deactivated *"
fi fi