Oh, I think I just give up on pkg-config for FreebSD for OpenEXR and
add static include ...

this is new "series" but patches must be simple enough to add changes manually

On Sun, Nov 26, 2023 at 8:39 PM Andrew Randrianasulu
<[email protected]> wrote:
>
> Hopefully they does not break anything else!
>
> I run freebsd-update directly from 13.0 to 14.0 and of course was
> bitten by update bug! :)
>
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273661
>
> but now build seems to be ok, next is runtime testing ..
>
> PS: 5 Gb is way too small space for modern system, I need to delete
> few caches, all docs, and even llvm's *.a files :/
From 3d32c7b85e8d4f2c40a3288149f7ef0aa86951fb Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <[email protected]>
Date: Mon, 27 Nov 2023 03:14:59 +0000
Subject: [PATCH 3/3] Better fix for freebsd 14 OpenEXR cflags pkg-config does
 not work for some reason/

---
 cinelerra-5.1/configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 27a2d298..6e70fb18 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -901,7 +901,7 @@ EXROStream() : Imf::OStream("mypath") {} };
   if test "x$WANT_STATIC_BUILD" = "xno"; then
     SHARED_openexr="$LIBS"
     SHARED_LIBS+=" $LIBS"
-    CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
+    CFG_CFLAGS+=" -I/usr/local/include/Imath -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
     CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)"
     CFG_CFLAGS+=" $(pkg-config --cflags Imath)"
   fi
@@ -909,7 +909,6 @@ EXROStream() : Imf::OStream("mypath") {} };
  fi
  LIBS="$saved_LIBS"
  CXXFLAGS="$saved_CXXFLAGS"
- CXXFLAGS+=" $(pkg-config --cflags OpenEXR)"
  AC_LANG_POP(C++)
  AC_MSG_RESULT([$HAVE_OPENEXR])
 ])
-- 
2.42.0

From 7dc3e6d0c42a767462e3126c589dbc4f1d87b236 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <[email protected]>
Date: Sun, 26 Nov 2023 17:27:42 +0000
Subject: [PATCH 1/3] Fix freebsd 14 build, moved to python39

---
 cinelerra-5.1/guicast/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index 423ba100..49bd154c 100644
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -130,7 +130,7 @@ python = $(shell which python)
 endif
 
 ifeq ($(python),)
-python += $(shell which python3.8)
+python += $(shell which python3.9)
 endif
 
 
-- 
2.42.0

From bf3749508e77af890f524b9052fbc6689f4afed1 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <[email protected]>
Date: Sun, 26 Nov 2023 17:28:51 +0000
Subject: [PATCH 2/3] Fix OpenEXR build on freebsd 14

---
 cinelerra-5.1/configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 4814f8b8..27a2d298 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -909,6 +909,7 @@ EXROStream() : Imf::OStream("mypath") {} };
  fi
  LIBS="$saved_LIBS"
  CXXFLAGS="$saved_CXXFLAGS"
+ CXXFLAGS+=" $(pkg-config --cflags OpenEXR)"
  AC_LANG_POP(C++)
  AC_MSG_RESULT([$HAVE_OPENEXR])
 ])
-- 
2.42.0

-- 
Cin mailing list
[email protected]
https://lists.cinelerra-gg.org/mailman/listinfo/cin

Reply via email to