commit ea1fe5cdf75b16be0a0d5fc65786a181da7fac9b Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sat Jan 25 16:03:03 2025 +0000 Update to latest monthly release .gitignore | 1 + cinelerra-gg.spec | 13 +++++-------- fix_upstreams_pathetic_makefile.patch | 19 +++++++++++++++++++ sources | 2 +- 4 files changed, 26 insertions(+), 9 deletions(-) --- diff --git a/.gitignore b/.gitignore index ce2c9fe..0c8634f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /cinelerra-gg-2024-05.tar.gz /cinelerra-gg-2024-06.tar.gz /cinelerra-gg-2024-10.tar.gz +/cinelerra-gg-2024-12.tar.gz diff --git a/cinelerra-gg.spec b/cinelerra-gg.spec index ece183c..f6c4a28 100644 --- a/cinelerra-gg.spec +++ b/cinelerra-gg.spec @@ -1,7 +1,7 @@ # disable lto rfbz#6570 %global _lto_cflags %nil -%global git_tag 2024-10 +%global git_tag 2024-12 %global tag_version %(c=%{git_tag}; echo "${c}" | tr '-' '.') Name: cinelerra-gg @@ -18,6 +18,7 @@ Url: https://cinelerra-gg.org/ Source0: https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=snapshot;sf=t... Patch0: buildfix.patch +Patch1: fix_upstreams_pathetic_makefile.patch # Only tested on x86_64 ExclusiveArch: x86_64 @@ -75,7 +76,6 @@ BuildRequires: pkgconfig(mjpegtools) BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(numa) #BuildRequires: pkgconfig(opencv) -BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(serd-0) BuildRequires: pkgconfig(sndfile) @@ -88,8 +88,6 @@ BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vdpau) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vpx) -BuildRequires: pkgconfig(x264) -BuildRequires: pkgconfig(x265) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xv) @@ -157,8 +155,6 @@ cd cinelerra-5.1 --enable-lilv=shared \ --enable-lv2=shared \ --enable-openjpeg=auto \ - --enable-openexr=shared \ - --enable-openExr=shared \ --enable-opus=auto \ --enable-serd=shared \ --enable-sord=shared \ @@ -166,8 +162,6 @@ cd cinelerra-5.1 --enable-suil=shared \ --enable-tiff=auto \ --enable-twolame=auto \ - --enable-x264=auto \ - --enable-x265=auto \ --with-browser=xdg-open \ --without-cuda \ --without-firewire \ @@ -223,6 +217,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sat Jan 25 2025 Leigh Scott <leigh123linux(a)gmail.com&gt; - 5.1.2024.12-1 +- Update to latest monthly release + * Thu Dec 12 2024 Leigh Scott <leigh123linux(a)gmail.com&gt; - 5.1.2024.10-1 - Update to latest monthly release diff --git a/fix_upstreams_pathetic_makefile.patch b/fix_upstreams_pathetic_makefile.patch new file mode 100644 index 0000000..e8e4e39 --- /dev/null +++ b/fix_upstreams_pathetic_makefile.patch @@ -0,0 +1,19 @@ +--- a/cinelerra-5.1/thirdparty/src/x265_4.0.patch2 ++++ b/cinelerra-5.1/thirdparty/src/x265_4.0.patch2 +@@ -1,7 +1,12 @@ + --- /dev/null 2020-03-14 06:02:18.586124011 +0300 + +++ ./Makefile 2020-03-18 00:04:59.388807329 +0300 +-@@ -0,0 +1,4 @@ +-+#$(shell cd build/linux ; ./multilib.sh) ++@@ -0,0 +1,9 @@ + +.NOTPARALLEL: +-+all: +-+ $(shell ./multilib.sh ; cp 8bit/libx265.a . ; cp 8bit/x265.pc . ; cp 8bit/x265_config.h .) +++all: multilib lib_copy +++ +++multilib: +++ ./multilib.sh +++ +++lib_copy: +++ cp 8bit/libx265.a . +++ cp 8bit/x265_config.h . diff --git a/sources b/sources index 2a7d0bf..e9e6f8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cinelerra-gg-2024-10.tar.gz) = cfdc693082f349abab432a8a69641587f0580ec349ff1ad4f431389bffbede9e4283953dd83f3d806c6cc7f6ea0f5f5e37d4e811ce074b16f54b0f495ff7ae6c +SHA512 (cinelerra-gg-2024-12.tar.gz) = 66a3ce45b528238fbbaa531d56b80303a65b238e548ff903224c96f3867b7fb860de970f922c6a809f2340ebeafc15d25b4a7b923cf72a9f07a19f6ee3a4cf63