diff options
| author | abcd <abcd@gentoo.org> | 2009-12-10 04:02:05 -0500 |
|---|---|---|
| committer | abcd <abcd@gentoo.org> | 2009-12-10 04:02:05 -0500 |
| commit | f32925b9f1540901408163972354dd955e3ff9fe (patch) | |
| tree | 7ee157a6c19791476030895bf07d42aba9f3c61c | |
| parent | ee97a92255c8825de60016fb2267431f81845f10 (diff) | |
| download | kde-f32925b9f1540901408163972354dd955e3ff9fe.tar.gz kde-f32925b9f1540901408163972354dd955e3ff9fe.tar.bz2 kde-f32925b9f1540901408163972354dd955e3ff9fe.zip | |
[media-libs/gluon] Fix build when gluon not yet installed
| -rw-r--r-- | media-libs/gluon/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/gluon/files/gluon-build-fix.patch | 25 | ||||
| -rw-r--r-- | media-libs/gluon/gluon-9999.ebuild | 1 |
3 files changed, 28 insertions, 1 deletions
diff --git a/media-libs/gluon/Manifest b/media-libs/gluon/Manifest index d3cfc6e4eb2..83cb04393fc 100644 --- a/media-libs/gluon/Manifest +++ b/media-libs/gluon/Manifest @@ -1,3 +1,4 @@ +AUX gluon-build-fix.patch 935 RMD160 b31f470c0dd438d7c2e01437a133f1c109f9e119 SHA1 e645e17ec4a0bd879fc9d14253cd56204122b7b8 SHA256 252a7fb1539927e8f32b98f7e05a8d25059bfafb5c18915f3403a6c2e40ea4f9 AUX gluon-pic-fix.patch 407 RMD160 3cf623eead224c7812e0fd63593ed5695ec73df8 SHA1 0bd06866bc34b5ba64b62c8ee54599289dfd5e72 SHA256 5420a625498fed7c8929ad037a93ba26730faa2b39722e189a853680320c2b64 -EBUILD gluon-9999.ebuild 817 RMD160 330a8b257f23c5431149d56e16f7f8f2be5501f8 SHA1 7f163115701b9e1954546439510a1f0168042782 SHA256 c3c83bf6011823ea68c6ad702e57b6cc6e596201c1af52eeffb3f676d5e60192 +EBUILD gluon-9999.ebuild 854 RMD160 c750fe881671a0401403fa75fc3a3488feab4a04 SHA1 c2c7b2885b024e64e87ef77b1901c28384dfb28d SHA256 adc750b912887dde35c4f29bc5bb0098f68a8bc2c751c150c5402acb8ea4c525 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/media-libs/gluon/files/gluon-build-fix.patch b/media-libs/gluon/files/gluon-build-fix.patch new file mode 100644 index 00000000000..862743ffabb --- /dev/null +++ b/media-libs/gluon/files/gluon-build-fix.patch @@ -0,0 +1,25 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7a87243..2cf3788 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -18,8 +18,18 @@ include_directories(${KDE4_INCLUDES}) + ENDIF() + + find_package(Eigen2 REQUIRED) +-find_package(GluonCommon REQUIRED) +-find_package(KGL REQUIRED) ++IF(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") ++ find_package(GluonCommon REQUIRED) ++ find_package(KGL REQUIRED) ++ELSE() ++ # GluonCommon and KGL aren't installed to the system yet ++ find_package(OpenGL REQUIRED) ++ find_package(GLEW REQUIRED) ++ set(GLUONCOMMON_INCLUDES "${CMAKE_SOURCE_DIR}") ++ set(KGL_INCLUDE_DIR "${CMAKE_SOURCE_DIR}") ++ set(KGL_INCLUDES ${GLUON_COMMON_INCLUDE_DIR} ${KGL_INCLUDE_DIR} ${EIGEN2_INCLUDE_DIR}) ++ set(KGL_LIBRARY kgl) ++ENDIF(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + + message("-- Found KGL include dir: " ${KGL_INCLUDE_DIR}) + message("-- Found KGL includes: " ${KGL_INCLUDES}) diff --git a/media-libs/gluon/gluon-9999.ebuild b/media-libs/gluon/gluon-9999.ebuild index 9c13c730d34..d91233010a3 100644 --- a/media-libs/gluon/gluon-9999.ebuild +++ b/media-libs/gluon/gluon-9999.ebuild @@ -34,6 +34,7 @@ RDEPEND="${COMMON_DEPEND}" PATCHES=( "${FILESDIR}/${PN}-pic-fix.patch" + "${FILESDIR}/${PN}-build-fix.patch" ) src_unpack() { |