[Mesa-dev] [PATCH 08/20] gallium/targets: drop link generation for non DRI targets

Wed Mar 5 04:02:20 PST 2014

On 05/03/14 07:55, Christian König wrote:
> Am 04.03.2014 22:12, schrieb Emil Velikov:
>> All three (xvmc, vdpau and omx) do not have an alternative loading
>> similar to the dri modules. Thus one needs to explicitly install
>> them in order to use/test them.
> 
> It's not mainline yet, but at least I'm using
> VDPAU_DRIVER_PATH=.../mesa/lib/gallium for quite a while now. So I would
> like to keep that.
> 
My initial plan was to keep the vdpau libs if the patch was merged in
the official repo. Either way, I did not know that it had any users but
me, so I guess we can keep those for a little longer :)

-Emil
> Christian.
> 
>>
>> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
>> ---
>>   src/gallium/targets/r600/omx/Makefile.am       | 6 ------
>>   src/gallium/targets/r600/vdpau/Makefile.am     | 6 ------
>>   src/gallium/targets/r600/xvmc/Makefile.am      | 6 ------
>>   src/gallium/targets/radeonsi/omx/Makefile.am   | 6 ------
>>   src/gallium/targets/radeonsi/vdpau/Makefile.am | 6 ------
>>   src/gallium/targets/vdpau-nouveau/Makefile.am  | 6 ------
>>   src/gallium/targets/xvmc-nouveau/Makefile.am   | 6 ------
>>   7 files changed, 42 deletions(-)
>>
>> diff --git a/src/gallium/targets/r600/omx/Makefile.am
>> b/src/gallium/targets/r600/omx/Makefile.am
>> index 3aef9e1..98b064f 100644
>> --- a/src/gallium/targets/r600/omx/Makefile.am
>> +++ b/src/gallium/targets/r600/omx/Makefile.am
>> @@ -70,9 +70,3 @@ libomx_r600_la_LINK = $(LINK) $(libomx_r600_la_LDFLAGS)
>>   # Mention a dummy pure C file to trigger generation of the $(LINK)
>> variable
>>   nodist_EXTRA_libomx_r600_la_SOURCES = dummy-c.c
>>   endif
>> -
>> -# Provide compatibility with scripts for the old Mesa build system for
>> -# a while by putting a link to the driver into /lib of the build tree.
>> -all-local: libomx_r600.la
>> -    $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
>> -    ln -f .libs/libomx_r600.so* $(top_builddir)/$(LIB_DIR)/gallium/
>> diff --git a/src/gallium/targets/r600/vdpau/Makefile.am
>> b/src/gallium/targets/r600/vdpau/Makefile.am
>> index 509b954..f4ecfcc 100644
>> --- a/src/gallium/targets/r600/vdpau/Makefile.am
>> +++ b/src/gallium/targets/r600/vdpau/Makefile.am
>> @@ -51,9 +51,3 @@ if HAVE_MESA_LLVM
>>   libvdpau_r600_la_LDFLAGS += $(LLVM_LDFLAGS)
>>   libvdpau_r600_la_LIBADD += $(LLVM_LIBS)
>>   endif
>> -
>> -# Provide compatibility with scripts for the old Mesa build system for
>> -# a while by putting a link to the driver into /lib of the build tree.
>> -all-local: libvdpau_r600.la
>> -    $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
>> -    ln -f .libs/libvdpau_r600.so* $(top_builddir)/$(LIB_DIR)/gallium/
>> diff --git a/src/gallium/targets/r600/xvmc/Makefile.am
>> b/src/gallium/targets/r600/xvmc/Makefile.am
>> index 7fe9b1a..6e71ffa 100644
>> --- a/src/gallium/targets/r600/xvmc/Makefile.am
>> +++ b/src/gallium/targets/r600/xvmc/Makefile.am
>> @@ -54,9 +54,3 @@ libXvMCr600_la_LINK = $(LINK) $(libXvMCr600_la_LDFLAGS)
>>   # Mention a dummy pure C file to trigger generation of the $(LINK)
>> variable
>>   nodist_EXTRA_libXvMCr600_la_SOURCES = dummy-c.c
>>   endif
>> -
>> -# Provide compatibility with scripts for the old Mesa build system for
>> -# a while by putting a link to the driver into /lib of the build tree.
>> -all-local: libXvMCr600.la
>> -    $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
>> -    ln -f .libs/libXvMCr600.so* $(top_builddir)/$(LIB_DIR)/gallium/
>> diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am
>> b/src/gallium/targets/radeonsi/omx/Makefile.am
>> index 0d47912..14e9dbb 100644
>> --- a/src/gallium/targets/radeonsi/omx/Makefile.am
>> +++ b/src/gallium/targets/radeonsi/omx/Makefile.am
>> @@ -65,9 +65,3 @@ nodist_EXTRA_libomx_radeonsi_la_SOURCES = dummy-cpp.cpp
>>   libomx_radeonsi_la_LDFLAGS += $(LLVM_LDFLAGS)
>>   libomx_radeonsi_la_LIBADD += $(LLVM_LIBS)
>>   endif
>> -
>> -# Provide compatibility with scripts for the old Mesa build system for
>> -# a while by putting a link to the driver into /lib of the build tree.
>> -all-local: libomx_radeonsi.la
>> -    $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
>> -    ln -f .libs/libomx_radeonsi.so* $(top_builddir)/$(LIB_DIR)/gallium/
>> diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am
>> b/src/gallium/targets/radeonsi/vdpau/Makefile.am
>> index 54d65b3..1d56bb3 100644
>> --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
>> +++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am
>> @@ -48,9 +48,3 @@ if HAVE_MESA_LLVM
>>   libvdpau_radeonsi_la_LDFLAGS += $(LLVM_LDFLAGS)
>>   libvdpau_radeonsi_la_LIBADD += $(LLVM_LIBS)
>>   endif
>> -
>> -# Provide compatibility with scripts for the old Mesa build system for
>> -# a while by putting a link to the driver into /lib of the build tree.
>> -all-local: libvdpau_radeonsi.la
>> -    $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
>> -    ln -f .libs/libvdpau_radeonsi.so*
>> $(top_builddir)/$(LIB_DIR)/gallium/
>> diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am
>> b/src/gallium/targets/vdpau-nouveau/Makefile.am
>> index 3cdf103..0066e02 100644
>> --- a/src/gallium/targets/vdpau-nouveau/Makefile.am
>> +++ b/src/gallium/targets/vdpau-nouveau/Makefile.am
>> @@ -48,9 +48,3 @@ if HAVE_MESA_LLVM
>>   libvdpau_nouveau_la_LDFLAGS += $(LLVM_LDFLAGS)
>>   libvdpau_nouveau_la_LIBADD += $(LLVM_LIBS)
>>   endif
>> -
>> -# Provide compatibility with scripts for the old Mesa build system for
>> -# a while by putting a link to the driver into /lib of the build tree.
>> -all-local: libvdpau_nouveau.la
>> -    $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
>> -    ln -f .libs/libvdpau_nouveau.so* $(top_builddir)/$(LIB_DIR)/gallium/
>> diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am
>> b/src/gallium/targets/xvmc-nouveau/Makefile.am
>> index 4a45f41..4abf81c 100644
>> --- a/src/gallium/targets/xvmc-nouveau/Makefile.am
>> +++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
>> @@ -47,9 +47,3 @@ if HAVE_MESA_LLVM
>>   libXvMCnouveau_la_LDFLAGS += $(LLVM_LDFLAGS)
>>   libXvMCnouveau_la_LIBADD += $(LLVM_LIBS)
>>   endif
>> -
>> -# Provide compatibility with scripts for the old Mesa build system for
>> -# a while by putting a link to the driver into /lib of the build tree.
>> -all-local: libXvMCnouveau.la
>> -    $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
>> -    ln -f .libs/libXvMCnouveau.so* $(top_builddir)/$(LIB_DIR)/gallium/
>