diff options
92 files changed, 99 insertions, 97 deletions
diff --git a/cerbero/build/cookbook.py b/cerbero/build/cookbook.py index d60fa7a7..38949764 100644 --- a/cerbero/build/cookbook.py +++ b/cerbero/build/cookbook.py @@ -21,7 +21,7 @@ import pickle import time from cerbero.config import CONFIG_DIR, Platform, Architecture, Distro,\ - DistroVersion + DistroVersion, License from cerbero.build.build import BuildType from cerbero.build.source import SourceType from cerbero.errors import FatalError, RecipeNotFoundError, InvalidRecipeError @@ -304,6 +304,7 @@ class CookBook (object): d = {'Platform': Platform, 'Architecture': Architecture, 'BuildType': BuildType, 'SourceType': SourceType, 'Distro': Distro, 'DistroVersion': DistroVersion, + 'License': License, 'recipe': crecipe, 'os': os, 'BuildSteps': crecipe.BuildSteps, 'InvalidRecipeError': InvalidRecipeError} execfile(filepath, d) diff --git a/cerbero/commands/info.py b/cerbero/commands/info.py index 7e7f7b1c..ff7a78fd 100644 --- a/cerbero/commands/info.py +++ b/cerbero/commands/info.py @@ -17,6 +17,7 @@ # Boston, MA 02111-1307, USA. from cerbero.commands import Command, register_command +from cerbero.enums import License from cerbero.utils import _, N_, ArgparseArgument from cerbero.utils import messages as m from cerbero.packages.packagesstore import PackagesStore @@ -53,7 +54,8 @@ class PackageInfo(Command): else: p = store.get_package(p_name) d = {'name': p.name, 'version': p.version, 'url': p.url, - 'licenses': ' '.join(p.licenses), 'desc': p.shortdesc, + 'licenses': ' '.join([l.acronym for l in p.licenses]), + 'desc': p.shortdesc, 'deps': ', '.join([p.name for p in store.get_package_deps(p_name, True)])} m.message(INFO_TPL % d) diff --git a/cerbero/config.py b/cerbero/config.py index 7c356557..c2511c85 100644 --- a/cerbero/config.py +++ b/cerbero/config.py @@ -42,6 +42,7 @@ Platform = enums.Platform Architecture = enums.Architecture Distro = enums.Distro DistroVersion = enums.DistroVersion +License = enums.License class Config (object): diff --git a/cerbero/packages/debian.py b/cerbero/packages/debian.py index e579d6d7..23f425fa 100644 --- a/cerbero/packages/debian.py +++ b/cerbero/packages/debian.py @@ -89,8 +89,8 @@ License: %(licenses)s -On Debian systems, the complete text of the license(s) can be found in -%(licenses_locations)s. +On Debian systems, the complete text of common license(s) can be found in +/usr/share/common-licenses/. ''' @@ -333,10 +333,7 @@ class DebianPackager(LinuxPackager): args = {} args['packager'] = self.packager args['datetime'] = self.datetime - args['licenses'] = ' '.join(self.package.licenses) - args['licenses_locations'] = \ - ', '.join(['/usr/share/common-licenses/' + l \ - for l in self.package.licenses]) + args['licenses'] = ',\n '.join([l.pretty_name for l in self.package.licenses]) return COPYRIGHT_TPL % args def _deb_rules(self): diff --git a/cerbero/packages/package.py b/cerbero/packages/package.py index e8cccca1..ee53ad72 100644 --- a/cerbero/packages/package.py +++ b/cerbero/packages/package.py @@ -17,6 +17,7 @@ # Boston, MA 02111-1307, USA. from cerbero.build.filesprovider import FilesProvider +from cerbero.enums import License from cerbero.packages import PackageType @@ -53,7 +54,7 @@ class PackageBase(object): version = 'default' org = 'default' uuid = None - licenses = ['GPL'] + licenses = [License.GPL] vendor = 'default' url = 'default' ignore_package_prefix = False diff --git a/cerbero/packages/packagesstore.py b/cerbero/packages/packagesstore.py index 0aafe832..104dc3c1 100644 --- a/cerbero/packages/packagesstore.py +++ b/cerbero/packages/packagesstore.py @@ -19,7 +19,7 @@ import os from cerbero.build.cookbook import CookBook -from cerbero.config import Platform, Architecture, Distro, DistroVersion +from cerbero.config import Platform, Architecture, Distro, DistroVersion, License from cerbero.packages import package from cerbero.errors import FatalError, PackageNotFoundError from cerbero.utils import _ @@ -173,7 +173,7 @@ class PackagesStore (object): try: d = {'Platform': Platform, 'Architecture': Architecture, 'Distro': Distro, 'DistroVersion': DistroVersion, - 'package': package} + 'License': License, 'package': package} execfile(filepath, d) if 'Package' in d: p = d['Package'](self._config, self, self.cookbook) diff --git a/cerbero/packages/rpm.py b/cerbero/packages/rpm.py index 1b5746c4..77ec3fb8 100644 --- a/cerbero/packages/rpm.py +++ b/cerbero/packages/rpm.py @@ -159,7 +159,7 @@ class RPMPackager(LinuxPackager): 'package_name': self.full_package_name, 'summary': self.package.shortdesc, 'description': self.package.longdesc if self.package.longdesc != 'default' else self.package.shortdesc, - 'license': ' '.join(self.package.licenses), + 'license': ' '.join([l.acronym for l in self.package.licenses]), 'packager': self.packager, 'vendor': self.package.vendor, 'url': URL_TPL % self.package.url if self.package.url != 'default' else '', diff --git a/packages/base-system.package b/packages/base-system.package index eae56dd7..e8ebabe1 100644 --- a/packages/base-system.package +++ b/packages/base-system.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'Base system dependencies' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '3ffe67c2-4565-411f-8287-e8faa892f853' diff --git a/packages/gobject-python.package b/packages/gobject-python.package index c628bf59..edf25410 100644 --- a/packages/gobject-python.package +++ b/packages/gobject-python.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GLib/GObject python bingings' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] uuid = '58fe67c2-4565-431f-8287-e8fba892f853' vendor = 'GStreamer Project' deps = ['base-system'] diff --git a/packages/gstreamer-capture.package b/packages/gstreamer-capture.package index 15ab5292..d60c9de7 100644 --- a/packages/gstreamer-capture.package +++ b/packages/gstreamer-capture.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer plugins for capture' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '58fe67c2-4565-411f-8287-e8faa892f853' deps = ['gstreamer-core'] diff --git a/packages/gstreamer-clutter.package b/packages/gstreamer-clutter.package index e3371d88..12a034ff 100644 --- a/packages/gstreamer-clutter.package +++ b/packages/gstreamer-clutter.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer Clutter support' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '3fde61c2-4565-411f-8287-e8faa892f853' deps = ['gstreamer-core', 'gtk+-2.0'] diff --git a/packages/gstreamer-codecs-gpl.package b/packages/gstreamer-codecs-gpl.package index b2062b33..6088b463 100644 --- a/packages/gstreamer-codecs-gpl.package +++ b/packages/gstreamer-codecs-gpl.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer codecs under the GPL license and/or with patents issues' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['GPL'] + licenses = [License.GPL] vendor = 'GStreamer Project' uuid = '3fde61c2-4535-411f-8287-e8f6a892f853' deps = ['gstreamer-core'] diff --git a/packages/gstreamer-codecs.package b/packages/gstreamer-codecs.package index 256648bf..d6b7e632 100644 --- a/packages/gstreamer-codecs.package +++ b/packages/gstreamer-codecs.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer codecs' version = '1.0' url = "http://www.gstreamer.com" - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '3fde61c2-4535-411f-8287-e8f6a892f853' deps = ['gstreamer-core'] diff --git a/packages/gstreamer-core.package b/packages/gstreamer-core.package index 67cb755f..ba8f827f 100644 --- a/packages/gstreamer-core.package +++ b/packages/gstreamer-core.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer core' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '32fe67c2-4565-411f-8287-e8faa892f853' deps = ['base-system'] diff --git a/packages/gstreamer-dvd.package b/packages/gstreamer-dvd.package index 758f6199..1adbb70a 100644 --- a/packages/gstreamer-dvd.package +++ b/packages/gstreamer-dvd.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer DVD support' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['GPL'] + licenses = [License.GPL] vendor = 'GStreamer Project' uuid = '3fdd61c2-4565-411f-8287-e1faa892f853' deps = ['gstreamer-core'] diff --git a/packages/gstreamer-effects.package b/packages/gstreamer-effects.package index 7f8ba988..32e04b1f 100644 --- a/packages/gstreamer-effects.package +++ b/packages/gstreamer-effects.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer effects and instrumentaion plugins' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = 'affe67f2-4565-411f-8287-e8faa892f853' deps = ['gstreamer-core'] diff --git a/packages/gstreamer-ffmpeg.package b/packages/gstreamer-ffmpeg.package index 1e3c7515..7f8a3eb5 100644 --- a/packages/gstreamer-ffmpeg.package +++ b/packages/gstreamer-ffmpeg.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer libav wrapper' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = 'afce67f2-4165-411f-8287-e8f2a892f853' deps = ['gstreamer-core'] diff --git a/packages/gstreamer-networking.package b/packages/gstreamer-networking.package index 468f29d9..a12d2091 100644 --- a/packages/gstreamer-networking.package +++ b/packages/gstreamer-networking.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer plugins for network protocols' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '2ffe6732-4565-411f-8281-e8f1a892f853' deps = ['gstreamer-core'] diff --git a/packages/gstreamer-playback.package b/packages/gstreamer-playback.package index f3bc6312..2f434476 100644 --- a/packages/gstreamer-playback.package +++ b/packages/gstreamer-playback.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer plugins for playback' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '5fce6752-4165-511f-8287-e8f2a895f853' deps = ['gstreamer-core'] diff --git a/packages/gstreamer-python.package b/packages/gstreamer-python.package index 7f7a4db0..1ba281d9 100644 --- a/packages/gstreamer-python.package +++ b/packages/gstreamer-python.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer python bingings' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '5fc36752-4165-511f-8387-e8f2a898f853' deps = ['gstreamer-core', 'gobject-python'] diff --git a/packages/gstreamer-system.package b/packages/gstreamer-system.package index b4b130f8..0f729457 100644 --- a/packages/gstreamer-system.package +++ b/packages/gstreamer-system.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer system plugins' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['GPL'] + licenses = [License.GPL] vendor = 'GStreamer Project' uuid = '3fde61c2-4535-411f-8287-e8f6a892f853' deps = ['gstreamer-core'] diff --git a/packages/gstreamer-tests.package b/packages/gstreamer-tests.package index a50e7490..75bd9319 100644 --- a/packages/gstreamer-tests.package +++ b/packages/gstreamer-tests.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'Tests for GStreamer' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '5fce6752-4165-511f-8287-e8f2a895f853' sys_deps = { diff --git a/packages/gstreamer-visualizers.package b/packages/gstreamer-visualizers.package index b4fba177..4bb5e19f 100644 --- a/packages/gstreamer-visualizers.package +++ b/packages/gstreamer-visualizers.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'GStreamer visualization plugins' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['GPL'] + licenses = [License.GPL] vendor = 'GStreamer Project' uuid = '3fde61c2-4535-411f-8287-e8f6a892f853' deps = ['gstreamer-core'] diff --git a/packages/gtk-python.package b/packages/gtk-python.package index fd7bee70..f1a6d38a 100644 --- a/packages/gtk-python.package +++ b/packages/gtk-python.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'Gtk python bingings' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '18fe47c2-4265-411f-8287-e8fda593f853' deps = ['gtk+-2.0'] diff --git a/packages/gtk.package b/packages/gtk.package index a32fe9f1..29ad5dc5 100644 --- a/packages/gtk.package +++ b/packages/gtk.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'Gtk toolkit' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GTK+ Project' uuid = '58fe67c2-4565-411f-8287-e8fda893f853' deps = ['base-system'] diff --git a/packages/snappy.package b/packages/snappy.package index 891e0bdf..420c6e29 100644 --- a/packages/snappy.package +++ b/packages/snappy.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'Snappy media player' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['GPL'] + licenses = [License.GPL] vendor = 'GStreamer Project' uuid = '5fce6752-4165-511f-8287-e8f2a895f853' deps = ['gstreamer-core', 'gstreamer-codecs', 'gstreamer-playback', diff --git a/packages/vsintegration.package b/packages/vsintegration.package index 10737a09..ae6f24bf 100644 --- a/packages/vsintegration.package +++ b/packages/vsintegration.package @@ -8,7 +8,7 @@ class Package(package.Package): shortdesc = 'Visual Studio Integration' url = "http://www.gstreamer.com" version = '1.0' - licenses = ['LGPL'] + licenses = [License.LGPL] vendor = 'GStreamer Project' uuid = '533337c2-4565-413f-3287-e8faa892f853' diff --git a/recipes/a52dec.recipe b/recipes/a52dec.recipe index 61e6e5ce..8dd84e83 100644 --- a/recipes/a52dec.recipe +++ b/recipes/a52dec.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'a52dec' version = '0.7.4' configure_options = '--with-pic --enable-shared' - license = 'GPLv2' + license = License.GPLv2 files_libs = ['liba52'] files_bins = ['a52dec'] diff --git a/recipes/atk.recipe b/recipes/atk.recipe index 79ca3002..021dce54 100644 --- a/recipes/atk.recipe +++ b/recipes/atk.recipe @@ -5,7 +5,7 @@ class Recipe(recipe.Recipe): name = 'atk' version = '2.2.0' deps = ['glib'] - license = 'LGPLv2' + license = License.LGPLv2 files_libs = ['libatk-1.0'] files_devel = ['lib/pkgconfig/atk.pc', 'include/atk-1.0'] diff --git a/recipes/bzip2.recipe b/recipes/bzip2.recipe index fdaeed15..a8cc9d4f 100644 --- a/recipes/bzip2.recipe +++ b/recipes/bzip2.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'bzip2' version = '1.0.6' - license = 'BSD-like' + license = License.BSD_like files_libs = ['libbz2'] files_devel = ['include/bzlib.h'] diff --git a/recipes/cairo.recipe b/recipes/cairo.recipe index fe28d2be..fe96a001 100644 --- a/recipes/cairo.recipe +++ b/recipes/cairo.recipe @@ -5,7 +5,7 @@ class Recipe(recipe.Recipe): name = 'cairo' version = '1.10.2' deps = ['glib', 'libpng', 'zlib', 'pixman', 'fontconfig', 'freetype'] - license = 'LGPLv2.1' + license = License.LGPLv2_1 files_libs = ['libcairo', 'libcairo-gobject', 'libcairo-script-interpreter'] files_devel = [ diff --git a/recipes/cerbero.recipe b/recipes/cerbero.recipe index 445de682..943d9167 100644 --- a/recipes/cerbero.recipe +++ b/recipes/cerbero.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'cerbero' version = '0.1.0' commit = 'origin/master' - license = 'LGPL' + license = License.LGPL make_install = 'make install PREFIX=$CERBERO_PREFIX' files_bins = ['cerbero'] diff --git a/recipes/clutter.recipe b/recipes/clutter.recipe index 899d306d..9214e9c6 100644 --- a/recipes/clutter.recipe +++ b/recipes/clutter.recipe @@ -6,7 +6,7 @@ class Recipe(recipe.Recipe): configure_options = "--disable-introspection " deps = ['json-glib', 'cairo', 'atk', 'pango', 'cogl'] use_system_libs = True - license = 'LGPLv2.1' + license = License.LGPLv2_1 files_devel = [ 'lib/pkgconfig/clutter-1.0.pc', diff --git a/recipes/cogl.recipe b/recipes/cogl.recipe index 09c0cfcd..3b8b0469 100644 --- a/recipes/cogl.recipe +++ b/recipes/cogl.recipe @@ -6,7 +6,7 @@ class Recipe(recipe.Recipe): configure_options = "--disable-introspection " use_system_libs = True deps = [ 'gdk-pixbuf' ] - license = 'LGPLv2.1' + license = License.LGPLv2_1 files_libs = ['libcogl', 'libcogl-pango'] files_devel = [ diff --git a/recipes/dbus.recipe b/recipes/dbus.recipe index 788651e2..eade1437 100644 --- a/recipes/dbus.recipe +++ b/recipes/dbus.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'dbus' version = '1.4.16' - license = 'AFLv2.1' + license = License.AFLv2_1 deps = ['expat'] configure_options = '--disable-xml-docs --disable-doxygen-docs --disable-selinux --disable-libaudit --disable-launchd --disable-tests --disable-x11-autolaunch --disable-Werror ' diff --git a/recipes/expat.recipe b/recipes/expat.recipe index 0e211e0d..9027e52a 100644 --- a/recipes/expat.recipe +++ b/recipes/expat.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'expat' version = '2.1.0' - license = 'BSD-like' + license = License.BSD_like files_libs = ['libexpat'] files_devel = ['include/expat.h', 'include/expat_external.h', 'lib/pkgconfig/expat.pc'] diff --git a/recipes/faad2.recipe b/recipes/faad2.recipe index f10f142a..1f7b1d1b 100644 --- a/recipes/faad2.recipe +++ b/recipes/faad2.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'faad2' version = '2.7' - license = 'GPLv2' + license = License.GPLv2 files_libs = ['libfaad'] files_bin = ['faad'] diff --git a/recipes/flac.recipe b/recipes/flac.recipe index 6ad3d7de..840c7da9 100644 --- a/recipes/flac.recipe +++ b/recipes/flac.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'flac' version = '1.2.1' - license = 'BSD' # only libraries, tools are GPL + license = License.BSD # only libraries, tools are GPL platform_deps = { Platform.WINDOWS: ['libiconv'] } files_libs = ['libFLAC', 'libFLAC++'] diff --git a/recipes/fontconfig.recipe b/recipes/fontconfig.recipe index 8625535c..adce9b9e 100644 --- a/recipes/fontconfig.recipe +++ b/recipes/fontconfig.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'fontconfig' version = '2.8.0' - license = 'MIT' + license = License.MIT deps = ['expat', 'freetype', 'zlib'] platform_deps = { Platform.WINDOWS: ['libiconv'] } diff --git a/recipes/freetype.recipe b/recipes/freetype.recipe index bc912fb2..dbf47ad2 100644 --- a/recipes/freetype.recipe +++ b/recipes/freetype.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'freetype' version = '2.4.8' - license = 'FreeType' + license = License.FreeType configure_tpl = "%(config-sh)s --prefix=%(prefix)s --libdir=%(libdir)s" force_configure = True diff --git a/recipes/fribidi.recipe b/recipes/fribidi.recipe index 689abc19..0308cdde 100644 --- a/recipes/fribidi.recipe +++ b/recipes/fribidi.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'fribidi' version = '0.19.2' - license = 'LGPLv2.1' + license = License.LGPLv2_1 files_libs = ['libfribidi'] files_bins = ['fribidi'] diff --git a/recipes/gdk-pixbuf.recipe b/recipes/gdk-pixbuf.recipe index 2d460892..723f2eff 100644 --- a/recipes/gdk-pixbuf.recipe +++ b/recipes/gdk-pixbuf.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'gdk-pixbuf' version = '2.24.1' - license = 'LGPLv2.1' + license = License.LGPLv2_1 configure_options = '--with-included-loaders ' deps = ['jpeg', 'glib', 'libpng', 'tiff', 'zlib' ] diff --git a/recipes/gettext.recipe b/recipes/gettext.recipe index d224509d..920ca741 100644 --- a/recipes/gettext.recipe +++ b/recipes/gettext.recipe @@ -6,7 +6,7 @@ class Recipe(recipe.Recipe): version = '0.18.1.1' srcdir = 'gettext-runtime' autoreconf = True - license = 'LGPL' + license = License.LGPL files_libs = ['libintl', 'libasprintf'] files_bins = ['gettext', 'ngettext', 'envsubst'] diff --git a/recipes/glib-networking.recipe b/recipes/glib-networking.recipe index b1fe0ff1..8ffd0010 100644 --- a/recipes/glib-networking.recipe +++ b/recipes/glib-networking.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'glib-networking' version = '2.30.2' - license = 'LGPLv2' + license = License.LGPLv2 configure_options = "--without-ca-certificates" deps = ['glib', 'gnutls'] diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 9e14b576..32cefe18 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'glib' version = '2.32.1' - license = 'LGPLv2' + license = License.LGPLv2 configure_sh = 'sh autogen.sh' deps = ['libffi', 'zlib'] can_use_configure_cache = False diff --git a/recipes/gmp.recipe b/recipes/gmp.recipe index 8264eab5..ecaf54fc 100644 --- a/recipes/gmp.recipe +++ b/recipes/gmp.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'gmp' version = '5.0.4' - license = 'LGPL' + license = License.LGPL files_libs = ['libgmp'] files_devel = ['include/gmp.h'] diff --git a/recipes/gnutls.recipe b/recipes/gnutls.recipe index d84179ed..49dac108 100644 --- a/recipes/gnutls.recipe +++ b/recipes/gnutls.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'gnutls' version = '3.0.14' - license = 'LGPLv2.1+' + license = License.LGPLv2_1 configure_options = "--enable-local-libopts --disable-guile" deps = ['zlib', 'nettle', 'libgcrypt', 'libtasn1'] diff --git a/recipes/gtk-engines.recipe b/recipes/gtk-engines.recipe index 7f27f7ff..b4e3c030 100644 --- a/recipes/gtk-engines.recipe +++ b/recipes/gtk-engines.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'gtk-engines' version = '2.18.5' - license = 'GPL' + license = License.GPL deps = ['gtk+'] files_etc = ['etc/gtk-2.0/gtkrc'] diff --git a/recipes/gtk-mac-integration.recipe b/recipes/gtk-mac-integration.recipe index 7b7bfd89..11bd95c7 100644 --- a/recipes/gtk-mac-integration.recipe +++ b/recipes/gtk-mac-integration.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'gtk-mac-integration' version = '1.0.1' - license = 'LGPLv2.1' + license = License.LGPLv2_1 deps = ['gtk+', 'pygtk'] files_libs = ['libgtkmacintegration'] diff --git a/recipes/gtk.recipe b/recipes/gtk.recipe index be26421e..75ec0433 100644 --- a/recipes/gtk.recipe +++ b/recipes/gtk.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'gtk+' version = '2.24.10' - license = 'LGPLv2' + license = License.LGPLv2 configure_options = '--with-included-immodules ' deps = ['glib', 'atk', 'pango', 'gdk-pixbuf', 'cairo'] diff --git a/recipes/icon-naming-utils.recipe b/recipes/icon-naming-utils.recipe index 2e5da3b2..8a4ffaa7 100644 --- a/recipes/icon-naming-utils.recipe +++ b/recipes/icon-naming-utils.recipe @@ -3,5 +3,5 @@ class Recipe(recipe.Recipe): name = 'icon-naming-utils' version = '0.8.7' - license = 'GPL' + license = License.GPL deps = ['XML-Simple'] diff --git a/recipes/jasper.recipe b/recipes/jasper.recipe index ca0de665..fe981fb4 100644 --- a/recipes/jasper.recipe +++ b/recipes/jasper.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'jasper' version = '1.900.1' - license = 'Jasper' + license = License.Jasperv2 config_sh = 'sh configure' configure_options = '--enable-shared ' diff --git a/recipes/jpeg.recipe b/recipes/jpeg.recipe index 858de971..16dc4aeb 100644 --- a/recipes/jpeg.recipe +++ b/recipes/jpeg.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'jpeg' version = '8d' - license = 'JPEG' + license = License.JPEG files_libs = ['libjpeg'] files_devel = ['include/jpeglib.h', 'include/jerror.h', 'include/jconfig.h', diff --git a/recipes/json-glib.recipe b/recipes/json-glib.recipe index d54bd4d5..5e928a1e 100644 --- a/recipes/json-glib.recipe +++ b/recipes/json-glib.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'json-glib' version = '0.12.6' - license = 'LGPLv2.1' + license = License.LGPLv2_1 files_libs = ['libjson-glib-1.0'] files_devel = ['include/json-glib-1.0', 'lib/pkgconfig/json-glib-1.0.pc'] diff --git a/recipes/libass.recipe b/recipes/libass.recipe index 29f909fd..81ec614b 100644 --- a/recipes/libass.recipe +++ b/recipes/libass.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libass' version = '0.10.0' - license = 'BSD-like' + license = License.BSD_like deps = ['freetype', 'fontconfig', 'libpng', 'fribidi'] files_libs = ['libass'] diff --git a/recipes/libdca.recipe b/recipes/libdca.recipe index 99008714..3a0503c3 100644 --- a/recipes/libdca.recipe +++ b/recipes/libdca.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'libdca' version = '0.0.5' - license = 'GPL' + license = License.GPL files_libs = ['libdca'] files_bins = ['extract_dca', 'extract_dcs', 'dcadec', 'dcsdec'] diff --git a/recipes/libdv.recipe b/recipes/libdv.recipe index 6733c5dc..61f89b4c 100644 --- a/recipes/libdv.recipe +++ b/recipes/libdv.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libdv' version = '1.0.0' - license = 'LGPLv2.1' + license = License.LGPLv2_1 files_libs = ['libdv'] files_bins = ['dvconnect', 'encodedv', 'dubdv'] diff --git a/recipes/libdvdnav.recipe b/recipes/libdvdnav.recipe index ec6978e4..bee68225 100644 --- a/recipes/libdvdnav.recipe +++ b/recipes/libdvdnav.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libdvdnav' version = '4.2.0' - license = 'GPLv2' + license = License.GPLv2 config_sh = 'sh autogen.sh' deps = ['libdvdread'] diff --git a/recipes/libdvdread.recipe b/recipes/libdvdread.recipe index c595abc3..c73739b5 100644 --- a/recipes/libdvdread.recipe +++ b/recipes/libdvdread.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libdvdread' version = '4.2.0' - license = 'GPLv2' + license = License.GPLv2 config_sh = 'sh autogen.sh' files_libs = ['libdvdread'] diff --git a/recipes/libexif.recipe b/recipes/libexif.recipe index 7f674281..8a28c482 100644 --- a/recipes/libexif.recipe +++ b/recipes/libexif.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libexif' version = '0.6.20' - license = 'LGPLv2.1' + license = License.LGPLv2_1 files_libs = ['libexif'] files_devel = ['include/libexif', 'lib/pkgconfig/libexif.pc'] diff --git a/recipes/libffi.recipe b/recipes/libffi.recipe index 0019255b..b554b2da 100644 --- a/recipes/libffi.recipe +++ b/recipes/libffi.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libffi' version = '3.0.10' - license = 'BSD-like' + license = License.BSD_like files_libs = ['libffi'] files_devel = ['lib/libffi-3.0.10', 'lib/pkgconfig/libffi.pc'] diff --git a/recipes/libgcrypt.recipe b/recipes/libgcrypt.recipe index 20577ea5..7f661eb4 100644 --- a/recipes/libgcrypt.recipe +++ b/recipes/libgcrypt.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libgcrypt' version = '1.5.0' - license = 'LGPLv2.1' + license = License.LGPLv2_1 deps = ['libgpg-error'] files_libs = ['libgcrypt'] diff --git a/recipes/libgpg-error.recipe b/recipes/libgpg-error.recipe index 10735df0..aa87cf83 100644 --- a/recipes/libgpg-error.recipe +++ b/recipes/libgpg-error.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libgpg-error' version = '1.10' - license = 'LGPLv2.1' + license = License.LGPLv2_1 files_libs = ['libgpg-error'] files_bins = ['gpg-error'] diff --git a/recipes/libmad.recipe b/recipes/libmad.recipe index 30a5ea03..bdfb64c1 100644 --- a/recipes/libmad.recipe +++ b/recipes/libmad.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'libmad' version = '0.15.1b' - license = 'GPLv2' + license = License.GPLv2 files_libs = ['libmad'] files_devel = ['include/mad.h'] diff --git a/recipes/libmms.recipe b/recipes/libmms.recipe index dc4511ed..8fbe9c6d 100644 --- a/recipes/libmms.recipe +++ b/recipes/libmms.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'libmms' version = '0.6.2' - license = 'LGPL' + license = License.LGPL deps = [ 'glib' ] files_libs = ['libmms'] diff --git a/recipes/libmpeg2.recipe b/recipes/libmpeg2.recipe index 4a165996..637cfea2 100644 --- a/recipes/libmpeg2.recipe +++ b/recipes/libmpeg2.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'libmpeg2' version = '0.5.1' - license = 'GPLv2' + license = License.GPLv2 autoreconf = True files_libs = ['libmpeg2', 'libmpeg2convert'] diff --git a/recipes/libogg.recipe b/recipes/libogg.recipe index eb92c0a9..b9ec4bcf 100644 --- a/recipes/libogg.recipe +++ b/recipes/libogg.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libogg' version = '1.3.0' - license = 'BSD-like' + license = License.BSD_like files_libs = ['libogg'] files_devel = ['include/ogg', 'lib/pkgconfig/ogg.pc'] diff --git a/recipes/libpng.recipe b/recipes/libpng.recipe index ebd45c58..f6e3af30 100644 --- a/recipes/libpng.recipe +++ b/recipes/libpng.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libpng' version = '1.5.8' - license = 'LibPNG' + license = License.LibPNG deps = ['zlib'] files_libs = ['libpng15'] diff --git a/recipes/libshout.recipe b/recipes/libshout.recipe index 57232b59..729b7a14 100644 --- a/recipes/libshout.recipe +++ b/recipes/libshout.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libshout' version = '2.2.2' - license = 'LGPLv2.1' + license = License.LGPLv2_1 deps = ['libtheora', 'libogg', 'libvorbis', 'speex'] files_libs = ['libshout'] diff --git a/recipes/libsoup.recipe b/recipes/libsoup.recipe index d1b3f48c..4c7ee4ce 100644 --- a/recipes/libsoup.recipe +++ b/recipes/libsoup.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libsoup' version = '2.36.1' - license = 'LGPLv2.1' + license = License.LGPLv2_1 configure_options = '--without-gnome' deps = ['libxml2', 'glib'] diff --git a/recipes/libtasn1.recipe b/recipes/libtasn1.recipe index be03066d..b5cd85e9 100644 --- a/recipes/libtasn1.recipe +++ b/recipes/libtasn1.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'libtasn1' version = '2.11' - license = 'LGPLv2.1' + license = License.LGPLv2_1 files_libs = ['libtasn1'] files_devel = ['include/libtasn1.h', 'lib/pkgconfig/libtasn1.pc'] diff --git a/recipes/libtheora.recipe b/recipes/libtheora.recipe index 1b0018f3..8e207ca9 100644 --- a/recipes/libtheora.recipe +++ b/recipes/libtheora.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libtheora' version = '1.1.1' - license = 'BSD' + license = License.BSD deps = ['libogg', 'libvorbis'] files_libs = ['libtheora', 'libtheoradec', 'libtheoraenc'] diff --git a/recipes/libvisual.recipe b/recipes/libvisual.recipe index f9873432..e6918314 100644 --- a/recipes/libvisual.recipe +++ b/recipes/libvisual.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libvisual' version = '0.4.0' - license = 'LGPLv2.1' + license = License.LGPLv2_1 autoreconf = True files_libs = ['libvisual-0.4'] diff --git a/recipes/libvorbis.recipe b/recipes/libvorbis.recipe index b9208ee0..a907f0a1 100644 --- a/recipes/libvorbis.recipe +++ b/recipes/libvorbis.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libvorbis' version = '1.3.2' - license = 'BSD-like' + license = License.BSD_like deps = ['libogg'] files_libs = ['libvorbis', 'libvorbisenc', 'libvorbisfile'] diff --git a/recipes/libvpx.recipe b/recipes/libvpx.recipe index 9d4d0767..256bc645 100644 --- a/recipes/libvpx.recipe +++ b/recipes/libvpx.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libvpx' version = 'v1.0.0' - license = 'BSD' + license = License.BSD configure_tpl = "%(config-sh)s --prefix=%(prefix)s "\ "--libdir=%(libdir)s %(options)s" configure_options = "--enable-pic --as=yasm " diff --git a/recipes/libxml2.recipe b/recipes/libxml2.recipe index 06841df1..681a5905 100644 --- a/recipes/libxml2.recipe +++ b/recipes/libxml2.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'libxml2' version = '2.7.8' - license = 'MIT' + license = License.MIT deps = [ 'zlib' ] platform_deps = { Platform.WINDOWS: ['libiconv'] } diff --git a/recipes/mingw.recipe b/recipes/mingw.recipe index fdf3a3ce..16590c3f 100644 --- a/recipes/mingw.recipe +++ b/recipes/mingw.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'mingw' version = '0.1' - license = 'LGPL' + license = License.LGPL btype = BuildType.CUSTOM stype = SourceType.CUSTOM diff --git a/recipes/nettle.recipe b/recipes/nettle.recipe index cbf988d2..8b26b2a5 100644 --- a/recipes/nettle.recipe +++ b/recipes/nettle.recipe @@ -10,7 +10,7 @@ from cerbero.build.filesprovider import FilesProvider class Recipe(recipe.Recipe): name = 'nettle' version = '2.4' - license = 'LGPLv2.1' + license = License.LGPLv2_1 configure_options = '--enable-shared' deps = ['gmp'] diff --git a/recipes/opencore-amr.recipe b/recipes/opencore-amr.recipe index cdb6a973..c819fe46 100644 --- a/recipes/opencore-amr.recipe +++ b/recipes/opencore-amr.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'opencore-amr' version = '0.1.3' - license = 'Apachev2.0' + license = License.Apachev2 files_libs = ['libopencore-amrnb', 'libopencore-amrwb'] files_devel = ['include/opencore-amrwb', 'include/opencore-amrnb', diff --git a/recipes/orc.recipe b/recipes/orc.recipe index b1c2e54b..a631cac2 100644 --- a/recipes/orc.recipe +++ b/recipes/orc.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'orc' version = '0.4.16' - license = 'BSD-like' + license = License.BSD_like files_libs = ['liborc-0.4', 'liborc-test-0.4'] files_devel = ['include/orc-0.4', 'lib/pkgconfig/orc-0.4.pc', diff --git a/recipes/pango.recipe b/recipes/pango.recipe index bd43a04e..8abe0c81 100644 --- a/recipes/pango.recipe +++ b/recipes/pango.recipe @@ -5,7 +5,7 @@ class Recipe(recipe.Recipe): name = 'pango' version = '1.28.4' autoreconf = True - license = 'LGPLv2.1' + license = License.LGPLv2_1 configure_options = '--with-included-modules ' deps = ['cairo', 'fontconfig', 'freetype'] diff --git a/recipes/pixman.recipe b/recipes/pixman.recipe index 2d18f519..98473e16 100644 --- a/recipes/pixman.recipe +++ b/recipes/pixman.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'pixman' version = '0.24.4' - license = 'MIT' + license = License.MIT files_libs = ['libpixman-1'] files_devel = ['include/pixman-1', 'lib/pkgconfig/pixman-1.pc'] diff --git a/recipes/schroedinger.recipe b/recipes/schroedinger.recipe index 1297897d..15d2f697 100644 --- a/recipes/schroedinger.recipe +++ b/recipes/schroedinger.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'schroedinger' version = '1.0.11' - license = 'LGPLv2' + license = License.LGPLv2 files_libs = ['libschroedinger-1.0'] files_devel = ['include/schroedinger-1.0', 'lib/pkgconfig/schroedinger-1.0.pc'] diff --git a/recipes/snappy.recipe b/recipes/snappy.recipe index 9dc23d9d..3bb20829 100644 --- a/recipes/snappy.recipe +++ b/recipes/snappy.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'snappy' version = '0.2+git' - license = 'GPLv2' + license = License.GPLv2 config_sh = 'autoreconf -fiv && sh ./configure' deps = ['glib', 'gstreamer', 'gst-plugins-base', 'clutter', 'clutter-gst'] platform_deps = { Platform.LINUX: ['libXtst'] } diff --git a/recipes/speex.recipe b/recipes/speex.recipe index e1a51e98..5b610467 100644 --- a/recipes/speex.recipe +++ b/recipes/speex.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'speex' version = '1.2rc1' - license = 'BSD-like' + license = License.BSD_like deps = ['libogg'] files_libs = ['libspeex', 'libspeexdsp'] diff --git a/recipes/taglib.recipe b/recipes/taglib.recipe index e765adcf..5d90fbde 100644 --- a/recipes/taglib.recipe +++ b/recipes/taglib.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'taglib' version = '1.7' - license = 'LGPL' + license = License.LGPL configure_options = '-DWITH_MP4=ON -DWITH_ASF=ON' btype = BuildType.CMAKE diff --git a/recipes/tango-icon-theme.recipe b/recipes/tango-icon-theme.recipe index 12e25df7..b8173299 100644 --- a/recipes/tango-icon-theme.recipe +++ b/recipes/tango-icon-theme.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): name = 'tango-icon-theme' version = '0.8.1' - license = 'LGPL' + license = License.LGPL configure_options = '--disable-icon-framing ' deps = ['icon-naming-utils'] diff --git a/recipes/tiff.recipe b/recipes/tiff.recipe index 8568fbd9..713e5404 100644 --- a/recipes/tiff.recipe +++ b/recipes/tiff.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'tiff' version = '4.0.1' - license = 'BSD-like' + license = License.BSD_like deps = [ 'zlib' ] diff --git a/recipes/vsintegration.recipe b/recipes/vsintegration.recipe index 82bf5a33..eacef971 100644 --- a/recipes/vsintegration.recipe +++ b/recipes/vsintegration.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'vsintegration' version = '0.1' - license = 'LGPL' + license = License.LGPL btype = BuildType.CUSTOM stype = SourceType.CUSTOM diff --git a/recipes/wavpack.recipe b/recipes/wavpack.recipe index dadb3486..e8b9bd8b 100644 --- a/recipes/wavpack.recipe +++ b/recipes/wavpack.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'wavpack' version = '4.60.1' - lincense = 'BSD-like' + license = License.BSD_like platform_deps = { Platform.WINDOWS: ['libiconv'] } files_libs = ['libwavpack'] diff --git a/recipes/winpthreads.recipe b/recipes/winpthreads.recipe index a47580b2..e7ae5fc4 100644 --- a/recipes/winpthreads.recipe +++ b/recipes/winpthreads.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'winpthreads' version = '20100604' - license = 'LGPL' + license = License.LGPL btype = BuildType.CUSTOM stype = SourceType.CUSTOM diff --git a/recipes/zlib.recipe b/recipes/zlib.recipe index c456eb60..c56cc0ca 100644 --- a/recipes/zlib.recipe +++ b/recipes/zlib.recipe @@ -4,7 +4,7 @@ class Recipe(recipe.Recipe): name = 'zlib' version = '1.2.6' - license = 'BSD-like' + license = License.BSD_like force_configure = True add_host_build_target = False can_use_configure_cache = False |