Credit Andrew - make x265_hidepth yes or no work

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 982845835638678f0ce08e7289475837d0cd68e8..0154ff7f6da08d5ecc95ae460c0c2a5bd924b225 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -515,7 +515,7 @@ AC_ARG_ENABLE([$1],
 ])
 
 CHECK_ENABLE([static-build], [STATIC_BUILD], [build static], [auto])
-CHECK_ENABLE([x265_hidepth], [X265_HIDEPTH], [build x265 10bit], [no])
+CHECK_ENABLE([x265_hidepth], [X265_HIDEPTH], [build x265 10/12bit], [yes])
 
 test "x$WANT_STATIC_BUILD" = "xauto" && WANT_STATIC_BUILD=$WANT_CINBIN_BUILD
 
@@ -719,8 +719,6 @@ if test "x$HAVE_LIBZIMG" != "xyes" -a "x$WANT_LIBZIMG" = "xyes"; then
   AC_MSG_ERROR([requires libzimg support.])
 fi
 
-
-
 #CHECK_LIB([NVENC], [nvidia-encode], [NvEncodeAPICreateInstance])
 
 #if test "x$HAVE_mjpegtools" = "xyes"; then
@@ -1109,7 +1107,7 @@ fi
 for v in GL XFT XXF86VM OSS ALSA FIREWIRE OGG DV DVB LADSPA \
         VIDEO4LINUX2 ESOUND PULSE PACTL OPENEXR LV2 \
         COMMERCIAL GIFLIB LIBZMPEG LIBDPX SHUTTLE SHUTTLE_USB XV \
-        VAAPI VDPAU ONEVPL VULKAN LIBPLACEBO LIBZIMG CUDA NV WINTV X10TV; do
+        VAAPI VDPAU ONEVPL VULKAN LIBPLACEBO LIBZIMG CUDA NV WINTV X10TV X265_HIDEPTH; do
   eval vv="\$WANT_$v"
   if test "x$vv" != "xno"; then
     CFG_CFLAGS+=" -DHAVE_$v"
@@ -1186,9 +1184,6 @@ if test "x$WANT_LIBZIMG" != "xno" -a "x$HAVE_LIBZIMG" = "xyes"; then
 fi
 CFG_WANTS+=" LIBZIMG"
 
-
-
-
 if test "x$WANT_NV" != "xno"; then
   WANT_NV="yes"
   CFG_WANTS+=" NV"
@@ -1286,7 +1281,7 @@ echo "export THIRDPARTY EXTRA_LIBS FFMPEG_EXTRA_CFG"
 echo ""
 
 echo "WANT_CIN := $WANT_CIN"
-CFG_WANTS+=" CIN_3RDPARTY LIBZMPEG COMMERCIAL STATIC_BUILD"
+CFG_WANTS+=" CIN_3RDPARTY LIBZMPEG COMMERCIAL STATIC_BUILD X265_HIDEPTH"
 for w in $CFG_WANTS; do ww=WANT_$w; echo "WANT_$w := ${!ww}"; done
 echo ""
 

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 41db2f49122c1e7f2be7f8900c53409953ea8748..95a4e311f576da8cc2b0d4100814bc1cafd11d12 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -277,9 +277,12 @@ tiff.cfg_params+= --disable-libdeflate --disable-lerc --enable-shared=no --disab
  $(call if_npkg,libwebp,--disable-webp)
 twolame.cfg_params?=--enable-shared=no
 x264.cfg_params?= --enable-static --enable-pic --disable-lavf --disable-swscale --disable-ffms --disable-gpac --disable-lsmash
+ifneq ($(WANT_X265_HIDEPTH),no)
 x265.cfg_vars?=chmod +x ./configure; chmod +x ./multilib.sh;
-#x265.cfg_vars?=$(call cmake_config,source)
-#x265.cfg_params?= -DENABLE_SHARED=no -DENABLE_CLI=no
+else
+x265.cfg_vars?=$(call cmake_config,source)
+x265.cfg_params?= -DENABLE_SHARED=no -DENABLE_CLI=no
+endif
 libvpx.cfg_params?= --enable-pic --disable-avx512 --enable-vp9-highbitdepth --disable-examples --disable-unit_tests
 libdpx.cfg_vars?= libtoolize; aclocal; autoconf; automake -a;
 libsndfile.cfg_params+= --disable-shared --enable-static --disable-sqlite --disable-mpeg