Merge pull request #19372 from cotequeiroz/libgd

libgd: avoid recursive and redundant dependencies
This commit is contained in:
Josef Schlehofer 2022-10-06 11:45:23 +02:00 committed by GitHub
commit ec6e977cd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/cmake.mk
define Package/libgd/default define Package/libgd/default
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libjpeg +libpng +libwebp +LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype DEPENDS:=+libjpeg +libpng +libwebp
TITLE:=The GD graphics library TITLE:=The GD graphics library
URL:=https://libgd.github.io/ URL:=https://libgd.github.io/
endef endef
@ -36,6 +36,7 @@ define Package/libgd
MENU:=1 MENU:=1
DEPENDS+=+LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype DEPENDS+=+LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype
VARIANT:=default VARIANT:=default
CONFLICTS:=libgd-full
endef endef
define Package/libgd-full define Package/libgd-full
@ -44,7 +45,6 @@ define Package/libgd-full
TITLE+=(full) TITLE+=(full)
VARIANT:=full VARIANT:=full
PROVIDES:=libgd PROVIDES:=libgd
CONFLICTS:=libgd
endef endef
define Package/libgd/description/default define Package/libgd/description/default