From 6176b23faa107f4ba493b883ce7fd7c3e120718b Mon Sep 17 00:00:00 2001 From: Good Guy Date: Mon, 19 Jan 2026 13:17:41 -0700 Subject: [PATCH] Credit Andrew - minor mods needed for building without thirdparty + year changed --- cinelerra-5.1/Makefile.am | 11 +++++++++++ cinelerra-5.1/cinelerra/versioninfo.h | 2 +- cinelerra-5.1/configure.ac | 6 +++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am index 4214a9ac..f51c0d5f 100644 --- a/cinelerra-5.1/Makefile.am +++ b/cinelerra-5.1/Makefile.am @@ -86,6 +86,17 @@ zmp_install: zmp_uninstall: rm -f "$(DESTDIR)$(bindir)"/zmpeg3{cc2txt,ifochk} +# with-libzmpeg3 without thirdparty +zmp_install_nothird: + cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" \ + zmpeg3{cc2txt,ifochk} + cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \ + hveg2enc mplexlo + +zmp_uninstall_nothird: + rm -f "$(DESTDIR)$(bindir)"/zmpeg3{cc2txt,ifochk} + + # with-commercial com_install: cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" cin_db diff --git a/cinelerra-5.1/cinelerra/versioninfo.h b/cinelerra-5.1/cinelerra/versioninfo.h index 3b733b6f..df4de924 100644 --- a/cinelerra-5.1/cinelerra/versioninfo.h +++ b/cinelerra-5.1/cinelerra/versioninfo.h @@ -9,7 +9,7 @@ #define COPYRIGHTTEXT1 "(c) 2006-2019 Heroine Virtual Ltd. by Adam Williams\n" #define COPYRIGHTTEXT2 "2007-2020 mods for Cinelerra-GG by W.P.Morrow aka goodguy\n" #define COPYRIGHTTEXT3 "2003-2017 mods for Cinelerra-CV by CinelerraCV team\n" -#define COPYRIGHTTEXT4 "2015-2025 mods for Cinelerra-GG by Cinelerra-GG team\n" +#define COPYRIGHTTEXT4 "2015-2026 mods for Cinelerra-GG by Cinelerra-GG team\n" #undef COMPILEDATE diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index ecb3fc64..0aa7c1e3 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -147,10 +147,14 @@ fi CIN_INSTALLS="" CIN_UNINSTALLS="" -if test "x$WANT_LIBZMPEG" = "xyes"; then +if test "x$WANT_LIBZMPEG" = "xyes" -a "x$WANT_CIN_3RDPARTY" = "xyes"; then CIN_INSTALLS+=" zmp_install" CIN_UNINSTALLS+=" zmp_uninstall" fi +if test "x$WANT_LIBZMPEG" = "xyes" -a "x$WANT_CIN_3RDPARTY" = "xno"; then + CIN_INSTALLS+=" zmp_install_nothird" + CIN_UNINSTALLS+=" zmp_uninstall_nothird" +fi if test "x$WANT_COMMERCIAL" = "xyes"; then CIN_INSTALLS+=" com_install" CIN_UNINSTALLS+=" com_uninstall" -- 2.34.1