- up to 20110406

[packages/cinelerra-cv.git] / cinelerra-cv-build.patch

diff --git a/cinelerra-cv-build.patch b/cinelerra-cv-build.patch
index 974f71c20959ea9de95a9b1ff1e6647991ef71c6..1633a758ba3766e77d10f620a3ff90cb5990717c 100644 (file)
--- a/cinelerra-cv-build.patch
+++ b/cinelerra-cv-build.patch
@@ -28,39 +28,6 @@
  AC_SUBST(SOUND_CFLAGS)
  AC_SUBST(SOUND_LDFLAGS)
  ############### END OF SOUND
---- cinelerra-cv-2.1/cinelerra/Makefile.am.org 2006-11-26 01:42:58.101122750 +0100
-+++ cinelerra-cv-2.1/cinelerra/Makefile.am     2006-11-26 01:43:09.741850250 +0100
-@@ -19,26 +19,26 @@
- 
- if BUILDINFO_GIT
- GITVERSION=$(shell if [ -d $(top_srcdir)/.git ]; then cd $(top_srcdir); git rev-parse HEAD; else echo "unknown"; fi)
--      echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
-+      echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
-       echo '#define REPOABOUTPREFTXT "Git SHA-1: $(GITVERSION)"' >> versioninfo.h
- else
- 
- if BUILDINFO_SVN
- SVNVERSION=$(shell if [ -d $(top_srcdir)/.svn ]; then svnversion $(top_srcdir); else echo "unknown"; fi)
--      echo '#define REPOMAINTXT      " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
-+      echo '#define REPOMAINTXT      " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
-       echo '#define REPOABOUTPREFTXT "SVN Version: $(SVNVERSION) $(BUILDINFO_NONRC_S)"' >> versioninfo.h
- 
- else
- if BUILDINFO_CUST
- 
--      echo '#define REPOMAINTXT      " $(BUILDINFO_CUSTOM_TAG) (C) 2006 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
-+      echo '#define REPOMAINTXT      " $(BUILDINFO_CUSTOM_TAG) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
-       echo '#define REPOABOUTPREFTXT "$(BUILDINFO_CUSTOM_TAG)"' >> versioninfo.h
- 
- 
- else # (no repository)
- 
- 
--      echo '#define REPOMAINTXT      "(C) 2006 Heroine Virtual Ltd.\nCompiled on $(BUILDDATE)"' >> versioninfo.h
-+      echo '#define REPOMAINTXT      "(C) 2006 Heroine Virtual Ltd. Compiled on $(BUILDDATE)"' >> versioninfo.h
-       echo '#define REPOABOUTPREFTXT ""' >> versioninfo.h
- endif
- endif
 --- cinelerra-cv-2.1/libmpeg3/video/Makefile.am        2008-08-23 14:53:19.959321239 +0000
 +++ cinelerra-cv-2.1/libmpeg3/video/Makefile.am.org    2008-08-23 14:53:15.609327436 +0000
 @@ -11,6 +11,7 @@
@@ -107,16 +74,6 @@
  #include <swscale.h>
  }
  #endif
---- cinelerra-cv/cinelerra/edits.C~    2010-01-09 15:12:19.000000000 +0100
-+++ cinelerra-cv/cinelerra/edits.C     2010-04-26 09:13:43.381588613 +0200
-@@ -47,7 +47,6 @@
-       this->edl = edl;
-       this->track = track;
- 
--      List<Edit>::List<Edit>();
-       default_edit->edl = edl;
-       default_edit->track = track;
-       default_edit->startproject = 0;
 --- cinelerra-cv/plugins/svg/svg.C~    2010-01-09 15:12:21.000000000 +0100
 +++ cinelerra-cv/plugins/svg/svg.C     2010-06-03 17:56:46.125079418 +0200
 @@ -29,6 +29,8 @@
@@ -128,3 +85,47 @@
  
  
  #include <libintl.h>
+--- cinelerra-cv/cinelerra/Makefile.am~        2011-04-06 19:57:22.664917219 +0200
++++ cinelerra-cv/cinelerra/Makefile.am 2011-04-06 20:02:23.865421062 +0200
+@@ -19,26 +19,26 @@
+ 
+ if BUILDINFO_GIT
+ GITVERSION=$(shell if [ -d $(top_srcdir)/.git ]; then cd $(top_srcdir); git rev-parse HEAD; else echo "unknown"; fi)
+-      echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
++      echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
+       echo '#define REPOABOUTPREFTXT "Git SHA-1: $(GITVERSION)"' >> versioninfo.h
+ else
+ 
+ if BUILDINFO_SVN
+ SVNVERSION=$(shell if [ -d $(top_srcdir)/.svn ]; then svnversion $(top_srcdir); else echo "unknown"; fi)
+-      echo '#define REPOMAINTXT      " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
++      echo '#define REPOMAINTXT      " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
+       echo '#define REPOABOUTPREFTXT "SVN Version: $(SVNVERSION) $(BUILDINFO_NONRC_S)"' >> versioninfo.h
+ 
+ else
+ if BUILDINFO_CUST
+ 
+-      echo '#define REPOMAINTXT      " $(BUILDINFO_CUSTOM_TAG) (C) 2010 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
++      echo '#define REPOMAINTXT      " $(BUILDINFO_CUSTOM_TAG) (C) 2010 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
+       echo '#define REPOABOUTPREFTXT "$(BUILDINFO_CUSTOM_TAG)"' >> versioninfo.h
+ 
+ 
+ else # (no repository)
+ 
+ 
+-      echo '#define REPOMAINTXT      "(C) 2010 Heroine Virtual Ltd.\nCompiled on $(BUILDDATE)"' >> versioninfo.h
++      echo '#define REPOMAINTXT      "(C) 2010 Heroine Virtual Ltd. Compiled on $(BUILDDATE)"' >> versioninfo.h
+       echo '#define REPOABOUTPREFTXT ""' >> versioninfo.h
+ endif
+ endif
+--- cinelerra-cv/guicast/Makefile.am~  2011-04-06 20:40:24.939828081 +0200
++++ cinelerra-cv/guicast/Makefile.am   2011-04-06 20:47:51.613590918 +0200
+@@ -1,7 +1,7 @@
+ lib_LTLIBRARIES = libguicast.la
+ noinst_PROGRAMS=bootstrap
+ 
+-libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS)
++libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS) -lpng $(top_builddir)/quicktime/libquicktimehv.la
+ libguicast_la_LDFLAGS = $(X_LIBS) -version-info 1:0:0 
+ libguicast_la_SOURCES = \
+       bcbar.C \