- fixed some plugins (still NF)

Changed files:
    cinelerra-system-libs.patch -> 1.2
    cinelerra.spec -> 1.2

diff --git a/cinelerra-system-libs.patch b/cinelerra-system-libs.patch
index 7a74c75c920dfef8f4e10e2091407ddc49199b7c..04a6185808db2b509a863e8a9b36691b7cd89c02 100644 (file)
--- a/cinelerra-system-libs.patch
+++ b/cinelerra-system-libs.patch
@@ -101,7 +101,7 @@
  CFLAGS += -I../ -I../../cinelerra \
        -I../../guicast \
 -      -I../../quicktime \
-+      -I/usr/include/quicktime \
++      -I/usr/include/quicktime -I../../quicktime \
        -I../colors
  
  $(shell echo $(CFLAGS) > ../$(OBJDIR)/c_flags)
@@ -126,3 +126,41 @@
        -lpthread \
        -lpng \
        -lz \
+--- cinelerra-1.1.5/plugins/titler/Makefile.orig       Sat Aug 17 04:26:42 2002
++++ cinelerra-1.1.5/plugins/titler/Makefile    Fri Mar 21 08:40:47 2003
+@@ -1,25 +1,28 @@
+ FREETYPE_DIR = $(shell expr ../../freetype* )
+-CFLAGS += -I$(FREETYPE_DIR)/include -I../../
++CFLAGS += -I/usr/include/freetype2
+ 
+ include ../../global_config
+ 
+ OBJS = $(OBJDIR)/title.o  \
+       $(OBJDIR)/titlewindow.o \
+       ../colors/$(OBJDIR)/colorpicker.o \
+-      ../colors/$(OBJDIR)/plugincolors.o \
+-      $(FREETYPE_DIR)/objs/.libs/libfreetype.a
++      ../colors/$(OBJDIR)/plugincolors.o
++
++LIBS = -lfreetype
+ 
+ OUTPUT = ../$(OBJDIR)/titler.plugin
+ 
+-include ../../plugin_config
++all: $(OUTPUT)
+ 
+-inst:
++install:
+       cp $(OUTPUT) /usr/lib/cinelerra
+       cp -a fonts /usr/lib/cinelerra
+ 
++$(OUTPUT) : $(OBJS)
++      $(LDLINKER) -o $(OUTPUT) $(OBJS) $(LIBS)
+ 
+-
+-
++$(OBJS):
++      $(CC) -c $(CFLAGS) -I/usr/include/quicktime -I../../quicktime -I../../cinelerra -I../../guicast -I../colors $(subst $(OBJDIR)/,, $*.C) -o $*.o
+ 
+ $(OBJDIR)/title.o: title.C
+ $(OBJDIR)/titlewindow.o: titlewindow.C

diff --git a/cinelerra.spec b/cinelerra.spec
index ddb64c048b675c14f78d1590271aa2c49de053c8..811c2189ad8e7db974a3f75e30d4f0c2fe454c21 100644 (file)
--- a/cinelerra.spec
+++ b/cinelerra.spec
@@ -44,15 +44,19 @@ CFLAGS="%{rpmcflags} -fno-rtti"; export CFLAGS
 %{__make} -C mplexhi
 %{__make} -C mplexlo
 %{__make} -C guicast
-%{__make} -C cinerella
-# TODO: titler (w/freetype) fails
+%{__make} -C cinelerra
+# TODO: lame fails (termcap.h not found)
+# TODO: lame should use shared lame library
+# TODO: defaulttheme and microtheme cannot be stripped
+#       (they have resources appended to linked binary :/)
 %{__make} -C plugins
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/cinelerra}
 
-install cinerella/*/cinerella $RPM_BUILD_ROOT%{_bindir}
+install cinelerra/*/cinelerra $RPM_BUILD_ROOT%{_bindir}
+install plugins/`uname -m`/*.plugin $RPM_BUILD_ROOT%{_libdir}/cinelerra
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,4 +64,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/cinerella
+%attr(755,root,root) %{_libdir}/cinelerra