Merge branch 'devel/tizen' into tizen

Conflicts:
	packaging/xf86-video-exynos.spec

Change-Id: Ie149d31906c7e1cb920750afdf3874130a195c22

diff --cc packaging/xf86-video-exynos.spec
index 5086c0a,e3cde65..6d8155c
mode 100755,100644..100644
--- 1/packaging/xf86-video-exynos.spec
--- 2/packaging/xf86-video-exynos.spec
+++ b/packaging/xf86-video-exynos.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:       xf86-video-exynos
  Summary:    X.Org X server driver for exynos
- Version:    1.0.0
 -Version:    0.0.1
++Version:    1.0.1
  Release:    1
  Group:      System/X Hardware Support
  License:    Samsung
@@@ -37,10 -33,10 +37,9 @@@ This package provides the driver for th
  %build
  rm -rf %{buildroot}
  
- %autogen --disable-static \
-       CFLAGS="${CFLAGS} -Wall -Werror -mfpu=neon -DNO_CRTC_MODE -mfloat-abi=softfp" LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
- 
+ %autogen --disable-static --enable-dri3 \
+       CFLAGS="${CFLAGS} -Wall -mfpu=neon -DNO_CRTC_MODE -DPRESENT_SWAP -mfloat-abi=softfp" LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
  
 -
  make %{?jobs:-j%jobs}
  
  %install