From d7d797739830826c01561fb92e582cf83864f2b5 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 15 Nov 2018 23:34:10 +0200 Subject: [PATCH] rpi-armmem: update & enable for all rpis --- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi_defconfig | 1 - package/Config.in | 6 ++++++ package/rpi-armmem/rpi-armmem.mk | 7 ++++--- package/streameye/Config.in | 3 +++ package/streameye/streameye.mk | 21 +++++++++++++++++++++ 7 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 package/streameye/Config.in create mode 100644 package/streameye/streameye.mk diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 75101f0aa9..221a5e87a5 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -42,7 +42,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y -BR2_PACKAGE_LAN951X_LED_CTL=y +BR2_PACKAGE_RPI_ARMMEM=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_CA_CERTIFICATES=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index dec0f46668..ace3079ad2 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -42,7 +42,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y -BR2_PACKAGE_LAN951X_LED_CTL=y +BR2_PACKAGE_RPI_ARMMEM=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_CA_CERTIFICATES=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 9d7cf395d6..e4be298d26 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -49,7 +49,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y -BR2_PACKAGE_LAN951X_LED_CTL=y BR2_PACKAGE_RPI_ARMMEM=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y diff --git a/package/Config.in b/package/Config.in index f5a17492c7..504a17805c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -28,6 +28,7 @@ menu "Audio and video applications" source "package/jack2/Config.in" source "package/kodi/Config.in" source "package/lame/Config.in" + source "package/libwebcam/Config.in" source "package/madplay/Config.in" source "package/mimic/Config.in" source "package/miraclecast/Config.in" @@ -46,6 +47,7 @@ menu "Audio and video applications" source "package/opus-tools/Config.in" source "package/pulseaudio/Config.in" source "package/sox/Config.in" + source "package/streameye/Config.in" source "package/squeezelite/Config.in" source "package/tidsp-binaries/Config.in" source "package/tovid/Config.in" @@ -494,6 +496,7 @@ endmenu source "package/pulseview/Config.in" source "package/read-edid/Config.in" source "package/rng-tools/Config.in" + source "package/rpi-armmem/Config.in" source "package/rpi-userland/Config.in" source "package/rs485conf/Config.in" source "package/rtl8188eu/Config.in" @@ -873,6 +876,7 @@ menu "External python modules" source "package/python-pathvalidate/Config.in" source "package/python-pexpect/Config.in" source "package/python-pickleshare/Config.in" + source "package/python-picamera/Config.in" source "package/python-pillow/Config.in" source "package/python-portend/Config.in" source "package/python-posix-ipc/Config.in" @@ -888,6 +892,7 @@ menu "External python modules" source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" source "package/python-pycrypto/Config.in" + source "package/python-pycurl/Config.in" source "package/python-pydal/Config.in" source "package/python-pyelftools/Config.in" source "package/python-pyftpdlib/Config.in" @@ -898,6 +903,7 @@ menu "External python modules" source "package/python-pylibftdi/Config.in" source "package/python-pylru/Config.in" source "package/python-pymodbus/Config.in" + source "package/python-pymongo/Config.in" source "package/python-pymysql/Config.in" source "package/python-pynacl/Config.in" source "package/python-pyopenssl/Config.in" diff --git a/package/rpi-armmem/rpi-armmem.mk b/package/rpi-armmem/rpi-armmem.mk index 373ebd5af3..3efe9d6e4a 100644 --- a/package/rpi-armmem/rpi-armmem.mk +++ b/package/rpi-armmem/rpi-armmem.mk @@ -4,16 +4,17 @@ # ################################################################################ -RPI_ARMMEM_VERSION = c06d1f1bc2736d91597282d6c189065e4ba66e31 +RPI_ARMMEM_VERSION = a3277ce9505cadfb158a7a128196058f3cc9fc47 RPI_ARMMEM_SITE = $(call github,bavison,arm-mem,$(RPI_ARMMEM_VERSION)) CFLAGS = -fPIC -std=gnu99 -O2 define RPI_ARMMEM_BUILD_CMDS - $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" CFLAGS="$(CFLAGS)" libarmmem.so -C $(@D) + $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" CFLAGS="$(CFLAGS)" all -C $(@D) endef define RPI_ARMMEM_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/libarmmem.so $(TARGET_DIR)/usr/lib/libarmmem.so + if [ -n "$(BR2_cortex_a7)" ]; then suffix="v7l"; else suffix="v6l"; fi + $(INSTALL) -D -m 0755 $(@D)/libarmmem-$${suffix}.so $(TARGET_DIR)/usr/lib/libarmmem.so endef $(eval $(generic-package)) diff --git a/package/streameye/Config.in b/package/streameye/Config.in new file mode 100644 index 0000000000..51bd52f25f --- /dev/null +++ b/package/streameye/Config.in @@ -0,0 +1,3 @@ +config BR2_PACKAGE_STREAMEYE + bool "streameye" + diff --git a/package/streameye/streameye.mk b/package/streameye/streameye.mk new file mode 100644 index 0000000000..3510e1506b --- /dev/null +++ b/package/streameye/streameye.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# streameye +# +################################################################################ + +STREAMEYE_VERSION = ffd6f28a094f70c70893f6e516610459faa15ea2 +STREAMEYE_SITE = $(call github,ccrisan,streameye,$(STREAMEYE_VERSION)) +STREAMEYE_LICENSE = GPLv3 + +define STREAMEYE_BUILD_CMDS + make CC="$(TARGET_CC)" -C "$(@D)" +endef + +define STREAMEYE_INSTALL_TARGET_CMDS + cp $(@D)/streameye $(TARGET_DIR)/usr/bin/ + cp $(@D)/extras/raspimjpeg.py $(TARGET_DIR)/usr/bin/ +endef + +$(eval $(generic-package)) +