OpenSDE
/
package-nopast
3
0
Fork 0
Code Issues 9 Projects 1 Releases Activity
OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1098 Commits
49 Branches
0 Tags
34 MiB
Tree: 02696e40e1
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '02696e40e1'
${ noResults }
package-nopast/multimedia/cinelerra/world.patch

298 lines
9.6 KiB
Raw Normal View History

* relocated current package database to the trunk of the package sub-project git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20072 10447126-35f2-4685-b0cf-6dd780d3921f
18 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../cinelerra/world.patch
  5. # Copyright (C) 2006 The OpenSDE Project
  6. # Copyright (C) 2006 The T2 SDE Project
  7. #
  8. # More information can be found in the files COPYING and README.
  9. #
  10. # This patch file is dual-licensed. It is available under the license the
  11. # patched project is licensed under, as long as it is an OpenSource license
  12. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  13. # of the GNU General Public License as published by the Free Software
  14. # Foundation; either version 2 of the License, or (at your option) any later
  15. # version.
  16. # --- SDE-COPYRIGHT-NOTE-END ---
  18. diff -ur cinelerra-2.1.orig/build/Makefile.cinelerra cinelerra-2.1/build/Makefile.cinelerra
  19. --- cinelerra-2.1.orig/build/Makefile.cinelerra 2006-10-11 20:50:15.286456500 +0200
  20. +++ cinelerra-2.1/build/Makefile.cinelerra 2006-10-11 20:52:02.405151000 +0200
  21. @@ -5,9 +5,7 @@
  23. DIRS := \
  24. doc \
  25. - libmpeg3 \
  26. mpeg2enc \
  27. - mplexlo \
  28. guicast \
  29. cinelerra \
  30. plugins \
  31. @@ -23,22 +21,10 @@
  34. all: $(OBJDIR)/soundtest
  35. -ifeq ($(HAVE_FIREWIRE), y)
  36. - $(MAKE) -C libraw1394*
  37. $(MAKE) -C libiec61883*
  38. - $(MAKE) -C libavc1394*
  39. -endif
  40. - $(MAKE) -C fftw*
  41. - $(MAKE) -f build/Makefile.esound
  42. - $(MAKE) -f build/Makefile.freetype
  43. - $(MAKE) -f build/Makefile.tiff
  44. $(MAKE) -f build/Makefile.toolame
  45. $(MAKE) -f build/Makefile.uuid
  46. - MAKE='make -j1' make -j1 -C mjpegtools*
  47. - $(MAKE) -C libsndfile*
  48. $(MAKE) -C quicktime
  49. - $(MAKE) -C libtheora*
  50. - $(MAKE) -f build/Makefile.exr
  51. @ for i in $(DIRS) ; \
  52. do \
  53. $(MAKE) -C $$i ; \
  54. @@ -83,8 +69,6 @@
  55. install:
  56. $(MAKE) -C cinelerra install
  57. $(MAKE) -C plugins install
  58. - $(MAKE) -C libmpeg3 install
  59. - $(MAKE) -C mplexlo install
  60. $(MAKE) -C po install
  61. cp $(OBJDIR)/soundtest /usr/bin
  63. diff -ur cinelerra-2.1.orig/cinelerra/Makefile cinelerra-2.1/cinelerra/Makefile
  64. --- cinelerra-2.1.orig/cinelerra/Makefile 2006-10-11 20:51:04.481531000 +0200
  65. +++ cinelerra-2.1/cinelerra/Makefile 2006-10-11 20:52:58.244640750 +0200
  66. @@ -16,11 +16,11 @@
  67. UUID_DIR := ../uuid
  68. VORBIS_DIR := $(shell expr ../quicktime/libvorbis* )
  70. -AVC_LIB := $(AVC_DIR)/libavc1394/.libs/libavc1394.a $(AVC_DIR)/librom1394/.libs/librom1394.a
  71. -RAW_LIB := $(LIBRAW_DIR)/src/.libs/libraw1394.a
  72. +AVC_LIB := -lavc1394 -lrom1394
  73. +RAW_LIB := -lraw1394
  74. IEC_LIB := $(LIBIEC_DIR)/src/.libs/libiec61883.a
  75. -SNDFILE_LIB := $(SNDFILE_DIR)/src/.libs/libsndfile.a
  76. -THEORA_LIB := $(THEORA_DIR)/lib/.libs/libtheora.a
  77. +SNDFILE_LIB := -lsndfile
  78. +THEORA_LIB := -ltheora
  80. OBJS = \
  81. $(OBJDIR)/aattachmentpoint.o \
  82. @@ -322,11 +322,11 @@
  83. $(RAW_LIB) \
  84. $(IEC_LIB) \
  85. ../quicktime/$(OBJDIR)/libquicktime.a \
  86. - $(ESOUNDLIBS) \
  87. - $(EXR_DIR)/$(OBJDIR)/libexr.a \
  88. - $(TIFF_DIR)/$(OBJDIR)/libtiff.a \
  89. + -lesd \
  90. + -lHalf -lIex -lImath -lIlmImf \
  91. + -ltiff \
  92. ../guicast/$(OBJDIR)/libguicast.a \
  93. - ../libmpeg3/$(OBJDIR)/libmpeg3.a \
  94. + $(LDIR)/libmpeg3.a \
  95. $(SNDFILE_LIB) \
  96. $(UUID_DIR)/$(OBJDIR)/libuuid.a \
  97. ../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
  98. @@ -340,9 +340,9 @@
  101. ifeq ($(OBJDIR), x86_64)
  102. -LIBS += -L/usr/X11R6/lib64
  103. +LIBS += -L/usr/X11/lib64
  104. else
  105. -LIBS += -L/usr/X11R6/lib
  106. +LIBS += -L/usr/X11/lib
  107. endif
  109. ifeq ($(HAVE_GL), y)
  110. @@ -450,7 +450,7 @@
  112. $(shell echo "\#define BUILDDATE \"`date`\"" > builddate.h )
  113. $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
  114. -$(shell echo $(LDFLAGS1) $(OBJS) $(DCRAW) $(FILEEXR) $(AVIOBJS) $(CXXREPOSITORY) $(STATICLIBS) $(LIBS) $(LDFLAGS2) > $(OBJDIR)/objs)
  115. +$(shell echo $(LDFLAGS1) $(OBJS) $(DCRAW) $(FILEEXR) $(AVIOBJS) $(CXXREPOSITORY) $(STATICLIBS) $(LIBS) $(LDFLAGS2) -lvorbis -lvorbisfile -lvorbisenc -logg -ltiff -lmp3lame -ldv -lavcodec > $(OBJDIR)/objs)
  119. @@ -501,7 +501,7 @@
  121. $(FILEEXR): fileexr.C
  122. @echo C++ $*.o
  123. - @$(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
  124. + @$(CC) -c `cat $(OBJDIR)/c_flags` -I/usr/include/OpenEXR/ $(subst $(OBJDIR)/,, $*.C) -o $*.o
  126. $(DCRAW): dcraw.c
  127. @echo CC $*.o
  128. diff -ur cinelerra-2.1.orig/configure cinelerra-2.1/configure
  129. --- cinelerra-2.1.orig/configure 2006-10-11 20:49:40.788300500 +0200
  130. +++ cinelerra-2.1/configure 2006-10-11 20:52:02.405151000 +0200
  131. @@ -135,47 +135,12 @@
  132. echo CONFIGURING QUICKTIME
  133. cd quicktime* && ./configure && cd ..
  135. -echo CONFIGURING LIBMPEG3
  136. -cd libmpeg3* && ./configure && cd ..
  137. -
  138. -echo CONFIGURING FFTW
  139. -cd fftw* && CFLAGS=-fPIC ./configure && cd ..
  140. -
  141. -echo CONFIGURING MJPEGTOOLS
  142. -cd mjpegtools* && ./configure --enable-shared=no && cd ..
  143. -
  144. -
  145. -
  146. -echo CONFIGURING SNDFILE
  147. -cd libsndfile* && chmod a+x ./configure && ./configure && cd ..
  148. -
  149. -echo CONFIGURING RAW1394
  150. -cd libraw1394* && \
  151. -./configure --enable-shared=no && \
  152. -ln -sf src libraw1394 && \
  153. -cd ..
  154. -
  155. -echo CONFIGURING AVC1394
  156. -cd libavc1394* && \
  157. -RAW1394_PATH=`expr $TOPDIR/libraw1394*` && \
  158. -PKG_CONFIG_PATH=$RAW1394_PATH CFLAGS=-I$RAW1394_PATH/ LDFLAGS=-L$RAW1394_PATH/src/.libs ./configure --enable-shared=no && \
  159. -cd ..
  160. -
  161. echo CONFIGURING IEC61883
  162. cd libiec61883* && \
  163. RAW1394_PATH=`expr $TOPDIR/libraw1394*` && \
  164. PKG_CONFIG_PATH=$RAW1394_PATH CFLAGS=-I$RAW1394_PATH/ LDFLAGS=-L$RAW1394_PATH/src/.libs ./configure --enable-shared=no && \
  165. cd ..
  167. -echo CONFIGURING THEORA
  168. -LIBOGG_PATH=`expr $TOPDIR/quicktime/libogg*` && \
  169. -LIBVORBIS_PATH=`expr $TOPDIR/quicktime/libvorbis*` && \
  170. -cd libtheora* && \
  171. -PKG_CONFIG_PATH=$LIBOGG_PATH:$LIBVORBIS_PATH CFLAGS="-I$LIBOGG_PATH/include -L$LIBOGG_PATH/src -I$LIBVORBIS_PATH/include -L$LIBVORBIS_PATH/lib" ./configure --enable-shared=no && \
  172. -cd ..
  173. -
  174. -
  175. -
  176. # write configuration header
  177. echo "Writing hvirtual_config.h"
  178. cat > hvirtual_config.h << EOF
  179. diff -ur cinelerra-2.1.orig/global_config cinelerra-2.1/global_config
  180. --- cinelerra-2.1.orig/global_config 2006-10-11 20:49:40.800301250 +0200
  181. +++ cinelerra-2.1/global_config 2006-10-11 20:52:02.413151500 +0200
  182. @@ -49,8 +49,10 @@
  183. # libraries are stored in different directories depending on CPU
  184. ifeq ($(OBJDIR), i686)
  185. PLUGINDIR := /usr/lib/cinelerra
  186. +LDIR := /usr/lib
  187. else
  188. PLUGINDIR := /usr/lib64/cinelerra
  189. +LDIR := /usr/lib64
  190. endif
  193. diff -ur cinelerra-2.1.orig/plugins/Makefile cinelerra-2.1/plugins/Makefile
  194. --- cinelerra-2.1.orig/plugins/Makefile 2006-10-11 20:49:43.972499500 +0200
  195. +++ cinelerra-2.1/plugins/Makefile 2006-10-11 20:52:02.413151500 +0200
  196. @@ -132,7 +132,7 @@
  197. cp $(OBJDIR)/*.plugin $(PLUGINDIR)
  198. mkdir -p $(PLUGINDIR)/fonts
  199. cp titler/fonts/* $(PLUGINDIR)/fonts
  200. - cp ../mjpegtools*/mpeg2enc/mpeg2enc $(PLUGINDIR)/mpeg2enc.plugin
  201. +
  205. diff -ur cinelerra-2.1.orig/plugins/titler/Makefile cinelerra-2.1/plugins/titler/Makefile
  206. --- cinelerra-2.1.orig/plugins/titler/Makefile 2006-10-11 20:49:43.368461750 +0200
  207. +++ cinelerra-2.1/plugins/titler/Makefile 2006-10-11 20:52:02.409151250 +0200
  208. @@ -15,7 +15,7 @@
  209. $(OUTPUT_PLUGIN): $(OBJS)
  210. $(LDLINKER) -o $(OUTPUT_PLUGIN) \
  211. $(OBJS) \
  212. - $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
  213. + -lfreetype
  214. strip $(OUTPUT_PLUGIN)
  216. include ../../plugin_config
  217. diff -ur cinelerra-2.1.orig/quicktime/Makefile cinelerra-2.1/quicktime/Makefile
  218. --- cinelerra-2.1.orig/quicktime/Makefile 2006-10-11 20:50:07.377962250 +0200
  219. +++ cinelerra-2.1/quicktime/Makefile 2006-10-11 20:52:02.413151500 +0200
  220. @@ -94,11 +94,11 @@
  222. #include Makefile.jpeg
  223. #include Makefile.vorbis
  224. -include Makefile.lame
  225. +#include Makefile.lame
  226. #include Makefile.dv
  227. include Makefile.encore50
  229. -
  230. +LAME_DIR = /usr
  234. @@ -218,7 +218,7 @@
  235. -I$(DV_INCLUDE) \
  236. -I$(JPEG_INCLUDE) \
  237. -I$(MPEG3_DIR) \
  238. - -I$(LAME_DIR)/include \
  239. + -I$(LAME_DIR)/include/lame \
  240. -I$(OGG_DIR)/include \
  241. -I$(VORBIS_DIR)/include \
  242. -ffast-math \
  243. @@ -248,11 +248,11 @@
  244. $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(DIRS) \; fi )
  245. $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
  246. $(shell echo $(LAME_CFLAGS) > $(OBJDIR)/lame_flags)
  247. -$(shell echo $(OBJS) $(JPEG_LIB)/*.o $(DV_LIB)/*.o $(FAAD_LIB)/*.o $(FAAC_LIB)/*.o $(FFMPEG_LIB)/*.o $(X264_LIB)/*.o $(OGG_LIB)/*.o $(VORBIS_LIB)/*.o $(LAME_OBJS) > $(OBJDIR)/objs)
  248. +$(shell echo $(OBJS) $(X264_LIB)/*.o > $(OBJDIR)/objs)
  250. all: $(OBJDIR) $(OUTPUT)
  252. -$(OUTPUT): $(OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(LAME_OBJS) $(FAAD_LIB) $(FAAC_LIB) $(FFMPEG_LIB) $(X264_LIB) $(DV_LIB) $(JPEG_LIB) $(OGG_LIB)/ $(VORBIS_LIB)
  253. +$(OUTPUT): $(OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(X264_LIB)
  254. ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
  256. # this is the only way we figured out to merge .a files
  257. diff -ur cinelerra-2.1.orig/quicktime/configure cinelerra-2.1/quicktime/configure
  258. --- cinelerra-2.1.orig/quicktime/configure 2006-10-11 20:49:47.504720250 +0200
  259. +++ cinelerra-2.1/quicktime/configure 2006-10-11 20:52:02.413151500 +0200
  260. @@ -54,24 +54,12 @@
  261. # configure them all
  263. # version 2.0 of faad2 produced defective Makefile
  264. -cd faad2* && ./configure && sed 's/ /\t/' Makefile > Makefile2 && mv -f Makefile2 Makefile && cd ..
  265. +##cd faad2* && ./configure && sed 's/ /\t/' Makefile > Makefile2 && mv -f Makefile2 Makefile && cd ..
  267. -cd faac* && ./configure && cd ..
  268. -
  269. -cd ffmpeg* && ./configure && cd ..
  270. +##cd faac* && ./configure && cd ..
  272. cd x264* && ./configure --enable-pthread && cd ..
  274. -cd libdv* && ./configure --disable-gtk --enable-shared=no && cd ..
  275. -
  276. -cd libogg* && ./configure && cd ..
  277. -
  278. -LIBOGG_PATH=`expr libogg*` && \
  279. -cd libvorbis* && \
  280. -CFLAGS="-I../../$LIBOGG_PATH/include -L../../$LIBOGG_PATH/src/" ./configure --enable-shared=no&& \
  281. -cd ..
  282. -
  283. -
  285. if [ `arch` == i686 ];
  286. then
  287. diff -ur cinelerra-2.1.orig/quicktime/mp4a.c cinelerra-2.1/quicktime/mp4a.c
  288. --- cinelerra-2.1.orig/quicktime/mp4a.c 2006-10-11 20:49:53.981125000 +0200
  289. +++ cinelerra-2.1/quicktime/mp4a.c 2006-10-11 20:52:02.413151500 +0200
  290. @@ -10,7 +10,7 @@
  291. #undef LTP
  294. -#include "faad.h"
  295. +#include "neaacdec.h"
  296. #include "funcprotos.h"
  297. #include "quicktime.h"