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

Update Qtopia to 4.5.0, which introduces a new licensing option: LGPL. This will be default now.

Browse Source
This commit is contained in:
Thiago A. Corrêa 2009-03-12 02:53:54 +00:00
parent afaa374590
commit ba567f8a58
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
package/qtopia4/Config.in
View File

@ -41,10 +41,13 @@ endchoice
choice choice
prompt "Qtopia 4 Core license type" prompt "Qtopia 4 Core license type"
default BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL default BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_LGPL
help help
Selects the type of license you which to use for Qtopia 4 Core. Selects the type of license you which to use for Qtopia 4 Core.
config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_LGPL
bool "LGPL license"
config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
bool "GPL license" bool "GPL license"
@ -53,16 +56,17 @@ config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
endchoice endchoice
config BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED config BR2_PACKAGE_QTOPIA4_LICENSE_APPROVED
bool "Approve Qtopia Core 4 GPL licence" bool "Approve Qtopia Core 4 license"
depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL || BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_LGPL
help help
Select this if you approve the GNU GENERAL PUBLIC LICENSE Version 2 Select this if you approve the above selected license for the
on the Qtopia Core 4 library. By doing this you will not be asked Qtopia Core 4 library.
while the library is compiled. Please read and understand the GPL By doing this you will not be asked while the library is compiled.
licence before approving this. Please read and understand the license terms before approving this.
For full GPL version 2 see http://www.gnu.org/licenses/gpl.txt For full GPL version 2 see http://www.gnu.org/licenses/gpl2.txt
For full LGPL see http://www.gnu.org/licenses/lgpl.txt
config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME

4
package/qtopia4/qtopia4.mk
View File

@ -16,7 +16,7 @@
# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus) # (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
# to fix # to fix
QTOPIA4_VERSION:=4.4.3 QTOPIA4_VERSION:=4.5.0
QTOPIA4_CAT:=$(BZCAT) QTOPIA4_CAT:=$(BZCAT)
BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME))) BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
@ -36,7 +36,7 @@ else # Good, good, we are free:
QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/source QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/source
QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.bz2 QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.bz2
QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION) QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION)
ifeq ($(BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED),y) ifeq ($(BR2_PACKAGE_QTOPIA4_LICENSE_APPROVED),y)
QTOPIA4_CONFIGURE+= -confirm-license QTOPIA4_CONFIGURE+= -confirm-license
endif endif
endif endif