jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 15:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/lua-periphery: bump to version 1.0.6

Browse Source 
Also remove patch 0001-fix-build-flags.patch. The uCLibc issue is fixed
upstream.

Add patch taken and slighly adopted from the c-periphery package to fix build
issue with musl.

Build was tested with an uCLibc toolchain and a musl toolchain.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Jörg Krause 2015-09-15 00:40:35 +02:00 committed by Thomas Petazzoni
parent 4685485ef7
commit 08647c6328
4 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
package/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch Normal file
View File

@ -0,0 +1,34 @@
From 1d8cb0ad54099c3d7261aaa19a2c0786f16736d0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 8 Aug 2015 22:42:39 +0200
Subject: [PATCH] Add missing header for musl compatibility
<linux/ioctl.h> is needed to get the definition of _IOC_SIZEBITS and
solve the following build failure:
src/spi.c: In function 'spi_transfer':
src/spi.c:100:24: error: '_IOC_SIZEBITS' undeclared (first use in this function)
if (ioctl(spi->fd, SPI_IOC_MESSAGE(1), &spi_xfer) < 1)
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Port from c-periphery]
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
src/spi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lua-periphery/c-periphery/src/spi.c b/lua-periphery/c-periphery/src/spi.c
index 52a8d3d..1a6b17c 100644
--- a/lua-periphery/c-periphery/src/spi.c
+++ b/lua-periphery/c-periphery/src/spi.c
@@ -16,6 +16,7 @@
#include <errno.h>
#include <sys/ioctl.h>
+#include <linux/ioctl.h>
#include <linux/spi/spidev.h>
#include "spi.h"
--
2.5.0

21
package/lua-periphery/0001-fix-build-flags.patch
View File

@ -1,21 +0,0 @@
Fix build flags to build properly with uClibc
Building with -std=c99 -D_DEFAULT_SOURCE hides the struct timespec and
nanosleep() definitions from <time.h> in uClibc. Work around that by
using -std=gnu99 instead.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/lua-periphery/Makefile
===================================================================
--- a/lua-periphery/Makefile
+++ b/lua-periphery/Makefile
@@ -16,7 +16,7 @@
###########################################################################
-CFLAGS += -std=c99 -pedantic -D_DEFAULT_SOURCE
+CFLAGS += -std=gnu99 -pedantic
CFLAGS += -Wall -Wextra -Wno-unused-parameter $(DEBUG) -fPIC -I. $(LUA_CFLAGS)
LDFLAGS += -shared

2
package/lua-periphery/lua-periphery.hash
View File

@ -1,2 +1,2 @@
# Locally computed
sha256 f94f4af342e531ff25b037b8b7c127db50b7464c0bbce4c5ea3b49fd215ada60 lua-periphery-1.0.5-2.src.rock
sha256 53762ed9b8a2edfcc5b4c535ef73e6a425f2577e036bb15994ca16a39b16ebab lua-periphery-1.0.6-1.src.rock

4
package/lua-periphery/lua-periphery.mk
View File

@ -4,8 +4,8 @@
#
################################################################################
LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.5
LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-2
LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.6
LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-1
LUA_PERIPHERY_SUBDIR = lua-periphery
LUA_PERIPHERY_LICENSE = MIT
LUA_PERIPHERY_LICENSE_FILES = $(LUA_PERIPHERY_SUBDIR)/LICENSE