File projectM-2.1.0-SUSE_misc.patch of Package projectM

Overview Repositories Revisions Requests Users Attributes Meta

File projectM-2.1.0-SUSE_misc.patch of Package projectM (Revision b7568645c53e98430eef60f9cd8a1f5f)

Currently displaying revision b7568645c53e98430eef60f9cd8a1f5f , Show latest

From: Luigi Baldoni <aloisio@gmx.com>
Date: 2017-07-23 08:16:42 +0200
Subject: Fix a number of SUSE-specific quirks

Set correct paths, fonts, desktop categories and remove warnings

Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
===================================================================
--- projectM-complete-2.1.0-Source.orig/src/libprojectM/CMakeLists.txt
+++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
@@ -33,9 +33,9 @@ set(PROJECTM_VERSION 2.1.0)
 set(PROJECTM_ABI_LEVEL 2)
 #
 
-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)
 
@@ -109,7 +109,6 @@ else(BUILD_PROJECTM_STATIC)
 	ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
 endif(BUILD_PROJECTM_STATIC)
 
-set_property(TARGET projectM PROPERTY LINK_INTERFACE_LIBRARIES "")
 set_property(TARGET projectM PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES "")
 SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION ${PROJECTM_VERSION} SOVERSION ${PROJECTM_ABI_LEVEL})
 
@@ -215,10 +214,10 @@ else(BUILD_PROJECTM_STATIC)
 	)
 endif(BUILD_PROJECTM_STATIC)
 
-SET(projectM_FONT_MENU "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" CACHE FILEPATH "Path to the default menu TrueType font")
-SET(projectM_FONT_TITLE "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" CACHE FILEPATH "Path to the default title TrueType font")
-ADD_DEFINITIONS(-DprojectM_FONT_MENU="\\\"${projectM_FONT_MENU}\\\"")
-ADD_DEFINITIONS(-DprojectM_FONT_TITLE="\\\"${projectM_FONT_TITLE}\\\"")
+SET(projectM_FONT_MENU "/usr/share/fonts/truetype/DejaVuSansMono.ttf")
+SET(projectM_FONT_TITLE "/usr/share/fonts/truetype/DejaVuSans.ttf")
+ADD_DEFINITIONS(-DprojectM_FONT_MENU="${projectM_FONT_MENU}")
+ADD_DEFINITIONS(-DprojectM_FONT_TITLE="${projectM_FONT_TITLE}")
 
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc" @ONLY)
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.inp" @ONLY)
@@ -234,7 +233,7 @@ ENDIF(projectM_FONT_MENU MATCHES "${CMAK
 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)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
 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})
Index: projectM-complete-2.1.0-Source/src/projectM-qt/CMakeLists.txt
===================================================================
--- projectM-complete-2.1.0-Source.orig/src/projectM-qt/CMakeLists.txt
+++ projectM-complete-2.1.0-Source/src/projectM-qt/CMakeLists.txt
@@ -111,7 +111,6 @@ else(BUILD_PROJECTM_QT_STATIC)
 ADD_LIBRARY(projectM-qt SHARED ${projectM-qt_SRCS} ${projectM-qt_RC_SRCS} ${projectM-qt_MOC_SRCS} ${projectM-qt_UIS_H})
 endif(BUILD_PROJECTM_QT_STATIC)
 
-set_property(TARGET projectM-qt PROPERTY LINK_INTERFACE_LIBRARIES "")
 set_property(TARGET projectM-qt PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES "")
 SET_TARGET_PROPERTIES(projectM-qt PROPERTIES VERSION ${PROJECTM_QT_VERSION} SOVERSION ${PROJECTM_QT_ABI_LEVEL})
 
@@ -131,6 +130,6 @@ include_directories(${PROJECTM_INCLUDE}
 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)
Index: projectM-complete-2.1.0-Source/src/projectM-pulseaudio/projectM-pulseaudio.desktop
===================================================================
--- projectM-complete-2.1.0-Source.orig/src/projectM-pulseaudio/projectM-pulseaudio.desktop
+++ projectM-complete-2.1.0-Source/src/projectM-pulseaudio/projectM-pulseaudio.desktop
@@ -6,4 +6,4 @@ Exec=projectM-pulseaudio
 Icon=prjm16-transparent
 Terminal=false
 Type=Application
-Categories=AudioVideo;Audio;
+Categories=AudioVideo;Audio;Mixer;
Index: projectM-complete-2.1.0-Source/src/projectM-libvisual/CMakeLists.txt
===================================================================
--- projectM-complete-2.1.0-Source.orig/src/projectM-libvisual/CMakeLists.txt
+++ projectM-complete-2.1.0-Source/src/projectM-libvisual/CMakeLists.txt
@@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 2.4.0)
 
 INCLUDE(cmake/CPack-projectM.cmake)
 
+if(COMMAND cmake_policy)
+    cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
+
 ADD_LIBRARY(projectM_libvisual SHARED actor_projectM.cpp lvtoprojectM.h ConfigFile.h ConfigFile.cpp)
 
 INCLUDE(FindPkgConfig.cmake)
Index: projectM-complete-2.1.0-Source/src/libprojectM/libprojectM.pc.in
===================================================================
--- projectM-complete-2.1.0-Source.orig/src/libprojectM/libprojectM.pc.in
+++ projectM-complete-2.1.0-Source/src/libprojectM/libprojectM.pc.in
@@ -10,4 +10,4 @@ Version: @PROJECTM_VERSION@
 Description: projectM - OpenGL Milkdrop
 Requires:
 Libs: -L${libdir} -lprojectM
-Cflags: -I${includedir}
+Cflags: -I${includedir}/libprojectM
Index: projectM-complete-2.1.0-Source/src/projectM-qt/libprojectM-qt.pc.in
===================================================================
--- projectM-complete-2.1.0-Source.orig/src/projectM-qt/libprojectM-qt.pc.in
+++ projectM-complete-2.1.0-Source/src/projectM-qt/libprojectM-qt.pc.in
@@ -9,5 +9,5 @@ Name: libprojectM-qt
 Version: 1.2.0
 Description: projectM-qt provides a full featured Qt4 graphical user interface to projectM
 Requires: libprojectM QtCore QtGui QtXml QtOpenGL
-+Libs: -L${libdir} -lprojectM-qt
-+Cflags: -I${includedir} 
+Libs: -L${libdir} -lprojectM-qt
+Cflags: -I${includedir}/libprojectM-qt

Places

File projectM-2.1.0-SUSE_misc.patch of Package projectM (Revision b7568645c53e98430eef60f9cd8a1f5f)

Places