diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-22 22:33:26 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-22 22:38:30 +0200 |
commit | 53bfb2398c16d2065ffa2bc6cd34c83e15347014 (patch) | |
tree | 3793fb7c6cb4799ec2c029b433636cb60fe7625b /packages/cairo | |
parent | 576cfbfba8880ea4421369d35236c696188b144d (diff) | |
parent | 245f7d129f3dba351b3c8ef284df69a86261904c (diff) |
Merge branch 'shared/file-pr-revert' into org.openembedded.dev
Conflicts:
packages/busybox/busybox_1.11.3.bb
packages/dsplink/codec-engine_2.10.bb
packages/gdb/gdb_6.3.bb
packages/gdb/gdb_6.4.bb
packages/gdb/gdb_6.6.bb
packages/gdb/gdb_6.8.bb
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.3.6.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/kexecboot/linux-kexecboot_2.6.26.bb
packages/libsdl/libsdl-x11_1.2.11.bb
packages/linux/linux-rp_2.6.26.bb
packages/mozilla/fennec_hg.bb
packages/python/python_2.5.2.bb
packages/tasks/task-xfce-base.bb
packages/xorg-driver/xf86-video-omapfb_git.bb
packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
Diffstat (limited to 'packages/cairo')
-rw-r--r-- | packages/cairo/cairo-directfb_1.4.8.bb | 2 | ||||
-rw-r--r-- | packages/cairo/cairo-directfb_1.6.4.bb | 2 | ||||
-rw-r--r-- | packages/cairo/cairo_1.2.4.bb | 2 | ||||
-rw-r--r-- | packages/cairo/cairo_1.4.10.bb | 2 | ||||
-rw-r--r-- | packages/cairo/cairo_1.4.14.bb | 2 | ||||
-rw-r--r-- | packages/cairo/cairo_1.4.8.bb | 2 | ||||
-rw-r--r-- | packages/cairo/cairo_1.6.4.bb | 2 | ||||
-rw-r--r-- | packages/cairo/cairomm_1.2.4.bb | 2 | ||||
-rw-r--r-- | packages/cairo/libsvg_0.1.4.bb | 2 | ||||
-rw-r--r-- | packages/cairo/libsvg_cvs.bb | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/packages/cairo/cairo-directfb_1.4.8.bb b/packages/cairo/cairo-directfb_1.4.8.bb index 3301c4981e..ada747600e 100644 --- a/packages/cairo/cairo-directfb_1.4.8.bb +++ b/packages/cairo/cairo-directfb_1.4.8.bb @@ -13,6 +13,6 @@ EXTRA_OECONF += " --enable-directfb \ LDFLAGS_append += " -ldirectfb" CFLAGS_append += " -I${STAGING_INCDIR}/directfb" -FILE_PR = "r2" +PR = "r2" S = "${WORKDIR}/cairo-${PV}" diff --git a/packages/cairo/cairo-directfb_1.6.4.bb b/packages/cairo/cairo-directfb_1.6.4.bb index 5f421a575c..a8b3f0fc78 100644 --- a/packages/cairo/cairo-directfb_1.6.4.bb +++ b/packages/cairo/cairo-directfb_1.6.4.bb @@ -12,6 +12,6 @@ EXTRA_OECONF += " --enable-directfb \ LDFLAGS_append += " -ldirectfb" CFLAGS_append += " -I${STAGING_INCDIR}/directfb" -FILE_PR = "r0" +PR = "r0" S = "${WORKDIR}/cairo-${PV}" diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb index 634de39e3d..e274387195 100644 --- a/packages/cairo/cairo_1.2.4.bb +++ b/packages/cairo/cairo_1.2.4.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" -FILE_PR = "r2" +PR = "r2" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://0001-Add-autoconf-macro-AX_C_FLOAT_WORDS_BIGENDIAN.diff;patch=1 \ diff --git a/packages/cairo/cairo_1.4.10.bb b/packages/cairo/cairo_1.4.10.bb index 2f2f6658e0..e89c0e6a9c 100644 --- a/packages/cairo/cairo_1.4.10.bb +++ b/packages/cairo/cairo_1.4.10.bb @@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://stats.patch;patch=1;p=1" -FILE_PR = "r0" +PR = "r0" diff --git a/packages/cairo/cairo_1.4.14.bb b/packages/cairo/cairo_1.4.14.bb index 16b99fd0f3..b0f9fe8790 100644 --- a/packages/cairo/cairo_1.4.14.bb +++ b/packages/cairo/cairo_1.4.14.bb @@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://0001-Fix-for-a-memory-leak-in-pixman.patch;patch=1;p=1" -FILE_PR = "r0" +PR = "r0" diff --git a/packages/cairo/cairo_1.4.8.bb b/packages/cairo/cairo_1.4.8.bb index c07b2e3235..845e14fc29 100644 --- a/packages/cairo/cairo_1.4.8.bb +++ b/packages/cairo/cairo_1.4.8.bb @@ -2,5 +2,5 @@ require cairo.inc SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" -FILE_PR = "r0" +PR = "r0" diff --git a/packages/cairo/cairo_1.6.4.bb b/packages/cairo/cairo_1.6.4.bb index 83f8b22f9c..0c262b80ee 100644 --- a/packages/cairo/cairo_1.6.4.bb +++ b/packages/cairo/cairo_1.6.4.bb @@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://configure_fix.patch;patch=1 " -FILE_PR = "r4" +PR = "r4" diff --git a/packages/cairo/cairomm_1.2.4.bb b/packages/cairo/cairomm_1.2.4.bb index 672924787c..7796a44016 100644 --- a/packages/cairo/cairomm_1.2.4.bb +++ b/packages/cairo/cairomm_1.2.4.bb @@ -2,7 +2,7 @@ require cairo.inc DEPENDS = "cairo" DESCRIPTION = "C++ bindings for Cairo graphics library" -FILE_PR = "r0" +PR = "r0" SRC_URI = "http://cairographics.org/releases/cairomm-${PV}.tar.gz" diff --git a/packages/cairo/libsvg_0.1.4.bb b/packages/cairo/libsvg_0.1.4.bb index c75ba47ab6..2c5578aea6 100644 --- a/packages/cairo/libsvg_0.1.4.bb +++ b/packages/cairo/libsvg_0.1.4.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "expat jpeg zlib libpng" DESCRIPTION = "SVG parser library" -FILE_PR = "r1" +PR = "r1" SRC_URI = "http://cairographics.org/snapshots/libsvg-${PV}.tar.gz \ file://configure_fix.patch;patch=1 \ diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb index 0bfa1711f0..95b360c041 100644 --- a/packages/cairo/libsvg_cvs.bb +++ b/packages/cairo/libsvg_cvs.bb @@ -6,7 +6,7 @@ DESCRIPTION = "SVG parser library" LICENSE = "LGPL" SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg" S = "${WORKDIR}/libsvg" -FILE_PR = "r2" +PR = "r2" EXTRA_OECONF = "--with-expat" |