From b2334715cf9ddc754add796eb3342334660af1af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 May 2013 22:05:17 +0100 Subject: Try to put all platform stuff in platform/ --- platform/linux/control-12.04-32 | 24 ++++++++++++++++++++++++ platform/linux/control-12.04-64 | 24 ++++++++++++++++++++++++ platform/linux/control-12.10-32 | 23 +++++++++++++++++++++++ platform/linux/control-12.10-64 | 24 ++++++++++++++++++++++++ 4 files changed, 95 insertions(+) create mode 100644 platform/linux/control-12.04-32 create mode 100644 platform/linux/control-12.04-64 create mode 100644 platform/linux/control-12.10-32 create mode 100644 platform/linux/control-12.10-64 (limited to 'platform/linux') diff --git a/platform/linux/control-12.04-32 b/platform/linux/control-12.04-32 new file mode 100644 index 000000000..0f52d03ae --- /dev/null +++ b/platform/linux/control-12.04-32 @@ -0,0 +1,24 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: i386 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: i386 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. + diff --git a/platform/linux/control-12.04-64 b/platform/linux/control-12.04-64 new file mode 100644 index 000000000..fa4b4476e --- /dev/null +++ b/platform/linux/control-12.04-64 @@ -0,0 +1,24 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: amd64 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: amd64 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. + diff --git a/platform/linux/control-12.10-32 b/platform/linux/control-12.10-32 new file mode 100644 index 000000000..0e5fc1f46 --- /dev/null +++ b/platform/linux/control-12.10-32 @@ -0,0 +1,23 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: i386 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: i386 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. diff --git a/platform/linux/control-12.10-64 b/platform/linux/control-12.10-64 new file mode 100644 index 000000000..24e16b4b5 --- /dev/null +++ b/platform/linux/control-12.10-64 @@ -0,0 +1,24 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: amd64 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: amd64 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. + -- cgit v1.2.3 From 260747962d87ed12115e940f7a9e86fcf7983ea4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 30 May 2013 20:02:01 +0100 Subject: Try to move Linux desktop files into platform/ --- dvdomatic.desktop.in | 10 --------- dvdomatic_batch.desktop.in | 10 --------- platform/linux/dvdomatic.desktop.in | 10 +++++++++ platform/linux/dvdomatic_batch.desktop.in | 10 +++++++++ platform/linux/servomatic.desktop.in | 10 +++++++++ platform/linux/wscript | 19 +++++++++++++++++ servomatic.desktop.in | 10 --------- wscript | 35 ++++++++++--------------------- 8 files changed, 60 insertions(+), 54 deletions(-) delete mode 100644 dvdomatic.desktop.in delete mode 100644 dvdomatic_batch.desktop.in create mode 100644 platform/linux/dvdomatic.desktop.in create mode 100644 platform/linux/dvdomatic_batch.desktop.in create mode 100644 platform/linux/servomatic.desktop.in create mode 100644 platform/linux/wscript delete mode 100644 servomatic.desktop.in (limited to 'platform/linux') diff --git a/dvdomatic.desktop.in b/dvdomatic.desktop.in deleted file mode 100644 index 65067eb3b..000000000 --- a/dvdomatic.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Exec=@PREFIX@/bin/dvdomatic -Name=DVD-o-matic -Icon=dvdomatic -Comment=DCP generator -Categories=AudioVideo;Video diff --git a/dvdomatic_batch.desktop.in b/dvdomatic_batch.desktop.in deleted file mode 100644 index 8150fe849..000000000 --- a/dvdomatic_batch.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Exec=@PREFIX@/bin/dvdomatic_batch -Name=DVD-o-matic Batch Converter -Icon=dvdomatic -Comment=Batch DCP generator -Categories=AudioVideo;Video diff --git a/platform/linux/dvdomatic.desktop.in b/platform/linux/dvdomatic.desktop.in new file mode 100644 index 000000000..65067eb3b --- /dev/null +++ b/platform/linux/dvdomatic.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@PREFIX@/bin/dvdomatic +Name=DVD-o-matic +Icon=dvdomatic +Comment=DCP generator +Categories=AudioVideo;Video diff --git a/platform/linux/dvdomatic_batch.desktop.in b/platform/linux/dvdomatic_batch.desktop.in new file mode 100644 index 000000000..8150fe849 --- /dev/null +++ b/platform/linux/dvdomatic_batch.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@PREFIX@/bin/dvdomatic_batch +Name=DVD-o-matic Batch Converter +Icon=dvdomatic +Comment=Batch DCP generator +Categories=AudioVideo;Video diff --git a/platform/linux/servomatic.desktop.in b/platform/linux/servomatic.desktop.in new file mode 100644 index 000000000..572b4c64c --- /dev/null +++ b/platform/linux/servomatic.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@PREFIX@/bin/servomatic_gui +Name=DVD-o-matic Encode Server +Icon=dvdomatic +Comment=DCP generator +Categories=AudioVideo;Video diff --git a/platform/linux/wscript b/platform/linux/wscript new file mode 100644 index 000000000..1d9054b32 --- /dev/null +++ b/platform/linux/wscript @@ -0,0 +1,19 @@ +def build(bld): + d = { 'PREFIX' : '${PREFIX' } + + obj = bld(features = 'subst') + obj.source = 'dvdomatic.desktop.in' + obj.target = 'dvdomatic.desktop' + obj.dict = d + + obj = bld(features = 'subst') + obj.source = 'dvdomatic_batch.desktop.in' + obj.target = 'dvdomatic_batch.desktop' + obj.dict = d + + obj = bld(features = 'subst') + obj.source = 'servomatic.desktop.in' + obj.target = 'servomatic.desktop' + obj.dict = d + + bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop', 'servomatic.desktop']) diff --git a/servomatic.desktop.in b/servomatic.desktop.in deleted file mode 100644 index 572b4c64c..000000000 --- a/servomatic.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Exec=@PREFIX@/bin/servomatic_gui -Name=DVD-o-matic Encode Server -Icon=dvdomatic -Comment=DCP generator -Categories=AudioVideo;Video diff --git a/wscript b/wscript index 9a7cedab9..fb2a838df 100644 --- a/wscript +++ b/wscript @@ -9,12 +9,13 @@ def options(opt): opt.load('compiler_cxx') opt.load('winres') - opt.add_option('--enable-debug', action='store_true', default = False, help = 'build with debugging information and without optimisation') - opt.add_option('--disable-gui', action='store_true', default = False, help = 'disable building of GUI tools') - opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows') - opt.add_option('--static', action='store_true', default = False, help = 'build statically, and link statically to libdcp and FFmpeg') - opt.add_option('--magickpp-config', action='store', default='Magick++-config', help = 'path to Magick++-config') - opt.add_option('--wx-config', action='store', default='wx-config', help = 'path to wx-config') + opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') + opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') + opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows') + opt.add_option('--static', action='store_true', default=False, help='build statically, and link statically to libdcp and FFmpeg') + opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config') + opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config') + opt.add_option('--osx', action='store_true', default=False, help='build on OS X') def configure(conf): conf.load('compiler_cxx') @@ -51,6 +52,8 @@ def configure(conf): conf.env.DISABLE_GUI = conf.options.disable_gui conf.env.STATIC = conf.options.static conf.env.VERSION = VERSION + conf.env.TARGET_OSX = conf.options.osx + conf.env.TARGET_LINUX = not conf.options.target_windows and not conf.options.osx if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG']) @@ -193,25 +196,9 @@ def build(bld): bld.recurse('test') if bld.env.TARGET_WINDOWS: bld.recurse('platform/windows') + if bld.env.TARGET_LINUX: + bld.recurse('platform/linux') - d = { 'PREFIX' : '${PREFIX' } - - obj = bld(features = 'subst') - obj.source = 'dvdomatic.desktop.in' - obj.target = 'dvdomatic.desktop' - obj.dict = d - - obj = bld(features = 'subst') - obj.source = 'dvdomatic_batch.desktop.in' - obj.target = 'dvdomatic_batch.desktop' - obj.dict = d - - obj = bld(features = 'subst') - obj.source = 'servomatic.desktop.in' - obj.target = 'servomatic.desktop' - obj.dict = d - - bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop', 'servomatic.desktop']) for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) -- cgit v1.2.3