From cdec3123183459c0d2275a54b295b2f4821376cc Mon Sep 17 00:00:00 2001 From: Good Guy Date: Tue, 9 Dec 2025 17:15:43 -0700 Subject: [PATCH] Credit Andrew - fixes for Debian version 13 as tested by Andrey with no expected impact --- cinelerra-5.1/README | 6 ++ cinelerra-5.1/blds/debian/control | 2 +- .../thirdparty/src/djbfft-0.76.patch2 | 72 +++++++++++++++++++ .../thirdparty/src/djbfft-0.76.patch3 | 10 +++ .../thirdparty/src/djbfft-0.76.patch4 | 10 +++ .../thirdparty/src/djbfft-0.76.patch5 | 16 +++++ .../thirdparty/src/djbfft-0.76.patch6 | 11 +++ .../thirdparty/src/djbfft-0.76.patch7 | 9 +++ cinelerra-5.1/thirdparty/src/x265_4.0.patch2 | 2 +- cinelerra-5.1/thirdparty/src/x265_4.0.patch3 | 2 +- 10 files changed, 137 insertions(+), 3 deletions(-) create mode 100644 cinelerra-5.1/thirdparty/src/djbfft-0.76.patch2 create mode 100644 cinelerra-5.1/thirdparty/src/djbfft-0.76.patch3 create mode 100644 cinelerra-5.1/thirdparty/src/djbfft-0.76.patch4 create mode 100644 cinelerra-5.1/thirdparty/src/djbfft-0.76.patch5 create mode 100644 cinelerra-5.1/thirdparty/src/djbfft-0.76.patch6 create mode 100644 cinelerra-5.1/thirdparty/src/djbfft-0.76.patch7 diff --git a/cinelerra-5.1/README b/cinelerra-5.1/README index 55e9ed74..1b08e8f9 100644 --- a/cinelerra-5.1/README +++ b/cinelerra-5.1/README @@ -23,6 +23,12 @@ Oct, 23, 2024 cd ./cin/cinelerra +== for Debian package build: + + cd blds + ./bld_prepare.sh debian + ./debpkg.sh + == Build notes: Shared builds are not recommended, since system versions of thirdparty libraries are not always known to be free of problems. The build diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control index 62bc980d..d78f12ed 100644 --- a/cinelerra-5.1/blds/debian/control +++ b/cinelerra-5.1/blds/debian/control @@ -11,7 +11,7 @@ Build-Depends: libflac-dev, libfreetype6-dev, liblzma-dev, libncurses5-dev, libpng-dev, libtool, libusb-1.0-0-dev, libva-dev, libvdpau-dev, libxft-dev, libxinerama-dev, libxml2-utils, libxv-dev, - libz-dev, linux-firmware, nasm, texinfo, ttf-bitstream-vera, + libz-dev, nasm, texinfo, ttf-bitstream-vera, udftools, xfonts-100dpi, xfonts-75dpi, yasm, libpulse-dev Package: cin diff --git a/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch2 b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch2 new file mode 100644 index 00000000..ed1b5a7f --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch2 @@ -0,0 +1,72 @@ +--- djbfft-0.76~/auto-str.c 2025-06-09 20:43:27.521080716 +0200 ++++ djbfft-0.76~/auto-str.c 2025-06-09 20:42:54.783164144 +0200 +@@ -5,13 +5,14 @@ + char buf1[256]; + substdio ss1 = SUBSTDIO_FDBUF(write,1,buf1,sizeof(buf1)); + ++#define puts puts_ + void puts(s) + char *s; + { + if (substdio_puts(&ss1,s) == -1) _exit(111); + } + +-main(argc,argv) ++void main(argc,argv) + int argc; + char **argv; + { +--- djbfft-0.76~/fftc4.h 2025-06-09 20:43:27.521184679 +0200 ++++ djbfft-0.76~/fftc4.h 2025-06-09 20:42:54.783362290 +0200 +@@ -33,6 +33,7 @@ + extern void fftc4_un4096(complex4 *); + extern void fftc4_un8192(complex4 *); + ++extern void fftc4_mul(complex4 *,complex4 *, unsigned int); + extern void fftc4_mul2(complex4 *,complex4 *); + extern void fftc4_mul4(complex4 *,complex4 *); + extern void fftc4_mul8(complex4 *,complex4 *); +--- djbfft-0.76~/fftc8.h 2025-06-09 20:43:27.521255985 +0200 ++++ djbfft-0.76~/fftc8.h 2025-06-09 20:42:54.783533701 +0200 +@@ -33,6 +33,7 @@ + extern void fftc8_un4096(complex8 *); + extern void fftc8_un8192(complex8 *); + ++extern void fftc8_mul(complex8 *,complex8 *, unsigned int); + extern void fftc8_mul2(complex8 *,complex8 *); + extern void fftc8_mul4(complex8 *,complex8 *); + extern void fftc8_mul8(complex8 *,complex8 *); +--- djbfft-0.76~/hier.c 2025-06-09 20:43:27.521332704 +0200 ++++ djbfft-0.76~/hier.c 2025-06-09 20:42:54.783699883 +0200 +@@ -1,5 +1,9 @@ + #include "auto_home.h" + ++extern void h(char *, int, int, int); ++extern void d(char *, char *, int, int, int); ++extern void c(char *, char *, char *, int, int, int); ++ + void hier() + { + h(auto_home,-1,-1,0755); +--- djbfft-0.76~/readwrite.h 1999-09-30 22:25:58.000000000 +0200 ++++ djbfft-0.76~/readwrite.h 2025-06-09 20:44:05.224886356 +0200 +@@ -1,7 +1,6 @@ + #ifndef READWRITE_H + #define READWRITE_H + +-extern int read(); +-extern int write(); ++#include + + #endif +--- djbfft-0.76~/substdio.c 1999-09-30 22:25:58.000000000 +0200 ++++ djbfft-0.76~/substdio.c 2025-06-09 20:44:34.408570321 +0200 +@@ -2,7 +2,7 @@ + + void substdio_fdbuf(s,op,fd,buf,len) + register substdio *s; +-register int (*op)(); ++register int (*op)(); + register int fd; + register char *buf; + register int len; diff --git a/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch3 b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch3 new file mode 100644 index 00000000..698bc098 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch3 @@ -0,0 +1,10 @@ +--- ./speed.c.orig 2025-12-08 18:24:05.385423476 +0300 ++++ ./speed.c 2025-12-08 18:24:25.281423799 +0300 +@@ -4,6 +4,7 @@ + #include "fftc4.h" + #include "fftc8.h" + #include "timing.h" ++#include + + void nomem() + { diff --git a/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch4 b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch4 new file mode 100644 index 00000000..0101a237 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch4 @@ -0,0 +1,10 @@ +--- ./accuracy.c.orig 2025-12-08 18:22:51.217422274 +0300 ++++ ./accuracy.c 2025-12-08 18:23:11.417422601 +0300 +@@ -4,6 +4,7 @@ + #include "fftc8.h" + #include "fftr4.h" + #include "fftr8.h" ++#include + + #define ROTATE(x,b) x = (((x) << (b)) | ((x) >> (32 - (b)))) + real8 myrand() diff --git a/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch5 b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch5 new file mode 100644 index 00000000..9f9ee5e0 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch5 @@ -0,0 +1,16 @@ +--- ./accuracy2.c.orig 2025-12-09 12:01:43.810451980 +0300 ++++ ./accuracy2.c 2025-12-09 12:03:19.766453535 +0300 +@@ -1,11 +1,13 @@ + #include + #include ++#include + #include "fftc4.h" + #include "fftc8.h" + #include "fftr4.h" + #include "fftr8.h" + #include "fftfreq.h" + ++ + unsigned int freq[8192]; + complex8 testroots[8192]; + complex4 x4[8192]; diff --git a/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch6 b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch6 new file mode 100644 index 00000000..b6b4bb14 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch6 @@ -0,0 +1,11 @@ +--- ./install.c.orig 2025-12-09 12:02:21.402452589 +0300 ++++ ./install.c 2025-12-09 12:06:06.774456242 +0300 +@@ -4,6 +4,8 @@ + #include "open.h" + #include "readwrite.h" + #include "exit.h" ++#include ++#include + + extern void hier(); + diff --git a/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch7 b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch7 new file mode 100644 index 00000000..bb523067 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/djbfft-0.76.patch7 @@ -0,0 +1,9 @@ +--- ./substdio.h.rig 2025-12-09 12:08:30.758458575 +0300 ++++ ./substdio.h 2025-12-09 12:09:40.930459713 +0300 +@@ -1,3 +1,6 @@ ++#include ++#include ++ + #ifndef SUBSTDIO_H + #define SUBSTDIO_H + diff --git a/cinelerra-5.1/thirdparty/src/x265_4.0.patch2 b/cinelerra-5.1/thirdparty/src/x265_4.0.patch2 index 72459e66..12348b11 100644 --- a/cinelerra-5.1/thirdparty/src/x265_4.0.patch2 +++ b/cinelerra-5.1/thirdparty/src/x265_4.0.patch2 @@ -4,4 +4,4 @@ +#$(shell cd build/linux ; ./multilib.sh) +.NOTPARALLEL: +all: -+ $(shell ./multilib.sh ; cp 8bit/libx265.a . ; cp 8bit/x265.pc . ; cp 8bit/x265_config.h .) ++ ./multilib.sh ; cp 8bit/libx265.a . ; cp 8bit/x265.pc . ; cp 8bit/x265_config.h . diff --git a/cinelerra-5.1/thirdparty/src/x265_4.0.patch3 b/cinelerra-5.1/thirdparty/src/x265_4.0.patch3 index e97af1d6..ecca4bcd 100644 --- a/cinelerra-5.1/thirdparty/src/x265_4.0.patch3 +++ b/cinelerra-5.1/thirdparty/src/x265_4.0.patch3 @@ -1,7 +1,7 @@ --- /dev/null 2020-07-19 09:07:01.788494015 +0300 +++ ./multilib.sh 2020-08-02 02:34:58.444933214 +0300 @@ -0,0 +1,54 @@ -+#!/bin/sh ++#!/bin/bash + +mkdir -p 8bit 10bit 12bit + -- 2.34.1