Change the CONFLICTS line from the libgd-full to libgd to fix a
recursive dependency.
While at it, remove the redundant +LIBGD_TIFF:libtiff
+LIBGD_FREETYPE:libfreetype dependencies from Package/libgd/default.
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
(cherry picked from commit 085eb34fbf)
The full variant should conflict with the default variant. This prevents that
libgd and libgd-full could be installed side by side, and also, the full
variant should provide the libgd. Otherwise, if you install libgd-full,
you can not install vnstat.
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 42b36b7180)
Upstream messed up and did not include getlib.sh, causing a wrong version
to be applied to the library.
lrwxrwxrwx 1 libgd.so -> libgd.so.VERSION
-rw-r--r-- 1 libgd.so.VERSION
Signed-off-by: Rosen Penev <rosenp@gmail.com>
The wrong paths are specified, causing failures with depending packages
that use pkgconfig.
Removed CMAKE_INSTALL as a result. No point when InstallDev is explicit.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
The php7-mod-gd package requires that freetype support exist in libgd,
but this is not included in the default libgd build. In order to allow
a working php7-mod-gd package while keeping the default libgd package
as small as possible, this commit introduces a -full variant of the
libgd package.
Ref: https://github.com/openwrt/packages/issues/10944
Signed-off-by: W. Michael Petullo <mike@flyn.org>
Freetype support is required for php7-mod-gd as of commit 0f10c8c8,
which causes the PHP7 package to build using this external libgd library.
This commit adds FREETYPE_INCLUDE_DIRS to the definition of CMAKE_OPTIONS.
Without this, libgd does not build freetype support as shown by
this message:
....
Build libgd:
-- Could NOT find Freetype (missing: FREETYPE_INCLUDE_DIRS)
-- Configuring done
-- Generating done
....
Signed-off-by: W. Michael Petullo <mike@flyn.org>
With the previous change to cmake, the generated pkg-config .pc
file does not contain the library version anymore. This breaks
programs which checks for a specific version, e.g. upcoming PHP 7.4.
The version is not filled because of a variable misnaming,
which was not covered by the imported upstream patch.
To not mangle the upstream patch, add an additional patch to
fix things up.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Size reduced from 92878 to 91675 bytes.
CMake added CXX files. Removed those.
Removed ceill patch. ceill is not used anymore.
Removed pkgconfig patch. CMake uses a different file, which does not have
this problem.
Further size reduction to 87938 with LTO.
Removed InstallDev. CMAKE_INSTALL takes care of that.
Added WebP support.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
HAVE_ICONV and HAVE_ICONV_H are two different headers that both need to
evaluate to false. Added the extra CONFIGURE_VARS.
This can be verified by passing -Werror=implicit-function-declaration
Added PKG_LICENSE_FILES
Updated homepage URL.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
libgd fails to build due to missing dependency if the libtiff
package is selected. Fix the build issue and add two new
configuration options, both disabled by default:
1) enable TIFF support, and
2) enable Freetype 2.x support.
Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
While fixing up some incorrect STAGING_DIR_HOSTPKG uses I introduced, I
noticed that the LIBPNG12_CONFIG variable is not used by libgd anymore (it
is called LIBPNG_CONFIG now).
As the build runs fine without setting LIBPNG_CONFIG, let's just remove the
unused line.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
As both LEDE and OpenWrt have STAGING_DIR_HOSTPKG now, we can start to rely
on it. See 73b7f55424 for more information on
STAGING_DIR_HOSTPKG.
STAGING_DIR_HOSTPKG won't actually be changed before the first LEDE release
(it is equivalent to $(STAGING_DIR)/host), so this simple search/replace
cleanup is safe to apply. Doing this cleanup now will be useful for the
Gluon project (an OpenWrt/LEDE based firmware framework) for experimenting
with modifying STAGING_DIR_HOSTPKG before doing this in the LEDE upstream.
Also fixes a typo in the dbus Makefile ("STAGIND_DIR").
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Eneas U de Queiroz
Josef Schlehofer
Rosen Penev
W. Michael Petullo
Michael Heimpold
Jan Pavlinec
Daniel Engberg
Val Kulkov
Matthias Schiffer
Jo-Philipp Wich
Jo-Philipp Wich