All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/wine: update dependencies for 5.12
@ 2020-10-30 14:25 André Hentschel
  2020-10-31 15:05 ` Thomas Petazzoni
  2020-11-02 21:58 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: André Hentschel @ 2020-10-30 14:25 UTC (permalink / raw
  To: buildroot

Signed-off-by: Andr? Hentschel <nerv@dawncrow.de>
---
 package/wine/wine.mk | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/package/wine/wine.mk b/package/wine/wine.mk
index 7d7b22a137..7eafe9b06d 100644
--- a/package/wine/wine.mk
+++ b/package/wine/wine.mk
@@ -145,11 +145,18 @@ else
 WINE_CONF_OPTS += --without-png
 endif
 
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
+WINE_CONF_OPTS += --with-usb
+WINE_DEPENDENCIES += libusb
+else
+WINE_CONF_OPTS += --without-usb
+endif
+
 ifeq ($(BR2_PACKAGE_LIBV4L),y)
-WINE_CONF_OPTS += --with-v4l
+WINE_CONF_OPTS += --with-v4l2
 WINE_DEPENDENCIES += libv4l
 else
-WINE_CONF_OPTS += --without-v4l
+WINE_CONF_OPTS += --without-v4l2
 endif
 
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
@@ -386,7 +393,8 @@ HOST_WINE_CONF_OPTS += \
 	--without-sane \
 	--without-sdl \
 	--without-tiff \
-	--without-v4l \
+	--without-usb \
+	--without-v4l2 \
 	--without-vkd3d \
 	--without-vulkan \
 	--without-x \
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] package/wine: update dependencies for 5.12
  2020-10-30 14:25 [Buildroot] [PATCH] package/wine: update dependencies for 5.12 André Hentschel
@ 2020-10-31 15:05 ` Thomas Petazzoni
  2020-11-02 21:58 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2020-10-31 15:05 UTC (permalink / raw
  To: buildroot

On Fri, 30 Oct 2020 15:25:29 +0100
Andr? Hentschel <nerv@dawncrow.de> wrote:

> Signed-off-by: Andr? Hentschel <nerv@dawncrow.de>
> ---
>  package/wine/wine.mk | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)

Applied to master with an extended commit log. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] package/wine: update dependencies for 5.12
  2020-10-30 14:25 [Buildroot] [PATCH] package/wine: update dependencies for 5.12 André Hentschel
  2020-10-31 15:05 ` Thomas Petazzoni
@ 2020-11-02 21:58 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-11-02 21:58 UTC (permalink / raw
  To: buildroot

>>>>> "Andr?" == Andr? Hentschel <nerv@dawncrow.de> writes:

 > Signed-off-by: Andr? Hentschel <nerv@dawncrow.de>

Committed to 2020.08.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-11-02 21:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-30 14:25 [Buildroot] [PATCH] package/wine: update dependencies for 5.12 André Hentschel
2020-10-31 15:05 ` Thomas Petazzoni
2020-11-02 21:58 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.