mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-01 21:23:51 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/vlc: replace wayland-scanner patch with upstream commit

Browse Source 
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls
2026-02-24 19:20:14 +01:00
committed by Thomas Petazzoni
parent 81e24e90bb
commit a659fa3bb5
4 changed files with 40 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpackageignore
View File

@@ -933,7 +933,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

39
package/vlc/0008-configure-make-it-possible-to-override-wayland-scann.patch Normal file
View File

@@ -0,0 +1,39 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Yann Lochet <yann@l0chet.fr>
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 <bernd@kuhls.net>
---
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

50
package/vlc/0008-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch
View File

@@ -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

1
package/vlc/vlc.mk
View File

@@ -527,6 +527,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