diff options
| author | Arjan Bouter | 2009-08-01 20:26:03 +0200 |
|---|---|---|
| committer | Arjan Bouter | 2009-08-01 20:26:03 +0200 |
| commit | bb596c3746144685faef4299d5442f597096b207 (patch) | |
| tree | e0643c471c7eb0f037af41d78f4a0fc6a7447aa9 | |
| parent | a45ab997b74dc33854e5a312d798f182cdf4ffca (diff) | |
wine: added win64 support, but won't build until gcc 4.4.x is available
| -rwxr-xr-x | x11-libs/wine/BUILD | 2 | ||||
| -rwxr-xr-x | x11-libs/wine/CONFIGURE | 8 | ||||
| -rwxr-xr-x | x11-libs/wine/DEPENDS | 15 | ||||
| -rw-r--r-- | x11-libs/wine/HISTORY | 6 |
4 files changed, 24 insertions, 7 deletions
diff --git a/x11-libs/wine/BUILD b/x11-libs/wine/BUILD index 8124c389f6..747ce63735 100755 --- a/x11-libs/wine/BUILD +++ b/x11-libs/wine/BUILD @@ -9,6 +9,8 @@ if grep -q "\-O3" <<< $CFLAGS; then CXXFLAGS="-fno-guess-branch-probability $CXXFLAGS" fi && +OPTS="${OPTS} ${WINE64}" && + default_build && if is_depends_enabled $SPELL docbook-utils; then diff --git a/x11-libs/wine/CONFIGURE b/x11-libs/wine/CONFIGURE new file mode 100755 index 0000000000..a881b15924 --- /dev/null +++ b/x11-libs/wine/CONFIGURE @@ -0,0 +1,8 @@ +ARCH="$(uname -m)" && +if [[ "${ARCH}" = 'x86_64' ]]; then + message "Wine64 does NOT run 32bit apps. You can, however, build a 64bit Wine." && + message "Probably this is not what you want. If you say 'n' to the next question" && + message "an attempt will be made to build a 32bit Wine, which will fail if you" && + message "do not have a multilib system." && + config_query_option WINE64 'Build a 64bit Wine?' n '--enable-win64 --enable-maintainer-mode' '' +fi diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS index c90a0af381..f5809bc8a0 100755 --- a/x11-libs/wine/DEPENDS +++ b/x11-libs/wine/DEPENDS @@ -71,9 +71,9 @@ optional_depends libpng \ '--without-png' \ 'for PNG image support' && -optional_depends libxslt \ - '--with-xslt' \ - '--without-xslt' \ +optional_depends libxslt \ + '--with-xslt --with-xml' \ + '--without-xslt --without-xml' \ 'for a functional Microsoft XML (MSXML) implementation' && optional_depends MSTTF \ @@ -88,10 +88,11 @@ optional_depends nas \ 'for NAS audio support' && # the --with-curses option fails -optional_depends ncurses \ - "" \ - "--without-curses" \ - "curses gui?" && +# because it can't find libncurses +#optional_depends ncurses \ +# "" \ +# "--without-curses" \ +# "curses gui?" && optional_depends OPENGL \ '--with-opengl' \ diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY index d01d62efd8..727727c210 100644 --- a/x11-libs/wine/HISTORY +++ b/x11-libs/wine/HISTORY @@ -1,3 +1,9 @@ +2009-08-01 Arjan Bouter <abouter@sourcemage.org> + * BUILD,CONFIGURE: added wine64 (fixes bug #11336) + * DEPENDS: completed optional dep on libxslt and commented out the + optional dep on ncurses as that fails to find libncurses and would + break the spell. + 2009-07-17 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 1.1.26 |