diff options
20 files changed, 46 insertions, 69 deletions
diff --git a/src/gallium/state_trackers/xorg/xvmc/Makefile b/src/gallium/state_trackers/xorg/xvmc/Makefile new file mode 100644 index 0000000000..126dc6d58f --- /dev/null +++ b/src/gallium/state_trackers/xorg/xvmc/Makefile @@ -0,0 +1,16 @@ +TOP = ../../../../.. +include $(TOP)/configs/current + +LIBNAME = xvmctracker + +LIBRARY_INCLUDES = \ + $(shell pkg-config --cflags-only-I xvmc) \ + -I$(TOP)/src/gallium/winsys/g3dvl + +C_SOURCES = block.c \ + surface.c \ + context.c \ + subpicture.c \ + attributes.c + +include ../../../Makefile.template diff --git a/src/gallium/state_trackers/xorg/xvmc/SConscript b/src/gallium/state_trackers/xorg/xvmc/SConscript new file mode 100644 index 0000000000..cb25d68bd8 --- /dev/null +++ b/src/gallium/state_trackers/xorg/xvmc/SConscript @@ -0,0 +1,27 @@ +####################################################################### +# SConscript for xvmc state_tracker + +Import('*') + +if 'xorg/xvmc' in env['statetrackers']: + + env = env.Clone() + + env.Append(CPPPATH = [ + '#/src/gallium/include', + '#/src/gallium/auxiliary', + '#/src/gallium/winsys/g3dvl', + ]) + + env.ParseConfig('pkg-config --cflags --libs xvmc') + + st_xvmc = env.ConvenienceLibrary( + target = 'st_xvmc', + source = [ 'block.c', + 'surface.c', + 'context.c', + 'subpicture.c', + 'attributes.c', + ] + ) + Export('st_xvmc') diff --git a/src/xvmc/attributes.c b/src/gallium/state_trackers/xorg/xvmc/attributes.c index 638da0b577..638da0b577 100644 --- a/src/xvmc/attributes.c +++ b/src/gallium/state_trackers/xorg/xvmc/attributes.c diff --git a/src/xvmc/block.c b/src/gallium/state_trackers/xorg/xvmc/block.c index 78fddfb79e..78fddfb79e 100644 --- a/src/xvmc/block.c +++ b/src/gallium/state_trackers/xorg/xvmc/block.c diff --git a/src/xvmc/context.c b/src/gallium/state_trackers/xorg/xvmc/context.c index 33f47838f5..33f47838f5 100644 --- a/src/xvmc/context.c +++ b/src/gallium/state_trackers/xorg/xvmc/context.c diff --git a/src/xvmc/subpicture.c b/src/gallium/state_trackers/xorg/xvmc/subpicture.c index 78ba618f5a..78ba618f5a 100644 --- a/src/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xorg/xvmc/subpicture.c diff --git a/src/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c index 0467c4d07d..0467c4d07d 100644 --- a/src/xvmc/surface.c +++ b/src/gallium/state_trackers/xorg/xvmc/surface.c diff --git a/src/xvmc/tests/.gitignore b/src/gallium/state_trackers/xorg/xvmc/tests/.gitignore index e1d2f9023d..e1d2f9023d 100644 --- a/src/xvmc/tests/.gitignore +++ b/src/gallium/state_trackers/xorg/xvmc/tests/.gitignore diff --git a/src/xvmc/tests/Makefile b/src/gallium/state_trackers/xorg/xvmc/tests/Makefile index 11b2e1a812..c875dd7605 100644 --- a/src/xvmc/tests/Makefile +++ b/src/gallium/state_trackers/xorg/xvmc/tests/Makefile @@ -1,4 +1,4 @@ -TOP = ../../.. +TOP = ../../../../../.. include $(TOP)/configs/current LIBS = -lXvMCW -lXvMC -lXv -lX11 diff --git a/src/xvmc/tests/test_blocks.c b/src/gallium/state_trackers/xorg/xvmc/tests/test_blocks.c index dc80adfa65..dc80adfa65 100644 --- a/src/xvmc/tests/test_blocks.c +++ b/src/gallium/state_trackers/xorg/xvmc/tests/test_blocks.c diff --git a/src/xvmc/tests/test_context.c b/src/gallium/state_trackers/xorg/xvmc/tests/test_context.c index 53f7449cd0..53f7449cd0 100644 --- a/src/xvmc/tests/test_context.c +++ b/src/gallium/state_trackers/xorg/xvmc/tests/test_context.c diff --git a/src/xvmc/tests/test_rendering.c b/src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c index 6d720dfcdc..6d720dfcdc 100644 --- a/src/xvmc/tests/test_rendering.c +++ b/src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c diff --git a/src/xvmc/tests/test_surface.c b/src/gallium/state_trackers/xorg/xvmc/tests/test_surface.c index 06948201ac..06948201ac 100644 --- a/src/xvmc/tests/test_surface.c +++ b/src/gallium/state_trackers/xorg/xvmc/tests/test_surface.c diff --git a/src/xvmc/tests/testlib.c b/src/gallium/state_trackers/xorg/xvmc/tests/testlib.c index 59a03ca813..59a03ca813 100644 --- a/src/xvmc/tests/testlib.c +++ b/src/gallium/state_trackers/xorg/xvmc/tests/testlib.c diff --git a/src/xvmc/tests/testlib.h b/src/gallium/state_trackers/xorg/xvmc/tests/testlib.h index af71ad74e1..af71ad74e1 100644 --- a/src/xvmc/tests/testlib.h +++ b/src/gallium/state_trackers/xorg/xvmc/tests/testlib.h diff --git a/src/xvmc/tests/xvmc_bench.c b/src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c index 97adcfc58a..97adcfc58a 100644 --- a/src/xvmc/tests/xvmc_bench.c +++ b/src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c diff --git a/src/xvmc/xvmc_private.h b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h index 1e3dd561c6..1e3dd561c6 100644 --- a/src/xvmc/xvmc_private.h +++ b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h diff --git a/src/gallium/winsys/g3dvl/xlib/Makefile b/src/gallium/winsys/g3dvl/xlib/Makefile index d4cbf0e2bb..cf765ef51a 100644 --- a/src/gallium/winsys/g3dvl/xlib/Makefile +++ b/src/gallium/winsys/g3dvl/xlib/Makefile @@ -20,9 +20,9 @@ DEFINES += -DGALLIUM_SOFTPIPE \ SOURCES = xsp_winsys.c -# XXX: Hack, if we include libXvMCapi.a in LIBS none of the symbols are +# XXX: Hack, if we include libxvmctracker.a in LIBS none of the symbols are # pulled in by the linker because xsp_winsys.c doesn't refer to them -OBJECTS = $(SOURCES:.c=.o) $(TOP)/src/xvmc/*.o +OBJECTS = $(SOURCES:.c=.o) $(TOP)/src/gallium/state_trackers/xorg/xvmc/*.o LIBS = $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ $(TOP)/src/gallium/auxiliary/vl/libvl.a \ diff --git a/src/xvmc/Makefile b/src/xvmc/Makefile deleted file mode 100644 index e7636e65c6..0000000000 --- a/src/xvmc/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -TOP = ../.. -include $(TOP)/configs/current - -#DEFINES += -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" - -SOURCES = block.c \ - surface.c \ - context.c \ - subpicture.c \ - attributes.c - -OBJECTS = $(SOURCES:.c=.o) - -INCLUDES = -I$(TOP)/src/gallium/include \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/src/gallium/winsys/g3dvl - -##### RULES ##### - -.c.o: - $(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@ - -.S.o: - $(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@ - -##### TARGETS ##### - -.PHONY: default clean - -default: depend libXvMCapi.a - -libXvMCapi.a: $(OBJECTS) Makefile - $(MKLIB) -o XvMCapi $(MKLIB_OPTIONS) -static $(OBJECTS) - -depend: $(SOURCES) Makefile - $(RM) depend - touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(SOURCES) - -clean: Makefile - $(RM) libXvMCapi.a - $(RM) *.o *~ - $(RM) depend depend.bak - --include depend diff --git a/src/xvmc/SConscript b/src/xvmc/SConscript deleted file mode 100644 index 53e04183e4..0000000000 --- a/src/xvmc/SConscript +++ /dev/null @@ -1,21 +0,0 @@ -Import('*') - -if env['platform'] not in ['linux']: - Return() - -env = env.Clone() - -env.AppendUnique(CPPPATH = [ - '#/src/gallium/winsys/g3dvl', -]) - -XvMCapi = env.StaticLibrary( - target = 'XvMCapi', - source = [ - 'block.c', - 'surface.c', - 'context.c', - 'subpicture.c', - 'attributes.c', - ], -) |