diff --git a/board/raspberrypi/motioneye-modules/streameyectl.py b/board/raspberrypi/motioneye-modules/streameyectl.py index 25e884f231..a00e15843e 100644 --- a/board/raspberrypi/motioneye-modules/streameyectl.py +++ b/board/raspberrypi/motioneye-modules/streameyectl.py @@ -112,10 +112,15 @@ RESOLUTION_CHOICES = [ ('1280x800', '1280x800'), ('1280x960', '1280x960'), ('1280x1024', '1280x1024'), + ('1296x972', '1296x972'), ('1440x960', '1440x960'), ('1440x1024', '1440x1024'), ('1600x1200', '1600x1200'), - ('1920x1080', '1920x1080') + ('1640x922', '1640x922'), + ('1640x1232', '1640x1232'), + ('1920x1080', '1920x1080'), + ('2592x1944', '2592x1944'), + ('3280x2464', '3280x2464') ] ROTATION_CHOICES = [ diff --git a/board/raspberrypi2/motioneye-modules/streameyectl.py b/board/raspberrypi2/motioneye-modules/streameyectl.py index 25e884f231..a00e15843e 100644 --- a/board/raspberrypi2/motioneye-modules/streameyectl.py +++ b/board/raspberrypi2/motioneye-modules/streameyectl.py @@ -112,10 +112,15 @@ RESOLUTION_CHOICES = [ ('1280x800', '1280x800'), ('1280x960', '1280x960'), ('1280x1024', '1280x1024'), + ('1296x972', '1296x972'), ('1440x960', '1440x960'), ('1440x1024', '1440x1024'), ('1600x1200', '1600x1200'), - ('1920x1080', '1920x1080') + ('1640x922', '1640x922'), + ('1640x1232', '1640x1232'), + ('1920x1080', '1920x1080'), + ('2592x1944', '2592x1944'), + ('3280x2464', '3280x2464') ] ROTATION_CHOICES = [ diff --git a/board/raspberrypi3/motioneye-modules/streameyectl.py b/board/raspberrypi3/motioneye-modules/streameyectl.py index 25e884f231..a00e15843e 100644 --- a/board/raspberrypi3/motioneye-modules/streameyectl.py +++ b/board/raspberrypi3/motioneye-modules/streameyectl.py @@ -112,10 +112,15 @@ RESOLUTION_CHOICES = [ ('1280x800', '1280x800'), ('1280x960', '1280x960'), ('1280x1024', '1280x1024'), + ('1296x972', '1296x972'), ('1440x960', '1440x960'), ('1440x1024', '1440x1024'), ('1600x1200', '1600x1200'), - ('1920x1080', '1920x1080') + ('1640x922', '1640x922'), + ('1640x1232', '1640x1232'), + ('1920x1080', '1920x1080'), + ('2592x1944', '2592x1944'), + ('3280x2464', '3280x2464') ] ROTATION_CHOICES = [ diff --git a/package/python-picamera/python-picamera.mk b/package/python-picamera/python-picamera.mk index e5ae4d421b..ef2a1a48a5 100644 --- a/package/python-picamera/python-picamera.mk +++ b/package/python-picamera/python-picamera.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PICAMERA_VERSION = 1.10 +PYTHON_PICAMERA_VERSION = 1.12 PYTHON_PICAMERA_SOURCE = picamera-$(PYTHON_PICAMERA_VERSION).tar.gz -PYTHON_PICAMERA_SITE = http://pypi.python.org/packages/source/p/picamera +PYTHON_PICAMERA_SITE = https://pypi.python.org/packages/ab/53/54a20f53e61df5c329480207fb0b6e6e25c64d16e82e899de335e08df7d9 PYTHON_PICAMERA_SETUP_TYPE = distutils $(eval $(python-package))