summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-01-05 18:41:21 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 11:54:15 +0000
commit7b81ef8d95d82c55e3650981d3010000cd493832 (patch)
tree8639d231bb5b1d0624959080762df8b1356d96b6 /meta
parentb68ea543603c35f4e3519d358e0d1e1e24bd5851 (diff)
downloadpoky-7b81ef8d95d82c55e3650981d3010000cd493832.tar.gz
Add LICENSE_FLAGS to packages mentioned in COMMERCIAL_LICENSE
Per-recipe LICENSE_FLAGS replace the global COMMERCIAL_LICENSE list; add LICENSE_FLAGS varables to each the recipes mentioned in that list: - lame - gst-fluendo-mp3 - gst-openmax - gst-plugins-ugly - libmad - libomxil - mpeg2dec - qmmp (From OE-Core rev: 43410523a07d9eb52a7d57ae3dc1cc320cbbc6f9) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.16.bb1
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb1
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb1
-rw-r--r--meta/recipes-multimedia/lame/lame_3.99.3.bb2
-rw-r--r--meta/recipes-multimedia/libmad/libmad_0.15.1b.bb1
-rw-r--r--meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb1
-rw-r--r--meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb1
-rw-r--r--meta/recipes-qt/qt-apps/qmmp_0.5.2.bb1
8 files changed, 9 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.16.bb b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.16.bb
index 5975513e07..3f8c67ea7c 100644
--- a/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.16.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.16.bb
@@ -2,6 +2,7 @@ require gst-fluendo.inc
2 2
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://COPYING;md5=98326cbb1723a5a97e9b1db62e9faa05" 4LIC_FILES_CHKSUM = "file://COPYING;md5=98326cbb1723a5a97e9b1db62e9faa05"
5LICENSE_FLAGS = "commercial"
5 6
6acpaths = "-I ${S}/common/m4 -I ${S}/m4" 7acpaths = "-I ${S}/common/m4 -I ${S}/m4"
7 8
diff --git a/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb b/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb
index b4fe52d5ba..76c8135493 100644
--- a/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb
@@ -1,6 +1,7 @@
1DEPENDS = "gstreamer" 1DEPENDS = "gstreamer"
2RDEPENDS_${PN} = "libomxil" 2RDEPENDS_${PN} = "libomxil"
3LICENSE = "LGPLv2.1" 3LICENSE = "LGPLv2.1"
4LICENSE_FLAGS = "commercial"
4LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
5 file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc" 6 file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc"
6 7
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb
index 2d7fa9183f..72a8151780 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb
@@ -1,6 +1,7 @@
1require gst-plugins.inc 1require gst-plugins.inc
2 2
3LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" 3LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+"
4LICENSE_FLAGS = "commercial"
4LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
5 file://gst/synaesthesia/synaescope.h;beginline=1;endline=20;md5=99f301df7b80490c6ff8305fcc712838 \ 6 file://gst/synaesthesia/synaescope.h;beginline=1;endline=20;md5=99f301df7b80490c6ff8305fcc712838 \
6 file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 \ 7 file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 \
diff --git a/meta/recipes-multimedia/lame/lame_3.99.3.bb b/meta/recipes-multimedia/lame/lame_3.99.3.bb
index 3c42cc7403..4dc4e0aa92 100644
--- a/meta/recipes-multimedia/lame/lame_3.99.3.bb
+++ b/meta/recipes-multimedia/lame/lame_3.99.3.bb
@@ -3,6 +3,8 @@ HOMEPAGE = "http://sourceforge.net/projects/lame/files/lame/"
3BUGTRACKER = "http://sourceforge.net/tracker/?group_id=290&atid=100290" 3BUGTRACKER = "http://sourceforge.net/tracker/?group_id=290&atid=100290"
4SECTION = "console/utils" 4SECTION = "console/utils"
5LICENSE = "LGPLv2+" 5LICENSE = "LGPLv2+"
6LICENSE_FLAGS = "commercial"
7
6LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \
7 file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b 9 file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b
8PR = "r0" 10PR = "r0"
diff --git a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
index aec929c449..e10b401112 100644
--- a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
+++ b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "MPEG Audio Decoder Library"
2HOMEPAGE = "http://sourceforge.net/projects/mad/" 2HOMEPAGE = "http://sourceforge.net/projects/mad/"
3BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" 3BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LICENSE_FLAGS = "commercial"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://COPYRIGHT;md5=8e55eb14894e782b84488d5a239bc23d \ 7 file://COPYRIGHT;md5=8e55eb14894e782b84488d5a239bc23d \
7 file://version.h;beginline=1;endline=8;md5=aa07311dd39288d4349f28e1de516454" 8 file://version.h;beginline=1;endline=8;md5=aa07311dd39288d4349f28e1de516454"
diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
index bb31c56154..ded0e1c060 100644
--- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
@@ -1,6 +1,7 @@
1DESCRIPTION = "Bellagio OpenMAX Integration Layer" 1DESCRIPTION = "Bellagio OpenMAX Integration Layer"
2HOMEPAGE = "http://omxil.sourceforge.net/" 2HOMEPAGE = "http://omxil.sourceforge.net/"
3LICENSE = "LGPLv2.1+" 3LICENSE = "LGPLv2.1+"
4LICENSE_FLAGS = "commercial"
4LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
5 file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90" 6 file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90"
6DEPENDS = "libvorbis libogg alsa-lib libmad" 7DEPENDS = "libvorbis libogg alsa-lib libmad"
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
index 351962fa97..7ff8a03451 100644
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
+++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Library and test program for decoding mpeg-2 and mpeg-1 video str
2HOMEPAGE = "http://libmpeg2.sourceforge.net/" 2HOMEPAGE = "http://libmpeg2.sourceforge.net/"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LICENSE_FLAGS = "commercial"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154" 7 file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154"
7 8
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
index b3ecc457bc..469351ce50 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
@@ -1,6 +1,7 @@
1DESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library" 1DESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
2HOMEPAGE = "http://qmmp.ylsoftware.com" 2HOMEPAGE = "http://qmmp.ylsoftware.com"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LICENSE_FLAGS = "commercial"
4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5SECTION = "multimedia" 6SECTION = "multimedia"
6 7