SOURCES: cinelerra-fix.patch, cinelerra-fontsdir.patch, cinelerra-strip.pat...
qboosh
qboosh at pld-linux.org
Fri Aug 29 16:34:30 CEST 2008
Author: qboosh Date: Fri Aug 29 14:34:29 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 4
---- Files affected:
SOURCES:
cinelerra-fix.patch (1.4 -> 1.5) , cinelerra-fontsdir.patch (1.4 -> 1.5) , cinelerra-strip.patch (1.4 -> 1.5) , cinelerra-system-libs.patch (1.10 -> 1.11)
---- Diffs:
================================================================
Index: SOURCES/cinelerra-fix.patch
diff -u SOURCES/cinelerra-fix.patch:1.4 SOURCES/cinelerra-fix.patch:1.5
--- SOURCES/cinelerra-fix.patch:1.4 Fri Dec 8 01:44:06 2006
+++ SOURCES/cinelerra-fix.patch Fri Aug 29 16:34:23 2008
@@ -1,6 +1,9 @@
---- cinelerra-2.1/cinelerra/dvbtune.C.orig 2006-02-28 05:41:15.000000000 +0100
-+++ cinelerra-2.1/cinelerra/dvbtune.C 2006-07-05 11:53:08.114440000 +0200
-@@ -1,5 +1,5 @@
+--- cinelerra-4/cinelerra/dvbtune.C.orig 2008-07-23 06:30:59.000000000 +0200
++++ cinelerra-4/cinelerra/dvbtune.C 2008-08-28 19:17:49.450113358 +0200
+@@ -19,8 +19,8 @@
+ *
+ */
+
-#include "../../guicast/bcwindowbase.inc"
-#include "../../guicast/clip.h"
+#include "../guicast/bcwindowbase.inc"
@@ -8,36 +11,3 @@
#include "condition.h"
#include "devicedvbinput.inc"
#include "dvbtune.h"
---- cinelerra-2.1/global_config.orig 2006-07-06 08:29:38.378711000 +0200
-+++ cinelerra-2.1/global_config 2006-07-06 08:29:48.367335500 +0200
-@@ -92,7 +92,7 @@
- CXXREPOSITORY = cxx_repository/*.o
- endif
-
--$(shell sh -c 'if ! test -d $(OBJDIR)\; then mkdir $(OBJDIR)\; fi' )
-+foo := $(shell sh -c 'if ! test -d $(OBJDIR); then mkdir $(OBJDIR); fi' )
-
- ########################## LINKER
-
---- cinelerra-2.1/guicast/Makefile.orig 2006-07-06 08:31:56.547346000 +0200
-+++ cinelerra-2.1/guicast/Makefile 2006-07-06 08:33:18.644477000 +0200
-@@ -37,7 +37,7 @@
- BOOTSTRAPFLAGS := -DBOOTSTRAP="\"objcopy -B sparc -I binary -O elf32-sparc\""
- endif
-
--$(shell sh -c 'if ! test -d $(OBJDIR)\; then mkdir $(OBJDIR)\; fi' )
-+foo := $(shell sh -c 'if ! test -d $(OBJDIR); then mkdir $(OBJDIR); fi' )
-
- OBJS = \
- $(OBJDIR)/bcbar.o \
---- cinelerra-2.1/cinelerra/Makefile.orig 2006-07-06 08:31:56.519344000 +0200
-+++ cinelerra-2.1/cinelerra/Makefile 2006-07-06 08:40:30.435462250 +0200
-@@ -427,7 +427,7 @@
-
-
-
--$(shell echo "\#define BUILDDATE \"`date`\"" > builddate.h )
-+$(shell echo "#define BUILDDATE \"`date`\"" > builddate.h )
- $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
- $(shell echo $(LDFLAGS1) $(OBJS) $(DCRAW) $(FILEEXR) $(AVIOBJS) $(CXXREPOSITORY) $(STATICLIBS) $(LIBS) $(LDFLAGS2) > $(OBJDIR)/objs)
-
================================================================
Index: SOURCES/cinelerra-fontsdir.patch
diff -u SOURCES/cinelerra-fontsdir.patch:1.4 SOURCES/cinelerra-fontsdir.patch:1.5
--- SOURCES/cinelerra-fontsdir.patch:1.4 Tue Nov 1 18:17:15 2005
+++ SOURCES/cinelerra-fontsdir.patch Fri Aug 29 16:34:23 2008
@@ -1,22 +1,21 @@
---- cinelerra-2.0/plugins/titler/title.C.orig 2005-05-12 10:41:22.000000000 +0200
-+++ cinelerra-2.0/plugins/titler/title.C 2005-11-01 14:03:10.117615280 +0100
-@@ -26,7 +26,7 @@
+--- cinelerra-4/plugins/titler/title.C.orig 2008-08-07 05:33:08.000000000 +0200
++++ cinelerra-4/plugins/titler/title.C 2008-08-28 18:23:34.662127605 +0200
+@@ -48,7 +48,7 @@
#include <byteswap.h>
#include <iconv.h>
--#define FONT_SEARCHPATH PLUGIN_DIR "/fonts"
+-#define FONT_SEARCHPATH "/fonts"
+#define FONT_SEARCHPATH "/usr/share/fonts"
REGISTER_PLUGIN(TitleMain)
---- cinelerra-2.0/plugins/titler/Makefile.orig 2005-11-01 13:51:28.423289000 +0100
-+++ cinelerra-2.0/plugins/titler/Makefile 2005-11-01 14:03:27.131028848 +0100
-@@ -21,8 +21,6 @@
-
- install:
- cp $(OUTPUT_PLUGIN) $(PLUGINDIR)
-- mkdir -p $(PLUGINDIR)/fonts
-- cp fonts/* $(PLUGINDIR)/fonts
-
-
-
+@@ -982,8 +982,7 @@
+ fonts = new ArrayList<FontEntry*>;
+ char find_command[BCTEXTLEN];
+ sprintf(find_command,
+- "find %s%s -name 'fonts.dir' -print -exec cat {} \\;",
+- PluginClient::get_plugin_dir(),
++ "find %s -name 'fonts.dir' -print -exec cat {} \\;",
+ FONT_SEARCHPATH);
+ FILE *in = popen(find_command, "r");
+ char current_dir[BCTEXTLEN];
================================================================
Index: SOURCES/cinelerra-strip.patch
diff -u SOURCES/cinelerra-strip.patch:1.4 SOURCES/cinelerra-strip.patch:1.5
--- SOURCES/cinelerra-strip.patch:1.4 Sun Aug 22 22:36:23 2004
+++ SOURCES/cinelerra-strip.patch Fri Aug 29 16:34:24 2008
@@ -20,14 +20,14 @@
../../cinelerra/$(OBJDIR)/bootstrap $(OUTPUT_THEME) data/*.png
include ../../plugin_config
---- cinelerra-1.2.1/cinelerra/Makefile.orig 2004-08-22 20:32:29.566359056 +0200
-+++ cinelerra-1.2.1/cinelerra/Makefile 2004-08-22 20:47:51.109263240 +0200
-@@ -412,7 +412,7 @@
- @echo LD $(OUTPUT)
- @$(LINKER) `cat $(OBJDIR)/objs`
- @echo STRIP $(OUTPUT)
-- @strip $(OUTPUT)
-+ @$(STRIP) $(OUTPUT)
+--- cinelerra-4/cinelerra/Makefile.orig 2008-08-28 18:02:51.486128443 +0200
++++ cinelerra-4/cinelerra/Makefile 2008-08-28 18:13:51.234129281 +0200
+@@ -449,7 +449,7 @@
+ # Also VFS only overrides the C library when dynamic linking is used.
+ $(OUTPUT): $(OBJS) $(DCRAW) $(FILEEXR) $(FFMPEG_OBJS) $(FILEFLAC) $(THEME_DATA) $(SNDFILE_LIB)
+ $(LINKER) `cat $(OBJDIR)/objs`
+- strip $(OUTPUT)
++ $(STRIP) $(OUTPUT)
$(OBJDIR)/test:
$(CC) -shared -o $(OBJDIR)/test.so \
================================================================
Index: SOURCES/cinelerra-system-libs.patch
diff -u SOURCES/cinelerra-system-libs.patch:1.10 SOURCES/cinelerra-system-libs.patch:1.11
--- SOURCES/cinelerra-system-libs.patch:1.10 Wed Jul 5 12:18:28 2006
+++ SOURCES/cinelerra-system-libs.patch Fri Aug 29 16:34:24 2008
@@ -1,40 +1,47 @@
---- cinelerra-2.1/cinelerra/Makefile.orig 2006-06-01 06:12:23.000000000 +0200
-+++ cinelerra-2.1/cinelerra/Makefile 2006-07-05 11:30:45.264440000 +0200
-@@ -1,27 +1,13 @@
+--- cinelerra-4/cinelerra/Makefile.orig 2008-08-08 08:29:31.000000000 +0200
++++ cinelerra-4/cinelerra/Makefile 2008-08-28 17:53:28.910125929 +0200
+@@ -1,33 +1,14 @@
include ../global_config
--AVC_DIR := $(shell expr ../libavc1394* )
--DV_DIR := ../quicktime/libdv-0.104
--EXR_DIR := ../OpenEXR-1.2.1/
--FFMPEG_DIR := $(shell expr ../quicktime/ffmpeg* )
--JPEG_DIR := $(shell expr ../quicktime/jpeg-mmx* )
--LAME_DIR := ../quicktime/lame-3.93.1/include
--LIBIEC_DIR := $(shell expr ../libiec61883* )
--LIBRAW_DIR := $(shell expr ../libraw1394* )
--OGG_DIR := $(shell expr ../quicktime/libogg* )
--SNDFILE_DIR := $(shell expr ../libsndfile* )
--THEORA_DIR := $(shell expr ../libtheora* )
--TIFF_DIR := ../tiff-v3.5.7
- TOOLAME_DIR := ../toolame-02l
--UUID_DIR := ../uuid
--VORBIS_DIR := $(shell expr ../quicktime/libvorbis* )
--
+-AVC_DIR := $(shell expr ../thirdparty/libavc1394* )
+-DV_DIR := $(shell expr ../quicktime/thirdparty/libdv-*/ )
+-FLAC_DIR := $(shell expr ../thirdparty/flac*/ )
+-FFMPEG_DIR := $(shell expr ../quicktime/thirdparty/ffmpeg* )
+-JPEG_DIR := $(shell expr ../quicktime/thirdparty/jpeg-mmx* )
+-LAME_DIR := ../quicktime/thirdparty/lame-3.93.1/include
+-LIBIEC_DIR := $(shell expr ../thirdparty/libiec61883* )
+-LIBRAW_DIR := $(shell expr ../thirdparty/libraw1394* )
+-OGG_DIR := $(shell expr ../quicktime/thirdparty/libogg* )
+-SNDFILE_DIR := $(shell expr ../thirdparty/libsndfile* )
+-THEORA_DIR := $(shell expr ../thirdparty/libtheora* )
+-TIFF_DIR := ../thirdparty/tiff-v3.5.7
+ TOOLAME_DIR := ../thirdparty/toolame-02l
+-UUID_DIR := ../thirdparty/uuid
+-VORBIS_DIR := $(shell expr ../quicktime/thirdparty/libvorbis* )
+
-AVC_LIB := $(AVC_DIR)/libavc1394/.libs/libavc1394.a $(AVC_DIR)/librom1394/.libs/librom1394.a
-RAW_LIB := $(LIBRAW_DIR)/src/.libs/libraw1394.a
-IEC_LIB := $(LIBIEC_DIR)/src/.libs/libiec61883.a
-SNDFILE_LIB := $(SNDFILE_DIR)/src/.libs/libsndfile.a
-THEORA_LIB := $(THEORA_DIR)/lib/.libs/libtheora.a
-
+-EXR_LIBS := \
+- ../thirdparty/lib/libIlmImf.a \
+- ../thirdparty/lib/libIlmThread.a \
+- ../thirdparty/lib/libImath.a \
+- ../thirdparty/lib/libHalf.a \
+- ../thirdparty/lib/libIex.a
+-EXR_INCLUDES := -I../thirdparty/include/OpenEXR
+AVC_LIB := -lavc1394 -lrom1394
+RAW_LIB := -lraw1394
+IEC_LIB := -liec61883
+SNDFILE_LIB := -lsndfile
+THEORA_LIB := -ltheora
-+
++EXR_LIBS := -lIlmImf -lIlmThread -lImath -lHalf -lIex
++EXR_INCLUDES := -I/usr/include/OpenEXR
OBJS = \
$(OBJDIR)/aattachmentpoint.o \
$(OBJDIR)/aautomation.o \
-@@ -318,21 +304,10 @@
+@@ -331,34 +312,16 @@
STATICLIBS = \
@@ -43,7 +50,8 @@
- $(IEC_LIB) \
- ../quicktime/$(OBJDIR)/libquicktime.a \
- $(ESOUNDLIBS) \
-- $(EXR_DIR)/$(OBJDIR)/libexr.a \
+- $(EXR_LIBS) \
+- $(FLAC_DIR)/src/libFLAC/.libs/libFLAC.a \
- $(TIFF_DIR)/$(OBJDIR)/libtiff.a \
../guicast/$(OBJDIR)/libguicast.a \
- ../libmpeg3/$(OBJDIR)/libmpeg3.a \
@@ -57,7 +65,19 @@
LIBS := \
-L./ \
-@@ -358,6 +333,17 @@
+ -L../guicast
+
+
+-ifeq ($(OBJDIR), x86_64)
+-LIBS += -L/usr/X11R6/lib64
+-else
+-LIBS += -L/usr/X11R6/lib
+-endif
+-
+ ifeq ($(HAVE_GL), y)
+ LIBS += -lGL -lGLU
+ endif
+@@ -372,6 +334,19 @@
LIBS += \
@@ -65,8 +85,10 @@
+ $(RAW_LIB) \
+ $(IEC_LIB) \
+ -lquicktime -lvorbisfile \
++ -lavformat \
+ $(ESOUNDLIBS) \
-+ -lIlmImf -lImath -lHalf -lIex \
++ $(EXR_LIBS) \
++ -lFLAC \
+ -ltiff \
+ -lmpeg3 \
+ $(SNDFILE_LIB) \
@@ -75,7 +97,7 @@
-lX11 \
-lXext \
-lXv \
-@@ -374,28 +360,21 @@
+@@ -390,26 +365,20 @@
CFLAGS += \
-I../guicast \
@@ -96,15 +118,12 @@
+ -I/usr/include/uuid \
-I$(TOOLAME_DIR) \
- -I$(LAME_DIR) \
-- -I../audiofile \
- -I../libmpeg3 \
- -I$(SNDFILE_DIR)/src \
+ -I/usr/include/lame \
+ -I/usr/include/libmpeg3 \
$(ESOUNDCFLAGS) \
-- -I$(FFMPEG_DIR)/libavcodec -I$(FFMPEG_DIR)/libavutil \
- -I$(THEORA_DIR)/include
-+ -I/usr/include/ffmpeg \
+ -I/usr/include/theora
@@ -114,15 +133,29 @@
-@@ -501,7 +480,7 @@
+@@ -431,10 +431,9 @@
- $(FILEEXR): fileexr.C
- @echo C++ $*.o
-- @$(CC) -c `cat $(OBJDIR)/c_flags` -I$(EXR_DIR)IlmImf -I$(EXR_DIR)Imath -I$(EXR_DIR)Iex -I$(EXR_DIR)Half $(subst $(OBJDIR)/,, $*.C) -o $*.o
-+ @$(CC) -c `cat $(OBJDIR)/c_flags` -I/usr/include/OpenEXR $(subst $(OBJDIR)/,, $*.C) -o $*.o
+ FFMPEG_CFLAGS := \
+ $(CFLAGS) \
+- -I$(FFMPEG_DIR)/libavcodec \
+- -I$(FFMPEG_DIR)/libavformat \
+- -I$(FFMPEG_DIR)/libavutil \
+- -I$(FFMPEG_DIR)
++ -I/usr/include/libavcodec \
++ -I/usr/include/libavformat \
++ -I/usr/include/libavutil
+
+
+ $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+@@ -519,7 +488,7 @@
+ $(CC) -c `cat $(OBJDIR)/c_flags` $(EXR_INCLUDES) $(subst $(OBJDIR)/,, $*.C) -o $*.o
+
+ $(FILEFLAC): fileflac.C
+- $(CC) -c `cat $(OBJDIR)/c_flags` -I$(FLAC_DIR)/include $(subst $(OBJDIR)/,, $*.C) -o $*.o
++ $(CC) -c `cat $(OBJDIR)/c_flags` -I/usr/include/FLAC $(subst $(OBJDIR)/,, $*.C) -o $*.o
- $(DCRAW): dcraw.c
- @echo CC $*.o
+ $(FFMPEG_OBJS):
+ $(CC) -c `cat $(OBJDIR)/ffmpeg_cflags` $(subst $(OBJDIR)/,, $*.C) -o $*.o
--- cinelerra-1.1.8/mpeg2enc/Makefile.orig 2003-10-14 09:54:43.000000000 +0200
+++ cinelerra-1.1.8/mpeg2enc/Makefile 2003-11-12 22:23:56.387225920 +0100
@@ -1,6 +1,6 @@
@@ -161,35 +194,22 @@
$(OBJS):
$(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o
---- cinelerra-2.0/plugins/titler/Makefile.orig 2005-05-29 02:01:50.000000000 +0200
-+++ cinelerra-2.0/plugins/titler/Makefile 2005-11-01 13:29:05.682416672 +0100
-@@ -8,19 +8,18 @@
-
-
- OUTPUT_PLUGIN = ../$(OBJDIR)/titler.plugin
--FREETYPE_DIR = ../../freetype-2.1.4
--CFLAGS += -I$(FREETYPE_DIR)/include -I../../
-+FREETYPE_DIR =
-+CFLAGS += -I/usr/include/freetype2 -I../../
+--- cinelerra-4/plugins/titler/Makefile.orig 2008-07-14 04:27:17.000000000 +0200
++++ cinelerra-4/plugins/titler/Makefile 2008-08-28 17:32:51.682116710 +0200
+@@ -8,8 +8,8 @@
- $(OUTPUT_PLUGIN): $(OBJS)
- $(LDLINKER) -o $(OUTPUT_PLUGIN) \
- $(OBJS) \
-- $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
-- strip $(OUTPUT_PLUGIN)
-+ -lfreetype
+ OUTPUT = ../$(OBJDIR)/titler.plugin
+-CFLAGS += -I$(FREETYPE_DIR)/include -I../../thirdparty/
+-LFLAGS += $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
++CFLAGS += -I/usr/include/freetype2
++LFLAGS += -lfreetype
include ../../plugin_config
--inst:
-+install:
- cp $(OUTPUT_PLUGIN) $(PLUGINDIR)
- mkdir -p $(PLUGINDIR)/fonts
- cp fonts/* $(PLUGINDIR)/fonts
---- cinelerra-1.1.8/global_config.orig 2003-10-29 10:05:08.000000000 +0100
-+++ cinelerra-1.1.8/global_config 2003-11-12 22:22:09.103535520 +0100
-@@ -24,7 +24,7 @@
+--- cinelerra-4/global_config.orig 2008-08-07 05:33:09.000000000 +0200
++++ cinelerra-4/global_config 2008-08-28 17:31:46.010117548 +0200
+@@ -36,7 +36,7 @@
############################# FINAL DESTINATION FOR INSTALLATION BINARIES
@@ -197,30 +217,34 @@
+PREFIX = /usr
LIBPREFIX = $(PREFIX)/lib
- ########################## THE COMPILER
-@@ -50,8 +50,8 @@
+
+@@ -64,10 +64,10 @@
ifeq ($(HAVE_ESOUND), y)
--ESOUNDCFLAGS = -DHAVE_ESOUND -I../esound
--ESOUNDLIBS = ../esound/$(OBJDIR)/libesound.a
+-ESOUND_DIR := ../thirdparty/esound
+-AUDIOFILE_DIR := ../thirdparty/audiofile
+-ESOUNDCFLAGS = -DHAVE_ESOUND -I$(ESOUND_DIR) -I$(AUDIOFILE_DIR)
+-ESOUNDLIBS = $(ESOUND_DIR)/$(OBJDIR)/libesound.a
++AUDIOFILEDIR=
++ESOUNDDIR=
+ESOUNDCFLAGS = -DHAVE_ESOUND
+ESOUNDLIBS = -lesd
endif
-@@ -59,8 +59,8 @@
- CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+@@ -76,8 +76,8 @@
#CFLAGS += -I. # Caused fileavi.C to fail
--FREETYPE_DIR = ../../freetype-2.1.4
+ # the directory for plugin includes
+-FREETYPE_DIR := $(shell expr ../../thirdparty/freetype-* )
-CFLAGS += -I$(FREETYPE_DIR)/include -I../../
+FREETYPE_DIR =
-+CFLAGS += -I/usr/include/freeetype2
++CFLAGS += -I/usr/include/freetype2
ifeq ($(HAVE_OSS), y)
CFLAGS += -DHAVE_OSS
-@@ -79,7 +79,7 @@
+@@ -91,7 +91,7 @@
CFLAGS += $(ALSA_CFLAGS)
endif
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cinelerra-fix.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cinelerra-fontsdir.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cinelerra-strip.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cinelerra-system-libs.patch?r1=1.10&r2=1.11&f=u
More information about the pld-cvs-commit
mailing list