reinit the tree, so we can have metadata

3 files changed, 101 insertions, 0 deletions

diff --git a/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch b/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch
new file mode 100644
index 000000000000..c6b04c5fe339
--- /dev/null
+++ b/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch
@@ -0,0 +1,70 @@
+diff -uNr nonolith-connect-1.1.ORIG/SConstruct nonolith-connect-1.1/SConstruct
+--- nonolith-connect-1.1.ORIG/SConstruct	2012-03-22 10:02:11.398944187 +0000
++++ nonolith-connect-1.1/SConstruct	2012-03-22 10:05:23.149936839 +0000
+@@ -1,7 +1,21 @@
+ import sys, os, shutil
++import SCons.Util
+ 
+ env = Environment()
+ 
++if os.environ.has_key('CC'):
++   env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++   env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++   env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++   env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++   env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++if "$CCFLAGS" in env['CXXCOM']:
++   env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","")
++
+ opts = Variables()
+ opts.Add(BoolVariable("mingwcross", "Cross-compile with mingw for Win32", 0))
+ opts.Add(BoolVariable("boost_static", "Statically link against Boost", 0))
+@@ -95,8 +109,7 @@
+ sources = Glob('*.cpp') +  Glob('streaming_device/*.cpp') + ['cee/cee.cpp', 'bootloader/bootloader.cpp']
+ 
+ json = env.Library('json', 
+-	Glob('libjson/Source/*.cpp'),
+-	CCFLAGS = "-c -O3 -ffast-math -fexpensive-optimizations".split()
++	Glob('libjson/Source/*.cpp')
+ )
+ 
+ websocketpp = env.Library('websocketpp', ['websocketpp/src/'+i for i in [
+@@ -107,7 +120,7 @@
+                 'websocket_session.cpp',
+                 'sha1/sha1.cpp',
+                 'base64/base64.cpp'
+-            ]], CCFLAGS=['-g', '-O3'])
++            ]])
+ 
+ 
+ libusb_cflags = []
+@@ -121,14 +134,22 @@
+ 	libusb_os = ['os/poll_windows.c', 'os/windows_usb.c', 'os/threads_windows.c']
+ 	libusb_cflags += ['-D OS_WINDOWS', '-DPOLL_NFDS_TYPE=unsigned int', '-D WINVER=0x0501']
+ 
+-libusb = env.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [
++env_libusb = env.Clone()
++env_libusb.Append(CPPFLAGS=libusb_cflags)
++env_libusb.Append(CFLAGS=['-Ilibusb', '-Ilibusb/libusb'])
++
++libusb = env_libusb.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [
+ 				'core.c',
+ 				'descriptor.c',
+ 				'io.c',
+ 				'sync.c',
+-			]+libusb_os], CFLAGS=['-g', '-O3', '-Ilibusb', '-Ilibusb/libusb']+libusb_cflags) 
++			]+libusb_os]) 
+ 
+ 
+ libs += boostlibs
+ 
+-env.Program('nonolith-connect', sources, LIBS=libs, CCFLAGS=['-Wall', '-g', '-O3', '-Ilibusb', '-Iwebsocketpp/src', '-shared'], FRAMEWORKS=frameworks)
++env_main = env.Clone()
++env_main.Append(CXXFLAGS=['-Ilibusb', '-Iwebsocketpp/src', '-Wall'])
++#env_main.Append(LINKFLAGS=['-shared'])
++env_main.Program('nonolith-connect', sources, LIBS=libs, FRAMEWORKS=frameworks)
++
diff --git a/sci-visualization/nonolith-connect/files/1.1-gcc6.patch b/sci-visualization/nonolith-connect/files/1.1-gcc6.patch
new file mode 100644
index 000000000000..815c3ca866c7
--- /dev/null
+++ b/sci-visualization/nonolith-connect/files/1.1-gcc6.patch
@@ -0,0 +1,14 @@
+--- nonolith-connect-1.1/websocketpp/src/websocket_server_session.cpp.old	2016-09-25 18:13:31.820474134 -0400
++++ nonolith-connect-1.1/websocketpp/src/websocket_server_session.cpp	2016-09-25 18:38:52.654567787 -0400
+@@ -41,8 +41,11 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++
++#if __cplusplus < 201103L
+ #include <ext/algorithm>
+ using __gnu_cxx::copy_n;
++#endif
+ 
+ using websocketpp::server_session;
+ 
diff --git a/sci-visualization/nonolith-connect/files/nonolith-connect.initd b/sci-visualization/nonolith-connect/files/nonolith-connect.initd
new file mode 100644
index 000000000000..c8a6bd1d0414
--- /dev/null
+++ b/sci-visualization/nonolith-connect/files/nonolith-connect.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+	after logger
+}
+
+start() {
+	ebegin "Starting nonolith-connect"
+	start-stop-daemon --start --quiet -b -m -p /var/run/nonolith-connect.pid -u nonolithd:usb --exec /usr/bin/nonolith-connect
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping nonolith-connect"
+	start-stop-daemon --stop --quiet -p /var/run/nonolith-connect.pid
+	eend $?
+}