Merge branch 'master' of https://github.com/hyades/gst-switch into lo…

…cal_system
hyades · Sep 19, 2013 · 870d71e · 870d71e
2 parents 8a737cc + ebf5d22
commit 870d71e
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 56 deletions.
diff --git a/.travis-setup.sh b/.travis-setup.sh
@@ -3,8 +3,7 @@
 sudo apt-get update
 sudo pip install -r requirements.txt --use-mirrors
 sudo apt-get install ubuntu-desktop
-sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 
-sudo apt-get -y install python-gi
+sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 python-gi
 sudo apt-get -y install python-scipy ffmpeg
 sudo apt-get -y install autoconf automake autopoint libbz2-dev libdv4-dev libfaac-dev libfaad-dev libgtk-3-dev libmjpegtools-dev libtag1-dev libasound2-dev libtool libvpx-dev libxv-dev libx11-dev libogg-dev libvorbis-dev libopencv-dev libcv-dev libhighgui-dev libv4l-dev pkg-config zlib1g-dev gtk-doc-tools yasm bison flex
 export PKG_CONFIG_PATH=/usr/lib/pkgconfig/
@@ -107,10 +106,8 @@ sudo make install || {
        exit -1
     }
 cd ..
-git clone https://github.com/duzy/gst-plugins-bad.git
+git clone https://github.com/hyades/gst-plugins-bad.git
 cd gst-plugins-bad
-git checkout speakertrack_new
-git checkout
 ./autogen.sh --prefix=/usr || {
 printf "Failed to do autogen!!!\n"
 exit -1

diff --git a/FORKING.md b/FORKING.md
@@ -0,0 +1,19 @@
+##Forking Gst-Switch
+
+To fork this project, click the "Fork" button at [Gst-Switch Github Page](https://github.com/hyades/gst-switch "").
+![forking](https://github-images.s3.amazonaws.com/help/Bootcamp-Fork.png "forking")
+
+Refer to the [Github Documentation](https://help.github.com/articles/fork-a-repo "") for further details.
+
+##Running Tests
+
+* Install gst-switch using instructions at [README.md](https://github.com/hyades/gst-switch/blob/master/README.md "").
+* `cd python-api`
+* make test
+* For specific tests refer to [Python-API Readme](https://github.com/hyades/gst-switch/blob/master/python-api/README.md "").
+
+##Sending Pull Requests for Changes
+
+* Click the **Compare and Review** button
+* Ensure that the Travis message shows **Success: The Travis Build Passed**
+* Send the pull request
diff --git a/README.md b/README.md
@@ -2,14 +2,27 @@
 [![Build Status](https://travis-ci.org/hyades/gst-switch.png?branch=master)](https://travis-ci.org/hyades/gst-switch)
 [![Coverage Status](https://coveralls.io/repos/hyades/gst-switch/badge.png?branch=master)](https://coveralls.io/r/hyades/gst-switch?branch=master)
 
-# GstSwitch
+# gst-switch
 ## Purpose
-This project is intended to be a replacement of DV-switch base on GStreamer.
+This project is intended tog be a replacement of DV-switch base on GStreamer.
+##Installing gst-switch
+```bash
+git clone https://github.com/hyades/gst-switch.git
+cd gst-switch
+./.travis-setup.sh
+```
+or you can do
+```bash
+wget https://raw.github.com/hyades/gst-switch/master/scripts/install.sh
+chmod +x install.sh
+./install.sh
+```
+The dependencies are taken care by the installation method.
 ## Components
-GstSwitch contains two parts, *gst-switch-srv* and *gst-switch-ui*
+gst-switch contains two parts, *gst-switch-srv* and *gst-switch-ui*
 ## Quick Manual
-### The GstSwitch Server
-The GstSwitch server will open at least three ports for video/audio input, and
+### The gst-switch Server
+The gst-switch server will open at least three ports for video/audio input, and
 command controls.
 #### Video Input
 The video input port is *3000*. Supported input video format: I420
@@ -58,16 +71,3 @@ The command control port is *5000*.
  e.g. *record 2013-01-23 131139.dat*
  </td></tr>
 </table>
-##Installing GstSwitch
-```bash
-git clone https://github.com/hyades/gst-switch.git
-cd gst-switch
-./.travis-setup.sh
-```
-or you can do
-```bash
-wget https://raw.github.com/hyades/gst-switch/master/scripts/install.sh
-chmod +x install.sh
-./install.sh
-```
-The dependencies are taken care by the installation method.
diff --git a/python-api/WRITING_TESTS.md b/python-api/WRITING_TESTS.md
@@ -1,4 +1,3 @@
-
 ##Writing Tests Using Python-API
 ###Import the Modules
 Ensure that gst-switch/python-api/gstswitch is in PYTHONPATH:
@@ -7,7 +6,7 @@ import sys
 sys.path.insert(0, install_dir + 'gst-switch/python-api/gstswitch')
 # install_dir is the path where the installation started
 ```
-###Start the GstSwitch Server
+###Start the gst-switch Server
 ```python
 from gstswitch.server import Server
 
@@ -53,7 +52,7 @@ controller.establish_connection()
 * Switch the Channel. Channel is specified as `ord('A')`, `ord('a')` or `ord('b')`.  `result = controller.switch(channel=ord('A'), port=3004)`
 * Start a New Record: `result = controller.new_record()`
 
-###Terminating the GstSwitch Server
+###Terminating the gst-switch Server
 The `server.run()` should always be kept in a try/finally block, so that if any Exception is caught, all processes terminate safely.
 i.e.
 ```python

diff --git a/scripts/install.sh b/scripts/install.sh
@@ -5,23 +5,18 @@ sudo pip install mock
 sudo pip install pytest-cov
 sudo pip install pytest-pep8
 sudo pip install pylint
-echo 'yes' | sudo add-apt-repository ppa:gstreamer-developers/ppa
-sudo apt-get update
-sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 
-sudo apt-get -y install python-gi python3-gi gstreamer1.0-tools gir1.2-gstreamer-1.0 gir1.2-gst-plugins-base-1.0 gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-plugins-bad gstreamer1.0-libav
+sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 python-gi
 sudo apt-get -y install python-scipy ffmpeg
-sudo apt-get -y build-dep gstreamer1.0
 sudo apt-get -y install autoconf automake autopoint libbz2-dev libdv4-dev libfaac-dev libfaad-dev libgtk-3-dev libmjpegtools-dev libtag1-dev libasound2-dev libtool libvpx-dev libxv-dev libx11-dev libogg-dev libvorbis-dev libopencv-dev libcv-dev libhighgui-dev libv4l-dev pkg-config zlib1g-dev gtk-doc-tools yasm bison flex
-
 export PKG_CONFIG_PATH=/usr/lib/pkgconfig/
 export LD_LIBRARY_PATH=/usr/lib/
 git clone http://git.chromium.org/webm/libvpx.git
 cd libvpx
 git checkout v1.2.0
-./configure --enable-shared --enable-vp8
+./configure --enable-shared --enable-vp8 --prefix=/usr
 [[ -f Makefile ]] || {
-  printf "Configure libvpx failed, no Makefile generated!!!\n"
-  exit -1
+	printf "Configure libvpx failed, no Makefile generated!!!\n"
+	exit -1
     }
 make
 sudo make install || {
@@ -32,13 +27,13 @@ cd ..
 git clone git://anongit.freedesktop.org/gstreamer/gstreamer
 cd gstreamer
 git checkout 6c11da1
-./autogen.sh || {
+./autogen.sh --prefix=/usr || {
 printf "Failed to do autogen!!!\n"
 exit -1
 }
 [[ -f Makefile ]] || {
-  printf "Configure gstreamer failed, no Makefile generated!!!\n"
-  exit -1
+	printf "Configure gstreamer failed, no Makefile generated!!!\n"
+	exit -1
     }
 make clean
 make || {
@@ -53,13 +48,13 @@ cd ..
 git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-base
 cd gst-plugins-base
 git checkout a8df760
-./autogen.sh || {
+./autogen.sh --prefix=/usr || {
 printf "Failed to do autogen!!!\n"
 exit -1
 }
 [[ -f Makefile ]] || {
-  printf "Configure gst-plugins-base failed, no Makefile generated!!!\n"
-  exit -1
+	printf "Configure gst-plugins-base failed, no Makefile generated!!!\n"
+	exit -1
     }
 make clean
 make || {
@@ -74,13 +69,13 @@ cd ..
 git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-good
 cd gst-plugins-good
 git checkout d14d4c4
-./autogen.sh --enable-experimental || {
+./autogen.sh --enable-experimental --prefix=/usr || {
 printf "Failed to do autogen!!!\n"
 exit -1
 }
 [[ -f Makefile ]] || {
-  printf "Configure gst-plugins-good failed, no Makefile generated!!!\n"
-  exit -1
+	printf "Configure gst-plugins-good failed, no Makefile generated!!!\n"
+	exit -1
     }
 make clean
 make || {
@@ -95,13 +90,13 @@ cd ..
 git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly
 cd gst-plugins-ugly
 git checkout 68985ba
-./autogen.sh || {
+./autogen.sh --prefix=/usr || {
 printf "Failed to do autogen!!!\n"
 exit -1
 }
 [[ -f Makefile ]] || {
-  printf "Configure gst-plugins-ugly failed, no Makefile generated!!!\n"
-  exit -1
+	printf "Configure gst-plugins-ugly failed, no Makefile generated!!!\n"
+	exit -1
     }
 make clean
 make || {
@@ -113,17 +108,15 @@ sudo make install || {
        exit -1
     }
 cd ..
-git clone https://github.com/duzy/gst-plugins-bad.git
+git clone https://github.com/hyades/gst-plugins-bad.git
 cd gst-plugins-bad
-git checkout speakertrack_new
-git checkout 
-./autogen.sh || {
+./autogen.sh --prefix=/usr || {
 printf "Failed to do autogen!!!\n"
 exit -1
 }
 [[ -f Makefile ]] || {
-  printf "Configure gst-plugins-bad failed, no Makefile generated!!!\n"
-  exit -1
+	printf "Configure gst-plugins-bad failed, no Makefile generated!!!\n"
+	exit -1
     }
 make clean
 make || {
@@ -137,7 +130,7 @@ sudo make install || {
 cd ..
 git clone https://github.com/hyades/gst-switch.git
 cd gst-switch
-./autogen.sh || {
+./autogen.sh --prefix=/usr || {
 printf "Failed to do autogen!!!\n"
 exit -1
 }
@@ -150,5 +143,3 @@ sudo make install || {
        printf "make install of gstswitch failed!!!\n"
        exit -1
     }
-# sudo cp /usr/lib/girepository-1.0/*.* /usr/lib/girepository-1.0/
-