openwrt/packages
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/packages.git synced 2025-05-02 06:31:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

telldus-core: use proper cmake argp

Browse Source 
Avoids linking to argp-standalone with glibc.

Some other minor fixes.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2022-04-16 19:15:20 -07:00 committed by 1582130940
parent 921c5a92a9
commit 1d6e4acf1b
4 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
utils/telldus-core/Makefile
View File

@ -23,6 +23,18 @@ PKG_BUILD_DEPENDS:=argp-standalone
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
define Download/argp-cmake
URL:=@GITHUB/alehaa/CMake-argp/e7e77e68d062708edf055f944d3094b0ce0b11b8/cmake
FILE:=Findargp.cmake
HASH:=b74e961260d17bc9af868be59053e50739dc94e06cbe73e3fced414a070a29fd
endef
define Build/Prepare
$(eval $(call Download,argp-cmake))
$(Build/Prepare/Default)
$(CP) $(DL_DIR)/Findargp.cmake $(PKG_BUILD_DIR)/cmake/
endef
define Package/telldus-core define Package/telldus-core
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities

4
utils/telldus-core/patches/110-fix_warnings.patch
View File

@ -6,7 +6,7 @@ Added a typecast (signed/unsigned char problem). Should be portable.
std::string ProtocolIkea::getStringForMethod(int method, unsigned char level, Controller *) { std::string ProtocolIkea::getStringForMethod(int method, unsigned char level, Controller *) {
const char B1[] = {84, 84, 0}; const char B1[] = {84, 84, 0};
- const char B0[] = {170, 0}; - const char B0[] = {170, 0};
+ const char B0[] = {(char)170, 0}; + const char B0[] = {char(170), 0};
int intSystem = this->getIntParameter(L"system", 1, 16)-1; int intSystem = this->getIntParameter(L"system", 1, 16)-1;
int intFadeStyle = TelldusCore::comparei(this->getStringParameter(L"fade", L"true"), L"true"); int intFadeStyle = TelldusCore::comparei(this->getStringParameter(L"fade", L"true"), L"true");
@ -17,7 +17,7 @@ Added a typecast (signed/unsigned char problem). Should be portable.
const unsigned char S = 59, L = 169; const unsigned char S = 59, L = 169;
const char B0[] = {S, S, 0}; const char B0[] = {S, S, 0};
- const char B1[] = {S, L, 0}; - const char B1[] = {S, L, 0};
+ const char B1[] = {S, (char)L, 0}; + const char B1[] = {S, char(L), 0};
const unsigned char START_CODE[] = {'S', 255, 1, 255, 1, 255, 1, 100, 255, 1, 180, 0}; const unsigned char START_CODE[] = {'S', 255, 1, 255, 1, 255, 1, 100, 255, 1, 180, 0};
const unsigned char STOP_CODE[] = {S, 0}; const unsigned char STOP_CODE[] = {S, 0};

17
utils/telldus-core/patches/900-openwrt_fixes_cmake.patch
View File

@ -12,15 +12,22 @@ Adopted to OpenWrt target. Most likely these changes go elsewhere when done righ
--- a/tdadmin/CMakeLists.txt --- a/tdadmin/CMakeLists.txt
+++ b/tdadmin/CMakeLists.txt +++ b/tdadmin/CMakeLists.txt
@@ -38,8 +38,11 @@ ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeB @@ -30,16 +30,11 @@ ELSEIF (APPLE)
${ARGP_LIBRARY} TARGET_LINK_LIBRARIES(tdadmin
TelldusCore
) )
-ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
- # FreeBSD does not have argp in base libc; port devel/argp-standalone is required.
- FIND_LIBRARY(ARGP_LIBRARY argp)
- TARGET_LINK_LIBRARIES(tdadmin
- ${CMAKE_BINARY_DIR}/client/libtelldus-core.so
- ${ARGP_LIBRARY}
- )
ELSE (WIN32) ELSE (WIN32)
+ # Linux, in this case openwrt that requires argp-standalone + FIND_PACKAGE(argp)
+ FIND_LIBRARY(ARGP_LIBRARY argp)
TARGET_LINK_LIBRARIES(tdadmin TARGET_LINK_LIBRARIES(tdadmin
${CMAKE_BINARY_DIR}/client/libtelldus-core.so ${CMAKE_BINARY_DIR}/client/libtelldus-core.so
+ ${ARGP_LIBRARY} + ${ARGP_LIBRARIES}
) )
ENDIF (WIN32) ENDIF (WIN32)

20
utils/telldus-core/patches/980-auto-ptr.patch Normal file
View File

@ -0,0 +1,20 @@
--- a/service/DeviceManager.cpp
+++ b/service/DeviceManager.cpp
@@ -74,7 +74,7 @@ void DeviceManager::executeActionEvent()
}
Log::notice("Execute a TellStick Action for device %i", data->deviceId);
- std::auto_ptr<TelldusCore::MutexLocker> deviceLocker(0);
+ std::unique_ptr<TelldusCore::MutexLocker> deviceLocker;
{
// devicelist locked
TelldusCore::MutexLocker deviceListLocker(&d->lock);
@@ -84,7 +84,7 @@ void DeviceManager::executeActionEvent()
return;
}
// device locked
- deviceLocker = std::auto_ptr<TelldusCore::MutexLocker>(new TelldusCore::MutexLocker(it->second));
+ deviceLocker = std::make_unique<TelldusCore::MutexLocker>(it->second);
device = it->second;
} // devicelist unlocked