summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2017-06-07 00:19:44 -0300
committerDaniel Bermond2017-06-07 00:19:44 -0300
commita19acd9cefa6a2fc89eeafcd1a8cf93a892d758e (patch)
tree69b40511b97e8e5571fa62f1a18315684f1a3555
parent8f58abda1808efc08c17bc0505e6635143246d0f (diff)
downloadaur-a19acd9cefa6a2fc89eeafcd1a8cf93a892d758e.tar.gz
license: changed to just nonfree and unredistributable
'--enable-decklink' is incompatible with the GPL and requires 'enable-nonfree'. Although GPL3 is present in the resuling complex license mix, it does not seem to make sense leaving GPL3 in the license list. The output of configure script clearly says that the resulting license is nonfree and unredistributable, and this is what should be clearly stated to the user. The ffmpeg documentation says that in such cases, like we are using here with --enable-nonfree, the resulting binaries are under a complex and restrictive license mix. But it does not provide clear licensing terms for such situation. So I just created a LICENSE file and added generic notes to it which seems to better describe this nature than the previously used UNREDISTRIBUTABLE.txt file. Also, the presence of a LICENSE file is something more standard and is described in the Wiki. References: ----------- https://github.com/FFmpeg/FFmpeg/blob/a47273c803edfbc43793349b74429ae29b05c003/configure#L101-L102 https://github.com/FFmpeg/FFmpeg/blob/a47273c803edfbc43793349b74429ae29b05c003/configure#L6554-L6555 https://github.com/FFmpeg/FFmpeg/blob/a47273c803edfbc43793349b74429ae29b05c003/LICENSE.md#incompatible-libraries https://ffmpeg.org/pipermail/libav-user/2012-November/003179.html
-rw-r--r--.SRCINFO6
-rw-r--r--LICENSE9
-rw-r--r--PKGBUILD12
-rwxr-xr-xUNREDISTRIBUTABLE.txt1
4 files changed, 18 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 91551c22e58..8e1a2c5562d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat May 20 14:04:42 UTC 2017
+# Wed Jun 7 03:19:13 UTC 2017
pkgbase = ffmpeg-decklink
pkgdesc = Complete solution to record, convert and stream audio and video (decklink enabled)
pkgver = 3.3.1
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = http://ffmpeg.org/
arch = i686
@@ -71,7 +71,7 @@ pkgbase = ffmpeg-decklink
conflicts = ffmpeg
conflicts = ffmpeg-git
source = https://ffmpeg.org/releases/ffmpeg-3.3.1.tar.xz
- source = UNREDISTRIBUTABLE.txt
+ source = LICENSE
sha256sums = b702a7fc656ac23e276b8c823a2f646e4e6f6309bb2788435a708e69bea98f2f
sha256sums = bc2b76d4f5be42c5b0a6a07f1b754d29392c84f8234f3b6ab9e7858fdc4043ff
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000000..b0bb658ca78
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,9 @@
+This software is nonfree and unredistributable.
+
+The end-user must compile this software for himself in order to be allowed to use it.
+
+This software cannot be redistributed.
+
+This software cannot be used commercially.
+
+Due to the libraries used to compile this software, the resulting binaries and libraries are under a complex and restrictive license mix.
diff --git a/PKGBUILD b/PKGBUILD
index 0c6d467c6a3..05182400142 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=ffmpeg-decklink
pkgver=3.3.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (decklink enabled)'
arch=('i686' 'x86_64')
@@ -31,7 +31,7 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libswscale.so' 'ffmpeg')
conflicts=('ffmpeg' 'ffmpeg-git')
source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"
- 'UNREDISTRIBUTABLE.txt')
+ 'LICENSE')
sha256sums=('b702a7fc656ac23e276b8c823a2f646e4e6f6309bb2788435a708e69bea98f2f'
'bc2b76d4f5be42c5b0a6a07f1b754d29392c84f8234f3b6ab9e7858fdc4043ff')
@@ -92,8 +92,8 @@ build() {
package() {
cd "ffmpeg-${pkgver}"
-
- make DESTDIR="$pkgdir" install install-man
- install -Dm 755 tools/qt-faststart "${pkgdir}/usr/bin/"
- install -D -m644 "${srcdir}/UNREDISTRIBUTABLE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/UNREDISTRIBUTABLE.txt"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m755 tools/qt-faststart "${pkgdir}/usr/bin/qt-faststart"
+ install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/UNREDISTRIBUTABLE.txt b/UNREDISTRIBUTABLE.txt
deleted file mode 100755
index ff73ce67d2f..00000000000
--- a/UNREDISTRIBUTABLE.txt
+++ /dev/null
@@ -1 +0,0 @@
-This package uses nonfree code and thus cannot be redistributed in binary form.