Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 300113 Details for
Bug 397595
Broken FindXine.cmake module in kde-base/kdelibs breaks build for media-video/kaffeine with >=media-libs/xine-lib-1.2
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
Patch to make kaffeine compile against kdelibs-4.8.0/xine-lib-1.2.0
kdelibs-4.8.0_FindXine.cmake_xine-lib-1.2.patch (text/plain), 2.24 KB, created by
Franz Trischberger
on 2012-01-28 11:33:44 UTC
(
hide
)
Description:
Patch to make kaffeine compile against kdelibs-4.8.0/xine-lib-1.2.0
Filename:
MIME Type:
Creator:
Franz Trischberger
Created:
2012-01-28 11:33:44 UTC
Size:
2.24 KB
patch
obsolete
>--- cmake/modules/FindXine.cmake.org 2012-01-27 21:45:34.061738811 +0100 >+++ cmake/modules/FindXine.cmake 2012-01-28 11:29:32.593086443 +0100 >@@ -14,16 +14,6 @@ > # Redistribution and use is allowed according to the terms of the BSD license. > # For details see the accompanying COPYING-CMAKE-SCRIPTS file. > >-# Support XINE_MIN_VERSION for compatibility: >-IF(NOT Xine_FIND_VERSION) >- SET(Xine_FIND_VERSION "${XINE_MIN_VERSION}") >-ENDIF(NOT Xine_FIND_VERSION) >- >-# the minimum version of xine we require >-IF(NOT Xine_FIND_VERSION) >- SET(Xine_FIND_VERSION "1.1.0") >-ENDIF(NOT Xine_FIND_VERSION) >- > FIND_PACKAGE(PkgConfig) > PKG_CHECK_MODULES(PC_LIBXINE QUIET libxine) > SET(XINE_DEFINITIONS ${PC_XINE_CFLAGS_OTHER}) >@@ -40,32 +30,10 @@ > ${PC_LIBXINE_LIBRARY_DIRS} > ) > >-FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config >- HINTS >- ${PC_LIBXINE_PREFIX}/bin >-) >- >-# Get the version number from xine.h and store it in the cache: >-IF(XINE_INCLUDE_DIR AND NOT XINE_VERSION) >- FILE(READ ${XINE_INCLUDE_DIR}/xine.h XINE_VERSION_CONTENT) >- STRING(REGEX MATCH "#define *XINE_MAJOR_VERSION *([0-9]+)" _dummy "${XINE_VERSION_CONTENT}") >- SET(XINE_VERSION_MAJOR "${CMAKE_MATCH_1}") >- >- STRING(REGEX MATCH "#define *XINE_MINOR_VERSION *([0-9]+)" _dummy "${XINE_VERSION_CONTENT}") >- SET(XINE_VERSION_MINOR "${CMAKE_MATCH_1}") >- >- STRING(REGEX MATCH "#define *XINE_SUB_VERSION *([0-9]+)" _dummy "${XINE_VERSION_CONTENT}") >- SET(XINE_VERSION_PATCH "${CMAKE_MATCH_1}") >- >- SET(XINE_VERSION "${XINE_VERSION_MAJOR}.${XINE_VERSION_MINOR}.${XINE_VERSION_PATCH}" CACHE STRING "Version number of Xine" FORCE) >- >- IF("${XINE_VERSION}" VERSION_GREATER "${Xine_FIND_VERSION}") >- STRING(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) >- ENDIF("${XINE_VERSION}" VERSION_GREATER "${Xine_FIND_VERSION}") >-ENDIF(XINE_INCLUDE_DIR AND NOT XINE_VERSION) >+SET(XINE_VERSION ${PC_LIBXINE_VERSION}) > > INCLUDE(FindPackageHandleStandardArgs) >-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xine REQUIRED_VARS XINE_INCLUDE_DIR XINE_LIBRARY XINECONFIG_EXECUTABLE >+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xine REQUIRED_VARS XINE_INCLUDE_DIR XINE_LIBRARY > VERSION_VAR XINE_VERSION) > >-MARK_AS_ADVANCED(XINE_INCLUDE_DIR XINE_LIBRARY XINECONFIG_EXECUTABLE) >+MARK_AS_ADVANCED(XINE_INCLUDE_DIR XINE_LIBRARY)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 397595
:
297969
|
297985
| 300113