added emulator repo, updated config

Change-Id: I345100f84b75dac344183038c91cdb4270b7ee41
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>

diff --git a/build.conf b/build.conf
index c50c98f87e72750aaee4acba31409b8924a8d1a3..ca7da7e25474c4d83e5dfcce8a1e8684f04e8d59 100644 (file)
--- a/build.conf
+++ b/build.conf
@@ -65,13 +65,27 @@ Macros:
 :Macros
 %endif
 
-%if "%_repository" == "emulator" 
+########################################### emulator config ################################
+# take from IVI:Release
+
+# Added for emulator-yagl conflict (does not solve emulators needs)
+Prefer: mesa-libGLESv2
+Prefer: libwayland-egl
+Prefer: libgbm
+Prefer: mesa-libGL
+Prefer: mesa-libEGL
+
+# This solves emulators needs
+%if "%_repository" == "emulator32-wayland" 
+Support: emulator-macros
 Prefer: emulator-yagl
-Prefer: -mesa
-%else
-Prefer: mesa
-Prefer: -emulator-yagl
-%end
+%define _with_wayland 1
+Macros:
+%_with_wayland 1
+:Macros
+%endif
+
+#############################################################################################
 
 Prefer: libpci-devel
 

diff --git a/meta.xml b/meta.xml
index d1f4ed5d27a5b183d9b364d99a790f4b6fa71455..4d7b365973595d05b1f4569bd8b3649d3c882e3d 100644 (file)
--- a/meta.xml
+++ b/meta.xml
@@ -28,6 +28,10 @@
   <repository name="ia32-wayland">
     <arch>i586</arch>
   </repository>
+  <repository name="emulator32-wayland">
+    <path project="Tizen:Common" repository="ia32-wayland"/>
+    <arch>i586</arch>
+  </repository>
   <repository name="arm64-wayland">
     <path project="devel:arm_toolchain:Mobile:Main" repository="aarch"/>
     <path project="devel:arm_toolchain:Mobile:Base" repository="aarch"/>