[packages/cinelerra] - cinelerra ver. 4.4 - it builds but does not run yet (see plugins todo item) - removed bootstrap
wrobell
wrobell at pld-linux.org
Sat Sep 22 14:31:19 CEST 2012
commit cbf2308eb1fa3115e9e983ace87cc3fe919a35ef
Author: wrobell <wrobell at pld-linux.org>
Date: Sat Sep 22 13:29:20 2012 +0100
- cinelerra ver. 4.4 - it builds but does not run yet (see plugins todo
item)
- removed bootstrap todo item - seems to be obsolete
cinelerra-typo.patch | 11 +++++
cinelerra.spec | 128 +++++++++++++++++++++++++++++++--------------------
2 files changed, 90 insertions(+), 49 deletions(-)
---
diff --git a/cinelerra.spec b/cinelerra.spec
index 0b6c92e..39f0646 100644
--- a/cinelerra.spec
+++ b/cinelerra.spec
@@ -1,34 +1,45 @@
#
-# TODO:
+# imho, it is pointless to build this app with system libraries until we
+# start submitting patches to the author (is that possible with his
+# current development and release strategy?)... anyway, the todo follows
+# - make a patch for plugin dir in preferences.C, i.e.
+# get_exe_path(plugin_dir); -> sprintf(plugin_dir, PLUGIN_DIR);
+# or move plugins to %{_bindir}... otherwise you cannot run it
+# - review existing, but commented out patches
+# - send the existing patches to the author (so we do not have to maintain
+# them forever)
+# - build with set of current systems libs
+# - quicktime4linux seems to be dead as separate library, use the provided
+# one
# - build guicast as separate, shared library to use in xmovie,
# mix2005 and cinelerra
-# - get rid of bootstrap stuff:
-# https://init.linpro.no/pipermail/skolelinux.no/cinelerra/2004-April/001413.html
#
Summary: Cinelerra - capturing, editing and production of audio/video material
Summary(pl.UTF-8): Cinelerra - nagrywanie, obróbka i produkcja materiału audio/video
Name: cinelerra
-Version: 4.1
-Release: 4
+Version: 4.4
+Release: 0.1
License: GPL v2+
Group: X11/Applications
-Source0: http://dl.sourceforge.net/heroines/%{name}-%{version}-src.tar.bz2
-# Source0-md5: e489693cf7ccc98c46cbcf8f751210c3
+Source0: http://dl.sourceforge.net/heroines/%{name}-%{version}-src.tar.xz
+# Source0-md5: 252d811546025470ae4d7fa31c1f52d4
Patch0: %{name}-system-libs.patch
Patch1: %{name}-strip.patch
Patch2: %{name}-fontsdir.patch
Patch3: %{name}-locale_h.patch
Patch4: %{name}-guicast_bootstrap.patch
-Patch5: %{name}-fix.patch
Patch6: %{name}-libpng.patch
Patch7: %{name}-ffmpeg.patch
+Patch8: %{name}-typo.patch
+# see speech_tools package
+Patch9: %{name}-st.patch
URL: http://www.heroinewarrior.com/cinelerra.php
BuildRequires: OpenEXR-devel >= 1.6.1
BuildRequires: OpenGL-GLU-devel
BuildRequires: OpenGL-devel >= 2.0
BuildRequires: alsa-lib-devel >= 1.0.8
BuildRequires: bzip2-devel
-BuildRequires: esound-devel
+#x#BuildRequires: esound-devel
BuildRequires: ffmpeg-devel >= 0.6
BuildRequires: flac-devel >= 1.1.4
BuildRequires: freetype-devel >= 2.1.4
@@ -45,7 +56,7 @@ BuildRequires: libuuid-devel
%ifarch %{ix86}
BuildRequires: nasm
%endif
-BuildRequires: quicktime4linux-devel >= 2.3
+#x#BuildRequires: quicktime4linux-devel >= 2.3
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXv-devel
@@ -59,7 +70,7 @@ Requires: libmpeg3 >= 1.8
Requires: libraw1394 >= 1.2.0
Requires: libsndfile >= 1.0.11
Requires: libtheora >= 1.0-0.alpha4
-Requires: quicktime4linux >= 2.3
+#x#Requires: quicktime4linux >= 2.3
Obsoletes: bcast
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -91,57 +102,75 @@ Cinelerra była tworzona z myślą o zastąpieniu programu Broadcast 2000.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+#x#%patch0 -p1
+#x#%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+#x#%patch3 -p1
+#x#%patch4 -p1
+#x#%patch5 -p1
%patch6 -p0
-%patch7 -p1
+#x#%patch7 -p1
+%patch8 -p1
+%patch9 -p0
-# assume we have <linux/videodev2.h> and <linux/dvb/*> (present in llh)
-cat > hvirtual_config.h <<EOF
-#define HAVE_VIDEO4LINUX2
-#define HAVE_DVB
-#define HAVE_GL
-#define PACKAGE_STRING "cinelerra"
-EOF
+#x## assume we have <linux/videodev2.h> and <linux/dvb/*> (present in llh)
+#x#cat > hvirtual_config.h <<EOF
+#x##define HAVE_VIDEO4LINUX2
+#x##define HAVE_DVB
+#x##define HAVE_GL
+#x##define PACKAGE_STRING "cinelerra"
+#x#EOF
-%{__rm} -r libmpeg3 quicktime \
- thirdparty/{audiofile,esound,fftw-*,flac-*,freetype-*,ilmbase-*,libavc1394-*,libiec61883-*,libraw1394-*,libsndfile-*,libtheora-*,mjpegtools-*,openexr-*,tiff-*,uuid}
+#x#%{__rm} -r libmpeg3 quicktime \
+#x# thirdparty/{audiofile,esound,fftw-*,flac-*,freetype-*,ilmbase-*,libavc1394-*,libiec61883-*,libraw1394-*,libsndfile-*,libtheora-*,mjpegtools-*,openexr-*,tiff-*,uuid}
%build
export CFLAGS="%{rpmcflags}"
-%{__make} -f build/Makefile.toolame \
- STRIP="true" \
- GCC="%{__cc}"
-%{__make} -C mpeg2enc \
- STRIP="true" \
- CC="%{__cc}"
-%{__make} -C mplexlo \
- STRIP="true" \
- CC="%{__cc}"
-%{__make} -C guicast \
- STRIP="true" \
- GCC="%{__cc}" \
- CC="%{__cxx}"
-# cinelerra, defaulttheme and microtheme are stripped before running "bootstrap"
-%{__make} -C cinelerra \
- STRIP="true" \
- GCC="%{__cc}" \
- CC="%{__cxx}" \
- LINKER='%{__cxx} -o $(OUTPUT)'
-%{__make} -C plugins \
- STRIP="true" \
- CC="%{__cxx}" \
+#x#%{__make} -f build/Makefile.toolame \
+#x# STRIP="true" \
+#x# GCC="%{__cc}"
+#x#%{__make} -C mpeg2enc \
+#x# STRIP="true" \
+#x# CC="%{__cc}"
+#x#%{__make} -C mplexlo \
+#x# STRIP="true" \
+#x# CC="%{__cc}"
+#x#%{__make} -C guicast \
+#x# STRIP="true" \
+#x# GCC="%{__cc}" \
+#x# CC="%{__cxx}"
+#x## cinelerra, defaulttheme and microtheme are stripped before running "bootstrap"
+#x#%{__make} -C cinelerra \
+#x# STRIP="true" \
+#x# GCC="%{__cc}" \
+#x# CC="%{__cxx}" \
+#x# LINKER='%{__cxx} -o $(OUTPUT)'
+#x#%{__make} -C plugins \
+#x# STRIP="true" \
+#x# CC="%{__cxx}" \
+
+(
+ # to replace -ltermcap with -tncurses
+ cd thirdparty/speech_tools
+ rm ./config.cache
+ ./configure
+)
+
+./configure
+make
+
+(
+ # to link with libva
+ cd cinelerra
+ g++ -o ../bin/cinelerra `cat x86_64/objs` -lva
+)
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/cinelerra}
cp -a bin/* $RPM_BUILD_ROOT%{_libdir}/cinelerra
mv $RPM_BUILD_ROOT{%{_libdir}/cinelerra,%{_bindir}}/cinelerra
-rm -rf $RPM_BUILD_ROOT%{_libdir}/cinelerra/c_flags
+rm -r $RPM_BUILD_ROOT%{_libdir}/cinelerra/c_flags
%clean
rm -rf $RPM_BUILD_ROOT
@@ -152,3 +181,4 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/cinelerra
%dir %{_libdir}/cinelerra
%attr(755,root,root) %{_libdir}/cinelerra/*.plugin
+%{_libdir}/cinelerra/Cinelerra_plugins
diff --git a/cinelerra-typo.patch b/cinelerra-typo.patch
new file mode 100644
index 0000000..c7e4c0c
--- /dev/null
+++ b/cinelerra-typo.patch
@@ -0,0 +1,11 @@
+--- cinelerra-4.4.orig/quicktime/Makefile~ 2012-09-19 00:32:09.652662204 +0100
++++ cinelerra-4.4/quicktime/Makefile 2012-09-19 00:32:39.119331629 +0100
+@@ -262,7 +262,7 @@
+
+ all: $(OBJDIR) $(OUTPUT)
+
+-$(OUTPUT): $(OBJS) $(FFMPEG_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(LAME_OBJS) $(FAAD_LIB) $(FAAC_LIB) $(FFMPEG_LIB) $(X264_LIB) $(DV_LIB) $(JPEG_LIB) $(OGG_LIB)/ $(VORBIS_LIB)
++$(OUTPUT): $(OBJS) $(FFMPEG_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(LAME_OBJS) $(FAAD_LIB) $(FAAC_LIB) $(FFMPEG_LIB) $(X264_LIB) $(DV_LIB) $(JPEG_LIB) $(OGG_LIB) $(VORBIS_LIB)
+ find $(FFMPEG_DIR)/libavcodec/ -name *.o >> $(OBJDIR)/objs
+ find $(FFMPEG_DIR)/libavformat/ -name *.o >> $(OBJDIR)/objs
+ find $(FFMPEG_DIR)/libavutil/ -name *.o >> $(OBJDIR)/objs
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cinelerra.git/commitdiff/cbf2308eb1fa3115e9e983ace87cc3fe919a35ef
More information about the pld-cvs-commit
mailing list