diff options
| author |   Craig Andrews <candrews@integralblue.com> | 2017-01-18 17:50:59 -0500 |
|---|---|---|
| committer |   Jory A. Pratt <anarchy@gentoo.org> | 2017-01-18 17:47:27 -0600 |
| commit | 26b0aa68025a309ea1da9a114caacb90feb2bbb5 (patch) | |
| tree | 849f2b44d1f5a37524c3bae420d44b5daa3852e8 /media-tv/kodi/kodi-9999.ebuild | |
| parent | media-sound/mixxx: Fixed compilation with >=media-libs/chromaprint-1.4 (diff) | |
| download | gentoo-26b0aa68025a309ea1da9a114caacb90feb2bbb5.tar.gz gentoo-26b0aa68025a309ea1da9a114caacb90feb2bbb5.tar.bz2 gentoo-26b0aa68025a309ea1da9a114caacb90feb2bbb5.zip | |
media-tv/kodi: upower and gold fixes
* -16.1-r2, -17.0_rc3-r2, -9999: adjust the upower dependency
* -16.1-r2, -17.0_rc3-r2, -9999: always use the system linker instead of always trying (inappropriately based on the way Gentoo works) to use gold
Gentoo-bug: 583230, 606124
Closes: https://github.com/gentoo/gentoo/pull/3535
Diffstat (limited to 'media-tv/kodi/kodi-9999.ebuild')
| -rw-r--r-- | media-tv/kodi/kodi-9999.ebuild | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index de348a07c9b4..47143985fc7e 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -101,7 +101,9 @@ RDEPEND="${COMMON_DEPEND} udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) - !systemd? ( sys-power/upower-pm-utils ) + !systemd? ( + || ( sys-power/upower-pm-utils sys-power/upower ) + ) ) " DEPEND="${COMMON_DEPEND} @@ -187,7 +189,7 @@ src_prepare() { # Prevent autoreconf rerun sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ - "${S}"/project/cmake/modules/FindCpluff.cmake \ + "${S}"/cmake/modules/FindCpluff.cmake \ "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh } @@ -197,6 +199,7 @@ src_configure() { local mycmakeargs=( -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -DNABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 -DENABLE_ALSA=$(usex alsa) -DENABLE_AIRTUNES=OFF -DENABLE_AVAHI=$(usex zeroconf) |