Update Tizen:IVI project conf with latest build macros

diff --git a/Tizen:IVI.build.conf b/Tizen:IVI.build.conf
index 216a8fa39bb7fadd21e10738028608c56c6166df..ac5143d4028fe3df531778f7208294a9251228bb 100644 (file)
--- a/Tizen:IVI.build.conf
+++ b/Tizen:IVI.build.conf
@@ -4,7 +4,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-
 FileProvides: /usr/sbin/groupadd pwdutils
 Prefer: util-linux
 Prefer: nfc-manager
@@ -15,8 +14,20 @@ Prefer: nfc-manager-neard
 Prefer: nfc-manager-neard-devel
 Prefer: libtapi-devel
 
-%define gcc_version 48
+#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" == "emulator"
+  Prefer: simulator-opengl-devel
+  Prefer: emulator-yagl
+%endif
 
+%define gcc_version 48
 %define _with_ivi 1
 %define _with_wayland 1
 %define _with_tizen 1
@@ -28,12 +39,14 @@ Prefer: libtapi-devel
 %define _with_bluetooth_frwk_libnotification 1
 %define _with_audio_session_manager 1
 %define _with_audio_session_manager_with_murphy 1
+%define _with_dlog_to_systemd_journal 1
+%define _with_wrt_option_eds 1
+%define _with_x 1
 
 
 # mesa
 Substitute: pkgconfig(gles20) pkgconfig(egl) pkgconfig(glesv2) pkgconfig(gl)
 Substitute: pkgconfig(gles11) pkgconfig(egl) pkgconfig(glesv1_cm) pkgconfig(gl) 
-#Prefer: mesa-libEGL
 Prefer: nfc-manager-neard
 Prefer: nfc-common-lib-neard
 Prefer: calendar-service-devel
@@ -171,6 +184,8 @@ Macros:
 %_with_bluetooth_frwk_libnotification 1
 %_with_audio_session_manager 1
 %_with_audio_session_manager_with_murphy 1
+%_with_x 1
+
 
 %tizen_version 3.0
 %tizen 3.0