Control: tags -1 patch
On Sat, 19 Nov 2016 23:27:24 +0200 Adrian Bunk <b...@stusta.de> wrote:
> Source: openscenegraph-3.4
> Version: 3.4.0+dfsg1-4
> Severity: important
>
> https://buildd.debian.org/status/fetch.php?pkg=openscenegraph-3.4&arch=armel&ver=3.4.0%2Bdfsg1-4&stamp=1474679517
>
> In file included from /usr/include/GL/gl.h:2055:0,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/build/osg/include/osg/GL:113,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osg/GLDefines:25,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osg/GLExtensions:18,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osg/State:18,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osg/GraphicsContext:17,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osgViewer/GraphicsWindow:17,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osgQt/GraphicsWindowQt:19,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/src/osgQt/GraphicsWindowQt.cpp:15:
> /usr/include/GL/glext.h:468:19: error: conflicting declaration 'typedef
> ptrdiff_t GLsizeiptr'
> typedef ptrdiff_t GLsizeiptr;
> ^~~~~~~~~~
> In file included from /usr/include/arm-linux-gnueabi/qt5/QtGui/qopengl.h:95:0,
> from /usr/include/arm-linux-gnueabi/qt5/QtOpenGL/qgl.h:39,
> from /usr/include/arm-linux-gnueabi/qt5/QtOpenGL/QGLWidget:1,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osgQt/GraphicsWindowQt:17,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/src/osgQt/GraphicsWindowQt.cpp:15:
> /usr/include/GLES3/gl3.h:69:25: note: previous declaration as 'typedef
> khronos_ssize_t GLsizeiptr'
> typedef khronos_ssize_t GLsizeiptr;
> ^~~~~~~~~~
> In file included from /usr/include/GL/gl.h:2055:0,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/build/osg/include/osg/GL:113,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osg/GLDefines:25,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osg/GLExtensions:18,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osg/State:18,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osg/GraphicsContext:17,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osgViewer/GraphicsWindow:17,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osgQt/GraphicsWindowQt:19,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/src/osgQt/GraphicsWindowQt.cpp:15:
> /usr/include/GL/glext.h:469:19: error: conflicting declaration 'typedef
> ptrdiff_t GLintptr'
> typedef ptrdiff_t GLintptr;
> ^~~~~~~~
> In file included from /usr/include/arm-linux-gnueabi/qt5/QtGui/qopengl.h:95:0,
> from /usr/include/arm-linux-gnueabi/qt5/QtOpenGL/qgl.h:39,
> from /usr/include/arm-linux-gnueabi/qt5/QtOpenGL/QGLWidget:1,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/include/osgQt/GraphicsWindowQt:17,
> from
> /«BUILDDIR»/openscenegraph-3.4-3.4.0+dfsg1/src/osgQt/GraphicsWindowQt.cpp:15:
> /usr/include/GLES3/gl3.h:70:26: note: previous declaration as 'typedef
> khronos_intptr_t GLintptr'
> typedef khronos_intptr_t GLintptr;
> ^~~~~~~~
> src/osgQt/CMakeFiles/osgQt.dir/build.make:66: recipe for target
> 'src/osgQt/CMakeFiles/osgQt.dir/GraphicsWindowQt.o' failed
> make[3]: *** [src/osgQt/CMakeFiles/osgQt.dir/GraphicsWindowQt.o] Error 1
I believe the attached patch should fix this bug (untested). The problem is that
Qt is using GLES on armel, but you're using big GL, and you can't mix them.
Cheers,
Emilio
diff -ruNp openscenegraph-3.4-3.4.0+dfsg1/debian/control openscenegraph-3.4-3.4.0+dfsg1.new/debian/control
--- openscenegraph-3.4-3.4.0+dfsg1/debian/control 2016-09-21 20:54:06.000000000 +0200
+++ openscenegraph-3.4-3.4.0+dfsg1.new/debian/control 2017-07-26 20:49:29.962498128 +0200
@@ -19,10 +19,10 @@ Build-Depends: debhelper (>= 7.0.50),
libgdal-dev,
libx11-dev,
libxmu-dev,
- freeglut3-dev [!armhf],
- libgl1-mesa-dev [!armhf] | libgl-dev [!armhf],
- libegl1-mesa-dev [armhf],
- libgles2-mesa-dev [armhf],
+ freeglut3-dev [!armel !armhf],
+ libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
+ libegl1-mesa-dev [armel armhf],
+ libgles2-mesa-dev [armel armhf],
libxine2-dev,
libavcodec-dev,
libswscale-dev,
@@ -44,8 +44,8 @@ Section: libdevel
Architecture: any
Depends: ${misc:Depends},
libopenthreads-dev,
- libgl1-mesa-dev [!armhf] | libgl-dev [!armhf],
- libgles2-mesa-dev [armhf],
+ libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
+ libgles2-mesa-dev [armel armhf],
libglu-dev,
libopenscenegraph-3.4-130 (= ${binary:Version})
Suggests: openscenegraph-doc,
diff -ruNp openscenegraph-3.4-3.4.0+dfsg1/debian/rules openscenegraph-3.4-3.4.0+dfsg1.new/debian/rules
--- openscenegraph-3.4-3.4.0+dfsg1/debian/rules 2016-09-23 21:17:22.000000000 +0200
+++ openscenegraph-3.4-3.4.0+dfsg1.new/debian/rules 2017-07-26 20:48:44.218670429 +0200
@@ -64,10 +64,10 @@ CXXFLAGS := ${CXXFLAGS} ${ARCH_CXX_FLAGS
LDFLAGS += -Wl,--as-needed
-ifeq (armhf,$(DEB_HOST_ARCH))
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
EGL_LDFLAGS=$(shell pkg-config egl --libs)
OPENGLES_LDFLAGS=$(shell pkg-config glesv2 --libs)
-ARMHF_DEFINES=-D OSG_GL1_AVAILABLE:BOOL=OFF \
+ARM_DEFINES=-D OSG_GL1_AVAILABLE:BOOL=OFF \
-D OSG_GL2_AVAILABLE:BOOL=OFF \
-D OSG_GL3_AVAILABLE:BOOL=OFF \
-D OSG_GLES1_AVAILABLE:BOOL=OFF \
@@ -451,7 +451,7 @@ build-stamp:
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
-D CMAKE_RELWITHDEBINFO_POSTFIX="" \
-D OSG_USE_LOCAL_LUA_SOURCE:BOOL=OFF \
- ${ARMHF_DEFINES} \
+ ${ARM_DEFINES} \
../..
${MAKE} ${PARALLEL_OPTIONS} VERBOSE=1 -C build/osg
