commit: 45fbfc23dadc7fb2d565d2d632e3e5fd6138449a
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 10:59:14 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat May 21 10:59:14 2016 +0000
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=45fbfc23
wine: sync with tree
app-emulation/wine/Manifest | 5 +-
app-emulation/wine/files/wine-sysmacros.patch | 177 ---------------------
app-emulation/wine/metadata.xml | 2 +
.../wine/{wine-1.9.8.ebuild => wine-1.9.9.ebuild} | 29 +++-
4 files changed, 29 insertions(+), 184 deletions(-)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index fe325fe..4de707a 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,6 +1,7 @@
-DIST wine-1.9.8.tar.bz2 23183703 SHA256
8bf34e8dd68e7187ed11fb06a55a76789073dda6ab2db6b84e194acf4f561a1d SHA512
3f90238b78836836b4cd74975da07b0ce39f3da0e68fc8529554e1770ecd52c315519985bd15dc82756491ca3d145b27249a0e937221badb01ed3a1f8a69fbd4
WHIRLPOOL
22f633ac0f9d1f7bf874dc756432534c0deca765e49013576ea69ade86c98e8759fb14813d8d68451250911902541a3027a729328bff1aedd74ecafc9c85acf0
+DIST wine-1.9.9.tar.bz2 23155986 SHA256
a1e76fd9842d0fe385e930cd62e7193035a04ed11fe771d9cd6ee9b2ceda7b41 SHA512
370caf527eac948b8bf2583e8f8a647e9b353b8ea70a341a0eb1fd768eea6c982a5c8b7eb23ecfded6eebea370d06bd23ee1ba7b2ded63547f571cc293ee1695
WHIRLPOOL
bf97f4fcacda1913d2e7be21f6c771392b06653a7877ea07cf65731bf37eae3f3eb5d5fe5971dae18be709afcbbc65b3337e8d1d0c01e938671eed095aacd0af
+DIST wine-d3d9-1.9.9.tar.gz 45615 SHA256
cc6575ef97c6ff74d11d370f6af012c82b33697cb5d120d93d3d501623ef4856 SHA512
142e4c11c392a7999093c6703e3e506c365633e7ae4c2426d164e411e5d28fd0c7b00acffc0ca35c755d8ff6d8585072f6a3d3bcb8b5e32417db5597f236c4d0
WHIRLPOOL
d56f84a455dc643f756fedfffdc73640cb34aa8164df747fe44f204dd7165d7b000c22de8c33c9978ad97b32b8b6d285551de8607acf75b5f079cb7eeeadb05e
DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256
f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512
bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd
WHIRLPOOL
0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06
DIST wine-mono-4.6.2.msi 45676544 SHA256
a46c5b32b6ed66e2e8d7ac9b15ff9ffe143a3aa6f12f2ea07a6ca9a4d2023e41 SHA512
7ff31b64539976cc4d5ded1b38549c9bec620ee7679b5a53093195b7df1a93a57db04ef81d94342ec6e4389fef356660e3eb4c35e7b50b6df98288ca19eb633f
WHIRLPOOL
eef536a301127f78b06d56054a95e86e73ce7ecd0522a41f6d581d6cfb8660ded5b8148e00e9f8ee77361bfa4a66996559480cd7881c4d132169b5de698f4ef2
-DIST wine-staging-1.9.8.tar.gz 10010607 SHA256
49201e31105208ae106f9426c2ca150e5d289b94c9b938a8669fbd32f58cec3d SHA512
53c9b6ef68986ea620843bcf97c583b3b29d98e40529f45f943868fa41b3c8356c50cf401c42aa11f0738a44f107ee55741603007681b43c1596b11988ff05e7
WHIRLPOOL
f5424479174f87fb0bf3e0e947a53af20c2eaca95d4814603a27a596a361e3e98fa7250e4ee8bb4eebe8a410329732311b7125320d7758719f42c693e9d7cc13
+DIST wine-staging-1.9.9.tar.gz 9997618 SHA256
23e165b0259561a3449a7c0195352cca96fdc247ad524c6567421d9971ebf517 SHA512
4e06315eda4ba8e7a44c06a422ebb8a315c808f1f651430e7fc56950916a61c38aa6d3a2467a6c70be2c344744d00b25d83df27c8629c783c8b67584c01f8c0c
WHIRLPOOL
01fe2ddb3de5485f221787a3899bca171ecf4d14c3c0c8a9b973757f1507a4ce3dcbf9c4cea2b20b31fb1ddc0ae0eaf8600c811f4fbcd1ffa39eb5fa81dcf313
DIST wine_gecko-2.44-x86.msi 34832896 SHA256
77a64ad17571b3a00386a88b9b1b1ea4b7e759061675568bee0ec238fb456d39 SHA512
6c3b6ccbab0081d8ab188a9a031050ca8fd7ef8f1de0efa3a57569d6166397f91bf13037402e3437cc8cfc4fc25e7c2f8be32f66500306d567055e89aae0797d
WHIRLPOOL
59c269a6d6e3ba829bd24cf81eba991f91bb0c1995a1841b7e548593f544088959093ba29eb83b53f38f77e71780d8288f0b12a212862af1374f954d61f24999
DIST wine_gecko-2.44-x86_64.msi 36273152 SHA256
628e5a0d3b7406cbd2f031139be06e2ef695081fc77ee18dc06748e649ff6661 SHA512
71dcbd28ff048fc587ed796f2f09815f624774742abc192d9aa1104485f5d8cd93b2308fb72506f82d0ea5032dd6c7ed2af4ac95121e7b2367e7a6dd77cb042f
WHIRLPOOL
a327f2b5a8f47498967b80e06336918006b71b4e1b90a96943faa6f05e481273203259ab6f8a3b45ba85249344c76c100880ad88dd346a94ee45327fffb2f3a1
diff --git a/app-emulation/wine/files/wine-sysmacros.patch
b/app-emulation/wine/files/wine-sysmacros.patch
deleted file mode 100644
index 4ea515d..0000000
--- a/app-emulation/wine/files/wine-sysmacros.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From ca8a08606d3f0900b3f4aa8f2e6547882a22dba8 Mon Sep 17 00:00:00 2001
-From: Seong-ho Cho <darkcircle.0...@gmail.com>
-Date: Mon, 18 Apr 2016 04:25:38 +0900
-Subject: [PATCH] configure: Add AC_HEADER_MAJOR to find where major() is
- defined.
-
-Signed-off-by: Seong-ho Cho <darkcircle.0...@gmail.com>
-Signed-off-by: Alexandre Julliard <julli...@winehq.org>
----
- configure | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 1 +
- dlls/ntdll/cdrom.c | 5 +++++
- dlls/ntdll/directory.c | 5 +++++
- dlls/ntdll/file.c | 5 +++++
- include/config.h.in | 8 ++++++++
- server/fd.c | 5 +++++
- 7 files changed, 79 insertions(+)
-
-diff --git a/configure b/configure
-index 1cb0e59..ffb1825 100755
---- a/configure
-+++ b/configure
-@@ -6836,6 +6836,56 @@ fi
-
- done
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines
makedev" >&5
-+$as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
-+if ${ac_cv_header_sys_types_h_makedev+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+int
-+main ()
-+{
-+return makedev(0, 0);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_header_sys_types_h_makedev=yes
-+else
-+ ac_cv_header_sys_types_h_makedev=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_header_sys_types_h_makedev" >&5
-+$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
-+
-+if test $ac_cv_header_sys_types_h_makedev = no; then
-+ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h"
"ac_cv_header_sys_mkdev_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
-+
-+$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
-+
-+fi
-+
-+
-+
-+ if test $ac_cv_header_sys_mkdev_h = no; then
-+ ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h"
"ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
-+
-+$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
-+
-+fi
-+
-+
-+ fi
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode
macros are broken" >&5
- $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
- if ${ac_cv_header_stat_broken+:} false; then :
-diff --git a/configure.ac b/configure.ac
-index 6189aa9..201bc77 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -512,6 +512,7 @@ AC_CHECK_HEADERS(\
- valgrind/valgrind.h \
- zlib.h
- )
-+AC_HEADER_MAJOR()
- AC_HEADER_STAT()
-
- dnl **** Checks for headers that depend on other ones ****
-diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
-index ee36045..2c64106 100644
---- a/dlls/ntdll/cdrom.c
-+++ b/dlls/ntdll/cdrom.c
-@@ -38,6 +38,11 @@
- #ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#elif defined(MAJOR_IN_SYSMACROS)
-+# include <sys/sysmacros.h>
-+#endif
- #include <sys/types.h>
-
- #ifdef HAVE_SYS_IOCTL_H
-diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
-index 93fe594..4d431c0 100644
---- a/dlls/ntdll/directory.c
-+++ b/dlls/ntdll/directory.c
-@@ -47,6 +47,11 @@
- #ifdef HAVE_SYS_ATTR_H
- #include <sys/attr.h>
- #endif
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#elif defined(MAJOR_IN_SYSMACROS)
-+# include <sys/sysmacros.h>
-+#endif
- #ifdef HAVE_SYS_VNODE_H
- /* Work around a conflict with Solaris' system list defined in sys/list.h. */
- #define list SYSLIST
-diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 7e5da59..b3bd9d6 100644
---- a/dlls/ntdll/file.c
-+++ b/dlls/ntdll/file.c
-@@ -57,6 +57,11 @@
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#elif defined(MAJOR_IN_SYSMACROS)
-+# include <sys/sysmacros.h>
-+#endif
- #ifdef HAVE_UTIME_H
- # include <utime.h>
- #endif
-diff --git a/include/config.h.in b/include/config.h.in
-index 0650f31..06b192f 100644
---- a/include/config.h.in
-+++ b/include/config.h.in
-@@ -1335,6 +1335,14 @@
- /* Define to 1 if you have the `__res_get_state' function. */
- #undef HAVE___RES_GET_STATE
-
-+/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
-+ */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define to 1 if `major', `minor', and `makedev' are declared in
-+ <sysmacros.h>. */
-+#undef MAJOR_IN_SYSMACROS
-+
- /* Define to the address where bug reports for this package should be sent. */
- #undef PACKAGE_BUGREPORT
-
-diff --git a/server/fd.c b/server/fd.c
-index 1fd1ce7..17b1b66 100644
---- a/server/fd.c
-+++ b/server/fd.c
-@@ -83,6 +83,11 @@
- #endif
- #include <sys/stat.h>
- #include <sys/time.h>
-+#ifdef MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif defined(MAJOR_IN_SYSMACROS)
-+#include <sys/sysmacros.h>
-+#endif
- #include <sys/types.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_SYSCALL_H
---
-2.7.4
-
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 7050449..aa61670 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -18,6 +18,8 @@ Think of Wine as a compatibility layer for running Windows
programs. Wine does n
<use>
<flag name="capi">Enable ISDN support via CAPI</flag>
<flag name="custom-cflags">Bypass strip-flags; use at your own
peril</flag>
+ <flag name="d3d9">Apply highly experimental patches for Gallium
Nine support.
+ This patch may break some applications.</flag>
<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to
run DOS applications</flag>
<flag name="gecko">Add support for the Gecko engine when using
iexplore</flag>
<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to
provide DirectShow functionality;
diff --git a/app-emulation/wine/wine-1.9.8.ebuild
b/app-emulation/wine/wine-1.9.9.ebuild
similarity index 91%
rename from app-emulation/wine/wine-1.9.8.ebuild
rename to app-emulation/wine/wine-1.9.9.ebuild
index f4b39b9..7561b7a 100644
--- a/app-emulation/wine/wine-1.9.8.ebuild
+++ b/app-emulation/wine/wine-1.9.9.ebuild
@@ -26,6 +26,8 @@ MV="4.6.2"
[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
WINE_GENTOO="wine-gentoo-2015.03.07"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/";
@@ -39,14 +41,16 @@ SRC_URI="${SRC_URI}
if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+ D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
else
SRC_URI="${SRC_URI}
- staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz
-> ${STAGING_P}.tar.gz )"
+ staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz
-> ${STAGING_P}.tar.gz )
+ d3d9? (
https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc
+fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses
netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png
prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging
test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos
elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3
ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight
+png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl
staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
test? ( abi_x86_32 )
elibc_glibc? ( threads )
@@ -62,6 +66,7 @@ RESTRICT="test"
COMMON_DEPEND="
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
capi? ( net-dialup/capi4k-utils )
+ d3d9? ( media-libs/mesa[d3d9,${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
@@ -179,8 +184,8 @@ wine_build_environment_check() {
# Compile in subshell to prevent "Aborted" message
if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3
"${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
eerror "Wine cannot be built with this version of
gcc-5.3"
- eerror "due to compiler bugs; please use gcc-config to
select a"
- eerror "different compiler version."
+ eerror "due to compiler bugs; please re-emerge the
latest gcc-5.3.x ebuild,"
+ eerror "or use gcc-config to select a different
compiler version."
eerror "See https://bugs.gentoo.org/574044";
eerror
return 1
@@ -229,9 +234,15 @@ src_unpack() {
einfo "Example: EGIT_COMMIT=${STAGING_COMMIT}
emerge -1 wine"
fi
fi
+ if use d3d9; then
+ EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
+ unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
+ EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+ fi
else
unpack ${P}.tar.bz2
use staging && unpack "${STAGING_P}.tar.gz"
+ use d3d9 && unpack "${D3D9_P}.tar.gz"
fi
unpack "${WINE_GENTOO}.tar.bz2"
@@ -246,7 +257,6 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
- "${FILESDIR}"/${PN}-sysmacros.patch #580046
)
if use staging; then
ewarn "Applying the Wine-Staging patchset. Any bug reports to
the"
@@ -269,6 +279,14 @@ src_prepare() {
sed -i "s/(Staging)/(Staging [Unofficial])/"
libs/wine/Makefile.in || die
fi
fi
+ if use d3d9; then
+ if use staging; then
+ PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
+ else
+ PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+ fi
+ PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+ fi
default
eautoreconf
@@ -342,6 +360,7 @@ multilib_src_configure() {
--with-xattr
$(use_with vaapi va)
)
+ use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on
amd64; #472038
