Skip to content
Snippets Groups Projects
Commit e0d71e8a authored by Xavier Claessens's avatar Xavier Claessens
Browse files

TMP

parent 19c3e76c
No related branches found
No related tags found
No related merge requests found
......@@ -28,6 +28,6 @@ class Package(custom.GStreamer, package.Package):
[DistroVersion.DEBIAN_SQUEEZE,
DistroVersion.UBUNTU_MAVERICK,
DistroVersion.UBUNTU_LUCID]:
self.files += ['glib-networking', 'glib-networking-static']
self.files += ['glib-networking']
elif self.config.target_platform == Platform.LINUX:
self.sys_deps = {self.config.target_distro_version: ['glib-networking']}
......@@ -5,7 +5,7 @@ import stat
class Recipe(recipe.Recipe):
name = 'meson'
version = '0.45.1'
version = '0.46.0'
licenses = [License.Apachev2]
btype = BuildType.CUSTOM
stype = SourceType.TARBALL
......
# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
import shutil
import os
from cerbero.errors import FatalError
from cerbero.utils.shell import which
class Recipe(recipe.Recipe):
name = 'glib-networking-static'
version = '2.54.1'
licenses = [License.LGPLv2Plus]
stype = SourceType.TARBALL
url = 'http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.54/glib-networking-%(version)s.tar.xz'
tarball_dirname = 'glib-networking-%(version)s'
autoreconf = True
configure_options = "--without-ca-certificates --enable-static-modules --enable-static --enable-more-warnings"
deps = ['glib', 'gnutls', 'glib-networking']
patches = ['glib-networking/0001-Add-support-for-static-modules.patch',
'glib-networking/0002-Get-the-CA-certificate-path-from-the-environment-var.patch',
'glib-networking/0003-gnutls-Use-db-relative-to-libglib-2.0-if-needed.patch',
'glib-networking/0004-gtlsbackend-gnutls-Get-anchor-file-relative-to-libgi.patch']
files_devel = ['lib/gio/modules/static/libgiognutls.a',
'lib/gio/modules/static/libgiognutls.la']
def prepare(self):
self.tmp_destdir = os.path.join(self.build_dir, 'static-build')
querymodule_path = which('true')
if self.config.target_platform in [Platform.ANDROID, Platform.IOS]:
self.append_env['CFLAGS'] = ' -DGST_CA_CERTIFICATES_FROM_ENV'
self.config_sh = 'GIO_QUERYMODULES=%s %s' % (querymodule_path, self.config_sh)
def install(self):
plugins_dir = os.path.join(self.config.prefix,
os.path.dirname(self.files_devel[0]))
if not os.path.exists(plugins_dir):
os.makedirs(plugins_dir)
shutil.copy(os.path.join(self.build_dir, 'tls', 'gnutls', '.libs',
'libgiognutls.a'), plugins_dir)
shutil.copy(os.path.join(self.build_dir, 'tls', 'gnutls', '.libs',
'libgiognutls.la'), plugins_dir)
......@@ -6,15 +6,22 @@ class Recipe(recipe.Recipe):
name = 'glib-networking'
version = '2.54.1'
licenses = [License.LGPLv2Plus]
stype = SourceType.TARBALL
#stype = SourceType.TARBALL
url = 'http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.54/glib-networking-%(version)s.tar.xz'
remotes = {'origin': 'ssh://xclaesse@git.gnome.org/git/glib-networking'}
commit = 'origin/master'
btype = BuildType.MESON
autoreconf = True
configure_options = "--without-ca-certificates --enable-more-warnings"
meson_options = {'static_modules': True,
'libproxy_support': False,
'gnome_proxy_support': False,
'pkcs11_support': False}
deps = ['glib', 'gnutls']
patches = ['glib-networking/0001-Add-support-for-static-modules.patch',
'glib-networking/0002-Get-the-CA-certificate-path-from-the-environment-var.patch',
'glib-networking/0003-gnutls-Use-db-relative-to-libglib-2.0-if-needed.patch',
'glib-networking/0004-gtlsbackend-gnutls-Get-anchor-file-relative-to-libgi.patch']
#patches = ['glib-networking/0001-Add-support-for-static-modules.patch',
# 'glib-networking/0002-Get-the-CA-certificate-path-from-the-environment-var.patch',
# 'glib-networking/0003-gnutls-Use-db-relative-to-libglib-2.0-if-needed.patch',
# 'glib-networking/0004-gtlsbackend-gnutls-Get-anchor-file-relative-to-libgi.patch']
files_misc = ['lib/gio/modules/libgiognutls%(mext)s']
files_lang = ['glib-networking']
......@@ -35,4 +42,4 @@ class Recipe(recipe.Recipe):
if self.config.target_platform in [Platform.ANDROID]:
self.append_env['CFLAGS'] = ' -DGST_CA_CERTIFICATES_FROM_ENV'
self.config_sh = 'GIO_QUERYMODULES=%s %s' % (querymodule_path, self.config_sh)
#self.config_sh = 'GIO_QUERYMODULES=%s %s' % (querymodule_path, self.config_sh)
......@@ -20,27 +20,24 @@ GLIB_CONFIG_UNVERSAL='''\
class Recipe(recipe.Recipe):
name = 'glib'
version = '2.54.3'
stype = SourceType.TARBALL
url = 'http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.54/glib-%(version)s.tar.xz'
version = '2.56.0'
remotes = {'origin': 'https://gitlab.gnome.org/GNOME/glib.git',
'xclaesse': 'git@gitlab.collabora.com:xclaesse/glib.git'}
commit = 'xclaesse/master'
licenses = [License.LGPLv2Plus]
config_sh = 'sh autogen.sh'
configure_options = '--with-pcre=internal --disable-libmount --enable-dtrace=no '
btype = BuildType.MESON
meson_options = {
'internal_pcre': True,
'libmount': False,
'dtrace': False,
}
meson_cross_properties = {
'growing_stack': True,
}
deps = ['libffi', 'zlib']
can_use_configure_cache = False
patches = ["glib/0001-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch",
"glib/0002-Optionally-revert-to-the-old-pre-2.28-URI-handler-co.patch",
"glib/0003-Add-support-for-loading-GIO-modules-from-the-distro-.patch",
"glib/0004-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch",
"glib/0005-Blacklist-the-bamf-GIO-module.patch",
"glib/0006-giomodule-do-not-try-to-load-modules-from-gio-module.patch",
"glib/0008-Unhide-_g_io_modules_ensure_extension_points_registe.patch",
'glib/0009-Implementation-of-Cocoa-event-loop-integration-in-GM.patch',
'glib/0010-GSocket-Fix-race-conditions-on-Win32-if-multiple-thr.patch',
'glib/0013-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch',
'glib/0001-gmodule-Use-RTLD_DEFAULT-if-defined-__BIONIC__.patch',
'glib/0001-configure.ac-add-enable-proxy-libintl.patch'
]
files_libs = [
'libglib-2.0', 'libgio-2.0', 'libgmodule-2.0', 'libgobject-2.0',
......@@ -102,8 +99,10 @@ class Recipe(recipe.Recipe):
self.append_env['ac_cv_func_mkostemp'] = 'no'
if self.config.target_platform != Platform.WINDOWS:
self.configure_options += ' --enable-static'
self.default_library = 'both'
if self.config.target_platform != Platform.LINUX:
self.configure_options += ' --disable-gtk-doc '
self.meson_options['gtk_doc'] = False
# Disable valgrind code on non-Linux, in the best case it just
# gives us compiler errors :)
self.append_env['CFLAGS'] = ' -DNVALGRIND=1 '
......@@ -111,7 +110,7 @@ class Recipe(recipe.Recipe):
self.deps += ['proxy-libintl']
self.configure_options += ' --enable-proxy-libintl'
# Hack to fix building of the glib/tests/private test
self.make = '%s private_LDFLAGS=""' % self.make
#self.make = '%s private_LDFLAGS=""' % self.make
v = DistroVersion.get_android_api_version(self.config.target_distro_version)
if self.config.target_arch in [Architecture.ARM, Architecture.ARMv7, Architecture.X86] and v < 21:
# FIXME: HACK to make projects using mmap compile with NDK 16
......@@ -119,8 +118,10 @@ class Recipe(recipe.Recipe):
# because we don't use clang and we use a platform < 21 (Lollipop)
# See $NDK_ROOT/sysroot/usr/include/sys/mman.h as one example
self.new_env['ac_cv_func_mmap'] = 'no'
self.meson_options['iconv'] = 'gnu'
elif self.config.target_platform == Platform.WINDOWS:
self.configure_options += ' --with-libiconv=gnu'
self.meson_options['iconv'] = 'gnu'
self.append_env['CFLAGS'] = ' -DMINGW_HAS_SECURE_API=1 '
elif self.config.target_platform in [Platform.DARWIN, Platform.IOS]:
self.files_devel.append(os.path.join('lib', 'glib-2.0', 'include', '*', 'glibconfig.h'))
......@@ -148,6 +149,7 @@ class Recipe(recipe.Recipe):
path2 = None
use_old_uri_scheme = False
self.configure_options += ' --disable-selinux'
self.meson_options['selinux'] = False
# Old Debian/Ubuntu
if self.config.target_distro_version in [DistroVersion.DEBIAN_SQUEEZE,
DistroVersion.UBUNTU_LUCID,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment