Commit 6a8aa11c authored by Gurkirpal Singh's avatar Gurkirpal Singh Committed by Christian König

st/omx_bellagio: Rename state tracker and option

Changes --enable-omx option to --enable-omx-bellagio
Signed-off-by: default avatarGurkirpal Singh <gurkirpal204@gmail.com>
Reviewed-and-Tested-by: default avatarJulien Isorce <julien.iso...@gmail.com>
Acked-by: Christian König's avatarChristian König <christian.koenig@amd.com>
parent acbfcb71
...@@ -1228,9 +1228,14 @@ AC_ARG_ENABLE([vdpau], ...@@ -1228,9 +1228,14 @@ AC_ARG_ENABLE([vdpau],
[enable_vdpau=auto]) [enable_vdpau=auto])
AC_ARG_ENABLE([omx], AC_ARG_ENABLE([omx],
[AS_HELP_STRING([--enable-omx], [AS_HELP_STRING([--enable-omx],
[enable OpenMAX library @<:@default=disabled@:>@])], [DEPRECATED: Use --enable-omx-bellagio instead @<:@default=auto@:>@])],
[enable_omx="$enableval"], [AC_MSG_ERROR([--enable-omx is deprecated. Use --enable-omx-bellagio instead.])],
[enable_omx=no]) [])
AC_ARG_ENABLE([omx-bellagio],
[AS_HELP_STRING([--enable-omx-bellagio],
[enable OpenMAX Bellagio library @<:@default=disabled@:>@])],
[enable_omx_bellagio="$enableval"],
[enable_omx_bellagio=no])
AC_ARG_ENABLE([va], AC_ARG_ENABLE([va],
[AS_HELP_STRING([--enable-va], [AS_HELP_STRING([--enable-va],
[enable va library @<:@default=auto@:>@])], [enable va library @<:@default=auto@:>@])],
...@@ -1281,7 +1286,7 @@ if test "x$enable_opengl" = xno -a \ ...@@ -1281,7 +1286,7 @@ if test "x$enable_opengl" = xno -a \
"x$enable_xa" = xno -a \ "x$enable_xa" = xno -a \
"x$enable_xvmc" = xno -a \ "x$enable_xvmc" = xno -a \
"x$enable_vdpau" = xno -a \ "x$enable_vdpau" = xno -a \
"x$enable_omx" = xno -a \ "x$enable_omx_bellagio" = xno -a \
"x$enable_va" = xno -a \ "x$enable_va" = xno -a \
"x$enable_opencl" = xno; then "x$enable_opencl" = xno; then
AC_MSG_ERROR([at least one API should be enabled]) AC_MSG_ERROR([at least one API should be enabled])
...@@ -2126,8 +2131,8 @@ if test -n "$with_gallium_drivers" -a "x$with_gallium_drivers" != xswrast; then ...@@ -2126,8 +2131,8 @@ if test -n "$with_gallium_drivers" -a "x$with_gallium_drivers" != xswrast; then
PKG_CHECK_EXISTS([vdpau >= $VDPAU_REQUIRED], [enable_vdpau=yes], [enable_vdpau=no]) PKG_CHECK_EXISTS([vdpau >= $VDPAU_REQUIRED], [enable_vdpau=yes], [enable_vdpau=no])
fi fi
if test "x$enable_omx" = xauto -a "x$have_omx_platform" = xyes; then if test "x$enable_omx_bellagio" = xauto -a "x$have_omx_platform" = xyes; then
PKG_CHECK_EXISTS([libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED], [enable_omx=yes], [enable_omx=no]) PKG_CHECK_EXISTS([libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED], [enable_omx_bellagio=yes], [enable_omx_bellagio=no])
fi fi
if test "x$enable_va" = xauto -a "x$have_va_platform" = xyes; then if test "x$enable_va" = xauto -a "x$have_va_platform" = xyes; then
...@@ -2138,7 +2143,7 @@ fi ...@@ -2138,7 +2143,7 @@ fi
if test "x$enable_dri" = xyes -o \ if test "x$enable_dri" = xyes -o \
"x$enable_xvmc" = xyes -o \ "x$enable_xvmc" = xyes -o \
"x$enable_vdpau" = xyes -o \ "x$enable_vdpau" = xyes -o \
"x$enable_omx" = xyes -o \ "x$enable_omx_bellagio" = xyes -o \
"x$enable_va" = xyes; then "x$enable_va" = xyes; then
need_gallium_vl=yes need_gallium_vl=yes
fi fi
...@@ -2146,7 +2151,7 @@ AM_CONDITIONAL(NEED_GALLIUM_VL, test "x$need_gallium_vl" = xyes) ...@@ -2146,7 +2151,7 @@ AM_CONDITIONAL(NEED_GALLIUM_VL, test "x$need_gallium_vl" = xyes)
if test "x$enable_xvmc" = xyes -o \ if test "x$enable_xvmc" = xyes -o \
"x$enable_vdpau" = xyes -o \ "x$enable_vdpau" = xyes -o \
"x$enable_omx" = xyes -o \ "x$enable_omx_bellagio" = xyes -o \
"x$enable_va" = xyes; then "x$enable_va" = xyes; then
PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
need_gallium_vl_winsys=yes need_gallium_vl_winsys=yes
...@@ -2172,14 +2177,14 @@ if test "x$enable_vdpau" = xyes; then ...@@ -2172,14 +2177,14 @@ if test "x$enable_vdpau" = xyes; then
fi fi
AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes) AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes)
if test "x$enable_omx" = xyes; then if test "x$enable_omx_bellagio" = xyes; then
if test "x$have_omx_platform" != xyes; then if test "x$have_omx_platform" != xyes; then
AC_MSG_ERROR([OMX requires at least one of the x11 or drm platforms]) AC_MSG_ERROR([OMX requires at least one of the x11 or drm platforms])
fi fi
PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED]) PKG_CHECK_MODULES([OMX_BELLAGIO], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED])
gallium_st="$gallium_st omx" gallium_st="$gallium_st omx_bellagio"
fi fi
AM_CONDITIONAL(HAVE_ST_OMX, test "x$enable_omx" = xyes) AM_CONDITIONAL(HAVE_ST_OMX_BELLAGIO, test "x$enable_omx_bellagio" = xyes)
if test "x$enable_va" = xyes; then if test "x$enable_va" = xyes; then
if test "x$have_va_platform" != xyes; then if test "x$have_va_platform" != xyes; then
...@@ -2341,15 +2346,15 @@ AC_ARG_WITH([vdpau-libdir], ...@@ -2341,15 +2346,15 @@ AC_ARG_WITH([vdpau-libdir],
[VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau']) [VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau'])
AC_SUBST([VDPAU_LIB_INSTALL_DIR]) AC_SUBST([VDPAU_LIB_INSTALL_DIR])
dnl Directory for OMX libs dnl Directory for OMX_BELLAGIO libs
AC_ARG_WITH([omx-libdir], AC_ARG_WITH([omx-bellagio-libdir],
[AS_HELP_STRING([--with-omx-libdir=DIR], [AS_HELP_STRING([--with-omx-bellagio-libdir=DIR],
[directory for the OMX libraries])], [directory for the OMX_BELLAGIO libraries])],
[OMX_LIB_INSTALL_DIR="$withval"], [OMX_BELLAGIO_LIB_INSTALL_DIR="$withval"],
[OMX_LIB_INSTALL_DIR=`$PKG_CONFIG --exists libomxil-bellagio && \ [OMX_BELLAGIO_LIB_INSTALL_DIR=`$PKG_CONFIG --exists libomxil-bellagio && \
$PKG_CONFIG --define-variable=libdir=\$libdir --variable=pluginsdir libomxil-bellagio`]) $PKG_CONFIG --define-variable=libdir=\$libdir --variable=pluginsdir libomxil-bellagio`])
AC_SUBST([OMX_LIB_INSTALL_DIR]) AC_SUBST([OMX_BELLAGIO_LIB_INSTALL_DIR])
dnl Directory for VA libs dnl Directory for VA libs
...@@ -2852,7 +2857,7 @@ AC_CONFIG_FILES([Makefile ...@@ -2852,7 +2857,7 @@ AC_CONFIG_FILES([Makefile
src/gallium/state_trackers/dri/Makefile src/gallium/state_trackers/dri/Makefile
src/gallium/state_trackers/glx/xlib/Makefile src/gallium/state_trackers/glx/xlib/Makefile
src/gallium/state_trackers/nine/Makefile src/gallium/state_trackers/nine/Makefile
src/gallium/state_trackers/omx/Makefile src/gallium/state_trackers/omx_bellagio/Makefile
src/gallium/state_trackers/osmesa/Makefile src/gallium/state_trackers/osmesa/Makefile
src/gallium/state_trackers/va/Makefile src/gallium/state_trackers/va/Makefile
src/gallium/state_trackers/vdpau/Makefile src/gallium/state_trackers/vdpau/Makefile
...@@ -2862,7 +2867,7 @@ AC_CONFIG_FILES([Makefile ...@@ -2862,7 +2867,7 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/d3dadapter9/d3d.pc src/gallium/targets/d3dadapter9/d3d.pc
src/gallium/targets/dri/Makefile src/gallium/targets/dri/Makefile
src/gallium/targets/libgl-xlib/Makefile src/gallium/targets/libgl-xlib/Makefile
src/gallium/targets/omx/Makefile src/gallium/targets/omx-bellagio/Makefile
src/gallium/targets/opencl/Makefile src/gallium/targets/opencl/Makefile
src/gallium/targets/opencl/mesa.icd src/gallium/targets/opencl/mesa.icd
src/gallium/targets/osmesa/Makefile src/gallium/targets/osmesa/Makefile
......
...@@ -149,8 +149,8 @@ if HAVE_GALLIUM_XLIB_GLX ...@@ -149,8 +149,8 @@ if HAVE_GALLIUM_XLIB_GLX
SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
endif endif
if HAVE_ST_OMX if HAVE_ST_OMX_BELLAGIO
SUBDIRS += state_trackers/omx targets/omx SUBDIRS += state_trackers/omx_bellagio targets/omx-bellagio
endif endif
if HAVE_GALLIUM_OSMESA if HAVE_GALLIUM_OSMESA
......
...@@ -28,7 +28,7 @@ AM_CFLAGS = \ ...@@ -28,7 +28,7 @@ AM_CFLAGS = \
$(VISIBILITY_CFLAGS) \ $(VISIBILITY_CFLAGS) \
$(VL_CFLAGS) \ $(VL_CFLAGS) \
$(XCB_DRI3_CFLAGS) \ $(XCB_DRI3_CFLAGS) \
$(OMX_CFLAGS) $(OMX_BELLAGIO_CFLAGS)
noinst_LTLIBRARIES = libomxtracker.la noinst_LTLIBRARIES = libomxtracker.la
......
...@@ -3,7 +3,7 @@ include $(top_srcdir)/src/gallium/Automake.inc ...@@ -3,7 +3,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \ AM_CFLAGS = \
$(GALLIUM_TARGET_CFLAGS) $(GALLIUM_TARGET_CFLAGS)
omxdir = $(OMX_LIB_INSTALL_DIR) omxdir = $(OMX_BELLAGIO_LIB_INSTALL_DIR)
omx_LTLIBRARIES = libomx_mesa.la omx_LTLIBRARIES = libomx_mesa.la
nodist_EXTRA_libomx_mesa_la_SOURCES = dummy.cpp nodist_EXTRA_libomx_mesa_la_SOURCES = dummy.cpp
...@@ -19,16 +19,16 @@ libomx_mesa_la_LDFLAGS = \ ...@@ -19,16 +19,16 @@ libomx_mesa_la_LDFLAGS = \
if HAVE_LD_VERSION_SCRIPT if HAVE_LD_VERSION_SCRIPT
libomx_mesa_la_LDFLAGS += \ libomx_mesa_la_LDFLAGS += \
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx/omx.sym -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx-bellagio/omx.sym
endif # HAVE_LD_VERSION_SCRIPT endif # HAVE_LD_VERSION_SCRIPT
libomx_mesa_la_LIBADD = \ libomx_mesa_la_LIBADD = \
$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \ $(top_builddir)/src/gallium/state_trackers/omx_bellagio/libomxtracker.la \
$(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \
$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/util/libmesautil.la \
$(OMX_LIBS) \ $(OMX_BELLAGIO_LIBS) \
$(LIBDRM_LIBS) \ $(LIBDRM_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS) $(GALLIUM_COMMON_LIB_DEPS)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment