targets/xvmc-nouveau: convert to static/shared pipe-drivers

Similar to vdpau targets, we're going to convert the individual
target libraries into a single one.

The library can be built with the relevant pipe-drivers
statically linked in, or loaded as shared modules.
Currently we default to static.

Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>

3 files changed, 123 insertions, 0 deletions

diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
new file mode 100644
index 0000000..44b4004
--- /dev/null
+++ b/src/gallium/targets/xvmc/Makefile.am
@@ -0,0 +1,90 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+	$(GALLIUM_VIDEO_CFLAGS)
+
+xvmcdir = $(XVMC_LIB_INSTALL_DIR)
+xvmc_LTLIBRARIES = libXvMCgallium.la
+
+nodist_EXTRA_libXvMCgallium_la_SOURCES = dummy.cpp
+libXvMCgallium_la_SOURCES = \
+	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
+
+libXvMCgallium_la_LDFLAGS = \
+	-shared \
+	-module \
+	-no-undefined \
+	-version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
+	$(GC_SECTIONS) \
+	$(LD_NO_UNDEFINED)
+
+if HAVE_LD_VERSION_SCRIPT
+libXvMCgallium_la_LDFLAGS += \
+	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc/xvmc.sym
+endif # HAVE_LD_VERSION_SCRIPT
+
+libXvMCgallium_la_LIBADD = \
+	$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
+	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(XVMC_LIBS) \
+	$(LIBDRM_LIBS) \
+	$(GALLIUM_COMMON_LIB_DEPS)
+
+
+if HAVE_GALLIUM_STATIC_TARGETS
+
+MEGADRIVERS =
+STATIC_TARGET_CPPFLAGS = -DGALLIUM_STATIC_TARGETS=1
+STATIC_TARGET_LIB_DEPS = \
+	$(top_builddir)/src/loader/libloader.la
+
+if HAVE_GALLIUM_NOUVEAU
+MEGADRIVERS += nouveau
+STATIC_TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU
+STATIC_TARGET_LIB_DEPS += \
+	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
+	$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
+	$(NOUVEAU_LIBS)
+endif
+
+libXvMCgallium_la_SOURCES += target.c
+libXvMCgallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS)
+libXvMCgallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS)
+
+else # HAVE_GALLIUM_STATIC_TARGETS
+
+libXvMCgallium_la_CPPFLAGS = \
+	$(GALLIUM_PIPE_LOADER_DEFINES) \
+	-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
+
+# XXX: Use the pipe-loader-client over pipe-loader ?
+libXvMCgallium_la_LIBADD += \
+	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
+	$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
+	$(GALLIUM_PIPE_LOADER_LIBS)
+
+endif # HAVE_GALLIUM_STATIC_TARGETS
+
+if HAVE_MESA_LLVM
+libXvMCgallium_la_LIBADD += $(LLVM_LIBS)
+libXvMCgallium_la_LDFLAGS += $(LLVM_LDFLAGS)
+endif
+
+# hardlink each megadriver instance, but don't actually have
+# libXvMCgallium.so in the set of final installed files.
+install-data-hook:
+	$(AM_V_GEN)dest_dir=$(DESTDIR)/$(xvmcdir);			\
+	for i in $(MEGADRIVERS); do					\
+		j=libXvMCgallium.$(LIB_EXT);				\
+		k=libXvMC$${i}.$(LIB_EXT);				\
+		l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0;			\
+		ln -f $$dest_dir/$$j.$(XVMC_MAJOR).$(XVMC_MINOR).0	\
+		      $$dest_dir/$${l};					\
+		ln -sf $${l}						\
+		       $$dest_dir/$$k.$(XVMC_MAJOR).$(XVMC_MINOR);	\
+		ln -sf $${l}						\
+		       $$dest_dir/$$k.$(XVMC_MAJOR);			\
+		ln -sf $${l}						\
+		       $$dest_dir/$$k;					\
+	done;								\
+	$(RM) -f $$dest_dir/libXvMCgallium.*
diff --git a/src/gallium/targets/xvmc/target.c b/src/gallium/targets/xvmc/target.c
new file mode 100644
index 0000000..fde4a4a
--- /dev/null
+++ b/src/gallium/targets/xvmc/target.c
@@ -0,0 +1 @@
+#include "target-helpers/inline_drm_helper.h"
diff --git a/src/gallium/targets/xvmc/xvmc.sym b/src/gallium/targets/xvmc/xvmc.sym
new file mode 100644
index 0000000..f51378e
--- /dev/null
+++ b/src/gallium/targets/xvmc/xvmc.sym
@@ -0,0 +1,32 @@
+{
+	global:
+		XvMCBlendSubpicture;
+		XvMCBlendSubpicture2;
+		XvMCClearSubpicture;
+		XvMCCompositeSubpicture;
+		XvMCCreateBlocks;
+		XvMCCreateContext;
+		XvMCCreateMacroBlocks;
+		XvMCCreateSubpicture;
+		XvMCCreateSurface;
+		XvMCDestroyBlocks;
+		XvMCDestroyContext;
+		XvMCDestroyMacroBlocks;
+		XvMCDestroySubpicture;
+		XvMCDestroySurface;
+		XvMCFlushSubpicture;
+		XvMCFlushSurface;
+		XvMCGetAttribute;
+		XvMCGetSubpictureStatus;
+		XvMCGetSurfaceStatus;
+		XvMCHideSurface;
+		XvMCPutSurface;
+		XvMCQueryAttributes;
+		XvMCRenderSurface;
+		XvMCSetAttribute;
+		XvMCSetSubpicturePalette;
+		XvMCSyncSubpicture;
+		XvMCSyncSurface;
+	local:
+		*;
+};