提交: 210ab05e85b9bcb5682f147538931f9d676e06e2 - hardware-intel-libva (git)

hardware/intel/libva

Commit MetaInfo

• 修订版: 210ab05e85b9bcb5682f147538931f9d676e06e2 (tree)
• 时间: 2012-09-28 18:03:53
• 作者: Gwenole Beauchesne <gwenole.beauchesne@inte...>
• Commiter: Gwenole Beauchesne

Log Message

Drop VA/dummy backend.

This backend had no practical use but for bootstrapping/testing the
VA/Android backend.

Signed-off-by: Gwenole Beauchesne <[e-mail]>

更改概述

• modified: configure.ac
• modified: va/Makefile.am
• modified: va/android/Makefile.am
• delete: va/android/va_dummy.c
• delete: va/dummy
• delete: va/va_dummy.h

差异

--- a/configure.ac
+++ b/configure.ac
@@ -148,11 +148,6 @@ AC_ARG_ENABLE(dummy-driver,
     [], [enable_dummy_driver="yes"])
 AM_CONDITIONAL(BUILD_DUMMY_DRIVER, test x$enable_dummy_driver = xyes)
 
-AC_ARG_ENABLE(dummy-backend,
-    [AC_HELP_STRING([--enable-dummy-backend],
-                    [build dummy libva backend])],
-    [], [enable_dummy_backend="no"])
-
 AC_ARG_WITH(drivers-path,
     [AC_HELP_STRING([--with-drivers-path=[[path]]],
                     [drivers path])],
@@ -199,15 +194,6 @@ if test "$ac_cv_have_gnuc_visibility_attribute" = "yes"; then
               [Defined to 1 if GCC visibility attribute is supported])
 fi
 
-# Dummy backend
-if test x$enable_dummy_backend = xyes; then
-    PKG_CHECK_MODULES([UDEV], [libudev], [libudev=yes], [libudev=no])
-fi
-if test x$libudev = xno; then
-   enable_dummy_backend=no
-fi
-AM_CONDITIONAL(BUILD_DUMMY_BACKEND, test x$enable_dummy_backend = xyes)
-
 # Check for DRM (mandatory)
 LIBDRM_VERSION=libdrm_version
 PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION])
@@ -317,7 +303,6 @@ AC_OUTPUT([
     test/v4l_h264/decode/Makefile
     va/Makefile
     va/drm/Makefile
-    va/dummy/Makefile
     va/egl/Makefile
     va/glx/Makefile
     va/va_version.h

--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -41,7 +41,6 @@ libva_source_h = \
 	va_backend_tpi.h	\
 	va_dec_jpeg.h		\
 	va_drmcommon.h		\
-	va_dummy.h		\
 	va_tpi.h		\
 	va_version.h		\
 	$(NULL)
@@ -117,17 +116,7 @@ libva_wayland_la_LIBADD		= libva.la wayland/libva_wayland.la \
 	$(WAYLAND_LIBS) $(DRM_LIBS) -ldl
 endif
 
-if BUILD_DUMMY_BACKEND
-SUBDIRS				+= dummy
-lib_LTLIBRARIES			+= libva-dummy.la
-libva_dummy_la_SOURCES		= 
-libva_dummy_la_LDFLAGS		= $(LDADD)
-libva_dummy_la_DEPENDENCIES	= libva.la dummy/libva_dummy.la
-libva_dummy_la_LIBADD		= libva.la dummy/libva_dummy.la \
-	$(LIBVA_LIBS) $(DRM_LIBS)
-endif
-
-DIST_SUBDIRS = x11 glx egl dummy drm wayland
+DIST_SUBDIRS = x11 glx egl drm wayland
 
 DISTCLEANFILES = \
 	va_version.h		\

--- a/va/android/Makefile.am
+++ b/va/android/Makefile.am
@@ -20,13 +20,5 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 $(DRM_CFLAGS)
-
-noinst_LTLIBRARIES = libva_dummy.la	
-
-libva_dummy_la_LIBADD = $(LIBVA_LIBS) -ldl -ludev
-
-libva_dummyincludedir = ${includedir}/va
-
-libva_dummy_la_SOURCES = va_dummy.c drmtest.c
-
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in

--- a/va/android/va_dummy.c
+++ /dev/null
@@ -1 +0,0 @@
-va_android.cpp
\ No newline at end of file

--- a/va/dummy
+++ /dev/null
@@ -1 +0,0 @@
-android
\ No newline at end of file

--- a/va/va_dummy.h
+++ /dev/null
@@ -1 +0,0 @@
-va_android.h
\ No newline at end of file