summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2016-05-31 10:04:17 -0400
committerChris Michael <cpmichael@osg.samsung.com>2016-05-31 10:05:28 -0400
commitaf22796356a62b56dca47712e29dd88d87bd722c (patch)
treea14b962bd742a40c60dc3414e0a5d8aa41ea450e
parente01ac62e5f36614e3a5195105f28bf5d9b05be08 (diff)
ecore-drm: Deprecate Ecore_Drm library
Small patch to deprecate Ecore_Drm. This patch also adds a configure option to enable ecore_drm for older code. This option is disabled by default, so must be explicitly specified during build. Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
-rw-r--r--configure.ac17
-rw-r--r--src/lib/ecore_drm/Ecore_Drm.h2
2 files changed, 17 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 07e7ec4..3eef79c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1651,6 +1651,17 @@ AC_ARG_ENABLE([ecore_wayland],
1651 ], 1651 ],
1652 [want_ecore_wayland="no"]) 1652 [want_ecore_wayland="no"])
1653 1653
1654AC_ARG_ENABLE([ecore_drm],
1655 [AS_HELP_STRING([--enable-ecore-drm],[enable legacy Ecore_Drm support. @<:@default=disabled@:>@])],
1656 [
1657 if test "x${enableval}" = "xyes" ; then
1658 want_ecore_drm="yes"
1659 else
1660 want_ecore_drm="no"
1661 fi
1662 ],
1663 [want_ecore_drm="no"])
1664
1654### Default values 1665### Default values
1655 1666
1656if test "${have_windows}" = "yes"; then 1667if test "${have_windows}" = "yes"; then
@@ -2098,7 +2109,7 @@ AC_ARG_ENABLE([drm],
2098 fi 2109 fi
2099 want_drm="yes" 2110 want_drm="yes"
2100 else 2111 else
2101 want_drm="no" 2112 want_drm="no"
2102 fi 2113 fi
2103 ], 2114 ],
2104 [want_drm="no"]) 2115 [want_drm="no"])
@@ -3511,7 +3522,7 @@ AM_CONDITIONAL([HAVE_EEZE_TIZEN], [test "x${want_tizen}" = "xyes"])
3511 3522
3512#### Ecore_Drm 3523#### Ecore_Drm
3513have_libinput_new="no" 3524have_libinput_new="no"
3514EFL_LIB_START_OPTIONAL([Ecore_Drm], [test "${want_drm}" = "yes"]) 3525EFL_LIB_START_OPTIONAL([Ecore_Drm], [test "${want_ecore_drm}" = "yes"])
3515 3526
3516### Additional options to configure 3527### Additional options to configure
3517SUID_CFLAGS=-fPIE 3528SUID_CFLAGS=-fPIE
@@ -5796,6 +5807,8 @@ echo "Ecore_File......: yes"
5796echo "Ecore_IMF.......: yes (${features_ecore_imf})" 5807echo "Ecore_IMF.......: yes (${features_ecore_imf})"
5797echo "Ecore_X.........: ${with_x11} (${features_ecore_x})" 5808echo "Ecore_X.........: ${with_x11} (${features_ecore_x})"
5798echo "Ecore_SDL.......: $want_sdl" 5809echo "Ecore_SDL.......: $want_sdl"
5810echo "Ecore_Drm.......: $want_ecore_drm"
5811echo "Ecore_Drm2......: $want_drm"
5799echo "Ecore_Wayland...: $want_ecore_wayland" 5812echo "Ecore_Wayland...: $want_ecore_wayland"
5800echo "Ecore_Wl2.......: $want_wayland" 5813echo "Ecore_Wl2.......: $want_wayland"
5801echo "IVI-Shell.......: $want_wayland_ivi_shell" 5814echo "IVI-Shell.......: $want_wayland_ivi_shell"
diff --git a/src/lib/ecore_drm/Ecore_Drm.h b/src/lib/ecore_drm/Ecore_Drm.h
index a1a13171..62717e5 100644
--- a/src/lib/ecore_drm/Ecore_Drm.h
+++ b/src/lib/ecore_drm/Ecore_Drm.h
@@ -30,6 +30,8 @@
30# endif // ifdef __GNUC__ 30# endif // ifdef __GNUC__
31# endif // ifdef _MSC_VER 31# endif // ifdef _MSC_VER
32 32
33# warning The Ecore_Drm library has been deprecated. Please use the Ecore_Drm2 library
34
33# ifdef __cplusplus 35# ifdef __cplusplus
34extern "C" { 36extern "C" {
35# endif 37# endif