From d9f43a31652d661da0c13a03c0155e3b4e0bdba9 Mon Sep 17 00:00:00 2001 From: Christian Buschau Date: Thu, 3 Jan 2019 02:04:09 +0100 Subject: [PATCH] New package: hyperion-1.03.2 --- srcpkgs/hyperion/files/hyperiond/run | 2 ++ srcpkgs/hyperion/patches/assert.patch | 26 ++++++++++++++++++++++++++ srcpkgs/hyperion/patches/musl.patch | 13 +++++++++++++ srcpkgs/hyperion/template | 27 +++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 srcpkgs/hyperion/files/hyperiond/run create mode 100644 srcpkgs/hyperion/patches/assert.patch create mode 100644 srcpkgs/hyperion/patches/musl.patch create mode 100644 srcpkgs/hyperion/template diff --git a/srcpkgs/hyperion/files/hyperiond/run b/srcpkgs/hyperion/files/hyperiond/run new file mode 100644 index 0000000000..c02ed5c33f --- /dev/null +++ b/srcpkgs/hyperion/files/hyperiond/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -u nobody:dialout hyperiond /etc/hyperion/hyperion.config.json diff --git a/srcpkgs/hyperion/patches/assert.patch b/srcpkgs/hyperion/patches/assert.patch new file mode 100644 index 0000000000..24f7ad7f72 --- /dev/null +++ b/srcpkgs/hyperion/patches/assert.patch @@ -0,0 +1,26 @@ +Source: https://github.com/hyperion-project/hyperion/commit/ad764cfeabfdea879a3cef92e291e5fc3888fc2f +Upstream: Yes +Reason: FTBFS + + +commit ad764cfeabfdea879a3cef92e291e5fc3888fc2f +Author: jelle van der Waa +Date: Sat Oct 21 23:44:08 2017 +0200 + + Fix no decleration of `assert` with GCC 7.2 (#767) + + Add a missing include for cassert to fix the -fpermissive compiler + error. + +diff --git include/utils/Image.h include/utils/Image.h +index e8c82e4..dad57a2 100644 +--- include/utils/Image.h ++++ include/utils/Image.h +@@ -1,6 +1,7 @@ + #pragma once + + // STL includes ++#include + #include + #include + #include diff --git a/srcpkgs/hyperion/patches/musl.patch b/srcpkgs/hyperion/patches/musl.patch new file mode 100644 index 0000000000..821cd0ffc0 --- /dev/null +++ b/srcpkgs/hyperion/patches/musl.patch @@ -0,0 +1,13 @@ +diff --git libsrc/utils/Logger.cpp libsrc/utils/Logger.cpp +index 5e803dd..fbfe0f8 100644 +--- libsrc/utils/Logger.cpp ++++ libsrc/utils/Logger.cpp +@@ -46,7 +46,7 @@ Logger::Logger ( std::string name, LogLevel minLevel ): + _syslogEnabled(true), + _loggerId(loggerId++) + { +-#ifdef __GLIBC__ ++#ifdef __linux__ + _appname = std::string(program_invocation_short_name); + #else + _appname = std::string(getprogname()); diff --git a/srcpkgs/hyperion/template b/srcpkgs/hyperion/template new file mode 100644 index 0000000000..bb17856d12 --- /dev/null +++ b/srcpkgs/hyperion/template @@ -0,0 +1,27 @@ +# Template file for 'hyperion' +pkgname=hyperion +version=1.03.2 +revision=1 +build_style=cmake +configure_args="-DUSE_SYSTEM_PROTO_LIBS=ON -DENABLE_QT5=ON + -DPROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc -DENABLE_AMLOGIC=ON + -DENABLE_X11=ON -DENABLE_SPIDEV=ON -DQT_PREFIX=${XBPS_CROSS_BASE}/usr + $(vopt_if dispmanx -DENABLE_DISPMANX=ON -DENABLE_FB=ON)" +hostmakedepends="protobuf qt5-host-tools qt5-qmake" +makedepends="libusb-devel protobuf-devel python3-devel qt5-devel $(vopt_if dispmanx rpi-userland-devel)" +short_desc="Ambient Lighting Software" +maintainer="Christian Buschau " +license="MIT" +homepage="https://hyperion-project.org/" +distfiles="https://github.com/hyperion-project/hyperion/archive/${version}.tar.gz" +checksum=aa2e226f1fe035166379eefef00bf389b36da514739fa24a3608b2ef44fc7b18 +conf_files="/etc/hyperion/hyperion.config.json" + +build_options="dispmanx" +desc_option_dispmanx="Enable the RPI dispmanx grabber (disables FB grabber)" + +post_install() { + vinstall config/hyperion.config.json.example 0644 etc/hyperion hyperion.config.json + vsv hyperiond + vlicense LICENSE +}