Am Donnerstag, 7. September 2006 23:10 schrieb Johannes Sixt:
> Subject says it all. Awaiting your feedback.
Great work! Here are a few thing I had to change against revision 870 to get
cinelerra installed as an RPM package on SuSE 10.1 x86_64. There are some
issues which didn't prevent installation but might cause problems:
*) The previous spec-file tried to create a symlink from "/usr/bin/mpeg2enc",
but I couldn't find this program in SuSE 10.1 and the cinelerra tree.
*) There is an incompatibility between versions 46 and 48 of the x264 library
(I didn't check version 47 to see if it is affected as well), but I don't
exactly understand the change between these. Maybe somebody who is familiar
with x264 can have a look at the proposed patch and correct it if necessary.
Aside from that, cinelerra works as expected.
Kind regards,
Markus
--
Markus Grabner - Computer Graphics and Vision
Graz University of Technology, Inffeldgasse 16a/II, 8010 Graz, Austria
Phone: +43/316/873-5041, Fax: +43/316/873-5050
WWW: http://www.icg.tu-graz.ac.at/Members/grabner
Index: plugins/histogram/Makefile.am
===================================================================
--- plugins/histogram/Makefile.am (revision 870)
+++ plugins/histogram/Makefile.am (working copy)
@@ -8,6 +8,7 @@
LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTCXX_FLAGS)
noinst_HEADERS = \
+ aggregated.h \
histogram.h histogramconfig.h histogramwindow.h \
histogram.inc histogramconfig.inc histogramwindow.inc \
max_picon_png.h mid_picon_png.h min_picon_png.h picon_png.h
Index: configure.in
===================================================================
--- configure.in (revision 870)
+++ configure.in (working copy)
@@ -1,4 +1,4 @@
-AC_INIT(Cinelerra, 2.0)
+AC_INIT(Cinelerra, 2.1)
AC_CANONICAL_SYSTEM
Index: quicktime/qth264.c
===================================================================
--- quicktime/qth264.c (revision 870)
+++ quicktime/qth264.c (working copy)
@@ -138,7 +138,11 @@
x264_param_t default_params;
x264_param_default(&default_params);
// Reset quantizer if fixed bitrate
+#if X264_BUILD >= 48
+ if(codec->param.rc.i_rc_method == X264_RC_ABR)
+#else
if(codec->param.rc.b_cbr)
+#endif
{
codec->param.rc.i_qp_constant = default_params.rc.i_qp_constant;
codec->param.rc.i_qp_min = default_params.rc.i_qp_min;
@@ -471,7 +475,11 @@
}
else
if(!strcasecmp(key, "h264_fix_bitrate"))
+#if X264_BUILD >= 48
+ codec->param.rc.i_bitrate = (*(int*)value) / 1000;
+#else
codec->param.rc.b_cbr = (*(int*)value) / 1000;
+#endif
}
}
Index: quicktime/ffmpeg/libavcodec/x264.c
===================================================================
--- quicktime/ffmpeg/libavcodec/x264.c (revision 870)
+++ quicktime/ffmpeg/libavcodec/x264.c (working copy)
@@ -136,7 +136,11 @@
x4->params.rc.i_bitrate = avctx->bit_rate / 1000;
x4->params.rc.i_vbv_buffer_size = avctx->rc_buffer_size / 1000;
if(avctx->rc_buffer_size)
+#if X264_BUILD >= 48
+ x4->params.rc.i_rc_method = X264_RC_ABR;
+#else
x4->params.rc.b_cbr = 1;
+#endif
x4->params.i_bframe = avctx->max_b_frames;
x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
Index: guicast/Makefile.am
===================================================================
--- guicast/Makefile.am (revision 870)
+++ guicast/Makefile.am (working copy)
@@ -93,6 +93,7 @@
bcfilebox.inc \
bchash.h \
bchash.inc \
+ bcipc.h \
bclistbox.h \
bclistbox.inc \
bclistboxitem.h \
@@ -144,8 +145,8 @@
bcsynchronous.inc \
bctextbox.h \
bctextbox.inc \
- bctextbox.h \
- bctextbox.inc \
+ bctexture.h \
+ bctexture.inc \
bctheme.h \
bctheme.inc \
bctimer.h \
Index: cinelerra-cvs-current.spec.in
===================================================================
--- cinelerra-cvs-current.spec.in (revision 870)
+++ cinelerra-cvs-current.spec.in (working copy)
@@ -1,5 +1,5 @@
# This is not relocatable
-%define prefix /usr
+%define _prefix /usr
Summary: Cinelerra CVS
Name: cinelerra
@@ -26,20 +26,20 @@
%setup -n [EMAIL PROTECTED]@
%build
-./configure --prefix=%{prefix} --enable-freetype2
+%configure --enable-freetype2 --enable-opengl
#./configure
%{__make} %{?_smp_mflags} %{?mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+DESTDIR=$RPM_BUILD_ROOT make prefix=$RPM_BUILD_ROOT%{_prefix} install
# rename the mpeg3 utils so they can be installed alongside SuSE native versions
-( cd $RPM_BUILD_ROOT%{prefix}/bin
+( cd $RPM_BUILD_ROOT%{_bindir}
mv mpeg3toc mpeg3toc.hv
mv mpeg3cat mpeg3cat.hv
mv mpeg3dump mpeg3dump.hv
-# cd $RPM_BUILD_ROOT%{prefix}/lib
- ln -s /usr/bin/mpeg2enc $RPM_BUILD_ROOT%{prefix}/lib/cinelerra/mpeg2enc.plugin
+# cd $RPM_BUILD_ROOT%{_prefix}/lib
+# ln -s /usr/bin/mpeg2enc $RPM_BUILD_ROOT%{_prefix}/lib/cinelerra/mpeg2enc.plugin
)
%clean
@@ -48,42 +48,42 @@
%files
%defattr(-,root,root,-)
%doc
-#%{prefix}/bin/*
-%{prefix}/bin/cinelerra
+#%{_bindir}/*
+%{_bindir}/cinelerra
# missing in the 2.0 build?
-#%{prefix}/bin/mplexhi
-%{prefix}/bin/mplexlo
+#%{_bindir}/mplexhi
+%{_bindir}/mplexlo
-#%exclude %{prefix}/bin/mpeg3dump
-#%exclude %{prefix}/bin/mpeg3toc
-#%exclude %{prefix}/bin/mpeg3cat
-%{prefix}/bin/mpeg3dump.hv
-%{prefix}/bin/mpeg3toc.hv
-%{prefix}/bin/mpeg3cat.hv
-#%{prefix}/lib/*
-%{prefix}/share/locale/*
-%exclude %{prefix}/include/*
+#%exclude %{_bindir}/mpeg3dump
+#%exclude %{_bindir}/mpeg3toc
+#%exclude %{_bindir}/mpeg3cat
+%{_bindir}/mpeg3dump.hv
+%{_bindir}/mpeg3toc.hv
+%{_bindir}/mpeg3cat.hv
+#%{_prefix}/lib/*
+%{_prefix}/share/locale/*
+%exclude %{_prefix}/include/*
-%{prefix}/lib/cinelerra/*.so
-%{prefix}/lib/cinelerra/mpeg2enc.plugin
-%{prefix}/lib/cinelerra/shapewipe/*
+%{_prefix}/lib/cinelerra/*.so
+#%{_prefix}/lib/cinelerra/mpeg2enc.plugin
+%{_prefix}/lib/cinelerra/shapewipe/*
# remove below for no static libs
-# %exclude %{prefix}/lib/cinelerra/*.a
-%exclude %{prefix}/lib/cinelerra/*.la
+# %exclude %{_prefix}/lib/cinelerra/*.a
+%exclude %{_prefix}/lib/cinelerra/*.la
-%{prefix}/lib/cinelerra/fonts/*
+%{_prefix}/lib/cinelerra/fonts/*
-%{prefix}/lib/libguicast*
-%{prefix}/lib/libmpeg3hv*
-%{prefix}/lib/libquicktimehv*
+%{_libdir}/libguicast*
+%{_libdir}/libmpeg3hv*
+%{_libdir}/libquicktimehv*
# missing in 2.0
-#%{prefix}/lib/libsndfilehv*
-#%{prefix}/lib/pkgconfig*
+#%{_libdir}/libsndfilehv*
+#%{_libdir}/pkgconfig*
-%{prefix}/share/applications/cinelerra.desktop
-%{prefix}/share/pixmaps/cinelerra.xpm
+%{_prefix}/share/applications/cinelerra.desktop
+%{_prefix}/share/pixmaps/cinelerra.xpm
%changelog
