- up to 1.1.6

- updated libsndfile1 patch, removed both obsolete c++ patches

Changed files:
    cinelerra-c++.patch -> 1.2
    cinelerra-libsndfile1.patch -> 1.2
    cinelerra.spec -> 1.6

diff --git a/cinelerra-c++.patch b/cinelerra-c++.patch
deleted file mode 100644 (file)
index 3977824..0000000
--- a/cinelerra-c++.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cinelerra-1.1.5/cinelerra/tracksedit.C.orig        Sat Dec 14 06:10:45 2002
-+++ cinelerra-1.1.5/cinelerra/tracksedit.C     Fri Mar 21 01:23:37 2003
-@@ -745,7 +745,7 @@
-       dest_edit->insert_transition(server->title);
- }
- 
--void Tracks::paste_video_transition(PluginServer *server, int first_track = 0)
-+void Tracks::paste_video_transition(PluginServer *server, int first_track /* = 0 */)
- {
-       for(Track *current = first; current; current = NEXT)
-       {

diff --git a/cinelerra-libsndfile1.patch b/cinelerra-libsndfile1.patch
index 7d1427f8994bd23b141cb99d17b6b135d919eb63..ccfb307ce1a62f5be12eb95520f1cb9f67cf76e1 100644 (file)
--- a/cinelerra-libsndfile1.patch
+++ b/cinelerra-libsndfile1.patch
@@ -92,7 +92,7 @@
                case SF_FORMAT_PCM_S8:
                        asset->signed_ = 1;
                        asset->bits = BITSLINEAR8;
-@@ -151,13 +137,29 @@
+@@ -151,14 +137,30 @@
                        asset->signed_ = 0;
                        asset->bits = BITSLINEAR8;
                        break;
@@ -118,7 +118,8 @@
        asset->audio_data = 1;
 -      asset->audio_length = fd_config.samples;
 +      asset->audio_length = fd_config.frames;
-       asset->sample_rate = fd_config.samplerate;
+       if(!asset->sample_rate)
+               asset->sample_rate = fd_config.samplerate;
        asset->channels = fd_config.channels;
 -//printf("FileSndFile::format_to_asset %x %d %d %x\n", fd_config.format & SF_FORMAT_TYPEMASK, fd_config.pcmbitwidth, fd_config.samples, fd_config.format & SF_FORMAT_SUBMASK);
 +//printf("FileSndFile::format_to_asset %x %d %x\n", fd_config.format & SF_FORMAT_TYPEMASK, fd_config.frames, fd_config.format & SF_FORMAT_SUBMASK);

diff --git a/cinelerra.spec b/cinelerra.spec
index a351207ff971980cff9d2d22f04f0ff541541493..ffec13b84c104bde7f7de06a1336de66ec1dbff1 100644 (file)
--- a/cinelerra.spec
+++ b/cinelerra.spec
@@ -1,22 +1,19 @@
+# TODO: build guicast as separate, shared library to use in
+#       xmovie, mix2000, cinelerra and bcast 
 Summary:       Cinelerra - capturing, editing and production of audio/video material
 Summary(pl):   Cinelerra - nagrywanie, obróbka i produkcja materia³u audio/video
 Name:          cinelerra
-Version:       1.1.5
+Version:       1.1.6
 Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://dl.sourceforge.net/heroines/%{name}-%{version}-src.tar.bz2
-# Source0-md5: 0c9082049bd7b05a80fe604493d8da02
-# yes, it's the same source
-# TODO: build guicast as separate, shared library to use in
-#       xmovie, mix2000, cinelerra and bcast 
-Patch0:                xmovie-c++.patch
-Patch1:                %{name}-system-libs.patch
-Patch2:                %{name}-libsndfile1.patch
-Patch3:                %{name}-c++.patch
-Patch4:                %{name}-lame.patch
-Patch5:                %{name}-strip.patch
-Patch6:                %{name}-fontsdir.patch
+# Source0-md5: a7868f0a7d3f45d0fc18a09f066f1aa1
+Patch0:                %{name}-system-libs.patch
+Patch1:                %{name}-libsndfile1.patch
+Patch2:                %{name}-lame.patch
+Patch3:                %{name}-strip.patch
+Patch4:                %{name}-fontsdir.patch
 URL:           http://heroinewarrior.com/cinelerra.php3
 BuildRequires: XFree86-devel
 # it's sick, but it's true - it uses libuuid functions
@@ -66,8 +63,6 @@ Cinelerra by
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 CFLAGS="%{rpmcflags} -fno-rtti"; export CFLAGS