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

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 40f9313612c514d2219d07e5a4780857f287d808..d742e19dd528c3ac858385b6e7f7712711ef342e 100644 (file)
--- 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 40f9313612c514d2219d07e5a4780857f287d808..d742e19dd528c3ac858385b6e7f7712711ef342e 100644 (file)
--- 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 40f9313612c514d2219d07e5a4780857f287d808..d742e19dd528c3ac858385b6e7f7712711ef342e 100644 (file)
--- 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 5753b7708bdc66d67939ebeb437eac33e05c9dbd..06c66b0e0b22fe26933313d84c53795a6aee2517 100644 (file)
--- 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 )