lcms2: Add LRN's patches for comatibility with libjpeg-turbo.

This commit is contained in:
Alexpux
2014-12-11 11:28:47 +03:00
parent 685aeb5b9f
commit 65eadb4ba0
4 changed files with 85 additions and 3 deletions

View File

@@ -0,0 +1,11 @@
--- lcms2-2.4/testbed/testcms2.c.orig 2013-04-04 11:44:04 +0400
+++ lcms2-2.4/testbed/testcms2.c 2013-04-04 11:47:22 +0400
@@ -33,6 +33,8 @@
// On Visual Studio, use debug CRT
#ifdef _MSC_VER
# include "crtdbg.h"
+#endif
+#if defined (_WIN32)
# include <io.h>
#endif

View File

@@ -0,0 +1,11 @@
--- lcms2-2.5/configure.ac.orig 2013-06-27 16:01:28.000000000 +0000
+++ lcms2-2.5/configure.ac 2013-07-28 06:17:38.507957900 +0000
@@ -122,7 +122,7 @@
passed=0;
AC_CHECK_HEADER(jconfig.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
AC_CHECK_HEADER(jerror.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_HEADER(jmorecfg.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+ AC_CHECK_HEADER(jmorecfg.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[#include <jconfig.h>])
AC_CHECK_HEADER(jpeglib.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
AC_CHECK_LIB(jpeg,jpeg_read_header,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)

View File

@@ -0,0 +1,45 @@
diff -ru lcms2-2.5/utils/linkicc/Makefile.am lcms2-2.5.new/utils/linkicc/Makefile.am
--- lcms2-2.5/utils/linkicc/Makefile.am 2013-06-27 16:01:28.000000000 +0000
+++ lcms2-2.5.new/utils/linkicc/Makefile.am 2013-07-28 06:35:22.305043000 +0000
@@ -14,6 +14,6 @@
linkicc_LDADD = $(top_builddir)/src/liblcms2.la
linkicc_LDFLAGS = @LDFLAGS@
linkicc_SOURCES = linkicc.c ../common/xgetopt.c ../common/vprf.c ../common/utils.h
-linkicc_MANS = linkicc.1
+man_MANS = linkicc.1
EXTRA_DIST = $(man_MANS)
Only in lcms2-2.5.new/utils/linkicc: Makefile.am.orig
diff -ru lcms2-2.5/utils/psicc/Makefile.am lcms2-2.5.new/utils/psicc/Makefile.am
--- lcms2-2.5/utils/psicc/Makefile.am 2013-06-27 16:01:28.000000000 +0000
+++ lcms2-2.5.new/utils/psicc/Makefile.am 2013-07-28 06:35:34.624607400 +0000
@@ -14,6 +14,6 @@
psicc_LDADD = $(top_builddir)/src/liblcms2.la
psicc_LDFLAGS = @LDFLAGS@
psicc_SOURCES = psicc.c ../common/xgetopt.c ../common/vprf.c ../common/utils.h
-psicc_MANS = psicc.1
+man_MANS = psicc.1
EXTRA_DIST = $(man_MANS)
diff -ru lcms2-2.5/utils/samples/Makefile.am lcms2-2.5.new/utils/samples/Makefile.am
--- lcms2-2.5/utils/samples/Makefile.am 2013-06-27 16:01:28.000000000 +0000
+++ lcms2-2.5.new/utils/samples/Makefile.am 2013-07-28 06:35:46.745146500 +0000
@@ -14,6 +14,6 @@
wtpt_LDADD = $(top_builddir)/src/liblcms2.la
wtpt_LDFLAGS = @LDFLAGS@
wtpt_SOURCES = wtpt.c ../common/xgetopt.c ../common/vprf.c ../common/utils.h
-wtpt_MANS = wtpt.1
+man_MANS = wtpt.1
EXTRA_DIST = $(man_MANS) roundtrip.c mktiff8.c mkgrayer.c mkcmy.c itufax.c
diff -ru lcms2-2.5/utils/transicc/Makefile.am lcms2-2.5.new/utils/transicc/Makefile.am
--- lcms2-2.5/utils/transicc/Makefile.am 2013-06-27 16:01:28.000000000 +0000
+++ lcms2-2.5.new/utils/transicc/Makefile.am 2013-07-28 06:35:57.328990500 +0000
@@ -14,6 +14,6 @@
transicc_LDADD = $(top_builddir)/src/liblcms2.la
transicc_LDFLAGS = @LDFLAGS@
transicc_SOURCES = transicc.c ../common/xgetopt.c ../common/vprf.c ../common/utils.h
-transicc_MANS = transicc.1
+man_MANS = transicc.1
EXTRA_DIST = $(man_MANS)

View File

@@ -3,7 +3,7 @@
_realname=lcms2
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.6
pkgrel=2
pkgrel=3
pkgdesc="Small-footprint color management engine, version 2 (mingw-w64)"
arch=(any)
url="http://www.littlecms.com"
@@ -11,8 +11,23 @@ license=("MIT")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config")
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libtiff")
options=('staticlibs' 'strip')
source=("http://downloads.sourceforge.net/sourceforge/lcms/lcms2-${pkgver}.tar.gz")
md5sums=('f4c08d38ceade4a664ebff7228910a33')
source=("http://downloads.sourceforge.net/sourceforge/lcms/lcms2-${pkgver}.tar.gz"
0001-fix-testcmd2.mingw.patch
0002-need-jconfig-before-jmoreconfig.mingw.patch
0003-install-mans.all.patch)
md5sums=('f4c08d38ceade4a664ebff7228910a33'
'495c11d0c18cd754acaf19740028a919'
'4017f8307298d6f65e1cb5bce9684fa5'
'847c756913571406528a30807374b5a7')
prepare() {
cd ${_realname}-$pkgver
patch -p1 -i ${srcdir}/0001-fix-testcmd2.mingw.patch
patch -p1 -i ${srcdir}/0002-need-jconfig-before-jmoreconfig.mingw.patch
patch -p1 -i ${srcdir}/0003-install-mans.all.patch
autoreconf -fiv
}
build() {
cd "$srcdir/${_realname}-$pkgver"