cingg-netbsd: remove openexr3.2 hardcode, unneeded. Add rpatch hardcode

diff --git a/cingg-netbsd/Makefile b/cingg-netbsd/Makefile
index 6bf54ba5fb696f1e5ceca1d4c213d8b9dc145120..2a9a8ba19ee89b924e628cf71934231f3a25eeea 100644 (file)
--- a/cingg-netbsd/Makefile
+++ b/cingg-netbsd/Makefile
@@ -20,12 +20,12 @@ USE_LANGUAGES=              c c++
 
 USE_TOOLS+=    bash:run pkg-config
 
-#SHEBANG_GLOB= *.sh *.bld
-#SHEBANG_FILES=        cinelerra-5.1/doc/ContextManual.pl
+REPLACE_PERL=cinelerra-5.1/doc/ContextManual.pl
+
 USE_TOOLS+=    pkg-config gmake aclocal autoconf automake makeinfo
 GNU_CONFIGURE= yes
 
-REPLACE_BASH=   cinelerra-5.1/inst.sh
+REPLACE_BASH=   cinelerra-5.1/inst.sh cinelerra-5.1/doc/RenderMux.sh
 
 CFLAGS+=               -fpermissive
 

diff --git a/cingg-netbsd/distinfo b/cingg-netbsd/distinfo
index b868262a344bcde016da7768afa506e22dcfb4cc..b06489f9bf5a61f1943fe6990a4a942cdf249f1b 100644 (file)
--- a/cingg-netbsd/distinfo
+++ b/cingg-netbsd/distinfo
@@ -3,5 +3,4 @@ $NetBSD$
 BLAKE2s (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 98552c0774608721d4adf1c5e63c138f27416fe840740ea1fd6da1c452ce40d7
 SHA512 (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 410e311544a73061e0042045f20b16d7137d76a306395844fe76b4410dcde92a2f3bf79f373a2dacdcc456bb7d72bd5939c8762b92c4724b3efe5817ee362002
 Size (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 195630107 bytes
-SHA1 (patch-aa) = c15fb44c81ac2d36af8fd4d4aa0ddcc38812675e
-SHA1 (patch-ac) = baa34cf5a6315d6612b14e6ff78aa9cd81e1eb73
+SHA1 (patch-aa) = ec634efcd8f7f2efca0cee3e8b94606799e4b148

diff --git a/cingg-netbsd/patches/patch-aa b/cingg-netbsd/patches/patch-aa
index 582394cf77982052af2634bead51afb83cd7c228..74a4eada648c7f36bfc63e4004cf7f742df809ea 100644 (file)
--- a/cingg-netbsd/patches/patch-aa
+++ b/cingg-netbsd/patches/patch-aa
@@ -1,14 +1,13 @@
-$NetBSD$
-
-Hardcoding openexr3.2 for a moment
-
+diff --git a/configure.ac.orig b/configure.ac
+index 7d98b25..ad557aa 100644
 --- ./cinelerra-5.1/configure.ac.orig
 +++ ./cinelerra-5.1/configure.ac
-@@ -1292,6 +1292,7 @@ echo "system_libs += -L/usr/pkg/lib/"
+@@ -1292,6 +1292,8 @@ echo "system_libs += -L/usr/pkg/lib/"
  echo "system_libs += -lpng16"
  echo "system_libs += -lintl"
  echo "system_libs += -lossaudio"
-+echo "system_libs += -lOpenEXR-3_2 -lOpenEXRUtil-3_2 -lOpenEXRCore-3_2 -lIex-3_2 -lIlmThread-3_2 -lImath-3_1"
++echo "system_libs += -rpath=/usr/pkg/lib/ffmpeg6"
++echo "system_libs += -rpath=/usr/pkg/lib/"
  echo "CFLAGS += -I/usr/X11R7/include"
  echo "CFLAGS += -I/usr/pkg/include/ffmpeg6"
  echo "CFLAGS += $(pkg-config --cflags xft)"

diff --git a/cingg-netbsd/patches/patch-ac b/cingg-netbsd/patches/patch-ac
deleted file mode 100644 (file)
index 88f1e92..0000000
--- a/cingg-netbsd/patches/patch-ac
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-lv2 and openexr fixes
-
---- cinelerra-5.1/configure.ac.orig    2024-07-05 04:24:53.716623204 +0000
-+++ cinelerra-5.1/configure.ac 2024-07-05 04:28:50.014303893 +0000
-@@ -30,6 +30,12 @@
- AC_MSG_ERROR([Please install libtool])
- fi
- 
-+AC_CHECK_PROG(PKGCONFIG,[pkg-config],[pkg-config],[no])
-+if test x"$PKGCONFIG" == x"no" ; then
-+AC_MSG_ERROR([Please install pkg-config])
-+fi
-+
-+
- CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
- CFG_CFLAGS+=" -pthread -Wall"
- # misguided pedantic warnings
-@@ -838,7 +844,7 @@
-  CFLAGS="-I/usr/include/sratom-0 -I/usr/local/include/sratom-0 `pkg-config --cflags sratom-0 2>/dev/null`"
-  CHECK_HEADERS([sratom], [sratom headers], [sratom/sratom.h])
-  CHECK_LIB([suil], [suil-0], [suil_instance_new])
-- CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags  suil-0 2>/dev/null`"
-+ CFLAGS=" -I${PREFIX}/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags  suil-0 2>/dev/null`"
-  CHECK_HEADERS([suil], [suil headers], [suil/suil.h])
-  CFG_CFLAGS+=" $(pkg-config --cflags lilv-0 2>/dev/null) $(pkg-config --cflags suil-0 2>/dev/null)"
-  LIBS="$saved_LIBS"
-@@ -1192,7 +1198,7 @@
- 
- exec > global_config
- 
--echo "SHELL := /bin/bash"
-+echo "SHELL := /bin/bash"
- echo "export SHELL"
- echo "WANT_JOBS := $WANT_JOBS"
- if test "x$WANT_CLANG" = "xyes" ; then
-@@ -1293,6 +1299,7 @@
- echo "system_libs += -lintl"
- echo "system_libs += -lossaudio"
- echo "system_libs += -lOpenEXR-3_2 -lOpenEXRUtil-3_2 -lOpenEXRCore-3_2 -lIex-3_2 -lIlmThread-3_2 -lImath-3_1"
-+echo "CFLAGS += -I${PREFIX}/include/suil-0"
- echo "CFLAGS += -I/usr/X11R7/include"
- echo "CFLAGS += -I/usr/pkg/include/ffmpeg6"
- echo "CFLAGS += $(pkg-config --cflags xft)"