Hi Austin,Could you please apply the following? This just moves files around so that a future patch can also remove the ugly IN_LIBVA ifdefs completely.
I have attached a "script" to apply the procedure mentionned below + a patch that makes it build again. This applies against the libva.git tree from this morning.
Thanks, Gwenole. On Thu, 24 Sep 2009, Gwenole Beauchesne wrote:
Hi,I want to drop the -DIN_LIBVA and includes hacks but also want to further split the headers.Initial steps: - Move src/ to src/va/ - Move i965_drv_video and dummy_drv_video to src/ Procedure: mkdir src/va git add src/va git mv src/Makefile.am src/va/ git mv src/*.c src/*.h src/*.h.in src/va/ git mv src/x11 src/va/ git commit -m "Move files from src/ to src/va/ directory." git mv dummy_drv_video src/ git commit -m "Move dummy driver to src/" git mv i965_drv_video/ src/ git commit -m "Move i965 driver to src/" Then the patch in attachment fixes build for the new infrastructure Thanks, Gwenole.
libva.reorg.sh
Description: script
commit 805998493496212a3fcaa07bfb361821b1b86255 Author: gb <[email protected]> Date: Fri Mar 5 07:15:00 2010 +0100 Fix build system for new infrastructure. diff --git a/Makefile.am b/Makefile.am index 07385e6..1beee59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,12 +23,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src test -if BUILD_DUMMY_DRIVER -SUBDIRS += dummy_drv_video -endif -if BUILD_I965_DRIVER -SUBDIRS += i965_drv_video -endif pcfiles = libva.pc pcfiles += libva-x11.pc diff --git a/configure.ac b/configure.ac index 088415f..4e705b6 100644 --- a/configure.ac +++ b/configure.ac @@ -117,14 +117,15 @@ AC_SUBST([libvabackendlib]) AC_OUTPUT([ Makefile src/Makefile - src/va_version.h - src/x11/Makefile - dummy_drv_video/Makefile - i965_drv_video/Makefile - i965_drv_video/shaders/Makefile - i965_drv_video/shaders/mpeg2/Makefile - i965_drv_video/shaders/mpeg2/vld/Makefile - i965_drv_video/shaders/render/Makefile + src/va/Makefile + src/va/va_version.h + src/va/x11/Makefile + src/dummy_drv_video/Makefile + src/i965_drv_video/Makefile + src/i965_drv_video/shaders/Makefile + src/i965_drv_video/shaders/mpeg2/Makefile + src/i965_drv_video/shaders/mpeg2/vld/Makefile + src/i965_drv_video/shaders/render/Makefile test/Makefile test/basic/Makefile test/decode/Makefile diff --git a/src/dummy_drv_video/Makefile.am b/src/dummy_drv_video/Makefile.am index 4e75a7b..24bf998 100644 --- a/src/dummy_drv_video/Makefile.am +++ b/src/dummy_drv_video/Makefile.am @@ -23,10 +23,10 @@ dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la dummy_drv_video_ladir = @LIBVA_DRIVERS_PATH@ dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined -dummy_drv_video_la_LIBADD = $(top_srcdir)/src/$(libvabackendlib) -dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) +dummy_drv_video_la_LIBADD = $(top_srcdir)/src/va/$(libvabackendlib) +dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/src/va/$(libvabackendlib) -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c noinst_HEADERS = dummy_drv_video.h object_heap.h diff --git a/src/i965_drv_video/Makefile.am b/src/i965_drv_video/Makefile.am index 42dd515..d9baf58 100644 --- a/src/i965_drv_video/Makefile.am +++ b/src/i965_drv_video/Makefile.am @@ -22,12 +22,12 @@ SUBDIRS = shaders -AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 @DRM_CFLAGS@ -DIN_LIBVA +AM_CFLAGS = -Wall -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 @DRM_CFLAGS@ -DIN_LIBVA i965_drv_video_la_LTLIBRARIES = i965_drv_video.la i965_drv_video_ladir = @LIBVA_DRIVERS_PATH@ i965_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined @DRM_LIBS@ -ldrm_intel -i965_drv_video_la_LIBADD = ../src/libva-x11.la -lpthread +i965_drv_video_la_LIBADD = $(top_srcdir)/src/va/libva-x11.la -lpthread i965_drv_video_la_SOURCES = \ object_heap.c \ diff --git a/src/va/Makefile.am b/src/va/Makefile.am index 2f4210a..3741250 100644 --- a/src/va/Makefile.am +++ b/src/va/Makefile.am @@ -21,7 +21,7 @@ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. INCLUDES = \ - $(LIBVA_CFLAGS) -I$(top_srcdir)/src/x11 \ + $(LIBVA_CFLAGS) -I$(top_srcdir)/src/va/x11 \ -DIN_LIBVA \ -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\"" diff --git a/src/va/x11/Makefile.am b/src/va/x11/Makefile.am index c70380d..f612205 100644 --- a/src/va/x11/Makefile.am +++ b/src/va/x11/Makefile.am @@ -18,7 +18,7 @@ # otherwise. Any license under such intellectual property rights must be # express and approved by Intel in writing. -AM_CFLAGS = -DLINUX -DIN_LIBVA -I$(top_srcdir)/src $(DRM_CFLAGS) +AM_CFLAGS = -DLINUX -DIN_LIBVA -I$(top_srcdir)/src/va $(DRM_CFLAGS) noinst_LTLIBRARIES = libva_x11.la diff --git a/test/Makefile.am b/test/Makefile.am index 5734226..29ff5d2 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -23,11 +23,11 @@ bin_PROGRAMS = vainfo -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/va/x11 -DIN_LIBVA -vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib) -vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) +vainfo_LDADD = $(top_srcdir)/src/va/$(libvabackendlib) +vainfo_DEPENDENCIES = $(top_srcdir)/src/va/$(libvabackendlib) vainfo_SOURCES = vainfo.c SUBDIRS = basic decode encode putsurface diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am index 24de161..ca4bd48 100644 --- a/test/basic/Makefile.am +++ b/test/basic/Makefile.am @@ -23,9 +23,9 @@ bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ test_07 test_08 test_09 test_10 test_11 -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 -DIN_LIBVA -TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) +TEST_LIBS = $(top_srcdir)/src/va/$(libvabackendlib) test_01_LDADD = $(TEST_LIBS) test_01_SOURCES = test_01.c diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am index 9283671..41500a9 100644 --- a/test/decode/Makefile.am +++ b/test/decode/Makefile.am @@ -22,9 +22,9 @@ bin_PROGRAMS = mpeg2vldemo -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 -DIN_LIBVA -TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) +TEST_LIBS = $(top_srcdir)/src/va/$(libvabackendlib) mpeg2vldemo_LDADD = $(TEST_LIBS) mpeg2vldemo_SOURCES = mpeg2vldemo.c diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am index 6d2d5a9..31f9ce0 100644 --- a/test/encode/Makefile.am +++ b/test/encode/Makefile.am @@ -22,9 +22,9 @@ bin_PROGRAMS = h264encode -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 -DIN_LIBVA -TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) +TEST_LIBS = $(top_srcdir)/src/va/$(libvabackendlib) h264encode_LDADD = $(TEST_LIBS) h264encode_SOURCES = h264encode.c diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am index b0e20ba..af9ceae 100644 --- a/test/putsurface/Makefile.am +++ b/test/putsurface/Makefile.am @@ -22,9 +22,9 @@ bin_PROGRAMS = putsurface -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 -DIN_LIBVA -TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) -lpthread +TEST_LIBS = $(top_srcdir)/src/va/$(libvabackendlib) -lpthread putsurface_LDADD = $(TEST_LIBS) putsurface_SOURCES = putsurface.c
_______________________________________________ Libva mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libva
