haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

opencascade: disabled FFmpeg (#13105)

Browse Source 
* opencasecade: disabled FFmpeg

* simplify qt path, backport a build fix for freetype

---------

Co-authored-by: Joachim Mairböck <j.mairboeck@gmail.com>
This commit is contained in:
kenmays
2025-11-02 06:27:03 -08:00
committed by GitHub
parent d5d9fa8073
commit 5cf0bba07c
2 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sci-libs/opencascade/opencascade-7.8.1.recipe
View File

@@ -7,7 +7,7 @@ COPYRIGHT="1993-1999 Matra Datavision
1999-2020 OPEN CASCADE SAS"
LICENSE="GNU LGPL v2.1
Open CASCADE exception v1.0"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V${portVersion//./_}.tar.gz"
CHECKSUM_SHA256="7321af48c34dc253bf8aae3f0430e8cb10976961d534d8509e72516978aa82f5"
SOURCE_DIR="OCCT-${portVersion//./_}"
@@ -91,9 +91,9 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavutil$secondaryArchSuffix
# lib:libavcodec$secondaryArchSuffix
# lib:libavformat$secondaryArchSuffix
# lib:libavutil$secondaryArchSuffix
lib:libdraco$secondaryArchSuffix
# lib:libEGL$secondaryArchSuffix
lib:libexecinfo$secondaryArchSuffix
@@ -101,7 +101,7 @@ REQUIRES="
lib:libfreeimage$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
# lib:libGL$secondaryArchSuffix
lib:libswscale$secondaryArchSuffix
# lib:libswscale$secondaryArchSuffix
# lib:libtbb$secondaryArchSuffix
lib:libX11$secondaryArchSuffix
"
@@ -214,9 +214,9 @@ REQUIRES_samples="
opencascade$secondaryArchSuffix == $portVersion base
opencascade${secondaryArchSuffix}_tools == $portVersion
haiku$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavutil$secondaryArchSuffix
# lib:libavcodec$secondaryArchSuffix
# lib:libavformat$secondaryArchSuffix
# lib:libavutil$secondaryArchSuffix
# lib:libEGL$secondaryArchSuffix
lib:libexecinfo$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
@@ -230,7 +230,7 @@ REQUIRES_samples="
lib:libQt5Quick$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
lib:libswscale$secondaryArchSuffix
# lib:libswscale$secondaryArchSuffix
# lib:libtbb$secondaryArchSuffix
lib:libX11$secondaryArchSuffix
"
@@ -281,9 +281,9 @@ PROVIDES_tools="
REQUIRES_tools="
opencascade$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavutil$secondaryArchSuffix
# lib:libavcodec$secondaryArchSuffix
# lib:libavformat$secondaryArchSuffix
# lib:libavutil$secondaryArchSuffix
# lib:libEGL$secondaryArchSuffix
lib:libexecinfo$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
@@ -296,7 +296,7 @@ REQUIRES_tools="
lib:libQt5Quick$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
lib:libswscale$secondaryArchSuffix
# lib:libswscale$secondaryArchSuffix
# lib:libtbb$secondaryArchSuffix
lib:libtcl8.6$secondaryArchSuffix
# lib:libtk8.6$secondaryArchSuffix
@@ -305,9 +305,11 @@ REQUIRES_tools="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
ffmpeg${secondaryArchSuffix}_devel
cmd:lrelease$secondaryArchSuffix
cmd:tclsh
# devel:libavcodec$secondaryArchSuffix
# devel:libavformat$secondaryArchSuffix
# devel:libavutil$secondaryArchSuffix
devel:libdraco$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
# devel:libEGL$secondaryArchSuffix
@@ -341,7 +343,7 @@ BUILD()
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-D3RDPARTY_DRACO_INCLUDE_DIR=/boot/system/$relativeIncludeDir \
-D3RDPARTY_DRACO_LIBRARY=/boot/system/$relativeDevelopLibDir/libdraco.so \
-D3RDPARTY_QT_DIR=$portPackageLinksDir/devel~libqt5 \
-D3RDPARTY_QT_DIR=/boot/system/$relativeLibDir \
-D3RDPARTY_SKIP_DOT_EXECUTABLE=OFF \
-DBUILD_Inspector=ON \
-DBUILD_OPT_PROFILE=Production \
@@ -361,7 +363,7 @@ BUILD()
-DINSTALL_SAMPLES=ON \
-DINSTALL_TEST_CASES=OFF \
-DUSE_DRACO=ON \
-DUSE_FFMPEG=ON \
-DUSE_FFMPEG=OFF \
-DUSE_FREEIMAGE=ON \
-DUSE_OPENGL=OFF \
-DUSE_OPENVR=OFF \

45
sci-libs/opencascade/patches/opencascade-7.8.1.patchset
View File

@@ -1,4 +1,4 @@
From db11071df1934abe7242cf436e4712fc79c8e8c9 Mon Sep 17 00:00:00 2001
From 9ca314ae6c4cb7e625d404388229daab31115f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 18 Dec 2022 20:25:23 +0100
Subject: Haiku support
@@ -266,10 +266,10 @@ index 493de12..ed5f356 100644
for {set i 0} {$i < 1000} {incr i} {
--
2.42.1
2.51.0
From dd1e5248c2491f13aa80d0c350e7ed4b3ab29c4c Mon Sep 17 00:00:00 2001
From 23dfc243c04a270d91952af4375ec3ce39708c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 18 Dec 2022 20:26:18 +0100
Subject: allow building the OpenGl module on Haiku
@@ -309,10 +309,10 @@ index a1b5b2b..26c2d27 100644
#if !defined(HAVE_EGL)
--
2.42.1
2.51.0
From e56aab06074fb2977028161ff44903f4eab397ca Mon Sep 17 00:00:00 2001
From d8f9d0817f54b02412eea6530f10c394d9a36b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 4 Dec 2022 21:33:38 +0100
Subject: add a stub to allow building on Haiku when not using Xlib
@@ -334,10 +334,10 @@ index a9b7406..87c8069 100644
//
#endif
--
2.42.1
2.51.0
From b351369d7b73d208f56292d0e69bbaf130e0b68a Mon Sep 17 00:00:00 2001
From c9c25183e35d544b6e2cd913aeb51bb1da4618c7 Mon Sep 17 00:00:00 2001
From: Bernd Waibel <waebbl@gmail.com>
Date: Wed, 3 Feb 2021 23:31:23 +0100
Subject: allow default search path for Qt5
@@ -358,10 +358,10 @@ index 535e6a2..ca8fa9a 100644
# Now we can apply standard CMake finder for Qt. We do this mostly
# to have qt4_wrap_cpp() function available
--
2.42.1
2.51.0
From 475152c06b15bb0f75dec222374680c2728321f1 Mon Sep 17 00:00:00 2001
From 78583d20eb6eb4de1ff09fc15b3ca5897d123fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 18 Dec 2022 20:16:41 +0100
Subject: allow building without OpenGL (stubbed)
@@ -562,5 +562,30 @@ index 5ba225a..becc510 100644
Handle(V3d_Viewer) aViewer = new V3d_Viewer (aGraphicDriver);
aViewer->SetDefaultLights();
--
2.42.1
2.51.0
From adbea66fbe495bb0779389967f7c8ef621b1cd6c Mon Sep 17 00:00:00 2001
From: dpasukhi <dpasukhi@opencascade.com>
Date: Tue, 27 Aug 2024 11:33:29 +0100
Subject: 0033808: Coding - FreeType Use unsigned point and contour indexing in
`FT_Outline`
Changes to auto instead of specific type
diff --git a/src/StdPrs/StdPrs_BRepFont.cxx b/src/StdPrs/StdPrs_BRepFont.cxx
index ab2d9b3..cd70187 100644
--- a/src/StdPrs/StdPrs_BRepFont.cxx
+++ b/src/StdPrs/StdPrs_BRepFont.cxx
@@ -457,7 +457,7 @@ Standard_Boolean StdPrs_BRepFont::renderGlyph (const Standard_Utf32Char theChar,
for (short aContour = 0, aStartIndex = 0; aContour < anOutline->n_contours; ++aContour)
{
const FT_Vector* aPntList = &anOutline->points[aStartIndex];
- const char* aTags = &anOutline->tags[aStartIndex];
+ const auto* aTags = &anOutline->tags[aStartIndex];
const short anEndIndex = anOutline->contours[aContour];
const short aPntsNb = (anEndIndex - aStartIndex) + 1;
aStartIndex = anEndIndex + 1;
--
2.51.0