mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-25 20:26:34 +00:00
package/libcec: bump to version 3.0.1
- reflect upstream changes of the build system by switching from an autotools-package to cmake-package [Thomas: - remove the gcc 4.5 dependency. While we do need a dependency on the gcc version, the proposed implementation was not correct as it wasn't handling external toolchains. - add a patch to fix a problem caused by libcec build system trying to use 'git' to get a version number, which does not work when the version control system information is not available, as is the case in Buildroot.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
f2f242c4ba
commit
cfefcd859f
@ -0,0 +1,31 @@
|
|||||||
|
From 369ffb5be23eca520df99732541d0482da271fd3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lars Op den Kamp <lars@opdenkamp.eu>
|
||||||
|
Date: Sat, 11 Jul 2015 00:53:17 +0200
|
||||||
|
Subject: [PATCH] fixed: don't generate an invalid env.h when not built with
|
||||||
|
the .git dir present. closes #112
|
||||||
|
|
||||||
|
Backported from upstream commit 2f32a9debc1f148b5dfcfc463480f1432bb71725.
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
---
|
||||||
|
support/git-rev.sh | 7 +++++--
|
||||||
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/support/git-rev.sh b/support/git-rev.sh
|
||||||
|
index 5dce3d0..4aadae6 100755
|
||||||
|
--- a/support/git-rev.sh
|
||||||
|
+++ b/support/git-rev.sh
|
||||||
|
@@ -1,5 +1,8 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
## cmake doesn't read the variable when it doesn't end with a newline, and I haven't figured out how to have it add a newline directly...
|
||||||
|
-echo -n "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`\n"
|
||||||
|
-
|
||||||
|
+if [ -d .git ]; then
|
||||||
|
+ echo "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`"
|
||||||
|
+else
|
||||||
|
+ echo "<unknown>"
|
||||||
|
+fi
|
||||||
|
--
|
||||||
|
2.5.0
|
||||||
|
|
@ -1,21 +0,0 @@
|
|||||||
Do not use -Wno-psabi option
|
|
||||||
|
|
||||||
This option was added in gcc 4.5, and Buildroot still uses gcc 4.3 on
|
|
||||||
some architectures. Since it's non essential (only disables some
|
|
||||||
warning), let's get rid of it.
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
||||||
|
|
||||||
Index: b/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -137,7 +137,7 @@
|
|
||||||
use_udev="no"
|
|
||||||
use_adapter_detection="yes"
|
|
||||||
use_lockdev="no"
|
|
||||||
-SUPPRESS_MANGLING_WARNINGS=" -Wno-psabi"
|
|
||||||
+SUPPRESS_MANGLING_WARNINGS=""
|
|
||||||
case "${host}" in
|
|
||||||
*-*-linux*)
|
|
||||||
## search for udev if pkg-config was found
|
|
@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBCEC
|
|||||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||||
depends on BR2_USE_WCHAR
|
depends on BR2_USE_WCHAR
|
||||||
depends on !BR2_STATIC_LIBS
|
depends on !BR2_STATIC_LIBS
|
||||||
|
select BR2_PACKAGE_LIBPLATFORM
|
||||||
help
|
help
|
||||||
libcec allows you in combination with the right hardware to
|
libcec allows you in combination with the right hardware to
|
||||||
control your home theater devices with your TV remote
|
control your home theater devices with your TV remote
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBCEC_VERSION = libcec-2.2.0-repack
|
LIBCEC_VERSION = libcec-3.0.1
|
||||||
LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION))
|
LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION))
|
||||||
LIBCEC_LICENSE = GPLv2+
|
LIBCEC_LICENSE = GPLv2+
|
||||||
LIBCEC_LICENSE_FILES = COPYING
|
LIBCEC_LICENSE_FILES = COPYING
|
||||||
@ -12,7 +12,7 @@ LIBCEC_LICENSE_FILES = COPYING
|
|||||||
# Autoreconf required due to being a dev tarball and not a release tarball.
|
# Autoreconf required due to being a dev tarball and not a release tarball.
|
||||||
LIBCEC_AUTORECONF = YES
|
LIBCEC_AUTORECONF = YES
|
||||||
LIBCEC_INSTALL_STAGING = YES
|
LIBCEC_INSTALL_STAGING = YES
|
||||||
LIBCEC_DEPENDENCIES = host-pkgconf
|
LIBCEC_DEPENDENCIES = host-pkgconf libplatform
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_LOCKDEV),y)
|
ifeq ($(BR2_PACKAGE_LOCKDEV),y)
|
||||||
LIBCEC_DEPENDENCIES += lockdev
|
LIBCEC_DEPENDENCIES += lockdev
|
||||||
@ -22,13 +22,20 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
|||||||
LIBCEC_DEPENDENCIES += udev
|
LIBCEC_DEPENDENCIES += udev
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
|
ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
|
||||||
LIBCEC_CONF_OPTS = --enable-rpi \
|
LIBCEC_DEPENDENCIES += host-swig $(if $(BR2_PACKAGE_PYTHON3),python3,python)
|
||||||
--with-rpi-include-path=$(STAGING_DIR)/usr/include
|
|
||||||
LIBCEC_DEPENDENCIES += rpi-userland
|
|
||||||
LIBCEC_CONF_ENV += LIBS="-lvcos -lvchostif"
|
|
||||||
else
|
|
||||||
LIBCEC_CONF_OPTS = --disable-rpi
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(eval $(autotools-package))
|
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
|
||||||
|
LIBCEC_DEPENDENCIES += rpi-userland
|
||||||
|
LIBCEC_CONF_OPTS += \
|
||||||
|
-DCMAKE_C_FLAGS="-lvcos -lvchiq_arm" \
|
||||||
|
-DCMAKE_CXX_FLAGS="-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux \
|
||||||
|
-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads"
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
|
||||||
|
LIBCEC_DEPENDENCIES += xlib_libXrandr
|
||||||
|
endif
|
||||||
|
|
||||||
|
$(eval $(cmake-package))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user