public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/osgearth] rawhide: Update to 3.8.1
@ 2026-07-02 14:33 Sandro Mani
0 siblings, 0 replies; only message in thread
From: Sandro Mani @ 2026-07-02 14:33 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/osgearth
Branch : rawhide
Commit : 7590dd0f91a64e7ead9c14c766bf86ccf7aca746
Author : Sandro Mani <manisandro@gmail.com>
Date : 2026-07-02T16:33:36+02:00
Stats : +44/-116 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/osgearth/c/7590dd0f91a64e7ead9c14c766bf86ccf7aca746?branch=rawhide
Log:
Update to 3.8.1
---
diff --git a/.gitignore b/.gitignore
index f57b3a9..258ff01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/osgearth-3.7.tar.gz
/osgearth-3.7.2.tar.gz
/osgearth-3.8.tar.gz
+/osgearth-3.8.1.tar.gz
diff --git a/osgearth.spec b/osgearth.spec
index a687e71..afa0061 100644
--- a/osgearth.spec
+++ b/osgearth.spec
@@ -3,8 +3,8 @@
%global with_docs 1
Name: osgearth
-Version: 3.8
-Release: 2%{?dist}
+Version: 3.8.1
+Release: 1%{?dist}
Summary: Dynamic map generation toolkit for OpenSceneGraph
License: LGPL-3.0-only
@@ -15,10 +15,8 @@ Source0: https://github.com/gwaldron/osgearth/archive/%{name}-%{version}.t
Patch0: osgearth_mingw.patch
# Support option to disable fastdxt build
Patch1: osgearth_fastdxt.patch
-# Unbundle liblerc, rapidjson
+# Unbundle rapidjson
Patch2: osgearth_unbundle.patch
-# Link against liblerct
-Patch3: osgearth_link-lerc.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
@@ -203,8 +201,8 @@ cp -a tests %{buildroot}%{_datadir}/%{name}/tests
%files
%license LICENSE.txt
-%{_libdir}/libosgEarth*.so.3.8.0
-%{_libdir}/libosgEarth*.so.185
+%{_libdir}/libosgEarth*.so.3.8.1
+%{_libdir}/libosgEarth*.so.187
%{_libdir}/osgPlugins-%{osg_ver}/osgdb_*.so
%files devel
@@ -278,6 +276,9 @@ cp -a tests %{buildroot}%{_datadir}/%{name}/tests
%changelog
+* Thu Jul 02 2026 Sandro Mani <manisandro@gmail.com> - 3.8.1-1
+- Update to 3.8.1
+
* Fri Jun 19 2026 Sandro Mani <manisandro@gmail.com> - 3.8-2
- Rebuild (gdal)
diff --git a/osgearth_fastdxt.patch b/osgearth_fastdxt.patch
index 08dd67a..db6021c 100644
--- a/osgearth_fastdxt.patch
+++ b/osgearth_fastdxt.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarthDrivers/CMakeLists.txt osgearth-osgearth-3.8-new/src/osgEarthDrivers/CMakeLists.txt
---- osgearth-osgearth-3.8/src/osgEarthDrivers/CMakeLists.txt 2026-03-04 15:48:55.000000000 +0100
-+++ osgearth-osgearth-3.8-new/src/osgEarthDrivers/CMakeLists.txt 2026-04-23 19:40:56.941096820 +0200
-@@ -32,7 +32,8 @@ endif()
+diff -rupN --no-dereference osgearth-osgearth-3.8.1/src/osgEarthDrivers/CMakeLists.txt osgearth-osgearth-3.8.1-new/src/osgEarthDrivers/CMakeLists.txt
+--- osgearth-osgearth-3.8.1/src/osgEarthDrivers/CMakeLists.txt 2026-06-30 15:25:27.000000000 +0200
++++ osgearth-osgearth-3.8.1-new/src/osgEarthDrivers/CMakeLists.txt 2026-07-02 14:45:42.844788550 +0200
+@@ -34,7 +34,8 @@ endif()
# now requires C++20
#add_subdirectory(cache_rocksdb)
@@ -9,5 +9,5 @@ diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarthDrivers/CMakeLists
+OPTION(DISABLE_FASTDXT "Disale fastdxt build" OFF)
+if(NOT APPLE AND NOT ANDROID AND NOT DISABLE_FASTDXT)
add_subdirectory(fastdxt)
- if(NOT BUILDING_VCPKG_PORT)
- add_subdirectory(lerc)
+ add_subdirectory(lerc)
+ endif()
diff --git a/osgearth_link-lerc.patch b/osgearth_link-lerc.patch
deleted file mode 100644
index 244b4f2..0000000
--- a/osgearth_link-lerc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarthDrivers/lerc/CMakeLists.txt osgearth-osgearth-3.8-new/src/osgEarthDrivers/lerc/CMakeLists.txt
---- osgearth-osgearth-3.8/src/osgEarthDrivers/lerc/CMakeLists.txt 2026-04-23 19:40:57.841701577 +0200
-+++ osgearth-osgearth-3.8-new/src/osgEarthDrivers/lerc/CMakeLists.txt 2026-04-23 19:40:57.846272944 +0200
-@@ -5,3 +5,5 @@ add_osgearth_plugin(
- SOURCES
- ReaderWriterLERC.cpp
- )
-+
-+target_link_libraries(osgdb_lerc PRIVATE Lerc)
diff --git a/osgearth_mingw.patch b/osgearth_mingw.patch
index acb152a..33fab50 100644
--- a/osgearth_mingw.patch
+++ b/osgearth_mingw.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarth/CMakeLists.txt osgearth-osgearth-3.8-new/src/osgEarth/CMakeLists.txt
---- osgearth-osgearth-3.8/src/osgEarth/CMakeLists.txt 2026-03-04 15:48:55.000000000 +0100
-+++ osgearth-osgearth-3.8-new/src/osgEarth/CMakeLists.txt 2026-04-23 19:40:56.487760626 +0200
+diff -rupN --no-dereference osgearth-osgearth-3.8.1/src/osgEarth/CMakeLists.txt osgearth-osgearth-3.8.1-new/src/osgEarth/CMakeLists.txt
+--- osgearth-osgearth-3.8.1/src/osgEarth/CMakeLists.txt 2026-06-30 15:25:27.000000000 +0200
++++ osgearth-osgearth-3.8.1-new/src/osgEarth/CMakeLists.txt 2026-07-02 14:45:42.383064564 +0200
@@ -949,6 +949,9 @@ if(WIN32)
target_link_libraries(${LIB_NAME} PRIVATE dbghelp)
endif()
@@ -11,18 +11,29 @@ diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarth/CMakeLists.txt os
# special purpose - do not remove
option(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF)
-diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarth/Notify.cpp osgearth-osgearth-3.8-new/src/osgEarth/Notify.cpp
---- osgearth-osgearth-3.8/src/osgEarth/Notify.cpp 2026-03-04 15:48:55.000000000 +0100
-+++ osgearth-osgearth-3.8-new/src/osgEarth/Notify.cpp 2026-04-23 19:40:56.488100497 +0200
-@@ -322,7 +322,7 @@ std::ostream& osgEarth::notify(const osg
+diff -rupN --no-dereference osgearth-osgearth-3.8.1/src/osgEarth/Notify.cpp osgearth-osgearth-3.8.1-new/src/osgEarth/Notify.cpp
+--- osgearth-osgearth-3.8.1/src/osgEarth/Notify.cpp 2026-06-30 15:25:27.000000000 +0200
++++ osgearth-osgearth-3.8.1-new/src/osgEarth/Notify.cpp 2026-07-02 14:45:42.383428845 +0200
+@@ -321,8 +321,8 @@ std::ostream& osgEarth::notify(const osg
+
//.....
- #ifdef WIN32
+-#ifdef WIN32
-#include <Windows.h>
++#ifdef _WIN32
+#include <windows.h>
#include <dbghelp.h>
#pragma comment(lib, "dbghelp.lib")
#elif defined(__GNUC__)
+@@ -334,7 +334,7 @@ std::ostream& osgEarth::notify(const osg
+
+ CallStack::CallStack()
+ {
+-#ifdef WIN32
++#ifdef _WIN32
+ HANDLE process = GetCurrentProcess();
+ SymInitialize(process, NULL, TRUE);
+
@@ -380,4 +380,4 @@ CallStack::CallStack()
}
free(bt);
@@ -30,9 +41,9 @@ diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarth/Notify.cpp osgear
-}
\ No newline at end of file
+}
-diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarth/Threading.cpp osgearth-osgearth-3.8-new/src/osgEarth/Threading.cpp
---- osgearth-osgearth-3.8/src/osgEarth/Threading.cpp 2026-03-04 15:48:55.000000000 +0100
-+++ osgearth-osgearth-3.8-new/src/osgEarth/Threading.cpp 2026-04-23 19:40:56.488340015 +0200
+diff -rupN --no-dereference osgearth-osgearth-3.8.1/src/osgEarth/Threading.cpp osgearth-osgearth-3.8.1-new/src/osgEarth/Threading.cpp
+--- osgearth-osgearth-3.8.1/src/osgEarth/Threading.cpp 2026-06-30 15:25:27.000000000 +0200
++++ osgearth-osgearth-3.8.1-new/src/osgEarth/Threading.cpp 2026-07-02 14:45:42.383771492 +0200
@@ -8,7 +8,7 @@
#include <cstring>
@@ -42,9 +53,9 @@ diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarth/Threading.cpp osg
#elif defined(__APPLE__) || defined(__LINUX__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__ANDROID__)
# include <unistd.h>
# include <sys/syscall.h>
-diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarthDrivers/sky_simple/eb_utility.cpp osgearth-osgearth-3.8-new/src/osgEarthDrivers/sky_simple/eb_utility.cpp
---- osgearth-osgearth-3.8/src/osgEarthDrivers/sky_simple/eb_utility.cpp 2026-03-04 15:48:55.000000000 +0100
-+++ osgearth-osgearth-3.8-new/src/osgEarthDrivers/sky_simple/eb_utility.cpp 2026-04-23 19:40:56.489499628 +0200
+diff -rupN --no-dereference osgearth-osgearth-3.8.1/src/osgEarthDrivers/sky_simple/eb_utility.cpp osgearth-osgearth-3.8.1-new/src/osgEarthDrivers/sky_simple/eb_utility.cpp
+--- osgearth-osgearth-3.8.1/src/osgEarthDrivers/sky_simple/eb_utility.cpp 2026-06-30 15:25:27.000000000 +0200
++++ osgearth-osgearth-3.8.1-new/src/osgEarthDrivers/sky_simple/eb_utility.cpp 2026-07-02 14:45:42.384081178 +0200
@@ -27,7 +27,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#include <algorithm>
@@ -54,24 +65,3 @@ diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarthDrivers/sky_simple
#include <direct.h>
#define GetCurrentDir _getcwd
#define ChangeWorkingDir _chdir
-diff -rupN osgearth-osgearth-3.8/src/osgEarth/Notify.cpp osgearth-osgearth-3.8-new/src/osgEarth/Notify.cpp
---- osgearth-osgearth-3.8/src/osgEarth/Notify.cpp 2026-04-23 19:40:56.936405213 +0200
-+++ osgearth-osgearth-3.8-new/src/osgEarth/Notify.cpp 2026-04-23 20:06:37.073534792 +0200
-@@ -321,7 +321,7 @@ std::ostream& osgEarth::notify(const osg
-
- //.....
-
--#ifdef WIN32
-+#ifdef _WIN32
- #include <windows.h>
- #include <dbghelp.h>
- #pragma comment(lib, "dbghelp.lib")
-@@ -334,7 +334,7 @@ std::ostream& osgEarth::notify(const osg
-
- CallStack::CallStack()
- {
--#ifdef WIN32
-+#ifdef _WIN32
- HANDLE process = GetCurrentProcess();
- SymInitialize(process, NULL, TRUE);
-
diff --git a/osgearth_unbundle.patch b/osgearth_unbundle.patch
index b2bb0a2..5ecb1f2 100644
--- a/osgearth_unbundle.patch
+++ b/osgearth_unbundle.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarthDrivers/gltf/CMakeLists.txt osgearth-osgearth-3.8-new/src/osgEarthDrivers/gltf/CMakeLists.txt
---- osgearth-osgearth-3.8/src/osgEarthDrivers/gltf/CMakeLists.txt 2026-03-04 15:48:55.000000000 +0100
-+++ osgearth-osgearth-3.8-new/src/osgEarthDrivers/gltf/CMakeLists.txt 2026-04-23 19:40:57.398635784 +0200
+diff -rupN --no-dereference osgearth-osgearth-3.8.1/src/osgEarthDrivers/gltf/CMakeLists.txt osgearth-osgearth-3.8.1-new/src/osgEarthDrivers/gltf/CMakeLists.txt
+--- osgearth-osgearth-3.8.1/src/osgEarthDrivers/gltf/CMakeLists.txt 2026-06-30 15:25:27.000000000 +0200
++++ osgearth-osgearth-3.8.1-new/src/osgEarthDrivers/gltf/CMakeLists.txt 2026-07-02 14:45:43.283792219 +0200
@@ -16,7 +16,7 @@ add_osgearth_plugin(
include_directories(
@@ -10,58 +10,3 @@ diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarthDrivers/gltf/CMake
if (draco_FOUND)
#include_directories(${draco_INCLUDE_DIRS})
-diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarthDrivers/lerc/CMakeLists.txt osgearth-osgearth-3.8-new/src/osgEarthDrivers/lerc/CMakeLists.txt
---- osgearth-osgearth-3.8/src/osgEarthDrivers/lerc/CMakeLists.txt 2026-03-04 15:48:55.000000000 +0100
-+++ osgearth-osgearth-3.8-new/src/osgEarthDrivers/lerc/CMakeLists.txt 2026-04-23 19:40:57.398936091 +0200
-@@ -4,12 +4,4 @@ add_osgearth_plugin(
- TARGET osgdb_lerc
- SOURCES
- ReaderWriterLERC.cpp
-- ../../third_party/lerc/src/LercLib/BitMask.cpp
-- ../../third_party/lerc/src/LercLib/BitStuffer2.cpp
-- ../../third_party/lerc/src/LercLib/Huffman.cpp
-- ../../third_party/lerc/src/LercLib/Lerc.cpp
-- ../../third_party/lerc/src/LercLib/Lerc_c_api_impl.cpp
-- ../../third_party/lerc/src/LercLib/Lerc2.cpp
-- ../../third_party/lerc/src/LercLib/RLE.cpp
-- ../../third_party/lerc/src/LercLib/Lerc1Decode/BitStuffer.cpp
-- ../../third_party/lerc/src/LercLib/Lerc1Decode/CntZImage.cpp )
-\ No newline at end of file
-+ )
-diff -rupN --no-dereference osgearth-osgearth-3.8/src/osgEarthDrivers/lerc/ReaderWriterLERC.cpp osgearth-osgearth-3.8-new/src/osgEarthDrivers/lerc/ReaderWriterLERC.cpp
---- osgearth-osgearth-3.8/src/osgEarthDrivers/lerc/ReaderWriterLERC.cpp 2026-03-04 15:48:55.000000000 +0100
-+++ osgearth-osgearth-3.8-new/src/osgEarthDrivers/lerc/ReaderWriterLERC.cpp 2026-04-23 19:40:57.399122811 +0200
-@@ -159,7 +159,7 @@ public:
-
- // Decode the image
- unsigned int bandOffset = 0;
-- hr = lerc_decode((const unsigned char*)(data.get()), length, 0, numDims, width, height, numBands, dataType, (void*)output);
-+ hr = lerc_decode((const unsigned char*)(data.get()), length, 0, 0, numDims, width, height, numBands, dataType, (void*)output);
- if (hr)
- {
- delete[]output;
-@@ -333,7 +333,7 @@ public:
-
- hr = lerc_computeCompressedSize((void*)imageData, // raw image data, row by row, band by band
- dataType, numDims, width, height, numBands,
-- 0,
-+ 0, 0,
- maxZError, // max coding error per pixel, or precision
- &numBytesNeeded); // size of outgoing Lerc blob
- if (hr)
-@@ -347,7 +347,7 @@ public:
-
- hr = lerc_encode((void*)imageData, // raw image data, row by row, band by band
- dataType, numDims, width, height, numBands,
-- 0, // can give nullptr if all pixels are valid
-+ 0, 0, // can give nullptr if all pixels are valid
- maxZError, // max coding error per pixel, or precision
- pLercBlob, // buffer to write to, function will fail if buffer too small
- numBytesBlob, // buffer size
-@@ -377,4 +377,4 @@ public:
- }
- };
-
--REGISTER_OSGPLUGIN(lerc, ReaderWriterLERC)
-\ No newline at end of file
-+REGISTER_OSGPLUGIN(lerc, ReaderWriterLERC)
diff --git a/sources b/sources
index bdabab1..e5c3335 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osgearth-3.8.tar.gz) = a7463b8f6f37aeb7d9fcf97afb108a2e3adbd511e5b5444db3c0a656102bd3b6dd697b8bb803e2b169adb3802d7e07c22756f116a057ec58cfebc46ec3a50ef8
+SHA512 (osgearth-3.8.1.tar.gz) = 10f15b0d0c575fbb9edb26421c5ad63768fb018ad9afeb635cc2aed43fff014d77025ade2a8c1c09c0d41ba293a51b75084ec7ad3250535dfbb325b23edd00c7
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-02 14:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-02 14:33 [rpms/osgearth] rawhide: Update to 3.8.1 Sandro Mani
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox