From 157fe1f9c1f71814d0a133dd1b4b4e8ccae84ac6 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Sun, 5 Aug 2012 00:26:44 +0400 Subject: [PATCH] wine: bump new version, rename patch file to suit both versions --- app-emulation/wine/Manifest | 14 +- ...put_mod.patch => wine-raw_input_mod.patch} | 0 app-emulation/wine/wine-1.5.2-r9999.ebuild | 2 +- app-emulation/wine/wine-1.5.9-r9999.ebuild | 251 ++++++++++++++++++ 4 files changed, 262 insertions(+), 5 deletions(-) rename app-emulation/wine/files/{wine-1.5.2-raw_input_mod.patch => wine-raw_input_mod.patch} (100%) create mode 100644 app-emulation/wine/wine-1.5.9-r9999.ebuild diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 8d6e17f..9909ee2 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -1,10 +1,16 @@ AUX disable-dynamic-vertex-buffers.patch 1034 SHA256 afd5ec5aef9d768daf0ba5f0c5b2cf49cdbf2830168b37906074423cc5a6d581 SHA512 59a8af905992140b86ece92836d16877520f2df785a7a1062aaeb82ab0556abbaf687352fed598027868c3d943777dacb5603e338621b1f11ac59ed13554ad57 WHIRLPOOL 54f5747cd9c564faf0679aa5464d0aa1ae146bb001b038e18a9e19a29fe9686ef8ea90e0f876480dfd95a8cf99e0ffb462b4c892d25e48c1beb94d499e5d2425 AUX wine-1.1.15-winegcc.patch 1556 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d SHA512 a6a6dbde16c1f850a5cb4d6b6fe1a8129bb267c44c19de63a4eb26933fd69ff98e440d257e467d766a6a6ac326d72dd621cae37fb593c8c62e43f588ccef3f25 WHIRLPOOL 3aea848b17217ab215f860c3526c44a5d9bd9e7adfe35c02bb5c841461bdaf4bd8ac4f8e8b990c0558980381fc1b2441b79edc3ff6dcde7455203fbd1fc3f49c AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 SHA512 ac0b29e2b4c9b04bb6694a4e4da654446f68efbf90cda6809b45dad51e6679ac5410398763fde7e9505ef959493a037aa588cee58d14906563a4746702d2b0e9 WHIRLPOOL 8ea26266c327bc8313eca9b5d39c9741b226037750ca2d1d33262420093e05c306e7f004656c362c3c50b330d050cf9e5fceaa2b024a82809aae8b3617b0ae18 -AUX wine-1.5.2-raw_input_mod.patch 108861 SHA256 0401f23221821d09f35f50d19389ad7c082c05fcf4acfccbbaf146fdaa0108c5 SHA512 66b1426df6bf0d974a8d431fa7658af10d7109bba3c4cda5f45ecff0ed7d9176b5c13f793ef53164e3fa16027171a18227b7e639f0597db23dc91e8239fd98f4 WHIRLPOOL c8f43b8aef8edfa568afbc1e2d9e6184d16f1a7bc1f440ddcfc43f1ca526d7667f405116a523afb34be20c8c2d0a1668dd2349814896d8e95f1409133a16754e +AUX wine-raw_input_mod.patch 108861 SHA256 0401f23221821d09f35f50d19389ad7c082c05fcf4acfccbbaf146fdaa0108c5 SHA512 66b1426df6bf0d974a8d431fa7658af10d7109bba3c4cda5f45ecff0ed7d9176b5c13f793ef53164e3fa16027171a18227b7e639f0597db23dc91e8239fd98f4 WHIRLPOOL c8f43b8aef8edfa568afbc1e2d9e6184d16f1a7bc1f440ddcfc43f1ca526d7667f405116a523afb34be20c8c2d0a1668dd2349814896d8e95f1409133a16754e AUX wine-remove-support-for-GL_ARB_sync.patch 1375 SHA256 00db42000ab584619ec2ee8503753599588f0689a1daf30e4d1579d7dca9a548 SHA512 14d98c65a9882927c55470a82bcc541fd9dc25763bd03dc31deabd3b294bbb1196b56f27096a59fbcdb446645ff668e2750715146318ba566a24be5d3e656a76 WHIRLPOOL 26da7593c16d551dbf92f2911cba67c394589a0b5c217be55ce56f18c38c742ff3faddf6befb15fd015041bf256736213f711c9e7f62507f1fb99fdb18475031 -DIST wine-1.5.2.tar.bz2 20104652 SHA256 8ee6fdaf716b5a1c7ccf9be9dc6d9b7546944e79351c4806b2fa596da418342f -DIST wine_gecko-1.5-x86.msi 15950848 SHA256 2e372a1b87ff2a22ad5127400ece4b09e55591d9f84e00bb562d294898a49b5c +DIST wine-1.5.2.tar.bz2 20104652 SHA256 8ee6fdaf716b5a1c7ccf9be9dc6d9b7546944e79351c4806b2fa596da418342f SHA512 da949f1943a1af1f4f9d75d41d35b5a968b4bb792f25c5d3202de5be944a04deac7116261d70b5b90f233e9fb526ae8d073e2cdd03304ac0f736926108fec7d7 WHIRLPOOL 947bff2ccda47e548e6eec4a1b7cc738b943fbbdf000e5686aa440c9d45962b5dee47e7060e93895cc398c2c82d7dce06c370091859bd46a6d09864c191d357c +DIST wine-1.5.9.tar.bz2 20413229 SHA256 7bc25e7d0d8fec11a41fec89994dd65265b8fd1052ee82d5648232e646899cd3 SHA512 245b3819f6ca17f50ffedbac44e55a367cff16e3c0c3b28f701511e79c2c20d596e0ae7d4a4094c7203589915cf048e023dedbba9439e1e81bcc7681176dd33b WHIRLPOOL b10bb0606bb013f1a84e8bcfee184eb860d3df8be10b27ef7208d2eb73ed5b1a233be7be3831b61967cac11aa5ad76ab01e1638af860e6426347aec6c45d7c83 +DIST wine-mono-0.0.4.msi 44408320 SHA256 15d8a612cdeca4eff3137353f29fdeb7a99e055cd633844c91cd00e0186b8882 SHA512 a7a3d5a564bab68ec6f3b96dff53c7b1491ce6d53b9fa3c2f5770e3ada69ffdefcbdde340697e9916d8c487f748db22aae97803b21bd63e461149be1eac096e4 WHIRLPOOL dc3bfafb8768cbda124870fceb1389e34a7d8ff0b1bad3df7e05923ce2695a2b037467bfddd90e1726f3f64f79bfa9f64bf65054ae3355a69039026fabf1eb4a +DIST wine_gecko-1.5-x86.msi 15950848 SHA256 2e372a1b87ff2a22ad5127400ece4b09e55591d9f84e00bb562d294898a49b5c SHA512 da4c2173569b62f2f6a195f81d919c95cab282d5cc8f2644a0d58eacb9520f6e58ca5bd6ae86cda36d01ffb13fdfd120fda171e061cc0a2377246c57715e0cf3 WHIRLPOOL 61af9ab8b5960e8caf3b7faf7b5a2d5f7fc24ca5180740e3263fafcbacdfd0d4a973ba931f38edb7ab281d3f2357db280dd8f6a89824a8a9a07777bad946c181 DIST wine_gecko-1.5-x86_64.msi 16345088 SHA256 762e80b41e6922849b28299dc5810a28634d484fe73fb7ca52804460588a1730 -EBUILD wine-1.5.2-r9999.ebuild 6804 SHA256 23d3325d0fc4e6d516b777968ead8c01d7945006718c0d3f7a8362ccc74fb1bd SHA512 6d5b938f2d48f66d18ee7ec9a19fd892a5b05848d035538ddcbc7361208ed5cc2f1723eb7bb17378e9d49eb78af0bdf630a8a9d5204ce561684cce7ad1cfc534 WHIRLPOOL 9490d192382e7fd67b97933122dc00bc010b641c3fbe9fa964dc0d2d39e99b82d170de3b8b8d34ff9c544f190f2cd1d853694f1844b64a6dbe98db44323cf260 +DIST wine_gecko-1.6-x86.msi 16802816 SHA256 1f2c201b970c2ec3dbfd35c29530edf4aaf1e82d45843f531fc43a03d7615e5d SHA512 29ad26bc37563d7dfe99b2c5b403a35f9d69787e456e9797596cea48c074f44dc38c2339ff208c7a53f30d0b4014a7ed27bffd13ccb1e0482540bbab689edc29 WHIRLPOOL d259fd4db5d452427bda31371dcd4211e21da4efdf3fb07200253fee14f9b6115836a666738613f1b5a7b1b5e4c5d8f0078aafdc1663f265e823c968e8884ed5 +DIST wine_gecko-1.6-x86_64.msi 17251328 SHA256 9f27fd2f67a10e01f9960707cbe365e795003050529af63fc68bc1192580801b SHA512 be49b579ed881fcf21980fa76e7be7891ebdfb6dd452646f8b7a8204e1b2ca1995e5d745252686fb4ccc25213e2aaf02a0d8a13b32e773095fbffba3878227df WHIRLPOOL 9ee867e2a6e25e3f90618a2cee7c32be639743454bf89429ed831aee04bdda6bb14cd3c5772bad1a3e8b9ac7758da9745cdf4f2470e859691b0f8fb0f76b367d +DIST winepulse-2012.06.15.patch 100596 SHA256 f6baf816e6170c406607d81e298fea2d175452ca822ee4cd2748fe4381ecd4dc SHA512 cd14a3407820d5d7b64a1ea19e41ae816a6a06888d57314cd7314192744574885501c98fa9e9f0fb102d3427d9f7bcc4f1a5ac532947b89db52ef731e071cb69 WHIRLPOOL 2dbb40afb633f5b1238d8849825b4711de865033ebb5c8f04c8e930a2974b8a5f4958fe87b5c1a9ccb1417ab1f4fbd2ed37feec11d2212efa01a6e05171a06a6 +EBUILD wine-1.5.2-r9999.ebuild 6805 SHA256 0e30bf8c07a0bfd0250c92a761f8cf28374625bbd341b78fa08a0422a1310851 SHA512 0745947ccd566e3dd83b96d526e4ab94980052e383bfb2d65e0117ce0629d9ba4b47cc428d3df1bac776e6d18a81f0882fc7fcbd8411ce60bbb40668d1add505 WHIRLPOOL f405c9efca67d1f828ee9cfcfbf9f98bfa384dedd083283ed6ab9dba62f2c0dcb2c3cb06b41b4bef926650ff518476676c22af9cac3cbd5469c5e0c87ed3bb81 +EBUILD wine-1.5.9-r9999.ebuild 7173 SHA256 cc42b2bc3f68649a5a5497a9c3eb64fc0cf0ae4851cbbb114461fd6488f3d897 SHA512 d731b67c4e4b89ae8548691143f339082579819ac2362f6852546170f29552e14487d49862109bd30880e7d3fba8900ff803895efe59f78273e1806abde85f2a WHIRLPOOL 7590ec9a6e43dbccda4ba99b20f1b4cb7be0ad2cde447a7616198ddc965a4b73ed446458bc98135d3a0796c71f49b30cccd4ab962a31b8d6a0a87d8c5d9dc357 MISC metadata.xml 1558 SHA256 fa58b3b055a5f848f6861fa85ca2d5cb922ba9723a8a26d7e69dd78481209616 SHA512 6e52cbb2c2304c19213d647f93a51894c5ec3e23fac993976ca36e2002656094108e31d0f4ec7144288b565894e4d161f14cdb47b96fd8d61e25099c48e8f060 WHIRLPOOL 22ebef2ae581e47676ddc6ea2c3c1422e8eb77699e28d97a922b7ea0277d9d2f515629619c1b7bb8023aee99c235a414ca1e61e3e9572666891e73912aa0a47d diff --git a/app-emulation/wine/files/wine-1.5.2-raw_input_mod.patch b/app-emulation/wine/files/wine-raw_input_mod.patch similarity index 100% rename from app-emulation/wine/files/wine-1.5.2-raw_input_mod.patch rename to app-emulation/wine/files/wine-raw_input_mod.patch diff --git a/app-emulation/wine/wine-1.5.2-r9999.ebuild b/app-emulation/wine/wine-1.5.2-r9999.ebuild index e93e1bc..1755ed1 100644 --- a/app-emulation/wine/wine-1.5.2-r9999.ebuild +++ b/app-emulation/wine/wine-1.5.2-r9999.ebuild @@ -126,7 +126,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726 epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 # Pinkbyte: hack for properly hook RawInput methods - epatch "${FILESDIR}"/${P}-raw_input_mod.patch + epatch "${FILESDIR}"/${PN}-raw_input_mod.patch # Pinkbyte: fix perfomance problems with vertex buffers epatch "${FILESDIR}"/disable-dynamic-vertex-buffers.patch # Pinkbyte: fix deadlock issue with WoT on fglrx (http://bugs.winehq.org/show_bug.cgi?id=30330). diff --git a/app-emulation/wine/wine-1.5.9-r9999.ebuild b/app-emulation/wine/wine-1.5.9-r9999.ebuild new file mode 100644 index 0000000..a84a324 --- /dev/null +++ b/app-emulation/wine/wine-1.5.9-r9999.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" + +inherit autotools eutils flag-o-matic multilib pax-utils + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://source.winehq.org/git/wine.git" + inherit git-2 + SRC_URI="" + #KEYWORDS="" +else + MY_P="${PN}-${PV/_/-}" + SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" + S=${WORKDIR}/${MY_P} +fi + +GV="1.6" +MV="0.0.4" +PULSE_PATCH="winepulse-2012.06.15.patch" + +DESCRIPTION="free implementation of Windows(tm) on Unix with custom patches to make World of Tanks work" +HOMEPAGE="http://www.winehq.org/" +SRC_URI="${SRC_URI} + gecko? ( + mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi + win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi ) + ) + mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi ) + http://source.winehq.org/patches/data/87234 -> ${PULSE_PATCH}" + +LICENSE="LGPL-2.1" +SLOT="0" +# Pinkbyte: add fglrx VIDEO_CARDS use +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 video_cards_fglrx +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads ) + mono? ( || ( win32 !win64 ) )" #286560 +RESTRICT="test" #72375 + +MLIB_DEPS="amd64? ( + truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) + X? ( + >=app-emulation/emul-linux-x86-xlibs-2.1 + >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?] + ) + mp3? ( app-emulation/emul-linux-x86-soundlibs ) + odbc? ( app-emulation/emul-linux-x86-db ) + openal? ( app-emulation/emul-linux-x86-sdl ) + opengl? ( app-emulation/emul-linux-x86-opengl ) + scanner? ( app-emulation/emul-linux-x86-medialibs ) + v4l? ( app-emulation/emul-linux-x86-medialibs ) + app-emulation/emul-linux-x86-baselibs + >=sys-kernel/linux-headers-2.6 + )" +RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) + perl? ( dev-lang/perl dev-perl/XML-Simple ) + capi? ( net-dialup/capi4k-utils ) + ncurses? ( >=sys-libs/ncurses-5.2 ) + fontconfig? ( media-libs/fontconfig ) + gphoto2? ( media-libs/libgphoto2 ) + openal? ( media-libs/openal ) + udisks? ( + sys-apps/dbus + sys-fs/udisks:2 + ) + gnutls? ( net-libs/gnutls ) + gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) + X? ( + x11-libs/libXcursor + x11-libs/libXrandr + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXxf86vm + x11-apps/xmessage + ) + xinerama? ( x11-libs/libXinerama ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + opencl? ( virtual/opencl ) + opengl? ( virtual/opengl ) + gsm? ( media-sound/gsm ) + jpeg? ( virtual/jpeg ) + ldap? ( net-nds/openldap ) + lcms? ( =media-libs/lcms-1* ) + mp3? ( >=media-sound/mpg123-1.5.0 ) + nls? ( sys-devel/gettext ) + odbc? ( dev-db/unixODBC ) + pulseaudio? ( media-sound/pulseaudio ) + samba? ( >=net-fs/samba-3.0.25 ) + selinux? ( sec-policy/selinux-wine ) + xml? ( dev-libs/libxml2 dev-libs/libxslt ) + scanner? ( media-gfx/sane-backends ) + ssl? ( dev-libs/openssl ) + png? ( media-libs/libpng ) + v4l? ( media-libs/libv4l ) + !win64? ( ${MLIB_DEPS} ) + win32? ( ${MLIB_DEPS} ) + xcomposite? ( x11-libs/libXcomposite )" +DEPEND="${RDEPEND} + X? ( + x11-proto/inputproto + x11-proto/xextproto + x11-proto/xf86vidmodeproto + ) + xinerama? ( x11-proto/xineramaproto ) + !hardened? ( sys-devel/prelink ) + virtual/pkgconfig + virtual/yacc + sys-devel/flex" + +src_unpack() { + if use win64 ; then + [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \ + && die "you need gcc-4.4+ to build 64bit wine" + fi + + if use win32 && use opencl; then + [[ x$(eselect opencl show) = "xintel" ]] && + die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947 + fi + + if [[ ${PV} == "9999" ]] ; then + git-2_src_unpack + else + unpack ${MY_P}.tar.bz2 + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726 + epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 + epatch "${DISTDIR}/${PULSE_PATCH}" #421365 + # Pinkbyte: hack for properly hook RawInput methods + epatch "${FILESDIR}"/${PN}-raw_input_mod.patch + # Pinkbyte: fix perfomance problems with vertex buffers + epatch "${FILESDIR}"/disable-dynamic-vertex-buffers.patch + # Pinkbyte: fix deadlock issue with WoT on fglrx (http://bugs.winehq.org/show_bug.cgi?id=30330). + # Thanks to eto-rapchik@jabber.ru for discovering this issue. + use video_cards_fglrx && epatch "${FILESDIR}"/${PN}-remove-support-for-GL_ARB_sync.patch + # Pinkbyte: finally, this should be executed after applying such patches + "${S}"/tools/make_requests + # + epatch_user #282735 + eautoreconf + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die + sed -i '/^MimeType/d' tools/wine.desktop || die #117785 +} + +do_configure() { + local builddir="${WORKDIR}/wine$1" + mkdir -p "${builddir}" + pushd "${builddir}" >/dev/null + + ECONF_SOURCE=${S} \ + econf \ + --sysconfdir=/etc/wine \ + $(use_with alsa) \ + $(use_with capi) \ + $(use_with lcms cms) \ + $(use_with cups) \ + $(use_with ncurses curses) \ + $(use_with udisks dbus) \ + $(use_with fontconfig) \ + $(use_with gnutls) \ + $(use_with gphoto2 gphoto) \ + $(use_with gsm) \ + $(use_with gstreamer) \ + --without-hal \ + $(use_with jpeg) \ + $(use_with ldap) \ + $(use_with mp3 mpg123) \ + $(use_with nls gettext) \ + $(use_with openal) \ + $(use_with opencl) \ + $(use_with opengl) \ + $(use_with ssl openssl) \ + $(use_with oss) \ + $(use_with png) \ + $(use_with threads pthread) \ + $(use_with pulseaudio pulse) \ + $(use_with scanner sane) \ + $(use_enable test tests) \ + $(use_with truetype freetype) \ + $(use_with v4l) \ + $(use_with X x) \ + $(use_with xcomposite) \ + $(use_with xinerama) \ + $(use_with xml) \ + $(use_with xml xslt) \ + $2 + + emake -j1 depend + + popd >/dev/null +} + +src_configure() { + export LDCONFIG=/bin/true + use custom-cflags || strip-flags + + if use win64 ; then + do_configure 64 --enable-win64 + use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64 + else + ABI=x86 do_configure 32 --disable-win64 + fi +} + +src_compile() { + local b + for b in 64 32 ; do + local builddir="${WORKDIR}/wine${b}" + [[ -d ${builddir} ]] || continue + emake -C "${builddir}" all + done +} + +src_install() { + local b + for b in 64 32 ; do + local builddir="${WORKDIR}/wine${b}" + [[ -d ${builddir} ]] || continue + emake -C "${builddir}" install DESTDIR="${D}" + done + dodoc ANNOUNCE AUTHORS README + if use gecko ; then + insinto /usr/share/wine/gecko + doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi + use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi + fi + if use mono ; then + insinto /usr/share/wine/mono + doins "${DISTDIR}"/wine-mono-${MV}.msi + fi + if ! use perl ; then + rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die + fi + + if use win32 || ! use win64; then + pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055 + fi + use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader} + + if use win64 && ! use win32; then + dosym /usr/bin/wine{64,} # 404331 + dosym /usr/bin/wine{64,}-preloader + fi +}