From 0e17c12fa7b2ceb6a7a77ed36604e0c3fd818db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 2 Nov 2013 12:07:42 +0100 Subject: [PATCH] gallium/targets: remove r300/vdpau MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Christian König --- configure.ac | 3 +- src/gallium/targets/Makefile.am | 4 -- src/gallium/targets/r300/vdpau/Makefile.am | 74 ---------------------- 3 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 src/gallium/targets/r300/vdpau/Makefile.am diff --git a/configure.ac b/configure.ac index a3bf6f6f9fb..ec0741d9f20 100644 --- a/configure.ac +++ b/configure.ac @@ -1771,7 +1771,7 @@ if test "x$with_gallium_drivers" != x; then PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) gallium_require_llvm "Gallium R300" GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" - gallium_check_st "radeon/drm" "r300/dri" "" "" "" "r300/vdpau" + gallium_check_st "radeon/drm" "r300/dri" "" "" "" "" DRICOMMON_NEED_LIBDRM=yes ;; xr600) @@ -2045,7 +2045,6 @@ AC_CONFIG_FILES([Makefile src/gallium/targets/radeonsi/dri/Makefile src/gallium/targets/radeonsi/vdpau/Makefile src/gallium/targets/r300/dri/Makefile - src/gallium/targets/r300/vdpau/Makefile src/gallium/targets/r600/dri/Makefile src/gallium/targets/r600/vdpau/Makefile src/gallium/targets/r600/xvmc/Makefile diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index 162e30d628d..02211358b8d 100644 --- a/src/gallium/targets/Makefile.am +++ b/src/gallium/targets/Makefile.am @@ -74,10 +74,6 @@ if HAVE_GALLIUM_R300 if HAVE_DRI SUBDIRS += r300/dri endif - -if HAVE_ST_VDPAU -SUBDIRS += r300/vdpau -endif endif if HAVE_GALLIUM_R600 diff --git a/src/gallium/targets/r300/vdpau/Makefile.am b/src/gallium/targets/r300/vdpau/Makefile.am deleted file mode 100644 index d4855b25e18..00000000000 --- a/src/gallium/targets/r300/vdpau/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright © 2012 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(PTHREAD_CFLAGS) \ - $(LIBDRM_CFLAGS) \ - $(VISIBILITY_CFLAGS) -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys - -vdpaudir = $(VDPAU_LIB_INSTALL_DIR) -vdpau_LTLIBRARIES = libvdpau_r300.la - -EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$' - -nodist_EXTRA_libvdpau_r300_la_SOURCES = dummy.cpp -libvdpau_r300_la_SOURCES = \ - ../drm_target.c \ - $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c - -libvdpau_r300_la_LDFLAGS = \ - -module \ - -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ - -export-symbols-regex $(EXPORTS) \ - -shared \ - -no-undefined - -libvdpau_r300_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \ - $(top_builddir)/src/gallium/drivers/r300/libr300.la \ - $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ - $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ - $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ - $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ - $(GALLIUM_DRI_LIB_DEPS) \ - $(VDPAU_LIBS) \ - $(LIBDRM_LIBS) \ - $(RADEON_LIBS) - -if HAVE_MESA_LLVM -libvdpau_r300_la_LDFLAGS += $(LLVM_LDFLAGS) -libvdpau_r300_la_LIBADD += $(LLVM_LIBS) -endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libvdpau_r300.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libvdpau_r300.so* $(top_builddir)/$(LIB_DIR)/gallium/