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

Merge remote-tracking branch 'thingos/dev' into dev

Browse Source
This commit is contained in:
Calin Crisan 2019-08-19 21:51:02 +03:00
commit 2aed981b41
5 changed files with 65 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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/streameye/streameye.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
STREAMEYE_VERSION = 6e4d9e3ad12ea8e5c0acef4d92f96bb0126ebcac
STREAMEYE_VERSION = 502a63bb14f8105a3daa9f0940b237300fe76d6f
STREAMEYE_SITE = $(call github,ccrisan,streameye,$(STREAMEYE_VERSION))
STREAMEYE_LICENSE = GPLv3