From 571b015fa2af5836a857e0ef23a810cadbdf690b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 2 Sep 2020 16:15:00 -0700 Subject: [PATCH] libftdi1: update to 1.5 Fix libftdi1-config. Signed-off-by: Rosen Penev --- libs/libftdi1/Makefile | 8 ++++---- libs/libftdi1/patches/101-use-findSWIG.patch | 11 ----------- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 libs/libftdi1/patches/101-use-findSWIG.patch diff --git a/libs/libftdi1/Makefile b/libs/libftdi1/Makefile index 4087d6b1c..4c70694b2 100644 --- a/libs/libftdi1/Makefile +++ b/libs/libftdi1/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libftdi1 -PKG_VERSION:=1.4 -PKG_RELEASE:=6 +PKG_VERSION:=1.5 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/ -PKG_HASH:=ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74 +PKG_HASH:=7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049 PKG_MAINTAINER:=Álvaro Fernández Rojas PKG_LICENSE:=LGPL-2.1-only @@ -60,13 +60,13 @@ define Package/ftdi_eeprom/description endef CMAKE_OPTIONS += \ - -DBoost_NO_BOOST_CMAKE=ON \ -DBUILD_TESTS=OFF \ -DDOCUMENTATION=OFF \ -DEXAMPLES=OFF define Build/InstallDev $(call Build/InstallDev/cmake,$(1)) + $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/libftdi1-config $(SED) 's,/usr/bin,/usr,g' $(1)/usr/lib/pkgconfig/libftdi1.pc $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libftdi1.pc $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libftdi1.pc diff --git a/libs/libftdi1/patches/101-use-findSWIG.patch b/libs/libftdi1/patches/101-use-findSWIG.patch deleted file mode 100644 index 91542ca28..000000000 --- a/libs/libftdi1/patches/101-use-findSWIG.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/python/CMakeLists.txt -+++ b/python/CMakeLists.txt -@@ -3,7 +3,7 @@ option ( LINK_PYTHON_LIBRARY "Link again - - if ( PYTHON_BINDINGS ) - # workaround for cmake bug #0013449 -- if ( NOT DEFINED CMAKE_FIND_ROOT_PATH ) -+ if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0 ) - find_package ( SWIG ) - else () - find_program ( SWIG_EXECUTABLE NAMES swig2.0 swig )