* [PR PATCH] osg: update to 3.6.5
@ 2021-12-28 9:08 HadetTheUndying
2021-12-28 20:01 ` HadetTheUndying
` (13 more replies)
0 siblings, 14 replies; 20+ messages in thread
From: HadetTheUndying @ 2021-12-28 9:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1362 bytes --]
There is a new pull request by HadetTheUndying against master on the void-packages repository
https://github.com/HadetTheUndying/void-packages osg-update
https://github.com/void-linux/void-packages/pull/34729
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: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (x86_64-glibc)
I've briefly tested this as it's very late. I've grabbed the latest patches from the Alpine builds. I know this update has been held before and am seeking review. I personally need this update to build some VR sourceports. I have revbumped the relevant packages as well
A patch file from https://github.com/void-linux/void-packages/pull/34729.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osg-update-34729.patch --]
[-- Type: text/x-diff, Size: 12880 bytes --]
From 9a8adb3016da0ef736cf7778c60fbc12cfb3203f Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Tue, 28 Dec 2021 02:58:17 -0600
Subject: [PATCH 1/5] osg: update to 3.6.5.
---
common/shlibs | 38 ++++++------
.../add-missing-include-for-ppc64le.patch | 13 ++++
srcpkgs/osg/patches/fix-narrowing.patch | 60 -------------------
srcpkgs/osg/patches/musl-endianess.patch | 15 -----
srcpkgs/osg/patches/musl-fixes.patch | 22 +++++++
srcpkgs/osg/patches/musl-pthread.patch | 11 ----
srcpkgs/osg/template | 7 +--
7 files changed, 57 insertions(+), 109 deletions(-)
create mode 100644 srcpkgs/osg/patches/add-missing-include-for-ppc64le.patch
delete mode 100644 srcpkgs/osg/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/osg/patches/musl-endianess.patch
create mode 100644 srcpkgs/osg/patches/musl-fixes.patch
delete mode 100644 srcpkgs/osg/patches/musl-pthread.patch
diff --git a/common/shlibs b/common/shlibs
index e1a175684656..4adaf54b447e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2507,25 +2507,25 @@ 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.26 libgdal-3.0.4_9
-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.4.0_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
+libosgQt.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/add-missing-include-for-ppc64le.patch b/srcpkgs/osg/patches/add-missing-include-for-ppc64le.patch
new file mode 100644
index 000000000000..8731b33a88ed
--- /dev/null
+++ b/srcpkgs/osg/patches/add-missing-include-for-ppc64le.patch
@@ -0,0 +1,13 @@
+--- OpenSceneGraph-3.4.0/src/OpenThreads/pthreads/PThread.cpp
++++ OpenSceneGraph-3.4.0/src/OpenThreads/pthreads/PThread.cpp
+@@ -57,6 +57,10 @@
+
+ #include <iostream>
+
++#ifdef __powerpc64__
++#include <string.h>
++#endif
++
+ using namespace OpenThreads;
+
+ #ifdef DEBUG
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/patches/musl-endianess.patch b/srcpkgs/osg/patches/musl-endianess.patch
deleted file mode 100644
index d7db8f0c36e8..000000000000
--- a/srcpkgs/osg/patches/musl-endianess.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This time it's the other way round: both GNU libc and musl libc
-have <endian.h> so use defined(__linux__) to use this header
-file for setting the target's endianness.
-
---- a/src/osgPlugins/osc/osc/OscHostEndianness.h 2015-07-23 13:14:00.000000000 +0200
-+++ b/src/osgPlugins/osc/osc/OscHostEndianness.h 2015-10-31 06:39:02.503234496 +0100
-@@ -51,7 +51,7 @@
-
- #else
-
-- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__)
-+ #if defined(__linux__) || defined(__ANDROID__) || defined(__CYGWIN__)
- #include <endian.h>
- #if (__BYTE_ORDER == __LITTLE_ENDIAN)
- #ifndef __LITTLE_ENDIAN__
diff --git a/srcpkgs/osg/patches/musl-fixes.patch b/srcpkgs/osg/patches/musl-fixes.patch
new file mode 100644
index 000000000000..234c507e3583
--- /dev/null
+++ b/srcpkgs/osg/patches/musl-fixes.patch
@@ -0,0 +1,22 @@
+--- a/src/OpenThreads/pthreads/PThread.cpp
++++ b/src/OpenThreads/pthreads/PThread.cpp
+@@ -23,7 +23,7 @@
+ #include <pthread.h>
+ #include <limits.h>
+
+-#if defined __linux__ || defined __sun || defined __APPLE__ || ANDROID
++#if defined __GLIBC__ || defined __sun || defined __APPLE__ || ANDROID
+ #include <string.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+--- a/src/osgPlugins/osc/osc/OscHostEndianness.h
++++ b/src/osgPlugins/osc/osc/OscHostEndianness.h
+@@ -51,7 +51,7 @@
+
+ #else
+
+- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__)
++ #if defined(__linux__) || defined(__ANDROID__) || defined(__CYGWIN__)
+ #include <endian.h>
+ #if (__BYTE_ORDER == __LITTLE_ENDIAN)
+ #ifndef __LITTLE_ENDIAN__
diff --git a/srcpkgs/osg/patches/musl-pthread.patch b/srcpkgs/osg/patches/musl-pthread.patch
deleted file mode 100644
index d0f155ce5381..000000000000
--- a/srcpkgs/osg/patches/musl-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/OpenThreads/pthreads/PThread.cpp 2015-04-07 20:01:12.000000000 +0200
-+++ b/src/OpenThreads/pthreads/PThread.cpp 2015-10-31 06:24:45.189319272 +0100
-@@ -27,7 +27,7 @@
- #include <string.h>
- #include <sys/time.h>
- #include <sys/resource.h>
--#if !defined ANDROID
-+#if defined __GLIBC__ && !defined ANDROID
- #include <sys/unistd.h>
- #endif
- #endif
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9a3702c52f55 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -1,8 +1,7 @@
# Template file for 'osg'
pkgname=osg
-reverts=3.6.0_1
-version=3.4.1
-revision=12
+version=3.6.5
+revision=1
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -22,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="OSGPL-2.0-or-later"
homepage="http://www.openscenegraph.org"
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
From 62725f51ef2baa1a66ac97bddbbc444042e214b7 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Tue, 28 Dec 2021 03:00:19 -0600
Subject: [PATCH 2/5] 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 16f2dd21a021..7e9c8ff61f0f 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.3.11
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
From dbd4f63f523ea045ed95b27cb326c06f1e3a58d1 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Tue, 28 Dec 2021 03:00:19 -0600
Subject: [PATCH 3/5] 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 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 8c7787c3d74624712dacdb26e5e794b13b053855 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Tue, 28 Dec 2021 03:00:19 -0600
Subject: [PATCH 4/5] speed-dreams: rebuild for osg-3.6.5
---
srcpkgs/speed-dreams/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index 2e862d8cae9d..81b98994efd0 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*"
create_wrksrc=yes
From e4590189abc5166b0fb7ae61c6dfe2c10e8f5b10 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Tue, 28 Dec 2021 03:00:19 -0600
Subject: [PATCH 5/5] 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 e760fdd45aee..a2301f0de9e0 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.5.0
-revision=4
+revision=5
build_style=cmake
python_version=3
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
@ 2021-12-28 20:01 ` HadetTheUndying
2021-12-28 22:42 ` paper42
` (12 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: HadetTheUndying @ 2021-12-28 20:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1002261523
Comment:
Might need a little help wrapping my head around what's going on with the build. Everything has built fine locally for me on all architectures. I see and understand the linting error with sumo but am not sure why the actions failed on all x86 builds and not the ARM ones.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
2021-12-28 20:01 ` HadetTheUndying
@ 2021-12-28 22:42 ` paper42
2021-12-29 0:01 ` HadetTheUndying
` (11 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2021-12-28 22:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 737 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1002309580
Comment:
> Might need a little help wrapping my head around what's going on with the build. Everything has built fine locally for me on all architectures. I see and understand the linting error with sumo but am not sure why the actions failed on all x86 builds and not the ARM ones.
Because the failing phase is `do_check` which is only ran on non-cross targets. You should be able to reproduce the failure with `./xbps-src check <pkg>` or `./xbps-src pkg -K <pkg>`, pkg doesn't run tests by default. If you are still not able to reproduce the issue, it's possible it's specific to the CI environment.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
2021-12-28 20:01 ` HadetTheUndying
2021-12-28 22:42 ` paper42
@ 2021-12-29 0:01 ` HadetTheUndying
2021-12-29 1:46 ` [PR PATCH] [Updated] " HadetTheUndying
` (10 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: HadetTheUndying @ 2021-12-29 0:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1011 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1002327797
Comment:
> > Might need a little help wrapping my head around what's going on with the build. Everything has built fine locally for me on all architectures. I see and understand the linting error with sumo but am not sure why the actions failed on all x86 builds and not the ARM ones.
>
> Because the failing phase is `do_check` which is only ran on non-cross targets. You should be able to reproduce the failure with `./xbps-src check <pkg>` or `./xbps-src pkg -K <pkg>`, pkg doesn't run tests by default. If you are still not able to reproduce the issue, it's possible it's specific to the CI environment.
Okay so yeah that definitely reproduced the issue, but I have no idea how to go about fixing it. Any advice or help would be nice. I'm still not too great at this kinda learning as I go. I understand that cmake is failing at that specific task but not why.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (2 preceding siblings ...)
2021-12-29 0:01 ` HadetTheUndying
@ 2021-12-29 1:46 ` HadetTheUndying
2021-12-29 1:51 ` HadetTheUndying
` (9 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: HadetTheUndying @ 2021-12-29 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1367 bytes --]
There is an updated pull request by HadetTheUndying against master on the void-packages repository
https://github.com/HadetTheUndying/void-packages osg-update
https://github.com/void-linux/void-packages/pull/34729
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: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (x86_64-glibc)
I've briefly tested this as it's very late. I've grabbed the latest patches from the Alpine builds. I know this update has been held before and am seeking review. I personally need this update to build some VR sourceports. I have revbumped the relevant packages as well
A patch file from https://github.com/void-linux/void-packages/pull/34729.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osg-update-34729.patch --]
[-- Type: text/x-diff, Size: 13282 bytes --]
From 9a8adb3016da0ef736cf7778c60fbc12cfb3203f Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Tue, 28 Dec 2021 02:58:17 -0600
Subject: [PATCH 1/5] osg: update to 3.6.5.
---
common/shlibs | 38 ++++++------
.../add-missing-include-for-ppc64le.patch | 13 ++++
srcpkgs/osg/patches/fix-narrowing.patch | 60 -------------------
srcpkgs/osg/patches/musl-endianess.patch | 15 -----
srcpkgs/osg/patches/musl-fixes.patch | 22 +++++++
srcpkgs/osg/patches/musl-pthread.patch | 11 ----
srcpkgs/osg/template | 7 +--
7 files changed, 57 insertions(+), 109 deletions(-)
create mode 100644 srcpkgs/osg/patches/add-missing-include-for-ppc64le.patch
delete mode 100644 srcpkgs/osg/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/osg/patches/musl-endianess.patch
create mode 100644 srcpkgs/osg/patches/musl-fixes.patch
delete mode 100644 srcpkgs/osg/patches/musl-pthread.patch
diff --git a/common/shlibs b/common/shlibs
index e1a175684656..4adaf54b447e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2507,25 +2507,25 @@ 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.26 libgdal-3.0.4_9
-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.4.0_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
+libosgQt.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/add-missing-include-for-ppc64le.patch b/srcpkgs/osg/patches/add-missing-include-for-ppc64le.patch
new file mode 100644
index 000000000000..8731b33a88ed
--- /dev/null
+++ b/srcpkgs/osg/patches/add-missing-include-for-ppc64le.patch
@@ -0,0 +1,13 @@
+--- OpenSceneGraph-3.4.0/src/OpenThreads/pthreads/PThread.cpp
++++ OpenSceneGraph-3.4.0/src/OpenThreads/pthreads/PThread.cpp
+@@ -57,6 +57,10 @@
+
+ #include <iostream>
+
++#ifdef __powerpc64__
++#include <string.h>
++#endif
++
+ using namespace OpenThreads;
+
+ #ifdef DEBUG
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/patches/musl-endianess.patch b/srcpkgs/osg/patches/musl-endianess.patch
deleted file mode 100644
index d7db8f0c36e8..000000000000
--- a/srcpkgs/osg/patches/musl-endianess.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This time it's the other way round: both GNU libc and musl libc
-have <endian.h> so use defined(__linux__) to use this header
-file for setting the target's endianness.
-
---- a/src/osgPlugins/osc/osc/OscHostEndianness.h 2015-07-23 13:14:00.000000000 +0200
-+++ b/src/osgPlugins/osc/osc/OscHostEndianness.h 2015-10-31 06:39:02.503234496 +0100
-@@ -51,7 +51,7 @@
-
- #else
-
-- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__)
-+ #if defined(__linux__) || defined(__ANDROID__) || defined(__CYGWIN__)
- #include <endian.h>
- #if (__BYTE_ORDER == __LITTLE_ENDIAN)
- #ifndef __LITTLE_ENDIAN__
diff --git a/srcpkgs/osg/patches/musl-fixes.patch b/srcpkgs/osg/patches/musl-fixes.patch
new file mode 100644
index 000000000000..234c507e3583
--- /dev/null
+++ b/srcpkgs/osg/patches/musl-fixes.patch
@@ -0,0 +1,22 @@
+--- a/src/OpenThreads/pthreads/PThread.cpp
++++ b/src/OpenThreads/pthreads/PThread.cpp
+@@ -23,7 +23,7 @@
+ #include <pthread.h>
+ #include <limits.h>
+
+-#if defined __linux__ || defined __sun || defined __APPLE__ || ANDROID
++#if defined __GLIBC__ || defined __sun || defined __APPLE__ || ANDROID
+ #include <string.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+--- a/src/osgPlugins/osc/osc/OscHostEndianness.h
++++ b/src/osgPlugins/osc/osc/OscHostEndianness.h
+@@ -51,7 +51,7 @@
+
+ #else
+
+- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__)
++ #if defined(__linux__) || defined(__ANDROID__) || defined(__CYGWIN__)
+ #include <endian.h>
+ #if (__BYTE_ORDER == __LITTLE_ENDIAN)
+ #ifndef __LITTLE_ENDIAN__
diff --git a/srcpkgs/osg/patches/musl-pthread.patch b/srcpkgs/osg/patches/musl-pthread.patch
deleted file mode 100644
index d0f155ce5381..000000000000
--- a/srcpkgs/osg/patches/musl-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/OpenThreads/pthreads/PThread.cpp 2015-04-07 20:01:12.000000000 +0200
-+++ b/src/OpenThreads/pthreads/PThread.cpp 2015-10-31 06:24:45.189319272 +0100
-@@ -27,7 +27,7 @@
- #include <string.h>
- #include <sys/time.h>
- #include <sys/resource.h>
--#if !defined ANDROID
-+#if defined __GLIBC__ && !defined ANDROID
- #include <sys/unistd.h>
- #endif
- #endif
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9a3702c52f55 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -1,8 +1,7 @@
# Template file for 'osg'
pkgname=osg
-reverts=3.6.0_1
-version=3.4.1
-revision=12
+version=3.6.5
+revision=1
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -22,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="OSGPL-2.0-or-later"
homepage="http://www.openscenegraph.org"
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
From 62725f51ef2baa1a66ac97bddbbc444042e214b7 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Tue, 28 Dec 2021 03:00:19 -0600
Subject: [PATCH 2/5] 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 16f2dd21a021..7e9c8ff61f0f 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.3.11
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
From dbd4f63f523ea045ed95b27cb326c06f1e3a58d1 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Tue, 28 Dec 2021 03:00:19 -0600
Subject: [PATCH 3/5] 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 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 8c7787c3d74624712dacdb26e5e794b13b053855 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Tue, 28 Dec 2021 03:00:19 -0600
Subject: [PATCH 4/5] speed-dreams: rebuild for osg-3.6.5
---
srcpkgs/speed-dreams/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template
index 2e862d8cae9d..81b98994efd0 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*"
create_wrksrc=yes
From eccd81cc5a83511005a4f45291e21c4d1dfca2fa Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Tue, 28 Dec 2021 03:00:19 -0600
Subject: [PATCH 5/5] sumo: rebuild for osg-3.6.5
---
srcpkgs/sumo/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index e760fdd45aee..97c2fe1d318f 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.5.0
-revision=4
+revision=5
build_style=cmake
python_version=3
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
@@ -12,6 +12,7 @@ license="EPL-2.0"
homepage="https://sumo.dlr.de"
distfiles="https://sumo.dlr.de/releases/${version}/sumo-src-${version}.tar.gz"
checksum=dcf5339fdda0659fa44fcfd69fe3f4e03009aa9a59849624f2a3cfe72eda9f8e
+make_check=no #There are some upstream changes we need to test but this builds fine without the checks
post_install() {
rm -f ${DESTDIR}/usr/share/sumo/tools/libsumo/*.so
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (3 preceding siblings ...)
2021-12-29 1:46 ` [PR PATCH] [Updated] " HadetTheUndying
@ 2021-12-29 1:51 ` HadetTheUndying
2021-12-29 21:32 ` HadetTheUndying
` (8 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: HadetTheUndying @ 2021-12-29 1:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1002357439
Comment:
Okay so I've set `make_check=no` in `sumo` for the time being. It looks like we are a considerable number of releases behind from the upstream and I will address this once the PR is merged. As Prior to `1.9.0 `sumo` did not support python3 properly and this was not spotted during the python-3.10 revbump which the check also fails on. I know this is a little messy but as this package is so many version out of date, and I don't regularly use it, I would prefer to revbump it and then get it back up to date with the upstream after we get `osg` updated. This is my first PR that effects multiple packages like this so I appreciate everyone that's been helping me learn.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (4 preceding siblings ...)
2021-12-29 1:51 ` HadetTheUndying
@ 2021-12-29 21:32 ` HadetTheUndying
2021-12-29 21:32 ` HadetTheUndying
` (7 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: HadetTheUndying @ 2021-12-29 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1002357439
Comment:
Okay so I've set `make_check=no` in `sumo` for the time being. It looks like we are a considerable number of releases behind from the upstream and I will address this once the PR is merged. As Prior to 1.9.0 `sumo` did not support python3 properly and this was not spotted during the python-3.10 revbump which the check also fails on. I know this is a little messy but as this package is so many version out of date, and I don't regularly use it, I would prefer to revbump it and then get it back up to date with the upstream after we get `osg` updated. This is my first PR that effects multiple packages like this so I appreciate everyone that's been helping me learn.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (5 preceding siblings ...)
2021-12-29 21:32 ` HadetTheUndying
@ 2021-12-29 21:32 ` HadetTheUndying
2022-01-01 18:58 ` paper42
` (6 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: HadetTheUndying @ 2021-12-29 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1002783862
Comment:
The issue with Flightgear was definitely introduced by this revbump though. So I'll try to figure that out right now I'm at a loss.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (6 preceding siblings ...)
2021-12-29 21:32 ` HadetTheUndying
@ 2022-01-01 18:58 ` paper42
2022-01-09 11:46 ` 4ricci
` (5 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-01-01 18:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1003601059
Comment:
Updating sumo to the latest version fixes the test failure.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (7 preceding siblings ...)
2022-01-01 18:58 ` paper42
@ 2022-01-09 11:46 ` 4ricci
2022-01-09 20:06 ` HadetTheUndying
` (4 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: 4ricci @ 2022-01-09 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New comment by 4ricci on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1008282296
Comment:
Even if `xrevshlib` does not mention it, simgear should be revbumped as well. This may fix the flightgear issue (no time to test right now).
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (8 preceding siblings ...)
2022-01-09 11:46 ` 4ricci
@ 2022-01-09 20:06 ` HadetTheUndying
2022-03-10 14:27 ` 4ricci
` (3 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: HadetTheUndying @ 2022-01-09 20:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1008365094
Comment:
> Even if `xrevshlib` does not mention it, simgear should be revbumped as well. This may fix the flightgear issue (no time to test right now).
I'll get around to trying to fix this up by Wednesday. Ended up getting a little busy after I started working on this.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (9 preceding siblings ...)
2022-01-09 20:06 ` HadetTheUndying
@ 2022-03-10 14:27 ` 4ricci
2022-03-12 1:35 ` HadetTheUndying
` (2 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: 4ricci @ 2022-03-10 14:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 145 bytes --]
New comment by 4ricci on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1064120952
Comment:
ping
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (10 preceding siblings ...)
2022-03-10 14:27 ` 4ricci
@ 2022-03-12 1:35 ` HadetTheUndying
2022-06-20 2:13 ` github-actions
2022-07-04 2:15 ` [PR PATCH] [Closed]: " github-actions
13 siblings, 0 replies; 20+ messages in thread
From: HadetTheUndying @ 2022-03-12 1:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1065781707
Comment:
Hey so, I really don't have time to work on this PR right now, but I've done a lot of the grunt work if someone wants to take over. I expect I'll have time to work on it again in May when things die down for me with other projects.
If no one gets to it, I will get back to it as soon as I can. There's not a lot left that needs to be done, I just don't have time to test those things right now, and my build server is out of commission right now and can't spare the build times on my main machine at the moment.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (11 preceding siblings ...)
2022-03-12 1:35 ` HadetTheUndying
@ 2022-06-20 2:13 ` github-actions
2022-07-04 2:15 ` [PR PATCH] [Closed]: " github-actions
13 siblings, 0 replies; 20+ messages in thread
From: github-actions @ 2022-06-20 2:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/34729#issuecomment-1159892022
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Closed]: osg: update to 3.6.5
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
` (12 preceding siblings ...)
2022-06-20 2:13 ` github-actions
@ 2022-07-04 2:15 ` github-actions
13 siblings, 0 replies; 20+ messages in thread
From: github-actions @ 2022-07-04 2:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1192 bytes --]
There's a closed pull request on the void-packages repository
osg: update to 3.6.5
https://github.com/void-linux/void-packages/pull/34729
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (x86_64-glibc)
I've briefly tested this as it's very late. I've grabbed the latest patches from the Alpine builds. I know this update has been held before and am seeking review. I personally need this update to build some VR sourceports. I have revbumped the relevant packages as well
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] osg: update to 3.6.5
2022-12-30 1:12 [PR PATCH] " r-ricci
` (3 preceding siblings ...)
2023-01-19 21:13 ` r-ricci
@ 2023-01-22 22:47 ` r-ricci
4 siblings, 0 replies; 20+ messages in thread
From: r-ricci @ 2023-01-22 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated 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: 12636 bytes --]
From 934bd178c45a5aed5a687b27cb590bcd291f7268 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 5845b00d034d..806e66dedee8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -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
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 71675077ec1f..1a031448b3cf 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=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"
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 a9cf2b351313971e83fe6e2009a89de21de47de7 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 40e11e560891f7e36533647985e979802a7420b8 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 0acbe065634e5b762b498edcdcf9ab508d57ee91 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 6da8913d17fd8add2efc5bbf531d3eec1663462b Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 3 Jan 2023 16:26:04 +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 ff551cc82bc0..5251a0283dc1 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=3
+revision=4
build_style=cmake
_recast_commit=e75adf86f91eb3082220085e42dda62679f9a3ea
_bullet_tag=3.17
From db906daac9dfb2e5ab7d96781ceb714a04737a70 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 22 Jan 2023 23:46:36 +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 595a4d4e4c4e..0f9b9ec815f5 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
# Template file for 'sumo'
pkgname=sumo
version=1.12.0
-revision=4
+revision=5
build_style=cmake
hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] osg: update to 3.6.5
2022-12-30 1:12 [PR PATCH] " r-ricci
` (2 preceding siblings ...)
2023-01-09 20:47 ` r-ricci
@ 2023-01-19 21:13 ` r-ricci
2023-01-22 22:47 ` r-ricci
4 siblings, 0 replies; 20+ messages in thread
From: r-ricci @ 2023-01-19 21:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated 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: 12730 bytes --]
From d6280052ff5965309f46073a3eeaf0e99d26aa67 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 85c08f13a05f..4b47023b52a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -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
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 71675077ec1f..1a031448b3cf 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=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"
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 dc79b3af141c5e55d92111b168d694f3a4e10469 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 5eba428098cdbe711765c32a11478a8b89d1f398 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 5cf356265a9bccacf6399ece57896221993bf5ae 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 5f69e76c6eadf59ed2d8180cea79d3701a5d8c2c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 3 Jan 2023 16:26:04 +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 eaf887dae6cd..73289c9ecbd4 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=3
+revision=4
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 7e95c39c73666e62ff87aa3fd88fa52dd46b71c1 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
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] osg: update to 3.6.5
2022-12-30 1:12 [PR PATCH] " r-ricci
2022-12-30 10:12 ` [PR PATCH] [Updated] " r-ricci
2023-01-03 16:33 ` r-ricci
@ 2023-01-09 20:47 ` r-ricci
2023-01-19 21:13 ` r-ricci
2023-01-22 22:47 ` r-ricci
4 siblings, 0 replies; 20+ messages in thread
From: r-ricci @ 2023-01-09 20:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated 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: 12730 bytes --]
From 0f8d9d716a3e7babbb273f8d8250a3f6bfbed617 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 d80771f9f719..8e8bb3762494 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2505,25 +2505,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 71675077ec1f..1a031448b3cf 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=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"
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 8575fe52172a24df6e1b6fa91e4e3ae01ce4e091 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 2e8802ecc1a7391634e0e481c55db1aa2bc9c55c 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 7094206774907f7636ee04dd4c1ed1a8bf7f04cb 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 8ef0cd1a125e616097d1c3040a742278994be1cf Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 3 Jan 2023 16:26:04 +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 eaf887dae6cd..73289c9ecbd4 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=3
+revision=4
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 cedb220bb992055403523e2c2abd6554fdbc2638 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
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] osg: update to 3.6.5
2022-12-30 1:12 [PR PATCH] " r-ricci
2022-12-30 10:12 ` [PR PATCH] [Updated] " r-ricci
@ 2023-01-03 16:33 ` r-ricci
2023-01-09 20:47 ` r-ricci
` (2 subsequent siblings)
4 siblings, 0 replies; 20+ messages in thread
From: r-ricci @ 2023-01-03 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated 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: 12690 bytes --]
From 465f776bd6c5df19441937be53c66b17ed1243b6 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 52a6d3e6d5fb..8f797038b990 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2512,25 +2512,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 87065376c0df083275e8bf242d7a6d73d5d79868 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 3be8fb7be42a18edc08328064e5197a66c23e824 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 76a9bd41373570ddc0d6d6df575bba540a2058be 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 09205b5af171e4b2d36ad2e768fa0aeb061c6e1f Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 3 Jan 2023 16:26:04 +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 eaf887dae6cd..73289c9ecbd4 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=3
+revision=4
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 5eb0651f496bc46797d1381ce26053b4927d8de0 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
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] osg: update to 3.6.5
2022-12-30 1:12 [PR PATCH] " r-ricci
@ 2022-12-30 10:12 ` r-ricci
2023-01-03 16:33 ` r-ricci
` (3 subsequent siblings)
4 siblings, 0 replies; 20+ messages in thread
From: r-ricci @ 2022-12-30 10:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated 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 763b31b9c12d23efceebb492cb864ab4da272a08 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
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2023-01-22 22:47 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-28 9:08 [PR PATCH] osg: update to 3.6.5 HadetTheUndying
2021-12-28 20:01 ` HadetTheUndying
2021-12-28 22:42 ` paper42
2021-12-29 0:01 ` HadetTheUndying
2021-12-29 1:46 ` [PR PATCH] [Updated] " HadetTheUndying
2021-12-29 1:51 ` HadetTheUndying
2021-12-29 21:32 ` HadetTheUndying
2021-12-29 21:32 ` HadetTheUndying
2022-01-01 18:58 ` paper42
2022-01-09 11:46 ` 4ricci
2022-01-09 20:06 ` HadetTheUndying
2022-03-10 14:27 ` 4ricci
2022-03-12 1:35 ` HadetTheUndying
2022-06-20 2:13 ` github-actions
2022-07-04 2:15 ` [PR PATCH] [Closed]: " github-actions
2022-12-30 1:12 [PR PATCH] " r-ricci
2022-12-30 10:12 ` [PR PATCH] [Updated] " r-ricci
2023-01-03 16:33 ` r-ricci
2023-01-09 20:47 ` r-ricci
2023-01-19 21:13 ` r-ricci
2023-01-22 22:47 ` r-ricci
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).