From patchwork Wed Feb 1 19:21:57 2023 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: 1735834 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P6XDB68ZFz23j9 for ; Thu, 2 Feb 2023 06:34:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C915B4051E; Wed, 1 Feb 2023 19:34:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C915B4051E X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ff39X1whpKsY; Wed, 1 Feb 2023 19:34:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 9420640541; Wed, 1 Feb 2023 19:34:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9420640541 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 8FDC71BF31A for ; Wed, 1 Feb 2023 19:34:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 6A63A40B79 for ; Wed, 1 Feb 2023 19:34:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6A63A40B79 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U_to8QqmuZEf for ; Wed, 1 Feb 2023 19:34:09 +0000 (UTC) X-Greylist: delayed 00:06:01 by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org CE43B40B7D Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.21]) by smtp2.osuosl.org (Postfix) with ESMTPS id CE43B40B7D for ; Wed, 1 Feb 2023 19:34:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1675279321; cv=none; d=strato.com; s=strato-dkim-0002; b=mlV+iiaRbXAMzFgMj4sk+Donx2F4BwmRGGn4oYxsf+NdsJmlYIOw8/Vn7TKMwiU49p n5iM6IAB2isBzdsSdu9vHBUC6koZUj47TLXOHLnXHsnSy6hEh9H6UDpkz73q8ncRogd8 GOESw1ti7Usva0ad2HLUFm6/ufWX1VBFU9u1bJDPl8lt1ehy6KkAySYWiMeiFelX+t0y tt7WHMrmOXDtgxyKFGjU2xPBL21pANT6u8MnomBjL5OQmXNe0MAa8P0fOyNhidlN0GuH sJpmgijWxvynTCN39IilnfDhbrFg9D0Kn38oLvgrmZE0E6d4M1JsCMWOjj2Es7vkjKGQ RHhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1675279321; s=strato-dkim-0002; d=strato.com; h=Message-Id:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=MZiZVr4lpMZRd3vCHAAv+fQyc/OQ93h5iIY9Y9baDpU=; b=gU0ctAblj131U3HpIce2Tt0uboHsL7MPunenI9qpITW36/rxH7x5KrzwC5Fo6dU1mn NFXJv2hlrPwUwO5XsoBA0mGNMLnrKiDIa0JXZzoH8K76Xz6fZKZgQr1qE083eifP4gTV bwEeQEGBvAGbyiLysiuFAhoeNPkEYSqg+UC2No+zv5XzlawnUlGBfAy2qEKI3diyobYN E/vRvuNlDPWLaJ97smnCTPKEDK83SL7IcHginJ26XtLr6VN5EuodA2MKtoi+WjQnsydY 6p9nRFkFyXifvVRljf8dk0iPva2Ugrq4uiViTuxIf8GlM+M+I/P/iUdwgQivdoqnC9o5 qB6g== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 X-RZG-AUTH: ":ImkWY2CseuihIZy6ZWWciR6unPhpN+aXzZGGjY6ptdusOK7nWzzuvt/yikxl+SKU" Received: from tesla.fritz.box by smtp.strato.de (RZmta 49.2.2 DYNA|AUTH) with ESMTPSA id xd73d3z11JM1ZaS (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Wed, 1 Feb 2023 20:22:01 +0100 (CET) From: =?utf-8?q?Andr=C3=A9_Zwing?= To: buildroot@buildroot.org Date: Wed, 1 Feb 2023 20:21:57 +0100 Message-Id: <20230201192157.1631613-1-nerv@dawncrow.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1675279321; s=strato-dkim-0002; d=dawncrow.de; h=Message-Id:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=MZiZVr4lpMZRd3vCHAAv+fQyc/OQ93h5iIY9Y9baDpU=; b=FbINgYhpGu4W6YL0ScawG+eN2yZ4VJenIVRQiCjSp2Hi3rxqgfpiz1NSzkIedVLHOC 7y9Xp0rfYeve3vVWDHTzWGwNeJIIXnWQYtZFdF+F1Aa590C4e42/V+/fFtHVvqE3LiwF qKjIDRpEthiJT8i8cl4WSUbzdHFOHdfkF1X2l23+3tDqU5xIMlVC9r3DveKrn4zzs7me 6grzGKGcECYUx1MpBlQkqvyLN3U8QFYtVZ7aRzYdQ37eF+NWLwGKkKGXJsR54467gOeu 8xFz9hbB/ka0JCaw4KAatJCbbrGymqE+afTN0TjW7a7hVcIxpGNvoeksy2mzUkKsIUPs GCNw== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=dawncrow.de header.i=@dawncrow.de header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=FbINgYhp Subject: [Buildroot] [PATCH] package/wine: bump to version 8.0 X-BeenThere: buildroot@buildroot.org 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@buildroot.org Sender: "buildroot" Multiple library checks are obsolete, either due to removal or due to built-in solutions. License file changed due to update of copyright year. Signed-off-by: André Zwing --- ...a-avoid-mpg123-functions-with-suffix.patch | 21 ----------- ...d-avoid-mpg123-functions-with-suffix.patch | 21 ----------- package/wine/wine.hash | 4 +-- package/wine/wine.mk | 35 ++----------------- 4 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch delete mode 100644 package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch diff --git a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch b/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 8332db4b38..0000000000 --- a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 75b70efdaa2d4baa064271098878b79f66df155f -Author: André Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - l3codeca.acm: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/75b70efdaa2d4baa064271098878b79f66df155f] -Signed-off-by: André Zwing - -diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in -index 451794b2624..31765766d4e 100644 ---- a/dlls/l3codeca.acm/Makefile.in -+++ b/dlls/l3codeca.acm/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = l3codeca.acm - IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mpegl3.c diff --git a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch b/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 16f2ba2898..0000000000 --- a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 8d441659f7c7ae359e06a99e7abaae57792356a0 -Author: André Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - mp3dmod: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/8d441659f7c7ae359e06a99e7abaae57792356a0] -Signed-off-by: André Zwing - -diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in -index dabbb1dfeae..3ba343a4d34 100644 ---- a/dlls/mp3dmod/Makefile.in -+++ b/dlls/mp3dmod/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = mp3dmod.dll - IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mp3dmod.c diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 9a7a1c342a..b87964da12 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b wine-7.0.tar.xz +sha256 0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e wine-8.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 7c360930e51d56c8fa12fe1df8ed348ac77a9ad73f9582a303919469399b3ce4 LICENSE +sha256 793d045546467c8f49e35fbd6e02859e57e78f8bb53571e8200bffd0e966dfa8 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index a1c65bef4e..a629bf0dd6 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 7.0 +WINE_VERSION = 8.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/7.0 +WINE_SITE = https://dl.winehq.org/wine/source/8.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -27,7 +27,6 @@ WINE_CONF_OPTS = \ --without-mingw \ --without-opencl \ --without-oss \ - --without-vkd3d \ --without-vulkan # Wine uses a wrapper around gcc, and uses the value of --host to @@ -131,20 +130,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_OPENAL),y) -WINE_CONF_OPTS += --with-openal -WINE_DEPENDENCIES += openal -else -WINE_CONF_OPTS += --without-openal -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -WINE_CONF_OPTS += --with-ldap -WINE_DEPENDENCIES += openldap -else -WINE_CONF_OPTS += --without-ldap -endif - ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d @@ -266,19 +251,8 @@ endif # Wine only needs the host tools to be built, so cut-down the # build time by building just what we need. -HOST_WINE_TOOLS = \ - tools \ - tools/sfnt2fon \ - tools/widl \ - tools/winebuild \ - tools/winegcc \ - tools/wmc \ - tools/wrc - define HOST_WINE_BUILD_CMDS - $(foreach t, $(HOST_WINE_TOOLS), - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/$(t) - ) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) __tooldeps__ endef # Wine only needs its host variant to be built, not that it is @@ -304,10 +278,8 @@ HOST_WINE_CONF_OPTS += \ --without-gssapi \ --without-gstreamer \ --without-krb5 \ - --without-ldap \ --without-mingw \ --without-netapi \ - --without-openal \ --without-opencl \ --without-opengl \ --without-osmesa \ @@ -318,7 +290,6 @@ HOST_WINE_CONF_OPTS += \ --without-sdl \ --without-usb \ --without-v4l2 \ - --without-vkd3d \ --without-vulkan \ --without-x \ --without-xcomposite \