commit:     09100f1d1fe7a0426bc146a79eb620f14521fbd9
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 04:43:20 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 05:54:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09100f1d

app-emulation/wine-d3d9: Drop osmesa patch

Setting minimum version for mesa to mesa-13 since that is the earliest
version that I can confirm works without this patch

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild  | 3 +--
 app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild  | 3 +--
 app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild  | 3 +--
 app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild  | 3 +--
 app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild  | 3 +--
 app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild  | 3 +--
 app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild
index 3b0bf33273c..c9d466cfdfa 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.0.ebuild
@@ -93,7 +93,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -321,7 +321,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild
index 4e02d6d3ba1..16579e0dfad 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.1.ebuild
@@ -93,7 +93,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -321,7 +321,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild
index 4e02d6d3ba1..16579e0dfad 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.2.ebuild
@@ -93,7 +93,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -321,7 +321,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild
index 4e02d6d3ba1..16579e0dfad 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.3.ebuild
@@ -93,7 +93,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -321,7 +321,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild
index bbe90f86cae..1591b6351dd 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.4.ebuild
@@ -93,7 +93,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -321,7 +321,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild
index bbe90f86cae..1591b6351dd 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.5.ebuild
@@ -93,7 +93,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -321,7 +321,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index bbe90f86cae..1591b6351dd 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -93,7 +93,7 @@ COMMON_DEPEND="
                virtual/glu[${MULTILIB_USEDEP}]
                virtual/opengl[${MULTILIB_USEDEP}]
        )
-       osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+       osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
        pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
        png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
        pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -321,7 +321,6 @@ src_prepare() {
        local PATCHES=(
                "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
                "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
-               "${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
                "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
                "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
        )

Reply via email to