Hello community, here is the log from the commit of package libvdpau for openSUSE:Factory checked in at 2020-08-03 14:12:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvdpau (Old) and /work/SRC/openSUSE:Factory/.libvdpau.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvdpau" Mon Aug 3 14:12:56 2020 rev:36 rq:823739 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libvdpau/libvdpau.changes 2020-04-15 19:52:37.113548232 +0200 +++ /work/SRC/openSUSE:Factory/.libvdpau.new.3592/libvdpau.changes 2020-08-03 14:13:36.516392146 +0200 @@ -1,0 +2,7 @@ +Fri Jul 31 11:52:51 UTC 2020 - Stefan Dirsch <[email protected]> + +- n_UsrEtc.patch + * switch to /usr/etc location for vdpau_wrapper.cfg, but first + try /etc (boo#1173038) + +------------------------------------------------------------------- New: ---- n_UsrEtc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvdpau.spec ++++++ --- /var/tmp/diff_new_pack.oZmGo8/_old 2020-08-03 14:13:40.488396129 +0200 +++ /var/tmp/diff_new_pack.oZmGo8/_new 2020-08-03 14:13:40.492396133 +0200 @@ -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 @@ Source2: README Source99: baselibs.conf Source100: %{name}-rpmlintrc +Patch0: n_UsrEtc.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen @@ -82,6 +87,7 @@ %prep %setup -q -b1 +%patch0 -p1 %build %meson @@ -112,9 +118,10 @@ %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) ++++++ n_UsrEtc.patch ++++++ 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) {
