diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-08-20 20:28:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 20:28:59 -0700 |
| commit | cd6e4f113121be2a06d2afa6128d230012e8aa9f (patch) | |
| tree | 709446cb4d86d51391b400500481ba6367b4a414 | |
| parent | e7b4ea09d7dc0f4fe746059e692bd5281b13cbc9 (diff) | |
| parent | 3f19592ef9e494b361fdf48b6857d1bc63ff9f3b (diff) | |
Merge pull request #9771 from neheb/gif
giflib: Update to 5.2.1 and add utilities
| -rw-r--r-- | libs/giflib/Makefile | 47 | ||||
| -rw-r--r-- | libs/giflib/patches/100-no-docs.patch | 10 |
2 files changed, 32 insertions, 25 deletions
diff --git a/libs/giflib/Makefile b/libs/giflib/Makefile index 97646c834..b59e37ffe 100644 --- a/libs/giflib/Makefile +++ b/libs/giflib/Makefile @@ -8,21 +8,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=giflib -PKG_VERSION:=5.1.4 +PKG_VERSION:=5.2.1 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/giflib -PKG_HASH:=df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5 +PKG_HASH:=31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> - PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:giflib_project:giflib -PKG_FIXUP:=autoreconf -PKG_REMOVE_FILES:=autogen.sh aclocal.m4 +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk @@ -31,7 +30,7 @@ define Package/giflib SECTION:=libs CATEGORY:=Libraries TITLE:=GIF libraries - URL:=http://sourceforge.net/projects/giflib + URL:=https://sourceforge.net/projects/giflib endef define Package/giflib/description @@ -40,24 +39,42 @@ define Package/giflib/description the LZW compression algorithm was patented. endef -TARGET_CFLAGS += $(FPIC) +define Package/giflib-utils + SECTION:=utils + CATEGORY:=Utilities + TITLE:=GIF utilities + URL:=https://sourceforge.net/projects/giflib +endef -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) +define Package/giflib-utils/description + These are the utilities that come with giflib. endef +TARGET_CFLAGS += -ffunction-sections -fdata-sections $(FPIC) +TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed + +MAKE_FLAGS += \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + PREFIX=$(CONFIGURE_PREFIX) + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib,include} - $(CP) $(PKG_BUILD_DIR)/lib/.libs/lib*so* $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/lib/.libs/libgif.a $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/lib/libgif.la $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/lib/*.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgif.so* $(1)/usr/lib + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libgif.a $(1)/usr/lib + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include endef define Package/giflib/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/lib/.libs/lib*so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgif.so* $(1)/usr/lib +endef + +define Package/giflib-utils/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin endef $(eval $(call HostBuild)) $(eval $(call BuildPackage,giflib)) +$(eval $(call BuildPackage,giflib-utils)) diff --git a/libs/giflib/patches/100-no-docs.patch b/libs/giflib/patches/100-no-docs.patch deleted file mode 100644 index f006d6cae..000000000 --- a/libs/giflib/patches/100-no-docs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,6 @@ AC_PROG_MAKE_SET - AM_PROG_CC_C_O - - dnl Allow partial building on systems without xmlto --AC_CHECK_PROG([have_xmlto], [xmlto], ["yes"],["no"]) - AM_CONDITIONAL([BUILD_DOC], [test "x${have_xmlto}" = "xyes"]) - - dnl Shared-library version |