diff options
| author |   Jimi Huotari <chiitoo@gentoo.org> | 2017-09-06 00:59:29 +0300 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2017-10-11 23:04:15 +0200 |
| commit | 468c871a96b0653d58051bd9937412abfd180171 (patch) | |
| tree | 151fbd21abdfb986dfb1ae68580e81acb7d6361f | |
| parent | media-video/obs-studio: fix build against ImageMagick 7. (diff) | |
| download | gentoo-468c871a96b0653d58051bd9937412abfd180171.tar.gz gentoo-468c871a96b0653d58051bd9937412abfd180171.tar.bz2 gentoo-468c871a96b0653d58051bd9937412abfd180171.zip | |
media-video/obs-studio: ddjust dependencies.
Add 'COMMON_DEPEND' to ease moving things around, and keep
'RDEPEND.suspect' happy. Also protect against incompatible
combinations of CMake (<3.9) and ImageMagick (>=7).
Special thanks to NP-Hardass.
d
Closes: https://github.com/gentoo/gentoo/pull/5642
Package-Manager: Portage-2.3.8, Repoman-2.3.3
| -rw-r--r-- | media-video/obs-studio/obs-studio-18.0.2.ebuild | 15 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-19.0.2.ebuild | 15 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-20.0.1.ebuild | 15 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-9999.ebuild | 15 |
4 files changed, 52 insertions, 8 deletions
diff --git a/media-video/obs-studio/obs-studio-18.0.2.ebuild b/media-video/obs-studio/obs-studio-18.0.2.ebuild index 40f9313612c5..d742e19dd528 100644 --- a/media-video/obs-studio/obs-studio-18.0.2.ebuild +++ b/media-video/obs-studio/obs-studio-18.0.2.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l" -DEPEND=" +COMMON_DEPEND=" >=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -49,7 +49,18 @@ DEPEND=" ) v4l? ( media-libs/libv4l ) " -RDEPEND="${DEPEND}" +DEPEND="${COMMON_DEPEND} + imagemagick? ( + || ( + <media-gfx/imagemagick-7 + ( + >=media-gfx/imagemagick-7 + >=dev-util/cmake-3.9 + ) + ) + ) +" +RDEPEND="${COMMON_DEPEND}" PATCHES="${FILESDIR}/${PN}-ImageMagick-header-path.patch" diff --git a/media-video/obs-studio/obs-studio-19.0.2.ebuild b/media-video/obs-studio/obs-studio-19.0.2.ebuild index 40f9313612c5..d742e19dd528 100644 --- a/media-video/obs-studio/obs-studio-19.0.2.ebuild +++ b/media-video/obs-studio/obs-studio-19.0.2.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l" -DEPEND=" +COMMON_DEPEND=" >=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -49,7 +49,18 @@ DEPEND=" ) v4l? ( media-libs/libv4l ) " -RDEPEND="${DEPEND}" +DEPEND="${COMMON_DEPEND} + imagemagick? ( + || ( + <media-gfx/imagemagick-7 + ( + >=media-gfx/imagemagick-7 + >=dev-util/cmake-3.9 + ) + ) + ) +" +RDEPEND="${COMMON_DEPEND}" PATCHES="${FILESDIR}/${PN}-ImageMagick-header-path.patch" diff --git a/media-video/obs-studio/obs-studio-20.0.1.ebuild b/media-video/obs-studio/obs-studio-20.0.1.ebuild index 40f9313612c5..d742e19dd528 100644 --- a/media-video/obs-studio/obs-studio-20.0.1.ebuild +++ b/media-video/obs-studio/obs-studio-20.0.1.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l" -DEPEND=" +COMMON_DEPEND=" >=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -49,7 +49,18 @@ DEPEND=" ) v4l? ( media-libs/libv4l ) " -RDEPEND="${DEPEND}" +DEPEND="${COMMON_DEPEND} + imagemagick? ( + || ( + <media-gfx/imagemagick-7 + ( + >=media-gfx/imagemagick-7 + >=dev-util/cmake-3.9 + ) + ) + ) +" +RDEPEND="${COMMON_DEPEND}" PATCHES="${FILESDIR}/${PN}-ImageMagick-header-path.patch" diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 5753b7708bdc..06c66b0e0b22 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l" -DEPEND=" +COMMON_DEPEND=" >=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -49,7 +49,18 @@ DEPEND=" ) v4l? ( media-libs/libv4l ) " -RDEPEND="${DEPEND}" +DEPEND="${COMMON_DEPEND} + imagemagick? ( + || ( + <media-gfx/imagemagick-7 + ( + >=media-gfx/imagemagick-7 + >=dev-util/cmake-3.9 + ) + ) + ) +" +RDEPEND="${COMMON_DEPEND}" CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) |