diff --git a/.checkpackageignore b/.checkpackageignore index e72e59b644..199881eee8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1129,7 +1129,6 @@ package/vlc/0004-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch lib_pa package/vlc/0005-Don-t-assume-strerror_l-is-available.patch lib_patch.Upstream package/vlc/0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch lib_patch.Upstream package/vlc/0007-Add-support-for-freerdp2.patch lib_patch.Upstream -package/vlc/0008-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch lib_patch.Upstream package/vlc/0009-modules-video_filter-opencv_example.cpp-fix-build-wi.patch lib_patch.Upstream package/vlc/0010-opengl-missing-library-check.patch lib_patch.Upstream package/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch lib_patch.Upstream diff --git a/package/vlc/0008-configure-make-it-possible-to-override-wayland-scann.patch b/package/vlc/0008-configure-make-it-possible-to-override-wayland-scann.patch new file mode 100644 index 0000000000..b89687ec74 --- /dev/null +++ b/package/vlc/0008-configure-make-it-possible-to-override-wayland-scann.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Yann Lochet +Date: Fri, 25 Nov 2022 16:20:45 +0100 +Subject: [PATCH] configure: make it possible to override wayland-scanner + +When cross-compiling, PKG_CONFIG might pick up the wayland-scanner +from the sysroot. + +Upstream: https://code.videolan.org/videolan/vlc/-/commit/75e52f617bf3273f4883b56c4175d68211e02d14 + +[Bernd: rebased for 3.0.23] +Signed-off-by: Bernd Kuhls +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index a91fc73172..5e8821dea9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3277,6 +3277,7 @@ AS_IF([test "${enable_wayland}" = "yes"], [ + ]) + + AC_MSG_CHECKING([for the Wayland scanner]) ++ AS_VAR_SET_IF(WAYLAND_SCANNER, [],[ + PKG_CHECK_EXISTS([wayland-scanner], [ + WAYLAND_SCANNER="$(${PKG_CONFIG} wayland-scanner --variable wayland_scanner)" + AC_MSG_RESULT([${WAYLAND_SCANNER}]) +@@ -3284,6 +3285,7 @@ AS_IF([test "${enable_wayland}" = "yes"], [ + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([$(${PKG_CONFIG} --print-errors wayland-scanner)]) + ]) ++ ]) + + have_wayland="yes" + +-- +2.47.3 + diff --git a/package/vlc/0008-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch b/package/vlc/0008-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch deleted file mode 100644 index 2b74fe0d39..0000000000 --- a/package/vlc/0008-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 -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 ---- - 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 - diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index a878a78181..58dade040a 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -539,6 +539,7 @@ VLC_CONF_OPTS += --disable-udev endif ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WAYLAND_PROTOCOLS),yy) +VLC_CONF_ENV += WAYLAND_SCANNER=$(HOST_DIR)/bin/wayland-scanner VLC_CONF_OPTS += --enable-wayland VLC_DEPENDENCIES += wayland wayland-protocols else