fixes and accomodations for other operating systems by Andrew

diff --git a/cinelerra-5.1/cinelerra/cursor.C b/cinelerra-5.1/cinelerra/cursor.C
index b392dda13b8b5a39d985a0b31d0684abd50dade3..87f932bbe48aec9e31480e705103b368a1164f78 100644 (file)
--- a/cinelerra-5.1/cinelerra/cursor.C
+++ b/cinelerra-5.1/cinelerra/cursor.C
@@ -51,6 +51,7 @@ return 0;
 int Cursor_::draw(int flash, long selectionstart, long selectionend, long zoom_sample, long viewstart, int vertical)
 {
 return 0;
+#if 0
        if(canvas->get_h() * canvas->get_w() == 0) return 1;
        if(zoom_sample == 0) return 1;       // no canvas
 
@@ -93,6 +94,7 @@ return 0;
                canvas->set_opaque();
        }
        if(flash) canvas->flash();
+#endif
 }
 
 int Cursor_::resize(int w, int h)

diff --git a/cinelerra-5.1/cinelerra/exportedl.C b/cinelerra-5.1/cinelerra/exportedl.C
index cac86bcf3ac512e2954d5dcd2778c19f367ea125..108c2ad6ec6a47ab577dcaa1b71162e0e53e1894 100644 (file)
--- a/cinelerra-5.1/cinelerra/exportedl.C
+++ b/cinelerra-5.1/cinelerra/exportedl.C
@@ -39,7 +39,9 @@
 #include "exportedl.h"
 #include "tracks.h"
 #include "transition.h"
-
+#if defined (__FreeBSD__)
+#include <libgen.h>
+#endif
 #include <ctype.h>
 #include <string.h>
 

diff --git a/cinelerra-5.1/cinelerra/indexfile.C b/cinelerra-5.1/cinelerra/indexfile.C
index 977ad1cbfd5c99cb7239dca14479baed5570d691..885495edba05552ff9d07ef0833d41e65eb125eb 100644 (file)
--- a/cinelerra-5.1/cinelerra/indexfile.C
+++ b/cinelerra-5.1/cinelerra/indexfile.C
@@ -73,6 +73,9 @@
 #ifdef HAVE_ISOFS
 #include <linux/iso_fs.h>
 #endif
+#if defined(__FreeBSD__)
+#include <isofs/cd9660/iso.h>
+#endif
 
 // check for isofs volume_id for dvd/cdrom
 
@@ -859,7 +862,8 @@ int IndexFile::read_info(Indexable *test_indexable)
 
                data = new char[index_state->index_start];
                temp = fread(data, index_state->index_start - sizeof(int64_t), 1, fd);
-               if(!temp) return 1;
+               if(!temp) { delete [] data;
+               return 1;}
 
                data[index_state->index_start - sizeof(int64_t)] = 0;
                FileXML xml;

diff --git a/cinelerra-5.1/cinelerra/indexstate.C b/cinelerra-5.1/cinelerra/indexstate.C
index 803c4f0ba207aa17833ccb0c150c9f8db7e6a1c0..87d907a105983fef747f328e7b91fbe67e09fb3b 100644 (file)
--- a/cinelerra-5.1/cinelerra/indexstate.C
+++ b/cinelerra-5.1/cinelerra/indexstate.C
@@ -304,6 +304,7 @@ int IndexState::read_markers(char *index_dir, char *file_path)
                        if( memcmp(version, MARKER_MAGIC_VERSION, vsz) ) {
                                eprintf(_("IndexState::read_markers marker file version mismatched\n: %s\n"),
                                        marker_path);
+                               fclose(fp);
                                return 1;
                        }
                        ret = read_marks(fp);

diff --git a/cinelerra-5.1/cinelerra/resourcepixmap.C b/cinelerra-5.1/cinelerra/resourcepixmap.C
index 1406dd2d8280191f01a3c986e3aad42945a04d74..5b5a12f86e2def8a786d86d9a8f1b048601d9571 100644 (file)
--- a/cinelerra-5.1/cinelerra/resourcepixmap.C
+++ b/cinelerra-5.1/cinelerra/resourcepixmap.C
@@ -238,7 +238,7 @@ VFrame *ResourcePixmap::change_title_color(VFrame *title_bg, int color)
        c.r = color>>16;  c.g = color>>8;  c.b = color>>0;  c.a = 0xff;
        if( BC_CModels::has_alpha(colormodel) && // fast path
            BC_CModels::calculate_pixelsize(colormodel) == sizeof(unsigned) ) {
-               const unsigned gap_rgba = (0xff<<24) |
+               const unsigned gap_rgba = ((uint32_t)(0xff)<<24) |
                        (gap_grey<<16) | (gap_grey<<8) | (gap_grey<<0);
                if( th > 0 ) {
                        unsigned *bp = (unsigned *)bar_rows[0];

diff --git a/cinelerra-5.1/guicast/bctrace.C b/cinelerra-5.1/guicast/bctrace.C
index 7e453925487b01931c480a541f23f91541b44134..2d08b46babef0c3fe0e2f47eb59e030753b227f6 100644 (file)
--- a/cinelerra-5.1/guicast/bctrace.C
+++ b/cinelerra-5.1/guicast/bctrace.C
@@ -309,7 +309,7 @@ void BC_Trace::dump_traces(FILE *fp)
        }
 }
 
-void trace_info::set_owner() { owner = pthread_self(); }
+void trace_info::set_owner() { owner = (unsigned long)pthread_self(); }
 void trace_info::unset_owner() { owner = 0; }
 
 void BC_Trace::dump_locks(FILE *fp)
@@ -322,7 +322,7 @@ void BC_Trace::dump_locks(FILE *fp)
                fprintf(fp,"    %p %s, %s %p%s",
                        p->info, p->title, p->loc,
                        (void*)p->tid, p->is_owner ? " *" : "");
-               if( p->info->owner && p->info->owner != p->tid )
+               if( p->info->owner && p->info->owner != (unsigned long)p->tid )
                        fprintf(fp," %p", (void*)p->info->owner);
                fprintf(fp,"\n");
        }

diff --git a/cinelerra-5.1/guicast/filesystem.h b/cinelerra-5.1/guicast/filesystem.h
index c976135b0459739e75ca9bb9e70ca71ff1c4f48d..b6cece2deb272b69e0df6e1b1faf1ae0acd74e24 100644 (file)
--- a/cinelerra-5.1/guicast/filesystem.h
+++ b/cinelerra-5.1/guicast/filesystem.h
@@ -26,6 +26,11 @@
 #include "bcwindowbase.inc"
 #include "sizes.h"
 
+#if defined (__FreeBSD__)
+#define dirent64 dirent
+#define readdir64 readdir
+#endif
+
 class FileItem
 {
 public:

diff --git a/cinelerra-5.1/plugins/titler/titler.C b/cinelerra-5.1/plugins/titler/titler.C
index 06fb7938278aa654505471e5041683b4d25ab0c7..b415781106b77ecf9164ffdc62d4941c0a09bae1 100644 (file)
--- a/cinelerra-5.1/plugins/titler/titler.C
+++ b/cinelerra-5.1/plugins/titler/titler.C
@@ -57,8 +57,13 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#if defined (__linux__)
 #include <endian.h>
 #include <byteswap.h>
+#endif
+#if defined (__FreeBSD__)
+#include <sys/endian.h>
+#endif
 #include <iconv.h>
 #include <sys/stat.h>
 #include <fontconfig/fontconfig.h>

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 0dc54fe4149b0b31a802098af59c014e20af77bd..504acb4a514b4c6ab250ce5a6fff9cb992eee6ab 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -47,7 +47,7 @@ pkg-built=$(BLD)/$(1).built
 ext=$(lastword $(subst ., ,$(1)))
 tarball=$(if $($(1).git),$(1).git,$(lastword $(sort $(wildcard src/$(1)*.tar.*))))
 unpack=$(call unpack_$(call ext,$(1)),$(1))
-unpack_git=git clone $($(1)) $(1)
+unpack_git=git clone --depth 1 $($(1)) $(1)
 unpack_gz=tar -xzf $(1)
 unpack_bz2=tar -xjf $(1)
 unpack_xz=tar -xJf $(1)
@@ -407,6 +407,9 @@ clean:
 install:
        cp -a $(ver_mjpegtools)/mpeg2enc/mpeg2enc $(BINDIR)/.
        cp -a $(ver_mjpegtools)/mplex/mplex $(BINDIR)/.
+
+objrem:
+       find . -type f -name '*.o' -delete
 else
 # not WANT_CIN_3RDPARTY
 all: