* [gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-0.32.0.ebuild poppler-9999.ebuild ChangeLog
@ 2015-03-20 15:18 Andreas HAttel (dilfridge)
0 siblings, 0 replies; only message in thread
From: Andreas HAttel (dilfridge) @ 2015-03-20 15:18 UTC (permalink / raw
To: gentoo-commits
dilfridge 15/03/20 15:18:23
Modified: poppler-0.32.0.ebuild poppler-9999.ebuild ChangeLog
Log:
Correctly build against libopenjpeg-1 (for now), bug 538282
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
Revision Changes Path
1.2 app-text/poppler/poppler-0.32.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.32.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.32.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.32.0.ebuild?r1=1.1&r2=1.2
Index: poppler-0.32.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.32.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- poppler-0.32.0.ebuild 13 Mar 2015 22:59:46 -0000 1.1
+++ poppler-0.32.0.ebuild 20 Mar 2015 15:18:23 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.32.0.ebuild,v 1.1 2015/03/13 22:59:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.32.0.ebuild,v 1.2 2015/03/20 15:18:23 dilfridge Exp $
EAPI=5
@@ -76,7 +76,6 @@
-DENABLE_XPDF_HEADERS=ON
$(cmake-utils_use_enable curl LIBCURL)
$(cmake-utils_use_enable cxx CPP)
- $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
$(cmake-utils_use_enable utils)
$(cmake-utils_use_with cairo)
$(cmake-utils_use_with introspection GObjectIntrospection)
@@ -86,6 +85,11 @@
$(cmake-utils_use_find_package qt5 Qt5Core)
$(cmake-utils_use_with tiff)
)
+ if use jpeg2k; then
+ mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg1)
+ else
+ mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+ fi
if use lcms; then
mycmakeargs+=(-DENABLE_CMS=lcms2)
else
1.5 app-text/poppler/poppler-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-9999.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-9999.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-9999.ebuild?r1=1.4&r2=1.5
Index: poppler-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- poppler-9999.ebuild 3 Dec 2014 20:57:38 -0000 1.4
+++ poppler-9999.ebuild 20 Mar 2015 15:18:23 -0000 1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.4 2014/12/03 20:57:38 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.5 2015/03/20 15:18:23 dilfridge Exp $
EAPI=5
@@ -75,7 +75,6 @@
-DENABLE_XPDF_HEADERS=ON
$(cmake-utils_use_enable curl LIBCURL)
$(cmake-utils_use_enable cxx CPP)
- $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
$(cmake-utils_use_enable utils)
$(cmake-utils_use_with cairo)
$(cmake-utils_use_with introspection GObjectIntrospection)
@@ -85,6 +84,11 @@
$(cmake-utils_use_find_package qt5 Qt5Core)
$(cmake-utils_use_with tiff)
)
+ if use jpeg2k; then
+ mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg1)
+ else
+ mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+ fi
if use lcms; then
mycmakeargs+=(-DENABLE_CMS=lcms2)
else
1.446 app-text/poppler/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.446&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.446&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.445&r2=1.446
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- ChangeLog 13 Mar 2015 22:59:46 -0000 1.445
+++ ChangeLog 20 Mar 2015 15:18:23 -0000 1.446
@@ -1,6 +1,10 @@
# ChangeLog for app-text/poppler
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.445 2015/03/13 22:59:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.446 2015/03/20 15:18:23 dilfridge Exp $
+
+ 20 Mar 2015; Andreas K. Huettel <dilfridge@gentoo.org> poppler-0.32.0.ebuild,
+ poppler-9999.ebuild:
+ Correctly build against libopenjpeg-1 (for now), bug 538282
*poppler-0.32.0 (13 Mar 2015)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-03-20 15:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-20 15:18 [gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-0.32.0.ebuild poppler-9999.ebuild ChangeLog Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox