aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes/antlr/antlr_2.7.7.bb4
-rw-r--r--recipes/dt/dt.inc4
-rw-r--r--recipes/efl1/embryo.inc7
-rw-r--r--recipes/efl1/epdf_svn.bb10
-rw-r--r--recipes/gtk+/composite-pixbuf_0.0.bb3
-rw-r--r--recipes/mesa/mesa-demos_8.0.1.bb4
-rw-r--r--recipes/nrlolsr/nrlolsr_7.8.1.bb4
-rw-r--r--recipes/xml-commons/jaxp1.3_1.3.04.bb4
-rw-r--r--recipes/xorg-lib/pixman_0.22.0.bb4
9 files changed, 27 insertions, 17 deletions
diff --git a/recipes/antlr/antlr_2.7.7.bb b/recipes/antlr/antlr_2.7.7.bb
index 3dbcea7569..ea921b5782 100644
--- a/recipes/antlr/antlr_2.7.7.bb
+++ b/recipes/antlr/antlr_2.7.7.bb
@@ -1,8 +1,10 @@
DESCRIPTION = "Framework for constructing recognizers, interpreters, compilers, and translators"
# see http://www.antlr2.org/license.html
-LICENSE = "Public Domain"
+LICENSE = "PD"
HOMEPAGE = "http://www.antlr2.org"
+PR = "r1"
+
SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz"
inherit java-library
diff --git a/recipes/dt/dt.inc b/recipes/dt/dt.inc
index 31f34026b4..fbf5df5ffb 100644
--- a/recipes/dt/dt.inc
+++ b/recipes/dt/dt.inc
@@ -3,8 +3,8 @@ operation of peripherals, file systems, device drivers, or any data stream suppo
operating system."
SECTION = "console/tests"
HOMEPAGE = "http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/dt.html"
-LICENSE = "Public domain"
-INC_PR = "r0"
+LICENSE = "PD"
+INC_PR = "r1"
SRC_URI = "http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/ftp/dt/dt-source.tar.gz"
S = "${WORKDIR}/dt.d"
diff --git a/recipes/efl1/embryo.inc b/recipes/efl1/embryo.inc
index ab0290511e..8bb8b6fbf0 100644
--- a/recipes/efl1/embryo.inc
+++ b/recipes/efl1/embryo.inc
@@ -1,11 +1,12 @@
DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
-LICENSE = "MIT BSD & CompuPhase"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6aa45e26c1ed178da910fd76b306a875"
inherit efl
+LICENSE = "MIT BSD CompuPhase"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6aa45e26c1ed178da910fd76b306a875"
+
BBCLASSEXTEND = "native"
-INC_PR = "r0"
+INC_PR = "r1"
# Some upgrade path tweaking
AUTO_LIBNAME_PKGS = ""
diff --git a/recipes/efl1/epdf_svn.bb b/recipes/efl1/epdf_svn.bb
index 1f3762991e..490b3cea37 100644
--- a/recipes/efl1/epdf_svn.bb
+++ b/recipes/efl1/epdf_svn.bb
@@ -1,8 +1,4 @@
DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
-LICENSE = "GPLv2 & LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
- file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6 \
-"
DEPENDS = "poppler evas ecore"
PV = "0.1.0+svnr${SRCPV}"
@@ -10,6 +6,12 @@ PR = "r4"
SRCREV = "${EFL_SRCREV}"
inherit efl
+
+LICENSE = "GPLv2 LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+ file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6 \
+"
+
SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep"
S = "${WORKDIR}/${SRCNAME}"
diff --git a/recipes/gtk+/composite-pixbuf_0.0.bb b/recipes/gtk+/composite-pixbuf_0.0.bb
index 29e329a4af..4c0479fcb4 100644
--- a/recipes/gtk+/composite-pixbuf_0.0.bb
+++ b/recipes/gtk+/composite-pixbuf_0.0.bb
@@ -1,6 +1,7 @@
DESCRIPTION = "Pixbuf performance test"
-LICENSE = "Public domain"
+LICENSE = "PD"
DEPENDS = "gtk+"
+PR = "r1"
SRC_URI = "http://amelang.net/composite_pixbuf.c"
diff --git a/recipes/mesa/mesa-demos_8.0.1.bb b/recipes/mesa/mesa-demos_8.0.1.bb
index 031434257c..36327615b6 100644
--- a/recipes/mesa/mesa-demos_8.0.1.bb
+++ b/recipes/mesa/mesa-demos_8.0.1.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "mesa demo applications"
HOMEPAGE = "http://mesa3d.org"
SECTION = "x11"
-LICENSE = "MIT & PD"
+LICENSE = "MIT PD"
DEPENDS = "virtual/libx11 virtual/libgl libglew"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${PN}-${PV}.tar.bz2"
diff --git a/recipes/nrlolsr/nrlolsr_7.8.1.bb b/recipes/nrlolsr/nrlolsr_7.8.1.bb
index 3a748b90d1..bb3c1a8e67 100644
--- a/recipes/nrlolsr/nrlolsr_7.8.1.bb
+++ b/recipes/nrlolsr/nrlolsr_7.8.1.bb
@@ -1,6 +1,8 @@
DESCRIPTION = "NRL OLSR - added to OE to support the Maniac Challenge (http://www.maniacchallenge.org/)"
SECTION = "applications"
-LICENSE = "Public Domain"
+LICENSE = "PD"
+
+PR = "r1"
S="${WORKDIR}/nrlolsr/"
diff --git a/recipes/xml-commons/jaxp1.3_1.3.04.bb b/recipes/xml-commons/jaxp1.3_1.3.04.bb
index 1875fa7d8a..8daa80fd52 100644
--- a/recipes/xml-commons/jaxp1.3_1.3.04.bb
+++ b/recipes/xml-commons/jaxp1.3_1.3.04.bb
@@ -1,7 +1,9 @@
DESCRIPTION = "Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)"
-LICENSES = "AL2.0 W3C Public Domain"
+LICENSES = "AL2.0 W3C PD"
AUTHOR = "Apache Software Foundation"
+PR = "r1"
+
SRC_URI = "http://archive.apache.org/dist/xml/commons/source/xml-commons-external-${PV}-src.tar.gz;subdir=${BPN}-${PV}"
inherit java-library
diff --git a/recipes/xorg-lib/pixman_0.22.0.bb b/recipes/xorg-lib/pixman_0.22.0.bb
index d256e6812e..ee1868178a 100644
--- a/recipes/xorg-lib/pixman_0.22.0.bb
+++ b/recipes/xorg-lib/pixman_0.22.0.bb
@@ -1,12 +1,12 @@
require pixman.inc
-LICENSE = "MIT & MIT-style & Public Domain"
+LICENSE = "MIT MIT-style PD"
LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3\
file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \
file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \
file://pixman/pixman-x64-mmx-emulation.h;beginline=4;endline=9;md5=4e32716f2efaa6c4659222667c339bb8"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI = "http://xorg.freedesktop.org/archive/individual/lib/${BPN}-${PV}.tar.gz \
file://0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \