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

package/grantlee: upgrade to 5.1.0, remove obsolete Qt4 build option

Browse Source 
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Zoltan Gyarmati 2016-06-29 14:33:40 +02:00 committed by Thomas Petazzoni
parent 82c114b227
commit 969285033b
3 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
package/grantlee/Config.in
View File

@ -1,24 +1,9 @@
config BR2_PACKAGE_GRANTLEE config BR2_PACKAGE_GRANTLEE
bool "grantlee" bool "grantlee"
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5
depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ select BR2_PACKAGE_QT5SCRIPT
(BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) select BR2_PACKAGE_QT5BASE_GUI
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
# https://sourceware.org/bugzilla/show_bug.cgi?id=20173
depends on !BR2_microblaze && !BR2_nios2
select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT
select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT
select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5
select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
help help
Qt implementation of the Django template framework Qt implementation of the Django template framework
http://www.grantlee.org http://www.grantlee.org
comment "grantlee needs a toolchain with NPTL not affected by Binutils bug 19405"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on !BR2_microblaze && !BR2_nios2
depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \
(BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || \
BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405

3
package/grantlee/grantlee.hash
View File

@ -1,3 +1,2 @@
# Locally calculated after checking pgp signature # Locally calculated after checking pgp signature
sha256 191809bf4c9b7ef877af0fd29345061c2372edfb4506aa7d5df5c71a570fa0ac grantlee-0.5.1.tar.gz sha256 ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478 grantlee-5.1.0.tar.gz
sha256 eaf22ba92e53b8eb5dd8bca045fe81b734d3445445ed9e0c1af2a0a7c375b161 grantlee-5.0.0.tar.gz

14
package/grantlee/grantlee.mk
View File

@ -3,21 +3,11 @@
# grantlee # grantlee
# #
################################################################################ ################################################################################
# qt4 support dropped after 0.5.1, so we use the older version for qt4 GRANTLEE_VERSION = 5.1.0
ifeq ($(BR2_PACKAGE_QT),y)
GRANTLEE_VERSION = 0.5.1
else ifeq ($(BR2_PACKAGE_QT5),y)
GRANTLEE_VERSION = 5.0.0
endif
GRANTLEE_SITE = http://downloads.grantlee.org GRANTLEE_SITE = http://downloads.grantlee.org
GRANTLEE_INSTALL_STAGING = YES GRANTLEE_INSTALL_STAGING = YES
GRANTLEE_LICENSE = LGPLv2.1+ GRANTLEE_LICENSE = LGPLv2.1+
GRANTLEE_LICENSE_FILES = COPYING.LIB GRANTLEE_LICENSE_FILES = COPYING.LIB
GRANTLEE_DEPENDENCIES = qt5base qt5script
ifeq ($(BR2_PACKAGE_QT),y)
GRANTLEE_DEPENDENCIES = qt
else ifeq ($(BR2_PACKAGE_QT5),y)
GRANTLEE_DEPENDENCIES += qt5base qt5script
endif
$(eval $(cmake-package)) $(eval $(cmake-package))