diff -Nru openscenegraph-3.2.3+dfsg1/debian/changelog openscenegraph-3.2.3+dfsg1/debian/changelog --- openscenegraph-3.2.3+dfsg1/debian/changelog 2018-07-19 08:47:39.000000000 +0000 +++ openscenegraph-3.2.3+dfsg1/debian/changelog 2019-01-14 12:59:44.000000000 +0000 @@ -1,75 +1,16 @@ -openscenegraph (3.2.3+dfsg1-2ubuntu11) cosmic; urgency=medium +openscenegraph (3.2.3+dfsg1-3ubuntu2) disco; urgency=medium - * No-change rebuild for ffmpeg soname changes. + * Ubuntu Upload, drop all the delta, make the package syncable again. + (the delta seems to be about a build failure in arm*, but now the package + builds again just fine) - -- Matthias Klose Thu, 19 Jul 2018 08:47:39 +0000 + -- Gianfranco Costamagna Mon, 14 Jan 2019 13:59:44 +0100 -openscenegraph (3.2.3+dfsg1-2ubuntu10) cosmic; urgency=medium +openscenegraph (3.2.3+dfsg1-3) unstable; urgency=medium - * Rebuild against new gdal PIC enabled. + * Use the new version of libcoin (Closes: #917082, #912866). - -- Gianfranco Costamagna Fri, 29 Jun 2018 15:07:23 +0200 - -openscenegraph (3.2.3+dfsg1-2ubuntu9) cosmic; urgency=medium - - * Rebuild against new gdal-abi-2-3-0. - - -- Gianfranco Costamagna Fri, 25 May 2018 10:51:00 +0200 - -openscenegraph (3.2.3+dfsg1-2ubuntu8) bionic; urgency=medium - - * Rebuild against new gdal-abi-2-2-3. - - -- Gianfranco Costamagna Sun, 17 Dec 2017 22:11:50 +0100 - -openscenegraph (3.2.3+dfsg1-2ubuntu7) bionic; urgency=medium - - * No-change rebuild against gdal-abi-2-2-2 - - -- Steve Langasek Fri, 03 Nov 2017 20:29:14 +0000 - -openscenegraph (3.2.3+dfsg1-2ubuntu6) artful; urgency=medium - - * Try again to fix armhf GLES support. - - -- Steve Langasek Tue, 25 Jul 2017 12:22:32 -0700 - -openscenegraph (3.2.3+dfsg1-2ubuntu5) artful; urgency=medium - - * Fix armhf GLES support for compatibility with current cmake. - - -- Steve Langasek Tue, 25 Jul 2017 10:54:26 -0700 - -openscenegraph (3.2.3+dfsg1-2ubuntu4) artful; urgency=medium - - * Rebuild against new gdal ABI. - - -- Gianfranco Costamagna Thu, 13 Jul 2017 13:04:55 +0200 - -openscenegraph (3.2.3+dfsg1-2ubuntu3) zesty; urgency=medium - - * No-change rebuild against latest gdal - - -- Jeremy Bicha Thu, 03 Nov 2016 13:53:43 -0400 - -openscenegraph (3.2.3+dfsg1-2ubuntu2) yakkety; urgency=medium - - * Rebuild against gdal-abi-2-1-1. - - -- Gianfranco Costamagna Thu, 14 Jul 2016 16:13:31 +0200 - -openscenegraph (3.2.3+dfsg1-2ubuntu1) yakkety; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Add support for building on armhf by building with OpenGL ES 2.0. - - Backport part of a commit to not build osgframerenderer example. - - Add change-typedef.patch to fix conflicting typedefs for GLdouble with - OpenGL ES 2.0. - - Exclude freeglut3-dev from dependencies for armhf. - - Change Depends of libopenscenegraph-dev for armhf from libgl1-mesa- - dev to libgles2-mesa-dev. - - -- Steve Langasek Fri, 10 Jun 2016 20:51:07 -0700 + -- Alberto Luaces Fernández Mon, 07 Jan 2019 11:52:00 +0100 openscenegraph (3.2.3+dfsg1-2) unstable; urgency=medium @@ -79,31 +20,6 @@ -- Alberto Luaces Fernández Mon, 16 May 2016 14:23:26 +0200 -openscenegraph (3.2.3+dfsg1-1ubuntu3) yakkety; urgency=medium - - * No-change rebuild against gdal-abi-2-1-0 - - -- Steve Langasek Fri, 20 May 2016 23:59:41 +0000 - -openscenegraph (3.2.3+dfsg1-1ubuntu2) yakkety; urgency=medium - - * No-change rebuild for gdal soname change. - - -- Matthias Klose Fri, 29 Apr 2016 18:29:23 +0000 - -openscenegraph (3.2.3+dfsg1-1ubuntu1) yakkety; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Add support for building on armhf by building with OpenGL ES 2.0. - - Backport part of a commit to not build osgframerenderer example. - - Add change-typedef.patch to fix conflicting typedefs for GLdouble with - OpenGL ES 2.0. - - Exclude freeglut3-dev from dependencies for armhf. - - Change Depends of libopenscenegraph-dev for armhf from libgl1-mesa- - dev to libgles2-mesa-dev. - - -- Gianfranco Costamagna Sat, 23 Apr 2016 16:58:10 +0200 - openscenegraph (3.2.3+dfsg1-1) unstable; urgency=medium * Remove jasper dependency (Closes: #818211). @@ -149,42 +65,6 @@ -- Alberto Luaces Fernández Mon, 19 Oct 2015 13:51:23 +0200 -openscenegraph (3.2.1-7ubuntu4) xenial; urgency=medium - - * No-change rebuild for new gdal - - -- Iain Lane Thu, 03 Dec 2015 11:37:44 +0000 - -openscenegraph (3.2.1-7ubuntu3) xenial; urgency=medium - - * Build using giflib5. - - -- Matthias Klose Tue, 27 Oct 2015 05:06:12 +0000 - -openscenegraph (3.2.1-7ubuntu2) xenial; urgency=medium - - * No-change rebuild for giflib soname bump. - - -- Matthias Klose Tue, 27 Oct 2015 03:52:17 +0000 - -openscenegraph (3.2.1-7ubuntu1) wily; urgency=low - - [ Ubuntu Merge-o-Matic ] - * Merge from Debian unstable. Remaining changes: - - Add support for building on armhf by building with OpenGL ES 2.0. - - Backport part of a commit to not build osgframerenderer example. - - Add change-typedef.patch to fix conflicting typedefs for GLdouble with - OpenGL ES 2.0. - - Exclude freeglut3-dev from dependencies for armhf. - - Change Depends of libopenscenegraph-dev for armhf from libgl1-mesa- - dev to libgles2-mesa-dev. - - Re-add a copy of the xine_xmalloc_aligned function, removed in - newer upstream versions. - * Dropped changes, included in Debian: - - Rename libopenscenegraph100 to -v5 for gcc5 transition - - -- Steve Langasek Tue, 01 Sep 2015 10:08:08 -0700 - openscenegraph (3.2.1-7) unstable; urgency=medium [ Martin Pitt ] @@ -194,47 +74,6 @@ -- Manuel A. Fernandez Montecelo Sun, 30 Aug 2015 15:13:43 +0100 -openscenegraph (3.2.1-6ubuntu5) wily; urgency=medium - - * No-change rebuild against libgdal1i - - -- Steve Langasek Sun, 23 Aug 2015 01:22:19 +0000 - -openscenegraph (3.2.1-6ubuntu4) wily; urgency=medium - - * No-change rebuild against libcoin80v5. - - -- Martin Pitt Wed, 12 Aug 2015 08:39:56 +0200 - -openscenegraph (3.2.1-6ubuntu3) wily; urgency=medium - - * Rename libopenscenegraph100 to -v5 for gcc5 transition (Closes: #791231) - Note that libopenthreads20 can keep its name, its symbols don't change - under g++ 5. - - -- Martin Pitt Thu, 30 Jul 2015 16:46:56 +0200 - -openscenegraph (3.2.1-6ubuntu2) wily; urgency=medium - - * Re-add a copy of the xine_xmalloc_aligned function, removed in - newer upstream versions. - - -- Matthias Klose Mon, 13 Jul 2015 22:28:18 +0200 - -openscenegraph (3.2.1-6ubuntu1) wily; urgency=medium - - * Merge with Debian; remaining changes: - - Add support for building on armhf by building with OpenGL ES 2.0. - - Backport part of a commit to not build osgframerenderer example. - - Add change-typedef.patch to fix conflicting typedefs for GLdouble with - OpenGL ES 2.0. - - Exclude freeglut3-dev from dependencies for armhf. - - Change Depends of libopenscenegraph-dev for armhf from libgl1-mesa- - dev to libgles2-mesa-dev. - * Build using GCC 5. - - -- Matthias Klose Mon, 13 Jul 2015 20:49:12 +0200 - openscenegraph (3.2.1-6) unstable; urgency=medium [ Andreas Beckmann ] @@ -244,25 +83,6 @@ -- Alberto Luaces Fernández Wed, 04 Feb 2015 18:27:21 +0100 -openscenegraph (3.2.1-5ubuntu2) vivid; urgency=medium - - * No-change rebuild for the libgdal-dev 1.11.2 transition. - - -- Adam Conrad Wed, 18 Mar 2015 01:06:09 -0600 - -openscenegraph (3.2.1-5ubuntu1) vivid; urgency=medium - - * Resynchronise with Debian. Remaining changes: - - Add support for building on armhf by building with OpenGL ES 2.0. - - Backport part of a commit to not build osgframerenderer example. - - Add change-typedef.patch to fix conflicting typedefs for GLdouble with - OpenGL ES 2.0. - - Exclude freeglut3-dev from dependencies for armhf. - - Change Depends of libopenscenegraph-dev for armhf from libgl1-mesa- - dev to libgles2-mesa-dev. - - -- Colin Watson Tue, 02 Dec 2014 16:00:21 +0000 - openscenegraph (3.2.1-5) unstable; urgency=medium * Update fix for correctly loading plugins on platforms other than amd64. @@ -308,30 +128,6 @@ -- Alberto Luaces Fernández Fri, 01 Aug 2014 20:41:55 +0200 -openscenegraph (3.2.0~rc1-5.1ubuntu3) utopic; urgency=medium - - * Rebuild against libav11. - - -- Colin Watson Fri, 05 Sep 2014 02:02:24 +0100 - -openscenegraph (3.2.0~rc1-5.1ubuntu2) utopic; urgency=low - - * Change Depends of libopenscenegraph-dev for armhf from libgl1-mesa- - dev to libgles2-mesa-dev (LP: #1363529) - - -- Saikrishna Arcot Sat, 30 Aug 2014 19:51:40 -0400 - -openscenegraph (3.2.0~rc1-5.1ubuntu1) utopic; urgency=low - - * Add support for building on armhf by building with OpenGL ES 2.0 - (LP: #1284190). - * Backport part of a commit to not build osgframerenderer example. - * Add change-typedef.patch to fix conflicting typedefs for GLdouble - with OpenGL ES 2.0 - * Exclude freeglut3-dev from dependencies for armhf - - -- Saikrishna Arcot Wed, 06 Aug 2014 17:41:46 -0500 - openscenegraph (3.2.0~rc1-5.1) unstable; urgency=low * Non-maintainer upload. diff -Nru openscenegraph-3.2.3+dfsg1/debian/control openscenegraph-3.2.3+dfsg1/debian/control --- openscenegraph-3.2.3+dfsg1/debian/control 2016-06-10 18:04:05.000000000 +0000 +++ openscenegraph-3.2.3+dfsg1/debian/control 2019-01-07 10:50:10.000000000 +0000 @@ -1,8 +1,7 @@ Source: openscenegraph Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Loic Dachary (OuoU) +Maintainer: Loic Dachary (OuoU) Uploaders: Manuel A. Fernandez Montecelo , Alberto Luaces Fernández , Ola Lundqvist Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.16.1~), @@ -16,14 +15,12 @@ lib3ds-dev, libfreetype6-dev, libpng-dev, - libcoin80-dev, + libcoin-dev, 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, + libgl1-mesa-dev | libgl-dev, libxine2-dev, libavcodec-dev, libswscale-dev, @@ -68,8 +65,7 @@ Architecture: any Depends: ${misc:Depends}, libopenthreads-dev, - libgl1-mesa-dev [!armhf] | libgl-dev [!armhf], - libgles2-mesa-dev [armhf], + libgl1-mesa-dev | libgl-dev, libglu-dev, libopenscenegraph100v5 (= ${binary:Version}) Suggests: openscenegraph-doc, diff -Nru openscenegraph-3.2.3+dfsg1/debian/patches/change-typedef.patch openscenegraph-3.2.3+dfsg1/debian/patches/change-typedef.patch --- openscenegraph-3.2.3+dfsg1/debian/patches/change-typedef.patch 2014-12-02 15:52:16.000000000 +0000 +++ openscenegraph-3.2.3+dfsg1/debian/patches/change-typedef.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: openscenegraph/OpenSceneGraph/include/osg/GL -=================================================================== ---- openscenegraph.orig/OpenSceneGraph/include/osg/GL 2014-08-05 16:58:36.000000000 -0500 -+++ openscenegraph/OpenSceneGraph/include/osg/GL 2014-08-06 06:45:29.857287930 -0500 -@@ -168,7 +168,7 @@ - // add defines for OpenGL targets that don't define them, just to ease compatibility across targets - #ifndef GL_DOUBLE - #define GL_DOUBLE 0x140A -- typedef double GLdouble; -+ #define GLdouble double - #endif - - #ifndef GL_INT diff -Nru openscenegraph-3.2.3+dfsg1/debian/patches/dont-build-osgframerenderer-on-gles.patch openscenegraph-3.2.3+dfsg1/debian/patches/dont-build-osgframerenderer-on-gles.patch --- openscenegraph-3.2.3+dfsg1/debian/patches/dont-build-osgframerenderer-on-gles.patch 2014-12-02 15:52:16.000000000 +0000 +++ openscenegraph-3.2.3+dfsg1/debian/patches/dont-build-osgframerenderer-on-gles.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Description: Don't build the osgframerenderer example if building for - OpenGL ES 1, OpenGL ES 2, or OpenGL 3. This is a portion of the full commit. -Origin: upstream, https://github.com/openscenegraph/osg/commit/3f812e42c7bb257e1e19604318becd359d21f469 - -Index: openscenegraph/OpenSceneGraph/examples/CMakeLists.txt -=================================================================== ---- openscenegraph.orig/OpenSceneGraph/examples/CMakeLists.txt 2014-07-26 08:49:44.583787000 -0500 -+++ openscenegraph/OpenSceneGraph/examples/CMakeLists.txt 2014-08-03 11:41:48.439983802 -0500 -@@ -46,7 +46,6 @@ - ADD_SUBDIRECTORY(osgfont) - ADD_SUBDIRECTORY(osgforest) - ADD_SUBDIRECTORY(osgfxbrowser) -- ADD_SUBDIRECTORY(osgframerenderer) - ADD_SUBDIRECTORY(osgoutline) - ADD_SUBDIRECTORY(osggameoflife) - ADD_SUBDIRECTORY(osggeometry) -@@ -173,6 +172,7 @@ - - IF(NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE) - ADD_SUBDIRECTORY(osgscreencapture) -+ ADD_SUBDIRECTORY(osgframerenderer) - ADD_SUBDIRECTORY(osgmotionblur) - ADD_SUBDIRECTORY(osgteapot) - ENDIF() diff -Nru openscenegraph-3.2.3+dfsg1/debian/patches/series openscenegraph-3.2.3+dfsg1/debian/patches/series --- openscenegraph-3.2.3+dfsg1/debian/patches/series 2016-06-10 18:04:05.000000000 +0000 +++ openscenegraph-3.2.3+dfsg1/debian/patches/series 2016-05-16 12:16:49.000000000 +0000 @@ -1,7 +1,5 @@ disable-zip-plugin-with-embedded-zlib.patch check__FreeBSD_kernel__ -dont-build-osgframerenderer-on-gles.patch -change-typedef.patch no-xine-malloc-aligned.diff ffmpeg_2.9.patch 0005-Bas-Couwenberg-s-patches-for-Hurd.patch diff -Nru openscenegraph-3.2.3+dfsg1/debian/rules openscenegraph-3.2.3+dfsg1/debian/rules --- openscenegraph-3.2.3+dfsg1/debian/rules 2017-07-25 19:00:41.000000000 +0000 +++ openscenegraph-3.2.3+dfsg1/debian/rules 2016-03-22 16:18:20.000000000 +0000 @@ -66,14 +66,6 @@ LDFLAGS += -Wl,--as-needed -ifeq (armhf,$(DEB_HOST_ARCH)) -ARMHF_DEFINES=-D OSG_GL1_AVAILABLE:BOOL=OFF \ - -D OSG_GL2_AVAILABLE:BOOL=OFF \ - -D OSG_GLES2_AVAILABLE:BOOL=ON \ - -D OPENGL_gl_LIBRARY:STRING=/usr/lib/arm-linux-gnueabihf/libGLESv2.so \ - -D OPENGL_egl_LIBRARY:STRING=/usr/lib/arm-linux-gnueabihf/libEGL.so -endif - # # Shared libraries version numbers # @@ -435,7 +427,6 @@ -D CMAKE_INSTALL_PREFIX:PATH=/usr \ -D BUILD_OSG_EXAMPLES:BOOL=ON \ -D LIB_POSTFIX="/${DEB_HOST_MULTIARCH}" \ - ${ARMHF_DEFINES} \ ../../${OSG} ${MAKE} ${PARALLEL_OPTIONS} VERBOSE=1 -C build/osg