From: r-ricci <r-ricci@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] osg: update to 3.6.5
Date: Fri, 30 Dec 2022 02:12:31 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41356@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is a new pull request by r-ricci against master on the void-packages repository
https://github.com/r-ricci/void-packages osg
https://github.com/void-linux/void-packages/pull/41356
osg: update to 3.6.5
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (except openmw)
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41356.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osg-41356.patch --]
[-- Type: text/x-diff, Size: 12691 bytes --]
From bae31e2e17bcde234e368df2cb91e871bd5612c7 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 9 Dec 2022 23:23:53 +0100
Subject: [PATCH 1/6] osg: update to 3.6.5
Also remove qt option as upstream moved osgQt to another
repository and nothing links to it
---
common/shlibs | 37 ++++++++-------
srcpkgs/osg/patches/fix-narrowing.patch | 60 -------------------------
srcpkgs/osg/template | 26 ++++-------
srcpkgs/osg/update | 3 +-
4 files changed, 28 insertions(+), 98 deletions(-)
delete mode 100644 srcpkgs/osg/patches/fix-narrowing.patch
diff --git a/common/shlibs b/common/shlibs
index 1c852ef3fdff..617db6291f79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2509,25 +2509,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
diff --git a/srcpkgs/osg/patches/fix-narrowing.patch b/srcpkgs/osg/patches/fix-narrowing.patch
deleted file mode 100644
index 241c31bdc100..000000000000
--- a/srcpkgs/osg/patches/fix-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.
-
---- 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;
- }
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..502a3c22cc6c 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -1,42 +1,34 @@
# Template file for 'osg'
pkgname=osg
-reverts=3.6.0_1
-version=3.4.1
-revision=13
+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="custom:OSGPL-0.0-or-later"
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"
diff --git a/srcpkgs/osg/update b/srcpkgs/osg/update
index 5b4d44bb1bf0..2821bcfe7cf3 100644
--- a/srcpkgs/osg/update
+++ b/srcpkgs/osg/update
@@ -1,2 +1 @@
-pattern='OpenSceneGraph-\K3\.4\.[\d]+(-rc.*)?'
-ignore="*-rc*"
+pkgname='OpenSceneGraph'
From 496577efecd5b401403d7e751fac85bcb5f962b3 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 11 Dec 2022 23:49:44 +0100
Subject: [PATCH 2/6] simgear: rebuild for osg-3.6.5
---
srcpkgs/simgear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template
index 3203613dc0c5..aaae27359568 100644
--- a/srcpkgs/simgear/template
+++ b/srcpkgs/simgear/template
@@ -1,7 +1,7 @@
# Template file for 'simgear'
pkgname=simgear
version=2020.3.17
-revision=1
+revision=2
# XXX: always keep in sync with flightgear version!
build_style=cmake
configure_args="-DENABLE_TESTS=OFF -DOpenGL_GL_PREFERENCE=GLVND
From 995fffa5b99124f3d7968db0fa1976f6540d8f53 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 12 Dec 2022 15:05:15 +0100
Subject: [PATCH 3/6] flightgear: rebuild for osg-3.6.5
---
srcpkgs/flightgear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 8486d6174329..9715c576d4e6 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.3.17
-revision=1
+revision=2
# XXX: always keep in sync with simgear version!
create_wrksrc=yes
build_style=cmake
From 075aa6070a4d734290e3f77587bf51df7adf714c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 12 Dec 2022 17:06:04 +0100
Subject: [PATCH 4/6] speed-dreams: rebuild for osg-3.6.5
And update checksum
---
srcpkgs/speed-dreams/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index 5db1c684bfb4..6664a0d15613 100644
--- a/srcpkgs/speed-dreams/template
+++ b/srcpkgs/speed-dreams/template
@@ -1,7 +1,7 @@
# Template file for 'speed-dreams'
pkgname=speed-dreams
version=2.2.3
-revision=1
+revision=2
_rev=r7616
archs="i686* x86_64* ppc64le* aarch64*"
create_wrksrc=yes
@@ -21,7 +21,7 @@ distfiles="${SOURCEFORGE_SITE}/speed-dreams/speed-dreams-src-base-${version}-${_
${SOURCEFORGE_SITE}/speed-dreams/speed-dreams-src-wip-cars-and-tracks-${version}-${_rev}.tar.xz
${SOURCEFORGE_SITE}/speed-dreams/speed-dreams-src-hq-cars-and-tracks-${version}-${_rev}.tar.xz
${SOURCEFORGE_SITE}/speed-dreams/speed-dreams-src-more-hq-cars-and-tracks-${version}-${_rev}.tar.xz"
-checksum="c67e48a083cd86f6c0062f0b38ed91a5d25274ea8aa656ee182f3f5074e96ff0
+checksum="1af07c483641f548af252b107cc3289fd37931445dc533b0b1a3781745d05021
aff20e49ff94660d9ef962079f640d0ceeaa414869209be1ec41768d0ee5cb20
06eaf2094bc10fbaca980a4236c4e444dd14275aba3f7b1d62b4b3a53a9d4c77
19208761b252df9db200c733cecb3bb584905f02d057af2bbff5e4c86cbe1a86"
From 82ebb606c15942b39b6975d5963fbd104966ebff Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 12 Dec 2022 23:08:44 +0100
Subject: [PATCH 5/6] openmw: rebuild for osg-3.6.5
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 8940e4c4367f..eaf887dae6cd 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=2
+revision=3
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
# LTO gives a measurable performance boost, while not hurting compile time too much
From 0fb432dc29bcf0b4d8aec4a45a4bf7c5b85e8337 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Dec 2022 00:16:07 +0100
Subject: [PATCH 6/6] sumo: rebuild for osg-3.6.5
---
srcpkgs/sumo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index dfc342f19a51..595a4d4e4c4e 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
next reply other threads:[~2022-12-30 1:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-30 1:12 r-ricci [this message]
2022-12-30 10:12 ` [PR PATCH] [Updated] " r-ricci
2023-01-03 16:33 ` r-ricci
2023-01-07 21:47 ` abenson
2023-01-09 20:47 ` [PR PATCH] [Updated] " r-ricci
2023-01-19 21:13 ` r-ricci
2023-01-20 0:54 ` r-ricci
2023-01-21 19:49 ` r-ricci
2023-01-22 22:32 ` Johnnynator
2023-01-22 22:47 ` [PR PATCH] [Updated] " r-ricci
2023-01-23 11:55 ` [PR PATCH] [Merged]: " Johnnynator
-- strict thread matches above, loose matches on Subject: below --
2021-12-28 9:08 [PR PATCH] " HadetTheUndying
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41356@inbox.vuxu.org \
--to=r-ricci@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).