ola: new package

Signed-off-by Dave Skok <[email protected]>

---
 package/Config.in     |   1 +
 package/ola/Config.in | 142 ++++++++++++++++++++++++++++++++++++++++++++++++
 package/ola/ola.mk    | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 290 insertions(+)
 create mode 100644 package/ola/Config.in
 create mode 100644 package/ola/ola.mk

package/Config.in +1 -0

index 7069d77..fb52411 100644
@@ -277,6 +277,7 @@ source "package/minicom/Config.in"
 source "package/nanocom/Config.in"
 source "package/neard/Config.in"
 source "package/ofono/Config.in"
+source "package/ola/Config.in"
 source "package/on2-8170-modules/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"

package/ola/Config.in new file +12 -0

new file mode 100644
index 0000000..e19dff4
@@ -0,0 +1,142 @@
+config BR2_PACKAGE_OLA
+       bool "open lighting architecture"
+       select BR2_PACKAGE_PROTOBUF
+       select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+       select BR2_PACKAGE_UTIL_LINUX
+       depends on BR2_INSTALL_LIBSTDCPP # protobuf
+       depends on BR2_LARGEFILE # util-linux
+       depends on BR2_USE_WCHAR # util-linux
+       depends on BR2_TOOLCHAIN_HAS_THREADS
+       help
+         Open Lighting Architecture provides applications
+         with a mechanism to send and receive DMX512 & RDM

package/ola/Config.in new file +28 -0

+
+config BR2_PACKAGE_OLA_WEB
+       bool "http interface"
+       select BR2_PACKAGE_LIBMICROHTTPD
+       help
+         Build OLA with browser interface.
+
+config BR2_PACKAGE_OLA_PYTHON_BINDINGS
+       bool "python bindings"
+       select BR2_PACKAGE_PYTHON
+       select BR2_PACKAGE_PYTHON_PROTOBUF
+       depends on BR2_USE_MMU
+       help
+         Build OLA with support for the Python language.
+
+config BR2_PACKAGE_OLA_SLP
+       bool "slp tools"
+       help
+         Build OLA with slp tools.
+
+endmenu
+
+menu "Tests and Examples"
+
+config BR2_PACKAGE_OLA_EXAMPLES
+       bool "examples"
+       select BR2_PACKAGE_NCURSES
+       help

package/ola/Config.in new file +22 -0

+
+config BR2_PACKAGE_OLA_PLUGIN_ARTNET
+       bool "artnet"
+       default y
+       help
+         Build Artnet plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_OPENDMX
+       bool "DMX4Linux"
+       help
+         Build DMX4Linux plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_DUMMY
+       bool "dummy"
+       default y
+       help
+         Build Dummy plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_ESPNET
+       bool "espnet"
+       help
+         Build EspNet plugin for OLA.

package/ola/Config.in new file +8 -0

+
+config BR2_PACKAGE_OLA_PLUGIN_PATHPORT
+       bool "pathport"
+       help
+         Build Pathport plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_SANDNET
+       bool "sandnet"

package/ola/Config.in new file +16 -0

+
+config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI
+       bool "stageprofi"
+       depends on BR2_PACKAGE_LIBFTDI || BR2_PACKAGE_LIBUSB
+       help
+         Build StageProfi plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_USBPRO
+       bool "usbpro"
+       depends on BR2_PACKAGE_LIBFTDI || BR2_PACKAGE_LIBUSB
+       help
+         Build UsbPro plugin for OLA.
+
+endmenu
+
+endif

package/ola/ola.mk new file +0 -0

new file mode 100644
index 0000000..5a60252

package/ola/ola.mk new file +127 -0

+OLA_SITE = https://open-lighting.googlecode.com/files
+
+OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPLv2+ (libolaserver, olad, Python examples and tests)
+OLA_LICENSE_FILES = LICENCE GPL LGPL
+OLA_INSTALL_STAGING = YES
+
+# util-linux provides uuid lib
+OLA_DEPENDENCIES = protobuf util-linux
+
+OLA_CONF_OPT = \
+       --disable-gcov \
+       --disable-tcmalloc \
+       --disable-unittests \
+       --disable-root-check \
+       --disable-java-libs
+
+# sets where to find python libs built for target and required by ola
+OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+
+## OLA Bindings and Interface selections
+
+ifeq ($(BR2_PACKAGE_OLA_WEB),y)
+OLA_CONF_OPT += --enable-http
+OLA_DEPENDENCIES += libmicrohttpd
+else
+OLA_CONF_OPT += --disable-http
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_SLP),y)
+OLA_CONF_OPT += --enable-slp
+else
+OLA_CONF_OPT += --disable-slp
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y)
+OLA_CONF_OPT += --enable-python-libs
+OLA_DEPENDENCIES += python python-protobuf
+else
+OLA_CONF_OPT += --disable-python-libs
+endif
+
+## OLA Examples and Tests
+
+ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y)
+OLA_CONF_OPT += --enable-examples
+OLA_DEPENDENCIES += ncurses
+else
+OLA_CONF_OPT += --disable-examples
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y)
+OLA_CONF_OPT += --enable-rdm-tests
+else
+OLA_CONF_OPT += --disable-rdm-tests
+endif
+
+## OLA Plugin selections
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y)
+OLA_CONF_OPT += --enable-e131
+else
+OLA_CONF_OPT += --disable-e131
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y)
+OLA_CONF_OPT += --enable-artnet
+else
+OLA_CONF_OPT += --disable-artnet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y)
+OLA_CONF_OPT += --enable-opendmx
+else
+OLA_CONF_OPT += --disable-opendmx
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y)
+OLA_CONF_OPT += --enable-dummy
+else
+OLA_CONF_OPT += --disable-dummy
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y)
+OLA_CONF_OPT += --enable-espnet
+else
+OLA_CONF_OPT += --disable-espnet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y)
+OLA_CONF_OPT += --enable-kinet
+else
+OLA_CONF_OPT += --disable-kinet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y)
+OLA_CONF_OPT += --enable-osc
+OLA_DEPENDENCIES += liblo
+else
+OLA_CONF_OPT += --disable-osc
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y)
+OLA_CONF_OPT += --enable-milinst
+else
+OLA_CONF_OPT += --disable-milinst
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y)
+OLA_CONF_OPT += --enable-pathport
+else
+OLA_CONF_OPT += --disable-pathport
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y)
+OLA_CONF_OPT += --enable-sandnet
+else
+OLA_CONF_OPT += --disable-sandnet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y)
+OLA_CONF_OPT += --enable-shownet
+else
+OLA_CONF_OPT += --disable-shownet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y)

package/ola/ola.mk new file +2 -1

+
+$(eval $(autotools-package))
--

1.8.3.4

Hi Dave,

Quoted 4 lines · Dave Skok

Signed-off-by Dave Skok <[email protected]>

---
 package/Config.in     |   1 +
 package/ola/Config.in | 142

++++++++++++++++++++++++++++++++++++++++++++++++

Quoted 1 line

 package/ola/ola.mk    | 147

++++++++++++++++++++++++++++++++++++++++++++++++++

Quoted 29 lines

 3 files changed, 290 insertions(+)
 create mode 100644 package/ola/Config.in
 create mode 100644 package/ola/ola.mk

package/Config.in +1 -0

index 7069d77..fb52411 100644
@@ -277,6 +277,7 @@ source "package/minicom/Config.in"
 source "package/nanocom/Config.in"
 source "package/neard/Config.in"
 source "package/ofono/Config.in"
+source "package/ola/Config.in"
 source "package/on2-8170-modules/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"

package/ola/Config.in new file +7 -0

new file mode 100644
index 0000000..e19dff4
@@ -0,0 +1,142 @@
+config BR2_PACKAGE_OLA
+       bool "open lighting architecture"
+       select BR2_PACKAGE_PROTOBUF
+       select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+       select BR2_PACKAGE_UTIL_LINUX
+       depends on BR2_INSTALL_LIBSTDCPP # protobuf
+       depends on BR2_LARGEFILE # util-linux

package/ola/Config.in line 17

Quoted 10 lines

package/ola/Config.in new file +10 -0

+       depends on BR2_USE_WCHAR # util-linux
+       depends on BR2_TOOLCHAIN_HAS_THREADS
+       help
+         Open Lighting Architecture provides applications
+         with a mechanism to send and receive DMX512 & RDM
+         commands using hardware devices and DMX over IP protocols.
+
+         http://www.opendmx.net/index.php/OLA
+
+comment "ola requires a toolchain with C++, thread, largefile and wchar

support"

package/ola/Config.in line 18

Quoted 1 line

package/ola/Config.in new file +1 -0

+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE ||

!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

package/ola/Config.in line 22

Quoted 4 lines

package/ola/Config.in new file +4 -0

+
+if BR2_PACKAGE_OLA
+
+menu "OLA Bindings and Interface"

If you look at the menuconfig, you currently see:

open lighting architecture
-- OLA Bindings and Interface
-- Tests and Examples
-- OLA Plugin selections

The naming is currently a bit inconsistent.
First of all, the name OLA suddenly pops-up without explanation, so it may be good to specify that acronym in the top-level config item. Secondly, the second sub-item is not prefixed with OLA, while the other two are. I'm not sure if the OLA prefix is needed in any of these three, but I think all three should be lined up, either with or without OLA prefix.
Thirdly, the capitalization is somewhat odd. Is there a specific reason to use capitals for Bindings, Interface, Tests, Examples and Plugin, but not for selections? My personal preference is not to use capitals here because they are just common words, not names. Also, the capitalization of OLA (if we're still keeping this): since all packages are written in lowercase already, just like you did for 'open lighting architecture', it makes sense to me to do the same for the acronym: ola (but I understand this is debatable).

My proposal is:
ola (open lighting architecture)
-- bindings and interface
-- tests and examples
-- plugin selections

Quoted 28 lines

package/ola/Config.in new file +28 -0

+
+config BR2_PACKAGE_OLA_WEB
+       bool "http interface"
+       select BR2_PACKAGE_LIBMICROHTTPD
+       help
+         Build OLA with browser interface.
+
+config BR2_PACKAGE_OLA_PYTHON_BINDINGS
+       bool "python bindings"
+       select BR2_PACKAGE_PYTHON
+       select BR2_PACKAGE_PYTHON_PROTOBUF
+       depends on BR2_USE_MMU
+       help
+         Build OLA with support for the Python language.
+
+config BR2_PACKAGE_OLA_SLP
+       bool "slp tools"
+       help
+         Build OLA with slp tools.
+
+endmenu
+
+menu "Tests and Examples"
+
+config BR2_PACKAGE_OLA_EXAMPLES
+       bool "examples"
+       select BR2_PACKAGE_NCURSES
+       help

package/ola/Config.in line 60

Quoted 10 lines

package/ola/Config.in new file +10 -0

+         Build OLA examples.
+
+comment "rdm tests require ola python bindings"
+       depends on !BR2_PACKAGE_OLA_PYTHON_BINDINGS
+
+config BR2_PACKAGE_OLA_RDM_TESTS
+       bool "rdm tests"
+       depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS
+       help
+         Build OLA RDM tests.

I think you could use 'select' here instead of depends on, and remove the comment, don't you think?

package/ola/Config.in line 70

Quoted 10 lines

package/ola/Config.in new file +10 -0

+
+endmenu
+
+menu "OLA Plugin selections"
+
+config BR2_PACKAGE_OLA_PLUGIN_E131
+       bool "acn E131"
+       default y
+       help
+         Build ACN E131 plugin for OLA.

Is there a specific reason why some plugins are marked as 'default y' ? I think all should be off by default, and the user can make his own selection based on the hardware he has.

Quoted 22 lines

package/ola/Config.in new file +22 -0

+
+config BR2_PACKAGE_OLA_PLUGIN_ARTNET
+       bool "artnet"
+       default y
+       help
+         Build Artnet plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_OPENDMX
+       bool "DMX4Linux"
+       help
+         Build DMX4Linux plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_DUMMY
+       bool "dummy"
+       default y
+       help
+         Build Dummy plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_ESPNET
+       bool "espnet"
+       help
+         Build EspNet plugin for OLA.

package/ola/Config.in line 102

Quoted 10 lines

package/ola/Config.in new file +10 -0

+
+config BR2_PACKAGE_OLA_PLUGIN_KINET
+       bool "kinet"
+       help
+         Build KiNet plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_MILINT
+       bool "milford Instruments"
+       help
+         Build Milford Instruments 1-463 plugin for OLA.

capitalization: milford vs Milford

package/ola/Config.in line 108

Quoted 6 lines

package/ola/Config.in new file +6 -0

+
+config BR2_PACKAGE_OLA_PLUGIN_OSC
+       bool "osc"
+       select BR2_PACKAGE_LIBLO
+       help
+         Build Open sound control plugin for OLA.

capitalization: here I'd expect Open Sound Control

Quoted 8 lines

package/ola/Config.in new file +8 -0

+
+config BR2_PACKAGE_OLA_PLUGIN_PATHPORT
+       bool "pathport"
+       help
+         Build Pathport plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_SANDNET
+       bool "sandnet"

package/ola/Config.in line 126

Quoted 10 lines

package/ola/Config.in new file +10 -0

+       help
+         Build SandNet plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_SHOWNET
+       bool "shownet"
+       help
+         Build ShowNet plugin for OLA.
+
+comment "USB driver required for stageprofi and usbpro plugin"
+       depends on !BR2_PACKAGE_LIBFTDI && !BR2_PACKAGE_LIBUSB

It seems that libftdi automatically selects libusb, so the check on libftdi is not needed I think.

Also, other packages that need USB use 'select BR2_PACKAGE_LIBUSB' instead of 'depends on'. I would follow the same approach in the below stageprofi and usbpro options, in which case the comment can be removed.

package/ola/ola.mk

Quoted 23 lines

package/ola/Config.in new file +16 -0

+
+config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI
+       bool "stageprofi"
+       depends on BR2_PACKAGE_LIBFTDI || BR2_PACKAGE_LIBUSB
+       help
+         Build StageProfi plugin for OLA.
+
+config BR2_PACKAGE_OLA_PLUGIN_USBPRO
+       bool "usbpro"
+       depends on BR2_PACKAGE_LIBFTDI || BR2_PACKAGE_LIBUSB
+       help
+         Build UsbPro plugin for OLA.
+
+endmenu
+
+endif

package/ola/ola.mk new file +0 -0

new file mode 100644
index 0000000..5a60252
@@ -0,0 +1,147 @@

+################################################################################

package/ola/ola.mk line 4

Quoted 4 lines

package/ola/ola.mk new file +3 -0

+#
+# ola
+#

+################################################################################

package/ola/ola.mk line 8

Quoted 3 lines

package/ola/ola.mk new file +3 -0

+
+OLA_VERSION = 0.8.31
+OLA_SOURCE = ola-0.8.31.tar.gz

This is the default value of OLA_SOURCE (pkgname-pkgversion.tar.gz), so you can remove the explicit definition.

package/ola/ola.mk

Quoted 3 lines

package/ola/ola.mk new file +3 -0

+OLA_SITE = https://open-lighting.googlecode.com/files
+
+OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPLv2+

(libolaserver, olad, Python examples and tests)

Quoted 5 lines

package/ola/ola.mk new file +5 -0

+OLA_LICENSE_FILES = LICENCE GPL LGPL
+OLA_INSTALL_STAGING = YES
+
+# util-linux provides uuid lib
+OLA_DEPENDENCIES = protobuf util-linux

package/ola/ola.mk

Quoted 10 lines

package/ola/ola.mk new file +10 -0

+
+OLA_CONF_OPT = \
+       --disable-gcov \
+       --disable-tcmalloc \
+       --disable-unittests \
+       --disable-root-check \
+       --disable-java-libs
+
+# sets where to find python libs built for target and required by ola
+OLA_CONF_ENV =

PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages

package/ola/ola.mk line 25

Quoted 1 line

package/ola/ola.mk new file +1 -0

+OLA_MAKE_ENV =

PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages

Quoted 108 lines

package/ola/ola.mk new file +108 -0

+
+## OLA Bindings and Interface selections
+
+ifeq ($(BR2_PACKAGE_OLA_WEB),y)
+OLA_CONF_OPT += --enable-http
+OLA_DEPENDENCIES += libmicrohttpd
+else
+OLA_CONF_OPT += --disable-http
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_SLP),y)
+OLA_CONF_OPT += --enable-slp
+else
+OLA_CONF_OPT += --disable-slp
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y)
+OLA_CONF_OPT += --enable-python-libs
+OLA_DEPENDENCIES += python python-protobuf
+else
+OLA_CONF_OPT += --disable-python-libs
+endif
+
+## OLA Examples and Tests
+
+ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y)
+OLA_CONF_OPT += --enable-examples
+OLA_DEPENDENCIES += ncurses
+else
+OLA_CONF_OPT += --disable-examples
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y)
+OLA_CONF_OPT += --enable-rdm-tests
+else
+OLA_CONF_OPT += --disable-rdm-tests
+endif
+
+## OLA Plugin selections
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y)
+OLA_CONF_OPT += --enable-e131
+else
+OLA_CONF_OPT += --disable-e131
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y)
+OLA_CONF_OPT += --enable-artnet
+else
+OLA_CONF_OPT += --disable-artnet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y)
+OLA_CONF_OPT += --enable-opendmx
+else
+OLA_CONF_OPT += --disable-opendmx
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y)
+OLA_CONF_OPT += --enable-dummy
+else
+OLA_CONF_OPT += --disable-dummy
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y)
+OLA_CONF_OPT += --enable-espnet
+else
+OLA_CONF_OPT += --disable-espnet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y)
+OLA_CONF_OPT += --enable-kinet
+else
+OLA_CONF_OPT += --disable-kinet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y)
+OLA_CONF_OPT += --enable-osc
+OLA_DEPENDENCIES += liblo
+else
+OLA_CONF_OPT += --disable-osc
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y)
+OLA_CONF_OPT += --enable-milinst
+else
+OLA_CONF_OPT += --disable-milinst
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y)
+OLA_CONF_OPT += --enable-pathport
+else
+OLA_CONF_OPT += --disable-pathport
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y)
+OLA_CONF_OPT += --enable-sandnet
+else
+OLA_CONF_OPT += --disable-sandnet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y)
+OLA_CONF_OPT += --enable-shownet
+else
+OLA_CONF_OPT += --disable-shownet
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y)

package/ola/ola.mk line 145

Quoted 10 lines

package/ola/ola.mk new file +10 -0

+OLA_CONF_OPT += --enable-stageprofi
+else
+OLA_CONF_OPT += --disable-stageprofi
+endif
+
+ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y)
+OLA_CONF_OPT += --enable-usbpro
+else
+OLA_CONF_OPT += --disable-usbpro
+endif

I think you need to add a dependency for libusb here in usbpro and stageprofi.

Quoted 5 lines

package/ola/ola.mk new file +2 -1

+
+$(eval $(autotools-package))
--

1.8.3.4

Best regards,
Thomas