From 40b4b87cc43cb5f34b8391b08a852cf6b837c127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 2 Apr 2018 18:48:48 +0200 Subject: [PATCH] Switch to absolute path for includedir/libdir --- .../libraries/gstreamer/bad/fix_pkgconfig_includedir.patch | 6 +++--- .../libraries/gstreamer/base/fix_pkgconfig_includedir.patch | 6 +++--- .../libraries/gstreamer/core/fix_pkgconfig_includedir.patch | 6 +++--- .../libraries/gstreamer/ges/fix_pkgconfig_includedir.patch | 6 +++--- .../libraries/gstreamer/good/fix_pkgconfig_includedir.patch | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch index b3deb05aebd9..c687fffc9c08 100644 --- a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch +++ b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch @@ -1,5 +1,5 @@ diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index 271f327f3..ddc52cca8 100644 +index 271f327f3..7e2afa754 100644 --- a/pkgconfig/meson.build +++ b/pkgconfig/meson.build @@ -2,8 +2,8 @@ pkgconf = configuration_data() @@ -8,8 +8,8 @@ index 271f327f3..ddc52cca8 100644 pkgconf.set('exec_prefix', '${prefix}') -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', get_option('libdir')) -+pkgconf.set('includedir', get_option('includedir')) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) pkgconf.set('GST_API_VERSION', api_version) pkgconf.set('VERSION', gst_version) diff --git a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch index 987cf0d87395..04486a4647f9 100644 --- a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch +++ b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch @@ -1,5 +1,5 @@ diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index 04abfbee5..74e3f290d 100644 +index 04abfbee5..88c86b431 100644 --- a/pkgconfig/meson.build +++ b/pkgconfig/meson.build @@ -2,8 +2,8 @@ pkgconf = configuration_data() @@ -8,8 +8,8 @@ index 04abfbee5..74e3f290d 100644 pkgconf.set('exec_prefix', '${prefix}') -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', get_option('libdir')) -+pkgconf.set('includedir', get_option('includedir')) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) pkgconf.set('GST_API_VERSION', api_version) pkgconf.set('VERSION', gst_version) pkgconf.set('LIBM', libm.found() ? '-lm' : '') diff --git a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch index ae0dbfa36ffc..c388a82fa2a8 100644 --- a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch +++ b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch @@ -1,5 +1,5 @@ diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index edb0586c2..0325cdf4a 100644 +index edb0586c2..7ed46dfce 100644 --- a/pkgconfig/meson.build +++ b/pkgconfig/meson.build @@ -2,8 +2,8 @@ pkgconf = configuration_data() @@ -8,8 +8,8 @@ index edb0586c2..0325cdf4a 100644 pkgconf.set('exec_prefix', '${prefix}') -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', get_option('libdir')) -+pkgconf.set('includedir', get_option('includedir')) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) pkgconf.set('GST_API_VERSION', apiversion) pkgconf.set('VERSION', gst_version) pkgconf.set('LIBM', mathlib.found() ? '-lm' : '') diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch index 6dff6aae39f4..1e12f3bbfbea 100644 --- a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch +++ b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch @@ -1,5 +1,5 @@ diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index a612b21b..e19cdfe7 100644 +index a612b21b..c017eaff 100644 --- a/pkgconfig/meson.build +++ b/pkgconfig/meson.build @@ -2,8 +2,8 @@ pkgconf = configuration_data() @@ -8,8 +8,8 @@ index a612b21b..e19cdfe7 100644 pkgconf.set('exec_prefix', '${prefix}') -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', get_option('libdir')) -+pkgconf.set('includedir', get_option('includedir')) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) pkgconf.set('GST_API_VERSION', apiversion) pkgconf.set('VERSION', gst_version) diff --git a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch index b506a0eda399..f68ad603a37c 100644 --- a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch +++ b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch @@ -1,5 +1,5 @@ diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index b3bf0d4d4..fb4386cfc 100644 +index b3bf0d4d4..3e6e576c0 100644 --- a/pkgconfig/meson.build +++ b/pkgconfig/meson.build @@ -2,8 +2,8 @@ pkgconf = configuration_data() @@ -8,8 +8,8 @@ index b3bf0d4d4..fb4386cfc 100644 pkgconf.set('exec_prefix', '${prefix}') -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', get_option('libdir')) -+pkgconf.set('includedir', get_option('includedir')) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) pkgconf.set('GST_API_VERSION', api_version) pkgconf.set('VERSION', gst_version)