jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

glibmm: bump to version 2.46.1

Browse Source 
Adjust pulseview/libsigrok for the gcc >= 4.8 dependency.

Line wrap comment depends for pulseview.

Drop redundant libsigrok depend on comment for libsigrok++.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Gustavo Zacarias 2015-11-13 15:05:55 -03:00 committed by Peter Korsgaard
parent 36862c71a8
commit 5fcd6c4a3a
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/glibmm/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_GLIBMM
bool "glibmm" bool "glibmm"
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBSIGC select BR2_PACKAGE_LIBSIGC
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
@ -11,7 +12,7 @@ config BR2_PACKAGE_GLIBMM
http://www.gtkmm.org/ http://www.gtkmm.org/
comment "glibmm needs a toolchain w/ C++, wchar, threads" comment "glibmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

4
package/glibmm/glibmm.hash
View File

@ -1,2 +1,2 @@
# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.36/glibmm-2.36.1.sha256sum # From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.46/glibmm-2.46.1.sha256sum
sha256 d1f7dec2fd75ea95034ec143fcf2ff77a02e92aacf3e0cc110f9c67e7fe23766 glibmm-2.36.1.tar.xz sha256 9647e596c1081d2ea202bd3da2824ec2ea359498fa86eb59a55b1b307dd8c4aa glibmm-2.46.1.tar.xz

2
package/glibmm/glibmm.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
GLIBMM_VERSION_MAJOR = 2.36 GLIBMM_VERSION_MAJOR = 2.46
GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).1 GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).1
GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools) GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
GLIBMM_LICENSE_FILES = COPYING COPYING.tools GLIBMM_LICENSE_FILES = COPYING COPYING.tools

7
package/libsigrok/Config.in
View File

@ -24,12 +24,13 @@ config BR2_PACKAGE_LIBSIGROKCXX
bool "build C++ bindings" bool "build C++ bindings"
select BR2_PACKAGE_GLIBMM select BR2_PACKAGE_GLIBMM
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # glibmm
help help
Build libsigrok C++ bindings as well. Build libsigrok C++ bindings as well.
comment "C++ bindings need a toolchain w/ C++" comment "C++ bindings need a toolchain w/ C++, gcc >= 4.8"
depends on BR2_PACKAGE_LIBSIGROK depends on !BR2_INSTALL_LIBSTDCPP || \
depends on !BR2_INSTALL_LIBSTDCPP !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
endif endif

7
package/pulseview/Config.in
View File

@ -17,15 +17,16 @@ config BR2_PACKAGE_PULSEVIEW
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
# libsigrok # libsigrok
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
help help
PulseView is a Qt based logic analyzer, oscilloscope PulseView is a Qt based logic analyzer, oscilloscope
and MSO GUI for sigrok. and MSO GUI for sigrok.
http://sigrok.org/wiki/PulseView http://sigrok.org/wiki/PulseView
comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.7" comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.8"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT5
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \
|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP