Cleanup Makefile edit, add back lost cut-n-paste in init script

Signed-off-by: Ted Hess <[email protected]>

diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index 7323a5d649f7b8e6ed4313f7228b712b0fa949c9..60b56553f80d68702677c867ef6ea8133b282148 100644 (file)
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@@ -29,7 +29,6 @@ define Package/mjpg-streamer
   CATEGORY:=Multimedia
   TITLE:=MJPG-streamer
   DEPENDS:=+libpthread +libjpeg +PACKAGE_libv4l:libv4l
-#$(if $(CONFIG_MJPG_STREAMER_V4L2),+libv4l)
   URL:=http://mjpg-streamer.wiki.sourceforge.net/
   MENU:=1
 endef

diff --git a/multimedia/mjpg-streamer/files/mjpg-streamer.init b/multimedia/mjpg-streamer/files/mjpg-streamer.init
index 550ea4d2f213aa5f983581d89e00585f9525ba3f..eebd4f84a7bf90d82ea678f817186e7aaba612a3 100644 (file)
--- a/multimedia/mjpg-streamer/files/mjpg-streamer.init
+++ b/multimedia/mjpg-streamer/files/mjpg-streamer.init
@@ -61,6 +61,10 @@ start_instance() {
 
                config_get www "$s" 'www'
                [ -n "$www" ] && output_arg="${output_arg} --www $www"
+
+               config_get username "$s" 'username'
+               config_get password "$s" 'password'
+               [ -n "$username" ] && [ -n "$password" ] && output_arg="${output_arg} --credentials $username:$password"
        fi
 
        if [ -z "$output_arg" ]; then