summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2014-09-20 15:48:26 +0200
committerChristian Pointner <equinox@spreadspace.org>2014-09-20 15:48:26 +0200
commit761ae57310985bc9d351eafe66e0fd8e1be51edf (patch)
tree562559afd1523c8ec4cef9738a63fb5c5776f4ff /src
parentrefactoring (diff)
added exception for non-GPL Gstreamer components
Diffstat (limited to 'src')
-rw-r--r--src/Makefile6
-rwxr-xr-xsrc/configure6
-rw-r--r--src/daemon.h6
-rw-r--r--src/datatypes.h6
-rw-r--r--src/log.c6
-rw-r--r--src/log.h6
-rw-r--r--src/log_targets.h6
-rw-r--r--src/options.c6
-rw-r--r--src/options.h6
-rw-r--r--src/slist.c6
-rw-r--r--src/slist.h6
-rw-r--r--src/string_list.c6
-rw-r--r--src/string_list.h6
-rw-r--r--src/sydra.c6
14 files changed, 84 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 1ee2157..f1e1bb3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,6 +26,12 @@
## You should have received a copy of the GNU General Public License
## along with sydra. If not, see <http://www.gnu.org/licenses/>.
##
+## In addition, as a special exception, the copyright holders hereby
+## grant permission for non-GPL-compatible GStreamer plugins to be used
+## and distributed together with GStreamer and sydra.
+## This permission goes above and beyond the permissions granted by the
+## GPL license sydra is covered by.
+##
ifneq ($(MAKECMDGOALS),distclean)
include include.mk
diff --git a/src/configure b/src/configure
index 84137e9..140b536 100755
--- a/src/configure
+++ b/src/configure
@@ -27,6 +27,12 @@
# You should have received a copy of the GNU General Public License
# along with sydra. If not, see <http://www.gnu.org/licenses/>.
#
+# In addition, as a special exception, the copyright holders hereby
+# grant permission for non-GPL-compatible GStreamer plugins to be used
+# and distributed together with GStreamer and sydra.
+# This permission goes above and beyond the permissions granted by the
+# GPL license sydra is covered by.
+#
set -e
diff --git a/src/daemon.h b/src/daemon.h
index b7c2880..297b040 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#ifndef SYDRA_daemon_h_INCLUDED
diff --git a/src/datatypes.h b/src/datatypes.h
index 365ed99..0927cfa 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#ifndef SYDRA_datatypes_h_INCLUDED
diff --git a/src/log.c b/src/log.c
index 7b66553..67fb4e9 100644
--- a/src/log.c
+++ b/src/log.c
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#include "datatypes.h"
diff --git a/src/log.h b/src/log.h
index 3a9c3e2..3a6eb7a 100644
--- a/src/log.h
+++ b/src/log.h
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#ifndef SYDRA_log_h_INCLUDED
diff --git a/src/log_targets.h b/src/log_targets.h
index de17f39..f012411 100644
--- a/src/log_targets.h
+++ b/src/log_targets.h
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#ifndef SYDRA_log_targets_h_INCLUDED
diff --git a/src/options.c b/src/options.c
index 260438b..fc11ae3 100644
--- a/src/options.c
+++ b/src/options.c
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#include "datatypes.h"
diff --git a/src/options.h b/src/options.h
index 31197b5..4b11723 100644
--- a/src/options.h
+++ b/src/options.h
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#ifndef SYDRA_options_h_INCLUDED
diff --git a/src/slist.c b/src/slist.c
index 884339f..59d470c 100644
--- a/src/slist.c
+++ b/src/slist.c
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#include <unistd.h>
diff --git a/src/slist.h b/src/slist.h
index bc7f6ad..636ee43 100644
--- a/src/slist.h
+++ b/src/slist.h
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#ifndef SYDRA_slist_h_INCLUDED
diff --git a/src/string_list.c b/src/string_list.c
index 1309745..18325df 100644
--- a/src/string_list.c
+++ b/src/string_list.c
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#include <string.h>
diff --git a/src/string_list.h b/src/string_list.h
index aaa90fb..a1c3e5d 100644
--- a/src/string_list.h
+++ b/src/string_list.h
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#ifndef SYDRA_string_list_h_INCLUDED
diff --git a/src/sydra.c b/src/sydra.c
index ae31ea9..9152f9e 100644
--- a/src/sydra.c
+++ b/src/sydra.c
@@ -25,6 +25,12 @@
*
* You should have received a copy of the GNU General Public License
* along with sydra. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders hereby
+ * grant permission for non-GPL-compatible GStreamer plugins to be used
+ * and distributed together with GStreamer and sydra.
+ * This permission goes above and beyond the permissions granted by the
+ * GPL license sydra is covered by.
*/
#define _GNU_SOURCE