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

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon
From:       Matthias Kretz <kretz () kde ! org>
Date:       2007-12-17 13:39:31
Message-ID: 1197898771.928570.21117.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 749623 by mkretz:

I want xinelib >= 1.1.9 for the KDE 4 release. And if you try the 1.2 branch of xine with this backend \
and are not prepared to work on this code you deserve that nothing works.

 M  +18 -9     CMakeLists.txt  


--- trunk/KDE/kdebase/runtime/phonon/CMakeLists.txt #749622:749623
@@ -3,6 +3,8 @@
 #  xinelib 1.1.2 adds audio with gapless playback
 #  xinelib 1.1.5 + xcb adds video
 #  xinelib 1.1.7 does not abort() when unplugging a USB device
+#  xinelib 1.1.9 fixes playback of short sounds
+#  xinelib 1.2 untested => unsupported
 
 # If you want to build KDE without any multimedia support
 # define the cmake variable KDE4_DISABLE_MULTIMEDIA, i.e,
@@ -18,19 +20,26 @@
    if (NOT Q_WS_WIN) #no xine on windows to look for, and running the find breaks stuff
       macro_optional_find_package(Xine)
 
-      # if no xinelib at all is available say that we want 1.1.7
-      macro_log_feature(XINE_FOUND "Xine" "xine-lib is required for the multimedia backend" \
"http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732" TRUE "1.1.7" "The xine \
development libraries (v1.1.7 or above) are required to provide audio and video support. Using the latest \
version is recommended. Run cmake again with the variable KDE4_DISABLE_MULTIMEDIA set if you really want \
to build KDE without multimedia support." ) +      # if no xinelib at all is available say that we want \
1.1.9 +      macro_log_feature(XINE_FOUND "Xine" "xine-lib 1.1.x is required for the multimedia backend" \
"http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732" TRUE "1.1.9" "The xine \
development libraries (v1.1.9 or above) are required to provide audio and video support. Using the latest \
1.1.x version is recommended. Run cmake again with the variable KDE4_DISABLE_MULTIMEDIA set if you really \
want to build KDE without multimedia support (this is not supported)." )  if(XINE_FOUND)
          string(REGEX REPLACE "^[0-9]*\\.([0-9]*)\\.[0-9]*$" "\\1" XINE_MINOR_VERSION ${XINE_VERSION})
          string(REGEX REPLACE "^[0-9]*\\.[0-9]*\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
          # if an older xinelib is installed give a warning about problems but continue
-         if(XINE_MINOR_VERSION LESS 2 AND XINE_BUGFIX_VERSION LESS 7)
-            if(XINE_BUGFIX_VERSION LESS 5)
-               macro_log_feature(TRUE "Xine" "xine-lib v${XINE_VERSION} was found on your system. This \
version does not provide video support and has known security issues. Recommend upgrading to version \
                1.1.7 or above." \
                "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732")
-            else(XINE_BUGFIX_VERSION LESS 5)
-               macro_log_feature(TRUE "Xine" "xine-lib v${XINE_VERSION} was found on your system. This \
version is known to have problems when a device is unplugged. Consider upgrading to version 1.1.7 or \
                above." "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732")
-            endif(XINE_BUGFIX_VERSION LESS 5)
-         endif(XINE_MINOR_VERSION LESS 2 AND XINE_BUGFIX_VERSION LESS 7)
+         if(XINE_MINOR_VERSION LESS 2 AND XINE_BUGFIX_VERSION LESS 90)
+            if(XINE_BUGFIX_VERSION LESS 7)
+               if(XINE_BUGFIX_VERSION LESS 5)
+                  macro_log_feature(TRUE "Xine" "xine-lib v${XINE_VERSION} was found on your system. \
This version does not provide video support and has known security issues. Recommend upgrading to version \
1.1.9 or above." "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732") +          \
else(XINE_BUGFIX_VERSION LESS 5) +                  macro_log_feature(TRUE "Xine" "xine-lib \
v${XINE_VERSION} was found on your system. This version is known to have problems when a device is \
unplugged. Consider upgrading to version 1.1.9 or above." \
"http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732") +               \
endif(XINE_BUGFIX_VERSION LESS 5) +            else(XINE_BUGFIX_VERSION LESS 7)
+               macro_log_feature(TRUE "Xine" "xine-lib v${XINE_VERSION} was found on your system. This \
version is known to have problems when playing short sounds. Consider upgrading to version 1.1.9 or \
above." "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732") +            \
endif(XINE_BUGFIX_VERSION LESS 7) +         else(XINE_MINOR_VERSION LESS 2 AND XINE_BUGFIX_VERSION LESS \
90) +            macro_log_feature(FALSE "Xine" "xine-lib v${XINE_VERSION} was found on your system. This \
version contains major changes compared to 1.1.x and has not been tested properly for use with this \
backend. Consider downgrading to version 1.1.9." \
"http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732") +            set(XINE_FOUND \
FALSE) +         endif(XINE_MINOR_VERSION LESS 2 AND XINE_BUGFIX_VERSION LESS 90)
          macro_optional_add_subdirectory(xine)
       endif(XINE_FOUND)
    endif (NOT Q_WS_WIN)


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