Gentoo Archives: gentoo-commits

From: "Thomas Kahle (tomka)" <tomka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/leptonica/files: leptonica-1.71-openjpeg-2.0.patch
Date: Wed, 30 Jul 2014 07:13:17
Message-Id: 20140730071311.676D020035@flycatcher.gentoo.org
1 tomka 14/07/30 07:13:09
2
3 Added: leptonica-1.71-openjpeg-2.0.patch
4 Log:
5 Add compatibility with openjpeg-2.0 (bug #518540)
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 565C32BC)
8
9 Revision Changes Path
10 1.1 media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch?rev=1.1&content-type=text/plain
14
15 Index: leptonica-1.71-openjpeg-2.0.patch
16 ===================================================================
17 Better use `pkg-config --cflags libopenjp2`
18
19 Michael Weber, xmw@g.o
20
21 --- leptonica-1.71/src/libversions.c
22 +++ leptonica-1.71/src/libversions.c
23 @@ -69,7 +69,7 @@
24 #endif
25
26 #if HAVE_LIBJP2K /* assuming it's 2.1 */
27 -#include "openjpeg-2.1/openjpeg.h"
28 +#include "openjpeg-2.0/openjpeg.h"
29 #endif
30
31 #define stringJoinInPlace(s1, s2) \
32 --- leptonica-1.71/src/jp2kio.c
33 +++ leptonica-1.71/src/jp2kio.c
34 @@ -108,7 +108,7 @@
35
36 /* Leptonica supports both 2.0 and 2.1. If you have 2.0,
37 * change MINOR to 0. */
38 -#define MINOR 1
39 +#define MINOR 0
40
41 #if MINOR == 0
42 static const l_int32 OpjMinor = 0;