manuel/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osg: update to 3.6.5

Browse Source 
Also remove qt option as upstream moved osgQt to another
repository and nothing links to it
This commit is contained in:
Roberto Ricci 2022-12-09 23:23:53 +01:00 committed by John Zimmermann
parent 4d86e56fd0
commit 7af019257d
4 changed files with 28 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
common/shlibs
View File

@ -2507,25 +2507,24 @@ libu2f-server.so.0 libu2f-server-1.1.0_9
libsqlcipher.so.0 sqlcipher-4.3.0_3
libgta.so.1 libgta-1.2.0_1
libgdal.so.31 libgdal-3.5.3_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.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
libOpenThreads.so.21 osg-3.6.5_1
libosgFX.so.161 osg-3.6.5_1
libosgText.so.161 osg-3.6.5_1
libosgUI.so.161 osg-3.6.5_1
libosg.so.161 osg-3.6.5_1
libosgAnimation.so.161 osg-3.6.5_1
libosgDB.so.161 osg-3.6.5_1
libosgManipulator.so.161 osg-3.6.5_1
libosgSim.so.161 osg-3.6.5_1
libosgTerrain.so.161 osg-3.6.5_1
libosgWidget.so.161 osg-3.6.5_1
libosgUtil.so.161 osg-3.6.5_1
libosgVolume.so.161 osg-3.6.5_1
libosgGA.so.161 osg-3.6.5_1
libosgPresentation.so.161 osg-3.6.5_1
libKF5Screen.so.7 libkscreen-5.7.5_1
libdbusmenu-qt5.so.2 libdbusmenu-qt5-0.9.3.0_1
libKF5Solid.so.5 libksolid-5.15.0_2

60
srcpkgs/osg/patches/fix-narrowing.patch
View File

@ -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.
--- a/src/osgDB/ConvertBase64.cpp 2015-07-23 13:14:00.000000000 +0200
+++ b/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];
}
--- a/src/osgPlugins/osgjs/Base64.cpp 2015-03-09 12:27:26.000000000 +0100
+++ b/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;
}

26
srcpkgs/osg/template
View File

@ -1,42 +1,34 @@
# Template file for 'osg'
pkgname=osg
reverts=3.6.0_1
version=3.4.1
revision=14
version=3.6.5
revision=1
build_style=cmake
build_helper="qemu"
# don't use /usr/lib64 on 64bit platforms
configure_args="-DLIB_POSTFIX= $(vopt_if qt '-DOSG_USE_QT=1' '-DOSG_USE_QT=0')"
hostmakedepends="pkg-config unzip xrandr"
configure_args="-DLIB_POSTFIX="
hostmakedepends="pkg-config xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
$(vopt_if openexr libopenexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
homepage="https://www.openscenegraph.org"
changelog="https://raw.githubusercontent.com/openscenegraph/OpenSceneGraph/master/NEWS.txt"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
checksum=aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12
# Append CFLAGS and CXXFLAGS to set work around code which gcc6 would
# otherwise regard as out-of-specification and allow it to produce a
# working program.
CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
build_options="openexr poppler vnc"
build_options_default="openexr poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" qt"
else
if [ -n "$CROSS_BUILD" ]; then
# cmake can't check this when cross compiling
configure_args+=" -DPOPPLER_HAS_CAIRO_EXITCODE=0"
configure_args+=" -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=0"

3
srcpkgs/osg/update
View File

@ -1,2 +1 @@
pattern='OpenSceneGraph-\K3\.4\.[\d]+(-rc.*)?'
ignore="*-rc*"
pkgname='OpenSceneGraph'