Переглянути джерело

package/wine: bump to version 9.19

For a summary of changes since 8.0.2, see:
https://www.winehq.org/news/

This commit adds the sha512 hash published on the download site.
The LICENSE hash also changed, due to a year update.

This commit also adds new optional dependencies for:
xlib_libXfixes, ffmpeg, pcsc-lite, and wayland.

All new build options are disabled in HOST_WINE_CONF_OPTS:
ffmpeg, pcsc-lite, udev, wayland and xfixes.

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Julien Olivain 10 місяців тому
батько
коміт
7cb49e7712
2 змінених файлів з 40 додано та 4 видалено
  1. 5 2
      package/wine/wine.hash
  2. 35 2
      package/wine/wine.mk

+ 5 - 2
package/wine/wine.hash

@@ -1,5 +1,8 @@
+# From:
+# https://dl.winehq.org/wine/source/9.x/sha512sums.asc
+sha512  530219c6a337f2996eac92d644ab603528b82cc6136cc37c1e6aa736d418f33c6f4b0d54f3537b04bceaf4487d84abcf926a2f5e9536ed4e966c4fe63c5b6ddd  wine-9.19.tar.xz
 # Locally calculated after checking pgp signature
-sha256  6ec8fb6f2c72d576cb11f52b2f8d59af64404802154651d122b98466d91dc847  wine-8.0.2.tar.xz
+sha256  2c13a0c3f31f25a54d415d86785a1ad46ef8a07ae973b6b699345a45206ac015  wine-9.19.tar.xz
 # Locally calculated
 sha256  e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c  COPYING.LIB
-sha256  793d045546467c8f49e35fbd6e02859e57e78f8bb53571e8200bffd0e966dfa8  LICENSE
+sha256  51433d87540ee2f30e3cff986e00e1477880002bf993106a13775ed60d4e0af4  LICENSE

+ 35 - 2
package/wine/wine.mk

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-WINE_VERSION = 8.0.2
+WINE_VERSION = 9.19
 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz
-WINE_SITE = https://dl.winehq.org/wine/source/8.0
+WINE_SITE = https://dl.winehq.org/wine/source/9.x
 WINE_LICENSE = LGPL-2.1+
 WINE_LICENSE_FILES = COPYING.LIB LICENSE
 WINE_CPE_ID_VENDOR = winehq
@@ -62,6 +62,13 @@ else
 WINE_CONF_OPTS += --without-dbus
 endif
 
+ifeq ($(BR2_PACKAGE_FFMPEG),y)
+WINE_CONF_OPTS += --with-ffmpeg
+WINE_DEPENDENCIES += ffmpeg
+else
+WINE_CONF_OPTS += --without-ffmpeg
+endif
+
 ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
 WINE_CONF_OPTS += --with-fontconfig
 WINE_DEPENDENCIES += fontconfig
@@ -137,6 +144,13 @@ else
 WINE_CONF_OPTS += --without-osmesa
 endif
 
+ifeq ($(BR2_PACKAGE_PCSC_LITE),y)
+WINE_CONF_OPTS += --with-pcsclite
+WINE_DEPENDENCIES += pcsc-lite
+else
+WINE_CONF_OPTS += --without-pcsclite
+endif
+
 ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
 WINE_CONF_OPTS += --with-pulse
 WINE_DEPENDENCIES += pulseaudio
@@ -173,6 +187,13 @@ else
 WINE_CONF_OPTS += --without-udev
 endif
 
+ifeq ($(BR2_PACKAGE_WAYLAND),y)
+WINE_CONF_OPTS += --with-wayland
+WINE_DEPENDENCIES += wayland
+else
+WINE_CONF_OPTS += --without-wayland
+endif
+
 ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
 WINE_CONF_OPTS += --with-x
 WINE_DEPENDENCIES += xlib_libX11
@@ -201,6 +222,13 @@ else
 WINE_CONF_OPTS += --without-xshape --without-xshm
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y)
+WINE_CONF_OPTS += --with-xfixes
+WINE_DEPENDENCIES += xlib_libXfixes
+else
+WINE_CONF_OPTS += --without-xfixes
+endif
+
 ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y)
 WINE_CONF_OPTS += --with-xinput --with-xinput2
 WINE_DEPENDENCIES += xlib_libXi
@@ -272,6 +300,7 @@ HOST_WINE_CONF_OPTS += \
 	--without-coreaudio \
 	--without-cups \
 	--without-dbus \
+	--without-ffmpeg \
 	--without-fontconfig \
 	--without-gphoto \
 	--without-gnutls \
@@ -285,15 +314,19 @@ HOST_WINE_CONF_OPTS += \
 	--without-osmesa \
 	--without-oss \
 	--without-pcap \
+	--without-pcsclite \
 	--without-pulse \
 	--without-sane \
 	--without-sdl \
+	--without-udev \
 	--without-usb \
 	--without-v4l2 \
 	--without-vulkan \
+	--without-wayland \
 	--without-x \
 	--without-xcomposite \
 	--without-xcursor \
+	--without-xfixes \
 	--without-xinerama \
 	--without-xinput \
 	--without-xinput2 \