diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-01-21 20:09:09 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-01-21 20:09:09 +0000 |
| commit | 58214b7a63dba7fbeced2583459a766f25f7ede2 (patch) | |
| tree | 3bfb5ae2c08a4cd7472d6e4ae3bc368488eb828e | |
| parent | Add ~arm keyword (diff) | |
| download | gentoo-2-58214b7a63dba7fbeced2583459a766f25f7ede2.tar.gz gentoo-2-58214b7a63dba7fbeced2583459a766f25f7ede2.tar.bz2 gentoo-2-58214b7a63dba7fbeced2583459a766f25f7ede2.zip | |
Seems like git was bit different, fix not applying patch.
(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
| -rw-r--r-- | media-libs/libprojectm/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch | 39 |
2 files changed, 11 insertions, 34 deletions
diff --git a/media-libs/libprojectm/ChangeLog b/media-libs/libprojectm/ChangeLog index f716d4fbcf2b..50461cc814e3 100644 --- a/media-libs/libprojectm/ChangeLog +++ b/media-libs/libprojectm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libprojectm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.49 2013/01/21 20:03:46 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.50 2013/01/21 20:09:09 scarabeus Exp $ + + 21 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> + files/libprojectm-2.1.0-multilib.patch: + Seems like git was bit different, fix not applying patch. 21 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> +files/libprojectm-2.1.0-multilib.patch, diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch index 229d0fd22559..8477a270df89 100644 --- a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch +++ b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch @@ -1,27 +1,16 @@ -From 38d610ed8f9dd1390c37e341435a4c3d1837d8be Mon Sep 17 00:00:00 2001 -From: Tomas Chvatal <tchvatal@suse.cz> -Date: Mon, 21 Jan 2013 21:00:07 +0100 -Subject: [PATCH] Fix multilib issues in libprojectM and projectM-qt - ---- - src/libprojectM/CMakeLists.txt | 6 +++--- - src/projectM-qt/CMakeLists.txt | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt -index 8f275c8..3bccf05 100644 ---- a/src/libprojectM/CMakeLists.txt -+++ b/src/libprojectM/CMakeLists.txt -@@ -35,7 +35,7 @@ set(PROJECTM_ABI_LEVEL 2) +diff -urN projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt projectM-complete-2.1.0-Source.new/src/libprojectM/CMakeLists.txt +--- projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt 2012-05-20 05:43:26.000000000 +0200 ++++ projectM-complete-2.1.0-Source.new/src/libprojectM/CMakeLists.txt 2013-01-21 21:07:49.097541426 +0100 +@@ -35,7 +35,7 @@ - ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\") + ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"") -SET(LIB_INSTALL_DIR "\${exec_prefix}/lib" +SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" FORCE) -@@ -234,7 +234,7 @@ ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fon +@@ -234,7 +234,7 @@ FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga") INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets) INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders) @@ -31,19 +20,3 @@ index 8f275c8..3bccf05 100644 INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM) -INSTALL(TARGETS projectM DESTINATION lib) +INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX}) -diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt -index 750d1ed..ed14840 100644 ---- a/src/projectM-qt/CMakeLists.txt -+++ b/src/projectM-qt/CMakeLists.txt -@@ -131,6 +131,6 @@ include_directories(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR - target_link_libraries(projectM-qt projectM GLEW GL ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES}) - - install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt) --install(TARGETS projectM-qt DESTINATION lib) --install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib/pkgconfig) -+install(TARGETS projectM-qt DESTINATION lib${LIB_SUFFIX}) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig) - install(FILES "images/icons/prjm16-transparent.svg" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) --- -1.7.12.4 - |