From e3cfb1c79b330a6ef7adbd09401b303f172a6263 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Thu, 14 Jul 2022 01:54:13 +0200 Subject: [PATCH] libulfius: update to 2.7.10 Signed-off-by: Toni Uhlig --- libs/liborcania/Makefile | 6 ------ libs/libulfius/Makefile | 11 +++-------- .../patches/0001-cmake-pc-orcania-found.patch | 11 +++++++++++ 3 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 libs/libulfius/patches/0001-cmake-pc-orcania-found.patch diff --git a/libs/liborcania/Makefile b/libs/liborcania/Makefile index 8ee31f1b53..5dd3651ff8 100644 --- a/libs/liborcania/Makefile +++ b/libs/liborcania/Makefile @@ -35,10 +35,4 @@ define Package/liborcania/description Potluck with different functions for different purposes that can be shared among C programs. endef -define Package/liborcania/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liborcania.so.* \ - $(1)/usr/lib/ -endef - $(eval $(call BuildPackage,liborcania)) diff --git a/libs/libulfius/Makefile b/libs/libulfius/Makefile index 93c1ef81f8..07ba49cc39 100644 --- a/libs/libulfius/Makefile +++ b/libs/libulfius/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libulfius -PKG_VERSION:=2.7.3 +PKG_VERSION:=2.7.10 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/babelouest/ulfius/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a20f575b3e81924c4ddb72c4ccdced134b5756a86b017f4a38b51608610628c5 +PKG_HASH:=616c5df99584071461a1285dd7155883f7d2b94abf0931038feeebd3da3a6def PKG_MAINTAINER:=Toni Uhlig PKG_LICENSE:=LGPL-2.1-or-later @@ -42,13 +42,8 @@ $(call Package/libulfius/default) PROVIDES:=libulfius endef -define Package/libulfius-$(BUILD_VARIANT)/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libulfius.so.* \ - $(1)/usr/lib/ -endef - CMAKE_OPTIONS += \ + -D_GNU_SOURCE=ON \ -DDOWNLOAD_DEPENDENCIES=OFF \ -DBUILD_WEBSOCKET=OFF \ -DSEARCH_ORCANIA_U=ON \ diff --git a/libs/libulfius/patches/0001-cmake-pc-orcania-found.patch b/libs/libulfius/patches/0001-cmake-pc-orcania-found.patch new file mode 100644 index 0000000000..b95b8c0709 --- /dev/null +++ b/libs/libulfius/patches/0001-cmake-pc-orcania-found.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -257,7 +257,7 @@ if (SEARCH_ORCANIA_U) + set(Orcania_FIND_QUIETLY ON) # force to find Orcania quietly + include(FindOrcania) + find_package(Orcania ${ORCANIA_VERSION_REQUIRED} QUIET) # try to find orcania +- if (NOT ORCANIA_FOUND) ++ if (NOT ORCANIA_FOUND AND NOT PC_ORCANIA_FOUND) + if (DOWNLOAD_DEPENDENCIES) + include(DownloadProject) + download_project(PROJ orcania # ... otherwise, download archive