* [Buildroot] [PATCH 2/8] adwaita-icon-theme: install to staging
2016-10-13 1:13 [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0 Gustavo Zacarias
@ 2016-10-13 1:13 ` Gustavo Zacarias
2016-10-16 16:15 ` Thomas Petazzoni
2016-10-13 1:13 ` [Buildroot] [PATCH 3/8] poppler: add explicit cairo support Gustavo Zacarias
` (6 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Gustavo Zacarias @ 2016-10-13 1:13 UTC (permalink / raw)
To: buildroot
This is required for the upcoming evince package.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/adwaita-icon-theme/adwaita-icon-theme.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/adwaita-icon-theme/adwaita-icon-theme.mk b/package/adwaita-icon-theme/adwaita-icon-theme.mk
index b9ec0c0..fdf66c8 100644
--- a/package/adwaita-icon-theme/adwaita-icon-theme.mk
+++ b/package/adwaita-icon-theme/adwaita-icon-theme.mk
@@ -8,6 +8,7 @@ ADWAITA_ICON_THEME_VERSION_MAJOR = 3.22
ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0
ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR)
ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz
+ADWAITA_ICON_THEME_INSTALL_STAGING = YES
ADWAITA_ICON_THEME_LICENSE = LGPLv3 or CC-BY-SA-3.0
ADWAITA_ICON_THEME_LICENSE_FILES = COPYING COPYING_LGPL COPYING_CCBYSA3
ADWAITA_ICON_THEME_DEPENDENCIES = host-intltool host-libgtk3
--
2.7.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 2/8] adwaita-icon-theme: install to staging
2016-10-13 1:13 ` [Buildroot] [PATCH 2/8] adwaita-icon-theme: install to staging Gustavo Zacarias
@ 2016-10-16 16:15 ` Thomas Petazzoni
2016-10-17 10:08 ` Gustavo Zacarias
0 siblings, 1 reply; 19+ messages in thread
From: Thomas Petazzoni @ 2016-10-16 16:15 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 12 Oct 2016 22:13:53 -0300, Gustavo Zacarias wrote:
> This is required for the upcoming evince package.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/adwaita-icon-theme/adwaita-icon-theme.mk | 1 +
> 1 file changed, 1 insertion(+)
It feels a bit odd that evince needs icons in the staging directory.
Could you improve the commit message a bit to explain why this is
needed?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH 2/8] adwaita-icon-theme: install to staging
2016-10-16 16:15 ` Thomas Petazzoni
@ 2016-10-17 10:08 ` Gustavo Zacarias
2016-10-17 20:30 ` Arnout Vandecappelle
0 siblings, 1 reply; 19+ messages in thread
From: Gustavo Zacarias @ 2016-10-17 10:08 UTC (permalink / raw)
To: buildroot
On 16/10/16 13:15, Thomas Petazzoni wrote:
> Hello,
>
> On Wed, 12 Oct 2016 22:13:53 -0300, Gustavo Zacarias wrote:
>> This is required for the upcoming evince package.
>>
>> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>> ---
>> package/adwaita-icon-theme/adwaita-icon-theme.mk | 1 +
>> 1 file changed, 1 insertion(+)
>
> It feels a bit odd that evince needs icons in the staging directory.
> Could you improve the commit message a bit to explain why this is
> needed?
>
> Thanks!
>
> Thomas
Hi.
It's actually very simple, evince checks for adwaita icons via
pkgconfig, hence if they're not installed in staging they're not found.
Should i resend the series or just this one?
Regards.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH 2/8] adwaita-icon-theme: install to staging
2016-10-17 10:08 ` Gustavo Zacarias
@ 2016-10-17 20:30 ` Arnout Vandecappelle
0 siblings, 0 replies; 19+ messages in thread
From: Arnout Vandecappelle @ 2016-10-17 20:30 UTC (permalink / raw)
To: buildroot
On 17-10-16 12:08, Gustavo Zacarias wrote:
> On 16/10/16 13:15, Thomas Petazzoni wrote:
>
>> Hello,
>>
>> On Wed, 12 Oct 2016 22:13:53 -0300, Gustavo Zacarias wrote:
>>> This is required for the upcoming evince package.
>>>
>>> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>>> ---
>>> package/adwaita-icon-theme/adwaita-icon-theme.mk | 1 +
>>> 1 file changed, 1 insertion(+)
>>
>> It feels a bit odd that evince needs icons in the staging directory.
>> Could you improve the commit message a bit to explain why this is
>> needed?
>>
>> Thanks!
>>
>> Thomas
>
> Hi.
> It's actually very simple, evince checks for adwaita icons via pkgconfig, hence
> if they're not installed in staging they're not found.
I indeed thought something like that, but then I thought: why bother installing
everything to staging if only the .pc file is needed? However, it is staging, so
we don't really care how much crap is in there, and we do prefer to use the
upstream install commands. So OK for me.
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Should i resend the series or just this one?
Normally I'd say: the series. However, we're not going to accept
python-libxml2. The idea is to bite the bullet and add Config.in.host entries
for all host packages, so this type of problem can be properly resolved. We'll
do that gradually. Python and python3 would be good to start with - although
those are already pretty heavy, roughly 50 packages need to be updated to select
BR2_PACKAGE_HOST_PYTHON{,3}).
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH 3/8] poppler: add explicit cairo support
2016-10-13 1:13 [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0 Gustavo Zacarias
2016-10-13 1:13 ` [Buildroot] [PATCH 2/8] adwaita-icon-theme: install to staging Gustavo Zacarias
@ 2016-10-13 1:13 ` Gustavo Zacarias
2016-10-15 9:33 ` Peter Korsgaard
2016-10-13 1:13 ` [Buildroot] [PATCH 4/8] poppler: add explicit libglib2 support Gustavo Zacarias
` (5 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Gustavo Zacarias @ 2016-10-13 1:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/poppler/poppler.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index c6cd2eb..4632d8d 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -14,6 +14,13 @@ POPPLER_INSTALL_STAGING = YES
POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
--enable-xpdf-headers
+ifeq ($(BR2_PACKAGE_CAIRO),y)
+POPPLER_CONF_OPTS += --enable-cairo-output
+POPPLER_DEPENDENCIES += cairo
+else
+POPLER_CONF_OPTS += --disable-cairo-output
+endif
+
ifeq ($(BR2_PACKAGE_LCMS2),y)
POPPLER_CONF_OPTS += --enable-cms=lcms2
POPPLER_DEPENDENCIES += lcms2
--
2.7.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 4/8] poppler: add explicit libglib2 support
2016-10-13 1:13 [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0 Gustavo Zacarias
2016-10-13 1:13 ` [Buildroot] [PATCH 2/8] adwaita-icon-theme: install to staging Gustavo Zacarias
2016-10-13 1:13 ` [Buildroot] [PATCH 3/8] poppler: add explicit cairo support Gustavo Zacarias
@ 2016-10-13 1:13 ` Gustavo Zacarias
2016-10-15 9:34 ` Peter Korsgaard
2016-10-13 1:13 ` [Buildroot] [PATCH 5/8] poppler: bump to version 0.48.0 Gustavo Zacarias
` (4 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Gustavo Zacarias @ 2016-10-13 1:13 UTC (permalink / raw)
To: buildroot
Evince needs poppler-glib support (when poppler is enabled, for PDF
reading support), so add explicit handling to the package.
And poppler-glib requires cairo output, hence the conditional on both
libglib2 and cairo to enable it.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/poppler/poppler.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index 4632d8d..172c428 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -28,6 +28,13 @@ else
POPPLER_CONF_OPTS += --enable-cms=none
endif
+ifeq ($(BR2_PACKAGE_CAIRO)$(BR2_PACKAGE_LIBGLIB2),yy)
+POPPLER_CONF_OPTS += --enable-poppler-glib
+POPPLER_DEPENDENCIES += libglib2
+else
+POPPLER_CONF_OPTS += --disable-poppler-glib
+endif
+
ifeq ($(BR2_PACKAGE_TIFF),y)
POPPLER_CONF_OPTS += --enable-libtiff
# Help poppler to find libtiff in static linking scenarios
--
2.7.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 5/8] poppler: bump to version 0.48.0
2016-10-13 1:13 [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0 Gustavo Zacarias
` (2 preceding siblings ...)
2016-10-13 1:13 ` [Buildroot] [PATCH 4/8] poppler: add explicit libglib2 support Gustavo Zacarias
@ 2016-10-13 1:13 ` Gustavo Zacarias
2016-10-15 9:35 ` Peter Korsgaard
2016-10-13 1:13 ` [Buildroot] [PATCH 6/8] python-libxml2: new host package Gustavo Zacarias
` (3 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Gustavo Zacarias @ 2016-10-13 1:13 UTC (permalink / raw)
To: buildroot
Drop upstream patch.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
...invalid-shell-comparaison-in-libtiff-test.patch | 23 ----------------------
package/poppler/poppler.hash | 2 +-
package/poppler/poppler.mk | 2 +-
3 files changed, 2 insertions(+), 25 deletions(-)
delete mode 100644 package/poppler/0001-Fix-invalid-shell-comparaison-in-libtiff-test.patch
diff --git a/package/poppler/0001-Fix-invalid-shell-comparaison-in-libtiff-test.patch b/package/poppler/0001-Fix-invalid-shell-comparaison-in-libtiff-test.patch
deleted file mode 100644
index f40bee1..0000000
--- a/package/poppler/0001-Fix-invalid-shell-comparaison-in-libtiff-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix syntax issue in configure script
-
-The change is not done in configure.ac, because the package doesn't
-autoreconf properly.
-
-Patch on configure.ac submitted upstream at
-https://bugs.freedesktop.org/show_bug.cgi?id=90292.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/configure
-===================================================================
---- a/configure
-+++ b/configure
-@@ -19738,7 +19738,7 @@
- CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS"
- LIBS="$LIBS $LIBTIFF_LIBS"
- if test x$enable_libtiff = xyes; then
-- if test x"$LIBTIFF_LIBS" != ; then
-+ if test x"$LIBTIFF_LIBS" != x; then
- ac_fn_cxx_check_func "$LINENO" "TIFFOpen" "ac_cv_func_TIFFOpen"
- if test "x$ac_cv_func_TIFFOpen" = xyes; then :
-
diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash
index c4c7f66..533178f 100644
--- a/package/poppler/poppler.hash
+++ b/package/poppler/poppler.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 poppler-0.32.0.tar.xz
+sha256 85a003968074c85d8e13bf320ec47cef647b496b56dcff4c790b34e5482fef93 poppler-0.48.0.tar.xz
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index 172c428..202eac2 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -4,7 +4,7 @@
#
################################################################################
-POPPLER_VERSION = 0.32.0
+POPPLER_VERSION = 0.48.0
POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
POPPLER_SITE = http://poppler.freedesktop.org
POPPLER_DEPENDENCIES = fontconfig host-pkgconf
--
2.7.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 6/8] python-libxml2: new host package
2016-10-13 1:13 [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0 Gustavo Zacarias
` (3 preceding siblings ...)
2016-10-13 1:13 ` [Buildroot] [PATCH 5/8] poppler: bump to version 0.48.0 Gustavo Zacarias
@ 2016-10-13 1:13 ` Gustavo Zacarias
2016-10-28 13:32 ` Thomas Petazzoni
2016-10-13 1:13 ` [Buildroot] [PATCH 7/8] itstool: " Gustavo Zacarias
` (2 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Gustavo Zacarias @ 2016-10-13 1:13 UTC (permalink / raw)
To: buildroot
Add a new python-libxml2 package to build the libxml2 python bindings.
This is required for host-itstool which in turn is required to build
evince.
Unfortunately since we can't detect host-python/host-python3 presence to
enable it in the libxml2 package itself and leaving it to automatic
would be problematic just make a separate package for it like
mesa3d-headers to handle it deterministically.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
.../0001-setup.py-tweak-includes_dir.patch | 40 ++++++++++++++++++++++
package/python-libxml2/python-libxml2.hash | 1 +
package/python-libxml2/python-libxml2.mk | 21 ++++++++++++
3 files changed, 62 insertions(+)
create mode 100644 package/python-libxml2/0001-setup.py-tweak-includes_dir.patch
create mode 120000 package/python-libxml2/python-libxml2.hash
create mode 100644 package/python-libxml2/python-libxml2.mk
diff --git a/package/python-libxml2/0001-setup.py-tweak-includes_dir.patch b/package/python-libxml2/0001-setup.py-tweak-includes_dir.patch
new file mode 100644
index 0000000..85ca829
--- /dev/null
+++ b/package/python-libxml2/0001-setup.py-tweak-includes_dir.patch
@@ -0,0 +1,40 @@
+From b29e99d93cf8103f64c62bd9a4394e39df549c29 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Mon, 10 Oct 2016 19:58:35 -0300
+Subject: [PATCH] setup.py: tweak includes_dir
+
+Add a preprocessor variable @@INCLUDEDIR@@ so that the package makefile
+can replace it with the host include directory. And keep the absolute
+/usr/include directory as well for the iconv headers.
+
+This is completely unsuitable for target-variant package, but then that
+can be handled in the libxml2 package proper if anyone wants target
+libxml2 python bindings.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ python/setup.py | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/python/setup.py b/python/setup.py
+index c44269a..fd08c5c 100755
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -55,13 +55,7 @@ else:
+ # - libxml2/libxml/tree.h
+ # - iconv.h
+ # - libxslt/xsltconfig.h
+-includes_dir = [
+-"/usr/include",
+-"/usr/local/include",
+-"/opt/include",
+-os.path.join(ROOT,'include'),
+-HOME
+-];
++includes_dir = [ "@@INCLUDEDIR@@", "/usr/include" ];
+
+ xml_includes=""
+ for dir in includes_dir:
+--
+2.7.3
+
diff --git a/package/python-libxml2/python-libxml2.hash b/package/python-libxml2/python-libxml2.hash
new file mode 120000
index 0000000..d3ce9f8
--- /dev/null
+++ b/package/python-libxml2/python-libxml2.hash
@@ -0,0 +1 @@
+../libxml2/libxml2.hash
\ No newline at end of file
diff --git a/package/python-libxml2/python-libxml2.mk b/package/python-libxml2/python-libxml2.mk
new file mode 100644
index 0000000..631468b
--- /dev/null
+++ b/package/python-libxml2/python-libxml2.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# python-libxml2
+#
+################################################################################
+
+PYTHON_LIBXML2_VERSION = 2.9.4
+PYTHON_LIBXML2_SOURCE = libxml2-$(PYTHON_LIBXML2_VERSION).tar.gz
+PYTHON_LIBXML2_SITE = ftp://xmlsoft.org/libxml2
+PYTHON_LIBXML2_LICENSE = MIT
+PYTHON_LIBXML2_LICENSE_FILES = COPYING
+PYTHON_LIBXML2_SETUP_TYPE = setuptools
+PYTHON_LIBXML2_SUBDIR = python
+HOST_PYTHON_LIBXML2_DEPENDENCIES = host-libxml2
+
+define PYTHON_LIBXML2_SET_HOST_DIR
+ $(SED) "s,@@INCLUDEDIR@@,$(HOST_DIR)/usr/include," $(@D)/python/setup.py
+endef
+HOST_PYTHON_LIBXML2_PRE_CONFIGURE_HOOKS += PYTHON_LIBXML2_SET_HOST_DIR
+
+$(eval $(host-python-package))
--
2.7.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 6/8] python-libxml2: new host package
2016-10-13 1:13 ` [Buildroot] [PATCH 6/8] python-libxml2: new host package Gustavo Zacarias
@ 2016-10-28 13:32 ` Thomas Petazzoni
2016-10-28 13:42 ` Gustavo Zacarias
0 siblings, 1 reply; 19+ messages in thread
From: Thomas Petazzoni @ 2016-10-28 13:32 UTC (permalink / raw)
To: buildroot
Gustavo,
On Wed, 12 Oct 2016 22:13:57 -0300, Gustavo Zacarias wrote:
> Add a new python-libxml2 package to build the libxml2 python bindings.
>
> This is required for host-itstool which in turn is required to build
> evince.
>
> Unfortunately since we can't detect host-python/host-python3 presence to
> enable it in the libxml2 package itself and leaving it to automatic
> would be problematic just make a separate package for it like
> mesa3d-headers to handle it deterministically.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
We discussed this patch during the Developers meeting, and I believe
the general consensus is that we'd instead prefer to introduce hidden
Config.in knobs for host packages.
This is not only useful for this situation, but also for other
situations.
For this one, I see two possibilities:
* The python/python3 packages gain some hidden host Config.in options
BR2_PACKAGE_HOST_PYTHON(3). The host-libxml2 package then looks at
BR2_PACKAGE_HOST_PYTHON(3) and if enabled, then the python support
in host-libxml2 is enabled.
Drawback of this approach is that if we want to do it right, every
package that uses host-python(3) should start selecting this new
option.
* The libxml2 package gains a sub-option
BR2_PACKAGE_HOST_LIBXML2_PYTHON, which allows to enable python
support. Of course, later we could add BR2_PACKAGE_HOST_LIBXML2 as
well, and fix the packages that depend on host-libxml2, but it can
be done later.
Arnout, Peter, which of those two options do you prefer? Or maybe you
were thinking of different approaches?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH 6/8] python-libxml2: new host package
2016-10-28 13:32 ` Thomas Petazzoni
@ 2016-10-28 13:42 ` Gustavo Zacarias
2016-11-04 23:47 ` Arnout Vandecappelle
0 siblings, 1 reply; 19+ messages in thread
From: Gustavo Zacarias @ 2016-10-28 13:42 UTC (permalink / raw)
To: buildroot
On 28/10/16 10:32, Thomas Petazzoni wrote:
> We discussed this patch during the Developers meeting, and I believe
> the general consensus is that we'd instead prefer to introduce hidden
> Config.in knobs for host packages.
>
> This is not only useful for this situation, but also for other
> situations.
Hi. Let's see.
> For this one, I see two possibilities:
>
> * The python/python3 packages gain some hidden host Config.in options
> BR2_PACKAGE_HOST_PYTHON(3). The host-libxml2 package then looks at
> BR2_PACKAGE_HOST_PYTHON(3) and if enabled, then the python support
> in host-libxml2 is enabled.
>
> Drawback of this approach is that if we want to do it right, every
> package that uses host-python(3) should start selecting this new
> option.
For me this is the cleanest option, even though it will take a bit more
time to get it right.
> * The libxml2 package gains a sub-option
> BR2_PACKAGE_HOST_LIBXML2_PYTHON, which allows to enable python
> support. Of course, later we could add BR2_PACKAGE_HOST_LIBXML2 as
> well, and fix the packages that depend on host-libxml2, but it can
> be done later.
We currently have no BR2_PACKAGE_HOST_LIBXML2 option so we should add
that and make host-libxml2 depend on host-python when the python option
is enabled, and make packages select host-libxml2 as well (+ python for
host-itstool).
It's basically a half-way to achieving the first point, even though
quick i'm not a big fan.
I'm in no rush to include evince so waiting for 1 is fine with me, which
probably won't happen until the next cycle.
Regards.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH 6/8] python-libxml2: new host package
2016-10-28 13:42 ` Gustavo Zacarias
@ 2016-11-04 23:47 ` Arnout Vandecappelle
2016-11-05 10:29 ` Thomas Petazzoni
0 siblings, 1 reply; 19+ messages in thread
From: Arnout Vandecappelle @ 2016-11-04 23:47 UTC (permalink / raw)
To: buildroot
On 28-10-16 15:42, Gustavo Zacarias wrote:
> On 28/10/16 10:32, Thomas Petazzoni wrote:
>
>> We discussed this patch during the Developers meeting, and I believe
>> the general consensus is that we'd instead prefer to introduce hidden
>> Config.in knobs for host packages.
>>
>> This is not only useful for this situation, but also for other
>> situations.
>
> Hi. Let's see.
>
>> For this one, I see two possibilities:
>>
>> * The python/python3 packages gain some hidden host Config.in options
>> BR2_PACKAGE_HOST_PYTHON(3). The host-libxml2 package then looks at
>> BR2_PACKAGE_HOST_PYTHON(3) and if enabled, then the python support
>> in host-libxml2 is enabled.
>>
>> Drawback of this approach is that if we want to do it right, every
>> package that uses host-python(3) should start selecting this new
>> option.
>
> For me this is the cleanest option, even though it will take a bit more time to
> get it right.
It can be done gradually however. Add the symbol, select it from some packages
that are easy. The main difficulty is where a host package depends on
host-python - so a Config.in.host symbol has to be introduced there as well...
>> * The libxml2 package gains a sub-option
>> BR2_PACKAGE_HOST_LIBXML2_PYTHON, which allows to enable python
>> support. Of course, later we could add BR2_PACKAGE_HOST_LIBXML2 as
>> well, and fix the packages that depend on host-libxml2, but it can
>> be done later.
>
> We currently have no BR2_PACKAGE_HOST_LIBXML2 option so we should add that and
> make host-libxml2 depend on host-python when the python option is enabled, and
> make packages select host-libxml2 as well (+ python for host-itstool).
> It's basically a half-way to achieving the first point, even though quick i'm
> not a big fan.
I'm also no big fan. Especially because the first one is where we want to go
eventually, so this would really just be a stop-gap measure.
Regards,
Arnout
> I'm in no rush to include evince so waiting for 1 is fine with me, which
> probably won't happen until the next cycle.
> Regards.
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH 6/8] python-libxml2: new host package
2016-11-04 23:47 ` Arnout Vandecappelle
@ 2016-11-05 10:29 ` Thomas Petazzoni
0 siblings, 0 replies; 19+ messages in thread
From: Thomas Petazzoni @ 2016-11-05 10:29 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 5 Nov 2016 00:47:04 +0100, Arnout Vandecappelle wrote:
> >> * The libxml2 package gains a sub-option
> >> BR2_PACKAGE_HOST_LIBXML2_PYTHON, which allows to enable python
> >> support. Of course, later we could add BR2_PACKAGE_HOST_LIBXML2 as
> >> well, and fix the packages that depend on host-libxml2, but it can
> >> be done later.
> >
> > We currently have no BR2_PACKAGE_HOST_LIBXML2 option so we should add that and
> > make host-libxml2 depend on host-python when the python option is enabled, and
> > make packages select host-libxml2 as well (+ python for host-itstool).
> > It's basically a half-way to achieving the first point, even though quick i'm
> > not a big fan.
>
> I'm also no big fan. Especially because the first one is where we want to go
> eventually, so this would really just be a stop-gap measure.
Well, between option (1) and (2) that I proposed, it's the same debate
between "implicit dependencies" and "explicit dependencies", which we
already have for target packages:
- Option 1 is: the host-libxml2 package automatically enables its
Python binding if host-python is enabled.
- Option 2 is: the host-libxml2 has a sub-option that allows to
explicitly enable/disable its Python binding
Just like we have a mix of (1) and (2) for target packages depending on
the situation, I guess we might have a similar mix for host packages,
no?
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH 7/8] itstool: new host package
2016-10-13 1:13 [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0 Gustavo Zacarias
` (4 preceding siblings ...)
2016-10-13 1:13 ` [Buildroot] [PATCH 6/8] python-libxml2: new host package Gustavo Zacarias
@ 2016-10-13 1:13 ` Gustavo Zacarias
2016-10-13 1:13 ` [Buildroot] [PATCH 8/8] evince: new package Gustavo Zacarias
2016-10-15 9:32 ` [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0 Peter Korsgaard
7 siblings, 0 replies; 19+ messages in thread
From: Gustavo Zacarias @ 2016-10-13 1:13 UTC (permalink / raw)
To: buildroot
ITS Tool allows you to translate your XML documents with PO files, using
rules from the W3C Internationalization Tag Set (ITS) to determine what
to translate and how to separate it into PO file messages.
This is required by the upcoming evince package.
A target-variant package doesn't make much sense so leave it out.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/itstool/itstool.hash | 2 ++
package/itstool/itstool.mk | 14 ++++++++++++++
2 files changed, 16 insertions(+)
create mode 100644 package/itstool/itstool.hash
create mode 100644 package/itstool/itstool.mk
diff --git a/package/itstool/itstool.hash b/package/itstool/itstool.hash
new file mode 100644
index 0000000..f266b93
--- /dev/null
+++ b/package/itstool/itstool.hash
@@ -0,0 +1,2 @@
+# From http://files.itstool.org/itstool/itstool-2.0.2.tar.bz2.sha256sum
+sha256 bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a itstool-2.0.2.tar.bz2
diff --git a/package/itstool/itstool.mk b/package/itstool/itstool.mk
new file mode 100644
index 0000000..b8a282a
--- /dev/null
+++ b/package/itstool/itstool.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# itstool
+#
+################################################################################
+
+ITSTOOL_VERSION = 2.0.2
+ITSTOOL_SITE = http://files.itstool.org/itstool
+ITSTOOL_SOURCE = itstool-$(ITSTOOL_VERSION).tar.bz2
+HOST_ITSTOOL_DEPENDENCIES = host-python-libxml2 host-python
+ITSTOOL_LICENSE = GPLv3+
+ITSTOOL_LICENSE_FILES = COPYING COPYING.GPL3
+
+$(eval $(host-autotools-package))
--
2.7.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 8/8] evince: new package
2016-10-13 1:13 [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0 Gustavo Zacarias
` (5 preceding siblings ...)
2016-10-13 1:13 ` [Buildroot] [PATCH 7/8] itstool: " Gustavo Zacarias
@ 2016-10-13 1:13 ` Gustavo Zacarias
2016-10-15 9:32 ` [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0 Peter Korsgaard
7 siblings, 0 replies; 19+ messages in thread
From: Gustavo Zacarias @ 2016-10-13 1:13 UTC (permalink / raw)
To: buildroot
To see nice PDFs and other documents.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/Config.in | 1 +
package/evince/Config.in | 20 ++++++++++++
package/evince/evince.hash | 2 ++
package/evince/evince.mk | 76 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 99 insertions(+)
create mode 100644 package/evince/Config.in
create mode 100644 package/evince/evince.hash
create mode 100644 package/evince/evince.mk
diff --git a/package/Config.in b/package/Config.in
index cf8552e..5871f50 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -233,6 +233,7 @@ endmenu
menu "Graphic libraries and applications (graphic/text)"
comment "Graphic applications"
+ source "package/evince/Config.in"
source "package/expedite/Config.in"
source "package/fswebcam/Config.in"
source "package/glmark2/Config.in"
diff --git a/package/evince/Config.in b/package/evince/Config.in
new file mode 100644
index 0000000..b0a7351
--- /dev/null
+++ b/package/evince/Config.in
@@ -0,0 +1,20 @@
+comment "evince needs a toolchain w/ wchar, threads"
+ depends on BR2_USE_MMU
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_EVINCE
+ bool "evince"
+ select BR2_PACKAGE_ADWAITA_ICON_THEME
+ select BR2_PACKAGE_GSETTINGS_DESKTOP_SCHEMAS
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_LIBXML2
+ select BR2_PACKAGE_SHARED_MIME_INFO
+ select BR2_PACKAGE_ZLIB
+ depends on BR2_USE_WCHAR # gettext
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+ depends on BR2_USE_MMU # fork()
+ depends on BR2_PACKAGE_LIBGTK3
+ help
+ Evince is a document viewer for multiple document formats.
+
+ https://wiki.gnome.org/Apps/Evince
diff --git a/package/evince/evince.hash b/package/evince/evince.hash
new file mode 100644
index 0000000..5dc103d
--- /dev/null
+++ b/package/evince/evince.hash
@@ -0,0 +1,2 @@
+# From http://ftp.acc.umu.se/pub/gnome/sources/evince/3.22/evince-3.22.1.sha256sum
+sha256 f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c evince-3.22.1.tar.xz
diff --git a/package/evince/evince.mk b/package/evince/evince.mk
new file mode 100644
index 0000000..571182e
--- /dev/null
+++ b/package/evince/evince.mk
@@ -0,0 +1,76 @@
+################################################################################
+#
+# evince
+#
+################################################################################
+
+
+EVINCE_VERSION_MAJOR = 3.22
+EVINCE_VERSION = $(EVINCE_VERSION_MAJOR).1
+EVINCE_SOURCE = evince-$(EVINCE_VERSION).tar.xz
+EVINCE_SITE = http://ftp.gnome.org/pub/gnome/sources/evince/$(EVINCE_VERSION_MAJOR)
+# Required for gschema build
+EVINCE_INSTALL_STAGING = YES
+EVINCE_DEPENDENCIES = \
+ host-intltool \
+ host-itstool \
+ host-pkgconf \
+ adwaita-icon-theme \
+ gsettings-desktop-schemas \
+ libglib2 \
+ libgtk3 \
+ shared-mime-info \
+ zlib
+
+# previewer and thumbnailer can be built but aren't very useful
+# without nautilus or a similarly-capable desktop/file manager
+EVINCE_CONF_OPTS = \
+ --disable-browser-plugin \
+ --disable-djvu \
+ --disable-dvi \
+ --disable-libgnome-desktop \
+ --disable-nautilus \
+ --disable-previewer \
+ --disable-ps \
+ --disable-thumbnailer \
+ --disable-xps \
+ --enable-introspection=no
+EVINCE_LICENSE = GPLv2+
+EVINCE_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+EVINCE_CONF_OPTS += --enable-dbus
+EVINCE_DEPENDENCIES += dbus
+else
+EVINCE_CONF_OPTS += --disable-dbus
+endif
+
+ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy)
+EVINCE_CONF_OPTS += --enable-multimedia
+EVINCE_DEPENDENCIES += gstreamer1 gst1-plugins-base
+else
+EVINCE_CONF_OPTS += --disable-multimedia
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSECRET),y)
+EVINCE_CONF_OPTS += --with-keyring
+EVINCE_DEPENDENCIES += libsecret
+else
+EVINCE_CONF_OPTS += --without-keyring
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+EVINCE_CONF_OPTS += --enable-tiff
+EVINCE_DEPENDENCIES += tiff
+else
+EVINCE_CONF_OPTS += --disable-tiff
+endif
+
+ifeq ($(BR2_PACKAGE_POPPLER),y)
+EVINCE_CONF_OPTS += --enable-pdf
+EVINCE_DEPENDENCIES += poppler
+else
+EVINCE_CONF_OPTS += --disable-pdf
+endif
+
+$(eval $(autotools-package))
--
2.7.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0
2016-10-13 1:13 [Buildroot] [PATCH 1/8] gsettings-desktop-schemas: bump to version 3.22.0 Gustavo Zacarias
` (6 preceding siblings ...)
2016-10-13 1:13 ` [Buildroot] [PATCH 8/8] evince: new package Gustavo Zacarias
@ 2016-10-15 9:32 ` Peter Korsgaard
7 siblings, 0 replies; 19+ messages in thread
From: Peter Korsgaard @ 2016-10-15 9:32 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 19+ messages in thread