Github messages for voidlinux
 help / color / mirror / Atom feed
From: HadetTheUndying <HadetTheUndying@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] osg: update to 3.6.5
Date: Tue, 28 Dec 2021 10:08:00 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34729@inbox.vuxu.org> (raw)

[-- 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"

             reply	other threads:[~2021-12-28  9:08 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-28  9:08 HadetTheUndying [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34729@inbox.vuxu.org \
    --to=hadettheundying@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).