diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile index ec5b19fe7..be75cc49d 100644 --- a/lang/node-hid/Makefile +++ b/lang/node-hid/Makefile @@ -7,23 +7,20 @@ include $(TOPDIR)/rules.mk -PKG_NPM_NAME:=hid -PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=0.7.2 -PKG_RELEASE:=2 +PKG_NPM_NAME:=node-hid +PKG_NAME:=$(PKG_NPM_NAME) +PKG_VERSION:=0.7.7 +PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/node-hid/node-hid.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=v0.7.2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=ede801a26a23290ab76d64ab636c3c3e2788030bb830af7006d37444c2a7b2c4 +PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ +PKG_HASH:=ac14467265a64116114e99091cd557ca7953500285c78cb4bdf6b82fe262cca6 PKG_BUILD_DEPENDS:=node/host -PKG_NODE_VERSION:=`$(STAGING_DIR_HOSTPKG)/bin/node --version` +PKG_USE_MIPS16:=0 -PKG_MAINTAINER:=John Crispin -PKG_LICENSE:=Custom +PKG_MAINTAINER:=Hirokazu MORIKAWA +PKG_LICENSE:=MIT or X11 PKG_LICENSE_FILES:= include $(INCLUDE_DIR)/package.mk @@ -34,43 +31,49 @@ define Package/node-hid CATEGORY:=Languages TITLE:=Node.js package to access HID devices URL:=https://github.com/node-hid/node-hid - DEPENDS:=+node +node-npm +libusb-1.0 +hidapi +libstdcpp +libudev-fbsd + DEPENDS:=+node +node-npm +libusb-1.0 +hidapi +libudev-fbsd endef define Package/node-hid/description Node.js package to access HID devices endef -CPU:=$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))) +TAR_OPTIONS+= --strip-components 1 +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) -EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include/libusb-1.0 +NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))) + +TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/libusb-1.0 define Build/Compile git init $(PKG_BUILD_DIR) - cd $(PKG_BUILD_DIR) ; \ $(MAKE_VARS) \ $(MAKE_FLAGS) \ - npm_config_arch=$(CONFIG_ARCH) \ - npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \ - npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \ - PREFIX="$(PKG_INSTALL_DIR)/usr/" \ - npm install --build-from-source --target_arch=$(CPU) -g \ - `npm pack $(PKG_BUILD_DIR) | tail -n 1` + npm_config_arch=$(NODEJS_CPU) \ + npm_config_target_arch=$(NODEJS_CPU) \ + npm_config_build_from_source=true \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + npm_config_prefix=$(PKG_INSTALL_DIR)/usr/ \ + npm_config_cache=$(TMP_DIR)/npm-cache \ + npm_config_tmp=$(TMP_DIR)/npm-tmp \ + npm install -g $(PKG_BUILD_DIR) + rm -rf $(TMP_DIR)/npm-tmp + rm -rf $(TMP_DIR)/npm-cache endef define Package/node-hid/install - mkdir -p $(1)/usr/lib/node/node-hid/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/. $(1)/usr/lib/node/ - $(RM) -rf $(1)/usr/lib/node/node-hid/patches \ - $(1)/usr/lib/node/node-hid/.p* \ - $(1)/usr/lib/node/node-hid/.quilt* \ - $(1)/usr/lib/node/node-hid/.built* \ - $(1)/usr/lib/node/node-hid/.config* - # Strip PKG_BUILD_DIR from useless metadata inserted by npm install - # https://github.com/npm/npm/issues/10393 - # https://github.com/npm/npm/issues/12110 - find $(1)/usr/lib/node -name package.json -exec sed -i -e 's,$(PKG_BUILD_DIR),,g' {} + + $(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME) + $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{package.json,*.md} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{binding.gyp,*.js} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{node_modules,src} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME)/build/Release + $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/build/Release/HID.node \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/build/Release/ + $(INSTALL_DIR) $(1)/usr/bin + $(LN) ../lib/node/node-hid/src/show-devices.js $(1)/usr/bin/hid-showdevices endef $(eval $(call BuildPackage,node-hid)) -