From 2442d3553fc06595c8c324bd50628da54e269364 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 23 Jun 2014 18:30:00 +0100 Subject: [PATCH] targets/(vdpau|xvmc): hardlink against the installed library With commit 11e46a32aed and f9ebb1ea771 we resolved the symlink generation required by the versioning of the library. Although they incorrectly changed the way hardlinks are created by linking to the ones from the build tree. If the device used for building differs from the one set as destination linking will fail. Reported-by: Andy Furniss Tested-by: Andy Furniss Signed-off-by: Emil Velikov --- src/gallium/targets/vdpau/Makefile.am | 4 ++-- src/gallium/targets/xvmc/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index 9920bd9b4e1..2059274b049 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -131,7 +131,7 @@ install-data-hook: j=libvdpau_gallium.$(LIB_EXT); \ k=libvdpau_$${i}.$(LIB_EXT); \ l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \ - ln -f .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ + ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ $${dest_dir}/$${l}; \ ln -sf $${l} \ $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \ @@ -140,4 +140,4 @@ install-data-hook: ln -sf $${l} \ $${dest_dir}/$${k}; \ done; \ - $(RM) -f $$dest_dir/libvdpau_gallium.* + $(RM) -f $${dest_dir}/libvdpau_gallium.* diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 6e81e085cb6..bf986f47f48 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -88,7 +88,7 @@ install-data-hook: j=libXvMCgallium.$(LIB_EXT); \ k=libXvMC$${i}.$(LIB_EXT); \ l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \ - ln -f .libs/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ + ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ $${dest_dir}/$${l}; \ ln -sf $${l} \ $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \ -- 2.30.2