* [Buildroot] [PATCH for-next 1/3] package/zziplib: new package
@ 2019-05-29 15:16 Romain Naour
2019-05-29 15:16 ` [Buildroot] [PATCH for-next 2/3] package/swig: enable PCRE regex matching in host-swig Romain Naour
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Romain Naour @ 2019-05-29 15:16 UTC (permalink / raw)
To: buildroot
Force the build system to use python2 interpreter.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
Tested using test-pkg with the useful subset of toolchains.
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/zziplib/Config.in | 11 +++++++++++
package/zziplib/zziplib.hash | 3 +++
package/zziplib/zziplib.mk | 18 ++++++++++++++++++
5 files changed, 34 insertions(+)
create mode 100644 package/zziplib/Config.in
create mode 100644 package/zziplib/zziplib.hash
create mode 100644 package/zziplib/zziplib.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 66dc2504ff..29fc91dabb 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1949,6 +1949,7 @@ F: package/tk/
F: package/upower/
F: package/waffle/
F: package/xenomai/
+F: package/zziplib/
F: toolchain/toolchain-external/toolchain-external-arm-aarch64/
F: toolchain/toolchain-external/toolchain-external-arm-aarch64-be/
F: toolchain/toolchain-external/toolchain-external-arm-arm/
diff --git a/package/Config.in b/package/Config.in
index 6f1c4593e6..f61009410d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1189,6 +1189,7 @@ menu "Compression and decompression"
source "package/snappy/Config.in"
source "package/szip/Config.in"
source "package/zlib/Config.in"
+ source "package/zziplib/Config.in"
endmenu
menu "Crypto"
diff --git a/package/zziplib/Config.in b/package/zziplib/Config.in
new file mode 100644
index 0000000000..6b55572a4d
--- /dev/null
+++ b/package/zziplib/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_ZZIPLIB
+ bool "zziplib"
+ select BR2_PACKAGE_ZLIB
+ help
+ The zziplib provides read access to zipped files in a
+ zip-archive, using compression based solely on free algorithms
+ provided by zlib. It also provides a functionality to overlay
+ the archive filesystem with the filesystem of the operating
+ system environment.
+
+ http://zziplib.sourceforge.net
diff --git a/package/zziplib/zziplib.hash b/package/zziplib/zziplib.hash
new file mode 100644
index 0000000000..ab191cc21e
--- /dev/null
+++ b/package/zziplib/zziplib.hash
@@ -0,0 +1,3 @@
+# sha256 locally computed
+sha256 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544 zziplib-v0.13.69.tar.gz
+sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING.LIB
diff --git a/package/zziplib/zziplib.mk b/package/zziplib/zziplib.mk
new file mode 100644
index 0000000000..7b0dd5283d
--- /dev/null
+++ b/package/zziplib/zziplib.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# zziplib
+#
+################################################################################
+
+ZZIPLIB_VERSION = v0.13.69
+ZZIPLIB_SITE = $(call github,gdraheim,zziplib,$(ZZIPLIB_VERSION))
+ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1
+ZZIPLIB_LICENSE_FILES = COPYING.LIB
+ZZIPLIB_INSTALL_STAGING = YES
+
+ZZIPLIB_DEPENDENCIES = host-pkgconf host-python zlib
+
+# zziplib is not python3 friendly, so force the python interpreter
+ZZIPLIB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2
+
+$(eval $(autotools-package))
--
2.21.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH for-next 2/3] package/swig: enable PCRE regex matching in host-swig
2019-05-29 15:16 [Buildroot] [PATCH for-next 1/3] package/zziplib: new package Romain Naour
@ 2019-05-29 15:16 ` Romain Naour
2019-06-01 7:28 ` Thomas Petazzoni
2019-05-29 15:16 ` [Buildroot] [PATCH for-next 3/3] package/ogre: new package Romain Naour
2019-06-01 7:22 ` [Buildroot] [PATCH for-next 1/3] package/zziplib: " Thomas Petazzoni
2 siblings, 1 reply; 11+ messages in thread
From: Romain Naour @ 2019-05-29 15:16 UTC (permalink / raw)
To: buildroot
The upcoming ogre package needs a host swig binary with PCRE
regex support.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
package/swig/swig.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/swig/swig.mk b/package/swig/swig.mk
index 157d3a39a6..892b0abe30 100644
--- a/package/swig/swig.mk
+++ b/package/swig/swig.mk
@@ -7,9 +7,9 @@
SWIG_VERSION_MAJOR = 3.0
SWIG_VERSION = $(SWIG_VERSION_MAJOR).12
SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
-HOST_SWIG_DEPENDENCIES = host-bison
+HOST_SWIG_DEPENDENCIES = host-bison host-pcre
HOST_SWIG_CONF_OPTS = \
- --without-pcre \
+ --with-pcre \
--disable-ccache \
--without-octave
SWIG_LICENSE = GPL-3.0+, BSD-2-Clause, BSD-3-Clause
--
2.21.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH for-next 2/3] package/swig: enable PCRE regex matching in host-swig
2019-05-29 15:16 ` [Buildroot] [PATCH for-next 2/3] package/swig: enable PCRE regex matching in host-swig Romain Naour
@ 2019-06-01 7:28 ` Thomas Petazzoni
2019-06-01 8:44 ` Peter Korsgaard
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2019-06-01 7:28 UTC (permalink / raw)
To: buildroot
Hello,
+Arnout, Yann, Peter in Cc.
On Wed, 29 May 2019 17:16:54 +0200
Romain Naour <romain.naour@gmail.com> wrote:
> The upcoming ogre package needs a host swig binary with PCRE
> regex support.
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
> package/swig/swig.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
I never really like the addition of mandatory host package dependencies
just for the sake of one use case. I was considering adding a hidden
BR2_PACKAGE_HOST_PCRE option for this, but since pcre takes only 17
seconds to build, maybe it was not worth the effort. So I've applied to
next as-is, but I'd be interested to know what Arnout/Peter/Yann thing
about adding a hidden BR2_PACKAGE_HOST_PCRE hidden option for that kind
of situation. We had decided to not systematically add such options in
all host packages, but that we could add some in a case-by-case basis.
This case-by-case basis however will look "weird": ogre would have
host-swig in its <pkg>_DEPENDENCIES, but in Config.in would select
BR2_PACKAGE_HOST_PCRE and not BR2_PACKAGE_HOST_SWIG. This could start
getting a bit clunky.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 11+ messages in thread* [Buildroot] [PATCH for-next 2/3] package/swig: enable PCRE regex matching in host-swig
2019-06-01 7:28 ` Thomas Petazzoni
@ 2019-06-01 8:44 ` Peter Korsgaard
2019-06-01 11:09 ` Yann E. MORIN
2019-06-04 20:21 ` Arnout Vandecappelle
2 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2019-06-01 8:44 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:
> Hello,
> +Arnout, Yann, Peter in Cc.
> On Wed, 29 May 2019 17:16:54 +0200
> Romain Naour <romain.naour@gmail.com> wrote:
>> The upcoming ogre package needs a host swig binary with PCRE
>> regex support.
>>
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> ---
>> package/swig/swig.mk | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
> I never really like the addition of mandatory host package dependencies
> just for the sake of one use case. I was considering adding a hidden
> BR2_PACKAGE_HOST_PCRE option for this, but since pcre takes only 17
> seconds to build, maybe it was not worth the effort. So I've applied to
> next as-is, but I'd be interested to know what Arnout/Peter/Yann thing
> about adding a hidden BR2_PACKAGE_HOST_PCRE hidden option for that kind
> of situation. We had decided to not systematically add such options in
> all host packages, but that we could add some in a case-by-case basis.
> This case-by-case basis however will look "weird": ogre would have
> host-swig in its <pkg>_DEPENDENCIES, but in Config.in would select
> BR2_PACKAGE_HOST_PCRE and not BR2_PACKAGE_HOST_SWIG. This could start
> getting a bit clunky.
I think just having it unconditionally enabled is OK for now.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH for-next 2/3] package/swig: enable PCRE regex matching in host-swig
2019-06-01 7:28 ` Thomas Petazzoni
2019-06-01 8:44 ` Peter Korsgaard
@ 2019-06-01 11:09 ` Yann E. MORIN
2019-06-04 20:21 ` Arnout Vandecappelle
2 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2019-06-01 11:09 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2019-06-01 09:28 +0200, Thomas Petazzoni spake thusly:
> On Wed, 29 May 2019 17:16:54 +0200
> Romain Naour <romain.naour@gmail.com> wrote:
> > The upcoming ogre package needs a host swig binary with PCRE
> > regex support.
> >
> > Signed-off-by: Romain Naour <romain.naour@gmail.com>
> > ---
> > package/swig/swig.mk | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
>
> I never really like the addition of mandatory host package dependencies
> just for the sake of one use case. I was considering adding a hidden
> BR2_PACKAGE_HOST_PCRE option for this, but since pcre takes only 17
> seconds to build, maybe it was not worth the effort. So I've applied to
> next as-is, but I'd be interested to know what Arnout/Peter/Yann thing
> about adding a hidden BR2_PACKAGE_HOST_PCRE hidden option for that kind
> of situation. We had decided to not systematically add such options in
> all host packages, but that we could add some in a case-by-case basis.
> This case-by-case basis however will look "weird": ogre would have
> host-swig in its <pkg>_DEPENDENCIES, but in Config.in would select
> BR2_PACKAGE_HOST_PCRE and not BR2_PACKAGE_HOST_SWIG. This could start
> getting a bit clunky.
As I understand what we said about host packages and their options, what we
would have in this case would be BR2_PACKAGE_HOST_SWIG_NEEDS_PCRE, and ogre
would select that, and BR2_PACKAGE_HOST_SWIG_NEEDS_PCRE would cause swig to
depend on host-pcre, without the need for BR2_PACKAGE_HOST_PCRE.
Consider it from another angle: what you suggested above could also
represent the case that ogre needs host-pcre and host-swig, not that it
needs a host-swig with pcre support.
But I'm OK with adding an unconditional dependency.
Regards,
Yann E. MORIN.
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH for-next 2/3] package/swig: enable PCRE regex matching in host-swig
2019-06-01 7:28 ` Thomas Petazzoni
2019-06-01 8:44 ` Peter Korsgaard
2019-06-01 11:09 ` Yann E. MORIN
@ 2019-06-04 20:21 ` Arnout Vandecappelle
2 siblings, 0 replies; 11+ messages in thread
From: Arnout Vandecappelle @ 2019-06-04 20:21 UTC (permalink / raw)
To: buildroot
On 01/06/2019 09:28, Thomas Petazzoni wrote:
> Hello,
>
> +Arnout, Yann, Peter in Cc.
>
> On Wed, 29 May 2019 17:16:54 +0200
> Romain Naour <romain.naour@gmail.com> wrote:
>
>> The upcoming ogre package needs a host swig binary with PCRE
>> regex support.
>>
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> ---
>> package/swig/swig.mk | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> I never really like the addition of mandatory host package dependencies
> just for the sake of one use case. I was considering adding a hidden
> BR2_PACKAGE_HOST_PCRE option for this, but since pcre takes only 17
> seconds to build, maybe it was not worth the effort. So I've applied to
> next as-is, but I'd be interested to know what Arnout/Peter/Yann thing
> about adding a hidden BR2_PACKAGE_HOST_PCRE hidden option for that kind
> of situation. We had decided to not systematically add such options in
> all host packages, but that we could add some in a case-by-case basis.
> This case-by-case basis however will look "weird": ogre would have
> host-swig in its <pkg>_DEPENDENCIES, but in Config.in would select
> BR2_PACKAGE_HOST_PCRE and not BR2_PACKAGE_HOST_SWIG. This could start
> getting a bit clunky.
It could be
select BR2_PACKAGE_HOST_PCRE # build swig with PCRE support
Regards,
Arnout
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH for-next 3/3] package/ogre: new package
2019-05-29 15:16 [Buildroot] [PATCH for-next 1/3] package/zziplib: new package Romain Naour
2019-05-29 15:16 ` [Buildroot] [PATCH for-next 2/3] package/swig: enable PCRE regex matching in host-swig Romain Naour
@ 2019-05-29 15:16 ` Romain Naour
2019-06-01 9:24 ` Thomas Petazzoni
2019-10-27 15:44 ` Thomas Petazzoni
2019-06-01 7:22 ` [Buildroot] [PATCH for-next 1/3] package/zziplib: " Thomas Petazzoni
2 siblings, 2 replies; 11+ messages in thread
From: Romain Naour @ 2019-05-29 15:16 UTC (permalink / raw)
To: buildroot
Ogre needs host-swig with pcre support when python interpreter is
present on the target.
Otherwise the build stop with the following message:
"SWIG:7: Error: PCRE regex matching is not available in this SWIG build."
Ogre has been tested using the SampleBrowser binary but some demos
are not working due to missing optional dependencies (nvidia Cg plugin).
See: https://www.ogre3d.org/2019/05/01/ogre3d-1-12-released
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
Runtime tested on x86_64 and build tested on ARM.
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/ogre/Config.in | 43 ++++++++++++++++++++++++++++++++++++++++++
package/ogre/ogre.hash | 3 +++
package/ogre/ogre.mk | 42 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 90 insertions(+)
create mode 100644 package/ogre/Config.in
create mode 100644 package/ogre/ogre.hash
create mode 100644 package/ogre/ogre.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 29fc91dabb..8b5b73138c 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1938,6 +1938,7 @@ F: package/mcelog/
F: package/mesa3d/
F: package/minetest/
F: package/minetest-game/
+F: package/ogre/
F: package/openpowerlink/
F: package/physfs/
F: package/solarus/
diff --git a/package/Config.in b/package/Config.in
index f61009410d..db28e9ab39 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -301,6 +301,7 @@ comment "Graphic libraries"
source "package/mesa3d/Config.in"
source "package/mesa3d-headers/Config.in"
source "package/ocrad/Config.in"
+ source "package/ogre/Config.in"
source "package/psplash/Config.in"
source "package/sdl/Config.in"
source "package/sdl_gfx/Config.in"
diff --git a/package/ogre/Config.in b/package/ogre/Config.in
new file mode 100644
index 0000000000..c5baac7a8f
--- /dev/null
+++ b/package/ogre/Config.in
@@ -0,0 +1,43 @@
+config BR2_PACKAGE_OGRE
+ bool "ogre"
+ depends on BR2_PACKAGE_HAS_LIBGL # libglu
+ depends on BR2_PACKAGE_XORG7
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+ depends on !BR2_STATIC_LIBS
+ depends on BR2_USE_MMU
+ depends on BR2_USE_WCHAR # use wchar_t
+ select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_LIBFREEIMAGE
+ select BR2_PACKAGE_LIBGLU # GL/glu.h
+ select BR2_PACKAGE_SDL2
+ select BR2_PACKAGE_SDL2_OPENGL
+ select BR2_PACKAGE_SDL2_X11 # use wmInfo.info.x11
+ select BR2_PACKAGE_XLIB_LIBX11
+ select BR2_PACKAGE_XLIB_LIBXAW
+ select BR2_PACKAGE_XLIB_LIBXEXT
+ select BR2_PACKAGE_XLIB_LIBXRANDR
+ select BR2_PACKAGE_ZZIPLIB
+ help
+ OGRE is a scene-oriented, flexible 3D engine written in C++
+ designed to make it easier and more intuitive for developers
+ to produce games and demos utilising 3D hardware. The class
+ library abstracts all the details of using the underlying
+ system libraries like Direct3D and OpenGL and provides an
+ interface based on world objects and other intuitive classes.
+
+ https://ogrecave.github.io/ogre
+
+comment "ogre needs X11 and an OpenGL provider"
+ depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7
+ depends on BR2_TOOLCHAIN_HAS_THREADS \&& BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
+ && BR2_INSTALL_LIBSTDCPP && !BR2_STATIC_LIBS && BR2_USE_WCHAR
+ depends on BR2_USE_MMU
+
+comment "ogre needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads, wchar"
+ depends on !BR2_INSTALL_LIBSTDCPP \
+ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
+ || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
+ || !BR2_USE_WCHAR
+ depends on BR2_USE_MMU
diff --git a/package/ogre/ogre.hash b/package/ogre/ogre.hash
new file mode 100644
index 0000000000..8bb4ae96a1
--- /dev/null
+++ b/package/ogre/ogre.hash
@@ -0,0 +1,3 @@
+# sha256 locally computed
+sha256 163e7700e319532d4389ecba91e3ab88551f78610886fa36f8f262f9a5080988 ogre-1.12.0.tar.gz
+sha256 82758e8d1d72139904b9b7472ef0f6544413d2871b58540307fdcc20e473e5f8 LICENSE
diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk
new file mode 100644
index 0000000000..c14c3e80e1
--- /dev/null
+++ b/package/ogre/ogre.mk
@@ -0,0 +1,42 @@
+################################################################################
+#
+# ogre
+#
+################################################################################
+
+OGRE_VERSION = 1.12.0
+OGRE_SITE = $(call github,OGRECave,ogre,v$(OGRE_VERSION))
+OGRE_LICENSE = MIT with exceptions (main library), MIT (DeferredShadingMedia samples), Public Domain (samples and plugins), Zlib (tinyxml)
+OGRE_LICENSE_FILES = LICENSE
+OGRE_INSTALL_STAGING = YES
+
+# Ogre use a bundled version of tinyxml
+OGRE_DEPENDENCIES = host-pkgconf \
+ freetype \
+ libfreeimage \
+ libgl \
+ libglu \
+ sdl2 \
+ xlib_libX11 \
+ xlib_libXaw \
+ xlib_libXext \
+ xlib_libXrandr \
+ zziplib
+
+# Unbundle freetype and zziplib.
+# Disable java and nvidia cg support.
+OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \
+ -DOGRE_BUILD_COMPONENT_JAVA=OFF \
+ -DOGRE_BUILD_PLUGIN_CG=OFF \
+ -DOGRE_INSTALL_DOCS=OFF
+
+# Enable optional python component if python interpreter is present on the target.
+ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+OGRE_DEPENDENCIES += host-swig \
+ $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
+OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=ON
+else
+OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=OFF
+endif
+
+$(eval $(cmake-package))
--
2.21.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH for-next 3/3] package/ogre: new package
2019-05-29 15:16 ` [Buildroot] [PATCH for-next 3/3] package/ogre: new package Romain Naour
@ 2019-06-01 9:24 ` Thomas Petazzoni
2019-06-01 22:00 ` Romain Naour
2019-10-27 15:44 ` Thomas Petazzoni
1 sibling, 1 reply; 11+ messages in thread
From: Thomas Petazzoni @ 2019-06-01 9:24 UTC (permalink / raw)
To: buildroot
Hello Romain,
On Wed, 29 May 2019 17:16:55 +0200
Romain Naour <romain.naour@gmail.com> wrote:
> +OGRE_VERSION = 1.12.0
> +OGRE_SITE = $(call github,OGRECave,ogre,v$(OGRE_VERSION))
> +OGRE_LICENSE = MIT with exceptions (main library), MIT (DeferredShadingMedia samples), Public Domain (samples and plugins), Zlib (tinyxml)
Could you comment a bit on where you found those license terms ? The
LICENSE file only contains the normal MIT license text. Just picking a
random file (OgreFileSystem.cpp) from the main library shows just the
regular MIT license (I don't see any exception).
PlugIns/CgProgramManager/src/OgreCgPlugin.cpp which is a plugin, shows
a MIT license.
Could you perhaps add a comment above this line that justifies this
licensing description ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH for-next 3/3] package/ogre: new package
2019-06-01 9:24 ` Thomas Petazzoni
@ 2019-06-01 22:00 ` Romain Naour
0 siblings, 0 replies; 11+ messages in thread
From: Romain Naour @ 2019-06-01 22:00 UTC (permalink / raw)
To: buildroot
Hi Thomas,
Le 01/06/2019 ? 11:24, Thomas Petazzoni a ?crit?:
> Hello Romain,
>
> On Wed, 29 May 2019 17:16:55 +0200
> Romain Naour <romain.naour@gmail.com> wrote:
>
>> +OGRE_VERSION = 1.12.0
>> +OGRE_SITE = $(call github,OGRECave,ogre,v$(OGRE_VERSION))
>> +OGRE_LICENSE = MIT with exceptions (main library), MIT (DeferredShadingMedia samples), Public Domain (samples and plugins), Zlib (tinyxml)
>
> Could you comment a bit on where you found those license terms ? The
> LICENSE file only contains the normal MIT license text. Just picking a
> random file (OgreFileSystem.cpp) from the main library shows just the
> regular MIT license (I don't see any exception).
For Licensing hints, I'm using Fedora or Archlinux packaging as initial base:
https://apps.fedoraproject.org/packages/ogre/sources (see spec tab)
https://aur.archlinux.org/packages/ogre-1.9 (custom:MIT)
But it correspond to the 1.9 version of ogre, Fedora and Arch seems to be stuck
with these versions due to an API break with ogre >= 1.10. (for example,
stuntrally needs ogre <= 1.9)
Archlinux has a package for ogre 1.12 which is only MIT
https://aur.archlinux.org/packages/ogre3d/
But ogre include tinyxml library (Zlib)
Tools/XMLConverter/src/tinyxml.cpp
And 2 plugings that use a dual license MIT or Public Domain.
PlugIns/STBICodec/src/stbi/stb_image.h
PlugIns/STBICodec/src/stbi/stb_image_write.h
>
> PlugIns/CgProgramManager/src/OgreCgPlugin.cpp which is a plugin, shows
> a MIT license.
>
> Could you perhaps add a comment above this line that justifies this
> licensing description ?
I believe the "with exceptions" come from the switch from LGPLv2+ with
exceptions to MIT in the Fedora packaging.
https://src.fedoraproject.org/rpms/ogre/c/d9206dd427f9e42082160fa80a2023cd8250a4f3?branch=master
So it ogre use a MIT license but we should add a Zlib license for tinyxml.
Best regards,
Romain
>
> Thanks!
>
> Thomas
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH for-next 3/3] package/ogre: new package
2019-05-29 15:16 ` [Buildroot] [PATCH for-next 3/3] package/ogre: new package Romain Naour
2019-06-01 9:24 ` Thomas Petazzoni
@ 2019-10-27 15:44 ` Thomas Petazzoni
1 sibling, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2019-10-27 15:44 UTC (permalink / raw)
To: buildroot
On Wed, 29 May 2019 17:16:55 +0200
Romain Naour <romain.naour@gmail.com> wrote:
> +comment "ogre needs X11 and an OpenGL provider"
> + depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7
> + depends on BR2_TOOLCHAIN_HAS_THREADS \&& BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
^^^^ spurious backslash here
> +OGRE_LICENSE = MIT with exceptions (main library), MIT (DeferredShadingMedia samples), Public Domain (samples and plugins), Zlib (tinyxml)
So as we discussed, the main library doesn't have MIT with exceptions,
but just MIT, so I fixed.
Applied, with those changes!
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH for-next 1/3] package/zziplib: new package
2019-05-29 15:16 [Buildroot] [PATCH for-next 1/3] package/zziplib: new package Romain Naour
2019-05-29 15:16 ` [Buildroot] [PATCH for-next 2/3] package/swig: enable PCRE regex matching in host-swig Romain Naour
2019-05-29 15:16 ` [Buildroot] [PATCH for-next 3/3] package/ogre: new package Romain Naour
@ 2019-06-01 7:22 ` Thomas Petazzoni
2 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2019-06-01 7:22 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 29 May 2019 17:16:53 +0200
Romain Naour <romain.naour@gmail.com> wrote:
> +ZZIPLIB_VERSION = v0.13.69
> +ZZIPLIB_SITE = $(call github,gdraheim,zziplib,$(ZZIPLIB_VERSION))
> +ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1
> +ZZIPLIB_LICENSE_FILES = COPYING.LIB
I have added docs/COPYING.MPL and docs/copying.htm to the license
files, and therefore also used docs/COPYING.LIB for consistency.
Applied to next with those changes, thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-10-27 15:44 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-29 15:16 [Buildroot] [PATCH for-next 1/3] package/zziplib: new package Romain Naour
2019-05-29 15:16 ` [Buildroot] [PATCH for-next 2/3] package/swig: enable PCRE regex matching in host-swig Romain Naour
2019-06-01 7:28 ` Thomas Petazzoni
2019-06-01 8:44 ` Peter Korsgaard
2019-06-01 11:09 ` Yann E. MORIN
2019-06-04 20:21 ` Arnout Vandecappelle
2019-05-29 15:16 ` [Buildroot] [PATCH for-next 3/3] package/ogre: new package Romain Naour
2019-06-01 9:24 ` Thomas Petazzoni
2019-06-01 22:00 ` Romain Naour
2019-10-27 15:44 ` Thomas Petazzoni
2019-06-01 7:22 ` [Buildroot] [PATCH for-next 1/3] package/zziplib: " Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox