diff --git a/common/shlibs b/common/shlibs index e78516de065..c7fb597eb4d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2279,25 +2279,25 @@ libu2f-server.so.0 libu2f-server-1.0.1_2 libsqlcipher.so.0 sqlcipher-3.3.1_1 libgta.so.0 libgta-1.0.7_1 libgdal.so.20 libgdal-2.0.1_1 -libosgViewer.so.131 osg-3.4.1_1 -libosgShadow.so.131 osg-3.4.1_1 -libosgParticle.so.131 osg-3.4.1_1 -libOpenThreads.so.20 osg-3.4.1_1 -libosgFX.so.131 osg-3.4.1_1 -libosgText.so.131 osg-3.4.1_1 -libosgUI.so.131 osg-3.4.1_1 -libosg.so.131 osg-3.4.1_1 -libosgAnimation.so.131 osg-3.4.1_1 -libosgDB.so.131 osg-3.4.0_1 -libosgManipulator.so.131 osg-3.4.1_1 -libosgSim.so.131 osg-3.4.1_1 -libosgTerrain.so.131 osg-3.4.1_1 -libosgWidget.so.131 osg-3.4.1_1 -libosgQt.so.131 osg-3.4.1_1 -libosgUtil.so.131 osg-3.4.1_1 -libosgVolume.so.131 osg-3.4.1_1 -libosgGA.so.131 osg-3.4.1_1 -libosgPresentation.so.131 osg-3.4.1_1 +libosgViewer.so.156 osg-3.6.0_1 +libosgShadow.so.156 osg-3.6.0_1 +libosgParticle.so.156 osg-3.6.0_1 +libOpenThreads.so.21 osg-3.6.0_1 +libosgFX.so.156 osg-3.6.0_1 +libosgText.so.156 osg-3.6.0_1 +libosgUI.so.156 osg-3.6.0_1 +libosg.so.156 osg-3.6.0_1 +libosgAnimation.so.156 osg-3.6.0_1 +libosgDB.so.156 osg-3.6.0_1 +libosgManipulator.so.156 osg-3.6.0_1 +libosgSim.so.156 osg-3.6.0_1 +libosgTerrain.so.156 osg-3.6.0_1 +libosgWidget.so.156 osg-3.6.0_1 +libosgQt.so.156 osg-3.6.0_1 +libosgUtil.so.156 osg-3.6.0_1 +libosgVolume.so.156 osg-3.6.0_1 +libosgGA.so.156 osg-3.6.0_1 +libosgPresentation.so.156 osg-3.6.0_1 libKF5Screen.so.7 libkscreen-5.7.5_1 libdbusmenu-qt5.so.2 libdbusmenu-qt5-0.9.3.0_1 libKF5Solid.so.5 ksolid-5.15.0_1 diff --git a/srcpkgs/osg/patches/fix-gcc6-narrowing.patch b/srcpkgs/osg/patches/fix-gcc6-narrowing.patch deleted file mode 100644 index a5c7684a852..00000000000 --- a/srcpkgs/osg/patches/fix-gcc6-narrowing.patch +++ /dev/null @@ -1,60 +0,0 @@ -Use short instead of char for the decoding[] table. -Also fix an off-by-one error when checking the upper boundary for value_in. - ---- src/osgDB/ConvertBase64.cpp 2015-07-23 13:14:00.000000000 +0200 -+++ src/osgDB/ConvertBase64.cpp 2016-12-06 14:05:50.435406287 +0100 -@@ -28,10 +28,10 @@ - - int base64_decode_value(char value_in) - { -- static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; -- static const char decoding_size = sizeof(decoding); -+ static const short decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; -+ static const int decoding_size = sizeof(decoding) / sizeof(decoding[0]); - value_in -= 43; -- if (value_in < 0 || value_in > decoding_size) return -1; -+ if (value_in < 0 || value_in >= decoding_size) return -1; - return decoding[(int)value_in]; - } - ---- src/osgPlugins/osgjs/Base64.cpp 2015-03-09 12:27:26.000000000 +0100 -+++ src/osgPlugins/osgjs/Base64.cpp 2016-12-06 14:27:36.284022097 +0100 -@@ -20,22 +20,22 @@ - - const char _from_table[128] = - { -- -1, -1, -1, -1, -1, -1, -1, -1, // 0 -- -1, -1, -1, -1, -1, -1, -1, -1, // 8 -- -1, -1, -1, -1, -1, -1, -1, -1, // 16 -- -1, -1, -1, -1, -1, -1, -1, -1, // 24 -- -1, -1, -1, -1, -1, -1, -1, -1, // 32 -- -1, -1, -1, 62, -1, -1, -1, 63, // 40 -- 52, 53, 54, 55, 56, 57, 58, 59, // 48 -- 60, 61, -1, -1, -1, 0, -1, -1, // 56 -- -1, 0, 1, 2, 3, 4, 5, 6, // 64 -- 7, 8, 9, 10, 11, 12, 13, 14, // 72 -- 15, 16, 17, 18, 19, 20, 21, 22, // 80 -- 23, 24, 25, -1, -1, -1, -1, -1, // 88 -- -1, 26, 27, 28, 29, 30, 31, 32, // 96 -- 33, 34, 35, 36, 37, 38, 39, 40, // 104 -- 41, 42, 43, 44, 45, 46, 47, 48, // 112 -- 49, 50, 51, -1, -1, -1, -1, -1 // 120 -+ '\xff','\xff','\xff','\xff','\xff','\xff','\xff','\xff', // 0 -+ '\xff','\xff','\xff','\xff','\xff','\xff','\xff','\xff', // 8 -+ '\xff','\xff','\xff','\xff','\xff','\xff','\xff','\xff', // 16 -+ '\xff','\xff','\xff','\xff','\xff','\xff','\xff','\xff', // 24 -+ '\xff','\xff','\xff','\xff','\xff','\xff','\xff','\xff', // 32 -+ '\xff','\xff','\xff', 62,'\xff','\xff','\xff', 63, // 40 -+ 52, 53, 54, 55, 56, 57, 58, 59, // 48 -+ 60, 61,'\xff','\xff','\xff', 0,'\xff','\xff', // 56 -+ '\xff', 0, 1, 2, 3, 4, 5, 6, // 64 -+ 7, 8, 9, 10, 11, 12, 13, 14, // 72 -+ 15, 16, 17, 18, 19, 20, 21, 22, // 80 -+ 23, 24, 25,'\xff','\xff','\xff','\xff','\xff', // 88 -+ '\xff', 26, 27, 28, 29, 30, 31, 32, // 96 -+ 33, 34, 35, 36, 37, 38, 39, 40, // 104 -+ 41, 42, 43, 44, 45, 46, 47, 48, // 112 -+ 49, 50, 51,'\xff','\xff','\xff','\xff','\xff' // 120 - }; - const char* from_table = _from_table; - } diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index 6e40413c375..e6cf2dcea10 100644 --- a/srcpkgs/osg/template +++ b/srcpkgs/osg/template @@ -1,6 +1,6 @@ # Template file for 'osg' pkgname=osg -version=3.4.1 +version=3.6.0 revision=1 wrksrc=OpenSceneGraph-OpenSceneGraph-${version} build_style=cmake @@ -20,7 +20,7 @@ maintainer="Jürgen Buchmüller " license="OSGPL" homepage="http://www.openscenegraph.org" distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz" -checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5 +checksum=6f57134ea74a39f1c7b24c285e6278cf906c47f6c681573b86d12173a466efed # Append CFLAGS and CXXFLAGS to set work around code which gcc6 would # otherwise regard as out-of-specification and allow it to produce a