-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hello Einar,
Today I tried to compile your git repo on my gentoo box (64 bit) and
succeeded only after the following steps:
1. Fixing admin/nasm script
Line 29 causes trouble as there is an unexpected "$". In my git repo I
resolved this problem by removing the dollar sign,[1] however escaping it
("\$") works as well.
Currently I have no idea what this file actually is required for,
especially the fact that it is unchanged since 2003 and contains mainly
hardcoded output created by libtool 1.5.0a (I'm on 2.2.10 here!) makes me
wonder. In case anyone knows, please speak up!
2. Fix shapewipe / libpng 1.4.x incompability.
libpng 1.4 does not define png_voidp_NULL, png_error_ptr_NULL and
png_infopp_NULL anymore. They have to be replaced by plain NULL, as already
fixed in my git repo.[2]
It is extremely likely that everyone trying to compile cinelerra against a
libpng 1.4 will run into these troubles.
3. Update po/POTFILES.in
A commit from August 2010 [3] removed cinelerra/assetremove.* from your
repo. However cinelerra/assetremove.C is still listed in po/POTFILES.in
which causes compilation to fail. However, this is not the only file which
has been forgotten to be commented out in po/POTFILES.in, for me
compilation of a fresh "git clone ..." worked after removing/commenting out
the following files from po/POTFILES.in:
cinelerra/assetremove.C
cinelerra/avc1394transport.C
cinelerra/confirmquit.C
cinelerra/labelnavigate.C
cinelerra/messages.C
cinelerra/recconfirmdelete.C
cinelerra/threadindexer.C
plugins/blurzoom/blurzoom.C
plugins/blurzoom/blurzoomwindow.C
plugins/interpolateall/interpolateall.C
plugins/quark/quark.C
plugins/quark/quarkwindow.C
I have attached the corresponding commit.
I would really appreciate if you could merge these fixes into your git repo.
Regards,
Simeon
References:
[1]
http://git.cinelerra.org/gitweb?p=sv/cinelerra.git;a=blobdiff;f=admin/nasm;h=4ff0a9d21e28ce2eb454f568ff9e57e2e75a6b33;hp=108f79dfeab4a790f0f3a0f90fc34953725cf1f7;hb=b14a3274c06b2a35e8f7c0aa3d7057e6992f0369;hpb=2f323240bd9bfb8cf44cebf5c4380df133b6ace2
[2]
http://git.cinelerra.org/gitweb?p=sv/cinelerra.git;a=blobdiff;f=plugins/shapewipe/shapewipe.C;h=fc8c7377477f6af5208af1cd6b34a7b207986aff;hp=2032aaa3eae38c78c9cf7338cc34771e2a44685d;hb=2f323240bd9bfb8cf44cebf5c4380df133b6ace2;hpb=86062fa76144e1ed04f55d8223dbd70db3707b95
[3]
http://git.cinelerra.org/gitweb?p=einar/cinelerra.git;a=commit;h=994d2d09912798dd3520da35f9037be40268b2df
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.16 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkzB1BgACgkQph/voQkhF7yAlACgiwkHHYzZYnsPyVGYJsEIkc9D
IdMAn20wjOOXPERbeYUdXk4i/69oXrV8
=SJ9l
-END PGP SIGNATURE-
commit 35f6cf8362d7f4c5716e5e15cc580f87db012599
Author: Simeon Voelkel
Date: Fri Oct 22 19:59:08 2010 +0200
update po/POTFILES.in to reflect deletion of files
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 05cb819..099588c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,9 +6,9 @@ cinelerra/apatchgui.C
cinelerra/assetedit.C
cinelerra/assetedit.h
cinelerra/assetpopup.C
-cinelerra/assetremove.C
+# cinelerra/assetremove.C
cinelerra/atrack.C
-cinelerra/avc1394transport.C
+# cinelerra/avc1394transport.C
cinelerra/awindowgui.C
cinelerra/awindowmenu.C
cinelerra/batch.C
@@ -20,7 +20,7 @@ cinelerra/channeledit.C
cinelerra/channelpicker.C
cinelerra/clipedit.C
# cinelerra/compresspopup.C
-cinelerra/confirmquit.C
+# cinelerra/confirmquit.C
cinelerra/confirmsave.C
cinelerra/cpanel.C
# cinelerra/cropvideo.C
@@ -56,7 +56,7 @@ cinelerra/indexfile.C
cinelerra/indexthread.C
cinelerra/interfaceprefs.C
cinelerra/keyframepopup.C
-cinelerra/labelnavigate.C
+# cinelerra/labelnavigate.C
cinelerra/loadfile.C
cinelerra/loadmode.C
cinelerra/main.C
@@ -65,7 +65,7 @@ cinelerra/mainmenu.C
cinelerra/mainprogress.C
cinelerra/manualgoto.C
cinelerra/menueffects.C
-cinelerra/messages.C
+# cinelerra/messages.C
cinelerra/meterpanel.C
cinelerra/mwindow.C
cinelerra/mwindowedit.C
@@ -86,7 +86,7 @@ cinelerra/pluginpopup.C
cinelerra/preferencesthread.C
cinelerra/question.C
cinelerra/quit.C
-cinelerra/recconfirmdelete.C
+# cinelerra/recconfirmdelete.C
cinelerra/record.C
cinelerra/recordaudio.C
# cinelerra/recordengine.C
@@ -95,7 +95,7 @@ cinelerra/recordmonitor.C
cinelerra/recordprefs.C
cinelerra/recordtransport.C
cinelerra/recordvideo.C
-cinelerra/recordwindow.C
+# cinelerra/recordwindow.C
# cinelerra/reindex.C
cinelerra/render.C
cinelerra/renderfarm.C
@@ -109,7 +109,7 @@ cinelerra/setformat.C
cinelerra/sharedlocation.C
cinelerra/splashgui.C
cinelerra/statusbar.C
-cinelerra/threadindexer.C
+# cinelerra/threadindexer.C
cinelerra/tipwindow.C
# cinelerra/toggleauto.C
cinelerra/trackcanvas.C
@@ -135,8 +135,8 @@ plugins/bandslide/bandslide.C
plugins/bandwipe/bandwipe.C
plugins/blur/blur.C
plugins/blur/blurwindow.C
-plugins/blurzoom/blurzoom.C
-plugins/blurzoom/blurzo
