summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShane Volpe <shanevolpe@gmail.com>2007-09-26 00:51:31 +0000
committerShane Volpe <shanevolpe@gmail.com>2007-09-26 00:51:31 +0000
commitdadf1a807d51513cf893f7364e994a1526b6dc6f (patch)
tree2ca24af55baa3cced8cd44f4270f435480d0f717
parent99f32ecb465e2bd8ef4121894f3f743685610eb1 (diff)
parentc1175ca8dd64905eba92cda879668612ab154fa2 (diff)
merge of '9ce99db5c6574a3d2161e2257da184c55971fddd'
and 'be38a6212d33035dc48ae2d5b8ad385a0e2409cc'
-rw-r--r--packages/cairo/cairo-directfb_1.4.8.bb3
-rw-r--r--packages/gtk+/gtk+-directfb_2.10.14.bb3
-rw-r--r--packages/pango/pango-directfb_1.18.1.bb10
3 files changed, 14 insertions, 2 deletions
diff --git a/packages/cairo/cairo-directfb_1.4.8.bb b/packages/cairo/cairo-directfb_1.4.8.bb
index 0a2090cf66..ada747600e 100644
--- a/packages/cairo/cairo-directfb_1.4.8.bb
+++ b/packages/cairo/cairo-directfb_1.4.8.bb
@@ -1,5 +1,6 @@
require cairo.inc
RCONFLICTS = "cairo"
+RPROVIDES = "cairo-directfb"
DEPENDS = "directfb libsm libpng fontconfig"
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
file://cairo_directfb_is_similar-typo.patch;patch=1 \
@@ -12,6 +13,6 @@ EXTRA_OECONF += " --enable-directfb \
LDFLAGS_append += " -ldirectfb"
CFLAGS_append += " -I${STAGING_INCDIR}/directfb"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/cairo-${PV}"
diff --git a/packages/gtk+/gtk+-directfb_2.10.14.bb b/packages/gtk+/gtk+-directfb_2.10.14.bb
index 9a855d078d..e77f24638d 100644
--- a/packages/gtk+/gtk+-directfb_2.10.14.bb
+++ b/packages/gtk+/gtk+-directfb_2.10.14.bb
@@ -1,6 +1,6 @@
require gtk-2.10.inc
-PR = "r1"
+PR = "r2"
# disable per default - untested and not all patches included.
DEFAULT_PREFERENCE = "-1"
@@ -8,6 +8,7 @@ S = "${WORKDIR}/gtk+-${PV}"
RCONFLICTS = "gtk+"
+RPROVIDES ="gtk+-directfb"
DEPENDS = "glib-2.0 pango-directfb atk jpeg libpng gtk-doc libgcrypt cairo-directfb cups"
LDFLAGS_append += " -ldirectfb"
CFLAGS_append += " -I${STAGING_INCDIR}/directfb"
diff --git a/packages/pango/pango-directfb_1.18.1.bb b/packages/pango/pango-directfb_1.18.1.bb
new file mode 100644
index 0000000000..7e5c798221
--- /dev/null
+++ b/packages/pango/pango-directfb_1.18.1.bb
@@ -0,0 +1,10 @@
+require pango.inc
+RCONFLICTS = "pango"
+RPROVIDES = "pango-directfb"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc cairo-directfb"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/pango-${PV}.tar.bz2 \
+ file://no-tests.patch;patch=1"
+
+S = "${WORKDIR}/pango-${PV}"
+RRECOMMENDS_${PN} = ""
+FILESPATH = "${FILE_DIRNAME}/pango-${PV}:${FILE_DIRNAME}/files"