| 1 |
johu 12/01/29 01:25:58 |
| 2 |
|
| 3 |
Added: kdelibs-4.8.0-xinelib12x.patch |
| 4 |
Log: |
| 5 |
Revision bump, adds upstream patch to fix cmake module for >=xine-lib-1.2, bug #397595. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/kdelibs/files/kdelibs-4.8.0-xinelib12x.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.0-xinelib12x.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.0-xinelib12x.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: kdelibs-4.8.0-xinelib12x.patch |
| 16 |
=================================================================== |
| 17 |
commit 568222416da483e81513cd5e28634a829e1aea23 |
| 18 |
Author: Raphael Kubo da Costa <rakuco@×××××××.org> |
| 19 |
Date: Wed Jan 25 20:49:04 2012 -0200 |
| 20 |
|
| 21 |
FindXine: Make version detection work with xine >= 1.2.0. |
| 22 |
|
| 23 |
Starting with the recently released version 1.2.0, xine has its version |
| 24 |
number macros in xine/version.h instead of xine.h itself. |
| 25 |
|
| 26 |
Account for this case by checking if xine/version.h exists and falling |
| 27 |
back to xine.h if it doesn't when reading the version numbers. |
| 28 |
|
| 29 |
Reviewed-by: Alexander Neundorf |
| 30 |
|
| 31 |
diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake |
| 32 |
index 0319b7d..7dd08be 100644 |
| 33 |
--- a/cmake/modules/FindXine.cmake |
| 34 |
+++ b/cmake/modules/FindXine.cmake |
| 35 |
@@ -47,7 +47,13 @@ FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config |
| 36 |
|
| 37 |
# Get the version number from xine.h and store it in the cache: |
| 38 |
IF(XINE_INCLUDE_DIR AND NOT XINE_VERSION) |
| 39 |
- FILE(READ ${XINE_INCLUDE_DIR}/xine.h XINE_VERSION_CONTENT) |
| 40 |
+ IF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) # xine 1.2.0+ |
| 41 |
+ SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine/version.h) |
| 42 |
+ ELSE(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) |
| 43 |
+ SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine.h) |
| 44 |
+ ENDIF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) |
| 45 |
+ |
| 46 |
+ FILE(READ ${XINE_VERSION_FILE} XINE_VERSION_CONTENT) |
| 47 |
STRING(REGEX MATCH "#define *XINE_MAJOR_VERSION *([0-9]+)" _dummy "${XINE_VERSION_CONTENT}") |
| 48 |
SET(XINE_VERSION_MAJOR "${CMAKE_MATCH_1}") |
Archives