Support QT-embedded and fix typos (bug #53403)

4 files changed, 222 insertions, 8 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index d466962433d2..28e6c04f9a1a 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.25 2004/06/28 16:21:19 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.26 2004/07/04 17:11:42 chrb Exp $
+
+  04 Jul 2004; Chris Bainbridge <chrb@gentoo.org> :
+  Support QT-embedded and fix typos (bug #53403)
 
   28 Jun 2004; Daniel Goller <morfic@gentoo.org> mythtv-0.15.1.ebuild:
   Added patch to allow compilation on gcc-3.4.0 conditionally
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 04bcc64affa0..c33d98088886 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,14 +1,16 @@
-MD5 3d9bee3ecb9fb56ee0662360121d9792 mythtv-0.15.1.ebuild 6637
+MD5 c1b5d819abb506319fcd4b1f4243a7bb ChangeLog 5960
+MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 bb8f641b460d061161d9982b0464b9dc mythtv-0.13-r1.ebuild 4519
 MD5 069bb2ed03255dd27030c717e89ff508 mythtv-0.14-r1.ebuild 5581
-MD5 288559b6d725c05b02052762df93c564 ChangeLog 5860
-MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 75594236f281302bcb8f60629e0da65b files/tvformat.fix.0.13.diff 407
-MD5 788cdcff1808794391bf5ef2e157b5fb files/digest-mythtv-0.15.1 67
+MD5 3d9bee3ecb9fb56ee0662360121d9792 mythtv-0.15.1.ebuild 6637
+MD5 e358642401b191c8a3a09bd4b196c525 mythtv-0.15.1-r1.ebuild 7221
 MD5 a01439b4ddf480862e31867fc4689698 files/digest-mythtv-0.13-r1 65
 MD5 24ab1e90e64fb0be4704e74b633e96b1 files/digest-mythtv-0.14-r1 65
+MD5 788cdcff1808794391bf5ef2e157b5fb files/digest-mythtv-0.15.1 67
+MD5 e7cc68f54ad1c6128aec944e105189e3 files/gcc-3.4-fix.patch 1773
 MD5 3c150f80fdec582108af25558f4a5716 files/mythbackend.conf 862
-MD5 f34c79d00b235a08f18cf9f2107d6390 files/mythtv-0.15-directfb.patch 1185
 MD5 7eb7585f7d3619b53ce2ca1180093f82 files/mythbackend.rc6 1660
-MD5 e7cc68f54ad1c6128aec944e105189e3 files/gcc-3.4-fix.patch 1773
 MD5 b3a4780890d53640604812b8069a8297 files/mythfilldatabase.cron 74
+MD5 f34c79d00b235a08f18cf9f2107d6390 files/mythtv-0.15-directfb.patch 1185
+MD5 75594236f281302bcb8f60629e0da65b files/tvformat.fix.0.13.diff 407
+MD5 788cdcff1808794391bf5ef2e157b5fb files/digest-mythtv-0.15.1-r1 67
diff --git a/media-tv/mythtv/files/digest-mythtv-0.15.1-r1 b/media-tv/mythtv/files/digest-mythtv-0.15.1-r1
new file mode 100644
index 000000000000..55e1ca838ced
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.15.1-r1
@@ -0,0 +1 @@
+MD5 91aca494281ae966f45f941026b72985 mythtv-0.15.1.tar.bz2 6209329
diff --git a/media-tv/mythtv/mythtv-0.15.1-r1.ebuild b/media-tv/mythtv/mythtv-0.15.1-r1.ebuild
new file mode 100644
index 000000000000..ab4693c60aa4
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.15.1-r1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.15.1-r1.ebuild,v 1.1 2004/07/04 17:11:42 chrb Exp $
+
+inherit flag-o-matic eutils
+
+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 arts dvb directfb lcd lirc nvidia cle266 opengl"
+
+DEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	X? ( >=x11-libs/qt-3.1 )
+	directfb? ( dev-libs/DirectFB >=x11-libs/qt-embedded-3.1 )
+	dev-db/mysql
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	>=sys-apps/sed-4
+	arts? ( kde-base/arts )
+	dvb? ( media-libs/libdvb )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	nvidia? ( media-video/nvidia-glx )
+	cle266? ( media-libs/libddmpeg )
+	opengl? ( >=x11-base/opengl-update-1.7 )
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )"
+
+RDEPEND="${DEPEND}
+	!media-tv/mythfrontend"
+
+pkg_setup() {
+	if use X; then QTP=x11-libs/qt; else QTP=x11-libs/qt-embedded; fi
+	local qt_use="$(</var/db/pkg/`best_version ${QTP}`/USE)"
+	if [ ! "`has mysql ${qt_use}`" ] ; 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 opengl ; then
+		local gl_implementation="$( opengl-update --get-implementation )"
+		if [ "$gl_implementation" == "xfree" ] || [ "$gl_implementation" == "xorg-x11" ] ; then
+			return 0
+		else
+			eerror "OpenGL implementation must be set to either xfree or xorg-x11 to allow compilation."
+			eerror "to change opengl implemantation use opengl-update <your xserver>."
+			eerror "After mythtv has been merged you can switch back to the preferred implementation.."
+			die "Incompatible OpenGL implementation."
+		fi
+	fi
+	return 0
+}
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+
+	for i in `grep -lr "usr/local" "${S}"` ; do
+		sed -e "s:usr/local:usr:g" -i "${i}" || die "sed failed"
+	done
+
+	use directfb && epatch ${FILESDIR}/mythtv-0.15-directfb.patch
+}
+
+src_compile() {
+	# Fix bugs 40964 and 42943.
+	filter-flags -fforce-addr -fPIC
+
+	if [ "${ARCH}" == "amd64" ]; then
+		sed -e "s:-march=pentiumpro::" -e "/DEFINES += MMX/d" -i settings.pro
+	else
+		local cpu="`get-flag march || get-flag mcpu`"
+		if [ "${cpu}" ] ; then
+			sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed"
+		fi
+	fi
+
+	if use alsa ; then
+		sed -e 's:#CONFIG += using_alsa:CONFIG += using_alsa:' \
+			-e 's:#ALSA_LIBS = -lasound:ALSA_LIBS = -lasound:' \
+			-i 'settings.pro' || die "enable alsa sed failed"
+	fi
+	if use arts ; then
+		sed -e 's:artsc/artsc.h:artsc.h:' \
+			-i "libs/libmyth/audiooutputarts.h" || die "sed failed"
+		sed -e 's:#CONFIG += using_arts:CONFIG += using_arts:' \
+			-e 's:#ARTS_LIBS = .*:ARTS_LIBS = `artsc-config --libs`:' \
+			-e 's:#EXTRA_LIBS += -L/opt/.*:EXTRA_LIBS += `artsc-config --libs`:' \
+			-e 's:#INCLUDEPATH += /opt/.*:QMAKE_CXXFLAGS += `artsc-config --cflags`:' \
+			-i 'settings.pro' || die "enable arts sed failed"
+	fi
+	if use directfb ; then
+		sed -e 's:#CONFIG += using_directfb:CONFIG += using_directfb:' \
+			-e 's:#EXTRA_LIBS += `directfb:EXTRA_LIBS += `directfb:' \
+			-e 's:#QMAKE_CXXFLAGS += `directfb:QMAKE_CXXFLAGS += `directfb:' \
+			-i 'settings.pro' || die "enable directfb sed failed"
+	fi
+	if use dvb ; then
+		sed -e 's:#CONFIG += using_dvb:CONFIG += using_dvb:' \
+			-e 's:#DEFINES += USING_DVB:DEFINES += USING_DVB:' \
+			-e 's:#INCLUDEPATH += /usr/src/.*:INCLUDEPATH += /usr/include:' \
+			-i 'settings.pro' || die "enable dvb sed failed"
+	fi
+	if use lcd ; then
+		sed -e 's:#DEFINES += LCD_DEVICE:DEFINES += LCD_DEVICE:' \
+			-i 'settings.pro' || die "enable lcd sed failed"
+	fi
+	if use lirc ; then
+		sed -e 's:#CONFIG += using_lirc:CONFIG += using_lirc:' \
+			-e 's:#LIRC_LIBS = -llirc_client:LIRC_LIBS = -llirc_client:' \
+			-i 'settings.pro' || die "enable lirc sed failed"
+	fi
+	if use nvidia ; then
+		sed -e 's:#CONFIG += using_xvmc:CONFIG += using_xvmc:' \
+			-e 's:#DEFINES += USING_XVMC:DEFINES += USING_XVMC:' \
+			-e 's:#EXTRA_LIBS += -lXvMCNVIDIA:EXTRA_LIBS += -lXvMCNVIDIA:' \
+			-i 'settings.pro' || die "enable nvidia xvmc sed failed"
+	fi
+	if use cle266 ; then
+		sed -e 's:#CONFIG += using_viahwslice:CONFIG += using_viahwslice:' \
+			-e 's:#DEFINES += USING_VIASLICE:DEFINES += USING_VIASLICE:' \
+			-e 's:#EXTRA_LIBS += -lddmpeg:EXTRA_LIBS += -lddmpeg:' \
+			-i 'settings.pro' || die "enable cle266 sed failed"
+	fi
+	if use opengl ; then
+		sed -e 's:#DEFINES += USING_OPENGL_VSYNC:DEFINES += USING_OPENGL_VSYNC:' \
+			-e 's:#EXTRA_LIBS += -lGL -lGLU:EXTRA_LIBS += -lGL -lGLU:' \
+			-i 'settings.pro' || die "enable opengl sed failed"
+	fi
+
+	if ! use X ; then
+		sed -e 's:CONFIG += using_x11:#CONFIG += using_x11:' \
+			-i 'settings.pro' || die "disable x11 failed"
+	fi
+
+	if ! use xv ; then
+		sed -e 's:CONFIG += using_xv:#CONFIG += using_xv:' \
+			-e 's:EXTRA_LIBS += -L/usr/X11:#EXTRA_LIBS += -L/usr/X11:' \
+		-i 'settings.pro' || die "disable xv failed"
+	fi
+
+	sed -i -e "s:-O3::g" -e "s:-fomit-frame-pointer::g" settings.pro
+
+	qmake -o "Makefile" "${PN}.pro"
+
+	econf || die "econf failed"
+	sed -i -e "s:OPTFLAGS=.*:OPTFLAGS=${CFLAGS}:g" config.mak
+	# enable exceptions if they are disabled (qt-e).
+	# this might not work.. if so, rebuild qt-e with rtti and exceptions
+	sed -i -e "s:-fno-exceptions:-fexceptions:g" programs/mythfilldatabase/Makefile
+	emake -j1 || die "compile problem"
+}
+
+src_install() {
+	einstall INSTALL_ROOT="${D}"
+	newbin "setup/setup" "mythsetup"
+
+	dodir /etc/mythtv
+	mv "${D}/usr/share/mythtv/mysql.txt" "${D}/etc/mythtv"
+	dosym /etc/mythtv/mysql.txt /usr/share/mythtv/mysql.txt
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	exeinto /usr/share/mythtv
+	doexe "${FILESDIR}/mythfilldatabase.cron"
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/mythbackend.rc6" mythbackend
+	insinto /etc/conf.d
+	newins "${FILESDIR}/mythbackend.conf" mythbackend
+
+	dodoc AUTHORS COPYING FAQ README UPGRADING keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /var/{log,run}/mythtv
+}
+
+pkg_postinst() {
+	ewarn "Please note that /usr/share/mythtv/setup has been moved"
+	ewarn "to /usr/bin/mythsetup"
+	echo
+
+	einfo "If this is the first time you install MythTV,"
+	einfo "you need to add /usr/share/mythtv/database/mc.sql"
+	einfo "to your mysql database."
+	einfo
+	einfo "You might run 'mysql < /usr/share/mythtv/database/mc.sql'"
+	einfo
+	einfo "Next, you need to run the mythsetup program."
+	einfo "It will ask you some questions about your hardware, and"
+	einfo "then run XMLTV's grabber to configure your channels."
+	einfo
+	einfo "Once you have configured your database, you can run"
+	einfo "/usr/bin/mythfilldatabase to populate the schedule"
+	einfo "or copy /usr/share/mythtv/mythfilldatabase.cron to"
+	einfo "/etc/cron.daily for this to happen automatically."
+	einfo
+	einfo "If you're upgrading from an older version and for more"
+	einfo "setup and usage instructions, please refer to:"
+	einfo "   /usr/share/doc/${PF}/README.gz"
+	einfo "   /usr/share/doc/${PF}/UPGRADING.gz"
+	echo
+	einfo "You need to emerge xmltv manually since it is no longer needed"
+	einfo "if the internal DataDirect implementation is to be used."
+}