summaryrefslogtreecommitdiffstats
path: root/package/vlc/0011-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2018-09-06 22:18:41 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-09-08 15:39:11 +0200
commitfd4abc30d2c21617a43d9ff19b7ab182c044f7c5 (patch)
treed3fc2de073c934640b25f4aa9fcadf53c352e2ba /package/vlc/0011-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
parent7620420758074fe49fe0944078a8cceb608096bc (diff)
downloadbuildroot-fd4abc30d2c21617a43d9ff19b7ab182c044f7c5.tar.gz
buildroot-fd4abc30d2c21617a43d9ff19b7ab182c044f7c5.zip
package/vlc: bump version to 3.0.4
Removed patch 0004, applied upstream. Renumbered remaining patches. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/vlc/0011-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch')
-rw-r--r--package/vlc/0011-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/package/vlc/0011-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch b/package/vlc/0011-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
deleted file mode 100644
index 2b74fe0d39..0000000000
--- a/package/vlc/0011-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 27635f902831fac898586f1f3dc98369f12582c9 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 26 Aug 2018 12:51:04 +0200
-Subject: [PATCH] configure.ac: also use AC_PATH_PROG to check for
- wayland-scanner
-
-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.
-Try searching the PATH first, and if that fails fall back into
-pkg-config.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- configure.ac | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4808b8becf..a18641ed23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3140,14 +3140,17 @@ AS_IF([test "${enable_wayland}" != "no"], [
- AC_MSG_ERROR([$(${PKG_CONFIG} --print-errors 'wayland-protocols >= 1.4')])
- ])
-
-- AC_MSG_CHECKING([for the Wayland scanner])
-- PKG_CHECK_EXISTS([wayland-scanner], [
-- WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)"
-- AC_MSG_RESULT([${WAYLAND_SCANNER}])
-- ], [
-- AC_MSG_RESULT([not found])
-- AC_MSG_ERROR([$(${PKG_CONFIG} --print-errors wayland-scanner)])
-- ])
-+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
-+ if test "x$WAYLAND_SCANNER" = x; then
-+ AC_MSG_CHECKING([for the Wayland scanner])
-+ PKG_CHECK_EXISTS([wayland-scanner], [
-+ WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)"
-+ AC_MSG_RESULT([${WAYLAND_SCANNER}])
-+ ], [
-+ AC_MSG_RESULT([not found])
-+ AC_MSG_ERROR([$(${PKG_CONFIG} --print-errors wayland-scanner)])
-+ ])
-+ fi
-
- have_wayland="yes"
-
---
-2.18.0
-
OpenPOWER on IntegriCloud