From 1bc5e758583df864b90e484954cfcf0ddfb43139 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Thu, 8 Feb 2024 09:49:07 -0700 Subject: [PATCH] LV2 files updated to accomodate python 3.12 which deleted imp since deprecated for a long time; 3 files already OK so only had to modify other 3 --- cinelerra-5.1/cinelerra/filesndfile.C | 2 ++ cinelerra-5.1/thirdparty/downloads.txt | 3 ++- .../thirdparty/src/sord-0.16.4.patch1 | 21 +++++++++++++++++++ .../thirdparty/src/sratom-0.6.4.patch1 | 21 +++++++++++++++++++ .../thirdparty/src/suil-0.10.6.patch1 | 21 +++++++++++++++++++ 5 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 cinelerra-5.1/thirdparty/src/sord-0.16.4.patch1 create mode 100644 cinelerra-5.1/thirdparty/src/sratom-0.6.4.patch1 create mode 100644 cinelerra-5.1/thirdparty/src/suil-0.10.6.patch1 diff --git a/cinelerra-5.1/cinelerra/filesndfile.C b/cinelerra-5.1/cinelerra/filesndfile.C index a215080d..a24002f3 100644 --- a/cinelerra-5.1/cinelerra/filesndfile.C +++ b/cinelerra-5.1/cinelerra/filesndfile.C @@ -442,6 +442,7 @@ SndFileHILO::SndFileHILO(SndFileConfig *gui, int x, int y) : BC_Radial(x, y, gui->asset->byte_order == 0, _("Hi Lo")) { this->gui = gui; + set_tooltip(_("Little Endian")); } int SndFileHILO::handle_event() { @@ -457,6 +458,7 @@ SndFileLOHI::SndFileLOHI(SndFileConfig *gui, int x, int y) : BC_Radial(x, y, gui->asset->byte_order == 1, _("Lo Hi")) { this->gui = gui; + set_tooltip(_("Big Endian")); } int SndFileLOHI::handle_event() { diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt index 5d32e8a8..b519e297 100644 --- a/cinelerra-5.1/thirdparty/downloads.txt +++ b/cinelerra-5.1/thirdparty/downloads.txt @@ -6,7 +6,8 @@ http://gnu.mirrors.pair.com/savannah/savannah//openexr/openexr-2.2.1.tar.gz https://sourceforge.net/projects/opencvlibrary/files/ 4.3.0 https://github.com/opencv/opencv_contrib/releases 4.3.0 #https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-2.2.0.tar.gz/download -http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.28.tar.gz +#http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.28.tar.gz +https://github.com/libsndfile/libsndfile/releases 1.2.2 https://mirrors.edge.kernel.org/pub/linux/libs/ieee1394/libraw1394-2.1.2.tar.xz https://mirrors.edge.kernel.org/pub/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz https://sourceforge.net/projects/libavc1394/files/latest/download?source=directory = 0.5.4 diff --git a/cinelerra-5.1/thirdparty/src/sord-0.16.4.patch1 b/cinelerra-5.1/thirdparty/src/sord-0.16.4.patch1 new file mode 100644 index 00000000..d21399a4 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/sord-0.16.4.patch1 @@ -0,0 +1,21 @@ +--- ./waflib/Context.py ++++ ./waflib/Context.py +@@ -6,10 +6,17 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, sys + from waflib import Utils, Errors, Logs + import waflib.Node + ++if sys.hexversion > 0x3040000: ++ import types ++ class imp(object): ++ new_module = lambda x: types.ModuleType(x) ++else: ++ import imp ++ + # the following 3 constants are updated on each new release (do not touch) + HEXVERSION=0x2001200 + """Constant updated on new releases""" diff --git a/cinelerra-5.1/thirdparty/src/sratom-0.6.4.patch1 b/cinelerra-5.1/thirdparty/src/sratom-0.6.4.patch1 new file mode 100644 index 00000000..274285a2 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/sratom-0.6.4.patch1 @@ -0,0 +1,21 @@ +--- ./waflib/Context.py ++++ ./waflib/Context.py +@@ -6,10 +6,17 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, sys + from waflib import Utils, Errors, Logs + import waflib.Node + ++if sys.hexversion > 0x3040000: ++ import types ++ class imp(object): ++ new_module = lambda x: types.ModuleType(x) ++else: ++ import imp ++ + # the following 3 constants are updated on each new release (do not touch) + HEXVERSION=0x2001200 + """Constant updated on new releases""" diff --git a/cinelerra-5.1/thirdparty/src/suil-0.10.6.patch1 b/cinelerra-5.1/thirdparty/src/suil-0.10.6.patch1 new file mode 100644 index 00000000..274285a2 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/suil-0.10.6.patch1 @@ -0,0 +1,21 @@ +--- ./waflib/Context.py ++++ ./waflib/Context.py +@@ -6,10 +6,17 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, sys + from waflib import Utils, Errors, Logs + import waflib.Node + ++if sys.hexversion > 0x3040000: ++ import types ++ class imp(object): ++ new_module = lambda x: types.ModuleType(x) ++else: ++ import imp ++ + # the following 3 constants are updated on each new release (do not touch) + HEXVERSION=0x2001200 + """Constant updated on new releases""" -- 2.26.2