From 0a9e410949da33e7d72a81b49549fe0aed63666b Mon Sep 17 00:00:00 2001
From: Ilya Tumaykin <itumaykin@gmail.com>
Date: Mon, 25 Apr 2016 02:45:25 +0300
Subject: media-video/mpv: replace math.h patch with upstream equivalent in
 0.17.0

It's the very same patch, but with an upstream commit reference.

Closes: https://github.com/gentoo/gentoo/pull/1341
Package-Manager: portage-2.2.28

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 .../files/mpv-0.17.0-add-missing-math-include.patch | 21 +++++++++++++++++++++
 media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch   | 14 --------------
 media-video/mpv/mpv-0.17.0.ebuild                   |  6 ++++--
 3 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 media-video/mpv/files/mpv-0.17.0-add-missing-math-include.patch
 delete mode 100644 media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch

(limited to 'media-video')

diff --git a/media-video/mpv/files/mpv-0.17.0-add-missing-math-include.patch b/media-video/mpv/files/mpv-0.17.0-add-missing-math-include.patch
new file mode 100644
index 000000000000..9f04fbe89c5c
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.17.0-add-missing-math-include.patch
@@ -0,0 +1,21 @@
+commit b735c0e2077cb37df6764350472cbc68a9142d91
+Author: wm4 <wm4@nowhere>
+Date:   Fri Apr 15 13:58:41 2016 +0200
+
+lcms: include math.h
+
+Fixes #3053.
+---
+
+diff --git a/video/out/opengl/lcms.c b/video/out/opengl/lcms.c
+index 7db8da6..a2030d3 100644
+--- a/video/out/opengl/lcms.c
++++ b/video/out/opengl/lcms.c
+@@ -16,6 +16,7 @@
+  */
+
+ #include <string.h>
++#include <math.h>
+
+ #include "mpv_talloc.h"
+
diff --git a/media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch b/media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch
deleted file mode 100644
index ecd02aa02f15..000000000000
--- a/media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fixes build failure on glibc-2.23
-
-../video/out/opengl/lcms.c: In function 'get_vid_profile':
-../video/out/opengl/lcms.c:235:27: error: implicit declaration of function 'pow' [-Werror=implicit-function-declaration]
-             double binv = pow(src_black[i], 1.0/gamma);
-                           ^
-diff --git a/video/out/opengl/lcms.c b/video/out/opengl/lcms.c
-index 7db8da6..3eb3d53 100644
---- a/video/out/opengl/lcms.c
-+++ b/video/out/opengl/lcms.c
-@@ -17,2 +17,3 @@
- 
-+#include <math.h> /* pow() */
- #include <string.h>
diff --git a/media-video/mpv/mpv-0.17.0.ebuild b/media-video/mpv/mpv-0.17.0.ebuild
index 7562eb57ac6b..7c3cfbb79412 100644
--- a/media-video/mpv/mpv-0.17.0.ebuild
+++ b/media-video/mpv/mpv-0.17.0.ebuild
@@ -126,8 +126,10 @@ RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-mplayer )
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-seeking-without-first-index-entry.patch"
-	"${FILESDIR}/${P}-glibc-2.23.patch")
+PATCHES=(
+	"${FILESDIR}/${P}-fix-seeking-without-first-index-entry.patch"
+	"${FILESDIR}/${P}-add-missing-math-include.patch"
+)
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
-- 
cgit v1.2.3-65-gdbad