From e87c796349b5991246ee7abab1c4fad11ad5690a Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld <kai.sommerfeld@gmx.com>
Date: Wed, 6 Jul 2022 21:22:02 +0200
Subject: [settings] Show blu-ray settings only for Kodi builds compiled with
 HAVE_LIBBLURAY.

---
 system/settings/settings.xml        | 1 +
 xbmc/settings/SettingConditions.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 556676b374..fdef6892c2 100755
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -335,6 +335,7 @@
         </setting>
       </group>
       <group id="2" label="14234">
+        <requirement>HAVE_LIBBLURAY</requirement>
         <setting id="bluray.playerregion" type="integer" label="14121" help="38017">
           <level>1</level>
           <default>1</default> <!-- region A -->
diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp
index cf65f77620..a88d9227f3 100644
--- a/xbmc/settings/SettingConditions.cpp
+++ b/xbmc/settings/SettingConditions.cpp
@@ -427,6 +427,10 @@ void CSettingConditions::Initialize()
     m_simpleConditions.emplace("webserver_has_ssl");
 #endif
 
+#ifdef HAVE_LIBBLURAY
+  m_simpleConditions.emplace("have_libbluray");
+#endif
+
   // add complex conditions
   m_complexConditions.emplace("addonhassettings", AddonHasSettings);
   m_complexConditions.emplace("checkmasterlock", CheckMasterLock);
-- 
cgit v1.2.3


From 32574fb02fb84e2fbaae79be1a7b5914738d6c17 Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld <kai.sommerfeld@gmx.com>
Date: Wed, 6 Jul 2022 22:24:18 +0200
Subject: [settings] Show Audio CD ripping settings only for Kodi builds
 compiled with HAS_CDDA_RIPPER.

---
 system/settings/settings.xml        | 5 +++++
 xbmc/settings/SettingConditions.cpp | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index fdef6892c2..dee579c108 100755
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -376,6 +376,7 @@
           <control type="toggle" />
         </setting>
         <setting id="audiocds.recordingpath" type="path" label="20000" help="36285">
+          <requirement>HAS_CDDA_RIPPER</requirement>
           <level>3</level>
           <default></default>
           <constraints>
@@ -386,6 +387,7 @@
           </control>
         </setting>
         <setting id="audiocds.trackpathformat" type="string" label="13307" help="36286">
+          <requirement>HAS_CDDA_RIPPER</requirement>
           <level>3</level>
           <default>%A/%A - %B/[%N. ][%A - ]%T</default>
           <control type="edit" format="string">
@@ -393,6 +395,7 @@
           </control>
         </setting>
         <setting id="audiocds.encoder" type="addon" label="621" help="36287">
+          <requirement>HAS_CDDA_RIPPER</requirement>
           <level>3</level>
           <default>audioencoder.kodi.builtin.aac</default>
           <constraints>
@@ -403,6 +406,7 @@
           </control>
         </setting>
         <setting id="audiocds.settings" parent="audiocds.encoder" type="action" label="21417" help="37025">
+          <requirement>HAS_CDDA_RIPPER</requirement>
           <level>3</level>
           <dependencies>
             <dependency type="enable">
@@ -412,6 +416,7 @@
           <control type="button" format="action" />
         </setting>
         <setting id="audiocds.ejectonrip" type="boolean" label="14099" help="36291">
+          <requirement>HAS_CDDA_RIPPER</requirement>
           <level>3</level>
           <default>true</default>
           <control type="toggle" />
diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp
index a88d9227f3..7c44a32241 100644
--- a/xbmc/settings/SettingConditions.cpp
+++ b/xbmc/settings/SettingConditions.cpp
@@ -431,6 +431,10 @@ void CSettingConditions::Initialize()
   m_simpleConditions.emplace("have_libbluray");
 #endif
 
+#ifdef HAS_CDDA_RIPPER
+  m_simpleConditions.emplace("has_cdda_ripper");
+#endif
+
   // add complex conditions
   m_complexConditions.emplace("addonhassettings", AddonHasSettings);
   m_complexConditions.emplace("checkmasterlock", CheckMasterLock);
-- 
cgit v1.2.3


From a86dae36a39681614d3add4cc5283957ff4dc00b Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld <kai.sommerfeld@gmx.com>
Date: Thu, 7 Jul 2022 17:38:09 +0200
Subject: [settings] Show CD/DVD autorun settings only for Kodi builds compiled
 with HAS_DVD_DRIVE.

---
 system/settings/settings.xml        | 3 +++
 xbmc/settings/SettingConditions.cpp | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index dee579c108..5ec2bfba58 100755
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -314,6 +314,7 @@
     <category id="discs" label="14087" help="36193">
       <group id="1" label="446">
         <setting id="dvds.autorun" type="boolean" label="14088" help="36194">
+          <requirement>HAS_DVD_DRIVE</requirement>
           <level>0</level>
           <default>false</default>
           <control type="toggle" />
@@ -363,6 +364,7 @@
       </group>
       <group id="3" label="620">
         <setting id="audiocds.autoaction" type="integer" label="14097" help="36283">
+          <requirement>HAS_DVD_DRIVE</requirement>
           <level>1</level>
           <default>0</default> <!-- AUTOCD_NONE -->
           <constraints>
@@ -371,6 +373,7 @@
           <control type="list" format="string" />
         </setting>
         <setting id="audiocds.usecddb" type="boolean" label="227" help="36284">
+          <requirement>HAS_DVD_DRIVE</requirement>
           <level>1</level>
           <default>true</default>
           <control type="toggle" />
diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp
index 7c44a32241..5fc1311b99 100644
--- a/xbmc/settings/SettingConditions.cpp
+++ b/xbmc/settings/SettingConditions.cpp
@@ -435,6 +435,10 @@ void CSettingConditions::Initialize()
   m_simpleConditions.emplace("has_cdda_ripper");
 #endif
 
+#ifdef HAS_DVD_DRIVE
+  m_simpleConditions.emplace("has_dvd_drive");
+#endif
+
   // add complex conditions
   m_complexConditions.emplace("addonhassettings", AddonHasSettings);
   m_complexConditions.emplace("checkmasterlock", CheckMasterLock);
-- 
cgit v1.2.3