summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Thomas Anderson <tanderson@caltech.edu> 2015-03-29 14:39:10 -0700
committerAvatar Thomas Anderson <tanderson@caltech.edu> 2015-03-29 14:39:10 -0700
commit40a54939f8097d11f344d4788605c7541eb55732 (patch)
tree463043f8492a19efcd2ee58c9effd7d536232fe9
parent640135f407479713e4817ed4510137dbdb429f80 (diff)
downloadenlightenment-40a54939f8097d11f344d4788605c7541eb55732.tar.gz
enlightenment-40a54939f8097d11f344d4788605c7541eb55732.tar.xz
evas_generic_loaders: bump to 1.13.0
-rw-r--r--packages/enlightenment-platform/evas_generic_loaders/evas_generic_loaders-1.13.0.exheres-0 (renamed from packages/enlightenment-platform/evas_generic_loaders/evas_generic_loaders-1.12.0.exheres-0)4
-rw-r--r--packages/enlightenment-platform/evas_generic_loaders/files/evas_generic_loaders-1.13.0-poppler-compat.patch91
2 files changed, 94 insertions, 1 deletions
diff --git a/packages/enlightenment-platform/evas_generic_loaders/evas_generic_loaders-1.12.0.exheres-0 b/packages/enlightenment-platform/evas_generic_loaders/evas_generic_loaders-1.13.0.exheres-0
index c0d12c8..9a4b3e3 100644
--- a/packages/enlightenment-platform/evas_generic_loaders/evas_generic_loaders-1.12.0.exheres-0
+++ b/packages/enlightenment-platform/evas_generic_loaders/evas_generic_loaders-1.13.0.exheres-0
@@ -1,7 +1,7 @@
# Copyright 2014 Thomas G. Anderson
# Distributed under the terms of the GNU General Public License v2
-require enlightenment
+require enlightenment autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.14 1.13 ] ]
SUMMARY="Extra loaders for GPL loaders and unstable libraries."
@@ -28,6 +28,8 @@ DEPENDENCIES="
x11-libs/cairo[>=1.0.0] )
"
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-poppler-compat.patch )
+
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES+=(
'gstreamer'
'libraw'
diff --git a/packages/enlightenment-platform/evas_generic_loaders/files/evas_generic_loaders-1.13.0-poppler-compat.patch b/packages/enlightenment-platform/evas_generic_loaders/files/evas_generic_loaders-1.13.0-poppler-compat.patch
new file mode 100644
index 0000000..55061d1
--- /dev/null
+++ b/packages/enlightenment-platform/evas_generic_loaders/files/evas_generic_loaders-1.13.0-poppler-compat.patch
@@ -0,0 +1,91 @@
+From 1e1a1e6fffc1805aadf75467e72af71391636075 Mon Sep 17 00:00:00 2001
+From: Stefan Schmidt <s.schmidt@samsung.com>
+Date: Fri, 6 Mar 2015 10:44:50 +0100
+Subject: [PATCH] pdf: Add support for changes with poppler >= 0.31
+
+With 0.31 poppler removed some parts of GlobalParams
+which they do not consider a public API. The antialias
+setting can now be done over the output device.
+
+Fixes T2184
+@fix
+---
+ configure.ac | 14 ++++++++++++--
+ src/bin/pdf/main.cpp | 10 ++++++++--
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7e13584..1079c6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -73,15 +73,25 @@ if test "x${want_poppler}" = "xyes" ; then
+ [have_poppler="no"])
+
+ if test "x${have_poppler}" = "xno" ; then
+- PKG_CHECK_EXISTS([poppler >= 0.20],
++ PKG_CHECK_EXISTS([poppler >= 0.20 poppler < 0.31],
+ [
+- poppler_pc="poppler >= 0.20"
++ poppler_pc="poppler >= 0.20 poppler < 0.31"
+ AC_DEFINE(HAVE_POPPLER_020, 1, [Have poppler 0.20])
+ have_poppler="yes"
+ ],
+ [have_poppler="no"])
+ fi
+
++ if test "x${have_poppler}" = "xno" ; then
++ PKG_CHECK_EXISTS([poppler >= 0.31],
++ [
++ poppler_pc="poppler >= 0.31"
++ AC_DEFINE(HAVE_POPPLER_031, 1, [Have poppler 0.31])
++ have_poppler="yes"
++ ],
++ [have_poppler="no"])
++ fi
++
+ if test "x${have_poppler}" = "xyes" ; then
+ PKG_CHECK_MODULES([POPPLER], [${poppler_pc}],
+ [have_poppler="yes"],
+diff --git a/src/bin/pdf/main.cpp b/src/bin/pdf/main.cpp
+index a68b21f..78f918e 100644
+--- a/src/bin/pdf/main.cpp
++++ b/src/bin/pdf/main.cpp
+@@ -62,10 +62,12 @@ Eina_Bool poppler_init(const char *file, int page_nbr, int size_w, int size_h)
+ if (!eina_init())
+ goto del_global_param;
+
++#ifndef HAVE_POPPLER_031
+ if (globalParams->getAntialias())
+ globalParams->setAntialias((char *)"yes");
+ if (globalParams->getVectorAntialias())
+ globalParams->setVectorAntialias((char *)"yes");
++#endif
+
+ pdfdoc = new PDFDoc(new GooString(file), NULL);
+ if (!pdfdoc)
+@@ -161,7 +163,7 @@ void poppler_load_image(int size_w, int size_h)
+ if (!output_dev)
+ return;
+
+-#ifdef HAVE_POPPLER_020
++#if defined(HAVE_POPPLER_020) || defined(HAVE_POPPLER_031)
+ output_dev->startDoc(pdfdoc);
+ #else
+ output_dev->startDoc(pdfdoc->getXRef());
+@@ -169,8 +171,12 @@ void poppler_load_image(int size_w, int size_h)
+
+ if (dpi <= 0.0) dpi = DEF_DPI;
+
++#ifdef HAVE_POPPLER_031
++ output_dev->setFontAntialias(EINA_TRUE);
++ output_dev->setVectorAntialias(EINA_TRUE);
++#endif
+
+-#ifdef HAVE_POPPLER_020
++#if defined(HAVE_POPPLER_020) || defined(HAVE_POPPLER_031)
+ page->displaySlice(output_dev, dpi, dpi,
+ 0, false, false,
+ 0, 0, width, height,
+--
+2.3.1
+