summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYounes Manton <younes.m@gmail.com>2009-09-28 01:54:20 (GMT)
committerYounes Manton <younes.m@gmail.com>2009-09-28 01:54:20 (GMT)
commit97c28bb63a4e1029eaf36d23b780f4d3396118a0 (patch)
treef6e0c325c5f40fd0da0c2ff94fbe2228aec47a85
parente44c85637a3298918e292e9ddba812856cf92924 (diff)
g3dvl: Move XvMC under the Xorg state tracker.
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/Makefile16
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/SConscript27
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/attributes.c (renamed from src/xvmc/attributes.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/block.c (renamed from src/xvmc/block.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/context.c (renamed from src/xvmc/context.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/subpicture.c (renamed from src/xvmc/subpicture.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/surface.c (renamed from src/xvmc/surface.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/tests/.gitignore (renamed from src/xvmc/tests/.gitignore)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/tests/Makefile (renamed from src/xvmc/tests/Makefile)2
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/tests/test_blocks.c (renamed from src/xvmc/tests/test_blocks.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/tests/test_context.c (renamed from src/xvmc/tests/test_context.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c (renamed from src/xvmc/tests/test_rendering.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/tests/test_surface.c (renamed from src/xvmc/tests/test_surface.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/tests/testlib.c (renamed from src/xvmc/tests/testlib.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/tests/testlib.h (renamed from src/xvmc/tests/testlib.h)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c (renamed from src/xvmc/tests/xvmc_bench.c)0
-rw-r--r--src/gallium/state_trackers/xorg/xvmc/xvmc_private.h (renamed from src/xvmc/xvmc_private.h)0
-rw-r--r--src/gallium/winsys/g3dvl/xlib/Makefile4
-rw-r--r--src/xvmc/Makefile45
-rw-r--r--src/xvmc/SConscript21
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 0000000..126dc6d
--- /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 0000000..cb25d68
--- /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 638da0b..638da0b 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 78fddfb..78fddfb 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 33f4783..33f4783 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 78ba618..78ba618 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 0467c4d..0467c4d 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 e1d2f90..e1d2f90 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 11b2e1a..c875dd7 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 dc80adf..dc80adf 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 53f7449..53f7449 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 6d720df..6d720df 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 0694820..0694820 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 59a03ca..59a03ca 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 af71ad7..af71ad7 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 97adcfc..97adcfc 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 1e3dd56..1e3dd56 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 d4cbf0e..cf765ef 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 e7636e6..0000000
--- 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 53e0418..0000000
--- 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',
- ],
-)