| Message ID | 1450024301-24083-1-git-send-email-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
Dear Bernd Kuhls, Thanks for the new version. On Sun, 13 Dec 2015 17:31:41 +0100, Bernd Kuhls wrote: > diff --git a/package/libfreeglut/Config.in b/package/libfreeglut/Config.in > new file mode 100644 > index 0000000..e09e7ef > --- /dev/null > +++ b/package/libfreeglut/Config.in > @@ -0,0 +1,20 @@ > +config BR2_PACKAGE_LIBFREEGLUT > + bool "libfreeglut" > + select BR2_PACKAGE_LIBGLU > + select BR2_PACKAGE_XLIB_LIBXI Where is this libXi dependency coming from? (It was already a question from my previous review). Thomas
Am Sun, 13 Dec 2015 22:24:02 +0100 schrieb Thomas Petazzoni: > Dear Bernd Kuhls, > > Thanks for the new version. > > On Sun, 13 Dec 2015 17:31:41 +0100, Bernd Kuhls wrote: > >> diff --git a/package/libfreeglut/Config.in >> b/package/libfreeglut/Config.in new file mode 100644 index >> 0000000..e09e7ef --- /dev/null +++ b/package/libfreeglut/Config.in @@ >> -0,0 +1,20 @@ >> +config BR2_PACKAGE_LIBFREEGLUT + bool "libfreeglut" >> + select BR2_PACKAGE_LIBGLU + select BR2_PACKAGE_XLIB_LIBXI > > Where is this libXi dependency coming from? (It was already a question > from my previous review). Hi, and I tried to answer your question this afternoon ;) http://lists.busybox.net/pipermail/buildroot/2015-December/146911.html libXi is mentioned in the compile instructions in README.cmake: http://sourceforge.net/p/freeglut/code/HEAD/tree/tags/FG_3_0_0/ README.cmake#l45 because X11/extensions/XInput.h is used in fg_internal_x11.h: http://sourceforge.net/p/freeglut/code/HEAD/tree/tags/FG_3_0_0/src/x11/ fg_internal_x11.h#l42 This file, X11/extensions/XInput.h, is part of libXi: http://cgit.freedesktop.org/xorg/lib/libXi/tree/include/X11/extensions https://packages.debian.org/search?searchon=contents&keywords=X11% 2Fextensions%2FXInput.h&mode=path&suite=stable&arch=any Regards, Bernd
Bernd, On Sun, 13 Dec 2015 17:31:41 +0100, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > v2: added xlib_libXxf86vm as dependency (Thomas) > handle shared-only build (Thomas) Applied, thanks. And sorry for having missed some justification you gave after my review of the v1. You did not Cc me on your answer, so I missed the e-mail. Thanks! Thomas
diff --git a/package/Config.in b/package/Config.in index 7cd6f9d..e27332b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -833,6 +833,7 @@ menu "Graphics" source "package/libevas-generic-loaders/Config.in" source "package/libfm/Config.in" source "package/libfm-extra/Config.in" + source "package/libfreeglut/Config.in" source "package/libfreeimage/Config.in" source "package/libgail/Config.in" source "package/libgeotiff/Config.in" diff --git a/package/libfreeglut/Config.in b/package/libfreeglut/Config.in new file mode 100644 index 0000000..e09e7ef --- /dev/null +++ b/package/libfreeglut/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_LIBFREEGLUT + bool "libfreeglut" + select BR2_PACKAGE_LIBGLU + select BR2_PACKAGE_XLIB_LIBXI + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXXF86VM + depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_XORG7 + help + FreeGLUT is a free-software/open-source alternative to the + OpenGL Utility Toolkit (GLUT) library. GLUT (and hence + FreeGLUT) takes care of all the system-specific chores required + for creating windows, initializing OpenGL contexts, and + handling input events, to allow for trully portable OpenGL + programs. + + http://freeglut.sourceforge.net + +comment "libfreeglut depends on X.org and needs an OpenGL backend" + depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash new file mode 100644 index 0000000..a69a0b4 --- /dev/null +++ b/package/libfreeglut/libfreeglut.hash @@ -0,0 +1,2 @@ +# From http://sourceforge.net/projects/freeglut/files/freeglut/3.0.0/ +sha1 fca52242f9344627a30f11487ee42002e6b0dacd freeglut-3.0.0.tar.gz diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk new file mode 100644 index 0000000..507cb52 --- /dev/null +++ b/package/libfreeglut/libfreeglut.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# libfreeglut +# +################################################################################ + +LIBFREEGLUT_VERSION = 3.0.0 +LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz +LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut +LIBFREEGLUT_LICENSE = MIT +LIBFREEGLUT_LICENSE_FILES = COPYING +LIBFREEGLUT_INSTALL_STAGING = YES +LIBFREEGLUT_DEPENDENCIES = \ + libgl \ + libglu \ + xlib_libXi \ + xlib_libXrandr \ + xlib_libXxf86vm + +LIBFREEGLUT_CONF_OPTS = -DFREEGLUT_BUILD_DEMOS=OFF + +# package depends on X.org which depends on !BR2_STATIC_LIBS +ifeq ($(BR2_SHARED_LIBS),y) +LIBFREEGLUT_CONF_OPTS += \ + -DFREEGLUT_BUILD_SHARED_LIBS=ON \ + -DFREEGLUT_BUILD_STATIC_LIBS=OFF +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBFREEGLUT_CONF_OPTS += \ + -DFREEGLUT_BUILD_SHARED_LIBS=ON \ + -DFREEGLUT_BUILD_STATIC_LIBS=ON +endif + +$(eval $(cmake-package))
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- v2: added xlib_libXxf86vm as dependency (Thomas) handle shared-only build (Thomas) package/Config.in | 1 + package/libfreeglut/Config.in | 20 ++++++++++++++++++++ package/libfreeglut/libfreeglut.hash | 2 ++ package/libfreeglut/libfreeglut.mk | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 package/libfreeglut/Config.in create mode 100644 package/libfreeglut/libfreeglut.hash create mode 100644 package/libfreeglut/libfreeglut.mk