| Message ID | 20190529151655.7098-3-romain.naour@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [for-next,1/3] package/zziplib: new package | expand |
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
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 >
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
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))
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