benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge Lumiera renaming

Browse source
This commit is contained in:
Fischlurch 2008-03-10 09:28:58 +01:00
parent 71c7bd6a82
commit dc10c78a83
16 changed files with 62 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DIR_INFO
View file

@ -1 +1 @@
The root dir for the cinelerra3 project
The root dir for the Lumiera project

4
INSTALL
View file

@ -1,5 +1,5 @@
Running / Installing Cinelerra-3 Prototype
==========================================
Running / Installing Lumiera Prototype
======================================
** to be written **

11
LICENSE
View file

@ -1,17 +1,10 @@
The Cinelerra source code is (C) by the original authors (see AUTHORS)
The Lumiera source code is (C) by the original authors (see AUTHORS)
=======================================================================
Cinelerra is free software -- you may use and redistribute it under the
Lumiera is free software -- you may use and redistribute it under the
Terms and conditions of the GNU GENERAL PUBLIC LICENSE (GPL);
either version 2 of the License, or (at your option) any later version.
=======================================================================
For a copy of the GPL Version 2 see the file "COPYING"
In addition to the GPL's warranty stipulation, Cinelerra is distributed WITHOUT
GUARANTEED SUPPORT; without even the guarantee of ADDITIONAL LABOR. Support
that is not guaranteed includes technical support, compiler troubleshooting,
debugging, version matching, updating, among other additional labor which
may or may not be required to meet a user's requirements.

29
README
View file

@ -1,8 +1,8 @@
======================================
Cinelerra -- the video NLE for Linux
======================================
====================================
Lumiera -- the video NLE for Linux
====================================
Cinelerra is a nonlinear video editing and compositing tool.
Lumiera is a nonlinear video editing and compositing tool.
It understands some of the common multimedia formats
(quicktime, avi, ogg) and audio/video compression
codecs (divx, xvid, mpeg1/2/4, ...)
@ -12,23 +12,30 @@ Cinelerra -- the video NLE for Linux
and RGB-float colormodels and the ability to mix media
with differing sizes and framerates.
For more information about Lumiera visit http://lumiera.org/
For more information about Cinelerra visit http://cinelerra.org/
------------------------------
"Cinelerra-3" prototype code
------------------------------
----------------------------
"Lumiera" prototype code
----------------------------
**This source tree doesn't contain a working video editing application**
Rather, it contains some design studies and prototype code for improving
some aspects of the Cinelerra Application. This work may eventually
evolve into a new major release of Cinelerra.
**This source tree doesn't yet contain a working video editing application**
Rather, it contains the initial framework and core modules of the lower and
middle layer of the envisioned new Application "Lumiera".
As of 7/2007, we start here with some backend and render engine modules
together with some unit tests. You should find a wiki with detailed
design considerations and developer documentation and a UML model
(usable with BOUML 2.29) in the sibling directories.
As of 2/2008 the project has been separated completely from his ancestor "Cinelerra"
The Community, which is largely identical to the Cinelerra-CV community, choose the
new project name "Lumiera". The basic project infrastructure is up and running,
and work on the new codebase is going on continuosely. We can show nothing but
a running test suite for now.
Build Requirements
------------------

30
SConstruct
View file

@ -1,10 +1,10 @@
# -*- python -*-
##
## SConstruct - SCons based build-sytem for Cinelerra
## SConstruct - SCons based build-sytem for Lumiera
##
# Copyright (C) CinelerraCV
# 2007, Hermann Vosseler <Ichthyostega@web.de>
# Copyright (C) Lumiera.org
# 2008, Hermann Vosseler <Ichthyostega@web.de>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@ -61,7 +61,7 @@ def setupBasicEnvironment():
, SRCDIR=SRCDIR
, BINDIR=BINDIR
, CPPPATH=["#"+SRCDIR] # used to find includes, "#" means always absolute to build-root
, CPPDEFINES=['-DCINELERRA_VERSION='+VERSION ] # note: it's a list to append further defines
, CPPDEFINES=['-DLUMIERA_VERSION='+VERSION ] # note: it's a list to append further defines
, CCFLAGS='-Wall ' # -fdiagnostics-show-option
)
@ -134,7 +134,7 @@ def defineCmdlineOptions():
def prepareOptionsHelp(opts,env):
prelude = """
USAGE: scons [-c] [OPTS] [key=val [key=val...]] [TARGETS]
Build and optionally install Cinelerra.
Build and optionally install Lumiera.
Without specifying any target, just the (re)build target will run.
Add -c to the commandline to clean up anything a given target would produce
@ -234,21 +234,21 @@ def defineBuildTargets(env, artifacts):
We use a custom function to declare a whole tree of srcfiles.
"""
cinobj = ( srcSubtree(env,'$SRCDIR/backend')
lumobj = ( srcSubtree(env,'$SRCDIR/backend')
+ srcSubtree(env,'$SRCDIR/proc')
+ srcSubtree(env,'$SRCDIR/common')
+ srcSubtree(env,'$SRCDIR/lib')
)
plugobj = srcSubtree(env,'$SRCDIR/plugin', isShared=True)
core = env.StaticLibrary('$BINDIR/core.la', cinobj)
#core = cinobj # use this for linking directly
core = env.StaticLibrary('$BINDIR/core.la', lumobj)
#core = lumobj # use this for linking directly
# use PCH to speed up building
precomp = env.PrecompiledHeader('$SRCDIR/pre')
env.Depends(cinobj, precomp)
env.Depends(lumobj, precomp)
artifacts['cinelerra'] = env.Program('$BINDIR/cinelerra', ['$SRCDIR/main.cpp']+ core )
artifacts['plugins'] = env.SharedLibrary('$BINDIR/cinelerra-plugin', plugobj)
artifacts['lumiera'] = env.Program('$BINDIR/lumiera', ['$SRCDIR/main.cpp']+ core )
artifacts['plugins'] = env.SharedLibrary('$BINDIR/lumiera-plugin', plugobj)
# call subdir SConscript(s) for independent components
SConscript(dirs=[SRCDIR+'/tool'], exports='env artifacts')
@ -264,7 +264,7 @@ def definePostBuildTargets(env, artifacts):
il = env.Alias('install-lib', '$DESTDIR/lib')
env.Alias('install', [ib, il])
build = env.Alias('build', artifacts['cinelerra']+artifacts['plugins'])
build = env.Alias('build', artifacts['lumiera']+artifacts['plugins'])
allbu = env.Alias('allbuild', build+artifacts['testsuite'])
env.Default('build')
# additional files to be cleaned when cleaning 'build'
@ -286,11 +286,11 @@ def definePostBuildTargets(env, artifacts):
def defineInstallTargets(env, artifacts):
""" define some artifacts to be installed into target locations.
"""
env.Install(dir = '$DESTDIR/bin', source=artifacts['cinelerra'])
env.Install(dir = '$DESTDIR/bin', source=artifacts['lumiera'])
env.Install(dir = '$DESTDIR/lib', source=artifacts['plugins'])
env.Install(dir = '$DESTDIR/bin', source=artifacts['tools'])
env.Install(dir = '$DESTDIR/share/doc/cinelerra$VERSION/devel', source=artifacts['doxydoc'])
env.Install(dir = '$DESTDIR/share/doc/lumiera$VERSION/devel', source=artifacts['doxydoc'])
#####################################################################
@ -310,7 +310,7 @@ artifacts = {}
# the various things we build.
# Each entry actually is a SCons-Node list.
# Passing these entries to other builders defines dependencies.
# 'cinelerra' : the App
# 'lumiera' : the App
# 'plugins' : plugin shared lib
# 'tools' : small tool applications (e.g mpegtoc)
# 'src,tar' : source tree as tarball (without doc)

8
admin/scons/Buildhelper.py
View file

@ -3,8 +3,8 @@
## Buildhelper.py - helpers, custom builders, for SConstruct
##
# Copyright (C) CinelerraCV
# 2007, Hermann Vosseler <Ichthyostega@web.de>
# Copyright (C) Lumiera.org
# 2008, Hermann Vosseler <Ichthyostega@web.de>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@ -123,8 +123,8 @@ def Tarball(env,location,dirs,suffix=''):
"""
targetID = '../extern-tar%s' % suffix
versionID = env['VERSION']
defaultName = 'cinelerra%s_%s' % (suffix, versionID)
nameprefix = 'cinelerra-%s/' % (versionID)
defaultName = 'lumiera%s_%s' % (suffix, versionID)
nameprefix = 'lumiera-%s/' % (versionID)
location = env.subst(location)
dirs = env.subst(dirs)
return env.Command(targetID,None, createTarball,

2
bin/DIR_INFO
View file

@ -1 +1 @@
cinelerra executable(s) and libraries will be built here
Lumiera executable(s) and libraries will be built here

2
oldsrc/DIR_INFO
View file

@ -1 +1 @@
cinelerra2 sources, added per case when needed
Cinelerra2 sources, added per case when needed

2
src/lib/DIR_INFO
View file

@ -1,2 +1,2 @@
cinelerra support library
Lumiera support library
This dir contains the code for some tools and library code which will be used in many places

14
src/main.cpp
View file

@ -1,8 +1,8 @@
/*
main.cpp - start the Cinelerra Application
main.cpp - start the Lumiera Application
Copyright (C) CinelerraCV
2007, Christian Thaeter <ct@pipapo.org>
Copyright (C) Lumiera.org
2008, Christian Thaeter <ct@pipapo.org>
Hermann Vosseler <Ichthyostega@web.de>
This program is free software; you can redistribute it and/or
@ -23,14 +23,16 @@
#include <iostream>
#include "lumiera.h"
using std::cout;
using std::endl;
using lumiera::Appconfig;
int main (int argc, char* argv[])
{
cout << "*** Cinelerra NLE for Linux ***" << endl
<< " hello SCONS build system" << endl;
cout << "*** Lumiera NLE for Linux ***" << endl
<< " Version: " << Appconfig::get("version") << endl;
return 0;
}

6
src/nobugcfg.h
View file

@ -2,8 +2,8 @@
NOBUGCFG.h - global configuration and definitions for NoBug
Copyright (C) CinelerraCV
2007, Christian Thaeter <ct@pipapo.org>
Copyright (C) Lumiera.org
2008, Christian Thaeter <ct@pipapo.org>
Hermann Vosseler <Ichthyostega@web.de>
This program is free software; you can redistribute it and/or
@ -27,7 +27,7 @@
** The idea is that configuration and some globally used flag
** declarations are to be kept in one central location. Normally,
** this header will be included by appconfig.hpp, which in turn gets
** included by cinelerra.h
** included by lumiera.h
** @par Besides the usual guarded declarations, this header contains
** one section with the corresponding <b>definitions</b>. This section
** is to be called by appconfig.cpp only, which deals with application

4
src/plugin/helloplugin.c
View file

@ -1,12 +1,12 @@
/*
* hello.c - demonstrates how to build a standalone tool (C source)
* integrated into the SCons based build system of Cinelerra
* integrated into the SCons based build system of Lumiera
*/
#include <stdio.h>
int main(int argc, char* argv[])
{
printf("hello cinelerra world");
printf("hello lumiera world");
return 0;
}

2
src/tool/DIR_INFO
View file

@ -1 +1 @@
source code of supplementary tools to be built alongside with Cinelerra
source code of supplementary tools to be built alongside with Lumiera

4
src/tool/SConscript
View file

@ -5,10 +5,6 @@
Import('env','artifacts')
# at the moment (8/07), Ichthyo tries to find out how to configure NoBug
# does it help, if we set the NOBUG_LOG to the environment used for building??
env = env.Clone()
env['ENV']['NOBUG_LOG'] = 'ttt:WARNING'
# build the ubiquitous Hello World application (note: C source)
artifacts['tools'] = [ env.Program('#$BINDIR/hello-world','hello.c')

4
src/tool/hello.c
View file

@ -1,12 +1,12 @@
/*
* hello.c - demonstrates how to build a standalone tool (C source)
* integrated into the SCons based build system of Cinelerra
* integrated into the SCons based build system of Lumiera
*/
#include <stdio.h>
int main(int argc, char* argv[])
{
printf("hello cinelerra world");
printf("hello lumiera world");
return 0;
}

2
tests/test.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (C) CinelerraCV
# Copyright (C) Lumiera.org
# 2007, Christian Thaeter <ct@pipapo.org>
# Hermann Vosseler <Ichthyostega@web.de>
#