Merge branch 'devel-crosswalk' of git.vannes:/srv/git/gitcache/github.com/eurogiciel...

Conflicts:
	proto-meta-Tizen_generic/.spec2yoctorc

Change-Id: I9946fd408ee6babb56344de4fee14c28bf5ad830

diff --git a/proto-meta-Tizen_generic/.spec2yoctorc b/proto-meta-Tizen_generic/.spec2yoctorc
index 653e23c..1b49c74 100644 (file)
--- a/proto-meta-Tizen_generic/.spec2yoctorc
+++ b/proto-meta-Tizen_generic/.spec2yoctorc
@@ -27,6 +27,7 @@ default_git_src=review.tizen.org
 priority=1
 
 [whitelist_tizen_common]
+
 list=smack, rpm, uthash, lua, weston-common, pwdutils, fdupes, doxygen, crosswalk, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta, slp-pkgmgr, app-core, libslp-sensor, libsf-common, tizen-platform-config, application, libslp-db-util, tizen-platform-wrapper, app-svc, notification, alarm-manager, eina, com-core, libtapi, libtapi-legacy
 
 [substitute]
@@ -84,7 +85,7 @@ ignore= glibc-devel-32bit, gdm, tk, subversion-perl, cvsps, perl-DBD-SQLite, cvs
 [tizen-provided-extra]
 acl=libacl-devel
 ail=pkgconfig(ail)
-alsa-lib=pkgconfig(alsa)
+alsa-lib=pkgconfig(alsa), alsa
 alsa-state=pkgconfig(libascenario)
 app-checker=pkgconfig(app-checker), pkgconfig(app-checker-server)
 application=pkgconfig(capi-appfw-application)
@@ -92,21 +93,20 @@ attr=libattr-devel
 audio-session-manager=pkgconfig(audio-session-mgr)
 aul-1=pkgconfig(aul)
 avsystem=pkgconfig(avsystem), pkgconfig(avsysaudio)
+bundle=pkgconfig(bundle)
 bzip2=pkgconfig(bzip2), bzip2-devel
 cairo=pkgconfig(cairo), pkgconfig(cairo-egl), pkgconfig(cairo-glesv2)
 common=pkgconfig(capi-base-common)
 dbus=pkgconfig(dbus-glib-1), pkgconfig(dbus-1)
 dlog=pkgconfig(dlog)
 ecore=pkgconfig(ecore-input), pkgconfig(ecore-wayland), pkgconfig(ecore)
-eglibc=glibc-devel, /sbin/ldconfig
+eglibc=glibc-devel, pkgconfig(gobject-2.0), pkgconfig(glib-2.0), pkgconfig(gio-2.0), /sbin/ldconfig
 elfutils=libelf-devel
 expat=expat-devel
 file=file-devel
 fontconfig=pkgconfig(fontconfig)
 freetype=pkgconfig(freetype2)
 gcc=gcc-c++
-glib-2.0=pkgconfig(glib-2.0)
-glib-2.0=pkgconfig(gobject-2.0), pkgconfig(glib-2.0), pkgconfig(gio-2.0)
 heynoti=pkgconfig(heynoti)
 icu=pkgconfig(icu-i18n)
 iniparser=pkgconfig(iniparser)
@@ -137,7 +137,6 @@ libxml2=pkgconfig(libxml-2.0), libxml2-devel
 libxslt=pkgconfig(libxslt)
 location-manager=pkgconfig(capi-location-manager), pkgconfig(location)
 lua=pkgconfig(lua)
-# Check that gbm is provided by mesa
 mesa=pkgconfig(egl), pkgconfig(glesv2), pkgconfig(gbm)
 mtdev=pkgconfig(mtdev)
 ncurses=ncurses-devel
@@ -156,6 +155,7 @@ pwdutils=/usr/sbin/groupadd
 python=python-devel
 readline=readline-devel
 security-server=pkgconfig(security-server)
+slp-pkgmgr=pkgconfig(pkgmgr-installer)
 smack=pkgconfig(libsmack)
 sound-manager=pkgconfig(capi-media-sound-manager)
 sqlite3=pkgconfig(sqlite3), /usr/bin/sqlite3
@@ -166,7 +166,7 @@ udev=pkgconfig(libudev)
 uthash=uthash-devel
 vconf=pkgconfig(vconf), pkgconfig(wayland-cursor), vconf-keys-devel, /usr/bin/vconftool
 vconf-internal-keys=pkgconfig(vconf-internal-keys)
-wayland=pkgconfig(wayland-client), pkgconfig(wayland-egl), pkgconfig(wayland-server),
+wayland=pkgconfig(wayland-client), pkgconfig(wayland-egl), pkgconfig(wayland-server)
 weston=pkgconfig(weston)
 xdgmime=pkgconfig(xdgmime), xdgmime-devel
 xz=xz-devel
@@ -183,4 +183,4 @@ eina=pkgconfig(eina)
 com-core=pkgconfig(com-core)
 libtapi-legacy=pkgconfig(tapi)
 libtapi=pkgconfig(tapi-3.0)
-libsoup-2.4=pkgconfig(libsoup-2.4)
\ No newline at end of file
+libsoup-2.4=pkgconfig(libsoup-2.4)