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

Merge branch 'dev' of github.com:ccrisan/thingos into dev

Browse Source
This commit is contained in:
Calin Crisan 2019-08-19 21:50:22 +03:00
commit a9cc2824c5
15 changed files with 73 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/raspberrypi2_defconfig
View File

@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi2/overlay"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6e787b87ace9f945f17a9022288e2758ed281cf7.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"

2
configs/raspberrypi3_defconfig
View File

@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi3/overlay"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6e787b87ace9f945f17a9022288e2758ed281cf7.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"

2
configs/raspberrypi4_defconfig
View File

@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi4/overlay"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6e787b87ace9f945f17a9022288e2758ed281cf7.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b"

2
configs/raspberrypi_defconfig
View File

@ -19,7 +19,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/overlay"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6e787b87ace9f945f17a9022288e2758ed281cf7.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"

2
package/libv4l/libv4l.hash
View File

@ -1,6 +1,6 @@
# Locally calculated after checking signature
# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.3.tar.bz2.asc
sha256 7c5c0d49c130cf65d384f28e9f3a53c5f7d17bf18740c48c40810e0fbbed5b54 v4l-utils-1.16.3.tar.bz2
sha256 f9dac1878e3d5636eab7f56bb209fdfc66b94ee8a2aae54dcb4282fe63a678ae v4l-utils-1.16.6.tar.bz2
# Locally calculated
sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING
sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l

2
package/libv4l/libv4l.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBV4L_VERSION = 1.16.3
LIBV4L_VERSION = 1.16.6
LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
LIBV4L_INSTALL_STAGING = YES

35
package/motion/0001-enable-awb-greyworld.patch Normal file
View File

@ -0,0 +1,35 @@
diff --git a/raspicam/RaspiCamControl.c b/raspicam/RaspiCamControl.c
index 073d657..ad0e405 100644
--- a/raspicam/RaspiCamControl.c
+++ b/raspicam/RaspiCamControl.c
@@ -73,7 +73,8 @@ static XREF_T awb_map[] =
{"fluorescent", MMAL_PARAM_AWBMODE_FLUORESCENT},
{"incandescent", MMAL_PARAM_AWBMODE_INCANDESCENT},
{"flash", MMAL_PARAM_AWBMODE_FLASH},
- {"horizon", MMAL_PARAM_AWBMODE_HORIZON}
+ {"horizon", MMAL_PARAM_AWBMODE_HORIZON},
+ {"greyworld", MMAL_PARAM_AWBMODE_GREYWORLD}
};
static const int awb_map_size = sizeof(awb_map) / sizeof(awb_map[0]);
@@ -1196,6 +1197,7 @@ int raspicamcontrol_set_exposure_mode(MMAL_COMPONENT_T *camera, MMAL_PARAM_EXPOS
* - MMAL_PARAM_AWBMODE_INCANDESCENT,
* - MMAL_PARAM_AWBMODE_FLASH,
* - MMAL_PARAM_AWBMODE_HORIZON,
+ * - MMAL_PARAM_AWBMODE_GREYWORLD,
* @return 0 if successful, non-zero if any parameters out of range
*/
int raspicamcontrol_set_awb_mode(MMAL_COMPONENT_T *camera, MMAL_PARAM_AWBMODE_T awb_mode)
diff --git a/raspicam/RaspiCamControl.h b/raspicam/RaspiCamControl.h
index f4c189a..e7a847f 100644
--- a/raspicam/RaspiCamControl.h
+++ b/raspicam/RaspiCamControl.h
@@ -57,6 +57,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
MMAL_PARAM_AWBMODE_INCANDESCENT,
MMAL_PARAM_AWBMODE_FLASH,
MMAL_PARAM_AWBMODE_HORIZON,
+ MMAL_PARAM_AWBMODE_GREYWORLD,
*
* Image FX
MMAL_PARAM_IMAGEFX_NONE,

27
package/python-picamera/0001-enable-awb-greyworld-mode.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/picamera/camera.py b/picamera/camera.py
index 36b1202..a7da186 100644
--- a/picamera/camera.py
+++ b/picamera/camera.py
@@ -274,6 +274,7 @@ class PiCamera(object):
'incandescent': mmal.MMAL_PARAM_AWBMODE_INCANDESCENT,
'flash': mmal.MMAL_PARAM_AWBMODE_FLASH,
'horizon': mmal.MMAL_PARAM_AWBMODE_HORIZON,
+ 'greyworld': mmal.MMAL_PARAM_AWBMODE_GREYWORLD,
}
IMAGE_EFFECTS = {
diff --git a/picamera/mmal.py b/picamera/mmal.py
index 81b059f..82b2b5f 100644
--- a/picamera/mmal.py
+++ b/picamera/mmal.py
@@ -692,7 +692,8 @@ MMAL_PARAM_AWBMODE_T = ct.c_uint32 # enum
MMAL_PARAM_AWBMODE_INCANDESCENT,
MMAL_PARAM_AWBMODE_FLASH,
MMAL_PARAM_AWBMODE_HORIZON,
-) = range(10)
+ MMAL_PARAM_AWBMODE_GREYWORLD,
+) = range(11)
MMAL_PARAM_AWBMODE_MAX = 0x7fffffff
class MMAL_PARAMETER_AWBMODE_T(ct.Structure):

2
package/rpi-firmware/rpi-firmware.hash
View File

@ -1 +1 @@
sha256 c8d411ad15a393bbd25ca2c1e71ab0d26432e0f39eaac7d7c26f0c60e784ca09 rpi-firmware-56e23d83c456bf36eb798fcd7c7271675e082f1b.tar.gz
sha256 b3a8bd532ca38f90e322be9fe4858a974e04ba8254248e416bf9e9ec5f176d95 rpi-firmware-66bafab005569e3eb92ec54cd3efeee3da338738.tar.gz

2
package/rpi-firmware/rpi-firmware.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
RPI_FIRMWARE_VERSION = 56e23d83c456bf36eb798fcd7c7271675e082f1b
RPI_FIRMWARE_VERSION = 66bafab005569e3eb92ec54cd3efeee3da338738
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
RPI_FIRMWARE_LICENSE = BSD-3-Clause
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

11
package/rpi-userland/0003-Disable-Werror-everywhere.patch
View File

@ -158,17 +158,6 @@ index fde18da..802c158 100755
# vc_vchi_gencmd.c has a type-punning problem in vc_gencmd_read_response
add_definitions(-fno-strict-aliasing)
diff --git a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
index aed0e83..d834b3f 100644
--- a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
+++ b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_definitions(-Werror)
+add_definitions()
# vcfiled - serves files to videocore. used for media handlers from
# OpenMAX/IL and loading VLLs.
--
2.19.0

47
package/rpi-userland/S94vcfiled
View File

@ -1,47 +0,0 @@
#!/bin/sh
NAME=vcfiled
DESC="VideoCore file server daemon $NAME"
DAEMON="/usr/sbin/$NAME"
DAEMON_ARGS=""
CFGFILE="/etc/default/$NAME"
PIDFILE="/var/run/$NAME.pid"
# Read configuration variable file if it is present
[ -r "$CFGFILE" ] && . "$CFGFILE"
start()
{
printf "Starting $DESC: "
start-stop-daemon -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS &&
echo "done" || echo "failed"
}
stop()
{
printf "Stopping $DESC: "
if start-stop-daemon -K -q -R TERM/30/KILL/5 -p "$PIDFILE" -n "$NAME"; then
# This daemon does not remove its PID file when it exits.
rm -f "$PIDFILE"
echo "done"
else
echo "failed"
fi
}
case "$1" in
start)
start
;;
stop)
stop
;;
restart|reload)
stop
start
;;
*)
echo "Usage: $0 {start|stop|restart|reload}" >&2
exit 1
;;
esac

2
package/rpi-userland/rpi-userland.hash
View File

@ -1 +1 @@
sha256 6a39327563c3dd5c16803e3937812541f6b273aba6da78921bf89b10b2865bde rpi-userland-30c89b53f2aa1496c09096e241e7d79724561052.tar.gz
sha256 f0909d5fcdc53b9227e307b858ed695dcaa6dce7f90acee0de3cb9add4f8ad12 rpi-userland-2f85f2db007fb7b15ed1b485f42eae4cc6bc2bf4.tar.gz

22
package/rpi-userland/rpi-userland.mk
View File

@ -4,31 +4,16 @@
#
################################################################################
RPI_USERLAND_VERSION = 30c89b53f2aa1496c09096e241e7d79724561052
RPI_USERLAND_VERSION = 2f85f2db007fb7b15ed1b485f42eae4cc6bc2bf4
RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
RPI_USERLAND_LICENSE = BSD-3-Clause
RPI_USERLAND_LICENSE_FILES = LICENCE
RPI_USERLAND_INSTALL_STAGING = YES
RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr \
-DCMAKE_C_FLAGS="$(TARGET_CFLAGS) \
-DVCFILED_LOCKFILE=\\\"/var/run/vcfiled.pid\\\""
-DCMAKE_C_FLAGS="$(TARGET_CFLAGS)"
RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
ifeq ($(BR2_PACKAGE_RPI_USERLAND_START_VCFILED),y)
define RPI_USERLAND_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/rpi-userland/S94vcfiled \
$(TARGET_DIR)/etc/init.d/S94vcfiled
endef
define RPI_USERLAND_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 644 package/rpi-userland/vcfiled.service \
$(TARGET_DIR)/usr/lib/systemd/system/vcfiled.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../usr/lib/systemd/system/vcfiled.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vcfiled.service
endef
endif
ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y)
RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON
@ -54,9 +39,6 @@ RPI_USERLAND_CONF_OPTS += -DALL_APPS=OFF
endif # BR2_PACKAGE_RPI_USERLAND_HELLO
define RPI_USERLAND_POST_TARGET_CLEANUP
rm -f $(TARGET_DIR)/etc/init.d/vcfiled
rm -f $(TARGET_DIR)/usr/share/install/vcfiled
rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/install
rm -Rf $(TARGET_DIR)/usr/src
endef
RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP

9
package/rpi-userland/vcfiled.service
View File

@ -1,9 +0,0 @@
[Unit]
Description=VideoCore file server daemon
[Service]
ExecStart=/usr/sbin/vcfiled --foreground
Restart=always
[Install]
WantedBy=multi-user.target