Pull in GLU headers and libraries for compability with x11-libs/qt-opengl >= 4.8.0 wrt #407391 by Daniel Pielmeier and Helmut Jarausch

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 56 insertions, 21 deletions

diff --git a/media-video/ttcut/ChangeLog b/media-video/ttcut/ChangeLog
index 0826ceaaf88b..b485acedf3cc 100644
--- a/media-video/ttcut/ChangeLog
+++ b/media-video/ttcut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ttcut
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ChangeLog,v 1.30 2011/07/26 17:14:46 billie Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ChangeLog,v 1.31 2012/03/10 08:36:07 ssuominen Exp $
+
+  10 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> ttcut-0.19.6-r3.ebuild,
+  +files/ttcut-0.19.6-no_implicit_GLU.patch:
+  Pull in GLU headers and libraries for compability with x11-libs/qt-opengl >=
+  4.8.0 wrt #407391 by Daniel Pielmeier and Helmut Jarausch
 
   26 Jul 2011; Daniel Pielmeier <billie@gentoo.org> -ttcut-0.19.6-r2.ebuild,
   -files/ttcut-0.19.6-transcode-compat.patch:
diff --git a/media-video/ttcut/Manifest b/media-video/ttcut/Manifest
index 3b00a4a0cda9..62b3a2564df1 100644
--- a/media-video/ttcut/Manifest
+++ b/media-video/ttcut/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ttcut-0.19.6-deprecated.patch 15006 RMD160 79786ddc54d21d1cd8aaa00a42d44dccd56f99c0 SHA1 61b49069f0ccdfb4fd9c5e0035dc55fef668a9e5 SHA256 165b51f4e65aa9cb81d76b7858e37aa1fe3de5674fc8a0beec0373390c20a11f
 AUX ttcut-0.19.6-ffmpeg-vf-setdar.patch 7161 RMD160 6314f24140bd85d99c765c26db5328f91eb392af SHA1 e691231240d4b1982d9ac636f9d8243e2eb5328c SHA256 c73ef34c54cccf408f90f6afb18c25de1518b2836d35df097684e47006c17b66
+AUX ttcut-0.19.6-no_implicit_GLU.patch 682 RMD160 a99691714c4015f8ef20ee34782b6282e8b881db SHA1 bf3ef28bf5d31ed7878ce512e71bc885330c204f SHA256 baadca16adce7f47686b26202e183ac9d86ef11efe0c10a68ddb318415f06b38
 AUX ttcut-0.19.6-ntsc-fps.patch 4284 RMD160 d3d7743658bb2e867c43de1af8823ee3bf30f9c3 SHA1 d3040464432efe3867d8f0b2b2ee0f751aa93dc2 SHA256 cd18f17334f3a282c7c3e3e1878d925b9156d3361ab5bfef28c641f359907c6d
 AUX ttcut.desktop 304 RMD160 d72ca00b4d3eba1287eaecde7dbe6720933b7e34 SHA1 cd65c92061b17fc33d6e42cafdedc09582df26ff SHA256 c0abf96602f80da68b88b35721838ae29e2708de009e78b522a5164d818f424a
 DIST ttcut-0.19.6.tar.gz 283977 RMD160 80e0e29cf0a807a5603b1d2b28e0467c04c8577e SHA1 ebb7b8cb9e516d9a3d394dc08abf3f8cd28f66c0 SHA256 e0f3f55fdcd67096de5588ddfb4a455cff731a9723923b34c283546c42c2ae11
-EBUILD ttcut-0.19.6-r3.ebuild 1047 RMD160 a3770d33e84b7d714a318d566934cf0838a6537e SHA1 67188c6e64beb8184e987ef2ad7766b9f1373cb3 SHA256 ae5a415a00a2c964d2582dd35bd242fd08978920c4a82e0058a0fa7098659f5e
-MISC ChangeLog 5067 RMD160 973a6a214e167ee8aec29970690f773ae6d9c3a4 SHA1 66fe30c3896cb3d7e402c3a89c94030c9a7d377f SHA256 81596cb990e9e75673473ddf12807069dfec6d029c84abed21d00eb21ed1bd3e
+EBUILD ttcut-0.19.6-r3.ebuild 1076 RMD160 fe0f1a829f727f85e2da06a70a0e71ab784fb8f9 SHA1 c62bd0f46d433f2c1cc42df4a6bc8d291615c4a5 SHA256 34e0e6227c96c563db4f9aad447838cd2135db369882542920936639f458c15a
+MISC ChangeLog 5333 RMD160 2a7813e5a0847ad62e384f43393b5894d9d77d9f SHA1 4ebe335a50ae18e4f57555dffce568bcd1e33c8b SHA256 07925aec45fa4956c47af81a73abb417cd4f5cc9e146bb37a2bb1a9ed53b521f
 MISC metadata.xml 734 RMD160 b1b3602ee8c6f19d6f77f085a93d02f35753f735 SHA1 6c81844cac4b33363e885d522c17137aa4226a0c SHA256 99ac9c6b2217ce49c92c9fd20563b769ffca3bdd70556e835ee5a62270ed8f05
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREIAAYFAk4u9iIACgkQlcuUeyFa0U3GrgCfYpOsvr+ADg2fYweWbgc2IRkm
-ny8An1P22Yv7NvmS0b8KGau7LvBv07xU
-=lKmB
+iQEcBAEBAgAGBQJPWxJ5AAoJEEdUh39IaPFN6CAIAJ5twBrI1hjepfBhK8kMq85Q
+9HPBUwYjAkBQWwNwovDJ0ELEe+8dlpQVh8+bTGBAJydXgWaYMoGSiQELFqNoG8RK
+wUOybylkfEjRoNDg4ROmetRJFsnl3jmxT/H+n5ZkzqceBbdcJ681QgSam/kf8bqR
+B6wXzNDmmhc8/sN9qj4P1+m40x7PASUnAB8rHwVqhMvg2cO6KLiw2XMtAXeWGmvY
+hZJaJ119gi13mnaD5Ex1QoEpg8G2nvDP/UdOC3D+t1ANqrHUJb/zXUavL4q9G8EF
+GnTdx285pzIzBHpesSOwFxGXpvgE9zoSzAMOz+24JlfWR5lRxKm4eBOswH8QdSA=
+=ioTG
 -----END PGP SIGNATURE-----
diff --git a/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch b/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch
new file mode 100644
index 000000000000..afb83aa296db
--- /dev/null
+++ b/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch
@@ -0,0 +1,24 @@
+Stop relying on implicit usage of GLU for compability with >=x11-libs/qt-opengl-4.8
+See, http://bugs.gentoo.org/407391
+
+--- mpeg2window/ttmpeg2window.cpp
++++ mpeg2window/ttmpeg2window.cpp
+@@ -33,6 +33,7 @@
+ // qApplication for the qApp pointer
+ #include <QApplication>
+ #include <QPixmap>
++#include <GL/glu.h>
+ 
+ // -----------------------------------------------------------------------------
+ // class declaration
+--- ttcut.pro
++++ ttcut.pro
+@@ -15,7 +15,7 @@
+ DEFINES     += _FILE_OFFSET_BITS=64
+ DIST        = TTCut
+ TARGET      = ttcut
+-LIBS        = -lmpeg2 -lmpeg2convert
++LIBS        = -lmpeg2 -lmpeg2convert -lGLU
+ OBJECTS_DIR = obj
+ MOC_DIR     = moc
+ UI_DIR      = ui_h 
diff --git a/media-video/ttcut/ttcut-0.19.6-r3.ebuild b/media-video/ttcut/ttcut-0.19.6-r3.ebuild
index c66c83d5486a..eb616e31f60e 100644
--- a/media-video/ttcut/ttcut-0.19.6-r3.ebuild
+++ b/media-video/ttcut/ttcut-0.19.6-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ttcut-0.19.6-r3.ebuild,v 1.3 2011/07/15 21:15:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ttcut/ttcut-0.19.6-r3.ebuild,v 1.4 2012/03/10 08:36:07 ssuominen Exp $
 
 EAPI=4
-
-inherit fdo-mime qt4-r2
+inherit eutils fdo-mime qt4-r2
 
 DESCRIPTION="Tool for cutting MPEG files especially for removing commercials"
 HOMEPAGE="http://www.tritime.de/ttcut/"
@@ -15,26 +14,28 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="x11-libs/qt-gui:4
+DEPEND=">=media-libs/libmpeg2-0.4.0
+	x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4
-	>=media-libs/libmpeg2-0.4.0
+	virtual/glu
 	virtual/opengl"
-
 RDEPEND="${DEPEND}
 	media-video/mplayer
 	>=virtual/ffmpeg-0.6.90[encode]"
 
 S=${WORKDIR}/${PN}
 
-PATCHES=( "${FILESDIR}"/${P}-deprecated.patch
-			"${FILESDIR}"/${P}-ntsc-fps.patch
-			"${FILESDIR}"/${P}-ffmpeg-vf-setdar.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-deprecated.patch
+	"${FILESDIR}"/${P}-ntsc-fps.patch
+	"${FILESDIR}"/${P}-ffmpeg-vf-setdar.patch
+	"${FILESDIR}"/${P}-no_implicit_GLU.patch
+	)
 
 src_install() {
 	dobin ttcut
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
+	domenu "${FILESDIR}"/${PN}.desktop
 
 	dodoc AUTHORS BUGS CHANGELOG README.* TODO
 }