Skip to contentSkip to conversation

package/zziplib: new package

PATCH New Romain Naour 5 participants 11 messages May 29, 2019 – Oct 27, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/zziplib: new package

Force the build system to use python2 interpreter.

---
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
DEVELOPERS +1 -0
index 66dc2504ff..29fc91dabb 100644
@@ -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/
package/Config.in +1 -0
index 6f1c4593e6..f61009410d 100644
@@ -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"
package/zziplib/Config.in new file +11 -0
new file mode 100644
index 0000000000..6b55572a4d
@@ -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
package/zziplib/zziplib.hash new file +3 -0
new file mode 100644
index 0000000000..ab191cc21e
@@ -0,0 +1,3 @@
+# sha256 locally computed
+sha256 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544  zziplib-v0.13.69.tar.gz
+sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23  COPYING.LIB
package/zziplib/zziplib.mk new file +18 -0
new file mode 100644
index 0000000000..7b0dd5283d
@@ -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))
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/3 package/swig: enable PCRE regex matching in host-swig

The upcoming ogre package needs a host swig binary with PCRE regex support.

---
 package/swig/swig.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/swig/swig.mk +2 -2
index 157d3a39a6..892b0abe30 100644
@@ -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
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/3 package/swig: enable PCRE regex matching in host-swig

Hello,

+Arnout, Yann, Peter in Cc.

Quoted 7 lines · On Wed, 29 May 2019 17:16:54 +0200 Romain Naour <[email protected]> wrote:

The upcoming ogre package needs a host swig binary with PCRE regex support.

---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com													
#3 lore raw

PATCH 2/3 package/swig: enable PCRE regex matching in host-swig

Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,
+Arnout, Yann, Peter in Cc.

Quoted 7 lines · On Wed, 29 May 2019 17:16:54 +0200 Romain Naour <[email protected]> wrote:

The upcoming ogre package needs a host swig binary with PCRE regex support.

---
package/swig/swig.mk | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 12 lines

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.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 2/3 package/swig: enable PCRE regex matching in host-swig

In reply to Thomas Petazzoni

Thomas, All,

On 2019-06-01 09:28 +0200, Thomas Petazzoni spake thusly:

Quoted 10 lines
Quoted 7 lines · On Wed, 29 May 2019 17:16:54 +0200 Romain Naour <[email protected]> wrote:

The upcoming ogre package needs a host swig binary with PCRE regex support.

---
 package/swig/swig.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 12 lines

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.

Quoted 7 lines

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com													
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#5 lore raw

PATCH 2/3 package/swig: enable PCRE regex matching in host-swig

In reply to Thomas Petazzoni
Quoted 15 lines · Thomas Petazzoni

Hello,

+Arnout, Yann, Peter in Cc.

Quoted 7 lines · On Wed, 29 May 2019 17:16:54 +0200 Romain Naour <[email protected]> wrote:

The upcoming ogre package needs a host swig binary with PCRE regex support.

---
 package/swig/swig.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 12 lines

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

#6 lore raw

PATCH 3/3 package/ogre: new package

In reply to Romain Naour

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

---
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
DEVELOPERS +1 -0
index 29fc91dabb..8b5b73138c 100644
@@ -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/
package/Config.in +1 -0
index f61009410d..db28e9ab39 100644
@@ -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"
package/ogre/Config.in new file +43 -0

43 lines not on this page · raw message

package/ogre/ogre.hash new file +3 -0
new file mode 100644
index 0000000000..8bb4ae96a1
@@ -0,0 +1,3 @@
+# sha256 locally computed
+sha256 163e7700e319532d4389ecba91e3ab88551f78610886fa36f8f262f9a5080988  ogre-1.12.0.tar.gz
+sha256 82758e8d1d72139904b9b7472ef0f6544413d2871b58540307fdcc20e473e5f8  LICENSE
package/ogre/ogre.mk new file +42 -0

42 lines not on this page · raw message

Signature · 1 line
2.21.0
#7 lore raw

PATCH 3/3 package/ogre: new package

Hello Romain,

package/ogre/ogre.mk line 9

Quoted 3 lines · On Wed, 29 May 2019 17:16:55 +0200 Romain Naour <[email protected]> wrote:
package/ogre/ogre.mk new file +3 -0
+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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#8 lore raw

PATCH 3/3 package/ogre: new package

Hi Thomas,

Le 01/06/2019 ? 11:24, Thomas Petazzoni a ?crit?:

Quoted 5 lines

Hello Romain,

On Wed, 29 May 2019 17:16:55 +0200
Romain Naour <[email protected]> wrote:

Quoted 8 lines

package/ogre/ogre.mk line 9

Quoted 3 lines
package/ogre/ogre.mk new file +3 -0
+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

Quoted 6 lines

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

Quoted 5 lines

Thanks!

Thomas

#9 lore raw

PATCH 3/3 package/ogre: new package

In reply to Romain Naour

package/ogre/Config.in line 34

Quoted 3 lines · On Wed, 29 May 2019 17:16:55 +0200 Romain Naour <[email protected]> wrote:
package/ogre/Config.in new file +3 -0
+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

Quoted 1 line

+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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#10 lore raw

PATCH 1/3 package/zziplib: new package

In reply to Romain Naour

Hello,

package/zziplib/zziplib.mk line 10

Quoted 4 lines · On Wed, 29 May 2019 17:16:53 +0200 Romain Naour <[email protected]> wrote:
package/zziplib/zziplib.mk new file +4 -0
+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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com