OpenGL compile fix

(Portage version: 2.0.51.22-r1)

5 files changed, 175 insertions, 12 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 96480a57a3d4..504db625ecd1 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.58 2005/05/22 22:43:19 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.59 2005/05/23 06:50:30 cardoe Exp $
+
+*mythtv-0.18.1-r1 (23 May 2005)
+
+  23 May 2005; Doug Goldstein <cardoe@gentoo.org>
+  +files/mythtv-0.18.1-opengl-fix.patch, +mythtv-0.18.1-r1.ebuild:
+  OpenGL compile fix.
 
   22 May 2005; Doug Goldstein <cardoe@gentoo.org> files/0.18-mythbackend.rc:
   Fix warning msg for users running MythTV as root.
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 7f5a13d473e4..2ddc4cf82782 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 24e80fc8691535e7884a0e53967d63ea ChangeLog 11292
+MD5 d9cd93e266ef145df3dab5a8c7d4b574 ChangeLog 11465
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 MD5 2fa8416fc9cfa49edcdc9558f1e8ad48 mythtv-0.16.ebuild 5817
 MD5 d031942485bf1c04b7b66ea1cbe191fb mythtv-0.17-r1.ebuild 7329
 MD5 6b86167bcfe95fc869f5eb693b24fe1a mythtv-0.18.1.ebuild 4018
 MD5 3c70eb99dc663b47f25f565270044080 mythtv-0.18-r2.ebuild 3787
+MD5 1b764338e9cf0bf6d201d4c27d595a79 mythtv-0.18.1-r1.ebuild 4065
 MD5 fb4505fe7e8b832e115d777bf836d3bc files/digest-mythtv-0.16 66
 MD5 590c9a6a89442b347c3a5f52d1781351 files/digest-mythtv-0.17-r1 66
 MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1 67
@@ -15,13 +13,8 @@ MD5 5938ea3584383e501674bf67a7f7e2a7 files/mythbackend.rc6 1776
 MD5 b3a4780890d53640604812b8069a8297 files/mythfilldatabase.cron 74
 MD5 8d46f5508de5d412db9e4a757db00e26 files/mythtv-0.16-cx88.patch 674
 MD5 bcfd584bc73afea9d88c8afe7d47f5be files/mythtv-0.17-qt334-dst-fix.patch 5663
+MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67
 MD5 946d39e6c7d43c06d11d2bc6e09d5c21 files/0.18-mythbackend.rc 1606
 MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931
 MD5 67c40a05f5751719f170820c4d50c9c6 files/digest-mythtv-0.18-r2 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCkQxLBtvusYtCZMsRAnPqAJ92mZZp2oq573Y8E1/n5HnxEScS3ACeOsew
-BwlSCxKxYWGoEYF71GvFGUg=
-=PsAa
------END PGP SIGNATURE-----
+MD5 340e376a796fcc134e37222f01d705b3 files/mythtv-0.18.1-opengl-fix.patch 304
diff --git a/media-tv/mythtv/files/digest-mythtv-0.18.1-r1 b/media-tv/mythtv/files/digest-mythtv-0.18.1-r1
new file mode 100644
index 000000000000..c19a91ec4aa3
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.18.1-r1
@@ -0,0 +1 @@
+MD5 e6cabf88feeaf6ae8f830d3fdf7b113d mythtv-0.18.1.tar.bz2 8858839
diff --git a/media-tv/mythtv/files/mythtv-0.18.1-opengl-fix.patch b/media-tv/mythtv/files/mythtv-0.18.1-opengl-fix.patch
new file mode 100644
index 000000000000..030178e3d6d9
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-0.18.1-opengl-fix.patch
@@ -0,0 +1,11 @@
+Index: libs/libmythtv/libmythtv.pro
+===================================================================
+--- libs/libmythtv/libmythtv.pro	(revision 7)
++++ libs/libmythtv/libmythtv.pro	(working copy)
+@@ -148,5 +148,6 @@
+ 
+ using_opengl_vsync {
+     CONFIG += opengl
++    DEFINES += USING_OPENGL_VSYNC
+ }
+ 
diff --git a/media-tv/mythtv/mythtv-0.18.1-r1.ebuild b/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
new file mode 100644
index 000000000000..47514ac8ab7c
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r1.ebuild,v 1.1 2005/05/23 06:50:30 cardoe Exp $
+
+inherit flag-o-matic eutils debug
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org/"
+SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="alsa altivec arts debug dvb frontendonly ieee1394 jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome xv"
+
+DEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	virtual/x11
+	>=x11-libs/qt-3.1.1
+	dev-db/mysql
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	arts? ( kde-base/arts )
+	dvb? ( media-libs/libdvb )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	nvidia? ( media-video/nvidia-glx )
+	oggvorbis? ( media-libs/libvorbis )
+	opengl? ( virtual/opengl )
+	ieee1394? ( >=sys-libs/libraw1394-1.2.0 )
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
+	!x11-base/xfree
+	!<x11-base/xorg-x11-6.8"
+
+# ieee1394 also needs >=sys-libs/libiec61883-1.0.0
+
+RDEPEND="${DEPEND}
+	!media-tv/mythfrontend"
+
+pkg_setup() {
+
+	if ! built_with_use x11-libs/qt mysql ; then
+		eerror "Qt is missing MySQL support. Please add"
+		eerror "'mysql' to your USE flags, and re-emerge Qt."
+		die "Qt needs MySQL support"
+	fi
+
+	if use nvidia; then
+		echo
+		ewarn "You enabled the 'nvidia' USE flag, you must have a GeForce 4 or"
+		ewarn "greater to use this. Otherwise, you'll have crashes with MythTV"
+		echo
+	fi
+
+	einfo
+	einfo "Please note, this ebuild does not use your CFLAGS and CXXFLAGS. It determines"
+	einfo "a sane set and uses those. Please do not attempt to override this behavior."
+	einfo
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-opengl-fix.patch
+
+#	# Fix bugs 40964 and 42943.
+#	filter-flags -fforce-addr -fPIC -momit-leaf-frame-pointer
+#	is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
+}
+
+src_compile() {
+	use unichrome && use nvidia && die "You can not have USE="unichrome" and USE="nvidia" at the same time. Must disable one or the other."
+	local myconf="$(use_enable altivec)
+		$(use_enable oss audio-oss)
+		$(use_enable alsa audio-alsa)
+		$(use_enable arts audio-arts)
+		$(use_enable jack audio-jack)
+		$(use_enable lirc)
+		$(use_enable joystick joystick-menu)
+		$(use_enable unichrome xvmc-vld)
+		$(use_enable dvb)
+		$(use_enable dvb dvb-eit)
+		--dvb-path=/usr/include
+		$(use_enable opengl opengl-vsync)
+		$(use_enable oggvorbis vorbis)
+		$(use_enable nvidia xvmc)
+		$(use_enable xv)
+		--disable-directfb
+		--enable-x11
+		--enable-proc-opt"
+
+	if use mmx || use amd64; then
+		myconf="${myconf} --enable-mmx"
+	else
+		myconf="${myconf} --disable-mmx"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+	fi
+
+	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	# depends on bug # 89799
+	# $(use_enable ieee1394 firewire)
+
+	if use frontendonly; then
+		##Backend Removal
+		cd ${S}
+		sed -e "s:CONFIG  += linux backend:CONFIG  += linux:" \
+			-i 'settings.pro' || die "Removal of mythbackend failed"
+	fi
+
+	# let MythTV come up with our CFLAGS. Upstream will support this
+	CFLAGS=""
+	CXXFLAGS=""
+	econf ${myconf} || die "configure died"
+
+	qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	emake || die "emake failed"
+
+}
+
+src_install() {
+
+	einstall INSTALL_ROOT="${D}" || die "install failed"
+	for doc in AUTHORS COPYING FAQ UPGRADING ChangeLog README; do
+		test -e "${doc}" && dodoc ${doc}
+	done
+
+	if ! use frontendonly; then
+		newbin "setup/mythtv-setup" "mythsetup"
+
+		insinto /usr/share/mythtv/database
+		doins database/*
+
+		exeinto /usr/share/mythtv
+		doexe "${FILESDIR}/mythfilldatabase.cron"
+
+		newinitd ${FILESDIR}/0.18-mythbackend.rc mythbackend
+		newconfd ${FILESDIR}/0.18-mythbackend.conf mythbackend
+	fi
+
+	dodoc keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /var/log/mythtv
+}