OSDN -- 开发和下载开源软件
简体中文翻译状态 translation status for zh
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

提交

标签
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

hardware/intel/common/libva


Commit MetaInfo

修订版a64b7562c03f93256e488512092ae31a93d031c9 (tree)
时间2009-07-02 18:51:41
作者Austin Yuan <shengquan.yuan@inte...>
CommiterAustin Yuan

Log Message

Refine the directory, move src/X11 to dri/

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

更改概述

  • add: .gitignore (diff)
  • modified: Makefile.am (diff)
  • modified: configure.ac (diff)
  • modified: i965_drv_video/Makefile.am (diff)
  • delete: i965_drv_video/i965_drv_video.la
  • delete: i965_drv_video/shaders/render/Makefile
  • delete: i965_drv_video/shaders/render/Makefile.in
  • modified: src/Makefile.am (diff)
  • delete: {src => dri}/dri1_util.c
  • delete: {src => dri}/dri2_util.c
  • delete: {src => dri}/va_dricommon.c
  • delete: {src => dri}/va_dricommon.h
  • delete: {src/X11 => dri}/Makefile.am
  • delete: {src/X11 => dri}/va_dri.c
  • delete: {src/X11 => dri}/va_dri.h
  • delete: {src/X11 => dri}/va_dri2.c
  • delete: {src/X11 => dri}/va_dri2.h
  • delete: {src/X11 => dri}/va_dri2str.h
  • delete: {src/X11 => dri}/va_dri2tokens.h
  • delete: {src/X11 => dri}/va_dristr.h
  • delete: {src/X11 => dri}/va_x11.c
  • delete: {src/X11 => dri}/va_x11.h

差异

--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,29 @@
1+*~
2+*.o
3+*.lo
4+*.la
5+*.orig
6+*.rej
7+*.loT
8+*.bin
9+.deps
10+.libs
11+install-sh
12+libtool
13+ltmain.sh
14+missing
15+Makefile
16+Makefile.in
17+config.h
18+config.h.in
19+stamp-h1
20+aclocal.m4
21+autom4te.cache
22+config.guess
23+config.log
24+config.status
25+config.sub
26+configure
27+depcomp
28+fw/msvdx_bin
29+fw/msvdx_fw.bin
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
2121 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222
2323 AUTOMAKE_OPTIONS = foreign
24-SUBDIRS = src dummy_drv_video test i965_drv_video
24+SUBDIRS = dri src dummy_drv_video i965_drv_video test
2525
2626 pkgconfigdir = @pkgconfigdir@
2727 pkgconfig_DATA = libva.pc
--- a/configure.ac
+++ b/configure.ac
@@ -53,14 +53,14 @@ AC_SUBST(pkgconfigdir)
5353 AC_OUTPUT([
5454 Makefile
5555 src/Makefile
56- src/X11/Makefile
56+ dri/Makefile
5757 dummy_drv_video/Makefile
58- test/Makefile
5958 i965_drv_video/Makefile
6059 i965_drv_video/shaders/Makefile
6160 i965_drv_video/shaders/mpeg2/Makefile
6261 i965_drv_video/shaders/mpeg2/vld/Makefile
6362 i965_drv_video/shaders/render/Makefile
63+ test/Makefile
6464 libva.pc
6565 ])
6666
--- a/src/X11/Makefile.am
+++ b/dri/Makefile.am
@@ -20,10 +20,10 @@
2020
2121 AM_CFLAGS = -DLINUX -DIN_LIBVA -I$(top_srcdir)/src $(DRM_CFLAGS)
2222
23-noinst_LTLIBRARIES = libva_X11.la
23+noinst_LTLIBRARIES = libva_dri.la
2424
25-libva_X11includedir = ${includedir}/va
26-libva_X11include_HEADERS = va_x11.h va_dri.h va_dri2.h
25+libva_driincludedir = ${includedir}/src
26+libva_driinclude_HEADERS = va_x11.h va_dri.h va_dri2.h va_dricommon.h
2727
28-libva_X11_la_SOURCES = va_x11.c va_dri.c va_dri2.c
28+libva_dri_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c
2929 CFLAGS = -ansi -O2
--- a/src/dri2_util.c
+++ b/dri/dri2_util.c
@@ -10,6 +10,7 @@
1010 #include "va_backend.h"
1111
1212 #include "va_dri2.h"
13+#include "va_dri2tokens.h"
1314 #include "va_dricommon.h"
1415
1516 #define __DRI_BUFFER_FRONT_LEFT 0
@@ -85,7 +86,7 @@ dri2GetRenderingBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
8586 int i;
8687 int count;
8788 unsigned int attachments[5];
88- DRI2Buffer *buffers;
89+ VA_DRI2Buffer *buffers;
8990
9091 i = 0;
9192 attachments[i++] = __DRI_BUFFER_BACK_LEFT;
similarity index 100%
rename from src/X11/va_x11.h
rename to dri/va_x11.h
--- a/i965_drv_video/Makefile.am
+++ b/i965_drv_video/Makefile.am
@@ -22,7 +22,7 @@
2222
2323 SUBDIRS = shaders
2424
25-AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/common -I$(top_srcdir)/intel @DRM_CFLAGS@ -DIN_LIBVA
25+AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/dri @DRM_CFLAGS@ -DIN_LIBVA
2626
2727 i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
2828 i965_drv_video_ladir = $(libdir)/dri
--- a/i965_drv_video/i965_drv_video.la
+++ /dev/null
@@ -1,42 +0,0 @@
1-# i965_drv_video.la - a libtool library file
2-# Generated by ltmain.sh (GNU libtool) 2.2.2 Debian-2.2.2-1
3-#
4-# Please DO NOT delete this file!
5-# It is necessary for linking the library.
6-
7-# The name that we can dlopen(3).
8-dlname='i965_drv_video.so'
9-
10-# Names of this library.
11-library_names='i965_drv_video.so i965_drv_video.so i965_drv_video.so'
12-
13-# The name of the static archive.
14-old_library=''
15-
16-# Linker flags that can not go in dependency_libs.
17-inherited_linker_flags=''
18-
19-# Libraries that this one depends upon.
20-dependency_libs=' -L/opt/X11R7/lib /opt/X11R7/lib/libdrm_intel.la /opt/X11R7/lib/libdrm.la -lrt /home/znh/libva.old/src/libva.la -lX11 -lXext /opt/X11R7/lib/libXext.la /opt/X11R7/lib/libX11.la /opt/X11R7/lib/libXdmcp.la -ldl /opt/X11R7/lib/libXau.la -lpthread'
21-
22-# Names of additional weak libraries provided by this library
23-weak_library_names=''
24-
25-# Version information for i965_drv_video.
26-current=0
27-age=0
28-revision=0
29-
30-# Is this an already installed library?
31-installed=no
32-
33-# Should we warn about portability when linking against -modules?
34-shouldnotlink=yes
35-
36-# Files to dlopen/dlpreopen
37-dlopen=''
38-dlpreopen=''
39-
40-# Directory that this library needs to be installed in:
41-libdir='/opt/X11R7/lib/dri'
42-relink_command="(cd /home/znh/libva.old/i965_drv_video; /bin/sh /home/znh/libva.old/libtool --tag CC --mode=relink gcc -Wall -I../src -I../common -I../intel -I/opt/X11R7/include -I/opt/X11R7/include/drm -DIN_LIBVA -g -O2 -module -avoid-version -no-undefined -Wl,--no-undefined -L/opt/X11R7/lib -ldrm -ldrm_intel -o i965_drv_video.la -rpath /opt/X11R7/lib/dri object_heap.lo intel_batchbuffer.lo intel_memman.lo intel_driver.lo i965_media.lo i965_media_mpeg2.lo i965_render.lo i965_drv_video.lo ../src/libva.la -lpthread @inst_prefix_dir@)"
--- a/i965_drv_video/shaders/render/Makefile
+++ /dev/null
@@ -1,375 +0,0 @@
1-# Makefile.in generated by automake 1.10.1 from Makefile.am.
2-# i965_drv_video/shaders/render/Makefile. Generated from Makefile.in by configure.
3-
4-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6-# This Makefile.in is free software; the Free Software Foundation
7-# gives unlimited permission to copy and/or distribute it,
8-# with or without modifications, as long as this notice is preserved.
9-
10-# This program is distributed in the hope that it will be useful,
11-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13-# PARTICULAR PURPOSE.
14-
15-
16-
17-pkgdatadir = $(datadir)/libva
18-pkglibdir = $(libdir)/libva
19-pkgincludedir = $(includedir)/libva
20-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
21-install_sh_DATA = $(install_sh) -c -m 644
22-install_sh_PROGRAM = $(install_sh) -c
23-install_sh_SCRIPT = $(install_sh) -c
24-INSTALL_HEADER = $(INSTALL_DATA)
25-transform = $(program_transform_name)
26-NORMAL_INSTALL = :
27-PRE_INSTALL = :
28-POST_INSTALL = :
29-NORMAL_UNINSTALL = :
30-PRE_UNINSTALL = :
31-POST_UNINSTALL = :
32-build_triplet = x86_64-unknown-linux-gnu
33-host_triplet = x86_64-unknown-linux-gnu
34-subdir = i965_drv_video/shaders/render
35-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
36-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
37-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
38-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
39- $(ACLOCAL_M4)
40-mkinstalldirs = $(install_sh) -d
41-CONFIG_HEADER = $(top_builddir)/config.h
42-CONFIG_CLEAN_FILES =
43-SOURCES =
44-DIST_SOURCES =
45-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
46-ACLOCAL = aclocal -I /opt/X11R7/share/aclocal
47-AMTAR = ${SHELL} /home/znh/libva.old/missing --run tar
48-AR = ar
49-AUTOCONF = ${SHELL} /home/znh/libva.old/missing --run autoconf
50-AUTOHEADER = ${SHELL} /home/znh/libva.old/missing --run autoheader
51-AUTOMAKE = ${SHELL} /home/znh/libva.old/missing --run automake-1.10
52-AWK = mawk
53-CC = gcc
54-CCDEPMODE = depmode=gcc3
55-CFLAGS = -g -O2
56-CPP = gcc -E
57-CPPFLAGS =
58-CYGPATH_W = echo
59-DEFS = -DHAVE_CONFIG_H
60-DEPDIR = .deps
61-DRM_CFLAGS = -I/opt/X11R7/include -I/opt/X11R7/include/drm
62-DRM_LIBS = -L/opt/X11R7/lib -ldrm
63-DSYMUTIL =
64-DUMPBIN =
65-ECHO_C =
66-ECHO_N = -n
67-ECHO_T =
68-EGREP = /bin/grep -E
69-EXEEXT =
70-FGREP = /bin/grep -F
71-GREP = /bin/grep
72-INSTALL = /usr/bin/install -c
73-INSTALL_DATA = ${INSTALL} -m 644
74-INSTALL_PROGRAM = ${INSTALL}
75-INSTALL_SCRIPT = ${INSTALL}
76-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
77-LD = /usr/bin/ld -m elf_x86_64
78-LDFLAGS =
79-LIBDRM_DEPS_CFLAGS = -I/opt/X11R7/include -I/opt/X11R7/include/drm
80-LIBDRM_DEPS_LIBS = -L/opt/X11R7/lib -ldrm
81-LIBOBJS =
82-LIBS =
83-LIBTOOL = $(SHELL) $(top_builddir)/libtool
84-LIBVA_CFLAGS = -I/opt/X11R7/include -I/opt/X11R7/include/drm
85-LIBVA_LIBS =
86-LN_S = ln -s
87-LTLIBOBJS =
88-MAKEINFO = ${SHELL} /home/znh/libva.old/missing --run makeinfo
89-MKDIR_P = /bin/mkdir -p
90-NM = /usr/bin/nm -B
91-NMEDIT =
92-OBJEXT = o
93-PACKAGE = libva
94-PACKAGE_BUGREPORT = waldo.bastian@intel.com
95-PACKAGE_NAME = libva
96-PACKAGE_STRING = libva 0.30.4
97-PACKAGE_TARNAME = libva
98-PACKAGE_VERSION = 0.30.4
99-PATH_SEPARATOR = :
100-PKG_CONFIG = /usr/bin/pkg-config
101-RANLIB = ranlib
102-SED = /bin/sed
103-SET_MAKE =
104-SHELL = /bin/sh
105-STRIP = strip
106-VERSION = 0.30.4
107-X11_CFLAGS = -I/opt/X11R7/include
108-X11_LIBS = -L/opt/X11R7/lib -lX11
109-XEXT_CFLAGS = -I/opt/X11R7/include
110-XEXT_LIBS = -L/opt/X11R7/lib -lXext
111-abs_builddir = /home/znh/libva.old/i965_drv_video/shaders/render
112-abs_srcdir = /home/znh/libva.old/i965_drv_video/shaders/render
113-abs_top_builddir = /home/znh/libva.old
114-abs_top_srcdir = /home/znh/libva.old
115-ac_ct_CC = gcc
116-ac_ct_DUMPBIN =
117-am__include = include
118-am__leading_dot = .
119-am__quote =
120-am__tar = ${AMTAR} chof - "$$tardir"
121-am__untar = ${AMTAR} xf -
122-bindir = ${exec_prefix}/bin
123-build = x86_64-unknown-linux-gnu
124-build_alias =
125-build_cpu = x86_64
126-build_os = linux-gnu
127-build_vendor = unknown
128-builddir = .
129-datadir = ${datarootdir}
130-datarootdir = ${prefix}/share
131-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
132-dvidir = ${docdir}
133-exec_prefix = ${prefix}
134-gen4asm = yes
135-host = x86_64-unknown-linux-gnu
136-host_alias =
137-host_cpu = x86_64
138-host_os = linux-gnu
139-host_vendor = unknown
140-htmldir = ${docdir}
141-includedir = ${prefix}/include
142-infodir = ${datarootdir}/info
143-install_sh = $(SHELL) /home/znh/libva.old/install-sh
144-libdir = ${exec_prefix}/lib
145-libexecdir = ${exec_prefix}/libexec
146-localedir = ${datarootdir}/locale
147-localstatedir = ${prefix}/var
148-lt_ECHO = echo
149-mandir = ${datarootdir}/man
150-mkdir_p = /bin/mkdir -p
151-oldincludedir = /usr/include
152-pdfdir = ${docdir}
153-pkgconfigdir = ${exec_prefix}/lib/pkgconfig
154-prefix = /opt/X11R7
155-program_transform_name = s,x,x,
156-psdir = ${docdir}
157-sbindir = ${exec_prefix}/sbin
158-sharedstatedir = ${prefix}/com
159-srcdir = .
160-sysconfdir = ${prefix}/etc
161-target_alias =
162-top_build_prefix = ../../../
163-top_builddir = ../../..
164-top_srcdir = ../../..
165-INTEL_G4I = \
166- exa_wm.g4i \
167- exa_wm_affine.g4i
168-
169-INTEL_G4A = \
170- exa_sf.g4a \
171- exa_wm_xy.g4a \
172- exa_wm_src_affine.g4a \
173- exa_wm_src_sample_planar.g4a \
174- exa_wm_yuv_rgb.g4a \
175- exa_wm_blend_subpicture.g4a \
176- exa_wm_write.g4a
177-
178-INTEL_G4B = \
179- exa_sf.g4b \
180- exa_wm_xy.g4b \
181- exa_wm_src_affine.g4b \
182- exa_wm_src_sample_planar.g4b \
183- exa_wm_yuv_rgb.g4b \
184- exa_wm_blend_subpicture.g4b \
185- exa_wm_write.g4b
186-
187-EXTRA_DIST = $(INTEL_G4I) \
188- $(INTEL_G4A) \
189- $(INTEL_G4B)
190-
191-SUFFIXES = .g4a .g4b
192-BUILT_SOURCES = $(INTEL_G4B)
193-all: $(BUILT_SOURCES)
194- $(MAKE) $(AM_MAKEFLAGS) all-am
195-
196-.SUFFIXES:
197-.SUFFIXES: .g4a .g4b
198-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
199- @for dep in $?; do \
200- case '$(am__configure_deps)' in \
201- *$$dep*) \
202- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
203- && exit 0; \
204- exit 1;; \
205- esac; \
206- done; \
207- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu i965_drv_video/shaders/render/Makefile'; \
208- cd $(top_srcdir) && \
209- $(AUTOMAKE) --gnu i965_drv_video/shaders/render/Makefile
210-.PRECIOUS: Makefile
211-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
212- @case '$?' in \
213- *config.status*) \
214- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
215- *) \
216- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
217- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
218- esac;
219-
220-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
221- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
222-
223-$(top_srcdir)/configure: $(am__configure_deps)
224- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
225-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
226- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
227-
228-mostlyclean-libtool:
229- -rm -f *.lo
230-
231-clean-libtool:
232- -rm -rf .libs _libs
233-tags: TAGS
234-TAGS:
235-
236-ctags: CTAGS
237-CTAGS:
238-
239-
240-distdir: $(DISTFILES)
241- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
242- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
243- list='$(DISTFILES)'; \
244- dist_files=`for file in $$list; do echo $$file; done | \
245- sed -e "s|^$$srcdirstrip/||;t" \
246- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
247- case $$dist_files in \
248- */*) $(MKDIR_P) `echo "$$dist_files" | \
249- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
250- sort -u` ;; \
251- esac; \
252- for file in $$dist_files; do \
253- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
254- if test -d $$d/$$file; then \
255- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
256- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
257- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
258- fi; \
259- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
260- else \
261- test -f $(distdir)/$$file \
262- || cp -p $$d/$$file $(distdir)/$$file \
263- || exit 1; \
264- fi; \
265- done
266-check-am: all-am
267-check: $(BUILT_SOURCES)
268- $(MAKE) $(AM_MAKEFLAGS) check-am
269-all-am: Makefile
270-installdirs:
271-install: $(BUILT_SOURCES)
272- $(MAKE) $(AM_MAKEFLAGS) install-am
273-install-exec: install-exec-am
274-install-data: install-data-am
275-uninstall: uninstall-am
276-
277-install-am: all-am
278- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
279-
280-installcheck: installcheck-am
281-install-strip:
282- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
283- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
284- `test -z '$(STRIP)' || \
285- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
286-mostlyclean-generic:
287-
288-clean-generic:
289-
290-distclean-generic:
291- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
292-
293-maintainer-clean-generic:
294- @echo "This command is intended for maintainers to use"
295- @echo "it deletes files that may require special tools to rebuild."
296- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
297-#clean-local:
298-clean: clean-am
299-
300-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
301-
302-distclean: distclean-am
303- -rm -f Makefile
304-distclean-am: clean-am distclean-generic
305-
306-dvi: dvi-am
307-
308-dvi-am:
309-
310-html: html-am
311-
312-info: info-am
313-
314-info-am:
315-
316-install-data-am:
317-
318-install-dvi: install-dvi-am
319-
320-install-exec-am:
321-
322-install-html: install-html-am
323-
324-install-info: install-info-am
325-
326-install-man:
327-
328-install-pdf: install-pdf-am
329-
330-install-ps: install-ps-am
331-
332-installcheck-am:
333-
334-maintainer-clean: maintainer-clean-am
335- -rm -f Makefile
336-maintainer-clean-am: distclean-am maintainer-clean-generic
337-
338-mostlyclean: mostlyclean-am
339-
340-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
341-
342-pdf: pdf-am
343-
344-pdf-am:
345-
346-ps: ps-am
347-
348-ps-am:
349-
350-uninstall-am:
351-
352-.MAKE: install-am install-strip
353-
354-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
355- clean-local distclean distclean-generic distclean-libtool \
356- distdir dvi dvi-am html html-am info info-am install \
357- install-am install-data install-data-am install-dvi \
358- install-dvi-am install-exec install-exec-am install-html \
359- install-html-am install-info install-info-am install-man \
360- install-pdf install-pdf-am install-ps install-ps-am \
361- install-strip installcheck installcheck-am installdirs \
362- maintainer-clean maintainer-clean-generic mostlyclean \
363- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
364- uninstall uninstall-am
365-
366-.g4a.g4b:
367- m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
368-
369-$(INTEL_G4B): $(INTEL_G4I)
370-
371-clean-local:
372- -rm -f $(INTEL_G4B)
373-# Tell versions [3.59,3.63) of GNU make to not export all variables.
374-# Otherwise a system limit (for SysV at least) may be exceeded.
375-.NOEXPORT:
--- a/i965_drv_video/shaders/render/Makefile.in
+++ /dev/null
@@ -1,375 +0,0 @@
1-# Makefile.in generated by automake 1.10.1 from Makefile.am.
2-# @configure_input@
3-
4-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6-# This Makefile.in is free software; the Free Software Foundation
7-# gives unlimited permission to copy and/or distribute it,
8-# with or without modifications, as long as this notice is preserved.
9-
10-# This program is distributed in the hope that it will be useful,
11-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13-# PARTICULAR PURPOSE.
14-
15-@SET_MAKE@
16-VPATH = @srcdir@
17-pkgdatadir = $(datadir)/@PACKAGE@
18-pkglibdir = $(libdir)/@PACKAGE@
19-pkgincludedir = $(includedir)/@PACKAGE@
20-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
21-install_sh_DATA = $(install_sh) -c -m 644
22-install_sh_PROGRAM = $(install_sh) -c
23-install_sh_SCRIPT = $(install_sh) -c
24-INSTALL_HEADER = $(INSTALL_DATA)
25-transform = $(program_transform_name)
26-NORMAL_INSTALL = :
27-PRE_INSTALL = :
28-POST_INSTALL = :
29-NORMAL_UNINSTALL = :
30-PRE_UNINSTALL = :
31-POST_UNINSTALL = :
32-build_triplet = @build@
33-host_triplet = @host@
34-subdir = i965_drv_video/shaders/render
35-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
36-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
37-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
38-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
39- $(ACLOCAL_M4)
40-mkinstalldirs = $(install_sh) -d
41-CONFIG_HEADER = $(top_builddir)/config.h
42-CONFIG_CLEAN_FILES =
43-SOURCES =
44-DIST_SOURCES =
45-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
46-ACLOCAL = @ACLOCAL@
47-AMTAR = @AMTAR@
48-AR = @AR@
49-AUTOCONF = @AUTOCONF@
50-AUTOHEADER = @AUTOHEADER@
51-AUTOMAKE = @AUTOMAKE@
52-AWK = @AWK@
53-CC = @CC@
54-CCDEPMODE = @CCDEPMODE@
55-CFLAGS = @CFLAGS@
56-CPP = @CPP@
57-CPPFLAGS = @CPPFLAGS@
58-CYGPATH_W = @CYGPATH_W@
59-DEFS = @DEFS@
60-DEPDIR = @DEPDIR@
61-DRM_CFLAGS = @DRM_CFLAGS@
62-DRM_LIBS = @DRM_LIBS@
63-DSYMUTIL = @DSYMUTIL@
64-DUMPBIN = @DUMPBIN@
65-ECHO_C = @ECHO_C@
66-ECHO_N = @ECHO_N@
67-ECHO_T = @ECHO_T@
68-EGREP = @EGREP@
69-EXEEXT = @EXEEXT@
70-FGREP = @FGREP@
71-GREP = @GREP@
72-INSTALL = @INSTALL@
73-INSTALL_DATA = @INSTALL_DATA@
74-INSTALL_PROGRAM = @INSTALL_PROGRAM@
75-INSTALL_SCRIPT = @INSTALL_SCRIPT@
76-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
77-LD = @LD@
78-LDFLAGS = @LDFLAGS@
79-LIBDRM_DEPS_CFLAGS = @LIBDRM_DEPS_CFLAGS@
80-LIBDRM_DEPS_LIBS = @LIBDRM_DEPS_LIBS@
81-LIBOBJS = @LIBOBJS@
82-LIBS = @LIBS@
83-LIBTOOL = @LIBTOOL@
84-LIBVA_CFLAGS = @LIBVA_CFLAGS@
85-LIBVA_LIBS = @LIBVA_LIBS@
86-LN_S = @LN_S@
87-LTLIBOBJS = @LTLIBOBJS@
88-MAKEINFO = @MAKEINFO@
89-MKDIR_P = @MKDIR_P@
90-NM = @NM@
91-NMEDIT = @NMEDIT@
92-OBJEXT = @OBJEXT@
93-PACKAGE = @PACKAGE@
94-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
95-PACKAGE_NAME = @PACKAGE_NAME@
96-PACKAGE_STRING = @PACKAGE_STRING@
97-PACKAGE_TARNAME = @PACKAGE_TARNAME@
98-PACKAGE_VERSION = @PACKAGE_VERSION@
99-PATH_SEPARATOR = @PATH_SEPARATOR@
100-PKG_CONFIG = @PKG_CONFIG@
101-RANLIB = @RANLIB@
102-SED = @SED@
103-SET_MAKE = @SET_MAKE@
104-SHELL = @SHELL@
105-STRIP = @STRIP@
106-VERSION = @VERSION@
107-X11_CFLAGS = @X11_CFLAGS@
108-X11_LIBS = @X11_LIBS@
109-XEXT_CFLAGS = @XEXT_CFLAGS@
110-XEXT_LIBS = @XEXT_LIBS@
111-abs_builddir = @abs_builddir@
112-abs_srcdir = @abs_srcdir@
113-abs_top_builddir = @abs_top_builddir@
114-abs_top_srcdir = @abs_top_srcdir@
115-ac_ct_CC = @ac_ct_CC@
116-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
117-am__include = @am__include@
118-am__leading_dot = @am__leading_dot@
119-am__quote = @am__quote@
120-am__tar = @am__tar@
121-am__untar = @am__untar@
122-bindir = @bindir@
123-build = @build@
124-build_alias = @build_alias@
125-build_cpu = @build_cpu@
126-build_os = @build_os@
127-build_vendor = @build_vendor@
128-builddir = @builddir@
129-datadir = @datadir@
130-datarootdir = @datarootdir@
131-docdir = @docdir@
132-dvidir = @dvidir@
133-exec_prefix = @exec_prefix@
134-gen4asm = @gen4asm@
135-host = @host@
136-host_alias = @host_alias@
137-host_cpu = @host_cpu@
138-host_os = @host_os@
139-host_vendor = @host_vendor@
140-htmldir = @htmldir@
141-includedir = @includedir@
142-infodir = @infodir@
143-install_sh = @install_sh@
144-libdir = @libdir@
145-libexecdir = @libexecdir@
146-localedir = @localedir@
147-localstatedir = @localstatedir@
148-lt_ECHO = @lt_ECHO@
149-mandir = @mandir@
150-mkdir_p = @mkdir_p@
151-oldincludedir = @oldincludedir@
152-pdfdir = @pdfdir@
153-pkgconfigdir = @pkgconfigdir@
154-prefix = @prefix@
155-program_transform_name = @program_transform_name@
156-psdir = @psdir@
157-sbindir = @sbindir@
158-sharedstatedir = @sharedstatedir@
159-srcdir = @srcdir@
160-sysconfdir = @sysconfdir@
161-target_alias = @target_alias@
162-top_build_prefix = @top_build_prefix@
163-top_builddir = @top_builddir@
164-top_srcdir = @top_srcdir@
165-INTEL_G4I = \
166- exa_wm.g4i \
167- exa_wm_affine.g4i
168-
169-INTEL_G4A = \
170- exa_sf.g4a \
171- exa_wm_xy.g4a \
172- exa_wm_src_affine.g4a \
173- exa_wm_src_sample_planar.g4a \
174- exa_wm_yuv_rgb.g4a \
175- exa_wm_blend_subpicture.g4a \
176- exa_wm_write.g4a
177-
178-INTEL_G4B = \
179- exa_sf.g4b \
180- exa_wm_xy.g4b \
181- exa_wm_src_affine.g4b \
182- exa_wm_src_sample_planar.g4b \
183- exa_wm_yuv_rgb.g4b \
184- exa_wm_blend_subpicture.g4b \
185- exa_wm_write.g4b
186-
187-EXTRA_DIST = $(INTEL_G4I) \
188- $(INTEL_G4A) \
189- $(INTEL_G4B)
190-
191-@HAVE_GEN4ASM_TRUE@SUFFIXES = .g4a .g4b
192-@HAVE_GEN4ASM_TRUE@BUILT_SOURCES = $(INTEL_G4B)
193-all: $(BUILT_SOURCES)
194- $(MAKE) $(AM_MAKEFLAGS) all-am
195-
196-.SUFFIXES:
197-.SUFFIXES: .g4a .g4b
198-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
199- @for dep in $?; do \
200- case '$(am__configure_deps)' in \
201- *$$dep*) \
202- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
203- && exit 0; \
204- exit 1;; \
205- esac; \
206- done; \
207- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu i965_drv_video/shaders/render/Makefile'; \
208- cd $(top_srcdir) && \
209- $(AUTOMAKE) --gnu i965_drv_video/shaders/render/Makefile
210-.PRECIOUS: Makefile
211-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
212- @case '$?' in \
213- *config.status*) \
214- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
215- *) \
216- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
217- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
218- esac;
219-
220-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
221- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
222-
223-$(top_srcdir)/configure: $(am__configure_deps)
224- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
225-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
226- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
227-
228-mostlyclean-libtool:
229- -rm -f *.lo
230-
231-clean-libtool:
232- -rm -rf .libs _libs
233-tags: TAGS
234-TAGS:
235-
236-ctags: CTAGS
237-CTAGS:
238-
239-
240-distdir: $(DISTFILES)
241- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
242- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
243- list='$(DISTFILES)'; \
244- dist_files=`for file in $$list; do echo $$file; done | \
245- sed -e "s|^$$srcdirstrip/||;t" \
246- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
247- case $$dist_files in \
248- */*) $(MKDIR_P) `echo "$$dist_files" | \
249- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
250- sort -u` ;; \
251- esac; \
252- for file in $$dist_files; do \
253- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
254- if test -d $$d/$$file; then \
255- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
256- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
257- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
258- fi; \
259- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
260- else \
261- test -f $(distdir)/$$file \
262- || cp -p $$d/$$file $(distdir)/$$file \
263- || exit 1; \
264- fi; \
265- done
266-check-am: all-am
267-check: $(BUILT_SOURCES)
268- $(MAKE) $(AM_MAKEFLAGS) check-am
269-all-am: Makefile
270-installdirs:
271-install: $(BUILT_SOURCES)
272- $(MAKE) $(AM_MAKEFLAGS) install-am
273-install-exec: install-exec-am
274-install-data: install-data-am
275-uninstall: uninstall-am
276-
277-install-am: all-am
278- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
279-
280-installcheck: installcheck-am
281-install-strip:
282- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
283- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
284- `test -z '$(STRIP)' || \
285- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
286-mostlyclean-generic:
287-
288-clean-generic:
289-
290-distclean-generic:
291- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
292-
293-maintainer-clean-generic:
294- @echo "This command is intended for maintainers to use"
295- @echo "it deletes files that may require special tools to rebuild."
296- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
297-@HAVE_GEN4ASM_FALSE@clean-local:
298-clean: clean-am
299-
300-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
301-
302-distclean: distclean-am
303- -rm -f Makefile
304-distclean-am: clean-am distclean-generic
305-
306-dvi: dvi-am
307-
308-dvi-am:
309-
310-html: html-am
311-
312-info: info-am
313-
314-info-am:
315-
316-install-data-am:
317-
318-install-dvi: install-dvi-am
319-
320-install-exec-am:
321-
322-install-html: install-html-am
323-
324-install-info: install-info-am
325-
326-install-man:
327-
328-install-pdf: install-pdf-am
329-
330-install-ps: install-ps-am
331-
332-installcheck-am:
333-
334-maintainer-clean: maintainer-clean-am
335- -rm -f Makefile
336-maintainer-clean-am: distclean-am maintainer-clean-generic
337-
338-mostlyclean: mostlyclean-am
339-
340-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
341-
342-pdf: pdf-am
343-
344-pdf-am:
345-
346-ps: ps-am
347-
348-ps-am:
349-
350-uninstall-am:
351-
352-.MAKE: install-am install-strip
353-
354-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
355- clean-local distclean distclean-generic distclean-libtool \
356- distdir dvi dvi-am html html-am info info-am install \
357- install-am install-data install-data-am install-dvi \
358- install-dvi-am install-exec install-exec-am install-html \
359- install-html-am install-info install-info-am install-man \
360- install-pdf install-pdf-am install-ps install-ps-am \
361- install-strip installcheck installcheck-am installdirs \
362- maintainer-clean maintainer-clean-generic mostlyclean \
363- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
364- uninstall uninstall-am
365-
366-@HAVE_GEN4ASM_TRUE@.g4a.g4b:
367-@HAVE_GEN4ASM_TRUE@ m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
368-
369-@HAVE_GEN4ASM_TRUE@$(INTEL_G4B): $(INTEL_G4I)
370-
371-@HAVE_GEN4ASM_TRUE@clean-local:
372-@HAVE_GEN4ASM_TRUE@ -rm -f $(INTEL_G4B)
373-# Tell versions [3.59,3.63) of GNU make to not export all variables.
374-# Otherwise a system limit (for SysV at least) may be exceeded.
375-.NOEXPORT:
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,13 +21,13 @@
2121 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222
2323 INCLUDES = \
24- $(LIBVA_CFLAGS) \
24+ $(LIBVA_CFLAGS) -I$(top_srcdir)/dri/ \
2525 -DIN_LIBVA
2626
2727 libva_la_LTLIBRARIES = libva.la
2828 libva_ladir = $(libdir)
2929 libva_la_LDFLAGS = -version-number 0:30:4 -no-undefined
30-libva_la_LIBADD = $(LIBVA_LIBS) -ldl -lX11 -lXext X11/libva_X11.la
30+libva_la_LIBADD = $(LIBVA_LIBS) -ldl -lX11 -lXext ../dri/libva_dri.la
3131 CFLAGS = -ansi -O2
3232
3333 nodist_libva_la_SOURCES = va_version.h
@@ -40,9 +40,7 @@ va_version.h: Makefile
4040 echo "#define VA_BUILD_GIT \"($(shell git log | head -n1 | cut -f2 -d' ')) \" " >> va_version.h
4141
4242
43-SUBDIRS = X11
44-
45-libva_la_SOURCES = va.c va_dricommon.c dri2_util.c dri1_util.c
43+libva_la_SOURCES = va.c
4644
4745 libvaincludedir = ${includedir}/va
48-libvainclude_HEADERS = va.h va_backend.h va_dricommon.h
46+libvainclude_HEADERS = va.h va_backend.h