diff options
Diffstat (limited to 'package/perl-gd')
| -rw-r--r-- | package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch | 34 | ||||
| -rw-r--r-- | package/perl-gd/Config.in | 2 | ||||
| -rw-r--r-- | package/perl-gd/perl-gd.hash | 4 | ||||
| -rw-r--r-- | package/perl-gd/perl-gd.mk | 44 |
4 files changed, 74 insertions, 10 deletions
diff --git a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch new file mode 100644 index 0000000000..af053c5605 --- /dev/null +++ b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch @@ -0,0 +1,34 @@ +From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Sun, 24 Jan 2021 10:59:31 +0100 +Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc + +Cross-compilation will fail if gdlib.pc does not contain any cflags. +Indeed, if cflags is empty, Makefile.PL will use the default value for +INC (i.e. -I/usr/include -I/usr/include/gd) + +It should be noted that gdlib-config has been dropped from gd since +version 2.3.0 + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Upstream status: probably not upstreamable] +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 25f2f93..7da3651 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option - + END + } + +-@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; ++#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; + @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; + @LIBS = qw(-lgd) unless @LIBS; + +-- +2.29.2 + diff --git a/package/perl-gd/Config.in b/package/perl-gd/Config.in index ef28f7b971..044e601021 100644 --- a/package/perl-gd/Config.in +++ b/package/perl-gd/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_PERL_GD bool "perl-gd" depends on !BR2_STATIC_LIBS select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_GD help Perl interface to the gd2 graphics library. diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash index bfa52b9970..780b1d1e27 100644 --- a/package/perl-gd/perl-gd.hash +++ b/package/perl-gd/perl-gd.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ae960b9eed826d8d20e4c563151629f2 GD-2.72.tar.gz -sha256 61d00713fcc3ba3c8fa8859025d86f97506e6af17e66d59e9396996773989104 GD-2.72.tar.gz +md5 c2bf1ca56d15e33d2432e4d8ba5aeadf GD-2.73.tar.gz +sha256 491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b GD-2.73.tar.gz # computed by scancpan sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index e73cf62a46..b402dfff49 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -4,19 +4,51 @@ # ################################################################################ -PERL_GD_VERSION = 2.72 +PERL_GD_VERSION = 2.73 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN -PERL_GD_DEPENDENCIES = zlib libpng freetype gd +PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd PERL_GD_LICENSE = Artistic or GPL-1.0+ PERL_GD_LICENSE_FILES = LICENSE PERL_GD_DISTNAME = GD -PERL_GD_CONF_OPTS = \ +PERL_GD_CONF_ENV = \ + PATH=$(BR_PATH) \ + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" + +ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +PERL_GD_DEPENDENCIES += fontconfig +PERL_GD_OPTIONS += FONTCONFIG +PERL_GD_CONF_OPTS += -lib_fontconfig_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_FREETYPE),y) +PERL_GD_DEPENDENCIES += freetype +PERL_GD_OPTIONS += FT +PERL_GD_CONF_OPTS += -lib_ft_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +PERL_GD_DEPENDENCIES += jpeg +PERL_GD_OPTIONS += JPEG +PERL_GD_CONF_OPTS += -lib_jpeg_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +PERL_GD_DEPENDENCIES += libpng +PERL_GD_OPTIONS += PNG +PERL_GD_CONF_OPTS += -lib_png_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) +PERL_GD_DEPENDENCIES += xlib_libXpm +PERL_GD_OPTIONS += XPM +PERL_GD_CONF_OPTS += -lib_xpm_path=$(STAGING_DIR)/usr +endif + +PERL_GD_CONF_OPTS += \ -lib_gd_path=$(STAGING_DIR)/usr \ - -lib_ft_path=$(STAGING_DIR)/usr \ - -lib_png_path=$(STAGING_DIR)/usr \ -lib_zlib_path=$(STAGING_DIR)/usr \ - -gdlib_config_path=$(STAGING_DIR)/usr/bin + -options=$(subst $(space),$(comma),$(PERL_GD_OPTIONS)) $(eval $(perl-package)) |