diff options
| author | John Stebbins <[email protected]> | 2016-08-30 09:51:05 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-08-30 09:51:05 -0700 |
| commit | a464833a790f44f061f9de42a88f64e49156d422 (patch) | |
| tree | 4ae1aeeb0d1e98640efe55c5f9db94a329f0de9f /make | |
| parent | aed230d055ce0e64dfc0a41e401a7a3e7e7fd7bb (diff) | |
LinGui: Add flatpak support (#231)
* LinGui: add --flatpak configure option
For building a linux flatpak bundle
* LinGui: add rules to build flatpak repo and bundles
* LinGui: add flatpak compatible icon
* LinGui: add flatpak compatible desktop file
* LinGui: add flatpak appdata xml
* pkg: disable building LinGui when creating cli flatpak
* pkg: clean flatpak build cache when updating source package
* pkg: fix source package build dependencies
Fixes errors when the git ref being packaged changes and you have not
manually deleted stage and pkg build directories.
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.py | 4 | ||||
| -rw-r--r-- | make/include/main.defs | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/make/configure.py b/make/configure.py index 3efb6848b..5952b22ac 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1346,8 +1346,11 @@ def createCLI(): h = IfHost( 'Build and use local pkg-config', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--enable-local-pkgconfig', default=False, action='store_true', help=h ) + if host.match( '*-*-linux*' ): + grp.add_option( '--flatpak', default=False, action='store_true', help='Build extra contribs for flatpak' ) cli.add_option_group( grp ) + ## add Xcode options if host.match( '*-*-darwin*' ): grp = OptionGroup( cli, 'Xcode Options' ) @@ -1838,6 +1841,7 @@ int main() doc.add( 'FEATURE.local_cmake', int( options.enable_local_cmake )) doc.add( 'FEATURE.local_pkgconfig', int( options.enable_local_pkgconfig )) doc.add( 'FEATURE.asm', 'disabled' ) + doc.add( 'FEATURE.flatpak', int( options.flatpak )) doc.add( 'FEATURE.gtk', int( not options.disable_gtk )) doc.add( 'FEATURE.gtk.update.checks', int( not options.disable_gtk_update_checks )) doc.add( 'FEATURE.gtk.mingw', int( options.enable_gtk_mingw )) diff --git a/make/include/main.defs b/make/include/main.defs index 8253f002a..b95227908 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -57,6 +57,17 @@ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw)) MODULES += contrib/jansson endif +ifeq (1,$(FEATURE.flatpak)) + MODULES += contrib/lame + MODULES += contrib/jansson + MODULES += contrib/x264 + MODULES += contrib/harfbuzz + MODULES += contrib/fribidi + MODULES += contrib/freetype + MODULES += contrib/libass + MODULES += contrib/yasm +endif + ifeq (1,$(FEATURE.fdk_aac)) MODULES += contrib/fdk-aac endif |