[wl-kmod] Reworked patch for kernel >= 5.10 - get_fs and set_fs macros removed Thanks to Joan Bruguera https
by Nicolas Viéville
commit f46d7c73586ceac4e9f23b572f5cb10a78abfa96
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Tue Dec 29 23:38:29 2020 +0100
Reworked patch for kernel >= 5.10 - get_fs and set_fs macros removed
Thanks to Joan Bruguera https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290
wl-kmod-020_kernel_5.10_get_set_fs_removed.patch | 183 +++++++++++++++++------
wl-kmod.spec | 6 +-
2 files changed, 140 insertions(+), 49 deletions(-)
---
diff --git a/wl-kmod-020_kernel_5.10_get_set_fs_removed.patch b/wl-kmod-020_kernel_5.10_get_set_fs_removed.patch
index 7d886cd..2fd0d8a 100644
--- a/wl-kmod-020_kernel_5.10_get_set_fs_removed.patch
+++ b/wl-kmod-020_kernel_5.10_get_set_fs_removed.patch
@@ -1,78 +1,90 @@
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2019-10-16 16:33:57.319456000 +0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2020-11-12 14:33:56.075438464 +0100
-@@ -477,7 +477,9 @@
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2020-12-29 21:44:24.206777104 +0100
+@@ -38,6 +38,9 @@
+ #include <wlioctl.h>
+ #include <proto/802.11.h>
+ #include <wl_cfg80211_hybrid.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
++#include <wl_linux.h>
++#endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+ #include <linux/sched/signal.h>
+@@ -475,13 +478,16 @@
+ static s32
+ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
{
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
struct ifreq ifr;
struct wl_ioctl ioc;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
mm_segment_t fs;
-+#endif
s32 err = 0;
++#endif
BUG_ON(len < sizeof(int));
-@@ -489,18 +491,22 @@
- strcpy(ifr.ifr_name, dev->name);
- ifr.ifr_data = (caddr_t)&ioc;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
- fs = get_fs();
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
- set_fs(KERNEL_DS);
- #else
- set_fs(get_ds());
- #endif
-+#endif
- #if defined(WL_USE_NETDEV_OPS)
- err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
- #else
- err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
- #endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+ memset(&ioc, 0, sizeof(ioc));
+ ioc.cmd = cmd;
+ ioc.buf = arg;
+@@ -503,6 +509,9 @@
set_fs(fs);
-+#endif
return err;
++#else
++ return wlc_ioctl_internal(dev, cmd, arg, len);
++#endif
}
+
+ static s32
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wlc_pub.h hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wlc_pub.h
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wlc_pub.h 2017-06-03 15:26:57.095475000 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wlc_pub.h 2020-12-29 21:55:44.922067533 +0100
+@@ -24,6 +24,9 @@
+
+ #include <wlc_types.h>
+ #include <wlc_utils.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
++#include <siutils.h>
++#endif
+ #include "proto/802.11.h"
+ #include "proto/bcmevent.h"
+
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_iw.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_iw.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_iw.c 2019-05-30 01:32:34.421426000 +0200
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_iw.c 2020-11-12 14:33:56.101438714 +0100
-@@ -105,7 +105,9 @@
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_iw.c 2020-12-29 21:47:36.457836102 +0100
+@@ -37,6 +37,9 @@
+
+ #include <wl_dbg.h>
+ #include <wl_iw.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
++#include <wl_linux.h>
++#endif
+
+ extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status,
+ uint32 reason, char* stringBuf, uint buflen);
+@@ -103,6 +106,7 @@
+ int len
+ )
{
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
struct ifreq ifr;
wl_ioctl_t ioc;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
mm_segment_t fs;
-+#endif
- int ret;
-
- memset(&ioc, 0, sizeof(ioc));
-@@ -116,18 +118,22 @@
- strcpy(ifr.ifr_name, dev->name);
- ifr.ifr_data = (caddr_t) &ioc;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
- fs = get_fs();
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
- set_fs(KERNEL_DS);
- #else
- set_fs(get_ds());
- #endif
-+#endif
- #if defined(WL_USE_NETDEV_OPS)
- ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
- #else
- ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
- #endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+@@ -130,6 +134,9 @@
set_fs(fs);
-+#endif
return ret;
++#else
++ return wlc_ioctl_internal(dev, cmd, arg, len);
++#endif
}
+
+ static int
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2020-11-11 13:39:00.579562572 +0100
-+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2020-11-11 23:14:57.451165706 +0100
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2020-12-29 21:55:44.899067286 +0100
@@ -1659,6 +1659,7 @@
goto done2;
}
@@ -91,3 +103,78 @@ diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c h
if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) {
bcmerror = BCME_NORESOURCE;
goto done2;
+@@ -1687,7 +1691,11 @@
+ WL_UNLOCK(wl);
+
+ done1:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+ if (ioc.buf && (ioc.buf != buf)) {
++#else
++ if (ioc.buf) {
++#endif
+ if (copy_to_user(ioc.buf, buf, ioc.len))
+ bcmerror = BCME_BADADDR;
+ MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN));
+@@ -1697,6 +1705,39 @@
+ ASSERT(VALID_BCMERROR(bcmerror));
+ if (bcmerror != 0)
+ wl->pub->bcmerror = bcmerror;
++ return (OSL_ERROR(bcmerror));
++}
++
++int
++wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len)
++{
++ wl_info_t *wl;
++ wl_if_t *wlif;
++ int bcmerror;
++
++ if (!dev)
++ return -ENETDOWN;
++
++ wl = WL_INFO(dev);
++ wlif = WL_DEV_IF(dev);
++ if (wlif == NULL || wl == NULL || wl->dev == NULL)
++ return -ENETDOWN;
++
++ bcmerror = 0;
++
++ WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd));
++
++ WL_LOCK(wl);
++ if (!capable(CAP_NET_ADMIN)) {
++ bcmerror = BCME_EPERM;
++ } else {
++ bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif);
++ }
++ WL_UNLOCK(wl);
++
++ ASSERT(VALID_BCMERROR(bcmerror));
++ if (bcmerror != 0)
++ wl->pub->bcmerror = bcmerror;
+ return (OSL_ERROR(bcmerror));
+ }
+
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.h hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.h
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.h 2017-06-03 15:26:57.095475000 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.h 2020-12-29 21:55:44.953067865 +0100
+@@ -22,6 +22,9 @@
+ #define _wl_linux_h_
+
+ #include <wlc_types.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
++#include <wlc_pub.h>
++#endif
+
+ typedef struct wl_timer {
+ struct timer_list timer;
+@@ -187,6 +190,9 @@
+ extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+ extern void wl_free(wl_info_t *wl);
+ extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
++extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len);
++#endif
+ extern struct net_device * wl_netdev_get(wl_info_t *wl);
+
+ #endif
diff --git a/wl-kmod.spec b/wl-kmod.spec
index fbb6e31..3feeb99 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -10,7 +10,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 35%{?dist}
+Release: 36%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -287,6 +287,10 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Dec 29 2020 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-36
+- Reworked patch for kernel >= 5.10 - get_fs and set_fs macros removed
+ Thanks to Joan Bruguera - https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290
+
* Sat Nov 28 2020 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-35
- Add patch for kernel >= 5.10 - get_fs and set_fs macros removed - first attempt
3 years, 7 months
[raspberrypi-vc] Update snapshot
by Damian Wrobel
commit 48d03109bd28a772fa74b58113a7105dda56bf44
Author: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl>
Date: Tue Dec 29 16:43:32 2020 +0100
Update snapshot
raspberrypi-vc.spec | 9 ++++++---
sources | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/raspberrypi-vc.spec b/raspberrypi-vc.spec
index e482420..6d39be7 100644
--- a/raspberrypi-vc.spec
+++ b/raspberrypi-vc.spec
@@ -1,11 +1,11 @@
-%global commit0 f73fca015d421b763936667a0b58fe5024d59921
+%global commit0 093b30bbc2fd083d68cc3ee07e6e555c6e592d11
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global _vc_libdir %{_libdir}/vc
Name: raspberrypi-vc
-Version: 20200813
-Release: 2.git%{shortcommit0}%{?dist}
+Version: 20201130
+Release: 1.git%{shortcommit0}%{?dist}
Summary: VideoCore GPU libraries, utilities and demos for Raspberry Pi
License: BSD
URL: https://github.com/raspberrypi
@@ -274,6 +274,9 @@ ln -s %{_includedir}/vc %{buildroot}/opt/vc/include
%changelog
+* Tue Dec 29 2020 Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl> - 20201130-0.git093b30b
+- Update snapshot
+
* Tue Sep 22 2020 Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl> - 20200813-2.gitf73fca0
- Change installation of ld.conf.d drop-in configuration file
diff --git a/sources b/sources
index b430920..45086b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (raspberrypi-userland-f73fca0.tar.gz) = 2b44a82945a1cad8a01938b866363001740274364d8818d0e83b701f1597de8e016b6f1254b0788685d411e832e7d5b053224b9d09d0126ad6db9abf2f768075
+SHA512 (raspberrypi-userland-093b30b.tar.gz) = 6cbc7b6ad6af0128c997f62bf1b35ff035b68f40258f2d208a41cd6eb3cf8264b79a603375e6ff6b4ab0aa9c7520cda97531cb85b0bd1fda0df89513b596d979
3 years, 7 months
[vdr-softhddevice] Use fork because its under maintenance fixes (rfbz#5882)
by Martin Gansser
commit 356143fe372b90d1922e9bc1800fb61a775ab962
Author: Martin Gansser <mgansser(a)online.de>
Date: Tue Dec 29 11:56:07 2020 +0100
Use fork because its under maintenance
fixes (rfbz#5882)
.gitignore | 1 +
chartype.patch | 11 -
ffmpeg_2.9.patch | 575 --------------------------------------------------
sources | 2 +-
vdr-softhddevice.spec | 60 +++---
5 files changed, 27 insertions(+), 622 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a852493..deeb6d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/vdr-plugin-softhddevice-ee2311d25237b9828c1423505e5d4055a836414d.tar.bz2
/vdr-plugin-softhddevice-6dfa88aecf1b5a4c5932ba278209d9f22676547f.tar.bz2
+/vdr-softhddevice-1.0.9.tar.gz
diff --git a/sources b/sources
index b15ee92..9e11059 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-plugin-softhddevice-6dfa88aecf1b5a4c5932ba278209d9f22676547f.tar.bz2) = 676fb558d1b424cc2ae1f7dde365f9dc1080d6c809c5eb1292e597b5f72832c243d402388d2803cb18ddba70f0fc054db7b4f297a9bff66afff3af7dcf95c13a
+SHA512 (vdr-softhddevice-1.0.9.tar.gz) = bd83c7ac605a400511d379b73549bc113207a6e601f99bfd4664dc305af7f740c91713e3449f629c54d24b6bc266a1fa6241edf19de6f5a2c83b5c6441d0c4c0
diff --git a/vdr-softhddevice.spec b/vdr-softhddevice.spec
index 5210468..d341215 100644
--- a/vdr-softhddevice.spec
+++ b/vdr-softhddevice.spec
@@ -1,29 +1,21 @@
-%global commit0 6dfa88aecf1b5a4c5932ba278209d9f22676547f
+%global commit0 057a3ab6d6ee2b1ebc4a302edf1629ba6a0377ce
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global gitdate 20151103
-
-%if 0%{?fedora} > 27
-%bcond_without compat_ffmpeg
-%else
-%bcond_with compat_ffmpeg
-%endif
+%global gitdate 20201226
Name: vdr-softhddevice
-Version: 0.6.1
-Release: 27.%{gitdate}git%{shortcommit0}%{?dist}
+Version: 1.0.9
+#Release: 0.1.%%{gitdate}git%%{shortcommit0}%%{?dist}
+Release: 1%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
License: AGPLv3
-URL: http://projects.vdr-developer.org/projects/plg-softhddevice
-Source0: http://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git/snapsho...
+URL: https://github.com/ua0lnj/vdr-plugin-softhddevice
+#Source0: https://github.com/ua0lnj/vdr-plugin-softhddevice/archive/%%{commit0}/%%{...
+Source0: https://github.com/ua0lnj/vdr-plugin-softhddevice/archive/v%{version}.tar...
# Configuration files for plugin parameters. These are Fedora specific and not in upstream.
Source1: %{name}.conf
-# http://projects.vdr-developer.org/issues/1417
+# https://github.com/ua0lnj/vdr-plugin-softhddevice/pull/33
Patch0: exit-crash.patch
-# http://projects.vdr-developer.org/issues/1916
-Patch1: chartype.patch
-# https://projects.vdr-developer.org/issues/2424
-Patch2: ffmpeg_2.9.patch
BuildRequires: gcc-c++
BuildRequires: vdr-devel >= 1.7.22
@@ -31,11 +23,7 @@ BuildRequires: gettext
BuildRequires: libva-devel
BuildRequires: libvdpau-devel
BuildRequires: alsa-lib-devel
-%if %{with compat_ffmpeg}
-BuildRequires: compat-ffmpeg28-devel
-%else
BuildRequires: ffmpeg-devel
-%endif
BuildRequires: libxcb-devel
BuildRequires: xcb-util-devel
BuildRequires: xcb-util-wm-devel
@@ -45,10 +33,11 @@ Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
Requires: xorg-x11-server-Xorg
%description
-A software and GPU emulated HD output device plugin for VDR.
+A software and GPU emulated UHD output device plugin for VDR.
- Video decoder CPU / VDPAU
- Video output VDPAU
+ Video decoder CPU / VA-API / VDPAU / CUVID
+ Video output VA-API / VDPAU / GLX (VA-API / CUVID)
+ OSD accelerated by GPU VDPAU / CUVID
Audio FFMpeg / Alsa / Analog
Audio FFMpeg / Alsa / Digital
Audio FFMpeg / OSS / Analog
@@ -57,20 +46,20 @@ A software and GPU emulated HD output device plugin for VDR.
VDR ScaleVideo API
Software deinterlacer Bob (VA-API only)
Autocrop
- Grab image (VDPAU only)
+ Grab image (VA-API / VDPAU / CUVID)
Suspend / Dettach
Letterbox, Stretch and Center cut-out video display modes
atmo light support with plugin http://github.com/durchflieger/DFAtmo
- PIP (Picture-in-Picture) (VDPAU only)
+ PIP (Picture-in-Picture) (VDPAU / CUVID)
+ planned: OSD accelerated by GPU VA-API
+ planned: Video output Opengl / Xv
+ planned: Improved software deinterlacer (yadif or/and ffmpeg filters)
+ XvBa support is no longer planned (use future Radeon UVD VDPAU)
%prep
-%setup -qn vdr-plugin-softhddevice-%{commit0}
-%patch0 -p1
-%patch1 -p0
-%if ! %{with compat_ffmpeg}
-%patch2 -p1
-%endif
+#%%setup -qn vdr-plugin-softhddevice-%%{commit0}
+%autosetup -p1 -n vdr-plugin-softhddevice-%{version}
# remove .git files and Gentoo files
rm -f .indent.pro .gitignore .gitattributes
@@ -83,9 +72,6 @@ for f in ChangeLog README.txt; do
done
%build
-%if %{with compat_ffmpeg}
-export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
-%endif
make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags}
%install
@@ -101,6 +87,10 @@ install -Dpm 644 %{SOURCE1} \
%license AGPL-3.0.txt
%changelog
+* Tue Dec 29 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 1.0.9-1
+- Use fork because its under maintenance
+- fixes (rfbz#5882)
+
* Wed Oct 21 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-27.20151103git6dfa88a
- Rebuilt for new VDR API version
3 years, 7 months
[vdr-skindesigner] Move dtd and script files into base package Create softlink dtd files are expected in /etc/vdr/plugi
by Martin Gansser
commit 71e74c0e6f57f83c48536b13e68721a37afcd835
Author: Martin Gansser <mgansser(a)online.de>
Date: Tue Dec 29 11:46:11 2020 +0100
Move dtd and script files into base package
Create softlink dtd files are expected in /etc/vdr/plugins/skindesigner
Move themes into data package
Move the two "builtin" skins into vdr-skindesigner-data
fixes (rfbz#5881)
vdr-skindesigner.spec | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/vdr-skindesigner.spec b/vdr-skindesigner.spec
index 30b0774..3f1f710 100644
--- a/vdr-skindesigner.spec
+++ b/vdr-skindesigner.spec
@@ -2,7 +2,7 @@
Name: vdr-skindesigner
Version: 1.2.8.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A VDR skinning engine that displays XML based Skins
License: GPLv2+
URL: http://projects.vdr-developer.org/projects/plg-skindesigner
@@ -95,6 +95,10 @@ install -Dpm 644 %{SOURCE1} \
# install missing symlink (was giving no-ldconfig-symlink rpmlint errors)
ldconfig -n %{buildroot}%{_libdir}
+#
+mkdir -p %{buildroot}/etc/vdr/plugins/skindesigner/
+ln -s %{vdr_resdir}/plugins/skindesigner/dtd %{buildroot}/%{vdr_configdir}/plugins/skindesigner/
+
%find_lang %{name}
%post -n libskindesignerapi -p /sbin/ldconfig
@@ -106,10 +110,19 @@ ldconfig -n %{buildroot}%{_libdir}
%license COPYING
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{sname}.conf
%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
-%{vdr_vardir}/themes/*.theme
+%dir %{vdr_resdir}/plugins/%{sname}/dtd
+%{vdr_resdir}/plugins/%{sname}/dtd
+%dir %{vdr_resdir}/plugins/%{sname}/scripts
+%{vdr_resdir}/plugins/%{sname}/scripts
+%{vdr_configdir}/plugins/skindesigner/dtd
+# to be able to install skin repos without the data package
+%dir %{vdr_resdir}/plugins/%{sname}/
+%dir %{vdr_resdir}/plugins/%{sname}/installerskins/
%files data
-%{vdr_resdir}/plugins/%{sname}/
+%dir %{vdr_resdir}/plugins/%{sname}/skins
+%{vdr_resdir}/plugins/%{sname}/skins
+%{vdr_vardir}/themes/*.theme
%files -n libskindesignerapi
%doc libskindesignerapi/README
@@ -123,6 +136,13 @@ ldconfig -n %{buildroot}%{_libdir}
%{_includedir}/libskindesignerapi/*
%changelog
+* Tue Dec 29 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 1.2.8.6-2
+- Move dtd and script files into base package
+- Create softlink dtd files are expected in /etc/vdr/plugins/skindesigner
+- Move themes into data package
+- Move the two "builtin" skins into vdr-skindesigner-data
+- fixes (rfbz#5881)
+
* Thu Dec 17 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 1.2.8.6-1
- Update to 1.2.8.6
3 years, 7 months