[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-431-gf4b74c5
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-431-gf4b74c5
|
From: jscheer <js...@us...> - 2013-09-03 09:47:38
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f4b74c5748a66f20921b8446dc821452b0cda88d (commit)
from 727b2d871b9bb1247de973de544f22143116e8c5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f4b74c5748a66f20921b8446dc821452b0cda88d
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Sep 3 11:47:08 2013 +0200
[BUILDROOT] Add package Poppler for Qt.
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/208-poppler-add_package.patch | 106 ++++++++++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
.../2013.05/210-poppler-qt_compiling.patch | 38 +++++++
3 files changed, 145 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/208-poppler-add_package.patch
create mode 100644 patches/buildroot/2013.05/210-poppler-qt_compiling.patch
diff --git a/patches/buildroot/2012.02/208-poppler-add_package.patch b/patches/buildroot/2012.02/208-poppler-add_package.patch
new file mode 100644
index 0000000..cd04d28
--- /dev/null
+++ b/patches/buildroot/2012.02/208-poppler-add_package.patch
@@ -0,0 +1,106 @@
+Add package Poppler.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+---
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2013-09-03 11:27:09.000000000 +0200
++++ buildroot/package/Config.in 2013-09-03 11:27:09.000000000 +0200
+@@ -352,6 +352,7 @@
+ source "package/opencv/Config.in"
+ source "package/pango/Config.in"
+ source "package/pixman/Config.in"
++source "package/poppler/Config.in"
+ source "package/tiff/Config.in"
+ source "package/webkit/Config.in"
+ endmenu
+Index: buildroot/package/poppler/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/poppler/Config.in 2013-09-03 11:27:09.000000000 +0200
+@@ -0,0 +1,14 @@
++config BR2_PACKAGE_POPPLER
++ bool "poppler"
++ depends on BR2_INSTALL_LIBSTDCPP
++ select BR2_PACKAGE_QT
++ select BR2_PACKAGE_FONTCONFIG
++ select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
++ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
++ help
++ Poppler is a PDF rendering library based on the xpdf-3.0 code base.
++
++ http://poppler.freedesktop.org/
++
++comment "poppler requires a toolchain with C++ support enabled"
++ depends on !BR2_INSTALL_LIBSTDCPP
+Index: buildroot/package/poppler/poppler.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/poppler/poppler.mk 2013-09-03 11:29:00.000000000 +0200
+@@ -0,0 +1,65 @@
++#############################################################
++#
++# poppler
++#
++#############################################################
++
++POPPLER_VERSION = 0.24.1
++POPPLER_SITE = http://poppler.freedesktop.org
++POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
++POPPLER_DEPENDENCIES = qt fontconfig
++POPPLER_LICENSE = GPLv2+
++POPPLER_LICENSE_FILES = COPYING
++POPPLER_CONF_OPT = --with-font-configuration=fontconfig
++POPPLER_INSTALL_STAGING = YES
++
++ifeq ($(BR2_PACKAGE_LCMS2),y)
++ POPPLER_CONF_OPT += --enable-cms=lcms2
++ POPPLER_DEPENDENCIES += lcms2
++else
++ POPPLER_CONF_OPT += --enable-cms=none
++endif
++
++ifeq ($(BR2_PACKAGE_TIFF),y)
++ POPPLER_CONF_OPT += --enable-libtiff
++ POPPLER_DEPENDENCIES += tiff
++else
++ POPPLER_CONF_OPT += --disable-libtiff
++endif
++
++ifeq ($(BR2_PACKAGE_JPEG),y)
++ POPPLER_CONF_OPT += --enable-libjpeg
++ POPPLER_DEPENDENCIES += jpeg
++else
++ POPPLER_CONF_OPT += --disable-libjpeg
++endif
++
++ifeq ($(BR2_PACKAGE_LIBPNG),y)
++ POPPLER_CONF_OPT += --enable-libpng
++ POPPLER_DEPENDENCIES += libpng
++else
++ POPPLER_CONF_OPT += --disable-libpng
++endif
++
++ifeq ($(BR2_PACKAGE_ZLIB),y)
++ POPPLER_CONF_OPT += --enable-zlib
++ POPPLER_DEPENDENCIES += zlib
++else
++ POPPLER_CONF_OPT += --disable-zlib
++endif
++
++ifeq ($(BR2_PACKAGE_POPPLER_LIBCURL),y)
++ POPPLER_CONF_OPT += --enable-libcurl
++ POPPLER_DEPENDENCIES += libcurl
++else
++ POPPLER_CONF_OPT += --disable-libcurl
++endif
++
++ifeq ($(BR2_PACKAGE_XORG7),y)
++ POPPLER_CONF_OPT += --with-x
++ POPPLER_DEPENDENCIES += xlib_libX11 xlib_libXext
++else
++ POPPLER_CONF_OPT += --without-x
++endif
++
++$(eval $(call AUTOTARGETS, package, popple))
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index f386fa4..75150de 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -88,3 +88,4 @@ rm -rf buildroot/package/opkg/
rm -rf buildroot/package/minicom/
rm -rf buildroot/package/joe/
rm -f buildroot/package/busybox/busybox-1.19.4/*.patch
+rm -rf buildroot/package/poppler
diff --git a/patches/buildroot/2013.05/210-poppler-qt_compiling.patch b/patches/buildroot/2013.05/210-poppler-qt_compiling.patch
new file mode 100644
index 0000000..8a12729
--- /dev/null
+++ b/patches/buildroot/2013.05/210-poppler-qt_compiling.patch
@@ -0,0 +1,38 @@
+Compile Poppler with Qt.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+---
+
+Index: buildroot/package/poppler/Config.in
+===================================================================
+--- buildroot.orig/package/poppler/Config.in 2013-05-31 22:29:04.000000000 +0200
++++ buildroot/package/poppler/Config.in 2013-09-03 11:36:33.000000000 +0200
+@@ -1,6 +1,7 @@
+ config BR2_PACKAGE_POPPLER
+ bool "poppler"
+ depends on BR2_INSTALL_LIBSTDCPP
++ select BR2_PACKAGE_QT
+ select BR2_PACKAGE_FONTCONFIG
+ select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+Index: buildroot/package/poppler/poppler.mk
+===================================================================
+--- buildroot.orig/package/poppler/poppler.mk 2013-09-03 11:28:33.000000000 +0200
++++ buildroot/package/poppler/poppler.mk 2013-09-03 11:36:51.000000000 +0200
+@@ -4,12 +4,14 @@
+ #
+ #############################################################
+
+-POPPLER_VERSION = 0.22.3
++POPPLER_VERSION = 0.24.1
+ POPPLER_SITE = http://poppler.freedesktop.org
+-POPPLER_DEPENDENCIES = fontconfig
++POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
++POPPLER_DEPENDENCIES = qt fontconfig
+ POPPLER_LICENSE = GPLv2+
+ POPPLER_LICENSE_FILES = COPYING
+ POPPLER_CONF_OPT = --with-font-configuration=fontconfig
++POPPLER_INSTALL_STAGING = YES
+
+ ifeq ($(BR2_PACKAGE_LCMS2),y)
+ POPPLER_CONF_OPT += --enable-cms=lcms2
hooks/post-receive
--
armadeus
|
