diff --git a/libvdpau.changes b/libvdpau.changes index 3e65871..cc48869 100644 --- a/libvdpau.changes +++ b/libvdpau.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 31 11:52:51 UTC 2020 - Stefan Dirsch + +- n_UsrEtc.patch + * switch to /usr/etc location for vdpau_wrapper.cfg, but first + try /etc (boo#1173038) + ------------------------------------------------------------------- Sat Apr 11 20:32:45 UTC 2020 - Stefan Dirsch diff --git a/libvdpau.spec b/libvdpau.spec index 8a626ac..3185c1f 100644 --- a/libvdpau.spec +++ b/libvdpau.spec @@ -16,6 +16,10 @@ # +%if 0%{?suse_version} < 1550 + %define _distconfdir /usr/etc +%endif + Name: libvdpau Version: 1.4 Release: 0 @@ -28,6 +32,7 @@ Source1: https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/vdpauin Source2: README Source99: baselibs.conf Source100: %{name}-rpmlintrc +Patch0: n_UsrEtc.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen @@ -82,6 +87,7 @@ Its usage is documented in the README. %prep %setup -q -b1 +%patch0 -p1 %build %meson @@ -112,9 +118,10 @@ cp %{_sourcedir}/README . %files -n libvdpau1 %defattr(-,root,root) %dir %{_libdir}/vdpau +%dir %{_distconfdir} %{_bindir}/vdpauinfo %{_libdir}/libvdpau.so.* -%config %{_sysconfdir}/vdpau_wrapper.cfg +%{_distconfdir}/vdpau_wrapper.cfg %files -n libvdpau-devel %defattr(-,root,root) diff --git a/n_UsrEtc.patch b/n_UsrEtc.patch new file mode 100644 index 0000000..2a85a0b --- /dev/null +++ b/n_UsrEtc.patch @@ -0,0 +1,24 @@ +diff -u -r libvdpau-1.4.orig/src/meson.build libvdpau-1.4/src/meson.build +--- libvdpau-1.4.orig/src/meson.build 2020-07-31 13:36:55.104530000 +0200 ++++ libvdpau-1.4/src/meson.build 2020-07-31 14:21:02.982468000 +0200 +@@ -16,4 +16,4 @@ + install : true, + ) + +-install_data('vdpau_wrapper.cfg', install_dir : get_option('sysconfdir')) ++install_data('vdpau_wrapper.cfg', install_dir : '/usr/etc') +diff -u -r libvdpau-1.4.orig/src/vdpau_wrapper.c libvdpau-1.4/src/vdpau_wrapper.c +--- libvdpau-1.4.orig/src/vdpau_wrapper.c 2020-07-31 13:36:55.116541000 +0200 ++++ libvdpau-1.4/src/vdpau_wrapper.c 2020-07-31 14:19:44.407242000 +0200 +@@ -362,7 +362,10 @@ + + fp = fopen(VDPAU_SYSCONFDIR "/vdpau_wrapper.cfg", "r"); + if (!fp) { +- return; ++ fp = fopen("/usr/etc/vdpau_wrapper.cfg", "r"); ++ if (!fp) { ++ return; ++ } + } + + while (fgets(buffer, sizeof(buffer), fp) != NULL) {