Merge branch 'develop'

kerberos-io · Aug 3, 2017 · 820e933 · 820e933
2 parents 08f699f + 741dad7
commit 820e933
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 4 deletions.
diff --git a/board/common/overlay/etc/version b/board/common/overlay/etc/version
@@ -1,4 +1,4 @@
 os_name="Kerberos.io OS"
 os_short_name="kios"
 os_prefix="kios"
-os_version="2.4.0"
+os_version="2.4.1"
diff --git a/board/raspberrypi/overlay/opt/vc/lib b/board/raspberrypi/overlay/opt/vc/lib
@@ -0,0 +1 @@
+../../usr/lib/
diff --git a/board/raspberrypi2/overlay/opt/vc/lib b/board/raspberrypi2/overlay/opt/vc/lib
@@ -0,0 +1 @@
+../../usr/lib/
diff --git a/board/raspberrypi3/overlay/opt/vc/lib b/board/raspberrypi3/overlay/opt/vc/lib
@@ -0,0 +1 @@
+../../usr/lib/
diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
@@ -114,6 +114,7 @@ BR2_PACKAGE_FFMPEG=y
 BR2_PACKAGE_FFMPEG_GPL=y
 BR2_PACKAGE_FFMPEG_NONFREE=y
 BR2_PACKAGE_FFMPEG_SWSCALE=y
+BR2_PACKAGE_FFMPEG_RPI_HW_CODECS=y
 BR2_PACKAGE_PHP=y
 BR2_PACKAGE_PHP_SAPI_CGI=y
 BR2_PACKAGE_PHP_SAPI_CLI=y

diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
@@ -115,6 +115,7 @@ BR2_PACKAGE_FFMPEG=y
 BR2_PACKAGE_FFMPEG_GPL=y
 BR2_PACKAGE_FFMPEG_NONFREE=y
 BR2_PACKAGE_FFMPEG_SWSCALE=y
+BR2_PACKAGE_FFMPEG_RPI_HW_CODECS=y
 BR2_PACKAGE_PHP=y
 BR2_PACKAGE_PHP_SAPI_CGI=y
 BR2_PACKAGE_PHP_SAPI_CLI=y

diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
@@ -114,6 +114,7 @@ BR2_PACKAGE_FFMPEG=y
 BR2_PACKAGE_FFMPEG_GPL=y
 BR2_PACKAGE_FFMPEG_NONFREE=y
 BR2_PACKAGE_FFMPEG_SWSCALE=y
+BR2_PACKAGE_FFMPEG_RPI_HW_CODECS=y
 BR2_PACKAGE_PHP=y
 BR2_PACKAGE_PHP_SAPI_CGI=y
 BR2_PACKAGE_PHP_SAPI_CLI=y

diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
@@ -167,6 +167,12 @@ config BR2_PACKAGE_FFMPEG_OUTDEVS
 	bool "Enable output devices"
 	default y
 
+config BR2_PACKAGE_FFMPEG_RPI_HW_CODECS
+	bool "Enable rpi hardware accelerated codecs"
+	depends on BR2_PACKAGE_RPI_USERLAND
+	help
+	  Enable HW accelerated codecs on Raspberry pi.
+
 config BR2_PACKAGE_FFMPEG_EXTRACONF
 	string "Additional parameters for ./configure"
 	default ""

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
@@ -22,9 +22,7 @@ endif
 FFMPEG_CONF_OPTS = \
 	--prefix=/usr \
 	--enable-static \
-        --disable-shared \
-        --enable-omx \
-        --enable-omx-rpi \
+  --disable-shared \
 	--enable-avfilter \
 	--disable-version3 \
 	--enable-logging \
@@ -480,6 +478,10 @@ else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
 FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH)
 endif
 
+ifeq ($(BR2_PACKAGE_FFMPEG_RPI_HW_CODECS),y)
+FFMPEG_DEPENDENCIES += rpi-userland
+FFMPEG_CONF_OPTS += --enable-omx --enable-omx-rpi --extra-cflags=-I../../staging/usr/include/IL/
+endif
 
 FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))