Credit Andrew with minor configuration updates

diff --git a/cinelerra-5.1/cinelerra/pluginfclient.C b/cinelerra-5.1/cinelerra/pluginfclient.C
index 2aac1af334f42f65718a95e54a8ac5283c6ed723..2d57743ca3447ef22473bc47fa698505879098cf 100644 (file)
--- a/cinelerra-5.1/cinelerra/pluginfclient.C
+++ b/cinelerra-5.1/cinelerra/pluginfclient.C
@@ -664,7 +664,7 @@ PluginFClient::~PluginFClient()
 bool PluginFClient::is_audio(const AVFilter *fp)
 {
        if( !fp->outputs ) return 0;
 bool PluginFClient::is_audio(const AVFilter *fp)
 {
        if( !fp->outputs ) return 0;

-#if LIBAVFILTER_VERSION_MINOR > 2
+#if LIBAVFILTER_VERSION_MINOR > 2 && LIBAVFILTER_VERSION_MAJOR > 7

        if( avfilter_filter_pad_count(fp, 1) > 1 ) return 0;
 #else
        if( avfilter_pad_count(fp->outputs) > 1 ) return 0;
        if( avfilter_filter_pad_count(fp, 1) > 1 ) return 0;
 #else
        if( avfilter_pad_count(fp->outputs) > 1 ) return 0;


@@ -672,7 +672,7 @@ bool PluginFClient::is_audio(const AVFilter *fp)
        if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_AUDIO ) return 0;
        if( !fp->inputs ) return 1;
        if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_AUDIO ) return 0;
        if( !fp->inputs ) return 1;

-#if LIBAVFILTER_VERSION_MINOR > 2
+#if LIBAVFILTER_VERSION_MINOR > 2 && LIBAVFILTER_VERSION_MAJOR > 7

        if( avfilter_filter_pad_count(fp, 0) > 1 ) return 0;
 #else
        if( avfilter_pad_count(fp->inputs) > 1 ) return 0;
        if( avfilter_filter_pad_count(fp, 0) > 1 ) return 0;
 #else
        if( avfilter_pad_count(fp->inputs) > 1 ) return 0;


@@ -684,7 +684,7 @@ bool PluginFClient::is_audio(const AVFilter *fp)
 bool PluginFClient::is_video(const AVFilter *fp)
 {
        if( !fp->outputs ) return 0;
 bool PluginFClient::is_video(const AVFilter *fp)
 {
        if( !fp->outputs ) return 0;

-#if LIBAVFILTER_VERSION_MINOR > 2
+#if LIBAVFILTER_VERSION_MINOR > 2 && LIBAVFILTER_VERSION_MAJOR > 7

        if( avfilter_filter_pad_count(fp, 1) > 1 ) return 0;
 #else
        if( avfilter_pad_count(fp->outputs) > 1 ) return 0;
        if( avfilter_filter_pad_count(fp, 1) > 1 ) return 0;
 #else
        if( avfilter_pad_count(fp->outputs) > 1 ) return 0;


@@ -692,7 +692,7 @@ bool PluginFClient::is_video(const AVFilter *fp)
        if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_VIDEO ) return 0;
        if( !fp->inputs ) return 1;
        if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_VIDEO ) return 0;
        if( !fp->inputs ) return 1;

-#if LIBAVFILTER_VERSION_MINOR > 2
+#if LIBAVFILTER_VERSION_MINOR > 2 && LIBAVFILTER_VERSION_MAJOR > 7

        if( avfilter_filter_pad_count(fp, 0) > 1 ) return 0;
 #else
        if( avfilter_pad_count(fp->inputs) > 1 ) return 0;
        if( avfilter_filter_pad_count(fp, 0) > 1 ) return 0;
 #else
        if( avfilter_pad_count(fp->inputs) > 1 ) return 0;

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f0a87279e2ced5866f11765d07e6c41f1022eb96..4814f8b879ce4151ef7463861f5617632c8f625d 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -5,6 +5,7 @@ AC_INIT([cinelerra],[5.1],[[email protected]])
 # Put autogenerated stuff in subdir m4, which must be created
 # externally. This macro must be set before calling AC_INIT_AUTOMAKE
 AC_CONFIG_AUX_DIR(m4)
 # Put autogenerated stuff in subdir m4, which must be created
 # externally. This macro must be set before calling AC_INIT_AUTOMAKE
 AC_CONFIG_AUX_DIR(m4)

+AC_CONFIG_MACRO_DIRS([m4])

 AM_INIT_AUTOMAKE([foreign])
 LT_INIT()
 
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT()
 

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index 5c23988d6d77902c20ed8dd6caa13ded98330cc5..650027bc4f5cbcd44c727c837a170ef570c1e716 100644 (file)
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -3,6 +3,12 @@ For usage help, refer to the following:
   https://cinelerra-gg.org/download/CinelerraGG_Manual.pdf
   http://g-raffa.eu/Cinelerra/HOWTO/basics.html
 .
   https://cinelerra-gg.org/download/CinelerraGG_Manual.pdf
   http://g-raffa.eu/Cinelerra/HOWTO/basics.html
 .

+2023 November changes of note:
+  New build farm for Ubuntu, Debian, Suse, and Fedora at:
+   https://github.com/einhander/cin-gg-packages/releases
+  FFmpeg has been upgraded to 6.1.
+  Libvpx has been upgraded to 1.13.1.
+  Tiff has been upgraded to 4.6.0.

 2023 September changes of note:
   Libwebp has been upgraded to 1.3.2.
   Alternative shortcuts (more Standard) AppImage available.
 2023 September changes of note:
   Libwebp has been upgraded to 1.3.2.
   Alternative shortcuts (more Standard) AppImage available.

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 659ab3fe3dab4740445821c79814015cff43f678..8c7aaf91e0af8886e58fe86e53cd8ed2b25d86da 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -132,6 +132,7 @@ fftw.cfg_params= --disable-fortran --enable-shared=no
 ffmpeg.cfg_vars?= PKG_CONFIG_PATH="$(call bld_path,libwebp)/usr/local/lib/pkgconfig"
 ffmpeg.cfg_params= \
        --enable-pthreads --disable-avdevice --enable-gpl --disable-ffplay \
 ffmpeg.cfg_vars?= PKG_CONFIG_PATH="$(call bld_path,libwebp)/usr/local/lib/pkgconfig"
 ffmpeg.cfg_params= \
        --enable-pthreads --disable-avdevice --enable-gpl --disable-ffplay \

+       --disable-doc \

        $(call if_want,VAAPI,--enable-vaapi,--disable-vaapi) \
        $(call if_want,VDPAU,--enable-vdpau,--disable-vdpau) \
        $(call if_want,NV, --enable-nvenc --enable-nvdec --enable-ffnvcodec) \
        $(call if_want,VAAPI,--enable-vaapi,--disable-vaapi) \
        $(call if_want,VDPAU,--enable-vdpau,--disable-vdpau) \
        $(call if_want,NV, --enable-nvenc --enable-nvdec --enable-ffnvcodec) \