From 7b0342ef585d51c07b4170fc75ecb41374ffde8b Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sat, 04 Nov 2023 14:07:02 +0100
Subject: [PATCH] rebuild openscenegraph & switch to libopenjpeg8-turbo
---
components/encumbered/openscenegraph/pkg5 | 7 +++----
components/encumbered/openscenegraph/Makefile | 12 ++++++++----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/components/encumbered/openscenegraph/Makefile b/components/encumbered/openscenegraph/Makefile
index f267aaa..50e7a90 100644
--- a/components/encumbered/openscenegraph/Makefile
+++ b/components/encumbered/openscenegraph/Makefile
@@ -12,12 +12,11 @@
# Copyright (c) 2022 Jake Goerzen
BUILD_STYLE= cmake
-
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= OpenSceneGraph
COMPONENT_VERSION= 3.6.5
-COMPONENT_REVISION= 3
+COMPONENT_REVISION= 4
COMPONENT_PROJECT_URL= https://www.openscenegraph.com
COMPONENT_SUMMARY= OpenSceneGraph - High performance 3D graphics toolkit.
COMPONENT_SRC= OpenSceneGraph-$(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -35,8 +34,14 @@
CMAKE_CXX_FLAGS += -std=c++11
+# build with the distribution preferred libjpeg implementation
+CFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
+CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
+LDFLAGS += $(JPEG_LDFLAGS)
+
# This is to get libraries to install into /usr/lib/$(MACH64)
CMAKE_OPTIONS += -DLIB_POSTFIX=/$(MACH64)
+CMAKE_OPTIONS += -DJPEG_LIBRARY=$(JPEG_LIBDIR)/libjpeg.so
# OpenSceneGraph doesn't yet support FFmpeg 5 or higher, we have FFmpeg 6, so disable it for now
# https://github.com/openscenegraph/OpenSceneGraph/issues/1111
@@ -45,9 +50,8 @@
# Auto-generated dependencies
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
+REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG)
REQUIRED_PACKAGES += codec/jasper
-REQUIRED_PACKAGES += image/library/libjpeg6
-REQUIRED_PACKAGES += image/library/libjpeg6-ijg
REQUIRED_PACKAGES += image/library/libpng16
REQUIRED_PACKAGES += image/library/librsvg
REQUIRED_PACKAGES += image/library/libtiff
diff --git a/components/encumbered/openscenegraph/pkg5 b/components/encumbered/openscenegraph/pkg5
index 88dca46..54e5cff 100644
--- a/components/encumbered/openscenegraph/pkg5
+++ b/components/encumbered/openscenegraph/pkg5
@@ -1,8 +1,7 @@
{
"dependencies": [
"codec/jasper",
- "image/library/libjpeg6",
- "image/library/libjpeg6-ijg",
+ "image/library/libjpeg8-turbo",
"image/library/libpng16",
"image/library/librsvg",
"image/library/libtiff",
@@ -18,8 +17,8 @@
"system/library",
"system/library/fontconfig",
"system/library/freetype-2",
- "system/library/g++-10-runtime",
- "system/library/gcc-10-runtime",
+ "system/library/g++-13-runtime",
+ "system/library/gcc-13-runtime",
"system/library/math",
"web/curl",
"x11/library/libx11",
--
Gitblit v1.9.3