Merge branch 'hotfix/0.0.2'

Author: Sungjin Han

README.md

@@ -15,16 +15,17 @@ $ sudo raspi-config
 
 ```
 $ sudo apt-get update
-$ sudo apt-get install libv4l-dev libjpeg8-dev subversion imagemagick v4l-utils
+$ sudo apt-get install build-essential libjpeg8-dev imagemagick libv4l-dev git cmake uvcdynctrl
 ```
 
 ### Build mjpg-streamer
 
 ```
-$ svn co https://svn.code.sf.net/p/mjpg-streamer/code/mjpg-streamer/ mjpg-streamer
-$ cd mjpg-streamer
 $ sudo ln -s /usr/include/linux/videodev2.h /usr/include/linux/videodev.h
-$ make USE_LIBV4L2=true clean all
+$ git clone https://github.com/jacksonliam/mjpg-streamer
+$ cd mjpg-streamer/mjpg-streamer-experimental
+$ cmake -DCMAKE_INSTALL_PREFIX:PATH=.. .
+$ make install
 ```
 
 ### Setup video4linux for Raspberry Pi Camera module
@@ -87,25 +88,6 @@ $ sudo systemctl start mjpg-streamer.service
 $ sudo systemctl stop mjpg-streamer.service
 ```
 
-#### init.d
-
-```
-# copy & edit init/mjpg-streamer file,
-$ sudo cp rpi-mjpg-streamer/init/mjpg-streamer.sample /etc/init.d/mjpg-streamer
-$ sudo chmod +x /etc/init.d/mjpg-streamer
-$ sudo vi /etc/init.d/mjpg-streamer
-
-# then register as a boot-up service
-$ sudo update-rc.d mjpg-streamer defaults
-
-# or remove it
-$ sudo update-rc.d -f mjpg-streamer remove
-
-# and start/stop it
-$ sudo service mjpg-streamer start
-$ sudo service mjpg-streamer stop
-```
-
 ## C. Connect
 
 Connect through the web browser:

init/mjpg-streamer.sample

@@ -2,23 +2,27 @@
 #
 # created by : [email protected]
 #
-# last update: 2014.01.24.
+# last update: 2018.08.14.
 #
 
 ################
 # customize these:
 
 # mjpg_streamer's install location
-MJPG_STREAMER_INSTALL="/home/pi/builds/mjpg-streamer"
+# XXX - edit this location to yours!!!
+MJPG_STREAMER_DIR="/home/pi/builds/mjpg-streamer"
 
 # mjpg_streamer excutable's location
-MJPG_STREAMER="$MJPG_STREAMER_INSTALL/mjpg_streamer"
+MJPG_STREAMER_BIN="$MJPG_STREAMER_DIR/bin/mjpg_streamer"
+
+# mjpg_streamer plugins' location
+MJPG_STREAMER_PLUGINS_DIR="$MJPG_STREAMER_DIR/lib/mjpg-streamer"
 
 # streaming port
 MJPG_STREAMER_PORT="8080"
 
 # htmls and related files' location
-MJPG_STREAMER_WWW="$MJPG_STREAMER_INSTALL/www"
+MJPG_STREAMER_WWW="$MJPG_STREAMER_DIR/share/mjpg-streamer/www"
 
 # video device
 DEVICE_IN="/dev/video0"
@@ -28,6 +32,7 @@ RESOLUTION="640x480"
 FPS=24
 
 # authentication
+# XXX - change these values before exposing your Pi to the outer world!!!
 USERNAME="pi"
 PASSWORD="raspberry"
 if [ ! -z $USERNAME ] && [ ! -z $PASSWORD ]; then
@@ -39,14 +44,14 @@ fi
 # LED blink
 LED="off"	# on/off/blink/auto (may not work on rpi camera modules)
 
-# plugin
-PLUGIN_IN="$MJPG_STREAMER_INSTALL/input_uvc.so -d $DEVICE_IN -r $RESOLUTION -f $FPS -l $LED"
-PLUGIN_OUT="$MJPG_STREAMER_INSTALL/output_http.so -p $MJPG_STREAMER_PORT -w $MJPG_STREAMER_WWW $AUTH"
+# plugins
+PLUGIN_IN="$MJPG_STREAMER_PLUGINS_DIR/input_uvc.so -d $DEVICE_IN -r $RESOLUTION -f $FPS -l $LED"
+PLUGIN_OUT="$MJPG_STREAMER_PLUGINS_DIR/output_http.so -p $MJPG_STREAMER_PORT -w $MJPG_STREAMER_WWW $AUTH"
 
 
 
 ################
 # run mjpg_streamer
-$MJPG_STREAMER -i "$PLUGIN_IN" -o "$PLUGIN_OUT"
+$MJPG_STREAMER_BIN -i "$PLUGIN_IN" -o "$PLUGIN_OUT"
 ################