| Message ID | 1456006176-21308-31-git-send-email-bernd.kuhls@t-online.de |
|---|---|
| State | Changes Requested |
| Headers | show |
Bernd, On Sat, 20 Feb 2016 23:09:35 +0100, Bernd Kuhls wrote: > +diff --git a/engine/include/debug/vsx_backtrace.h b/engine/include/debug/vsx_backtrace.h > +index 0fbcf86..a83fdc4 100644 > +--- a/engine/include/debug/vsx_backtrace.h > ++++ b/engine/include/debug/vsx_backtrace.h > +@@ -7,7 +7,9 @@ > + > + #include <stdio.h> > + #include <errno.h> > ++#ifdef HAVE_EXECINFO > + #include <execinfo.h> > ++#endif > + #include <unistd.h> > + #include <string.h> > + #include <malloc.h> > +@@ -18,7 +20,7 @@ namespace vsx_backtrace > + > + inline void full_write(int fd, const char *buf, size_t len) > + { > +-#if !(PLATFORM_FAMILY == PLATFORM_FAMILY_WINDOWS) > ++#if !(PLATFORM_FAMILY == PLATFORM_FAMILY_WINDOWS) && defined(HAVE_EXECINFO) I believ the !(PLATFORM_FAMILY == PLATFORM_FAMILY_WINDOWS) part of the condition could be removed, since Windows won't have HAVE_EXECINFO defined. > +# instead of using master branch we use branch glfw3 Can you expand the comment to explain why we use the glfw3 branch ? > +VSXU_VERSION = 4a34b08ec9e51605ca55d1a833f23e9601b2aa88 > +VSXU_SITE = $(call github,vovoid,vsxu,$(VSXU_VERSION)) > +VSXU_CAL3D_VERSION = 0f640189eec913973c64db3bc1c1685554cb7202 > +VSXU_CAL3D_SOURCE = cal3d-$(VSXU_CAL3D_VERSION).tar.gz > +VSXU_EXTRA_DOWNLOADS = $(call github,vovoid,cal3d,$(VSXU_CAL3D_VERSION))/$(VSXU_CAL3D_SOURCE) cal3d is a project of its own, available on its own website (http://home.gna.org/cal3d/). I would very much prefer to create package/cal3d/ with the upstream cal3d version rather than using this submodule solution. > +VSXU_LICENSE = GPLv3+, LGPLv2.1+ > +VSXU_LICENSE_FILES = COPYING COPYING.LESSER COPYING.LESSER is actually the text of LGPLv3, so are you sure it's under LGPLv2.1+ ? Also, it would be good if you could specify which parts of the software are under GPLv3, which parts are under LGPLv3. Of course, it's this is reasonably possible. > +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) > +VSXU_DEPENDENCIES += alsa-lib > +endif > + > +ifeq ($(BR2_PACKAGE_JACK2),y) > +VSXU_DEPENDENCIES += jack2 > +endif > + > +ifeq ($(BR2_PACKAGE_OPENCV),y) > +VSXU_DEPENDENCIES += opencv > +endif > + > +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) > +VSXU_DEPENDENCIES += pulseaudio > +endif No options to explicitly enable/disable? Thanks! Thomas
Hi Thomas, Am Sat, 05 Mar 2016 16:15:52 +0100 schrieb Thomas Petazzoni: >> +VSXU_VERSION = 4a34b08ec9e51605ca55d1a833f23e9601b2aa88 +VSXU_SITE = >> $(call github,vovoid,vsxu,$(VSXU_VERSION)) >> +VSXU_CAL3D_VERSION = 0f640189eec913973c64db3bc1c1685554cb7202 >> +VSXU_CAL3D_SOURCE = cal3d-$(VSXU_CAL3D_VERSION).tar.gz >> +VSXU_EXTRA_DOWNLOADS = $(call >> github,vovoid,cal3d,$(VSXU_CAL3D_VERSION))/$(VSXU_CAL3D_SOURCE) > > cal3d is a project of its own, available on its own website > (http://home.gna.org/cal3d/). I would very much prefer to create > package/cal3d/ with the upstream cal3d version rather than using this > submodule solution. the first iteration of my patch series contained a pseudo cal3d package: http://patchwork.ozlabs.org/patch/541356/ The current code replacing this pseudo cal3d package which you quoted, and rejected now, was written by you ;) http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/135191 I understand that there is no good solution for projects using git submodules in buildroot atm but I would like to know which way of handling them is prefered so I can send a proper patch ;) Regards, Bernd
Hi Thomas, Am Sat, 05 Mar 2016 16:15:52 +0100 schrieb Thomas Petazzoni: >> +VSXU_LICENSE = GPLv3+, LGPLv2.1+ >> +VSXU_LICENSE_FILES = COPYING COPYING.LESSER > > COPYING.LESSER is actually the text of LGPLv3, so are you sure it's > under LGPLv2.1+ ? yes, searching for "version 3 " found only artiste/src/artiste_main.cpp, the rest of the LGPL-licensed files contain * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2 of the * License, or Quoting https://github.com/vovoid/vsxu/blob/glfw3/COPYING "All code (C and C++) is released under the GNU GPL 3.0 as included in this document unless explicitly released as LGPL 3.0 (check source files)." This is indeed misleading because I found only file referencing GPLv3+, the rest contains * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or so I changed to VSXU_LICENSE to VSXU_LICENSE = GPLv3+ (artiste/src/artiste_main.cpp), GPLv2+, LGPLv2+ and hope its ok. > Also, it would be good if you could specify which parts of the software > are under GPLv3, which parts are under LGPLv3. Of course, it's this is > reasonably possible. This will be difficult ;) $ grep -r "(LGPL)" * | wc -l 267 $ grep -r "(GPL)" * | wc -l 209 Regards, Bernd
Hello, Please Cc: me on your replies. Please, please! I've asked you already several times. Just use "Reply-all" in your mailer whenever you reply to a mail on the Buildroot mailing list. On Sat, 05 Mar 2016 18:43:54 +0100, Bernd Kuhls wrote: > > cal3d is a project of its own, available on its own website > > (http://home.gna.org/cal3d/). I would very much prefer to create > > package/cal3d/ with the upstream cal3d version rather than using this > > submodule solution. > > the first iteration of my patch series contained a pseudo cal3d package: > http://patchwork.ozlabs.org/patch/541356/ > > The current code replacing this pseudo cal3d package which you quoted, > and rejected now, was written by you ;) > http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/135191 > > I understand that there is no good solution for projects using git > submodules in buildroot atm but I would like to know which way of > handling them is prefered so I can send a proper patch ;) Aaah, very good that you remember this. I had honestly forgotten that we already had this discussion. I in fact don't contradict myself completely, and I'll try to explain why. Your original proposal for a cal3d package is a package that 1/ doesn't use the upstream version of cal3d and 2/ doesn't do anything except downloading the cal3d sources. Instead, what I would ideally like to see is a cal3d package that works on its own. cal3d is a separate open-source project, which might be used outside of vsxu. So I'd like to have http://download.gna.org/cal3d/sources/cal3d-0.11.0.tar.gz downloaded, built and installed by a cal3d package. And then vsxu depend on it and link against it. Now, whether this is doable or not depends on: 1/ Whether vsxu's version of cal3d is heavily patched or not. 2/ Whether the changes needed in vsxu's build system to use the external cal3d library are very complicated or not. But my strong preference is to avoid using bundled versions of the libraries when possible. Best regards, Thomas
Hello, On Sat, 05 Mar 2016 19:17:57 +0100, Bernd Kuhls wrote: > > COPYING.LESSER is actually the text of LGPLv3, so are you sure it's > > under LGPLv2.1+ ? > > yes, searching for "version 3 " found only artiste/src/artiste_main.cpp, > the rest of the LGPL-licensed files contain > > * it under the terms of the GNU Lesser General Public License as > * published by the Free Software Foundation; either version 2 of the > * License, or > > Quoting https://github.com/vovoid/vsxu/blob/glfw3/COPYING > "All code (C and C++) is released under the GNU GPL 3.0 as included in > this document unless explicitly released as LGPL 3.0 (check source > files)." > > This is indeed misleading because I found only file referencing GPLv3+, > the rest contains > > * it under the terms of the GNU General Public License as published by > * the Free Software Foundation; either version 2 of the License, or It is indeed very misleading. > so I changed to VSXU_LICENSE to > > VSXU_LICENSE = GPLv3+ (artiste/src/artiste_main.cpp), GPLv2+, LGPLv2+ > > and hope its ok. In addition to this, could you: 1/ Add a comment in the .mk file that indicates that things are a bit misleading (i.e that COPYING/COPYING.LESSER contain the v3 of the license text, but the source code points to the v2, except one file). Basically summarize what you said in this e-mail. 2/ Report the problem upstream by filling a Github issue. > > Also, it would be good if you could specify which parts of the software > > are under GPLv3, which parts are under LGPLv3. Of course, it's this is > > reasonably possible. > > This will be difficult ;) > > $ grep -r "(LGPL)" * | wc -l > 267 > $ grep -r "(GPL)" * | wc -l > 209 Yeah, ok, so don't do it :-) Thanks! Thomas
Hi Thomas, [posted and mailed] Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote in news:20160305192635.259a28cd@free-electrons.com: > Hello, > > Please Cc: me on your replies. Please, please! I've asked you already > several times. Just use "Reply-all" in your mailer whenever you reply > to a mail on the Buildroot mailing list. easier said than done ;) I am not using a mail software to communicate with the buildroot mailinglist. Instead leafnode downloads all newsgroups I am interested in, then I am currently using pan to read the newsgroups, but it can not send mails: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=391649 Getting knode to work was not possible due to a broken akanodi setup, the kde stuff is so closely integrated that at the end knode was unable to download a single message from my leafnode server... Icedove/claws-mail look horrible, they are no real newsreaders so I setup wine instead to run Xnews, my favourite newsreader, which I am trying right now. I hope you receive an email as well but beware that it will be addressed to a gmane.org address because I am receiving the buildroot newsgroup via gmane.org. > Instead, what I would ideally like to see is a cal3d package that > works on its own. cal3d is a separate open-source project, which might > be used outside of vsxu. So I'd like to have > http://download.gna.org/cal3d/sources/cal3d-0.11.0.tar.gz downloaded, > built and installed by a cal3d package. And then vsxu depend on it and > link against it. I will try and report back, but this package has low priority for me. Regards, Bernd
diff --git a/package/Config.in b/package/Config.in index 422978f..488b59e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -241,6 +241,7 @@ comment "Graphic applications" source "package/mesa3d-demos/Config.in" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" + source "package/vsxu/Config.in" comment "Graphic libraries" source "package/cegui06/Config.in" diff --git a/package/vsxu/0001-Detect-backtrace-support.patch b/package/vsxu/0001-Detect-backtrace-support.patch new file mode 100644 index 0000000..a3dd692 --- /dev/null +++ b/package/vsxu/0001-Detect-backtrace-support.patch @@ -0,0 +1,65 @@ +From a3606dcf62b78a987369e557930efef8a9499148 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <bernd.kuhls@t-online.de> +Date: Sat, 19 Dec 2015 18:31:48 +0100 +Subject: [PATCH 1/2] Detect backtrace support + +uClibc has no support for execinfo.h/backtrace + +Patch sent upstream: https://github.com/vovoid/vsxu/pull/171 + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +--- + CMakeLists.txt | 4 ++++ + engine/include/debug/vsx_backtrace.h | 6 ++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c2377b8..9613610 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,6 +152,10 @@ INCLUDE(CPack) + ################################################################################ + + ++include(CheckIncludeFiles) ++ ++check_include_files(execinfo.h HAVE_EXECINFO) ++ + add_definitions( -std=c++0x ) + + if (VSXU_STATIC EQUAL 1) +diff --git a/engine/include/debug/vsx_backtrace.h b/engine/include/debug/vsx_backtrace.h +index 0fbcf86..a83fdc4 100644 +--- a/engine/include/debug/vsx_backtrace.h ++++ b/engine/include/debug/vsx_backtrace.h +@@ -7,7 +7,9 @@ + + #include <stdio.h> + #include <errno.h> ++#ifdef HAVE_EXECINFO + #include <execinfo.h> ++#endif + #include <unistd.h> + #include <string.h> + #include <malloc.h> +@@ -18,7 +20,7 @@ namespace vsx_backtrace + + inline void full_write(int fd, const char *buf, size_t len) + { +-#if !(PLATFORM_FAMILY == PLATFORM_FAMILY_WINDOWS) ++#if !(PLATFORM_FAMILY == PLATFORM_FAMILY_WINDOWS) && defined(HAVE_EXECINFO) + while (len > 0) { + ssize_t ret = write(fd, buf, len); + +@@ -34,7 +36,7 @@ inline void full_write(int fd, const char *buf, size_t len) + + inline void print_backtrace(void) + { +-#if !(PLATFORM_FAMILY == PLATFORM_FAMILY_WINDOWS) ++#if !(PLATFORM_FAMILY == PLATFORM_FAMILY_WINDOWS) && defined(HAVE_EXECINFO) + static const char start[] = "BACKTRACE ------------\n"; + static const char end[] = "----------------------\n"; + +-- +2.6.4 + diff --git a/package/vsxu/0002-Do-not-use-host-paths-when-cross-compiling.patch b/package/vsxu/0002-Do-not-use-host-paths-when-cross-compiling.patch new file mode 100644 index 0000000..f3fb885 --- /dev/null +++ b/package/vsxu/0002-Do-not-use-host-paths-when-cross-compiling.patch @@ -0,0 +1,55 @@ +From 927e98180736612bccebfa04e9b681dc92541b5e Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <bernd.kuhls@t-online.de> +Date: Sat, 19 Dec 2015 18:32:38 +0100 +Subject: [PATCH 2/2] Do not use host paths when cross-compiling. + +Patch sent upstream: https://github.com/vovoid/vsxu/pull/171 + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +--- + plugins/src/render.text/CMakeLists.txt | 4 +++- + plugins/src/texture/CMakeLists.txt | 6 +++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/plugins/src/render.text/CMakeLists.txt b/plugins/src/render.text/CMakeLists.txt +index 38f3994..3f322eb 100644 +--- a/plugins/src/render.text/CMakeLists.txt ++++ b/plugins/src/render.text/CMakeLists.txt +@@ -8,6 +8,8 @@ project (${module_id}) + + message("configuring vsxu module " ${module_id}) + ++find_package(Freetype REQUIRED) ++ + # set defines for MOD_CM, MOD_DM, MOD_NM + CREATE_STATIC_GLUE(${module_id}) + +@@ -21,7 +23,7 @@ if(WIN32) + endif(WIN32) + + if(UNIX) +- include_directories(/usr/include/freetype2) ++ include_directories(${FREETYPE_INCLUDE_DIRS}) + endif(UNIX) + + # include common +diff --git a/plugins/src/texture/CMakeLists.txt b/plugins/src/texture/CMakeLists.txt +index e65ae9b..1c667e6 100644 +--- a/plugins/src/texture/CMakeLists.txt ++++ b/plugins/src/texture/CMakeLists.txt +@@ -8,7 +8,11 @@ project (${module_id}) + + message("configuring vsxu module " ${module_id}) + +-include_directories(/usr/include/OpenEXR) ++find_package(OpenEXR) ++ ++if(OpenEXR_FOUND) ++ include_directories(${OPENEXR_INCLUDE_DIRS}) ++endif(OpenEXR_FOUND) + + # set defines for MOD_CM, MOD_DM, MOD_NM + CREATE_STATIC_GLUE(${module_id}) +-- +2.6.4 + diff --git a/package/vsxu/Config.in b/package/vsxu/Config.in new file mode 100644 index 0000000..e8db892 --- /dev/null +++ b/package/vsxu/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_VSXU + bool "vsxu" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBGLEW + select BR2_PACKAGE_LIBGLFW + select BR2_PACKAGE_LIBGLU + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_ZLIB + help + VSXu (VSX Ultra) is an OpenGL-based (hardware-accelerated), + modular programming environment with its main purpose to + visualize music and create real time graphic effects. + + http://www.vsxu.com + +comment "vsxu depends on X.org and needs an OpenGL backend" + depends on BR2_i386 || BR2_x86_64 + depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/vsxu/vsxu.hash b/package/vsxu/vsxu.hash new file mode 100644 index 0000000..f8d5e76 --- /dev/null +++ b/package/vsxu/vsxu.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 69ecfc85d7d2c1eebf87fbfe5a74240289cdb5571cc99a9730ace7e3d88ace09 vsxu-4a34b08ec9e51605ca55d1a833f23e9601b2aa88.tar.gz +sha256 c2b3b999b090bc5bcf7047a74d3e83e81e9aabcc3e2181a9dddebb01b99bd381 cal3d-0f640189eec913973c64db3bc1c1685554cb7202.tar.gz diff --git a/package/vsxu/vsxu.mk b/package/vsxu/vsxu.mk new file mode 100644 index 0000000..8b7e483 --- /dev/null +++ b/package/vsxu/vsxu.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# vsxu +# +################################################################################ + +# instead of using master branch we use branch glfw3 +VSXU_VERSION = 4a34b08ec9e51605ca55d1a833f23e9601b2aa88 +VSXU_SITE = $(call github,vovoid,vsxu,$(VSXU_VERSION)) +VSXU_CAL3D_VERSION = 0f640189eec913973c64db3bc1c1685554cb7202 +VSXU_CAL3D_SOURCE = cal3d-$(VSXU_CAL3D_VERSION).tar.gz +VSXU_EXTRA_DOWNLOADS = $(call github,vovoid,cal3d,$(VSXU_CAL3D_VERSION))/$(VSXU_CAL3D_SOURCE) +VSXU_LICENSE = GPLv3+, LGPLv2.1+ +VSXU_LICENSE_FILES = COPYING COPYING.LESSER +VSXU_INSTALL_STAGING = YES +VSXU_DEPENDENCIES = freetype jpeg libgl libglew libglfw libglu \ + libpng zlib + +# cal3d is a git submodule +define VSXU_EXTRACT_CAL3D + mkdir -p $(@D)/plugins/src/mesh.importers/cal3d + $(call suitable-extractor,$(VSXU_CAL3D_SOURCE)) $(DL_DIR)/$(VSXU_CAL3D_SOURCE) | \ + $(TAR) --strip-components=1 -C $(@D)/plugins/src/mesh.importers/cal3d $(TAR_OPTIONS) - +endef +VSXU_POST_EXTRACT_HOOKS += VSXU_EXTRACT_CAL3D + +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) +VSXU_DEPENDENCIES += alsa-lib +endif + +ifeq ($(BR2_PACKAGE_JACK2),y) +VSXU_DEPENDENCIES += jack2 +endif + +ifeq ($(BR2_PACKAGE_OPENCV),y) +VSXU_DEPENDENCIES += opencv +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +VSXU_DEPENDENCIES += pulseaudio +endif + +$(eval $(cmake-package))
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/Config.in | 1 + package/vsxu/0001-Detect-backtrace-support.patch | 65 ++++++++++++++++++++++ ...o-not-use-host-paths-when-cross-compiling.patch | 55 ++++++++++++++++++ package/vsxu/Config.in | 22 ++++++++ package/vsxu/vsxu.hash | 3 + package/vsxu/vsxu.mk | 43 ++++++++++++++ 6 files changed, 189 insertions(+) create mode 100644 package/vsxu/0001-Detect-backtrace-support.patch create mode 100644 package/vsxu/0002-Do-not-use-host-paths-when-cross-compiling.patch create mode 100644 package/vsxu/Config.in create mode 100644 package/vsxu/vsxu.hash create mode 100644 package/vsxu/vsxu.mk