- updated for 1.1.9

Changed files:
    cinelerra-fontsdir.patch -> 1.3
    cinelerra-libsndfile1.patch -> 1.5

diff --git a/cinelerra-fontsdir.patch b/cinelerra-fontsdir.patch
index 4ac96f01dc049c17155df889ab150f4ac9d417e5..c5827804e937895f0807360f47b38407048248eb 100644 (file)
--- a/cinelerra-fontsdir.patch
+++ b/cinelerra-fontsdir.patch
@@ -1,28 +1,11 @@
---- cinelerra-1.1.7/plugins/titler/title.C.orig        2003-07-29 06:20:35.000000000 +0200
-+++ cinelerra-1.1.7/plugins/titler/title.C     2003-08-16 23:32:42.547252184 +0200
+--- cinelerra-1.1.9/plugins/titler/title.C.orig        2003-07-29 06:20:35.000000000 +0200
++++ cinelerra-1.1.9/plugins/titler/title.C     2003-08-16 23:32:42.547252184 +0200
 @@ -27,7 +27,7 @@
  
  #define ZERO (1.0 / 64.0)
  
--#define FONT_SEARCHPATH "fonts"
+-#define FONT_SEARCHPATH "/usr/lib/cinelerra/fonts"
 +#define FONT_SEARCHPATH "/usr/share/fonts"
  //#define FONT_SEARCHPATH "/usr/X11R6/lib/X11/fonts"
  
  
-@@ -1030,15 +1030,11 @@
-       {
-               fonts = new ArrayList<FontEntry*>;
- // Construct path from location of the plugin
--              char search_path[BCTEXTLEN];
--              strcpy(search_path, PluginClient::get_path());
--              char *ptr = strrchr(search_path, '/');
--              strcpy(ptr + 1, FONT_SEARCHPATH);
-               char command_line[BCTEXTLEN];
- 
-               sprintf(command_line, 
-                       "find %s -name 'fonts.dir' -print -exec cat {} \\;", 
--                      search_path);
-+                      FONT_SEARCHPATH);
- //printf("TitleMain::build_fonts %s\n", command_line);
- 
-               FILE *in = popen(command_line, "r");

diff --git a/cinelerra-libsndfile1.patch b/cinelerra-libsndfile1.patch
index 2461fe99620d185e7b97ae33ba558fc1e8b329d3..3c4d16381be4fd322be718fc243b9f34935226a1 100644 (file)
--- a/cinelerra-libsndfile1.patch
+++ b/cinelerra-libsndfile1.patch
@@ -1,5 +1,5 @@
---- cinelerra-1.1.8/cinelerra/filesndfile.C.orig       2003-10-19 11:51:37.000000000 +0200
-+++ cinelerra-1.1.8/cinelerra/filesndfile.C    2003-11-12 22:54:02.284687776 +0100
+--- cinelerra-1.1.9/cinelerra/filesndfile.C.orig       2003-10-19 11:51:37.000000000 +0200
++++ cinelerra-1.1.9/cinelerra/filesndfile.C    2003-11-12 22:54:02.284687776 +0100
 @@ -34,7 +34,7 @@
        FILE *fileptr = fopen(asset->path, "r");
        if(fileptr)
@@ -15,9 +15,9 @@
                        {
 -                              fd = sf_open_fd(fileptr, asset->path, SFM_READ, &fd_config, 0);
 +                              fd = sf_open_fd(fileno(fileptr), SFM_READ, &fd_config, 0);
+ // Already given by user
                                if(fd) format_to_asset();
                        }
-               }
 @@ -218,7 +218,7 @@
                        fileptr = fopen(asset->path, "r");
                        if(fileptr)