From 0cf94e0d8c9dba437ea760a33ca5aa030195fffd4343592503798488d0ea33eb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 20 Jan 2016 16:01:53 +0000 Subject: [PATCH] - n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch * Since these are packaged separately in (open)SUSE anyway, one can use copies as well. This makes debug packages possible again. (bnc #962609) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=497 --- Mesa.changes | 8 +++ Mesa.spec | 3 ++ ...C-libs-Replace-hardlinks-with-copies.patch | 52 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch diff --git a/Mesa.changes b/Mesa.changes index 2af5332..03f0690 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 20 15:16:11 UTC 2016 - sndirsch@suse.com + +- n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch + * Since these are packaged separately in (open)SUSE anyway, one + can use copies as well. This makes debug packages possible + again. (bnc #962609) + ------------------------------------------------------------------- Wed Jan 13 23:14:33 UTC 2016 - mimi.vx@gmail.com diff --git a/Mesa.spec b/Mesa.spec index 92ba8a7..883c3c1 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -65,6 +65,8 @@ Patch13: u_mesa-8.0.1-fix-16bpp.patch Patch15: u_mesa-8.0-llvmpipe-shmget.patch # to be upstreamed Patch17: u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch +# never to be upstreamed +Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: bison @@ -555,6 +557,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} #%patch15 -p1 #%patch13 -p1 %patch17 -p1 +%patch18 -p1 %build %if 0%{?suse_version} >= 1310 diff --git a/n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch b/n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch new file mode 100644 index 0000000..9eb00d2 --- /dev/null +++ b/n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch @@ -0,0 +1,52 @@ +From a9af1af5f1f9aa9fdea9e73135a92f053478f849 Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Wed, 20 Jan 2016 16:10:15 +0100 +Subject: [PATCH] VDPAU/XVMC libs: Replace hardlinks with copies + +Since these are packaged separately in (open)SUSE anyway, one can use +copies as well. This makes debug packages possible again. (bnc #962609) + +Signed-off-by: Stefan Dirsch +--- + 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 d388f8b..c9cc534 100644 +--- a/src/gallium/targets/vdpau/Makefile.am ++++ b/src/gallium/targets/vdpau/Makefile.am +@@ -86,7 +86,7 @@ all-local: $(vdpau_LTLIBRARIES) + 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 \ ++ cp -a .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ + $${link_dir}/$${l}; \ + ln -sf $${l} \ + $${link_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \ +@@ -111,7 +111,7 @@ install-data-hook: + j=libvdpau_gallium.$(LIB_EXT); \ + k=libvdpau_$${i}.$(LIB_EXT); \ + l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \ +- ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ ++ cp -a $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ + $${dest_dir}/$${l}; \ + ln -sf $${l} \ + $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \ +diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am +index fdc5f4b..93ef230 100644 +--- a/src/gallium/targets/xvmc/Makefile.am ++++ b/src/gallium/targets/xvmc/Makefile.am +@@ -73,7 +73,7 @@ install-data-hook: + j=libXvMCgallium.$(LIB_EXT); \ + k=libXvMC$${i}.$(LIB_EXT); \ + l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \ +- ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ ++ cp -a $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ + $${dest_dir}/$${l}; \ + ln -sf $${l} \ + $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \ +-- +2.6.2 +