[arch-commits] Commit in hyperion/repos/community-x86_64 (7 files)
NicoHood
nicohood at archlinux.org
Sun Jan 14 19:35:28 UTC 2018
Date: Sunday, January 14, 2018 @ 19:35:23
Author: nicohood
Revision: 282267
archrelease: copy trunk to community-x86_64
Added:
hyperion/repos/community-x86_64/0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch
(from rev 282266, hyperion/trunk/0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch)
hyperion/repos/community-x86_64/PKGBUILD
(from rev 282266, hyperion/trunk/PKGBUILD)
hyperion/repos/community-x86_64/hyperion.install
(from rev 282266, hyperion/trunk/hyperion.install)
hyperion/repos/community-x86_64/hyperion.sysusers
(from rev 282266, hyperion/trunk/hyperion.sysusers)
hyperion/repos/community-x86_64/hyperiond.service
(from rev 282266, hyperion/trunk/hyperiond.service)
Deleted:
hyperion/repos/community-x86_64/0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch
hyperion/repos/community-x86_64/PKGBUILD
------------------------------------------------------+
0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch | 52 +++----
PKGBUILD | 121 +++++++++--------
hyperion.install | 20 ++
hyperion.sysusers | 2
hyperiond.service | 14 +
5 files changed, 128 insertions(+), 81 deletions(-)
Deleted: 0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch
===================================================================
--- 0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch 2018-01-14 19:35:01 UTC (rev 282266)
+++ 0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch 2018-01-14 19:35:23 UTC (rev 282267)
@@ -1,26 +0,0 @@
-From 88ae95d522bfdda4c29a1116367aad8c7d948779 Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle at vdwaa.nl>
-Date: Sat, 21 Oct 2017 12:46:49 +0200
-Subject: [PATCH] Fix no decleration of `assert` with GCC 7.2
-
-Add a missing include for cassert to fix the -fpermissive compiler
-error.
----
- include/utils/Image.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/utils/Image.h b/include/utils/Image.h
-index e8c82e4..dad57a2 100644
---- a/include/utils/Image.h
-+++ b/include/utils/Image.h
-@@ -1,6 +1,7 @@
- #pragma once
-
- // STL includes
-+#include <cassert>
- #include <vector>
- #include <cstdint>
- #include <cstring>
---
-2.14.2
-
Copied: hyperion/repos/community-x86_64/0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch (from rev 282266, hyperion/trunk/0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch)
===================================================================
--- 0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch (rev 0)
+++ 0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch 2018-01-14 19:35:23 UTC (rev 282267)
@@ -0,0 +1,26 @@
+From 88ae95d522bfdda4c29a1116367aad8c7d948779 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle at vdwaa.nl>
+Date: Sat, 21 Oct 2017 12:46:49 +0200
+Subject: [PATCH] Fix no decleration of `assert` with GCC 7.2
+
+Add a missing include for cassert to fix the -fpermissive compiler
+error.
+---
+ include/utils/Image.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/utils/Image.h b/include/utils/Image.h
+index e8c82e4..dad57a2 100644
+--- a/include/utils/Image.h
++++ b/include/utils/Image.h
+@@ -1,6 +1,7 @@
+ #pragma once
+
+ // STL includes
++#include <cassert>
+ #include <vector>
+ #include <cstdint>
+ #include <cstring>
+--
+2.14.2
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-14 19:35:01 UTC (rev 282266)
+++ PKGBUILD 2018-01-14 19:35:23 UTC (rev 282267)
@@ -1,55 +0,0 @@
-# Maintainer: NicoHood <archlinux {cat} nicohood {dog} de>
-# PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161
-# Contributor: Christopher Reimer <mail+aur[at]c-reimer[dot]de>
-
-pkgname=hyperion
-pkgver=1.03.2
-pkgrel=13
-pkgdesc="An opensource 'AmbiLight' implementation"
-arch=('x86_64')
-url="https://github.com/hyperion-project/hyperion"
-license=('MIT')
-depends=('libusb' 'protobuf' 'python' 'qt5-base')
-optdepends=('xorg-server: X11 grabbing')
-makedepends=('cmake')
-backup=('etc/hyperion/hyperion.config.json')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/tvdzwan/${pkgname}/archive/${pkgver}.tar.gz" "0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch")
-sha512sums=('7406f5bdf323d2799fb375557603fefd1f077cda287b5aa9ff10251b22d8dd07590458515b0e01ef97fba80885aab1aa72bd8b5d26873ad8ebcc1ba53d6776ec'
- '11c51f6085d78bb75a7d73372262eedc2dab84b9d37ee1850f6b8d8c9cfe85d72a69b7d755e169028c6f7150f09201ded7d32a4edf15130ca2a12a188fe5945c')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch"
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- mkdir -p build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" \
- -DCMAKE_BUILD_TYPE=Release \
- -DENABLE_QT5=ON \
- -DPLATFORM=x86 \
- -DPROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc \
- -DUSE_SYSTEM_PROTO_LIBS=ON \
- ..
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- cd build
- make install
- cd ..
-
- install -Dm 644 config/hyperion.config.json.example \
- "${pkgdir}/etc/hyperion/hyperion.config.json"
-
- install -Dm 644 bin/service/hyperion.systemd.sh \
- "${pkgdir}/usr/lib/systemd/system/hyperiond.service"
-
- rm -rf "${pkgdir}/usr/share/hyperion/service"
-
- install -Dm 644 LICENSE \
- "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: hyperion/repos/community-x86_64/PKGBUILD (from rev 282266, hyperion/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-14 19:35:23 UTC (rev 282267)
@@ -0,0 +1,66 @@
+# Maintainer: NicoHood <archlinux {cat} nicohood {dog} de>
+# PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161
+# Contributor: Christopher Reimer <mail+aur[at]c-reimer[dot]de>
+
+pkgname=hyperion
+pkgver=1.03.2
+pkgrel=14
+pkgdesc="An opensource 'AmbiLight' implementation"
+arch=('x86_64')
+url="https://github.com/hyperion-project/hyperion"
+license=('MIT')
+depends=('libusb' 'protobuf' 'python' 'qt5-base')
+optdepends=('xorg-server: X11 grabbing')
+makedepends=('cmake')
+backup=('etc/hyperion/hyperion.config.json')
+install='hyperion.install'
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/tvdzwan/${pkgname}/archive/${pkgver}.tar.gz"
+ "0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch"
+ "hyperion.sysusers"
+ "hyperiond.service"
+ "hyperion.install")
+sha512sums=('7406f5bdf323d2799fb375557603fefd1f077cda287b5aa9ff10251b22d8dd07590458515b0e01ef97fba80885aab1aa72bd8b5d26873ad8ebcc1ba53d6776ec'
+ '11c51f6085d78bb75a7d73372262eedc2dab84b9d37ee1850f6b8d8c9cfe85d72a69b7d755e169028c6f7150f09201ded7d32a4edf15130ca2a12a188fe5945c'
+ '80764d3abdfb7e6e7f65913e9c89dd61b425ffb80e9ab4f9df7739abe32117441095ac7b45792acd5d2a516cf4aca3e21062b119f5790aae3b178036db74ce61'
+ 'f8c23ba920ce683e731237c164f4f70f94d635398be5cc43ce1af48bb8ab672da47397979a825a5761dacb1ae18a1c5fc840b168c8f1e3ae411908e0e92a0c5b'
+ 'ff5ed8ed647a621b73e922590616e4f5d63f0a7e243aa3de0f8382a835e83166a0e04944396a61a03645cc00853251690a514b3772f163f445240e4f55f18fb5')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/0001-Fix-no-decleration-of-assert-with-GCC-7.2.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ mkdir -p build
+ cd build
+ cmake -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DENABLE_QT5=ON \
+ -DPLATFORM=x86 \
+ -DPROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc \
+ -DUSE_SYSTEM_PROTO_LIBS=ON \
+ ..
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ cd build
+ make install
+ cd ..
+
+ install -Dm 644 config/hyperion.config.json.example \
+ "${pkgdir}/etc/hyperion/hyperion.config.json"
+
+ install -Dm 644 "${srcdir}/hyperiond.service" \
+ "${pkgdir}/usr/lib/systemd/system/hyperiond.service"
+
+ rm -rf "${pkgdir}/usr/share/hyperion/service"
+
+ install -Dm 644 "${srcdir}/hyperion.sysusers" \
+ "${pkgdir}"/usr/lib/sysusers.d/hyperion.conf
+
+ install -Dm 644 LICENSE \
+ "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: hyperion/repos/community-x86_64/hyperion.install (from rev 282266, hyperion/trunk/hyperion.install)
===================================================================
--- hyperion.install (rev 0)
+++ hyperion.install 2018-01-14 19:35:23 UTC (rev 282267)
@@ -0,0 +1,20 @@
+_1.03.2_14_changes() {
+ echo ":: The hyperiond.service now runs as independent user 'hyperion'."
+ echo " Make sure you still have access rights to your ambilight devices."
+ echo " The user 'hyperion' belongs to the 'uucp' group."
+ echo " Also see: https://wiki.archlinux.org/index.php/users_and_groups"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ local v upgrades=(
+ 1.03.2-14
+ )
+
+ for v in "${upgrades[@]}"; do
+ if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
+ "_${v//-/_}_changes"
+ fi
+ done
+}
Copied: hyperion/repos/community-x86_64/hyperion.sysusers (from rev 282266, hyperion/trunk/hyperion.sysusers)
===================================================================
--- hyperion.sysusers (rev 0)
+++ hyperion.sysusers 2018-01-14 19:35:23 UTC (rev 282267)
@@ -0,0 +1,2 @@
+u hyperion - "Hyperion daemon user"
+m hyperion uucp
Copied: hyperion/repos/community-x86_64/hyperiond.service (from rev 282266, hyperion/trunk/hyperiond.service)
===================================================================
--- hyperiond.service (rev 0)
+++ hyperiond.service 2018-01-14 19:35:23 UTC (rev 282267)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Hyperiond Systemd service
+
+[Service]
+Type=simple
+User=hyperion
+Group=hyperion
+ExecStart=/usr/bin/hyperiond /etc/hyperion/hyperion.config.json
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-failure
+TimeoutStopSec=10
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list