diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2006-01-11 05:15:47 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2006-01-11 05:15:47 +0000 |
commit | fb98171327767204a6feef40da5818a65a4b41f4 (patch) | |
tree | f086ad0ec5b73aaf3b640c1066de8e3d5637c7ca /media-tv | |
parent | Stable on x86; bug #118407 (diff) | |
download | historical-fb98171327767204a6feef40da5818a65a4b41f4.tar.gz historical-fb98171327767204a6feef40da5818a65a4b41f4.tar.bz2 historical-fb98171327767204a6feef40da5818a65a4b41f4.zip |
added some patches that I sent upstream
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'media-tv')
-rw-r--r-- | media-tv/mythtv/ChangeLog | 7 | ||||
-rw-r--r-- | media-tv/mythtv/Manifest | 16 | ||||
-rw-r--r-- | media-tv/mythtv/files/mythtv-0.19_pre8554-chanutil-schar.patch | 21 | ||||
-rw-r--r-- | media-tv/mythtv/files/mythtv-0.19_pre8554-freetype.patch | 33 | ||||
-rw-r--r-- | media-tv/mythtv/mythtv-0.19_pre8554.ebuild | 4 |
5 files changed, 67 insertions, 14 deletions
diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog index 93837d3d2bda..b5e3f1540716 100644 --- a/media-tv/mythtv/ChangeLog +++ b/media-tv/mythtv/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-tv/mythtv # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.80 2006/01/11 04:01:47 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.81 2006/01/11 05:15:47 cardoe Exp $ + + 11 Jan 2006; Doug Goldstein <cardoe@gentoo.org> + +files/mythtv-0.19_pre8554-chanutil-schar.patch, + +files/mythtv-0.19_pre8554-freetype.patch, mythtv-0.19_pre8554.ebuild: + added some patches that I sent upstream *mythtv-0.19_pre8554 (11 Jan 2006) diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index fc30544fb1f1..b2ce74fe5045 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -1,7 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 3baf3cf772dcd0205678c9ecfbfb1259 ChangeLog 14972 +MD5 2aea27805dc29178b82b051e7ed3618d ChangeLog 15189 MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931 MD5 946d39e6c7d43c06d11d2bc6e09d5c21 files/0.18-mythbackend.rc 1606 MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67 @@ -14,16 +11,11 @@ MD5 a0dc63e4be8c214490e4ed4f13ed9544 files/mythtv-0.18.1-cc-on-mute.patch 679 MD5 58ad62106705e1d4641f95ea96a37748 files/mythtv-0.18.1-cputypes-configure.patch 994 MD5 340e376a796fcc134e37222f01d705b3 files/mythtv-0.18.1-opengl-fix.patch 304 MD5 fde2b2886b037b199cc815dbcb12617e files/mythtv-0.18.1-x86_64-configure.patch 631 +MD5 6aa61436d9eed3e1792a745a6d1f3dcc files/mythtv-0.19_pre8554-chanutil-schar.patch 1208 +MD5 c89433c53aa0030c59598b7403ffbe94 files/mythtv-0.19_pre8554-freetype.patch 1209 MD5 96e1efbc2a12349e4c5ada14422868af files/mythtv-0.19_pre8554-xrandr.patch 744 MD5 0d20a49cff965a0f3ab35cb0600b65b4 files/runmythfe 104 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222 MD5 f2c7e6f87a9c718acdd942b22140e2a9 mythtv-0.18.1-r1.ebuild 5109 MD5 cac72423d3f6c98d2ef628c3e83c4ff2 mythtv-0.18.1-r2.ebuild 5488 -MD5 9a1578bd13ca8cc9002e71a7f1117f2a mythtv-0.19_pre8554.ebuild 6328 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDxIOABtvusYtCZMsRAgtTAJ94Z4xl/+MQIo0gfz4kEkJV1iQUAgCeL1A2 -oqy+Ur9/RP+ut8w7thBk75E= -=kBPG ------END PGP SIGNATURE----- +MD5 d07136e9e07fa2055136e09dd09842da mythtv-0.19_pre8554.ebuild 6418 diff --git a/media-tv/mythtv/files/mythtv-0.19_pre8554-chanutil-schar.patch b/media-tv/mythtv/files/mythtv-0.19_pre8554-chanutil-schar.patch new file mode 100644 index 000000000000..bfdb011ec768 --- /dev/null +++ b/media-tv/mythtv/files/mythtv-0.19_pre8554-chanutil-schar.patch @@ -0,0 +1,21 @@ +Index: libs/libmythtv/channelutil.cpp +=================================================================== +--- libs/libmythtv/channelutil.cpp (revision 8554) ++++ libs/libmythtv/channelutil.cpp (working copy) +@@ -11,11 +11,11 @@ + // DVB specific + int transport_id, int network_id, + bool set_odfm_info, +- int symbol_rate, char bandwidth, +- char polarity, char inversion, +- char trans_mode, ++ int symbol_rate, signed char bandwidth, ++ signed char polarity, signed char inversion, ++ signed char trans_mode, + QString inner_FEC, QString constellation, +- char hierarchy, QString hp_code_rate, ++ signed char hierarchy, QString hp_code_rate, + QString lp_code_rate, QString guard_interval) + { + MSqlQuery query(MSqlQuery::InitCon()); + diff --git a/media-tv/mythtv/files/mythtv-0.19_pre8554-freetype.patch b/media-tv/mythtv/files/mythtv-0.19_pre8554-freetype.patch new file mode 100644 index 000000000000..98f1a922293a --- /dev/null +++ b/media-tv/mythtv/files/mythtv-0.19_pre8554-freetype.patch @@ -0,0 +1,33 @@ +Index: configure +=================================================================== +--- configure (revision 8554) ++++ configure (working copy) +@@ -2383,6 +2383,8 @@ + fi + if test "$freetype2" = "yes" ; then + echo "HAVE_FREETYPE2=yes" >> $MYTH_CONFIG_MAK ++ echo "FREETYPE_CFLAGS=`freetype-config --cflags`" >> $MYTH_CONFIG_MAK ++ echo "FREETYPE_LIBS=`freetype-config --libs`" >> $MYTH_CONFIG_MAK + fi + if test "$sunmlib" = "yes" ; then + echo "HAVE_MLIB=yes" >> $MYTH_CONFIG_MAK +Index: libs/libmythtv/libmythtv.pro +=================================================================== +--- libs/libmythtv/libmythtv.pro (revision 8554) ++++ libs/libmythtv/libmythtv.pro (working copy) +@@ -33,10 +33,11 @@ + TARGETDEPS += ../libmythmpeg2/libmythmpeg2-$${LIBVERSION}.$${QMAKE_EXTENSION_LIB} + + DEFINES += _LARGEFILE_SOURCE +-QMAKE_CXXFLAGS_RELEASE += `freetype-config --cflags` +-QMAKE_CXXFLAGS_DEBUG += `freetype-config --cflags` +-QMAKE_LFLAGS_SHLIB += `freetype-config --libs` + ++QMAKE_CXXFLAGS_RELEASE += $${FREETYPE_CFLAGS} ++QMAKE_CXXFLAGS_DEBUG += $${FREETYPE_CFLAGS} ++QMAKE_LFLAGS_SHLIB += $${FREETYPE_LIBS} ++ + macx { + # Mac OS X Frameworks + FWKS = ApplicationServices Carbon QuickTime + diff --git a/media-tv/mythtv/mythtv-0.19_pre8554.ebuild b/media-tv/mythtv/mythtv-0.19_pre8554.ebuild index 38d09dc70be7..f410713cc3be 100644 --- a/media-tv/mythtv/mythtv-0.19_pre8554.ebuild +++ b/media-tv/mythtv/mythtv-0.19_pre8554.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.19_pre8554.ebuild,v 1.1 2006/01/11 04:01:47 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.19_pre8554.ebuild,v 1.2 2006/01/11 05:15:47 cardoe Exp $ inherit flag-o-matic eutils debug qt3 @@ -80,6 +80,8 @@ src_unpack() { cd ${S} epatch "${FILESDIR}"/${P}-xrandr.patch + epatch "${FILESDIR}"/${P}-chanutil-schar.patch + epatch "${FILESDIR}"/${P}-freetype.patch if [ $(get_libdir) != "lib" ] ; then sed -i -e "s:\$\${PREFIX}/lib/:\$\${PREFIX}/$(get_libdir)/:g" \ |