diff options
| -rw-r--r-- | app-emulation/wine/Manifest | 2 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-1.6-memset-O3.patch | 21 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-1.7.2-osmesa-check.patch | 38 |
3 files changed, 61 insertions, 0 deletions
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 95c2a3ca..95a19e1b 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -5,6 +5,8 @@ AUX wine-1.5.19-KUSER_SHARED_DATA_18.patch 3922 SHA256 84959853c303c43e3ba1e10c2 AUX wine-1.5.23-winebuild-CCAS.patch 6101 SHA256 34143c55618870dd31eea1e260ae973572d99557a20f24a4f217bb0ff1d615eb SHA512 f44580efcf4a406517a2fc65d7509a42b0b0b180a4c63f5980c894e708934d60155d87634e406763426415d00c1ea2f8f3894ac4797a2e2527ca0d9ed23430af WHIRLPOOL d62fb5c27fba3b8297ae2151a432f80d9655c0c2ccee9dee12beea84a2186c0e7965a6902d6bc5638cdb1c853c188a49b790825c8741a9dc4bb1516ff6ca9a53 AUX wine-1.5.26-winegcc.patch 1808 SHA256 91c1012059b93a421b2eae9f2ea46b7b327d6d3d58ba0cb47021c8a57f6d8228 SHA512 fce9daf40a96f4a7502c249a30107c8dfc5d8edd4a171b863d2bf14c3ad46d18e4c29932ab4a6ede7da5d589d777b962d2f577f5360ee4db8019d71362c51d47 WHIRLPOOL 71cbe36c6bac87071472541b7f5cd3ed1b08f05479bc0016262b3f86e75738e467dad197563b4898f2b24fd0ab4e27c40dce04f244a3e7f5ea1582b4db1c5cc2 AUX wine-1.5.28-pathofexile.patch 1264 SHA256 e709fa3c4938886d985e96e95b14671039062c11851ef49fc33be9c0d6f132fc SHA512 365ca568cae37e44b6d32b2dbd548aa83e6616381b6e2c10dfc586e4e4f6d5544f2d3a4e151c771c725fdaffea23fc474fca5c74b7b9044534a1369a42f1cff7 WHIRLPOOL b2c6f2057941da741a0d39f82734edfe6451c50b585127249e5125c87b28d3b1dacf89c8b8675f6da4d8727fb6df0d888289124ad38e5159cb927af0474a9929 +AUX wine-1.6-memset-O3.patch 695 SHA256 1f04496713e8a401ba068702c5c3e104b18635bfb54808e5641a3c48a9b9bad4 SHA512 ad7231f8dedf98f9e9b91fcb8bbe72a716d78285127b0c33396de0b1e17a191f91f9a4a377c0e90671bb5f4e57bfb087ef7e80c9537c6c73b3c9bb90b3885968 WHIRLPOOL 91689c31054b896609493e2b0b4fe67e3d752d889f4ccae9c3e15229543341998809fd19a2040457e04fbdbd45505f0f2b49052844004193872713053d7239f8 +AUX wine-1.7.2-osmesa-check.patch 1740 SHA256 5264ac291435eb64c70cef4bdccbf8d4448472b4f014ab15ede35bcceebb6579 SHA512 4738a381923df7b45ea68092efb7ccb967907976d6d2f8bb0167af4211c377a73e296481b94092ac232f9ae09edf21447da92a134ebfff9b32acdd9e20340b95 WHIRLPOOL 95a90f8ff5a649833b39cb28de997c3b516cd09a53cf71d616c4fd412dfa6e71c47a1255a4d0597d85a62966cd9d6b9fae1c21c88e67d8650d31d414fca8fd42 DIST wine-1.5.19.tar.bz2 21013509 SHA256 51ad795ae62d8392ac6fbc3ad595ac57d44bcc779b716573a9d73ca122961023 SHA512 aefc05cb0ce6b41a7a70861fd85c5f5d30501f61923620837f3a8124b039e1eedaea75d261116b26770b64a21b27a4ee13133a07a36157bebd2cbeddd110de27 WHIRLPOOL 3ca550f2b0fb9d6b096f025e9f94b88648386c04d3a82350802fcd05d6b0604d6fe6aa4f6e68876abe523e60a8906438148613d4bdd8e7badd3a251d3c0e60e5 DIST wine-1.5.20.tar.bz2 21012282 SHA256 75e3073a62a933af5beaa8e8591298325edb57f255ca5b0de55a0f29a4ba2430 SHA512 25de10f4e3f94d79391e61bdadf00af0e6f191b064f61948911d0de4b1c71ab3a727510b7ec4a52882aed0c59e75bb0cd3fb46a0a4da3dc3707045a3af517754 WHIRLPOOL f85ed944dce117761b6509f090161e9d071027571c87675c03f0f78fb29679bf4d4fb382038c5512588e346f8a242ae4a66fa32992a3bacd48af63417158efe2 DIST wine-1.5.21.tar.bz2 21088257 SHA256 ac77c1dd1a31ccc67f0391b4965959096aeb98745f52c4d91b7bd280e3c8b350 SHA512 3d9847da09f5227d0118f0fc1468134e69ee66dfec3cfee5e069050a4e2b848647d2247264d7f2e9e35f434676be97f4104be170fd02915bb3061b4057c11bb9 WHIRLPOOL 67b5b0693cea4998e48d1e4163b1cd8506401252c268854d559c7a323af082cc635ec10752440e0945b7988b85537af92f204ef645e9e4916e01fc476d19eb85 diff --git a/app-emulation/wine/files/wine-1.6-memset-O3.patch b/app-emulation/wine/files/wine-1.6-memset-O3.patch new file mode 100644 index 00000000..75372f86 --- /dev/null +++ b/app-emulation/wine/files/wine-1.6-memset-O3.patch @@ -0,0 +1,21 @@ +Avoid "undefined reference to `memset'" error when building with +USE=custom-cflags and -O3 in CFLAGS with gcc-4.8. + +See: + +http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56888 +http://bugs.winehq.org/show_bug.cgi?id=33521 +https://bugs.gentoo.org/show_bug.cgi?id=480508 + +diff --git a/configure.ac b/configure.ac +index d8033cf..fe7cc7d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1767,6 +1767,7 @@ then + + dnl Check for some compiler flags + WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) ++ WINE_TRY_CFLAGS([-fno-tree-loop-distribute-patterns]) + WINE_TRY_CFLAGS([-fno-strict-aliasing]) + dnl clang needs to be told to fail on unknown options + saved_CFLAGS=$CFLAGS diff --git a/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch b/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch new file mode 100644 index 00000000..e20ea2c2 --- /dev/null +++ b/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch @@ -0,0 +1,38 @@ +From b7eb1ff48dd1210aa3e1002afc503d5df75d50b9 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Tue, 7 Aug 2012 01:29:01 -0400 +Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa + +If mesa had been built with shared glapi, glAccum is not available in +libOSMesa without explicitly linking to libGL. In addition, in +mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to +libglapi if mesa was built with shared glapi, see +https://bugs.gentoo.org/show_bug.cgi?id=399813 +And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and +libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832 +--- + configure.ac | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 66b4dd6..0303d87 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1213,7 +1213,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c + + if test "x$with_osmesa" != "xno" + then +- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS]) ++ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS]) ++ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then ++ osmesa_save_CC=$CC ++ CC=$CXX ++ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $XLIB -lm $X_EXTRA_LIBS]) ++ CC=$osmesa_save_CC ++ fi + WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], + [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) + fi +-- +1.8.3.2 + |
