Thank's for the compile error report... I assume j6t will fix this soon.
If people like test-compiling code, here are some instructions on how
you could help j6t and myself by doing so.
1. Install git, cogito
2. make an empty directory
3. within this directory, follow these commands:
cg-init
# Type ":wq" in vi to save an initial commit, (which is empty)
# Now what the next lines do is declares remote branches to your git
repository according to
# cg-branch-add <localbranchname> <remoteURL>
cg-branch-add svn-plan-linear
http://cvs.cinelerra.org/~j6t/cinelerra2.git#svn-plan-linear
cg-branch-add svn-planj6t
http://cvs.cinelerra.org/~j6t/cinelerra2.git#svn-planj6t
cg-branch-add svn-linearpmd
http://cvs.cinelerra.org/~pmdumuid/2.0_to_2.1_notes/git.pmd_cin#svn-linearpmd
# After declaring the remote branches, you then need to fetch the latest
updates for each of these branches:
# (note, these could be bandwidth intensive!!)
cg-fetch svn-plan-linear
cg-fetch svn-planj6t
cg-fetch svn-linearpmd
# Now your master is currently on your empty repository, (so you'll
likely see no changes in your dir)
# Perform the following:
git-update-ref refs/heads/master 7e637073eb
cg-reset
cg-clean
# Your master is now on commit 7e637073eb (which is r852 for the real SVN)
# Now fire up gitk:
gitk
# and select
# View-> New View...
# Name: svn-plans
# [x] remember this view
# Commits to include: svn-plan-linear svn-planj6t svn-linearpmd
# Now after you've switched to that view, here is what you are seeing in
git:
# (type the SHA1 ID's into the textbox in gitk to jump quickly to these
commits)
# fc8df179735c7f1ee58737cdf6078b51184adcdd
# - this is the last commit in SVN before j6t and I started the merge,
(it is that patch that people had
# errors compiling!)
# b85916e7118ac4f2163dc1822179d0283ef9b2f5 -> svn-plan-linear
# - this is a branch is the svn-plan-linear branch. This branch
contains a heap of commits that were formed
# that should cover all the new features in 2.1
# ( we actually jointly developed these patches on another commit branch at
# http://cvs.cinelerra.org/~j6t/cinelerra2.git#svn-plan )
# 93a8e83215efb356539eab47042b1c468ead51ae -> svn-planj6t
# - this branch is a re-ordering (and re-fining) of the commits on
svn-plan-linear branch
# It is from this branch that we are pushing into the SVN
# As both j6t and myself are on the job, sometimes (in Aussie time) I'll
look at collating some patches
# together for j6t to review and place in his svn-planj6t branch. This
is what the svn-linearpmd branch
# is about.
# of course, these branches are updated on a {bi,tri,dec...}-daily
basis, so you'll need to
# perform cg-fetch to bring your local git up-to-date with ours...
# o.k. after that tour, here's how to test compile for us:
# you are currently at 7e637073eb,
# perform your standard: ./autogen; ./configure; make; make install
# hopefully this should work!
# if it does, then you can test another commit for us, say 2cc60c1, to
try this commit out:
./cms_movelocalmaster 2cc60c10aba # this updates the master reference only!
cg-reset # this actually sync's the files in
the repo
make; make install
# and so forth. Note, that if you go onto the svn-plan-linear branch,
instead of typing:
# ./cms_movelocalmaster ...
# you should type
# git-update-ref refs/heads/master ...
# if you manage to run-across a commit that is bad, you could email us
and let us know which commit doesn't compile for you...
# that way we don't commit non-compiling commits to SVN :) !
Note:
The above instructions were written without testing, (I didn't want to
chew my bandwidth just for a demo!)
the above steps could possibly need refining!
Oh, HV, if you're listening in, there's a branch especially for you:
cg-branch-add pmd-ee
git+ssh://cvs.cinelerra.org/home/pmdumuid/cinelerra.git#embraceextend
This branch contains a series of commits that you might want to get.
(I'll also assume you didn't read this whole email, and will send you a
private email later)
Cheers,
Pierre
Bas Alphenaar wrote:
How did you manage to compile r845? I get this error:
if g++ -DHAVE_CONFIG_H -I. -I. -I.. -I../quicktime -I../guicast
-I../libmpeg3 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -DHAVE_ALSA -DHAVE_OSS
-I/usr/include/mjpegtools -I/usr/include/mjpegtools/mpeg2enc
-I/usr/include/mjpegtools/mplex -I/usr/include/OpenEXR
-DPLUGIN_DIR=\"/usr/local/lib/cinelerra\" -g -O2 -MT videodevice.o -MD
-MP -MF ".deps/videodevice.Tpo" \
-c -o videodevice.o `test -f 'videodevice.C' || echo
'./'`videodevice.C; \
then mv -f ".deps/videodevice.Tpo" ".deps/videodevice.Po"; \
else rm -f ".deps/videodevice.Tpo"; exit 1; \
fi
videodevice.C: In constructor ‘VideoDevice::VideoDevice(MWindow*)’:
videodevice.C:110: error: invalid use of undefined type ‘struct MWindow’
mwindow.inc:16: error: forward declaration of ‘struct MWindow’
make[3]: *** [videodevice.o] Error 1
make[3]: Leaving directory `/home/bas/Desktop/hvirtual/cinelerra'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/bas/Desktop/hvirtual/cinelerra'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/bas/Desktop/hvirtual'
make: *** [all] Error 2
_______________________________________________
Cinelerra mailing list
[email protected]
https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
_______________________________________________
Cinelerra mailing list
[email protected]
https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
