libartnet: Fix compilation with GCC8

Previous GCC7 fix was incorrect and GCC8 correctly complains about it.
Fix it properly.

Also cleaned up the Makefile for consistency between packages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/libartnet/Makefile b/libs/libartnet/Makefile
index 5e7fc3c88abae806a7c184b32b539305ab534d7f..b2c325aa9fae7dccf90b268ecf5a7eb8257b1b47 100644 (file)
--- a/libs/libartnet/Makefile
+++ b/libs/libartnet/Makefile
@@ -9,24 +9,25 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libartnet
 PKG_VERSION:=1.1.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/OpenLightingProject/libartnet/releases/download/1.1.2
 PKG_HASH:=19cdda434e208a81ddd138377f11046364438e40e34542ae101d6aa3fcaec696
 
 PKG_MAINTAINER:=Martijn Zilverschoon <martijn@friedzombie.com>
-
 PKG_LICENSE:=GPL-2.1
 PKG_LICENSE_FILES:=COPYING
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libartnet
        SECTION:=libs
        CATEGORY:=Libraries
        TITLE:=Libartnet is an implementation of the ArtNet protocol.
-       URL:=http://www.openlighting.org/libartnet-main/
+       URL:=https://www.openlighting.org/libartnet-main/
 endef
 
 define Package/libartnet/description
@@ -34,16 +35,6 @@ define Package/libartnet/description
        transmission of DMX and related data over IP networks.
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default)
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       all install
-endef
-
 define Build/InstallDev
        mkdir -p $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/artnet $(1)/usr/include/

diff --git a/libs/libartnet/patches/002-gcc7.patch b/libs/libartnet/patches/002-gcc7.patch
index 44dde906900a65b89f5d37b47e3dff8733585088..9f0d62ff0ac6047183073d108eaea15068742700 100644 (file)
--- a/libs/libartnet/patches/002-gcc7.patch
+++ b/libs/libartnet/patches/002-gcc7.patch
@@ -1,5 +1,3 @@
-diff --git a/artnet/transmit.c b/artnet/transmit.c
-index ce19b11..e882db9 100644
 --- a/artnet/transmit.c
 +++ b/artnet/transmit.c
 @@ -163,7 +163,7 @@ int artnet_tx_tod_data(node n, int id) {
@@ -7,7 +5,7 @@ index ce19b11..e882db9 100644
  
    while (remaining > 0) {
 -    memset(&tod.data.toddata.tod,0x00, ARTNET_MAX_UID_COUNT);
-+    memset(&tod.data.toddata.tod,0x00, ARTNET_MAX_UID_COUNT * sizeof(tod.data.toddata.tod));
++    memset(&tod.data.toddata.tod,0x00, sizeof(tod.data.toddata.tod));
      lim = min(ARTNET_MAX_UID_COUNT, remaining);
      tod.data.toddata.blockCount = bloc++;
      tod.data.toddata.uidCount = lim;