[xiph-commits] r14978 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2008-05-28 07:32:10 -0700 (Wed, 28 May 2008)
New Revision: 14978

Modified:
   trunk/ffmpeg2theora/
   trunk/ffmpeg2theora/INSTALL
   trunk/ffmpeg2theora/SConstruct
Log:
options and install in scons script


Property changes on: trunk/ffmpeg2theora
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-05-28 12:49:07.861000061 +0200
committer: j
properties: 
	branch-nick: ffmpeg2theora

   + timestamp: 2008-05-28 13:13:29.579999924 +0200
committer: j
properties: 
	branch-nick: ffmpeg2theora

Name: bzr:revision-id:v3-single1-dHJ1bmsvZmZtcGVnMnRoZW9yYQ..
   - 191 j-20080517230830-he5x8v2m8yrfiw35
192 j-20080518224037-pkmoctzf4qce7tog
193 j-20080518224409-6hbfp3k2ssn6egqa
194 j-20080520111939-dhi52qwbqe7a47cu
195 j-20080523092252-gj9k9db0s67vl7dw
196 j-20080523092420-l0850yrq1qkgz9t0
197 j-20080523093057-l5g0ezzy5geu0pey
198 j-20080523094343-kcno1dm2e1lr38q4
199 j-20080523163006-kjl6ewea5sxawmq2
200 j-20080523165904-l2vm52qae0hlqkhp
201 j-20080523175432-2ed953iktnl8c7cr
202 j-20080525100939-7oja8pk08v9fquiw
203 j-20080526111321-nhzaqh6ivzn0vs7b
204 j-20080527100851-2v5eyxxrq1riqi50
205 j-20080527101341-9ynbgth2b15jw792
206 j-20080527205556-19tffvfrxgt3khld
207 j-20080527205840-zeestdde3v1zks9k
208 j-20080527210129-e73y56uwmzbcid00
209 j-20080527211813-5ll680ed1q4byp16
210 j-20080528102006-aeippim0tn70mz3f
211 j-20080528104907-40kiidjojvta8j61

   + 191 j-20080517230830-he5x8v2m8yrfiw35
192 j-20080518224037-pkmoctzf4qce7tog
193 j-20080518224409-6hbfp3k2ssn6egqa
194 j-20080520111939-dhi52qwbqe7a47cu
195 j-20080523092252-gj9k9db0s67vl7dw
196 j-20080523092420-l0850yrq1qkgz9t0
197 j-20080523093057-l5g0ezzy5geu0pey
198 j-20080523094343-kcno1dm2e1lr38q4
199 j-20080523163006-kjl6ewea5sxawmq2
200 j-20080523165904-l2vm52qae0hlqkhp
201 j-20080523175432-2ed953iktnl8c7cr
202 j-20080525100939-7oja8pk08v9fquiw
203 j-20080526111321-nhzaqh6ivzn0vs7b
204 j-20080527100851-2v5eyxxrq1riqi50
205 j-20080527101341-9ynbgth2b15jw792
206 j-20080527205556-19tffvfrxgt3khld
207 j-20080527205840-zeestdde3v1zks9k
208 j-20080527210129-e73y56uwmzbcid00
209 j-20080527211813-5ll680ed1q4byp16
210 j-20080528102006-aeippim0tn70mz3f
211 j-20080528104907-40kiidjojvta8j61
212 j-20080528111329-vkqbt7xkat2o9h4z


Modified: trunk/ffmpeg2theora/INSTALL
===================================================================
--- trunk/ffmpeg2theora/INSTALL	2008-05-28 14:31:55 UTC (rev 14977)
+++ trunk/ffmpeg2theora/INSTALL	2008-05-28 14:32:10 UTC (rev 14978)
@@ -23,19 +23,27 @@
  export PKG_CONFIG_PATH=/path/to/ffmpeg_src:$PKG_CONFIG_PATH
 
 now you can build ffmpeg2theora:
-./configure
-make
+ scons
 
+to make a static binary
+ scons static=1
+
+
 Installation
 ------------
+install ffmpeg2theora in /usr/local/bin:
 
-make install
+ scons install
 
-Unless you specify a different --prefix option to ./configure, you will
-need root privileges for this, ie.:
+Unless you specify a different prefix,
+you will need root privileges for this, ie.:
 
-sudo make install
+ sudo scons install
 
+to install to another prefix:
+
+ scons install prefix=/usr
+
 vhook suppport
 --------------
 

Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2008-05-28 14:31:55 UTC (rev 14977)
+++ trunk/ffmpeg2theora/SConstruct	2008-05-28 14:32:10 UTC (rev 14978)
@@ -8,21 +8,40 @@
 pkg_version="0.21+svn"
 pkg_name="ffmpeg2theora"
 
-#parse config variables
-static = False
+opts = Options()
+opts.AddOptions(
+  BoolOption('static', 'Set to 1 for static linking', 0),
+  ('prefix', 'install architecture-independent files in', '/usr/local'),
+  ('bindir', 'user executables', 'PREFIX/bin'),
+  ('mandir', 'man documentation', 'PREFIX/man'),
+  ('destdir', 'extra install time prefix', ''),
+  ('APPEND_CCFLAGS', 'Additional C/C++ compiler flags'),
+  ('APPEND_LINKFLAGS', 'Additional linker flags')
+)
+env = Environment(options = opts)
+Help(opts.GenerateHelpText(env))
 
-env = Environment()
 pkg_flags="--cflags --libs"
-if static:
+if env['static']:
   pkg_flags+=" --static"
   env.Append(LINKFLAGS=["-static"])
 
+prefix = env['prefix']
+if env['destdir']:
+  if prefix.startswith('/'): prefix = prefix[1:]
+  prefix = os.path.join(env['destdir'], prefix)
+man_dir = env['mandir'].replace('PREFIX', prefix)
+bin_dir = env['bindir'].replace('PREFIX', prefix)
+
 env.Append(CPPPATH=['.'])
 env.Append(CCFLAGS=[
-  '-DPACKAGE_VERSION=\\"%s\\"' %pkg_version,
-  '-DPACKAGE_STRING=\\"%s-%s\\"' %(pkg_name, pkg_version),
+  '-DPACKAGE_VERSION=\\"%s\\"' % pkg_version,
+  '-DPACKAGE_STRING=\\"%s-%s\\"' % (pkg_name, pkg_version),
   '-DPACKAGE=\\"%s\\"' % pkg_name,
 ])
+env.Append(CCFLAGS = Split('$APPEND_CCFLAGS'))
+env.Append(LINKFLAGS = Split('$APPEND_LINKFLAGS'))
+
 #if env['CC'] == 'gcc':
 #  env.Append(CCFLAGS=["-g", "-O2", "-Wall"])
 
@@ -90,3 +109,8 @@
 ffmpeg2theora = env.Copy()
 ffmpeg2theora_sources = glob('src/*.c')
 ffmpeg2theora.Program('ffmpeg2theora', ffmpeg2theora_sources)
+
+ffmpeg2theora.Install(bin_dir, 'ffmpeg2theora')
+ffmpeg2theora.Install(man_dir + "/man1", 'ffmpeg2theora.1')
+ffmpeg2theora.Alias('install', prefix)
+