From 641a0f760f3a44983c527e1a5ce5ecc82b028e80 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 28 May 2024 17:55:02 +0800
Subject: BSDs use system OpenJPEG, Linuxes link statically

Cause 2.5.2 on MacPorts and FBSD ports are safe, while 2.5.0 on
Debian/Ubuntu would cause a crash that we stick to LL's 2.5.0.
---
 indra/llimagej2coj/llimagej2coj.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/llimagej2coj')

diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 26043b2d8b..67cd9d572d 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -28,9 +28,15 @@
 #include "llimagej2coj.h"
 
 // this is defined so that we get static linking.
+#if LL_LINUX || !LL_USESYSTEMLIBS
 #include "openjpeg/openjpeg.h"
 #include "openjpeg/event.h"
 #include "openjpeg/cio.h"
+#else
+#include <openjpeg-2.5/openjpeg.h>
+#include <openjpeg-2.5/event.h>
+#include <openjpeg-2.5/cio.h>
+#endif
 
 #define MAX_ENCODED_DISCARD_LEVELS 5
 
-- 
cgit v1.2.3