From f51f21bb68d996b575c1431f673c587b9abf4744 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 7 Aug 2012 09:51:07 -0700 Subject: [PATCH] wine: version bump --- app-emulation/wine/Manifest | 10 +++--- .../wine/files/wine-1.5.10-osmesa-check.patch | 33 +++++++++++++++++++ .../{wine-1.5.9.ebuild => wine-1.5.10.ebuild} | 25 +++++++++----- app-emulation/wine/wine.diff | 21 ++++++++++++ 4 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 app-emulation/wine/files/wine-1.5.10-osmesa-check.patch rename app-emulation/wine/{wine-1.5.9.ebuild => wine-1.5.10.ebuild} (89%) create mode 100644 app-emulation/wine/wine.diff diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 6e272ca..0d6d636 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -1,13 +1,15 @@ AUX pulseaudio.patch 109370 RMD160 a7412efb915018d657ae329aeed2b907e285425c SHA1 bcf663862186bb62a6ccefb85297c6b218b06087 SHA256 71e28f02a9a3d341e123303ad7ff2ee63aaa33945cd6d40fdb2986b9a393a4a1 AUX wine-1.1.15-winegcc.patch 1556 RMD160 ca7e0df0a45507e7d31ed81c5712111b83ed9bfa SHA1 4b155fe7cb5e831b7f92757d52aa1ab12569b232 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d AUX wine-1.4_rc2-multilib-portage.patch 1256 RMD160 6445df9cc97ad523f54de256f37810366a0693fd SHA1 8d0d794f74952a53d38c75a8cb586f784a3b9357 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 +AUX wine-1.5.10-osmesa-check.patch 1620 RMD160 35bd25cccfcd1cbe9b59f55a078a1fbc12aee0db SHA1 713163fc3399b0a99e31faa788da966107e9194a SHA256 3c6c5081cd28231e251c6bacdcee3042decf87ee985624ca76d7b9c1d35a0184 DIST wine-1.4.tar.bz2 20035856 RMD160 ee523c4cf15984197487432790c0e5bbba3ec495 SHA1 ce5d56b9b949c01dde663ab39739ffcfb41a73c4 SHA256 99a437bb8bd350bb1499d59183635e58217e73d631379c43cfd0d6020428ee65 -DIST wine-1.5.9.tar.bz2 20413229 RMD160 b2c0f36d2e2542de03985dfa6199da3bd6e70659 SHA1 601943269f444b9fd2aac9767a4a5233c7428a2f SHA256 7bc25e7d0d8fec11a41fec89994dd65265b8fd1052ee82d5648232e646899cd3 +DIST wine-1.5.10.tar.bz2 20510011 RMD160 004792775d3151c6bcd8ed718b18d2530f4752fd SHA1 a8c67336b4a0ca39a57e98fc67f89871484ab528 SHA256 f35e7a52faab23647fd15ab9b54ea7a390fc96159d4e9a17e22b118c186f9e13 DIST wine-mono-0.0.4.msi 44408320 RMD160 4a68b97bbe6f5202de594c51a2cc45ea7e1e5089 SHA1 7d827f7d28a88ae0da95a136573783124ffce4b1 SHA256 15d8a612cdeca4eff3137353f29fdeb7a99e055cd633844c91cd00e0186b8882 DIST wine_gecko-1.4-x86.msi 14732288 RMD160 02363538a77a954f2bf1014b28ec1ed8fe2d1b6e SHA1 c30aa99621e98336eb4b7e2074118b8af8ea2ad5 SHA256 b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d DIST wine_gecko-1.4-x86_64.msi 14980096 RMD160 5613e27d474085c31b53c868ed020445bdee37ae SHA1 bf0aaf56a8cf9abd75be02b56b05e5c4e9a4df93 SHA256 ceab7f1866e85175ed4cd3b5d081ee4f77c8d32ac7adf489a19c1f7329187219 -DIST wine_gecko-1.6-x86.msi 16802816 RMD160 a1ea4dfec3fc784d1b1a9f596d7484c3675efc1e SHA1 41167632dbc30f32dce7dca43c2a0487aa7cac04 SHA256 1f2c201b970c2ec3dbfd35c29530edf4aaf1e82d45843f531fc43a03d7615e5d -DIST wine_gecko-1.6-x86_64.msi 17251328 RMD160 eb1ef8d54bbada23cd6069f1c4e0f6d20431d629 SHA1 edc626480024f58e294447573c7ab94606e8d610 SHA256 9f27fd2f67a10e01f9960707cbe365e795003050529af63fc68bc1192580801b +DIST wine_gecko-1.7-x86.msi 16995328 RMD160 6ce45f67498be7c1c010e9fc1eef166529213f4b SHA1 efebc4ed7a86708e2dc8581033a3c5d6effe0b0b SHA256 2ed524e79cc88137b28430389af19cb032989311921462a29f72d6f121954913 +DIST wine_gecko-1.7-x86_64.msi 17438720 RMD160 7ef9720567d11abe143e0d57de58ded0dffbf508 SHA1 2253e7ce3a699ddd110c6c9ce4c7ca7e6f7c02f5 SHA256 19d0364a43621738fa3fd1713ef9590ad0cc61ea4c8858ad3f8703a81b13c927 DIST winepulse-2012.06.15.patch 100596 RMD160 33782944497666b150c77ec1c3dd00433a5b2933 SHA1 7720987932e42036a3d9764b5a571af961c750e5 SHA256 f6baf816e6170c406607d81e298fea2d175452ca822ee4cd2748fe4381ecd4dc EBUILD wine-1.4.ebuild 6236 RMD160 aea6af88d59cfcb02d72c1194a85b26d59fd40a4 SHA1 c03b0d215b10f4d5f6230796a9becf2925693f49 SHA256 8e6ed9bdaa8ff6f89d72f0eccc580a689fbc8aae8692c481893a1a5aa307cea4 -EBUILD wine-1.5.9.ebuild 6687 RMD160 9cf43ef4a3cade79ec2a7adac9c6249d21bcb5eb SHA1 2c0e8b5ad030b76f8b221360268006e0b163e114 SHA256 c11e807b5810ab878d29f32d1319910e7266396e2e5c46dd3d875f95041478a6 +EBUILD wine-1.5.10.ebuild 7011 RMD160 7a5cf097751da1d927ce6cfc0e2ca3210c5899d7 SHA1 0604ee04df631e4707cf8af91b935dde2558a4af SHA256 eb840595b9c7d431e8d91a3f2c7618e6ed5e5d29bdddac584ee89b78f7902931 +MISC wine.diff 862 RMD160 6325375b9e12c041a41582801981ec65972e87dc SHA1 9d469367f3024a842140967ed0f6f3621d274772 SHA256 38266c6b96f7280f8aa81a10fbf3fc8a0e03722fbb75c7828f2f883c54b6f2c9 diff --git a/app-emulation/wine/files/wine-1.5.10-osmesa-check.patch b/app-emulation/wine/files/wine-1.5.10-osmesa-check.patch new file mode 100644 index 0000000..86d90ca --- /dev/null +++ b/app-emulation/wine/files/wine-1.5.10-osmesa-check.patch @@ -0,0 +1,33 @@ +From a233e35ca650db2758de0fd31450b8ce2d86d5e3 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +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 +--- + configure.ac | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4bd43d1..c7a718f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1132,7 +1132,10 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c + + if test "$ac_cv_header_GL_osmesa_h" = "yes" + then +- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS]) ++ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS]) ++ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then ++ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS]) ++ fi + 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.]) +-- +1.7.8.6 + diff --git a/app-emulation/wine/wine-1.5.9.ebuild b/app-emulation/wine/wine-1.5.10.ebuild similarity index 89% rename from app-emulation/wine/wine-1.5.9.ebuild rename to app-emulation/wine/wine-1.5.10.ebuild index 56bb55f..fa6d283 100644 --- a/app-emulation/wine/wine-1.5.9.ebuild +++ b/app-emulation/wine/wine-1.5.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.9.ebuild,v 1.1 2012/06/24 23:23:11 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.10.ebuild,v 1.1 2012/08/07 08:06:43 tetromino Exp $ EAPI="4" @@ -18,7 +18,7 @@ else S=${WORKDIR}/${MY_P} fi -GV="1.6" +GV="1.7" MV="0.0.4" PULSE_PATCH="winepulse-2012.06.15.patch" DESCRIPTION="free implementation of Windows(tm) on Unix" @@ -33,9 +33,10 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml" REQUIRED_USE="elibc_glibc? ( threads ) - mono? ( || ( win32 !win64 ) )" #286560 + mono? ( || ( win32 !win64 ) ) + osmesa? ( opengl )" #286560 RESTRICT="test" #72375 MLIB_DEPS="amd64? ( @@ -86,6 +87,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) + osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) @@ -130,11 +132,9 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726 epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 - - # Pulseaudio - #epatch "${DISTDIR}/${PULSE_PATCH}" #421365 - epatch "${FILESDIR}"/pulseaudio.patch - + epatch "${FILESDIR}"/${PN}-1.5.10-osmesa-check.patch #429386 + # epatch "${DISTDIR}/${PULSE_PATCH}" #421365 + epatch "${FILESDIR}"/pulseaudio.patch epatch_user #282735 eautoreconf sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die @@ -146,6 +146,12 @@ do_configure() { mkdir -p "${builddir}" pushd "${builddir}" >/dev/null + with_osmesa=$(use_with osmesa) + if use osmesa && use amd64 && [[ $1 = 32 ]]; then #430268 + elog "win32 osmesa support is disabled for now, see bug #430268" + with_osmesa=--without-osmesa + fi + ECONF_SOURCE=${S} \ econf \ --sysconfdir=/etc/wine \ @@ -169,6 +175,7 @@ do_configure() { $(use_with opencl) \ $(use_with opengl) \ $(use_with ssl openssl) \ + ${with_osmesa} \ $(use_with oss) \ $(use_with png) \ $(use_with threads pthread) \ diff --git a/app-emulation/wine/wine.diff b/app-emulation/wine/wine.diff new file mode 100644 index 0000000..dd103e4 --- /dev/null +++ b/app-emulation/wine/wine.diff @@ -0,0 +1,21 @@ +--- /mnt/portage/portage/app-emulation/wine/wine-1.5.10.ebuild 2012-08-07 01:06:43.000000000 -0700 ++++ wine-1.5.10.ebuild 2012-08-07 09:31:02.394262211 -0700 +@@ -133,7 +133,8 @@ + epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726 + epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 + epatch "${FILESDIR}"/${PN}-1.5.10-osmesa-check.patch #429386 +- epatch "${DISTDIR}/${PULSE_PATCH}" #421365 ++ # epatch "${DISTDIR}/${PULSE_PATCH}" #421365 ++ epatch "${FILESDIR}"/pulseaudio.patch + epatch_user #282735 + eautoreconf + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die +@@ -178,7 +179,7 @@ + $(use_with oss) \ + $(use_with png) \ + $(use_with threads pthread) \ +- $(use_with pulseaudio pulse) \ ++ $(use_with pulseaudio) \ + $(use_with scanner sane) \ + $(use_enable test tests) \ + $(use_with truetype freetype) \