Gles patch added bug #554478.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x34E69781

4 files changed, 34 insertions, 11 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 433d4fc39802..c0da0262b293 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.127 2015/07/10 22:58:27 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.128 2015/07/22 18:27:21 amynka Exp $
+
+  22 Jul 2015; Amy Winston <amynka@gentoo.org> +files/opencv-3.0.0-gles.patch,
+  opencv-3.0.0.ebuild:
+  Gles patch added bug #554478.
 
 *opencv-3.0.0 (10 Jul 2015)
 	
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index fdd612d0266a..88ea4404273b 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -9,22 +9,23 @@ AUX opencv-2.4.8-javamagic.patch 1165 SHA256 b13037b93683ee8e6f535cbbd8742005e67
 AUX opencv-2.4.9-cuda-pkg-config.patch 373 SHA256 18ef4f87f3effcc1306c81ff8134a5863a694988efddc16ac36b15892d403b76 SHA512 5b8f931758c6c8edfc3cae35a16d1c8674f17716f13b424ee0510eb313f06ed334b80205262e6bfcce22db235467cad81fddfa96e0cf669972794cc8524f6937 WHIRLPOOL c19c4b3acc6944a3218cba55b38875f417a8755e9616dc26a1541a189452bf7f01fcbbde3436290752d8fa75caebd39b3335eb8beca697e06a4a86cd8dfa0e27
 AUX opencv-2.4.9-cuda.patch 7247 SHA256 94f01e58038306a6f699d867936038c9815f965f31075c268e80ad30aab33cc2 SHA512 b8d7a18e00359a985f389eecf779b2d648ea88f2508c31f1895eb0d9ef9ce2924866054a2df0bb452ba161c3ba254e4cb9717c1275392a2e8691b9b34c245e9b WHIRLPOOL 6bc5b4afb724a6450228eae6e6920ee57d36f2d1bb50c09a6bd7230f870224d75367d3a9dbd0f02d1bacb1fa48d6e2d331d363716cc547fb85b67b48985dc5fb
 AUX opencv-2.4.9-libav10.patch 22417 SHA256 7c95f31c8242b239c2cb3259e2bdecad4a56d1dfd8d6087e71265ab6123aeb8c SHA512 e6ce98f788df2cfa32861d62c21296e4a3cea7a8b6747bc945cf80267a23aa207f94b30c000bddf6ccea69fc22edef635ee33cd3dd683a4b790bcca49e068a93 WHIRLPOOL 887a684bdc0994b8a5bf6a83aca4e94eca45c5a65ab5bfda873156b4cb8c9ab3b3bc6a5a75a8a2016f4416e47ab4f6f9a3b6776ac10af3ca57d9a4e2c3b08c9c
+AUX opencv-3.0.0-gles.patch 481 SHA256 043a77f1726e1fe35d8b103bc8d3cfddd186db3cc7577d2e362da813f51a9c3e SHA512 37cac226bc39b91a87e4891e1d58169a0c2723240215670ebaecbfaf9b066b571296041fc5140aff7274cc44ca132b6f1b3bd4cf6d6dd23b950cac6eca548ad9 WHIRLPOOL a6f9f1022d29175cc6c5a1e08960178de254f2b1ff8c7714929020851d1f38934c6fee54239aed3f47e8c4005ee9ac359999f5f407d97cd684ebf28458044058
 DIST opencv-2.4.10.zip 91692581 SHA256 1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6 SHA512 545345f2984bda9ec5e5f0947077c5f40028ea018cbb21362f33615e5a02d5ed19a51c77a9b183086534e6496509dd008f9d7d40c2efc46bf2a942c710b4424c WHIRLPOOL 3231c1f6b766b39a44b10354532037f5f9f856bd1533c205cc39a1a3758aa53dd4d15595127fd6d1c1d2b6b7bdafe64521ca833c036a5075de4b298218d4bf0c
 DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
 DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
 EBUILD opencv-2.4.10.ebuild 6158 SHA256 c24bfb58248c57756cad39976581f279f70a9ec89d79332ee9e13cd33157666f SHA512 774448ea1b56adefb87baaaa19050994e03b056ef2b8b012092552a87890b028623ea6b35c53e2419372c19deae109a1889352bd5abd012be0bbdb2fc3577650 WHIRLPOOL eb6362c1b8a488e54f066a137bfedf99a8f3e6536629bd49186aada6a0c634f7649aa4e7ac17317f46c450682b7481fd9cfad10c52b100818a6744b97d120e59
 EBUILD opencv-2.4.9.ebuild 6145 SHA256 46923f2f7d72d5cc270a02afb9648efbf12c779137b1d9a8ee15e5fda4d4c65e SHA512 0ed36f1e35f085f00d28d120ac5c4a34f95f2bfa1fa13b1c8c3337fd474121e2cf7e36e213ab1144c5983cfed916841b5fae5ced02c802f80f3a7780a0d45361 WHIRLPOOL 2a71f4a2bb7868bd279676b56f5526f0f9ea8444ab3df73ee4e3fb8c46fe322c02b1fe02b415bead855c7df87a6d980d8af26b4e0264a93cc54fb13b80e98053
-EBUILD opencv-3.0.0.ebuild 5857 SHA256 55791b04a7d15a273d97a61744e738a05f466f6aa67be37dc6af15ce25df49dd SHA512 ed00a3789b16203ad254610944a8b61ac8e57b2cfadc218e9b13b39507f01f59e6e238e6777f7e7ce2107a81b221c49f8b1d9620a05b4698b49f4dab800ba400 WHIRLPOOL af0918b91c8136537a3bf21643be7f98798568098f0fa76ba4322fe61345d29757a33d10639896d598deffdb387a903c7da574ad44e36d6f173c7a56e9fa9ada
-MISC ChangeLog 20636 SHA256 0c9f366f9bf3039efde0c34cd462230a4df948cdf7b3157f24ea62acfe3c7544 SHA512 66b15df71f8218f4d5a64b5e2258f11cfd45294a13fe23b72c8885c10abbe273f68001d43fec83096a89476b2184f590c32a5144508c3ce8e7a7a30c90ba3fbf WHIRLPOOL e6237d99f2be806ce04bb4dae650dd55ce363b52b7c23dfcf05ff040d9c2dc68a944ae7baac50744f4363f706ae125c1c10bf25d067ed6604744d3009a1d91df
+EBUILD opencv-3.0.0.ebuild 5901 SHA256 7c87eb1a3297c079857f68f8bfa888b5280caab16677ad4c4f133c61b21169c3 SHA512 a80b28891782cfe609fff5218c392f4522db0a3dff52dd241eab8dc579cdc16e01841a88f96be0c2306d9fd376caa54805f894036da62989be6f17aa851f1986 WHIRLPOOL 0424f06ae93f829fbd2d389b46aec9b7e439cada1c70059502642bfd132e2696751ba2f07d9ef679a31e10ae810434379d20223360608b8ca28d030ac9fff293
+MISC ChangeLog 20771 SHA256 052e27ba72374b2839c36008f932238db999cb6b2c160c5660373a908aa412cb SHA512 99c69a12889f817de45682fb6fba36a3a1a37be3ef001ded69d602ba3ae252cea10cb45a714ff412b48b62fb54c63d5806b15e40f7817392e8d038c646699475 WHIRLPOOL 12448db499506deab2a67dccad6c0991bb138979cae260beda1e55d05a09e0bb643be3c255090d33480c46806b57589042afd4455aa1cd96204bfd92310a913f
 MISC metadata.xml 1331 SHA256 e15a4a1db3e105297dd1e081e599a5987d3f6a5dd0840ce32ffe60f3b2fc7d23 SHA512 adc6b5794ac0ede6d2477d9b62efff3c96495ac66c0ddfd50879047c514ecaac8f69cb5f0ea0a60f83e3542f5e0dda49ef945f63a22784df46e42dd73266fdaf WHIRLPOOL 4cefa607c0da6eaf753d26d18cdc0cf300c7c9fae71a0d06468db81dbe6faea347c6883d5c437d5e891661d661ac4fcec4bec600c385d873d3c9c7ef7362dcbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVoE1LAAoJEDuJ1FA05peBJ88H/A5bjtCOP8AXVAQwypuOEXW6
-WtuAcRGQtiuLYqDJ7TEaoM6BB9/CQH5lMd//H/n6Pv+mTgGoOP4yoeuZZgqwPfxW
-BsLOBLL2MvYrmRmm44vkQoD3k4Dps9XxBntNwbAaWu3aETugzP9nqNyMqNdFQosB
-bSPcT0x4I5Mi04rsjv0UR+//ustnei6Hx/UqJaXB/KNENoio8a6ICWOERRjaWYD4
-dQ9okz38wK3RSHa6LLDMEwG4GaDf/YUKY6hyQHRJMInvRCQwxzAy8Y42fdUDwgQl
-286+5BgFuXVgrUK3M8NGl/ZOPTvaj7aEAlfsGgKljxJQvNcn14jmxI60WwJTc/Y=
-=7x19
+iQEcBAEBCAAGBQJVr+CDAAoJEDuJ1FA05peBsSMH/RC9VX1pogvFyx2GGThhrN3g
+vjecRPr4C/XXFWio1za16Sqj0jFT8I4xbQW+gPOr7NUtzJjczPqa1ER0URLBii1+
+X6JVwwja6eAeV1XFRFTkZKXlU4YsmayKJqy8JdgUFdG05NTyQ7ovcW2BDgG3nvPi
+XSWlpNd2QZjRBlO03ghIzHKWeS1vmT0ws4R/2fN+SmXnczNjCNkLd0sMpR18uCSM
+jbLHCKxLHrxuC/fHHrJKALw6oI0qRQG5AQEl1QdDeRmrr9ng8P36j4Wk7tskDQ8b
+AAGMAiC2ZL2xLrfteqAC3r3i6weBajjBaz1zpp0MDo7xfDPtI497yfEk2WoCPGU=
+=XXoC
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-3.0.0-gles.patch b/media-libs/opencv/files/opencv-3.0.0-gles.patch
new file mode 100644
index 000000000000..a2629d928e82
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.0.0-gles.patch
@@ -0,0 +1,14 @@
+Index: opencv-2.4.11/modules/highgui/src/window_QT.cpp
+===================================================================
+--- opencv-2.4.11.orig/modules/highgui/src/window_QT.cpp
++++ opencv-2.4.11/modules/highgui/src/window_QT.cpp
+@@ -3118,7 +3118,9 @@ void OpenGlViewPort::updateGl()
+ 
+ void OpenGlViewPort::initializeGL()
+ {
++#ifdef GL_PERSPECTIVE_CORRECTION_HINT
+     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
++#endif
+ }
+ 
+ void OpenGlViewPort::resizeGL(int w, int h)
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index f677b7a7fa40..b744913573f6 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-3.0.0.ebuild,v 1.1 2015/07/10 22:02:43 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-3.0.0.ebuild,v 1.2 2015/07/22 18:27:21 amynka Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -83,6 +83,10 @@ DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.6 )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-gles.patch"
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	java-pkg-opt-2_pkg_setup