[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [K3b] d310459: Added K3B_ENABLE_HAL_SUPPORT option to the build c
From:       Michal Malek <michalm () jabster ! pl>
Date:       2010-12-26 16:16:08
Message-ID: 20101226161608.E61E6A6092 () git ! kde ! org
[Download RAW message or body]

commit d310459c9f1358393df7722c7b7a0d0af80cea11
branch master
Author: Michal Malek <michalm@jabster.pl>
Date:   Sun Dec 26 17:13:54 2010 +0100

    Added K3B_ENABLE_HAL_SUPPORT option to the build configuration. When enabled, K3b \
prevents HAL from polling the burning device during burning.  BUG: 253388

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8151938..2239514 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,14 +19,15 @@ set(K3B_LIB_VERSION_RELEASE 0)
 
 
 ##################  K3b options #################################
-if (NOT WIN32)
-    option(K3B_BUILD_K3BSETUP "Build k3bsetup" ON)
-endif(NOT WIN32)
 option(K3B_DEBUG "K3b additional debugging support")
 option(K3B_ENABLE_MUSICBRAINZ "Support for querying metadata about audio tracks from \
Musicbrainz." ON)  option(K3B_ENABLE_DVD_RIPPING "Support for ripping Video DVDs with \
optional decryption." ON)  option(K3B_ENABLE_TAGLIB "Support for reading audio file \
metadata using Taglib." ON)  option(K3B_BUILD_API_DOCS "Build the API documentation \
for the K3b libs." OFF) +if(NOT WIN32 AND NOT APPLE)
+  option(K3B_BUILD_K3BSETUP "Graphical utility for managing device permissions" ON)
+  option(K3B_ENABLE_HAL_SUPPORT "Support for inhibiting HAL from polling disk during \
write." ON) +endif(NOT WIN32 AND NOT APPLE)
 
 # plugin options
 option(K3B_BUILD_FFMPEG_DECODER_PLUGIN "Build FFmpeg decoder plugin" ON)
@@ -221,9 +222,9 @@ if(K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
  set(BUILD_EXTERNAL_ENCODER_PLUGIN 1)
 endif(K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
 
-if(NOT WIN32 AND NOT APPLE)
+if(K3B_ENABLE_HAL_SUPPORT)
   set(ENABLE_HAL_SUPPORT 1)
-endif(NOT WIN32 AND NOT APPLE)
+endif(K3B_ENABLE_HAL_SUPPORT)
 
 configure_file (config-k3b.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-k3b.h )
 
diff --git a/ChangeLog b/ChangeLog
index de69f3b..1e9e9be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@ Bugfixes:
 
 2.0.2
 =====
+Changes:
+ * Added K3B_ENABLE_HAL_SUPPORT option to the build configuration. It allows to \
disable any direct calls to HAL (253388) +
 Bugfixes:
  * Crash on start when checking device capabilities (246822)
  * Search paths on "Programs" options are not saved (248648)


[prev in list] [next in list] [prev in thread] [next in thread]