media-video/mjpg-streamer: fixups after testing on arm64 espressobin

Signed-off-by: Steve Arnold <nerdboy@gentoo.org>

2 files changed, 22 insertions, 8 deletions

diff --git a/media-video/mjpg-streamer/files/mjpg-streamer.initd b/media-video/mjpg-streamer/files/mjpg-streamer.initd
index 60665e5..c667c65 100644
--- a/media-video/mjpg-streamer/files/mjpg-streamer.initd
+++ b/media-video/mjpg-streamer/files/mjpg-streamer.initd
@@ -4,6 +4,7 @@
 
 MJPG_STREAMER_PIDFILE="${MJPG_STREAMER_PIDFILE:-/var/run/${SVCNAME}.pid}"
 MY_NAME=${SVCNAME//-/_}
+MY_PLUGINS="/usr/lib/mjpg-streamer"
 
 depend() {
 	use logger
@@ -34,8 +35,8 @@ start() {
 		--user "${MJPG_STREAMER_USER}" \
 		--group "${MJPG_STREAMER_GROUP}" -w 100 -b -m \
 		--pidfile "${MJPG_STREAMER_PIDFILE}" \
-		-- -i "/usr/$(get_libdir)/input_${INPUT_PLUGIN}.so ${INPUT_PLUGIN_OPTS}" \
-		-o "/usr/$(get_libdir)/output_${OUTPUT_PLUGIN}.so ${OUTPUT_PLUGIN_OPTS}"
+		-- -i "${MY_PLUGINS}/input_${INPUT_PLUGIN}.so ${INPUT_PLUGIN_OPTS}" \
+		-o "${MY_PLUGINS}/output_${OUTPUT_PLUGIN}.so ${OUTPUT_PLUGIN_OPTS}"
 	eend $? "Check syslog to see why startup failed."
 }
 
diff --git a/media-video/mjpg-streamer/mjpg-streamer-9999.ebuild b/media-video/mjpg-streamer/mjpg-streamer-9999.ebuild
index bddf995..8c194b7 100644
--- a/media-video/mjpg-streamer/mjpg-streamer-9999.ebuild
+++ b/media-video/mjpg-streamer/mjpg-streamer-9999.ebuild
@@ -25,11 +25,12 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-INPUT_PLUGINS="input_testpicture input_control input_file input_uvc"
-OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp"
+INPUT_PLUGINS="input_testpicture input_control input_file input_uvc input_raspicam input_opencv input_ptp2"
+OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp output_viewer"
 IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS}"
-IUSE="input_testpicture input_control +input_file input_uvc output_file
-	output_udp +output_http output_autofocus output_rtsp v4l"
+IUSE="input_testpicture input_control +input_file input_uvc -input_opencv
+	output_udp +output_http output_autofocus output_rtsp output_file
+	input_ptp2 -input_raspicam output_viewer v4l"
 
 REQUIRED_USE="|| ( ${INPUT_PLUGINS} )
 	|| ( ${OUTPUT_PLUGINS} )
@@ -39,10 +40,21 @@ RDEPEND="virtual/jpeg
 	v4l? ( input_uvc? ( media-libs/libv4l ) )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	input_raspicam? ( media-libs/raspberrypi-userland )
+	input_opencv? ( media-libs/opencv )
+	input_ptp2? ( media-libs/libgphoto2 )
+	output_viewer? ( media-libs/libsdl )
 	input_testpicture? ( media-gfx/imagemagick )"
 
 S="${WORKDIR}/${P}/mjpg-streamer-experimental"
 
+src_prepare() {
+	sed -i -e "s|lib/${PN}|$(get_libdir)/${PN}/plugins|g" \
+		"${S}"/CMakeLists.txt
+
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	append-cxxflags -std=gnu++11
 	cmake-utils_src_configure
@@ -53,8 +65,6 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	sed -i -e 's|usr/lib|usr/$(get_libdir)|g' /etc/init.d/${PN}
 }
 
 pkg_postinst() {
@@ -63,4 +73,7 @@ pkg_postinst() {
 	echo
 	elog "An example webinterface has been installed into"
 	elog "/usr/share/mjpg-streamer/www for your usage."
+	elog "Note: uses output_http plugin for builtin server."
+	ewarn "Note2: opencv input plugin may not work with newer"
+	ewarn "versions of media-libs/opencv, YMMV..."
 }