|
|
Marking resolved as original problem is fixed and Andrea tested a 32-bit appimage.
The timecode patch request is in an email and will eventually get added in. |
|
|
|
@Andrea_Paz
A 32-bit appimage is at: https://cinelerra-gg.org/download/testing/cin-i386.AppImage
It includes the fix here + the newly checked in TERMUX mods. Let me know if all is OK so I can close this BT.
@Andrew-R
I checked 0030-add timecode ... and it did not cause any problems on the one bluray player I tested. I will test another one. Having problem creating DVDs on this laptop that I have to fix. |
|
|
|
@Andrea_Paz
I will make a 32-bit appimage on my new Debian Bullseye after I finish struggling getting the network setup. |
|
|
|
@Andrea_Paz, my main concern about my timecode patch - it may also put it into mpeg2-based bluray/dvd formats, and players will chocke... |
|
|
|
Compiling from git works now. Thanks!
[[@PhyllisSmith
If you prepare a 32-bit appimage, I can try it with my debian 11 32-bit in vm. I add to @mehw's compliments: you're doing a great job!
@Andrew-R
- The 0030-Add-timecode-to-output-mov-mxf.patch works and introduces timecode in both mov and mxf and also in mp4 (instead it doesn't work in mkv). Thanks! I propose to put this patch in git.
- Compiling with --with-opencv=sys doesn't work and leads to the same plugins loading errors seen before.]] |
|
|
|
@PhyllisSmith, don't worry, you are doing an amazing job.
Some bugs just fall under the radar. |
|
|
|
@mehw
@Andrew-R
@andrea_paz
I should be fired for not having done better testing before checking this in 2 days ago.
Now I think I have tested a little better the patches provided here -- included booting up a 32-bit system (the usual Debian 9.1) and checking it there.
Andrea, could you build again and check too? |
|
|
|
@Andrew-R, you're welcome ;)
Thanks you all for maintaining Cinelerra-gg. |
|
|
|
@mehw, I think you are right - my main concern was with DV-disabled case - now I have both cases at least compile-able, so as long as @Andrea_Paz and @PhyllisSmith can compile/run new patch ok - I'm happy.
thanks for untangling my mess... |
|
|
|
@Andrew-R
@PhyllisSmith
If you replace all HAVE_DV with HAVE_LIBDV in livevideo.C, you're going to disable DV... so, the code will compile fine... but with DV disabled even when you enabled it in the first place... the right variable to use is HAVE_DV, like in ffmpeg.C, file.C, filedv.C, formattools.C, libdv.C, record.C, recordmonitor.C, and videodevice.C.
To test the above, compile with "--enable-libdv" (anyway, enable/use the built-in libdv) and put in livevideo.C the followings where they can be executed:
#if HAVE_DV
#pragma message "compile with HAVE_DV"
#endif
#if HAVE_LIBDV
#pragma message "compile with HAVE_LIBDV"
#endif
then, check/capture the output during compilation and search for the pragma messages...
To use an 'or' condition '||' with "#ifdef", switch to "#if defined(__i386__) || defined(__x86_64__)"...
I'll attach a patch based on the latest commit b9acb7cd4ecb313fe68ab385ae7a248a29671040 that re-enables the above test, and fixes the compilation of livevideo.C properly enabling/disabling DV based on the configure option used.
0001-latest-fix-compilation-problems.patch (2,951 bytes)
From 47c095da5dad0bf7a2dd2c9b7fbcd28276c518e4 Mon Sep 17 00:00:00 2001
From: Matthew White <[email protected]>
Date: Wed, 10 Nov 2021 19:15:04 +0000
Subject: [PATCH] fix compilation problems
Revert and fix b9acb7cd4ecb313fe68ab385ae7a248a29671040: replace
__I386__ with __i386__, and __x86-64__ with __x86_64__. The 'or'
condition '||' is incompatible with the directive '#ifdef', hence
use '#if defined(__i386__) || defined(__x86_64__)'.
In plugins/livevideo/livevideo.C use HAVE_DB, rather than HAVE_LIBDV,
to properly compile with DV when libdv was enabled. Here, HAVE_LIBDV
will always be undefined... the correct variable set during configure
is HAVE_DB.
---
cinelerra-5.1/cinelerra/commercials.h | 2 ++
cinelerra-5.1/cinelerra/dbwindow.h | 2 ++
cinelerra-5.1/cinelerra/mediadb.h | 2 ++
cinelerra-5.1/db/tdb.h | 2 ++
cinelerra-5.1/plugins/livevideo/livevideo.C | 2 +-
5 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/cinelerra-5.1/cinelerra/commercials.h b/cinelerra-5.1/cinelerra/commercials.h
index b7b815c4..443cf6c7 100644
--- a/cinelerra-5.1/cinelerra/commercials.h
+++ b/cinelerra-5.1/cinelerra/commercials.h
@@ -1,3 +1,4 @@
+#if defined(__i386__) || defined(__x86_64__)
#ifndef _COMMERCIALS_H_
#define _COMMERCIALS_H_
@@ -202,3 +203,4 @@ public:
#endif
+#endif /* x86 */
\ No newline at end of file
diff --git a/cinelerra-5.1/cinelerra/dbwindow.h b/cinelerra-5.1/cinelerra/dbwindow.h
index 24a40df8..103beb6d 100644
--- a/cinelerra-5.1/cinelerra/dbwindow.h
+++ b/cinelerra-5.1/cinelerra/dbwindow.h
@@ -1,3 +1,4 @@
+#if defined(__i386__) || defined(__x86_64__)
#ifndef _DBWINDOW_H_
#define _DBWINDOW_H_
@@ -296,3 +297,4 @@ public:
#endif
+#endif /* x86 */
\ No newline at end of file
diff --git a/cinelerra-5.1/cinelerra/mediadb.h b/cinelerra-5.1/cinelerra/mediadb.h
index 9bb970ee..f55cc6b0 100644
--- a/cinelerra-5.1/cinelerra/mediadb.h
+++ b/cinelerra-5.1/cinelerra/mediadb.h
@@ -1,3 +1,4 @@
+#if defined(__i386__) || defined(__x86_64__)
#ifndef _MEDIA_DB_H_
#define _MEDIA_DB_H_
@@ -239,3 +240,4 @@ public:
};
#endif
+#endif /* x86 */
\ No newline at end of file
diff --git a/cinelerra-5.1/db/tdb.h b/cinelerra-5.1/db/tdb.h
index 8ee88002..24c8617c 100644
--- a/cinelerra-5.1/db/tdb.h
+++ b/cinelerra-5.1/db/tdb.h
@@ -1,3 +1,4 @@
+#if defined(__i386__) || defined(__x86_64__)
#ifndef __DB_H__
#define __DB_H__
#include <cstring>
@@ -1514,3 +1515,4 @@ public:
};
#endif
+#endif /* x86 */
\ No newline at end of file
diff --git a/cinelerra-5.1/plugins/livevideo/livevideo.C b/cinelerra-5.1/plugins/livevideo/livevideo.C
index c30034ab..ac69ba20 100644
--- a/cinelerra-5.1/plugins/livevideo/livevideo.C
+++ b/cinelerra-5.1/plugins/livevideo/livevideo.C
@@ -31,7 +31,7 @@
#include "filexml.h"
#include "guicast.h"
#include "language.h"
-#if HAVE_LIBDV
+#if HAVE_DV
#include "libdv.h"
#endif
#include "libmjpeg.h"
--
2.32.0
|
|
|
|
@Andrew-R
@mehw
Looking at this now -- I wish I knew C++, but I do not. Will checkout above patches/suggestions.
Not opposed to having the 'ifdef's in but I just did not know how to fix the || logical or and it would not even compile for me. It is still early in the month so now is a good time to get patches in and fixed with testing by other people. The merging in of Termux/Android may be a little difficult but definitely worthwhile as we do not want another split Cinelerra version! |
|
|
|
@mehw, I think previous HAVE_DV failed for @Andrea_Paz...
try not just compile but run resulted installation...
yet, in some other places it worked with HAVE_DV... (like in cinelerra/record.C)
May it depend on configure switches and installed system libs? |
|
|
|
@mehw, did I re-typed them correctly? (i ommited livevideo part because I hope my previous {0051} patch fixes this. tell us if it still fails for you)
0065-Fixes-from-Mat-for-x86-ifdefs-in-db-tdb.h-and-cinele.patch (1,825 bytes)
From accfae9b1d8ac0b1c54cc6b52cdc4a474d3ffa68 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <[email protected]>
Date: Wed, 10 Nov 2021 19:45:55 +0300
Subject: [PATCH 65/65] Fixes from Mat for x86 ifdefs in db/tdb.h and
cinelerra/
---
cinelerra-5.1/cinelerra/commercials.h | 2 +-
cinelerra-5.1/cinelerra/dbwindow.h | 2 +-
cinelerra-5.1/cinelerra/mediadb.h | 2 +-
cinelerra-5.1/db/tdb.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cinelerra-5.1/cinelerra/commercials.h b/cinelerra-5.1/cinelerra/commercials.h
index 7869c3c3..aa55662e 100644
--- a/cinelerra-5.1/cinelerra/commercials.h
+++ b/cinelerra-5.1/cinelerra/commercials.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined( __i386__) || defined(__x86_64__)
#ifndef _COMMERCIALS_H_
#define _COMMERCIALS_H_
diff --git a/cinelerra-5.1/cinelerra/dbwindow.h b/cinelerra-5.1/cinelerra/dbwindow.h
index c8a12f66..7d40792f 100644
--- a/cinelerra-5.1/cinelerra/dbwindow.h
+++ b/cinelerra-5.1/cinelerra/dbwindow.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined( __i386__) || defined(__x86_64__)
#ifndef _DBWINDOW_H_
#define _DBWINDOW_H_
diff --git a/cinelerra-5.1/cinelerra/mediadb.h b/cinelerra-5.1/cinelerra/mediadb.h
index 71e96bfb..f55cc6b0 100644
--- a/cinelerra-5.1/cinelerra/mediadb.h
+++ b/cinelerra-5.1/cinelerra/mediadb.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined(__i386__) || defined(__x86_64__)
#ifndef _MEDIA_DB_H_
#define _MEDIA_DB_H_
diff --git a/cinelerra-5.1/db/tdb.h b/cinelerra-5.1/db/tdb.h
index e4a08565..24c8617c 100644
--- a/cinelerra-5.1/db/tdb.h
+++ b/cinelerra-5.1/db/tdb.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined(__i386__) || defined(__x86_64__)
#ifndef __DB_H__
#define __DB_H__
#include <cstring>
--
2.33.1
|
|
|
|
@Andrew-R
@PhyllisSmith
Are you sure about using HAVE_LIBDV rather than HAVE_DV in livevideo.C?
Working on commit 9d54c23d957ea350c5ffd756ac2c1c221c94637b I had to change just the first HAVE_LIBDV to HAVE_DV in livevideo.C to compile successfully. For commit b9acb7cd4ecb313fe68ab385ae7a248a29671040 (the latest right now) it should be the same, since it removed only "#ifdef __I386__ || __x86-64__" (fixed also in my patch 0001-fix-compilation-problems.patch, see below: "#if defined(__i386__) || defined(__x86_64__").
To me it seems that HAVE_LIBDV is used in the configure of the thirdparty mjpegtools, but livevideo.C requires HAVE_DV.
Could you please take a look at my patch 0001-fix-compilation-problems.patch attached previously?
https://www.cinelerra-gg.org/bugtracker/file_download.php?file_id=876&type=bug
Thanks. |
|
|
|
@mehw, I have this patch in my local tree
0051-fix-typos-in-libdv-ifdefs-in-livevideo.patch (1,430 bytes)
From fed23dc2fc80d3a60dfdb67f09cbcccee5a6a449 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <[email protected]>
Date: Mon, 26 Jul 2021 20:21:44 +0300
Subject: [PATCH 51/72] fix typos in libdv ifdefs in livevideo
---
cinelerra-5.1/plugins/livevideo/livevideo.C | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/cinelerra-5.1/plugins/livevideo/livevideo.C b/cinelerra-5.1/plugins/livevideo/livevideo.C
index c30034ab..f9304a9d 100644
--- a/cinelerra-5.1/plugins/livevideo/livevideo.C
+++ b/cinelerra-5.1/plugins/livevideo/livevideo.C
@@ -152,7 +152,7 @@ public:
int prev_channel;
int w, h;
// Decompressors for different video drivers
-#if HAVE_DV
+#if HAVE_LIBDV
dv_t *dv;
#endif
mjpeg_t *mjpeg;
@@ -354,7 +354,7 @@ LiveVideo::LiveVideo(PluginServer *server)
w = xS(320);
h = yS(640);
prev_channel = 0;
-#if HAVE_DV
+#if HAVE_LIBDV
dv = 0;
#endif
mjpeg = 0;
@@ -376,7 +376,7 @@ LiveVideo::~LiveVideo()
delete channeldb;
delete temp;
-#if HAVE_DV
+#if HAVE_LIBDV
if(dv) dv_delete(dv);
#endif
if(mjpeg) mjpeg_delete(mjpeg);
@@ -507,7 +507,7 @@ int LiveVideo::process_buffer(VFrame *frame,
{
switch(session->vconfig_in->driver)
{
-#if HAVE_DV
+#if HAVE_LIBDV
case CAPTURE_FIREWIRE:
case CAPTURE_IEC61883:
// Decompress a DV frame from the driver
@@ -648,8 +648,3 @@ void LiveVideo::update_gui()
}
}
}
-
-
-
-
-
--
2.33.1
|
|
|
|
@PhyllisSmith, well, even if default on x86 worked fine - without those ifdefs I had compile errors on termux/arm.. ( (probably due to some interdependency via headers) |
|
|
|
@PhyllisSmith can you consider these changes?
if defined(VAR_A) || defined(VAR_B) ...
Theres also a HAVE_LIBDB to change into HAVE_DB in livevideo.C.
The attached patch fixed all compiling on my system.
0001-fix-compilation-problems.patch (2,506 bytes)
From a9239660df85b23d495a98b857b3d8f7889b5008 Mon Sep 17 00:00:00 2001
From: Matthew White <[email protected]>
Date: Wed, 10 Nov 2021 03:19:48 +0000
Subject: [PATCH] fix compilation problems
Replace __I386__ with __i386__, and __x86-64__ with __x86_64__.
The 'or' condition '||' is incompatible with the directive '#ifdef',
prefer '#if defined(VAR_A) || defined(VAR_B)'.
In plugins/livevideo/livevideo.C use HAVE_DB, rather than HAVE_LIBDV.
---
cinelerra-5.1/cinelerra/commercials.h | 2 +-
cinelerra-5.1/cinelerra/dbwindow.h | 2 +-
cinelerra-5.1/cinelerra/mediadb.h | 2 +-
cinelerra-5.1/db/tdb.h | 2 +-
cinelerra-5.1/plugins/livevideo/livevideo.C | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cinelerra-5.1/cinelerra/commercials.h b/cinelerra-5.1/cinelerra/commercials.h
index 7869c3c3..443cf6c7 100644
--- a/cinelerra-5.1/cinelerra/commercials.h
+++ b/cinelerra-5.1/cinelerra/commercials.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined(__i386__) || defined(__x86_64__)
#ifndef _COMMERCIALS_H_
#define _COMMERCIALS_H_
diff --git a/cinelerra-5.1/cinelerra/dbwindow.h b/cinelerra-5.1/cinelerra/dbwindow.h
index c8a12f66..103beb6d 100644
--- a/cinelerra-5.1/cinelerra/dbwindow.h
+++ b/cinelerra-5.1/cinelerra/dbwindow.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined(__i386__) || defined(__x86_64__)
#ifndef _DBWINDOW_H_
#define _DBWINDOW_H_
diff --git a/cinelerra-5.1/cinelerra/mediadb.h b/cinelerra-5.1/cinelerra/mediadb.h
index 71e96bfb..f55cc6b0 100644
--- a/cinelerra-5.1/cinelerra/mediadb.h
+++ b/cinelerra-5.1/cinelerra/mediadb.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined(__i386__) || defined(__x86_64__)
#ifndef _MEDIA_DB_H_
#define _MEDIA_DB_H_
diff --git a/cinelerra-5.1/db/tdb.h b/cinelerra-5.1/db/tdb.h
index e4a08565..24c8617c 100644
--- a/cinelerra-5.1/db/tdb.h
+++ b/cinelerra-5.1/db/tdb.h
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#if defined(__i386__) || defined(__x86_64__)
#ifndef __DB_H__
#define __DB_H__
#include <cstring>
diff --git a/cinelerra-5.1/plugins/livevideo/livevideo.C b/cinelerra-5.1/plugins/livevideo/livevideo.C
index c30034ab..ac69ba20 100644
--- a/cinelerra-5.1/plugins/livevideo/livevideo.C
+++ b/cinelerra-5.1/plugins/livevideo/livevideo.C
@@ -31,7 +31,7 @@
#include "filexml.h"
#include "guicast.h"
#include "language.h"
-#if HAVE_LIBDV
+#if HAVE_DV
#include "libdv.h"
#endif
#include "libmjpeg.h"
--
2.32.0
|
|
|
|
@mehw
@Andrew-R
Since the default build is "without the commercials", the ifdefs for termux/android builds is really not needed. I backed the changes to these 4 files out of GIT. |
|
|
|
It does not like the || on the ifdef statement. |
|
|
|
@mehw
@Andrew-R
I should have caught this but I forgot to add --with-commercial in bld.sh so that explains why it compiled for me.
BUT after applying the second patch, I am still getting errors. Not sure why yet.
Thanks for quickly finding this, Mat. |
|
|
|
Amended patch.
__I386__ may also need to be changed to __i386__ (with a lowercase "i").
fix-defines-in-headers-2.patch (1,594 bytes)
diff -Nuar a/cinelerra/commercials.h b/cinelerra/commercials.h
--- a/cinelerra/commercials.h 2021-11-09 21:54:26.000000000 +0000
+++ b/cinelerra/commercials.h 2021-11-09 23:49:25.000000000 +0000
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#ifdef __i386__ || __x86_64__
#ifndef _COMMERCIALS_H_
#define _COMMERCIALS_H_
@@ -203,4 +203,4 @@
#endif
-#endif /* x86 */
\ No newline at end of file
+#endif /* x86 */
diff -Nuar a/cinelerra/dbwindow.h b/cinelerra/dbwindow.h
--- a/cinelerra/dbwindow.h 2021-11-09 21:54:26.000000000 +0000
+++ b/cinelerra/dbwindow.h 2021-11-09 23:49:28.000000000 +0000
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#ifdef __i386__ || __x86_64__
#ifndef _DBWINDOW_H_
#define _DBWINDOW_H_
@@ -297,4 +297,4 @@
#endif
-#endif /* x86 */
\ No newline at end of file
+#endif /* x86 */
diff -Nuar a/cinelerra/mediadb.h b/cinelerra/mediadb.h
--- a/cinelerra/mediadb.h 2021-11-09 21:54:26.000000000 +0000
+++ b/cinelerra/mediadb.h 2021-11-09 23:49:32.000000000 +0000
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#ifdef __i386__ || __x86_64__
#ifndef _MEDIA_DB_H_
#define _MEDIA_DB_H_
@@ -240,4 +240,4 @@
};
#endif
-#endif /* x86 */
\ No newline at end of file
+#endif /* x86 */
diff -Nuar a/db/tdb.h b/db/tdb.h
--- a/db/tdb.h 2021-11-09 21:54:27.000000000 +0000
+++ b/db/tdb.h 2021-11-09 23:49:42.000000000 +0000
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#ifdef __i386__ || __x86_64__
#ifndef __DB_H__
#define __DB_H__
#include <cstring>
@@ -1515,4 +1515,4 @@
};
#endif
-#endif /* x86 */
\ No newline at end of file
+#endif /* x86 */
|
|
|
|
Patch attached.
fix-defines-in-headers.patch (1,594 bytes)
diff -Nuar a/cinelerra/commercials.h b/cinelerra/commercials.h
--- a/cinelerra/commercials.h 2021-11-09 21:54:26.000000000 +0000
+++ b/cinelerra/commercials.h 2021-11-09 23:49:25.000000000 +0000
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#ifdef __I386__ || __x86_64__
#ifndef _COMMERCIALS_H_
#define _COMMERCIALS_H_
@@ -203,4 +203,4 @@
#endif
-#endif /* x86 */
\ No newline at end of file
+#endif /* x86 */
diff -Nuar a/cinelerra/dbwindow.h b/cinelerra/dbwindow.h
--- a/cinelerra/dbwindow.h 2021-11-09 21:54:26.000000000 +0000
+++ b/cinelerra/dbwindow.h 2021-11-09 23:49:28.000000000 +0000
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#ifdef __I386__ || __x86_64__
#ifndef _DBWINDOW_H_
#define _DBWINDOW_H_
@@ -297,4 +297,4 @@
#endif
-#endif /* x86 */
\ No newline at end of file
+#endif /* x86 */
diff -Nuar a/cinelerra/mediadb.h b/cinelerra/mediadb.h
--- a/cinelerra/mediadb.h 2021-11-09 21:54:26.000000000 +0000
+++ b/cinelerra/mediadb.h 2021-11-09 23:49:32.000000000 +0000
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#ifdef __I386__ || __x86_64__
#ifndef _MEDIA_DB_H_
#define _MEDIA_DB_H_
@@ -240,4 +240,4 @@
};
#endif
-#endif /* x86 */
\ No newline at end of file
+#endif /* x86 */
diff -Nuar a/db/tdb.h b/db/tdb.h
--- a/db/tdb.h 2021-11-09 21:54:27.000000000 +0000
+++ b/db/tdb.h 2021-11-09 23:49:42.000000000 +0000
@@ -1,4 +1,4 @@
-#ifdef __I386__ || __x86-64__
+#ifdef __I386__ || __x86_64__
#ifndef __DB_H__
#define __DB_H__
#include <cstring>
@@ -1515,4 +1515,4 @@
};
#endif
-#endif /* x86 */
\ No newline at end of file
+#endif /* x86 */
|
|
