summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wulf C. Krueger <philantrop@exherbo.org> 2018-03-07 18:44:44 +0100
committerAvatar Wulf C. Krueger <philantrop@exherbo.org> 2018-03-07 18:44:44 +0100
commitbc0bd54108bc77a366bbdec3b5c6890cae7043e2 (patch)
tree0e1148762fa5666ebe4076e6252548ba21d69bdd
parentcadad92263c9590d3bc1e889c4866cbf32ea0e05 (diff)
downloadvirtualization-bc0bd54108bc77a366bbdec3b5c6890cae7043e2.tar.gz
virtualization-bc0bd54108bc77a366bbdec3b5c6890cae7043e2.tar.xz
Version bump to wine-3.3
Change-Id: Ifdf5e7330947f164bd2fcb8ebfb9d880709316be
-rw-r--r--packages/app-emulation/wine/wine-3.3.exheres-07
-rw-r--r--packages/app-emulation/wine/wine.exlib10
2 files changed, 14 insertions, 3 deletions
diff --git a/packages/app-emulation/wine/wine-3.3.exheres-0 b/packages/app-emulation/wine/wine-3.3.exheres-0
new file mode 100644
index 0000000..94cb8d5
--- /dev/null
+++ b/packages/app-emulation/wine/wine-3.3.exheres-0
@@ -0,0 +1,7 @@
+# Copyright 2009-2018 Wulf C. Krueger <philantrop@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require wine [ gecko_version=2.47 mono_version=4.7.1 compholio_version=${PV} ]
+
+PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/app-emulation/wine/wine.exlib b/packages/app-emulation/wine/wine.exlib
index 9848da9..1ab009f 100644
--- a/packages/app-emulation/wine/wine.exlib
+++ b/packages/app-emulation/wine/wine.exlib
@@ -22,7 +22,8 @@ MY_GECKO_NAME=${GECKO_NAME[${t%%-*}]}
unset t
MONO_NAME=${PN}-mono-${MONO_PV}.msi
STAGING_NAME=${PN}-staging
-STAGING_UNAME=${PN}-compholio
+#STAGING_UNAME=${PN}-compholio
+STAGING_UNAME=${STAGING_NAME}
DOWNLOADS="
${GECKO_NAME[@]/#/https://dl.winehq.org/wine/wine-gecko/${GECKO_PV}/}
@@ -42,11 +43,11 @@ if ever is_scm ; then
SCM_REPOSITORY="git://source.winehq.org/git/${PN}.git"
SCM_staging_REPOSITORY="https://github.com/${STAGING_UNAME}/${STAGING_NAME}.git"
require scm-git
-elif ever at_least 3.0-rc1 ; then
+elif [[ $(ever range 2) -eq 0 ]]; then
DOWNLOADS+="
https://dl.winehq.org/wine/source/$(ever range 1).0/${PNV}.tar.xz
"
-elif ever at_least 2.1 ; then
+elif [[ $(ever range 2) -gt 0 ]]; then
DOWNLOADS+="
https://dl.winehq.org/wine/source/$(ever range 1).x/${PNV}.tar.xz
"
@@ -220,6 +221,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
--with-freetype
--with-gettext
--with-gnutls
+ --without-gssapi
--with-jpeg
--with-png
--with-pthread
@@ -243,7 +245,9 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
--without-hal
--without-krb5
--without-opencl
+ --without-sdl
--without-v4l
+ --without-vulkan
$(my_win64_enable $(exhost --target))
$(exhost --is-native -q || echo --with-wine-tools="${WORK_HOST}")