From ae608845ca83ab02c5a386285375c36778874151 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@osg.samsung.com>
Date: Thu, 20 Oct 2016 15:38:46 -0300
Subject: [PATCH] meson: require meson 0.36 and use new `pic` arg on static
 libs

Removes a meson warning and some special casing we had.
---
 gst/printf/meson.build              |  3 ++-
 libs/gst/check/libcheck/meson.build |  3 ++-
 meson.build                         | 10 +---------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/gst/printf/meson.build b/gst/printf/meson.build
index 2a867a60e8..1b42d2a354 100644
--- a/gst/printf/meson.build
+++ b/gst/printf/meson.build
@@ -74,6 +74,7 @@ endif
 printf_lib = static_library('gstprintf',
     printf_sources,
     include_directories : [configinc],
-    c_args : printf_args + pic_args,
+    c_args : printf_args,
     install : false,
+    pic: true,
     dependencies : [glib_dep])
diff --git a/libs/gst/check/libcheck/meson.build b/libs/gst/check/libcheck/meson.build
index 4f9a92bc3e..f86c187bc6 100644
--- a/libs/gst/check/libcheck/meson.build
+++ b/libs/gst/check/libcheck/meson.build
@@ -38,4 +38,5 @@ libcheck = static_library('check',
   libcheck_files,
   include_directories : [ configinc, internal_check_h_inc ],
   dependencies : [rt_lib, mathlib],
-  c_args: gst_c_args + pic_args)
+  c_args: gst_c_args,
+  pic: true)
diff --git a/meson.build b/meson.build
index 572227b0ca..0df520f6d0 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('gstreamer', 'c', 'cpp',
   version : '1.11.0.1',
-  meson_version : '>= 0.35.0',
+  meson_version : '>= 0.36.0',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
 
@@ -29,14 +29,6 @@ helpers_install_dir = libexecdir + '/gstreamer-1.0/'
 
 cc = meson.get_compiler('c')
 
-# FIXME: Meson should have a way for portably adding -fPIC when needed for use
-# with static libraries that are linked into shared libraries. Or, it should
-# add it by default with an option to turn it off if needed.
-pic_args = ['-fPIC']
-if host_machine.system() == 'windows'
-  pic_args = []
-endif
-
 # Ignore several spurious warnings for things gstreamer does very commonly
 # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it
 # If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once