From patchwork Sat Feb 9 16:35:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Zwing?= X-Patchwork-Id: 1039257 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=dawncrow.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=dawncrow.de header.i=@dawncrow.de header.b="JBae6b4+"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43xd3F4d0Tz9sMr for ; Sun, 10 Feb 2019 03:36:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 66A6A87029; Sat, 9 Feb 2019 16:36:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mO3OTl6feq6i; Sat, 9 Feb 2019 16:36:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 95FB186A07; Sat, 9 Feb 2019 16:36:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2DE4D1BF5F8 for ; Sat, 9 Feb 2019 16:36:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 28DDF2202E for ; Sat, 9 Feb 2019 16:36:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DkAJA-PXDbUH for ; Sat, 9 Feb 2019 16:36:02 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.22]) by silver.osuosl.org (Postfix) with ESMTPS id C740C2076E for ; Sat, 9 Feb 2019 16:36:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1549730159; s=strato-dkim-0002; d=dawncrow.de; h=Message-Id:Date:Subject:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=nRqXxhR7akDpmiic5BgZLNCwQHhMyC/b0MS7BIxca1Q=; b=JBae6b4+LJ6BARoPY+KaVpNpz+4i5jQijc77+++jK/B0R4PPGywGj8eKrNKG2sNDO9 T6lF9KXB/xWF4Sx+tgHmva/ZKD+HUHLphDTs0MWeAQrPW/0JvYdbTz7FplRhASknqeeC Oqmn1fh2UGzyzJ1zdZ4RhKvysW+s15vsSKFmF3JMEKktPbVQMnM6OXl4Q4J/sJYZb5V6 5v1e+pYe8UUSqHRuWkRMoF6qpt89wg7v240e5BjsessW+MKqZVkcCBOX8Kqr2nUabgab Pnk1U8AOSdI07X/UNNIrLg4Va6zCWQgbGAyKRt0zzjuXwoar2sbf4GV/HJA4NH7L9KkY UOHw== X-RZG-AUTH: ":ImkWY2CseuihIZy6ZWWciR6unPhpN+aXzZGGjY6ptdusOaLnXzr3om3WkRTaB9I=" X-RZG-CLASS-ID: mo00 Received: from tesla.fritz.box by smtp.strato.de (RZmta 44.9 DYNA|AUTH) with ESMTPSA id f00a20v19GZxBsr (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate) for ; Sat, 9 Feb 2019 17:35:59 +0100 (CET) From: =?utf-8?q?Andr=C3=A9_Hentschel?= To: buildroot@buildroot.org Date: Sat, 9 Feb 2019 17:35:55 +0100 Message-Id: <20190209163555.17097-1-nerv@dawncrow.de> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] wine: Bump to version 4.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: André Hentschel --- package/wine/wine.hash | 2 +- package/wine/wine.mk | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/package/wine/wine.hash b/package/wine/wine.hash index ba007142e8..6993d6ecbc 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 d45a88edbe7db363e297cacedc94e66df3464504a01c2eccf04f518066a6fb0c wine-3.0.4.tar.xz +sha256 6736cdee95b2b8bb021ec0c19497ed8cad5ae2c8bfdb7ab5dc687ff92a480d4d wine-4.0.tar.xz diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 7e44e3c81d..78fa860ecf 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 3.0.4 +WINE_VERSION = 4.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/3.0 +WINE_SITE = https://dl.winehq.org/wine/source/4.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_DEPENDENCIES = host-bison host-flex host-wine @@ -25,7 +25,9 @@ WINE_CONF_OPTS = \ --without-gsm \ --without-hal \ --without-opencl \ - --without-oss + --without-oss \ + --without-vkd3d \ + --without-vulkan # Wine uses a wrapper around gcc, and uses the value of --host to # construct the filename of the gcc to call. But for external @@ -222,6 +224,13 @@ else WINE_CONF_OPTS += --without-sane endif +ifeq ($(BR2_PACKAGE_SDL2),y) +WINE_CONF_OPTS += --with-sdl +WINE_DEPENDENCIES += sdl2 +else +WINE_CONF_OPTS += --without-sdl +endif + ifeq ($(BR2_PACKAGE_TIFF),y) WINE_CONF_OPTS += --with-tiff WINE_DEPENDENCIES += tiff @@ -356,6 +365,7 @@ HOST_WINE_CONF_OPTS += \ --without-glu \ --without-gnutls \ --without-gsm \ + --without-gssapi \ --without-gstreamer \ --without-hal \ --without-jpeg \ @@ -372,8 +382,11 @@ HOST_WINE_CONF_OPTS += \ --without-pulse \ --without-png \ --without-sane \ + --without-sdl \ --without-tiff \ --without-v4l \ + --without-vkd3d \ + --without-vulkan \ --without-x \ --without-xcomposite \ --without-xcursor \