Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uvcdynctrl: Fix compilation with uClibc-ng

Browse source 
Got rid of libiconv-full dependency. Relying on nls.mk

Fixed up the license information.

Added CMAKE_INSTALL to get rid of the InstallDev section.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-06-20 15:42:44 -07:00
parent 274b111782
commit 6f18a460fe
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
utils/uvcdynctrl/Makefile
View file

@ -9,23 +9,27 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=uvcdynctrl PKG_NAME:=uvcdynctrl
PKG_VERSION:=0.2.5 PKG_VERSION:=0.2.5
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=libwebcam-src-$(PKG_VERSION).tar.gz PKG_SOURCE:=libwebcam-src-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/libwebcam PKG_SOURCE_URL:=@SF/libwebcam
PKG_HASH:=3ca5199c7b8398b655a7c38e3ad4191bb053b1486503287f20d30d141bda9d41 PKG_HASH:=3ca5199c7b8398b655a7c38e3ad4191bb053b1486503287f20d30d141bda9d41
PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
PKG_BUILD_DIR:=$(BUILD_DIR)/libwebcam-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/libwebcam-$(PKG_VERSION)
PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
CMAKE_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
include $(INCLUDE_DIR)/nls.mk
define Package/uvcdynctrl define Package/uvcdynctrl
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libwebcam DEPENDS:=+libwebcam
TITLE:=Manage dynamic controls in uvcvideo TITLE:=Manage dynamic controls in uvcvideo
LICENSE:=GPL-3.0-or-later
LICENSE_FILES:=uvcdynctrl/COPYING
URL:=https://sourceforge.net/projects/libwebcam/ URL:=https://sourceforge.net/projects/libwebcam/
MENU:=1 MENU:=1
endef endef
@ -39,8 +43,10 @@ endef
define Package/libwebcam define Package/libwebcam
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libxml2 +libiconv-full DEPENDS:=+libxml2 $(ICONV_DEPENDS)
TITLE:=Webcam library TITLE:=Webcam library
LICENSE:=LGPL-3.0-or-later
LICENSE_FILES:=libwebcam/COPYING.LESSER
URL:=https://sourceforge.net/projects/libwebcam/ URL:=https://sourceforge.net/projects/libwebcam/
endef endef
@ -48,9 +54,6 @@ define Package/libwebcam/description
$(call Package/uvcdynctrl/description) $(call Package/uvcdynctrl/description)
endef endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/lib/libiconv-full/include -liconv
TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib/libiconv-full/lib
define Package/uvcdynctrl/install define Package/uvcdynctrl/install
$(INSTALL_DIR) $(1)/usr/{bin,share} $(INSTALL_DIR) $(1)/usr/{bin,share}
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uvcdynctrl* $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uvcdynctrl* $(1)/usr/bin/
@ -62,11 +65,5 @@ define Package/libwebcam/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebcam.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebcam.so* $(1)/usr/lib/
endef endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/{include,lib}
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebcam.{a,so*} $(1)/usr/lib/
endef
$(eval $(call BuildPackage,uvcdynctrl)) $(eval $(call BuildPackage,uvcdynctrl))
$(eval $(call BuildPackage,libwebcam)) $(eval $(call BuildPackage,libwebcam))

11
utils/uvcdynctrl/patches/010-iconv.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/uvcdynctrl/CMakeLists.txt
+++ b/uvcdynctrl/CMakeLists.txt
@@ -77,7 +77,7 @@ include_directories (../common/include)
include_directories (${CMAKE_CURRENT_BINARY_DIR})
link_directories (${LIBWEBCAM_BINARY_DIR}/webcam)
-target_link_libraries (uvcdynctrl webcam)
+target_link_libraries (uvcdynctrl webcam iconv)
# Compiler flags
set_target_properties (uvcdynctrl PROPERTIES