From patchwork Thu Mar 11 20:18:41 2021 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: 1451524 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=dawncrow.de header.i=@dawncrow.de header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=IQ/XBoHp; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DxL612QFxz9sS8 for ; Fri, 12 Mar 2021 07:24:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 12D83843A0; Thu, 11 Mar 2021 20:24:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vqOAlNPfwLhs; Thu, 11 Mar 2021 20:24:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 3DA7C8437E; Thu, 11 Mar 2021 20:24:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E89A31BF421 for ; Thu, 11 Mar 2021 20:24:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D7AA08437E for ; Thu, 11 Mar 2021 20:24:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9HHLnsBw2uxc for ; Thu, 11 Mar 2021 20:24:50 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.25]) by smtp1.osuosl.org (Postfix) with ESMTPS id 7E4F383E85 for ; Thu, 11 Mar 2021 20:24:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1615493927; cv=none; d=strato.com; s=strato-dkim-0002; b=m89f6NUxeR36MLyzrp/D11rCb4UqBXiUHeTztdUyGs0gGwladV4pEA+oDv9SrdwWIj DLp/ci/fnTZ9FbzlH8taqfoMc5FvxgBI8B3SVBhjRsNmPzDG8xqx2JFwNe0TQ3cOKUBj JOoJQm6HyRj4XwymC9oQwJUfni4C7FKqUuAjFVrgV0q8CrkXHSkitAOt07wEpv7q3VPX xubLlJkG1+2RC8M3fBll5+8hGbyc9D1F/tYGZUOqU8nEG2LuWo5zZM1ElYq3UaRRxrHo QKAabRjntF/yQd+GRbzeAQCtKqhut5Ca9y7NBcmLdv3OCZATW7OV3kG5cTts4UnSyK/f 3jFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1615493927; s=strato-dkim-0002; d=strato.com; h=Message-Id:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=26M43IxlRmjqoXROJL3ecBYm9wCKZewoFbOjVm1fDeo=; b=C/OigvtlJxRfb2Iw3/E0eSY6tlsFxKJBhH/vH+MyMoeDqtJNF+4tKDHVZ7nEOhmqJ8 zoOIKoN8IHAbNjcZyCHwYTPXOUaITYL7pQ7J3LH7Puss9vxG4MCLjTsJ5B+kz/o9Xmkn 85oMRTtyR2UYcsl+pphxyIy7V5wN8NM6ZJS7SDhQR4iThQOB/PmGlNJw0VX70FyRqqTa VmKgPPWOMxR66p+6+nCeadlmNrGHz0qZCGJUeSU4/1ky4EiAAV1E5mvisb4DHe7yngn+ Z0gqeLCODkJvpGrEXlKh6tIaDJjhkbRvfUyhq+9fioUXd+gPcLSLhYeJ93+Mjbzj+FdP DiHw== ARC-Authentication-Results: i=1; strato.com; dkim=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1615493927; s=strato-dkim-0002; d=dawncrow.de; h=Message-Id:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=26M43IxlRmjqoXROJL3ecBYm9wCKZewoFbOjVm1fDeo=; b=IQ/XBoHpzx+jl9e4RE5Vk2hYmeJp3eCL+qbtKvHAoLNv/qmwgw/8f6CzM1INMJ0Ijv jKJ4tvxJQ5mjBnPMZLhyLNGT3H5yDmOdrMJrWp4e+1aDm1rsi7OKg/yQXfrCAWShtra6 5FERgCsggTFrB7RyjEhFlQCHTXivZS7utumkqt7lEKMUqhbDdpHxx5AgcIeRsBk3XXVe KG9vOJaTLD4L6e8Gy08FfVNLOF8csdz5mplkuPIWkLkQ2tLhYV/iHZ0Vw0ZqM8tGMJbM 55D+FURcnCisNzjg7vuK18eCty9CgRbovGrZvi01OgVEHsokcqFfGqYka2nH6lx6lhmV 7gBA== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":ImkWY2CseuihIZy6ZWWciR6unPhpN+aXzZGGjY6ptdusOaLnXzn3ovD/FrFaWSk=" X-RZG-CLASS-ID: mo00 Received: from tesla.fritz.box by smtp.strato.de (RZmta 47.20.3 DYNA|AUTH) with ESMTPSA id y0b77ax2BKIlVwH (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Thu, 11 Mar 2021 21:18:47 +0100 (CET) From: =?utf-8?q?Andr=C3=A9_Hentschel?= To: buildroot@buildroot.org Date: Thu, 11 Mar 2021 21:18:41 +0100 Message-Id: <20210311201841.992134-1-nerv@dawncrow.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCHv2] package/wine: bump to version 6.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" Starting with this Wine version many things changed. zlib, ncurses and GLU are no longer used. I also explicitly disabled mingw, as otherwise my host mingw-w64 was picked up. The build system was refactored, so now we have to build the host tools in their directories instead of asking for them to be built. Signed-off-by: André Hentschel --- package/wine/wine.hash | 4 ++-- package/wine/wine.mk | 47 +++++++++++------------------------------- 2 files changed, 14 insertions(+), 37 deletions(-) diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 08abccb4a8..083e3dd3eb 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 87f17254c6794ec6eeb7020b164c859983c9df0dacdd66d6449ff000498c842e wine-5.12.tar.xz +sha256 b493065f2f83ee429c62e2ec58698a3cf63ef78722e1b20765823152e8582c56 wine-6.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 f3ca909e68d38c972e8ded5248b4745958dbb26f2e581ad73cfbedb6b0408e58 LICENSE +sha256 111398f1be25b1ae1f124512fe61569e6b4555408e2feb9bc82f9fe57d39b302 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 80c9d20d3d..f1b76736ad 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 5.12 +WINE_VERSION = 6.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/5.x +WINE_SITE = https://dl.winehq.org/wine/source/6.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -26,6 +26,7 @@ WINE_CONF_OPTS = \ --without-gphoto \ --without-gsm \ --without-hal \ + --without-mingw \ --without-opencl \ --without-oss \ --without-vkd3d \ @@ -118,13 +119,6 @@ else WINE_CONF_OPTS += --without-opengl endif -ifeq ($(BR2_PACKAGE_LIBGLU),y) -WINE_CONF_OPTS += --with-glu -WINE_DEPENDENCIES += libglu -else -WINE_CONF_OPTS += --without-glu -endif - ifeq ($(BR2_PACKAGE_LIBKRB5),y) WINE_CONF_OPTS += --with-krb5 WINE_DEPENDENCIES += libkrb5 @@ -183,13 +177,6 @@ else WINE_CONF_OPTS += --without-mpg123 endif -ifeq ($(BR2_PACKAGE_NCURSES),y) -WINE_CONF_OPTS += --with-curses -WINE_DEPENDENCIES += ncurses -else -WINE_CONF_OPTS += --without-curses -endif - ifeq ($(BR2_PACKAGE_OPENAL),y) WINE_CONF_OPTS += --with-openal WINE_DEPENDENCIES += openal @@ -317,13 +304,6 @@ else WINE_CONF_OPTS += --without-xxf86vm endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -WINE_CONF_OPTS += --with-zlib -WINE_DEPENDENCIES += zlib -else -WINE_CONF_OPTS += --without-zlib -endif - # host-gettext is essential for .po file support in host-wine wrc ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) HOST_WINE_DEPENDENCIES += host-gettext @@ -340,14 +320,13 @@ endif # Wine only needs the host tools to be built, so cut-down the # build time by building just what we need. define HOST_WINE_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ - tools \ - tools/sfnt2fon \ - tools/widl \ - tools/winebuild \ - tools/winegcc \ - tools/wmc \ - tools/wrc + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools/sfnt2fon + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools/widl + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools/winebuild + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools/winegcc + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools/wmc + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools/wrc endef # Wine only needs its host variant to be built, not that it is @@ -368,11 +347,9 @@ HOST_WINE_CONF_OPTS += \ --without-coreaudio \ --without-faudio \ --without-cups \ - --without-curses \ --without-dbus \ --without-fontconfig \ --without-gphoto \ - --without-glu \ --without-gnutls \ --without-gsm \ --without-gssapi \ @@ -381,6 +358,7 @@ HOST_WINE_CONF_OPTS += \ --without-jpeg \ --without-krb5 \ --without-ldap \ + --without-mingw \ --without-mpg123 \ --without-netapi \ --without-openal \ @@ -410,8 +388,7 @@ HOST_WINE_CONF_OPTS += \ --without-xshape \ --without-xshm \ --without-xslt \ - --without-xxf86vm \ - --without-zlib + --without-xxf86vm $(eval $(autotools-package)) $(eval $(host-autotools-package))