commit: d30c046800f15497fbda72f654c91261dcd547ba
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 04:26:08 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 06:01:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d30c0468
app-emulation/wine: Version bump to 1.8.1. Includes GST 1.0 backport
Package-Manager: portage-2.2.26
app-emulation/wine/Manifest | 3 ++
.../wine/{wine-9999.ebuild => wine-1.8.1.ebuild} | 35 ++++++++++++++++------
app-emulation/wine/wine-9999.ebuild | 10 +++++--
3 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index ed36f76..5dd7561 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -42,6 +42,8 @@ DIST wine-1.7.55-gstreamer-v5.patch.bz2 5800 SHA256
9ce03b6bc404dec4ed82208dcaa5
DIST wine-1.7.55.tar.bz2 22814631 SHA256
a148f6c9cb45a75ef1a15e60a7db9c22fce985e0e58fe1350e7931dfe5d36119 SHA512
f47025017836ce1bbf2ed69c7d7421bd8a2f33ff94ced4a5caf92f4fabdf336119c80a28aeb8ba1ebe0239871a6ac62d8af8435d220c317624c17aabc2100dd7
WHIRLPOOL
c5575d2ef687caccbdb5cc09a0c6a4ba9f65ec9674cbe3f23ecfced62710dcb0019a11ff66f2ec4c2eafdb30d9891abad158ac4f865cc580a2878067de7304d7
DIST wine-1.7.8.tar.bz2 21463503 SHA256
30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512
1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea
WHIRLPOOL
3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
DIST wine-1.7.9.tar.bz2 21323337 SHA256
79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512
29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0
WHIRLPOOL
333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
+DIST wine-1.8-gstreamer-1.0.patch.bz2 30908 SHA256
00cc1e943e2dffb7d588bb5befd444655a661bc0a0e51e49651af47e9421c501 SHA512
46901b549b1c84f7d8f8ff4485d1faf60a108cdf84feddc754739aff918e1e979b0b8a1a2604e5df6693bdfb02a3324516a187187f019bea13bc5485fc51aec9
WHIRLPOOL
afe4caaf7b3d7ab07a9d8f6ea32125c1838745d399eb9ef2211c669bcd445ae5020991bd729b0460a6804fe5d44a2f42c32d94b2de32cc4b338f9391dcc6f78c
+DIST wine-1.8.1.tar.bz2 22839063 SHA256
149ad3daaf8593b36c5c061285df0ec2a25e20ea48c61323be91088c4d22ca97 SHA512
e4cc3d00f28a616326f3069c7eeb94dc07759018b719bc37fe733b0f5e5d17f54ed2e877a964e9ea235362c49bf45bb3ec7072fba3d66648e6c7d55568e863cb
WHIRLPOOL
8970d900c769add34a079f84c0562fca2d7e303ee9aa15de0fe2fde059de01256951c5ffeddb7b0a126599636e83d0d4ebdb8c0df5cde218fe8858e8b2451a0a
DIST wine-1.8.tar.bz2 22843418 SHA256
f33b45c18112b2071fbf9edee0e8c575407f9e2a9855ca4ee918ed33efa7c6f4 SHA512
34308e82e04dee714fdbd10f29cd6cf6326e5e6e9134f7076e58b09988211065b8c6584881b7e5dcbc9b3906a819ab8a72b612b060cb9aa50b5b67f03bdab089
WHIRLPOOL
335a48f1b34cd1038d62290e52c3189b842d4077b7cf0bcb9d003595992360dc36eac1c592d31db44598de68010f3934daa1f4bcd0a2ca74aa130a39a74f7ce3
DIST wine-1.9.4.tar.bz2 22974777 SHA256
75c1eab6b980870b367a73db6e57eb0dc9242c2be8546f94084577a0ed0bbbb8 SHA512
e7b35290ec8f451163a08e841c559698a6b7264b320058e38ac788bdde66042efbb88511b30fa38383844425eaf0b6f4ed4b8412feb843ed405cb510a4a9000c
WHIRLPOOL
875e11e9163df8c3473aa7b79deb5c6783a2068e678c4008cacf730d81c2f141490264a10f4345ceadd7aba100d3fc71bdfda7858f89d966d339cc2772cd8190
DIST wine-1.9.5.tar.bz2 23034629 SHA256
fb526308e7ac5e202c0f0b663d4c7a943419d9eec766af6831caf23914300f09 SHA512
cae779353bff61c215d0969288afe6e6e5192cdf0f86f8b15073861f0a22cb6b508ceb084e9b2cb5c5c658abfec5751edf9cb48930bc97c43ecbd6953427fc07
WHIRLPOOL
7f0c29b13b67660d364b2bbc86982a92f73409cfca3e8a31817c39df36d9ad476a9762f135d85fbb947746367277576a97fb6a012f346c11454c43ef75ac9fa7
@@ -79,6 +81,7 @@ DIST wine-staging-1.7.52.tar.gz 9654310 SHA256
84354a10e4226b5e456abb6d5727f4514
DIST wine-staging-1.7.53.tar.gz 9638222 SHA256
438f41165987a57635694dba2f67cc435cd630581b13cafe0c85daacf37a102a SHA512
716840c44923848a28b481f6b4e422ef84fe33bef33a650c183c62be0dbec34471375fe2b1911382282f293fd5135ce133cdb775acd7df98029be2e4646b6d9e
WHIRLPOOL
702555a706e50521ca6864b7b29ee4a4774fc8d770775c5186728b19e2c71ba6040ce98f86a772435c0d2f0a4363bc2a1e8f0b13ffbbe9395c072d3d89d1118c
DIST wine-staging-1.7.54.tar.gz 9647030 SHA256
b244ab05326e0a4c149beba0684afc100d44dca8e6ff606bcfee883b21b27303 SHA512
f6e58be01ba10121d6904cb238b2d91dd79cb7d14d623c00a897e655adb88332bea125cedf3fad85e680c76aacfbab16dd5035c322278155defd3b493054aa23
WHIRLPOOL
4c053ad96e67f4e82c93d3cfa9b6f885c4c3fe693946dd0e2a30cef556aac55f9dcafb5c56ced0f714f8ea9448cb4e22f144ea7f3561cfdb5bbff1b049d34f07
DIST wine-staging-1.7.55.tar.gz 9604441 SHA256
856b630fe95250e3d2dfc80588529e42e92e37f2e974ce8d3da37b39bf5cc3c3 SHA512
a6fbfa01b6d6efc75f79235aea86091c32ddf91ca300c73325c8347949c627f53ceb0fe085d6c212602797b0496d36c0a79f08eae4644a17774e95906332032d
WHIRLPOOL
ad232568c9df5d436a79a3557c82e231eed121356d8db1f5a3c0e7249b6c2760d87bb433ff30d6db53ce190b2d49401aa387b06f0c3f74925aefea7b1d73f112
+DIST wine-staging-1.8.1.tar.gz 9598557 SHA256
12a4e54376515e2ab8ad79855ba724ba065c8de619c5da192ec528cc365f9c97 SHA512
d24bb78aed1e50ad73e742608048a68097d40e3c6563c1bd5adc2fab6abe0838dbce2d9f700ef71d876c6dfee232e97bef91bbc8f6b6c9092ff8db5a2d0f05ac
WHIRLPOOL
cb1400586860d4e6dad3f3bad78bdde27f8ea9fb703180533f5852368041879efe93e716df8f54bbeabba38b7d921ec0e2737bc6121c8cb5fd5af8d117d7e538
DIST wine-staging-1.8.tar.gz 9632566 SHA256
c66f3dd6a760d516affe7467c4fb2d15ea8e2f0c72bcda1982219948dcdff11b SHA512
7b030b217ed0b37b8037d782406f75fcdb681c81371eafcab87175c0e6ac8b50fc58fe364e933e79eff168c1755412276fae3f914b7c36a6937aea1f6e35b022
WHIRLPOOL
8cff5d1d4c23405b820dbf9e7f73f7bba785e04ec2d9087b0977bb7aa1e6b84c2e6c3ac2f9cc72ba3c16f2b9c8c3607ea02ef1cd52d428a2b441333a424d9a21
DIST wine-staging-1.9.4.tar.gz 9719676 SHA256
1b3c6bb3e21e549fb8657cd9a2117946b7e78140b400c614dd41b041b6dc2674 SHA512
2c81b9f0315ed4f68d1874482805c9b6d3f2f9611f6dd1477ad0632d17f66e7f5e75720e5c7cef3a873876541c9d7d212fa8803a57cbec415aca32793a734634
WHIRLPOOL
0a66f53327976dd63532b9350d64461df3dcb0ea2fdc63d3498eac94d92387cf4bd53054c693c4a902f7fbba8ad0f2fdf59682e8622f3920a9a426344c656f54
DIST wine-staging-1.9.5.tar.gz 9889302 SHA256
e12c5fb741e6c5b55b99c37d6bba1746b0f40317f27198406e63f260ede3600c SHA512
aaaf08449e956f5f2b42440f8becf7233a22f2f807041b5524fae3c25c80078b86a84e6000803e014a5d2fc089e3df78cb66f0d1fe35675ae0f4ffdfa7ba3f10
WHIRLPOOL
692da1ec383b7efbcb12c8fa4078ed9b4143eb101baa06523f5bd85c749f0b87fe9a550e4d60e3c33e3d896782c9bc957f61171d01dcadbc8847ecbbc57c40ff
diff --git a/app-emulation/wine/wine-9999.ebuild
b/app-emulation/wine/wine-1.8.1.ebuild
similarity index 93%
copy from app-emulation/wine/wine-9999.ebuild
copy to app-emulation/wine/wine-1.8.1.ebuild
index 96af59e..466e8f5 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-1.8.1.ebuild
@@ -2,13 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI=6
-AUTOTOOLS_AUTORECONF=1
PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv
te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n
multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib
multilib-minimal pax-utils toolchain-funcs virtualx versionator
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git
http://source.winehq.org/git/wine.git";
@@ -22,11 +21,13 @@ else
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
fi
-GV="2.44"
-MV="4.6.0"
+GV="2.40"
+MV="4.5.6"
+[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.8-gstreamer-1.0"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/";
SRC_URI="${SRC_URI}
@@ -34,6 +35,7 @@ SRC_URI="${SRC_URI}
abi_x86_32? (
https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
abi_x86_64? (
https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
)
+ gstreamer? (
https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${GST_P}.patch.bz2 )
mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2";
@@ -41,7 +43,7 @@ if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
else
SRC_URI="${SRC_URI}
- staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz ->
${STAGING_P}.tar.gz )"
+ staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz
-> ${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
@@ -50,6 +52,7 @@ IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags
dos elibc_glibc +fon
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
test? ( abi_x86_32 )
elibc_glibc? ( threads )
+ mono? ( abi_x86_32 )
pipelight? ( staging )
s3tc? ( staging )
vaapi? ( staging )
@@ -235,6 +238,7 @@ src_unpack() {
fi
unpack "${WINE_GENTOO}.tar.bz2"
+ use gstreamer && unpack "${GST_P}.patch.bz2"
l10n_find_plocales_changes "${S}/po" "" ".po"
}
@@ -243,9 +247,10 @@ src_prepare() {
local md5="$(md5sum server/protocol.def)"
local PATCHES=(
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
- "${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615
+ "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+ "${WORKDIR}/${GST_P}.patch"
)
if use staging; then
ewarn "Applying the Wine-Staging patchset. Any bug reports to
the"
@@ -262,8 +267,14 @@ src_prepare() {
source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $?
+
+ # To differentiate unofficial staging releases
+ [[ ! -z ${SUFFIX} ]] && \
+ sed -i "s/(Staging)/(Staging [Unofficial])/"
libs/wine/Makefile.in || die
fi
- autotools-utils_src_prepare
+
+ default
+ eautoreconf
# Modification of the server protocol requires regenerating the server
requests
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
@@ -430,6 +441,12 @@ pkg_postinst() {
ewarn "the existence of a .NET implementation, so you will
likely need"
ewarn "to install an external one, like via winetricks"
fi
+
+ if use gstreamer; then
+ ewarn "This package uses a Gentoo specific patchset to provide"
+ ewarn "GStreamer 1.0 support. Any bugs related to GStreamer
should"
+ ewarn "be filed at Gentoo's bugzilla, not upstream's."
+ fi
}
pkg_postrm() {
diff --git a/app-emulation/wine/wine-9999.ebuild
b/app-emulation/wine/wine-9999.ebuild
index 96af59e..89b9b23 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -24,8 +24,9 @@ fi
GV="2.44"
MV="4.6.0"
+[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
WINE_GENTOO="wine-gentoo-2015.03.07"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/";
@@ -41,7 +42,7 @@ if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
else
SRC_URI="${SRC_URI}
- staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz ->
${STAGING_P}.tar.gz )"
+ staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz
-> ${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
@@ -262,7 +263,12 @@ src_prepare() {
source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $?
+
+ # To differentiate unofficial staging releases
+ [[ ! -z ${SUFFIX} ]] && \
+ sed -i "s/(Staging)/(Staging [Unofficial])/"
libs/wine/Makefile.in || die
fi
+
autotools-utils_src_prepare
# Modification of the server protocol requires regenerating the server
requests
