Module: Mesa
Branch: master
Commit: 6a8aa11c207b99920b9306b209f071a0e3fe8b43
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a8aa11c207b99920b9306b209f071a0e3fe8b43
Author: Gurkirpal Singh <gurkirpal...@gmail.com>
Date: Sat Aug 12 21:55:15 2017 +0530
st/omx_bellagio: Rename state tracker and option
Changes --enable-omx option to --enable-omx-bellagio
Signed-off-by: Gurkirpal Singh <gurkirpal...@gmail.com>
Reviewed-and-Tested-by: Julien Isorce <julien.iso...@gmail.com>
Acked-by: Christian König <christian.koe...@amd.com>
---
configure.ac | 49 ++++++++++++----------
src/gallium/Makefile.am | 4 +-
.../{omx => omx_bellagio}/Makefile.am | 2 +-
.../{omx => omx_bellagio}/Makefile.sources | 0
.../{omx => omx_bellagio}/entrypoint.c | 0
.../{omx => omx_bellagio}/entrypoint.h | 0
.../state_trackers/{omx => omx_bellagio}/vid_dec.c | 0
.../state_trackers/{omx => omx_bellagio}/vid_dec.h | 0
.../{omx => omx_bellagio}/vid_dec_h264.c | 0
.../{omx => omx_bellagio}/vid_dec_h265.c | 0
.../{omx => omx_bellagio}/vid_dec_mpeg12.c | 0
.../state_trackers/{omx => omx_bellagio}/vid_enc.c | 0
.../state_trackers/{omx => omx_bellagio}/vid_enc.h | 0
.../targets/{omx => omx-bellagio}/Makefile.am | 8 ++--
src/gallium/targets/{omx => omx-bellagio}/omx.sym | 0
src/gallium/targets/{omx => omx-bellagio}/target.c | 0
16 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/configure.ac b/configure.ac
index d0d4c0dfd1..605c9b4e99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1228,9 +1228,14 @@ AC_ARG_ENABLE([vdpau],
[enable_vdpau=auto])
AC_ARG_ENABLE([omx],
[AS_HELP_STRING([--enable-omx],
- [enable OpenMAX library @<:@default=disabled@:>@])],
- [enable_omx="$enableval"],
- [enable_omx=no])
+ [DEPRECATED: Use --enable-omx-bellagio instead
@<:@default=auto@:>@])],
+ [AC_MSG_ERROR([--enable-omx is deprecated. Use --enable-omx-bellagio
instead.])],
+ [])
+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],
[AS_HELP_STRING([--enable-va],
[enable va library @<:@default=auto@:>@])],
@@ -1281,7 +1286,7 @@ if test "x$enable_opengl" = xno -a \
"x$enable_xa" = xno -a \
"x$enable_xvmc" = 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_opencl" = xno; then
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
PKG_CHECK_EXISTS([vdpau >= $VDPAU_REQUIRED], [enable_vdpau=yes],
[enable_vdpau=no])
fi
- if test "x$enable_omx" = xauto -a "x$have_omx_platform" = xyes; then
- PKG_CHECK_EXISTS([libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED],
[enable_omx=yes], [enable_omx=no])
+ if test "x$enable_omx_bellagio" = xauto -a "x$have_omx_platform" = xyes;
then
+ PKG_CHECK_EXISTS([libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED],
[enable_omx_bellagio=yes], [enable_omx_bellagio=no])
fi
if test "x$enable_va" = xauto -a "x$have_va_platform" = xyes; then
@@ -2138,7 +2143,7 @@ fi
if test "x$enable_dri" = xyes -o \
"x$enable_xvmc" = xyes -o \
"x$enable_vdpau" = xyes -o \
- "x$enable_omx" = xyes -o \
+ "x$enable_omx_bellagio" = xyes -o \
"x$enable_va" = xyes; then
need_gallium_vl=yes
fi
@@ -2146,7 +2151,7 @@ AM_CONDITIONAL(NEED_GALLIUM_VL, test "x$need_gallium_vl"
= xyes)
if test "x$enable_xvmc" = xyes -o \
"x$enable_vdpau" = xyes -o \
- "x$enable_omx" = xyes -o \
+ "x$enable_omx_bellagio" = xyes -o \
"x$enable_va" = xyes; then
PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
need_gallium_vl_winsys=yes
@@ -2172,14 +2177,14 @@ if test "x$enable_vdpau" = xyes; then
fi
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
AC_MSG_ERROR([OMX requires at least one of the x11 or drm platforms])
fi
- PKG_CHECK_MODULES([OMX], [libomxil-bellagio >=
$LIBOMXIL_BELLAGIO_REQUIRED])
- gallium_st="$gallium_st omx"
+ PKG_CHECK_MODULES([OMX_BELLAGIO], [libomxil-bellagio >=
$LIBOMXIL_BELLAGIO_REQUIRED])
+ gallium_st="$gallium_st omx_bellagio"
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$have_va_platform" != xyes; then
@@ -2341,15 +2346,15 @@ AC_ARG_WITH([vdpau-libdir],
[VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau'])
AC_SUBST([VDPAU_LIB_INSTALL_DIR])
-dnl Directory for OMX libs
+dnl Directory for OMX_BELLAGIO libs
-AC_ARG_WITH([omx-libdir],
- [AS_HELP_STRING([--with-omx-libdir=DIR],
- [directory for the OMX libraries])],
- [OMX_LIB_INSTALL_DIR="$withval"],
- [OMX_LIB_INSTALL_DIR=`$PKG_CONFIG --exists libomxil-bellagio && \
- $PKG_CONFIG --define-variable=libdir=\$libdir
--variable=pluginsdir libomxil-bellagio`])
-AC_SUBST([OMX_LIB_INSTALL_DIR])
+AC_ARG_WITH([omx-bellagio-libdir],
+ [AS_HELP_STRING([--with-omx-bellagio-libdir=DIR],
+ [directory for the OMX_BELLAGIO libraries])],
+ [OMX_BELLAGIO_LIB_INSTALL_DIR="$withval"],
+ [OMX_BELLAGIO_LIB_INSTALL_DIR=`$PKG_CONFIG --exists libomxil-bellagio && \
+ $PKG_CONFIG
--define-variable=libdir=\$libdir --variable=pluginsdir libomxil-bellagio`])
+AC_SUBST([OMX_BELLAGIO_LIB_INSTALL_DIR])
dnl Directory for VA libs
@@ -2852,7 +2857,7 @@ AC_CONFIG_FILES([Makefile
src/gallium/state_trackers/dri/Makefile
src/gallium/state_trackers/glx/xlib/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/va/Makefile
src/gallium/state_trackers/vdpau/Makefile
@@ -2862,7 +2867,7 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/d3dadapter9/d3d.pc
src/gallium/targets/dri/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/mesa.icd
src/gallium/targets/osmesa/Makefile
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 9f98a7e28b..2b930ac2cc 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -149,8 +149,8 @@ if HAVE_GALLIUM_XLIB_GLX
SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
endif
-if HAVE_ST_OMX
-SUBDIRS += state_trackers/omx targets/omx
+if HAVE_ST_OMX_BELLAGIO
+SUBDIRS += state_trackers/omx_bellagio targets/omx-bellagio
endif
if HAVE_GALLIUM_OSMESA
diff --git a/src/gallium/state_trackers/omx/Makefile.am
b/src/gallium/state_trackers/omx_bellagio/Makefile.am
similarity index 98%
rename from src/gallium/state_trackers/omx/Makefile.am
rename to src/gallium/state_trackers/omx_bellagio/Makefile.am
index e2d9ec72dc..fcd8b2c310 100644
--- a/src/gallium/state_trackers/omx/Makefile.am
+++ b/src/gallium/state_trackers/omx_bellagio/Makefile.am
@@ -28,7 +28,7 @@ AM_CFLAGS = \
$(VISIBILITY_CFLAGS) \
$(VL_CFLAGS) \
$(XCB_DRI3_CFLAGS) \
- $(OMX_CFLAGS)
+ $(OMX_BELLAGIO_CFLAGS)
noinst_LTLIBRARIES = libomxtracker.la
diff --git a/src/gallium/state_trackers/omx/Makefile.sources
b/src/gallium/state_trackers/omx_bellagio/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/omx/Makefile.sources
rename to src/gallium/state_trackers/omx_bellagio/Makefile.sources
diff --git a/src/gallium/state_trackers/omx/entrypoint.c
b/src/gallium/state_trackers/omx_bellagio/entrypoint.c
similarity index 100%
rename from src/gallium/state_trackers/omx/entrypoint.c
rename to src/gallium/state_trackers/omx_bellagio/entrypoint.c
diff --git a/src/gallium/state_trackers/omx/entrypoint.h
b/src/gallium/state_trackers/omx_bellagio/entrypoint.h
similarity index 100%
rename from src/gallium/state_trackers/omx/entrypoint.h
rename to src/gallium/state_trackers/omx_bellagio/entrypoint.h
diff --git a/src/gallium/state_trackers/omx/vid_dec.c
b/src/gallium/state_trackers/omx_bellagio/vid_dec.c
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_dec.c
rename to src/gallium/state_trackers/omx_bellagio/vid_dec.c
diff --git a/src/gallium/state_trackers/omx/vid_dec.h
b/src/gallium/state_trackers/omx_bellagio/vid_dec.h
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_dec.h
rename to src/gallium/state_trackers/omx_bellagio/vid_dec.h
diff --git a/src/gallium/state_trackers/omx/vid_dec_h264.c
b/src/gallium/state_trackers/omx_bellagio/vid_dec_h264.c
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_dec_h264.c
rename to src/gallium/state_trackers/omx_bellagio/vid_dec_h264.c
diff --git a/src/gallium/state_trackers/omx/vid_dec_h265.c
b/src/gallium/state_trackers/omx_bellagio/vid_dec_h265.c
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_dec_h265.c
rename to src/gallium/state_trackers/omx_bellagio/vid_dec_h265.c
diff --git a/src/gallium/state_trackers/omx/vid_dec_mpeg12.c
b/src/gallium/state_trackers/omx_bellagio/vid_dec_mpeg12.c
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_dec_mpeg12.c
rename to src/gallium/state_trackers/omx_bellagio/vid_dec_mpeg12.c
diff --git a/src/gallium/state_trackers/omx/vid_enc.c
b/src/gallium/state_trackers/omx_bellagio/vid_enc.c
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_enc.c
rename to src/gallium/state_trackers/omx_bellagio/vid_enc.c
diff --git a/src/gallium/state_trackers/omx/vid_enc.h
b/src/gallium/state_trackers/omx_bellagio/vid_enc.h
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_enc.h
rename to src/gallium/state_trackers/omx_bellagio/vid_enc.h
diff --git a/src/gallium/targets/omx/Makefile.am
b/src/gallium/targets/omx-bellagio/Makefile.am
similarity index 88%
rename from src/gallium/targets/omx/Makefile.am
rename to src/gallium/targets/omx-bellagio/Makefile.am
index d977255fcf..4c9a12c3c7 100644
--- a/src/gallium/targets/omx/Makefile.am
+++ b/src/gallium/targets/omx-bellagio/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
$(GALLIUM_TARGET_CFLAGS)
-omxdir = $(OMX_LIB_INSTALL_DIR)
+omxdir = $(OMX_BELLAGIO_LIB_INSTALL_DIR)
omx_LTLIBRARIES = libomx_mesa.la
nodist_EXTRA_libomx_mesa_la_SOURCES = dummy.cpp
@@ -19,16 +19,16 @@ libomx_mesa_la_LDFLAGS = \
if HAVE_LD_VERSION_SCRIPT
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
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/libgalliumvl.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \
- $(OMX_LIBS) \
+ $(OMX_BELLAGIO_LIBS) \
$(LIBDRM_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS)
diff --git a/src/gallium/targets/omx/omx.sym
b/src/gallium/targets/omx-bellagio/omx.sym
similarity index 100%
rename from src/gallium/targets/omx/omx.sym
rename to src/gallium/targets/omx-bellagio/omx.sym
diff --git a/src/gallium/targets/omx/target.c
b/src/gallium/targets/omx-bellagio/target.c
similarity index 100%
rename from src/gallium/targets/omx/target.c
rename to src/gallium/targets/omx-bellagio/target.c
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
