Am 03.04.2013 02:17, schrieb Matt Turner:
On Tue, Apr 2, 2013 at 4:19 PM, Christian König <deathsim...@vodafone.de> wrote:
diff --git a/configure.ac b/configure.ac
index 81d4a3f..93ec1d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1814,6 +1814,7 @@ if test "x$with_gallium_drivers" != x; then
if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes;
then
radeon_llvm_check
NEED_RADEON_GALLIUM=yes;
+ NEED_RUVD_GALLIUM=yes;
R600_NEED_RADEON_GALLIUM=yes;
LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo bitreader asmparser"
fi
@@ -1832,6 +1833,7 @@ if test "x$with_gallium_drivers" != x; then
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi"
radeon_llvm_check
NEED_RADEON_GALLIUM=yes;
+ NEED_RUVD_GALLIUM=yes;
gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi" "" ""
"vdpau-radeonsi" ""
;;
xnouveau)
@@ -1987,6 +1989,7 @@ AM_CONDITIONAL(HAVE_GALAHAD_GALLIUM, test
x$HAVE_GALAHAD_GALLIUM = xyes)
AM_CONDITIONAL(HAVE_IDENTITY_GALLIUM, test x$HAVE_IDENTITY_GALLIUM = xyes)
AM_CONDITIONAL(HAVE_NOOP_GALLIUM, test x$HAVE_NOOP_GALLIUM = xyes)
AM_CONDITIONAL(NEED_RADEON_GALLIUM, test x$NEED_RADEON_GALLIUM = xyes)
+AM_CONDITIONAL(NEED_RUVD_GALLIUM, test x$NEED_RUVD_GALLIUM = xyes)
AM_CONDITIONAL(R600_NEED_RADEON_GALLIUM, test x$R600_NEED_RADEON_GALLIUM =
xyes)
AM_CONDITIONAL(USE_R600_LLVM_COMPILER, test x$USE_R600_LLVM_COMPILER = xyes)
AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes)
@@ -2062,6 +2065,7 @@ AC_CONFIG_FILES([Makefile
src/gallium/drivers/softpipe/Makefile
src/gallium/drivers/svga/Makefile
src/gallium/drivers/trace/Makefile
+ src/gallium/drivers/ruvd/Makefile
Keep this list in alphabetical order please.
src/gallium/state_trackers/Makefile
src/gallium/state_trackers/clover/Makefile
src/gallium/state_trackers/dri/Makefile
diff --git a/docs/README.UVD b/docs/README.UVD
new file mode 100644
index 0000000..36b467e
--- /dev/null
+++ b/docs/README.UVD
@@ -0,0 +1,13 @@
+The software may implement third party technologies (e.g. third party
+libraries) that are not licensed to you by AMD and for which you may need
+to obtain licenses from other parties. Unless explicitly stated otherwise,
+these third party technologies are not licensed hereunder. Such third
+party technologies include, but are not limited, to H.264, MPEG-2, MPEG-4,
+AVC, and VC-1.
+
+For MPEG-2 Encoding Products ANY USE OF THIS PRODUCT IN ANY MANNER OTHER
+THAN PERSONAL USE THAT COMPLIES WITH THE MPEG-2 STANDARD FOR ENCODING VIDEO
+INFORMATION FOR PACKAGED MEDIA IS EXPRESSLY PROHIBITED WITHOUT A LICENSE
+UNDER APPLICABLE PATENTS IN THE MPEG-2 PATENT PORTFOLIO, WHICH LICENSES IS
+AVAILABLE FROM MPEG LA, LLC, 6312 S. Fiddlers Green Circle, Suite 400E,
+Greenwood Village, Colorado 80111 U.S.A.
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index 3477fee..b78a3e0 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -64,4 +64,12 @@ endif
################################################################################
+if NEED_RADEON_GALLIUM
Supposed to be NEED_RUVD_GALLIUM?
+
+SUBDIRS += ruvd
+
+endif
+
+################################################################################
+
SUBDIRS += $(GALLIUM_MAKE_DIRS)
diff --git a/src/gallium/drivers/ruvd/Makefile.am
b/src/gallium/drivers/ruvd/Makefile.am
new file mode 100644
index 0000000..1d183e7
--- /dev/null
+++ b/src/gallium/drivers/ruvd/Makefile.am
@@ -0,0 +1,16 @@
+include Makefile.sources
+
+noinst_LTLIBRARIES = libruvd.la
+
+AM_CFLAGS = \
+ -I$(top_srcdir)/src/gallium/include \
+ -I$(top_srcdir)/src/gallium/auxiliary \
+ -I$(top_srcdir)/src/gallium/drivers \
+ -I$(top_srcdir)/include \
+ $(RADEON_CFLAGS) \
+ $(DEFINES) \
+ $(PIC_FLAGS) \
No more PIC_FLAGS.
Congratulations. I bet this has been a really long process for you guys.
Yeah it was and thanks for the review. If nobody minds I'm moving that
code to the radeon subdirectory, but still keep it as a separate lib.
It's just that I wrote it quite some time ago, and at this point it
wasn't clear what we want to do with the radeon subdir.
Christian.
Matt
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
