From patchwork Tue Jun 7 13:18:51 2022 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: 1639956 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.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=rM0IxotI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LHWTT622Kz9sFx for ; Tue, 7 Jun 2022 23:31:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2D7B8410EB; Tue, 7 Jun 2022 13:31:07 +0000 (UTC) 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 uhnebOPSWaIm; Tue, 7 Jun 2022 13:31:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id AECF940AFE; Tue, 7 Jun 2022 13:31:04 +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 065161BF360 for ; Tue, 7 Jun 2022 13:31:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E4E778416A for ; Tue, 7 Jun 2022 13:31:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=dawncrow.de 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 uBa3fTxZtLpB for ; Tue, 7 Jun 2022 13:31:00 +0000 (UTC) X-Greylist: delayed 00:12:04 by SQLgrey-1.8.0 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.20]) by smtp1.osuosl.org (Postfix) with ESMTPS id 98D8A82CD3 for ; Tue, 7 Jun 2022 13:31:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1654607934; s=strato-dkim-0002; d=dawncrow.de; h=Message-Id:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=gUodpZXM3iRJt0UkQSPV2wL2I9nQWR0RrnArg/uDCHc=; b=rM0IxotIZHOM8figNKol1/hTQrwOHqWr2MAuZJCynyEgtp75VxiO7W9iSZSy20olvM 13BVuZfR5tsFTuSdRwPy+lhB8gUiSU74on9EiNdQbGHADuS+So8CCHV8fWbGFQBKnZAe WocwlB5a/9+++6esMiU76wh4OtKsqGgoK7N8mO/syTUd/njnTjJapvutJs8X/q9DAeaG i8Yv33z0ZgpoH32mF9A+Gv62xgbgU0Ezi7eE2IeveBnMyPNobgqZyN1bp3suUuE3Y/0i Aj1JByEFWE9UzPpEZENJn3EroMFoMp+UVzYyux4GdXoFfcxDAfybVBU2ZANa6k1/l2FK gVog== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":ImkWY2CseuihIZy6ZWWciR6unPhpN+aXzZGGjY6ptdusOK7nWzzuvt/yikxt/E0=" X-RZG-CLASS-ID: mo00 Received: from tesla.fritz.box by smtp.strato.de (RZmta 47.45.0 DYNA|AUTH) with ESMTPSA id Q06403y57DIsDgl (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Tue, 7 Jun 2022 15:18:54 +0200 (CEST) From: =?utf-8?q?Andr=C3=A9_Zwing?= To: buildroot@buildroot.org Date: Tue, 7 Jun 2022 15:18:51 +0200 Message-Id: <20220607131851.57232-1-nerv@dawncrow.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/wine: bump to version 7.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. 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 | 68 +------------------ 4 files changed, 46 insertions(+), 68 deletions(-) create mode 100644 package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch create 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 new file mode 100644 index 0000000000..8332db4b38 --- /dev/null +++ b/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch @@ -0,0 +1,21 @@ +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 new file mode 100644 index 0000000000..16f2ba2898 --- /dev/null +++ b/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch @@ -0,0 +1,21 @@ +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 083e3dd3eb..9a7a1c342a 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 b493065f2f83ee429c62e2ec58698a3cf63ef78722e1b20765823152e8582c56 wine-6.0.tar.xz +sha256 5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b wine-7.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 111398f1be25b1ae1f124512fe61569e6b4555408e2feb9bc82f9fe57d39b302 LICENSE +sha256 7c360930e51d56c8fa12fe1df8ed348ac77a9ad73f9582a303919469399b3ce4 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index c925a58632..5f4d2ef6e3 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 6.0 +WINE_VERSION = 7.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/6.0 +WINE_SITE = https://dl.winehq.org/wine/source/7.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -21,12 +21,9 @@ WINE_CONF_OPTS = \ --disable-win64 \ --without-capi \ --without-coreaudio \ - --without-faudio \ --without-gettext \ --without-gettextpo \ --without-gphoto \ - --without-gsm \ - --without-hal \ --without-mingw \ --without-opencl \ --without-oss \ @@ -99,20 +96,6 @@ else WINE_CONF_OPTS += --without-gstreamer endif -ifeq ($(BR2_PACKAGE_JPEG),y) -WINE_CONF_OPTS += --with-jpeg -WINE_DEPENDENCIES += jpeg -else -WINE_CONF_OPTS += --without-jpeg -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -WINE_CONF_OPTS += --with-cms -WINE_DEPENDENCIES += lcms2 -else -WINE_CONF_OPTS += --without-cms -endif - ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) WINE_CONF_OPTS += --with-opengl WINE_DEPENDENCIES += libgl @@ -134,13 +117,6 @@ else WINE_CONF_OPTS += --without-pcap endif -ifeq ($(BR2_PACKAGE_LIBPNG),y) -WINE_CONF_OPTS += --with-png -WINE_DEPENDENCIES += libpng -else -WINE_CONF_OPTS += --without-png -endif - ifeq ($(BR2_PACKAGE_LIBUSB),y) WINE_CONF_OPTS += --with-usb WINE_DEPENDENCIES += libusb @@ -155,29 +131,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_LIBXML2),y) -WINE_CONF_OPTS += --with-xml -WINE_DEPENDENCIES += libxml2 -WINE_CONF_ENV += XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config -else -WINE_CONF_OPTS += --without-xml -endif - -ifeq ($(BR2_PACKAGE_LIBXSLT),y) -WINE_CONF_OPTS += --with-xslt -WINE_DEPENDENCIES += libxslt -WINE_CONF_ENV += XSLT_CONFIG=$(STAGING_DIR)/usr/bin/xslt-config -else -WINE_CONF_OPTS += --without-xslt -endif - -ifeq ($(BR2_PACKAGE_MPG123),y) -WINE_CONF_OPTS += --with-mpg123 -WINE_DEPENDENCIES += mpg123 -else -WINE_CONF_OPTS += --without-mpg123 -endif - ifeq ($(BR2_PACKAGE_OPENAL),y) WINE_CONF_OPTS += --with-openal WINE_DEPENDENCIES += openal @@ -228,13 +181,6 @@ else WINE_CONF_OPTS += --without-sdl endif -ifeq ($(BR2_PACKAGE_TIFF),y) -WINE_CONF_OPTS += --with-tiff -WINE_DEPENDENCIES += tiff -else -WINE_CONF_OPTS += --without-tiff -endif - ifeq ($(BR2_PACKAGE_HAS_UDEV),y) WINE_CONF_OPTS += --with-udev WINE_DEPENDENCIES += udev @@ -349,23 +295,17 @@ HOST_WINE_CONF_OPTS += \ --disable-win16 \ --without-alsa \ --without-capi \ - --without-cms \ --without-coreaudio \ - --without-faudio \ --without-cups \ --without-dbus \ --without-fontconfig \ --without-gphoto \ --without-gnutls \ - --without-gsm \ --without-gssapi \ --without-gstreamer \ - --without-hal \ - --without-jpeg \ --without-krb5 \ --without-ldap \ --without-mingw \ - --without-mpg123 \ --without-netapi \ --without-openal \ --without-opencl \ @@ -374,10 +314,8 @@ HOST_WINE_CONF_OPTS += \ --without-oss \ --without-pcap \ --without-pulse \ - --without-png \ --without-sane \ --without-sdl \ - --without-tiff \ --without-usb \ --without-v4l2 \ --without-vkd3d \ @@ -388,12 +326,10 @@ HOST_WINE_CONF_OPTS += \ --without-xinerama \ --without-xinput \ --without-xinput2 \ - --without-xml \ --without-xrandr \ --without-xrender \ --without-xshape \ --without-xshm \ - --without-xslt \ --without-xxf86vm $(eval $(autotools-package))