Mercurial > louis > mq > lightsd
changeset 474:59061c76f3b2
Automated merge with ssh://lardossa.kalessin.fr/projs/lightsd/.hg/patches
author | Louis Opter <kalessin@kalessin.fr> |
---|---|
date | Sat, 25 Jun 2016 16:06:14 -0700 |
parents | d553a41aab6c (current diff) 86f99a847b20 (diff) |
children | 0ade7fb71c8c |
files | |
diffstat | 3 files changed, 109 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/do_not_warn_on_unknown_packets.patch Sat Jun 25 16:06:14 2016 -0700 @@ -0,0 +1,18 @@ +# HG changeset patch +# Parent 0609b70c96424f0d43b1a7d97171f7831b3d33a4 +Do not warn when receiving unknown LIFX packets + +This is confusing people, INFO is good enough. + +diff --git a/lifx/wire_proto.c b/lifx/wire_proto.c +--- a/lifx/wire_proto.c ++++ b/lifx/wire_proto.c +@@ -810,7 +810,7 @@ + const struct lgtd_lifx_packet_info *pkt_info = + lgtd_lifx_wire_get_packet_info(read.hdr.packet_type); + if (!pkt_info) { +- lgtd_warnx( ++ lgtd_info( + "received unknown packet %#x from %s", + read.hdr.packet_type, peer_addr + );
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pkgbuild_fix.patch Sat Jun 25 16:06:14 2016 -0700 @@ -0,0 +1,89 @@ +# HG changeset patch +# Parent b0cc0e6c6801ce4593bc7d998d767981e07f9c35 +Fix Pacman (Arch Linux) packaging + +Like on Debian, hyphens in version numbers aren't supported, so use a +tilde instead. + +While we are at it, fix a CMake warning when you have all the +dependencies for the release script but are missing Sphinx to build the +docs. + +diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt +--- a/dist/CMakeLists.txt ++++ b/dist/CMakeLists.txt +@@ -21,9 +21,11 @@ + pre_release + package_release + release_new_tag +- release_docs + release_debuild + ) ++IF (SPHINX_FOUND) ++ LIST(APPEND RELEASE_COMMANDS release_docs) ++ENDIF () + FOREACH (TARGET ${RELEASE_COMMANDS}) + ADD_CUSTOM_TARGET( + ${TARGET} +@@ -33,7 +35,9 @@ + ) + ENDFOREACH () + +-ADD_DEPENDENCIES(release_docs docs) ++IF (SPHINX_FOUND) ++ ADD_DEPENDENCIES(release_docs docs) ++ENDIF (SPHINX_FOUND) + + SET( + EXTRA_OUTPUT +diff --git a/dist/pkgbuild/.SRCINFO b/dist/pkgbuild/.SRCINFO +--- a/dist/pkgbuild/.SRCINFO ++++ b/dist/pkgbuild/.SRCINFO +@@ -1,6 +1,6 @@ + pkgbase = lightsd + pkgdesc = Daemon to control your LIFX smart bulbs via a JSON-RPC API +- pkgver = {{ version }} ++ pkgver = {{ version|replace("-", "~") }} + pkgrel = {{ build_number }} + epoch = 1 + url = https://www.github.com/lopter/lightsd/ +diff --git a/dist/pkgbuild/PKGBUILD b/dist/pkgbuild/PKGBUILD +--- a/dist/pkgbuild/PKGBUILD ++++ b/dist/pkgbuild/PKGBUILD +@@ -1,7 +1,9 @@ + # Maintainer: Louis Opter <kalessin@kalessin.fr> + + pkgname=lightsd +-pkgver={{ version }} ++pkgver={{ version|replace("-", "~") }} ++# This will have - instead of ~ for rc versions: ++_lightsdver={{ version }} + pkgrel={{ build_number }} + epoch=1 + pkgdesc="Daemon to control your LIFX smart bulbs via a JSON-RPC API" +@@ -19,7 +21,7 @@ + install=lightsd.install + + build() { +- cd "$srcdir/$pkgname-$pkgver" ++ cd "$srcdir/$pkgname-$_lightsdver" + + cmake . \ + -DCMAKE_BUILD_TYPE=RELEASE \ +@@ -30,14 +32,13 @@ + } + + check() { +- cd "$srcdir/$pkgname-$pkgver" ++ cd "$srcdir/$pkgname-$_lightsdver" + + make test + } + + package() { +- cd "$srcdir/$pkgname-$pkgver" ++ cd "$srcdir/$pkgname-$_lightsdver" + + make DESTDIR="$pkgdir/" install + } +-
--- a/series Tue Jun 21 10:07:55 2016 -0700 +++ b/series Sat Jun 25 16:06:14 2016 -0700 @@ -1,5 +1,7 @@ mkdtemp_error_handling.patch dont_use_time_t.patch +do_not_warn_on_unknown_packets.patch +pkgbuild_fix.patch add_power_transition.patch open_gateway_on_any_bulb_response.patch #+future make_gateway_write_callbacks_low_priority.patch #+future