From 7ed143d744d0a35aaa9bb662dba777ce5b05cae9 Mon Sep 17 00:00:00 2001 From: Herbie Hopkins Date: Thu, 16 Mar 2006 18:09:13 +0000 Subject: [PATCH] Add patch to fix multilib-strict issues. Package-Manager: portage-2.1_pre6-r2 --- media-tv/mythtv/ChangeLog | 6 +- media-tv/mythtv/Manifest | 21 +- .../mythtv/files/mythtv-0.19-libdir.patch | 224 ++++++++++++++++++ media-tv/mythtv/mythtv-0.19_p9163-r1.ebuild | 11 +- 4 files changed, 249 insertions(+), 13 deletions(-) create mode 100644 media-tv/mythtv/files/mythtv-0.19-libdir.patch diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog index dbdbb5029dd5..41c0525ca7a0 100644 --- a/media-tv/mythtv/ChangeLog +++ b/media-tv/mythtv/ChangeLog @@ -1,6 +1,10 @@ # 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.90 2006/03/10 21:45:34 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.91 2006/03/16 18:09:13 herbs Exp $ + + 16 Mar 2006; Herbie Hopkins + +files/mythtv-0.19-libdir.patch, mythtv-0.19_p9163-r1.ebuild: + Add patch to solve multilib-strict issues, bug 126144 (also in upstream svn) 10 Mar 2006; Doug Goldstein mythtv-0.19_p9163-r1.ebuild: diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index a31eb6072210..156681f77e9d 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 520d9a211d9a76dd901d6be01eb0195d ChangeLog 16798 -RMD160 973d3ee7e89952f42499207d28d60cc49cf74c03 ChangeLog 16798 -SHA256 1fd39a8165bf2b733136f2d523d02cb68a8cf80372658bf390588411209a8415 ChangeLog 16798 +MD5 b3ce4e7bd533aa02f8b6981c6c8f182b ChangeLog 16990 +RMD160 94f84d29001a181261e4a117386c2d3b8f239833 ChangeLog 16990 +SHA256 8b30e779221205eb1a4f4a4db7864311c3bf78dad535f847f887f6a081e95208 ChangeLog 16990 MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931 RMD160 626d1a051ad5d9d724e1450e0bd0da21c57fe2d2 files/0.18-mythbackend.conf 931 SHA256 ecb82a5de903a63df0c5821ace68a845cf49faa90d754fead240542980e95b2f files/0.18-mythbackend.conf 931 @@ -40,6 +40,9 @@ SHA256 ef3d468144e216135ffd1973a7f78544b62a6201f8b4fc885fd30d16c84fb872 files/my MD5 fde2b2886b037b199cc815dbcb12617e files/mythtv-0.18.1-x86_64-configure.patch 631 RMD160 295c6fadffb8fad17703556d09959b58972a6b22 files/mythtv-0.18.1-x86_64-configure.patch 631 SHA256 d3d4283d7d7d53cfea564cd83165f8f75c8d0d536d987c5fe02480da3d013d51 files/mythtv-0.18.1-x86_64-configure.patch 631 +MD5 5cedab3afb8a9c686500c0a7360e79e2 files/mythtv-0.19-libdir.patch 8739 +RMD160 999895762c2e711cea256be032a9d337f99d81a8 files/mythtv-0.19-libdir.patch 8739 +SHA256 bba339054d2cd656e39b0fa467fd73d63567667b54fd05447262d34b2fc35706 files/mythtv-0.19-libdir.patch 8739 MD5 0d20a49cff965a0f3ab35cb0600b65b4 files/runmythfe 104 RMD160 61d825641aae0b77ea0995f5b9b59855e33b9027 files/runmythfe 104 SHA256 7d3c316ec3af8f8cac23a1645c537f90feb09f7cb6d510dc2185d799080dd675 files/runmythfe 104 @@ -49,16 +52,16 @@ SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6 metadata MD5 f2c7e6f87a9c718acdd942b22140e2a9 mythtv-0.18.1-r1.ebuild 5109 RMD160 5598253366d0d608598df6503b33fcf636e6bc12 mythtv-0.18.1-r1.ebuild 5109 SHA256 8bbf3b1c856ceeb623dc3ff016044a20afba27e7092e30666832f73c8512f766 mythtv-0.18.1-r1.ebuild 5109 -MD5 9778e87d8860cc386664fe3ef6bda802 mythtv-0.19_p9163-r1.ebuild 7895 -RMD160 ea6ac3aaf4118d2956e67896537fa01c5c4965db mythtv-0.19_p9163-r1.ebuild 7895 -SHA256 961e2b6afaa440f80b3ac0cc1266c926b0dffce820cfd4b742e0f740d19ebcda mythtv-0.19_p9163-r1.ebuild 7895 +MD5 d335cfc1646a846cef629727f01fbac5 mythtv-0.19_p9163-r1.ebuild 8022 +RMD160 af35d43fb880345a1a97c97728295de2dcda0aa0 mythtv-0.19_p9163-r1.ebuild 8022 +SHA256 e5dcbe2b061c66c4f5172e323514bd75ce0bf78c0ff1eefd38299ee9f4b659a7 mythtv-0.19_p9163-r1.ebuild 8022 MD5 dfbeafc04a274b47e50a45d204824bf0 mythtv-0.19_p9163.ebuild 7073 RMD160 81251f037be12f72a72f1d5a0569476e8c823bea mythtv-0.19_p9163.ebuild 7073 SHA256 31cdc898b30c8e4695a30c876762f5dd15b750b5916a1a7bd8a29e16fb6e6ee9 mythtv-0.19_p9163.ebuild 7073 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFEEl/RBtvusYtCZMsRAt5OAJ9dgCTSDhPNR8AjZ2V7cnQ453DtmQCeOWYJ -3+1MuQM8JP3CfaEOl2nydj4= -=F5X+ +iD8DBQFEGanb2G5bA0cA/ScRAqcCAJ9AZ+KDPkEALuyLIWqxYRzE9YRJwQCgiU66 +Q7NVn5VWsFJ7v/WyOuCatMI= +=CETe -----END PGP SIGNATURE----- diff --git a/media-tv/mythtv/files/mythtv-0.19-libdir.patch b/media-tv/mythtv/files/mythtv-0.19-libdir.patch new file mode 100644 index 000000000000..8b1f436c3611 --- /dev/null +++ b/media-tv/mythtv/files/mythtv-0.19-libdir.patch @@ -0,0 +1,224 @@ +diff -urN mythtv-0.19.orig/configure mythtv-0.19/configure +--- mythtv-0.19.orig/configure 2006-02-09 15:14:44.000000000 +0000 ++++ mythtv-0.19/configure 2006-03-14 13:12:41.000000000 +0000 +@@ -21,6 +21,7 @@ + compile_type="release" + prefix="/usr/local" + libdir="" ++libdir_name="lib" + mandir="" + bindir="" + cross_prefix="" +@@ -96,6 +97,7 @@ + echo " --compile-type=CTYPE one of release, profile, debug [$compile_type]" + echo " NOTE: profile is for sampling profilers" + echo " --prefix=PREFIX install in PREFIX [$prefix]" ++echo " --libdir-name=LIBNAME search/install libraries in PREFIX/LIBNAME [$libdir_name]" + #echo " --libdir=DIR install libs in DIR [PREFIX/lib]" + #echo " --mandir=DIR man documentation in DIR [PREFIX/man]" + echo " --disable-ccache disable compiler cache (ccache)" +@@ -606,6 +608,8 @@ + ;; + --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`; force_prefix=yes + ;; ++ --libdir-name=*) libdir_name=`echo $opt | cut -d '=' -f 2`; ++ ;; + --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`; force_prefix=yes + ;; + --mandir=*) mandir=`echo $opt | cut -d '=' -f 2` +@@ -889,7 +893,7 @@ + done + fi + +- LIBPATHS="`echo $LIBPATHS /lib /usr/lib /usr/local/lib /usr/X11R6/lib | sed s/'\/ '/' '/g` " ++ LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " + + HAS_IT="no" + for LIBPATH in $LIBPATHS ; do +@@ -904,7 +908,7 @@ + { + HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include" + INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` +- HPATHS="$HPATHS `echo $INCL | sed s/lib/include/g` " ++ HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` " + + HAS_IT="no" + for HPATH in $HPATHS ; do +@@ -1918,7 +1922,7 @@ + fi + + if test x"$libdir" = x""; then +-libdir="${prefix}/lib" ++libdir="${prefix}/${libdir_name}" + fi + + if test x"$mandir" = x""; then +@@ -2235,7 +2239,7 @@ + echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH + + echo "PREFIX=$prefix" >> $MYTH_CONFIG_MAK +-#echo "libdir=$libdir" >> $MYTH_CONFIG_MAK ++echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK + #echo "bindir=$bindir" >> $MYTH_CONFIG_MAK + #echo "mandir=$mandir" >> $MYTH_CONFIG_MAK + #echo "MAKE=$make" >> $MYTH_CONFIG_MAK +diff -urN mythtv-0.19.orig/filters/filter-common.pro mythtv-0.19/filters/filter-common.pro +--- mythtv-0.19.orig/filters/filter-common.pro 2005-07-13 22:35:02.000000000 +0100 ++++ mythtv-0.19/filters/filter-common.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -4,7 +4,7 @@ + TEMPLATE = lib + CONFIG -= moc qt + CONFIG += plugin thread +-target.path = $${PREFIX}/lib/mythtv/filters ++target.path = $${LIBDIR}/mythtv/filters + INSTALLS = target + + QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes +diff -urN mythtv-0.19.orig/libs/libavcodec/libavcodec.pro mythtv-0.19/libs/libavcodec/libavcodec.pro +--- mythtv-0.19.orig/libs/libavcodec/libavcodec.pro 2006-01-16 07:14:43.000000000 +0000 ++++ mythtv-0.19/libs/libavcodec/libavcodec.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -4,7 +4,7 @@ + TEMPLATE = lib + TARGET = mythavcodec-$$LIBVERSION + CONFIG += thread dll warn_off +-target.path = $${PREFIX}/lib ++target.path = $${LIBDIR} + INSTALLS = target + + INCLUDEPATH = ../ ../../ ../libavutil +diff -urN mythtv-0.19.orig/libs/libavformat/libavformat.pro mythtv-0.19/libs/libavformat/libavformat.pro +--- mythtv-0.19.orig/libs/libavformat/libavformat.pro 2005-12-09 03:35:28.000000000 +0000 ++++ mythtv-0.19/libs/libavformat/libavformat.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -4,7 +4,7 @@ + TEMPLATE = lib + TARGET = mythavformat-$$LIBVERSION + CONFIG += thread dll warn_off +-target.path = $${PREFIX}/lib ++target.path = $${LIBDIR} + INSTALLS = target + + INCLUDEPATH += ../ ../../ ../libavcodec ../libavutil ../libmythtv +diff -urN mythtv-0.19.orig/libs/libavutil/libavutil.pro mythtv-0.19/libs/libavutil/libavutil.pro +--- mythtv-0.19.orig/libs/libavutil/libavutil.pro 2005-12-09 03:35:28.000000000 +0000 ++++ mythtv-0.19/libs/libavutil/libavutil.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -5,7 +5,7 @@ + TARGET = mythavutil-$$LIBVERSION + CONFIG += thread dll warn_off + CONFIG -= qt +-target.path = $${PREFIX}/lib ++target.path = $${LIBDIR} + INSTALLS = target + + INCLUDEPATH = ../ ../../ +diff -urN mythtv-0.19.orig/libs/libmyth/libmyth.pro mythtv-0.19/libs/libmyth/libmyth.pro +--- mythtv-0.19.orig/libs/libmyth/libmyth.pro 2005-12-09 03:35:28.000000000 +0000 ++++ mythtv-0.19/libs/libmyth/libmyth.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -4,7 +4,7 @@ + TEMPLATE = lib + TARGET = myth-$$LIBVERSION + CONFIG += thread dll +-target.path = $${PREFIX}/lib ++target.path = $${LIBDIR} + INSTALLS = target + + QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2) +diff -urN mythtv-0.19.orig/libs/libmyth/mythcontext.cpp mythtv-0.19/libs/libmyth/mythcontext.cpp +--- mythtv-0.19.orig/libs/libmyth/mythcontext.cpp 2006-01-25 10:22:57.000000000 +0000 ++++ mythtv-0.19/libs/libmyth/mythcontext.cpp 2006-03-14 13:12:41.000000000 +0000 +@@ -186,6 +186,7 @@ + Settings *m_qtThemeSettings; + + QString m_installprefix; ++ QString m_installlibdir; + + bool m_gui; + bool m_backend; +@@ -258,7 +259,7 @@ + MythContextPrivate::MythContextPrivate(MythContext *lparent) + : parent(lparent), + m_settings(new Settings()), m_qtThemeSettings(new Settings()), +- m_installprefix(PREFIX), ++ m_installprefix(PREFIX), m_installlibdir(LIBDIR), + m_gui(false), m_backend(false), m_themeloaded(false), + m_menuthemepathname(QString::null), m_themepathname(QString::null), + m_backgroundimage(NULL), +@@ -1120,7 +1121,7 @@ + + QString MythContext::GetLibraryDir(void) + { +- return d->m_installprefix + "/lib/mythtv/"; ++ return d->m_installlibdir + "/mythtv/"; + } + + QString MythContext::GetThemesParentDir(void) +diff -urN mythtv-0.19.orig/libs/libmythmpeg2/libmythmpeg2.pro mythtv-0.19/libs/libmythmpeg2/libmythmpeg2.pro +--- mythtv-0.19.orig/libs/libmythmpeg2/libmythmpeg2.pro 2005-12-09 03:35:28.000000000 +0000 ++++ mythtv-0.19/libs/libmythmpeg2/libmythmpeg2.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -4,8 +4,6 @@ + TEMPLATE = lib + TARGET = mythmpeg2-$$LIBVERSION + CONFIG += thread staticlib warn_off +-target.path = $${PREFIX}/lib +-INSTALLS = target + + QMAKE_CFLAGS_RELEASE += -DPIC -fPIC -fno-common + QMAKE_CFLAGS_DEBUG += -DPIC -fPIC -fno-common +diff -urN mythtv-0.19.orig/libs/libmythsamplerate/libmythsamplerate.pro mythtv-0.19/libs/libmythsamplerate/libmythsamplerate.pro +--- mythtv-0.19.orig/libs/libmythsamplerate/libmythsamplerate.pro 2005-12-09 03:35:28.000000000 +0000 ++++ mythtv-0.19/libs/libmythsamplerate/libmythsamplerate.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -4,8 +4,6 @@ + TEMPLATE = lib + TARGET = mythsamplerate-$$LIBVERSION + CONFIG += thread staticlib warn_off +-target.path = $${PREFIX}/lib +-INSTALLS = target + + INCLUDEPATH += ../../ + +diff -urN mythtv-0.19.orig/libs/libmythsoundtouch/libmythsoundtouch.pro mythtv-0.19/libs/libmythsoundtouch/libmythsoundtouch.pro +--- mythtv-0.19.orig/libs/libmythsoundtouch/libmythsoundtouch.pro 2005-12-09 03:35:28.000000000 +0000 ++++ mythtv-0.19/libs/libmythsoundtouch/libmythsoundtouch.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -4,8 +4,6 @@ + TEMPLATE = lib + TARGET = mythsoundtouch-$$LIBVERSION + CONFIG += thread staticlib warn_off +-target.path = $${PREFIX}/lib +-INSTALLS = target + + INCLUDEPATH += ../../libs/libavcodec ../.. + +diff -urN mythtv-0.19.orig/libs/libmythtv/libmythtv.pro mythtv-0.19/libs/libmythtv/libmythtv.pro +--- mythtv-0.19.orig/libs/libmythtv/libmythtv.pro 2006-01-13 08:11:45.000000000 +0000 ++++ mythtv-0.19/libs/libmythtv/libmythtv.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -4,7 +4,7 @@ + TEMPLATE = lib + TARGET = mythtv-$$LIBVERSION + CONFIG += thread dll +-target.path = $${PREFIX}/lib ++target.path = $${LIBDIR} + INSTALLS = target + + INCLUDEPATH += ../.. .. +diff -urN mythtv-0.19.orig/libs/libmythui/libmythui.pro mythtv-0.19/libs/libmythui/libmythui.pro +--- mythtv-0.19.orig/libs/libmythui/libmythui.pro 2006-01-10 06:09:06.000000000 +0000 ++++ mythtv-0.19/libs/libmythui/libmythui.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -4,7 +4,7 @@ + TEMPLATE = lib + TARGET = mythui-$$LIBVERSION + CONFIG += debug thread dll +-target.path = $${PREFIX}/lib ++target.path = $${LIBDIR} + INSTALLS = target + + INCLUDEPATH += ../libmyth +diff -urN mythtv-0.19.orig/settings.pro mythtv-0.19/settings.pro +--- mythtv-0.19.orig/settings.pro 2006-01-11 14:40:52.000000000 +0000 ++++ mythtv-0.19/settings.pro 2006-03-14 13:12:41.000000000 +0000 +@@ -56,6 +56,7 @@ + DEFINES += _GNU_SOURCE + DEFINES += _FILE_OFFSET_BITS=64 + DEFINES += PREFIX=\"$${PREFIX}\" ++DEFINES += LIBDIR=\"$${LIBDIR}\" + + # construct linking path + diff --git a/media-tv/mythtv/mythtv-0.19_p9163-r1.ebuild b/media-tv/mythtv/mythtv-0.19_p9163-r1.ebuild index 6f810ff5e7db..a869d39af62b 100644 --- a/media-tv/mythtv/mythtv-0.19_p9163-r1.ebuild +++ b/media-tv/mythtv/mythtv-0.19_p9163-r1.ebuild @@ -1,8 +1,8 @@ # 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_p9163-r1.ebuild,v 1.2 2006/03/10 21:45:34 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.19_p9163-r1.ebuild,v 1.3 2006/03/16 18:09:13 herbs Exp $ -inherit flag-o-matic eutils debug qt3 +inherit flag-o-matic multilib eutils debug qt3 PATCHREV=9163 MY_PV="${PV%_*}" @@ -123,10 +123,15 @@ src_unpack() { #Fixes of the bugs found in the 0.19 release epatch "${WORKDIR}"/${PN}-${MY_PV}-rev${PATCHREV}.patch + + # Support installing in libdir != lib + epatch "${FILESDIR}/mythtv-0.19-libdir.patch" } src_compile() { - local myconf="--prefix=/usr --mandir=/usr/share/man" + local myconf="--prefix=/usr + --mandir=/usr/share/man + --libdir-name=$(get_libdir)" use alsa || myconf="${myconf} --disable-audio-alsa" use arts || myconf="${myconf} --disable-audio-arts" use jack || myconf="${myconf} --disable-audio-jack" -- 2.26.2