Message ID | 1445720476-21517-20-git-send-email-romain.naour@openwide.fr |
---|---|
State | Changes Requested |
Headers | show |
Romain, All, On 2015-10-24 23:00 +0200, Romain Naour spake thusly: > Use the newly added libefl package wich provide a new version > of libeina. > > Also, update the upstream url and add a hash file. > > While at it, remove BR2_TOOLCHAIN_HAS_THREADS and BR2_INSTALL_LIBSTDCPP > dependencies since the efl package already depend on them. > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > v5: Use depends on BR2_PACKAGE_EFL instead of select (ThomasP) > v4: rename to libefl > improve commit log > add a dependency on threads > v3: remove trailing slash (Vicente Bergas) > v2: bump to 1.15 > remove glibc only dependency > --- > package/libevas-generic-loaders/Config.in | 9 +-------- > package/libevas-generic-loaders/libevas-generic-loaders.hash | 2 ++ > package/libevas-generic-loaders/libevas-generic-loaders.mk | 9 +++++---- > 3 files changed, 8 insertions(+), 12 deletions(-) > create mode 100644 package/libevas-generic-loaders/libevas-generic-loaders.hash > > diff --git a/package/libevas-generic-loaders/Config.in b/package/libevas-generic-loaders/Config.in > index d0c3cf4..5b9f009 100644 > --- a/package/libevas-generic-loaders/Config.in > +++ b/package/libevas-generic-loaders/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS > bool "libevas generic loaders" > - select BR2_PACKAGE_LIBEINA > select BR2_PACKAGE_ZLIB > depends on BR2_PACKAGE_EFL > help > @@ -8,7 +7,7 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS > stand-alone executables that evas may run from its generic > loader module. > > - http://trac.enlightenment.org/e/wiki/Evas_Generic_Loaders > + https://www.enlightenment.org/ > > if BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS > > @@ -16,14 +15,8 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG > bool "SVG loader" > select BR2_PACKAGE_LIBRSVG > select BR2_PACKAGE_CAIRO > - depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2 > - depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango > depends on BR2_ARCH_HAS_ATOMICS # cairo > help > This option enables the Evas generic SVG loader > > -comment "SVG loader needs a toolchain w/ threads, C++" > - depends on BR2_ARCH_HAS_ATOMICS > - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP > - > endif > diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.hash b/package/libevas-generic-loaders/libevas-generic-loaders.hash > new file mode 100644 > index 0000000..32723ba > --- /dev/null > +++ b/package/libevas-generic-loaders/libevas-generic-loaders.hash > @@ -0,0 +1,2 @@ > +# From https://download.enlightenment.org/rel/libs/evas_generic_loaders/evas_generic_loaders-1.15.0.tar.xz.sha256 > +sha256 1e539e4d4d4e1590345caeb7fdd84f47ec7cd63bb76b6b7107a87420a401fd7f evas_generic_loaders-1.15.0.tar.xz > diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.mk b/package/libevas-generic-loaders/libevas-generic-loaders.mk > index ac6b1cc..d8ab252 100644 > --- a/package/libevas-generic-loaders/libevas-generic-loaders.mk > +++ b/package/libevas-generic-loaders/libevas-generic-loaders.mk > @@ -4,17 +4,18 @@ > # > ################################################################################ > > -LIBEVAS_GENERIC_LOADERS_VERSION = 1.7.10 > -LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.bz2 > -LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/releases > +LIBEVAS_GENERIC_LOADERS_VERSION = 1.15.0 > +LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.xz > +LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/rel/libs/evas_generic_loaders > LIBEVAS_GENERIC_LOADERS_LICENSE = GPLv2 > LIBEVAS_GENERIC_LOADERS_LICENSE_FILES = COPYING > > LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES > > -LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libeina zlib > +LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libefl zlib > > # For now, we only support the SVG loader > +# poppler >= 0.32 is not supported with libevas-generic-loaders 1.14.0 > LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \ > --disable-poppler \ > --disable-spectre \ > -- > 2.4.3 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Romain, All, On 2015-10-25 17:01 +0100, Yann E. MORIN spake thusly: > On 2015-10-24 23:00 +0200, Romain Naour spake thusly: > > Use the newly added libefl package wich provide a new version > > of libeina. > > > > Also, update the upstream url and add a hash file. > > > > While at it, remove BR2_TOOLCHAIN_HAS_THREADS and BR2_INSTALL_LIBSTDCPP > > dependencies since the efl package already depend on them. > > > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> > > Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> As we discussed on another patch, you can indeed drop threads, because they are not used by evas-generic-loader. However, it has a C++ file (for PDF rendering), and configure.ac checks for it with AC_PROG_CXX, so you need to keep the dependency on C++. Regards, Yann E. MORIN.
diff --git a/package/libevas-generic-loaders/Config.in b/package/libevas-generic-loaders/Config.in index d0c3cf4..5b9f009 100644 --- a/package/libevas-generic-loaders/Config.in +++ b/package/libevas-generic-loaders/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS bool "libevas generic loaders" - select BR2_PACKAGE_LIBEINA select BR2_PACKAGE_ZLIB depends on BR2_PACKAGE_EFL help @@ -8,7 +7,7 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS stand-alone executables that evas may run from its generic loader module. - http://trac.enlightenment.org/e/wiki/Evas_Generic_Loaders + https://www.enlightenment.org/ if BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS @@ -16,14 +15,8 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG bool "SVG loader" select BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_CAIRO - depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2 - depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango depends on BR2_ARCH_HAS_ATOMICS # cairo help This option enables the Evas generic SVG loader -comment "SVG loader needs a toolchain w/ threads, C++" - depends on BR2_ARCH_HAS_ATOMICS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP - endif diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.hash b/package/libevas-generic-loaders/libevas-generic-loaders.hash new file mode 100644 index 0000000..32723ba --- /dev/null +++ b/package/libevas-generic-loaders/libevas-generic-loaders.hash @@ -0,0 +1,2 @@ +# From https://download.enlightenment.org/rel/libs/evas_generic_loaders/evas_generic_loaders-1.15.0.tar.xz.sha256 +sha256 1e539e4d4d4e1590345caeb7fdd84f47ec7cd63bb76b6b7107a87420a401fd7f evas_generic_loaders-1.15.0.tar.xz diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.mk b/package/libevas-generic-loaders/libevas-generic-loaders.mk index ac6b1cc..d8ab252 100644 --- a/package/libevas-generic-loaders/libevas-generic-loaders.mk +++ b/package/libevas-generic-loaders/libevas-generic-loaders.mk @@ -4,17 +4,18 @@ # ################################################################################ -LIBEVAS_GENERIC_LOADERS_VERSION = 1.7.10 -LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.bz2 -LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/releases +LIBEVAS_GENERIC_LOADERS_VERSION = 1.15.0 +LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.xz +LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/rel/libs/evas_generic_loaders LIBEVAS_GENERIC_LOADERS_LICENSE = GPLv2 LIBEVAS_GENERIC_LOADERS_LICENSE_FILES = COPYING LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES -LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libeina zlib +LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libefl zlib # For now, we only support the SVG loader +# poppler >= 0.32 is not supported with libevas-generic-loaders 1.14.0 LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \ --disable-poppler \ --disable-spectre \
Use the newly added libefl package wich provide a new version of libeina. Also, update the upstream url and add a hash file. While at it, remove BR2_TOOLCHAIN_HAS_THREADS and BR2_INSTALL_LIBSTDCPP dependencies since the efl package already depend on them. Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- v5: Use depends on BR2_PACKAGE_EFL instead of select (ThomasP) v4: rename to libefl improve commit log add a dependency on threads v3: remove trailing slash (Vicente Bergas) v2: bump to 1.15 remove glibc only dependency --- package/libevas-generic-loaders/Config.in | 9 +-------- package/libevas-generic-loaders/libevas-generic-loaders.hash | 2 ++ package/libevas-generic-loaders/libevas-generic-loaders.mk | 9 +++++---- 3 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 package/libevas-generic-loaders/libevas-generic-loaders.hash