From 52550314f9f7c5a7c5ff517e734b414178fc4a50 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 1 Sep 2005 20:49:09 +0000 Subject: ecore, evas, imlib2, esmart: Update vitrual and native PROVIDES - Moved all virtual PROVIDES into inc files - Made inc file PROVIDES always += and removed any extra PROVIDES in main files - Made native builds override PROVIDES (native builds should not provide virtual) --- packages/efl/ecore-native_0.9.9.013.bb | 1 + packages/efl/ecore.inc | 4 ++-- packages/efl/esmart.inc | 1 + packages/efl/evas-native_0.9.9.013.bb | 1 + packages/efl/evas-x11_0.9.9.013.bb | 1 - packages/efl/evas.inc | 2 +- packages/efl/imlib2-fb_1.2.1.004.bb | 1 - packages/efl/imlib2-native_1.2.1.004.bb | 1 + packages/efl/imlib2-x11_1.2.1.004.bb | 1 - packages/efl/imlib2.inc | 1 + 10 files changed, 8 insertions(+), 6 deletions(-) (limited to 'packages/efl') diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb index abfb41d63b..299470841c 100644 --- a/packages/efl/ecore-native_0.9.9.013.bb +++ b/packages/efl/ecore-native_0.9.9.013.bb @@ -3,3 +3,4 @@ inherit native # disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it # DEPENDS = "curl-native eet-native evas-native" DEPENDS = "eet-native evas-native" +PROVIDES = "ecore-native" \ No newline at end of file diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index ccc88b10c3..441d780a47 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -4,8 +4,8 @@ timeouts and idle handlers fast, optimized, and convenient." LEAD_SONAME = "libecore.so" LICENSE = "MIT" # can also have openssl, dbus -DEPENDS = "virtual/evas curl eet" -PROVIDES = "virtual/ecore" +DEPENDS += "virtual/evas curl eet" +PROVIDES += "virtual/ecore" inherit efl diff --git a/packages/efl/esmart.inc b/packages/efl/esmart.inc index 452222e93b..f4a5191462 100644 --- a/packages/efl/esmart.inc +++ b/packages/efl/esmart.inc @@ -1,6 +1,7 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" LICENSE = "MIT" DEPENDS = "virtual/evas virtual/ecore virtual/imlib2 epsilon edje libtool" +PROVIDES += "virtual/esmart" inherit efl diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb index fd94b48ef2..60bf7f6ae5 100644 --- a/packages/efl/evas-native_0.9.9.013.bb +++ b/packages/efl/evas-native_0.9.9.013.bb @@ -1,3 +1,4 @@ include evas-fb_${PV}.bb inherit native DEPENDS = "freetype-native libpng-native jpeg-native eet-native" +PROVIDES = "evas-native" \ No newline at end of file diff --git a/packages/efl/evas-x11_0.9.9.013.bb b/packages/efl/evas-x11_0.9.9.013.bb index 901a23d2a8..8e51a2a873 100644 --- a/packages/efl/evas-x11_0.9.9.013.bb +++ b/packages/efl/evas-x11_0.9.9.013.bb @@ -1,5 +1,4 @@ include evas.inc -PROVIDES += "virtual/evas" DEPENDS += "x11 xext" PR = "r3" diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 5876c1fd4e..521ecb9912 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -5,7 +5,7 @@ your CPU or graphics hardware are too slow." LICENSE = "MIT" # can also depend on valgrind (?) DEPENDS = "freetype libpng jpeg eet edb" -PROVIDES = "virtual/evas" +PROVIDES += "virtual/evas" inherit efl diff --git a/packages/efl/imlib2-fb_1.2.1.004.bb b/packages/efl/imlib2-fb_1.2.1.004.bb index fdf9b17afc..09fecdaf8b 100644 --- a/packages/efl/imlib2-fb_1.2.1.004.bb +++ b/packages/efl/imlib2-fb_1.2.1.004.bb @@ -1,5 +1,4 @@ include imlib2.inc -PROVIDES += "virtual/imlib2" EXTRA_OECONF = "--without-x \ --disable-mmx" diff --git a/packages/efl/imlib2-native_1.2.1.004.bb b/packages/efl/imlib2-native_1.2.1.004.bb index e3a46c4aba..6f8ebe477a 100644 --- a/packages/efl/imlib2-native_1.2.1.004.bb +++ b/packages/efl/imlib2-native_1.2.1.004.bb @@ -1,5 +1,6 @@ include imlib2.inc inherit native +PROVIDES = "imlib2-native" DEPENDS = "freetype-native libpng-native jpeg-native" EXTRA_OECONF = "--disable-mmx \ diff --git a/packages/efl/imlib2-x11_1.2.1.004.bb b/packages/efl/imlib2-x11_1.2.1.004.bb index 383473e589..165321355c 100644 --- a/packages/efl/imlib2-x11_1.2.1.004.bb +++ b/packages/efl/imlib2-x11_1.2.1.004.bb @@ -1,5 +1,4 @@ include imlib2.inc -PROVIDES += "virtual/imlib2" DEPENDS += "x11 xext" EXTRA_OECONF = "--disable-mmx \ diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc index a6982e21c7..4691bf2ce0 100644 --- a/packages/efl/imlib2.inc +++ b/packages/efl/imlib2.inc @@ -2,6 +2,7 @@ DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipu LICENSE = "BSD" # can also depend on tiff34, ungif or gif, z, bz2, id3tag DEPENDS = "freetype libpng jpeg" +PROVIDES += "virtual/imlib2" inherit efl -- cgit v1.2.3