* [Buildroot] [PATCH 1/1] package/mesa3d: drop pkgconfig workaround
@ 2020-05-02 0:25 James Hilliard
2020-05-02 16:30 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: James Hilliard @ 2020-05-02 0:25 UTC (permalink / raw)
To: buildroot
This workaround is not needed as of commit
5cff3a8bdfba92e9f61d0984df08f1ecd205c072 which properly sets the
PKG_CONFIG_LIBDIR for native: true dependencies.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
...d-scanner-provided-by-wayland-scanne.patch | 52 -------------------
package/mesa3d/mesa3d.mk | 1 -
2 files changed, 53 deletions(-)
delete mode 100644 package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch
diff --git a/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch b/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch
deleted file mode 100644
index 784b27c4a2..0000000000
--- a/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0e107f7bac8d84d8fb2bb5b83bfb4474348a82c1 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@smile.fr>
-Date: Wed, 17 Apr 2019 22:47:05 +0200
-Subject: [PATCH] meson: use wayland-scanner provided by wayland-scanner-path
-
-When cross-compiling the .pc file might point to the wrong
-wayland-scanner binary (target rather than host) resulting in a
-non-executable and wrong scanner.
-First try by using the path provided by wayland-scanner-path,
-and if that fails fall back into pkg-config.
-
-Based on the patch for autotools provided by Gustavo Zacarias.
-
-Signed-off-by: Romain Naour <romain.naour@smile.fr>
----
- meson.build | 5 ++++-
- meson_options.txt | 6 ++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 6c4f1508855..ef0532b2cfb 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1319,7 +1319,10 @@ endif
-
- if with_platform_wayland
- dep_wl_scanner = dependency('wayland-scanner', native: true)
-- prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner'))
-+ prog_wl_scanner = get_option('wayland-scanner-path')
-+ if prog_wl_scanner == ''
-+ prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner'))
-+ endif
- if dep_wl_scanner.version().version_compare('>= 1.15')
- wl_scanner_arg = 'private-code'
- else
-diff --git a/meson_options.txt b/meson_options.txt
-index ccf70659ff7..59ff8df8337 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -324,3 +324,9 @@ option(
- value : true,
- description : 'Enable direct rendering in GLX and EGL for DRI',
- )
-+option(
-+ 'wayland-scanner-path',
-+ type : 'string',
-+ value : '',
-+ description : 'Locations to wayland-scanner binary. Default: use path from pkg-config'
-+)
---
-2.20.1
-
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index e1fc2511a2..531dcf5b81 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -192,7 +192,6 @@ endif
ifeq ($(BR2_PACKAGE_WAYLAND),y)
MESA3D_DEPENDENCIES += wayland wayland-protocols
MESA3D_PLATFORMS += wayland
-MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner
endif
ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_X11),y)
MESA3D_DEPENDENCIES += \
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/mesa3d: drop pkgconfig workaround
2020-05-02 0:25 [Buildroot] [PATCH 1/1] package/mesa3d: drop pkgconfig workaround James Hilliard
@ 2020-05-02 16:30 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2020-05-02 16:30 UTC (permalink / raw)
To: buildroot
James, All,
On 2020-05-01 18:25 -0600, James Hilliard spake thusly:
> This workaround is not needed as of commit
> 5cff3a8bdfba92e9f61d0984df08f1ecd205c072 which properly sets the
> PKG_CONFIG_LIBDIR for native: true dependencies.
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...d-scanner-provided-by-wayland-scanne.patch | 52 -------------------
> package/mesa3d/mesa3d.mk | 1 -
> 2 files changed, 53 deletions(-)
> delete mode 100644 package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch
>
> diff --git a/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch b/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch
> deleted file mode 100644
> index 784b27c4a2..0000000000
> --- a/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -From 0e107f7bac8d84d8fb2bb5b83bfb4474348a82c1 Mon Sep 17 00:00:00 2001
> -From: Romain Naour <romain.naour@smile.fr>
> -Date: Wed, 17 Apr 2019 22:47:05 +0200
> -Subject: [PATCH] meson: use wayland-scanner provided by wayland-scanner-path
> -
> -When cross-compiling the .pc file might point to the wrong
> -wayland-scanner binary (target rather than host) resulting in a
> -non-executable and wrong scanner.
> -First try by using the path provided by wayland-scanner-path,
> -and if that fails fall back into pkg-config.
> -
> -Based on the patch for autotools provided by Gustavo Zacarias.
> -
> -Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ----
> - meson.build | 5 ++++-
> - meson_options.txt | 6 ++++++
> - 2 files changed, 10 insertions(+), 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 6c4f1508855..ef0532b2cfb 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -1319,7 +1319,10 @@ endif
> -
> - if with_platform_wayland
> - dep_wl_scanner = dependency('wayland-scanner', native: true)
> -- prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner'))
> -+ prog_wl_scanner = get_option('wayland-scanner-path')
> -+ if prog_wl_scanner == ''
> -+ prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner'))
> -+ endif
> - if dep_wl_scanner.version().version_compare('>= 1.15')
> - wl_scanner_arg = 'private-code'
> - else
> -diff --git a/meson_options.txt b/meson_options.txt
> -index ccf70659ff7..59ff8df8337 100644
> ---- a/meson_options.txt
> -+++ b/meson_options.txt
> -@@ -324,3 +324,9 @@ option(
> - value : true,
> - description : 'Enable direct rendering in GLX and EGL for DRI',
> - )
> -+option(
> -+ 'wayland-scanner-path',
> -+ type : 'string',
> -+ value : '',
> -+ description : 'Locations to wayland-scanner binary. Default: use path from pkg-config'
> -+)
> ---
> -2.20.1
> -
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index e1fc2511a2..531dcf5b81 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -192,7 +192,6 @@ endif
> ifeq ($(BR2_PACKAGE_WAYLAND),y)
> MESA3D_DEPENDENCIES += wayland wayland-protocols
> MESA3D_PLATFORMS += wayland
> -MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner
> endif
> ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_X11),y)
> MESA3D_DEPENDENCIES += \
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-02 16:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-02 0:25 [Buildroot] [PATCH 1/1] package/mesa3d: drop pkgconfig workaround James Hilliard
2020-05-02 16:30 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox