Skip to content

Commit 56aadb6

Browse files
committed
x86_64 Generic: fix package dependencies
1 parent cd4a4f6 commit 56aadb6

5 files changed

Lines changed: 13 additions & 6 deletions

File tree

config/distro/LibreELEC-12-x86_64-Generic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ DEVICE=Generic
1111
ARCH=x86_64
1212

1313
# VDR settings
14-
VDR_OUTPUTDEVICE=softhddevice
14+
VDR_OUTPUTDEVICE=softhddevice-drm-gles
1515
VDR_INPUTDEVICE=satip

config/distro/LibreELEC-12-x86_64-Generic-qemu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ DEVICE=Generic
1111
ARCH=x86_64
1212

1313
# VDR settings
14-
VDR_OUTPUTDEVICE=softhddevice
14+
VDR_OUTPUTDEVICE=softhddevice-drm-gles
1515
VDR_INPUTDEVICE=satip

config/distro/LibreELEC-12-x86_64-GenericLegacy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ DEVICE=Generic-legacy
1111
ARCH=x86_64
1212

1313
# VDR settings
14-
VDR_OUTPUTDEVICE=softhddevice
14+
VDR_OUTPUTDEVICE=softhdevice
1515
VDR_INPUTDEVICE=satip

config/distro/LibreELEC-12-x86_64-GenericLegacy-qemu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ DEVICE=Generic-legacy
1111
ARCH=x86_64
1212

1313
# VDR settings
14-
VDR_OUTPUTDEVICE=softhddevice
14+
VDR_OUTPUTDEVICE=softhdevice
1515
VDR_INPUTDEVICE=satip

packages/virtual/vdr-all/package.mk

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ PKG_LONGDESC="A DVB TV server application."
1212
PKG_DEPENDS_TARGET+=" _vdr"
1313

1414
if [ "${VDR_OUTPUTDEVICE}" = "softhdodroid" ]; then
15-
#PKG_DEPENDS_TARGET+=" _vdr-plugin-softhdodroid _vdr-plugin-softhdodroid-gxl"
1615
PKG_DEPENDS_TARGET+=" _vdr-plugin-softhdodroid"
1716
elif [ "${VDR_OUTPUTDEVICE}" = "softhddevice-drm" ] || [ "${VDR_OUTPUTDEVICE}" = "softhddevice-drm-gles" ]; then
1817
PKG_DEPENDS_TARGET+=" _vdr-plugin-softhddevice-drm _vdr-plugin-softhddevice-drm-gles"
1918
fi
2019

21-
if [ "${ARCH}" = "x86_64" ]; then
20+
if [ "${ARCH}" = "x86_64" ] && [ "${PROJECT}" = "Generic" ] && ([ "${DEVICE}" = "x11" ] || [ "${DEVICE}" = "Generic-legacy" ]); then
2221
PKG_DEPENDS_TARGET+=" _vdr-plugin-softhdcuvid"
2322
PKG_DEPENDS_TARGET+=" _vdr-plugin-softhdvaapi"
2423
PKG_DEPENDS_TARGET+=" _vdr-plugin-softhddrm"
@@ -28,6 +27,14 @@ if [ "${ARCH}" = "x86_64" ]; then
2827
PKG_DEPENDS_TARGET+=" _vdr-plugin-xineliboutput"
2928
fi
3029

30+
if [ "${ARCH}" = "x86_64" ] && [ "${PROJECT}" = "Generic" ] && [ "${DEVICE}" = "Generic" ]; then
31+
# Fixme: Dependency problem
32+
# PKG_DEPENDS_TARGET+=" _vdr-plugin-softhddrm"
33+
34+
PKG_DEPENDS_TARGET+=" _vdr-plugin-softhddevice-drm"
35+
PKG_DEPENDS_TARGET+=" _vdr-plugin-softhddevice-drm-gles"
36+
fi
37+
3138
PKG_DEPENDS_TARGET+=" _vdr-plugin-satip"
3239
PKG_DEPENDS_TARGET+=" _vdr-plugin-ddci2"
3340
PKG_DEPENDS_TARGET+=" _vdr-plugin-dummydevice"

0 commit comments

Comments
 (0)