Forgot to add main patch for .configure.ac :/
Thing is, even after ./autogen.sh && ./configure
resulted cin file still links to system's *shared* ilmbase/openexr libs :/
diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f10af67..11d527b 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -239,14 +239,14 @@ PKG_3RD([giflib],[yes],
libutil.a ],
[ . ])
-PKG_3RD([ilmbase],[auto],
- [ilmbase-2.2.1],
- [ Iex/.libs/libIex.a \
- IexMath/.libs/libIexMath.a \
- Half/.libs/libHalf.a \
- Imath/.libs/libImath.a \
- IlmThread/.libs/libIlmThread.a ],
- [ Iex Half Imath config IlmThread ])
+#PKG_3RD([ilmbase],[auto],
+# [ilmbase-2.2.1],
+# [ Iex/.libs/libIex.a \
+# IexMath/.libs/libIexMath.a \
+# Half/.libs/libHalf.a \
+# Imath/.libs/libImath.a \
+# IlmThread/.libs/libIlmThread.a ],
+# [ Iex Half Imath config IlmThread ])
PKG_DEF([ladspa], [ladspa-0.4.17], [], [])
@@ -338,10 +338,15 @@ PKG_3RD([mjpegtools],[yes],
[ . lavtools utils ])
PKG_3RD([openexr],[auto],
- [openexr-2.2.1],
- [ IlmImf/.libs/libIlmImf.a \
- IlmImfUtil/.libs/libIlmImfUtil.a ],
- [ IlmImf config ])
+ [openexr-2.4.1],
+ [ IlmBase/Iex/.libs/libIex.a \
+ IlmBase/IexMath/.libs/libIexMath.a \
+ IlmBase/Half/.libs/libHalf.a \
+ IlmBase/Imath/.libs/libImath.a \
+ IlmBase/IlmThread/.libs/libIlmThread.a
+ OpenEXR/IlmImf/.libs/libIlmImf.a \
+ OpenEXR/IlmImfUtil/.libs/libIlmImfUtil.a ],
+ [ Iex Half Imath IlmThread IlmImf config ])
----
may be I misused something again.
diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 5315237..50b9358 100644
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -195,9 +195,9 @@ audiofile.mak_params?=LIBS="-lm -lstdc++"
flac.cfg_params?= --enable-shared=no
flac.cflags?="$(call inc_path,libogg) $(call ld_path,libogg,src/.libs)"
giflib.cfg_params=echo "exec true" > ./configure; chmod +x ./configure;
-ilmbase.cfg_vars= CFLAGS+=" -Wno-narrowing" CXXFLAGS+=" -Wno-narrowing"
-ilmbase.cfg_params?=--prefix=$(call bld_path,ilmbase,usr)
-ilmbase.mak_params?=; $(MAKE) -C ilmbase* install; cd $(call bld_path,ilmbase); ln -sf lib64 usr/lib
+#ilmbase.cfg_vars= CFLAGS+=" -Wno-narrowing" CXXFLAGS+=" -Wno-narrowing"
+#ilmbase.cfg_params?=--prefix=$(call bld_path,ilmbase,usr)
+#ilmbase.mak_params?=; $(MAKE) -C ilmbase* install; cd $(call bld_path,ilmbase); ln -sf lib64 usr/lib
lame.cfg_vars?= CFLAGS+=" -O"
lame.cfg_params?=--enable-shared=no
lame.mak_params?= ; cd $(call bld_path,lame,include); ln -sf . lame
@@ -242,8 +242,8 @@ openjpeg.cfg_vars?=$(call cmake_config,.)
openjpeg.mak_params?= ; cd $(call bld_path,openjpeg,src/lib/openjp2); ln -sf . openjpeg-2.1
opencv.cfg_vars?=$(call cmake_config,.)
opencv.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF
-openexr.cfg_vars?=LD_LIBRARY_PATH=$(call bld_path,ilmbase,usr/lib)
-openexr.cfg_params?=--enable-shared=no --with-ilmbase-prefix=$(call bld_path,ilmbase,usr)
+openexr.cfg_vars?=LD_LIBRARY_PATH=$(call bld_path,openexr,usr/lib) chmod +x ./configure;
+openexr.cfg_params?=`realpath $(call bld_path,openexr,usr)`
speech_tools.mak_params?=-j1
tiff.cfg_vars+=LIBS+=" -lpthread"
tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\
@@ -251,7 +251,7 @@ tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\
--with-webp-lib-dir=$(call pkg_libs,libwebp))
twolame.cfg_params?=--enable-shared=no
x264.cfg_params?= --enable-static --enable-pic
-x265.cfg_vars?=$(call cmake_config,source)
+#x265.cfg_vars?=$(call cmake_config,source)
x265.cfg_params?= -DENABLE_SHARED=no
libvpx.cfg_params?= --enable-pic
@@ -328,7 +328,7 @@ $(call rules,$(call std-build,ffmpeg, twolame lame openjpeg opus \
$(call rules,$(call std-build,fftw))
$(call rules,$(call std-build,flac,libogg))
$(call rules,$(call std-build,giflib))
-$(call rules,$(call std-build,ilmbase))
+#$(call rules,$(call std-build,ilmbase))
$(call rules,$(call std-build,ladspa))
$(call rules,$(call std-build,lame))
$(call rules,$(call std-build,libaom))
@@ -346,7 +346,7 @@ $(call rules,$(call std-build,libuuid))
$(call rules,$(call std-build,libvorbis))
$(call rules,$(call std-build,mjpegtools, libjpeg))
$(call rules,$(call std-build,opencv))
-$(call rules,$(call std-build,openexr, ilmbase))
+$(call rules,$(call std-build,openexr))
$(call rules,$(call std-build,openjpeg))
$(call rules,$(call std-build,opus))
$(call rules,$(call std-build,speech_tools))
--- /dev/null 2020-03-14 06:02:18.586124011 +0300
+++ ./configure 2020-03-18 10:10:50.078516811 +0300
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+cd IlmBase
+./bootstrap
+./configure --prefix=$1 --enable-shared=no
+make
+make install
+
+cd ../OpenEXR
+./bootstrap
+./configure --prefix=$1 \
+ --with-ilmbase-prefix=$1 --enable-shared=no
+make
+make install
--- a/dev/null 2020-03-14 06:02:18.586124011 +0300
+++ b/Makefile 2020-03-18 12:11:17.633850531 +0300
@@ -0,0 +1,2 @@
+all:
+ echo "OpenEXR build done"
diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f10af67..11d527b 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -239,14 +239,14 @@ PKG_3RD([giflib],[yes],
libutil.a ],
[ . ])
-PKG_3RD([ilmbase],[auto],
- [ilmbase-2.2.1],
- [ Iex/.libs/libIex.a \
- IexMath/.libs/libIexMath.a \
- Half/.libs/libHalf.a \
- Imath/.libs/libImath.a \
- IlmThread/.libs/libIlmThread.a ],
- [ Iex Half Imath config IlmThread ])
+#PKG_3RD([ilmbase],[auto],
+# [ilmbase-2.2.1],
+# [ Iex/.libs/libIex.a \
+# IexMath/.libs/libIexMath.a \
+# Half/.libs/libHalf.a \
+# Imath/.libs/libImath.a \
+# IlmThread/.libs/libIlmThread.a ],
+# [ Iex Half Imath config IlmThread ])
PKG_DEF([ladspa], [ladspa-0.4.17], [], [])
@@ -338,10 +338,15 @@ PKG_3RD([mjpegtools],[yes],
[ . lavtools utils ])
PKG_3RD([openexr],[auto],
- [openexr-2.2.1],
- [ IlmImf/.libs/libIlmImf.a \
- IlmImfUtil/.libs/libIlmImfUtil.a ],
- [ IlmImf config ])
+ [openexr-2.4.1],
+ [ IlmBase/Iex/.libs/libIex.a \
+ IlmBase/IexMath/.libs/libIexMath.a \
+ IlmBase/Half/.libs/libHalf.a \
+ IlmBase/Imath/.libs/libImath.a \
+ IlmBase/IlmThread/.libs/libIlmThread.a
+ OpenEXR/IlmImf/.libs/libIlmImf.a \
+ OpenEXR/IlmImfUtil/.libs/libIlmImfUtil.a ],
+ [ Iex Half Imath IlmThread IlmImf config ])
#PKG_3RD([festival],[no],
# [festival],
@@ -374,7 +379,7 @@ PKG_3RD([x265],[auto],
[ libx265.a ],
[ . source ])
-PKG_3RD([libvpx],[auto],
+PKG_3RD([libvpx],[yes],
[libvpx-1.8.1],
[ libvpx.a ],
[ . ])
@@ -980,7 +985,7 @@ fi
FFMPEG_EXTRA_LDFLAGS=""
if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva'
- EXTRA_LIBS+=' -lva'
+ EXTRA_LIBS+=' -lva -L/usr/X11R7/lib'
WANT_VAAPI="yes"
if test "x$HAVE_vaapi_x11" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva-x11'
@@ -994,6 +999,8 @@ fi
CFG_WANTS+=" VAAPI"
if test "x$WANT_VDPAU" != "xno" -a "x$HAVE_VDPAU" = "xyes"; then
+ FFMPEG_EXTRA_LDFLAGS+=' -lvdpau'
+ EXTRA_LIBS+=' -lvdpau -L/usr/X11R7/lib'
WANT_VDPAU="yes"
fi
CFG_WANTS+=" VDPAU"
--
Cin mailing list
[email protected]
https://lists.cinelerra-gg.org/mailman/listinfo/cin
