From 533852830f5c671263b540971ad0545d9cba5825 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 12 Mar 2017 00:39:33 +0100 Subject: [PATCH] - updated to 2.0.1 - need adding new subpackages - drop static lib --- 01-change-texture-size.patch | 33 -------------- 04-change-preset-duration.patch | 37 --------------- 06-fix-numeric-locale.patch | 81 --------------------------------- as-needed.patch | 11 ----- c++14.patch | 61 +++++++++++++++++++++++++ freetype.patch | 10 ---- libprojectM-fonts.patch | 22 --------- libprojectM-pkgconfig.patch | 20 -------- libprojectM-soname.patch | 12 ----- libprojectM-static.patch | 53 --------------------- libprojectM.spec | 50 +++++--------------- paths.patch | 33 ++++++++++++++ pkgconfig.patch | 20 ++++++++ test-link.patch | 15 ++++++ 14 files changed, 141 insertions(+), 317 deletions(-) delete mode 100644 01-change-texture-size.patch delete mode 100644 04-change-preset-duration.patch delete mode 100644 06-fix-numeric-locale.patch delete mode 100644 as-needed.patch create mode 100644 c++14.patch delete mode 100644 freetype.patch delete mode 100644 libprojectM-fonts.patch delete mode 100644 libprojectM-pkgconfig.patch delete mode 100644 libprojectM-soname.patch delete mode 100644 libprojectM-static.patch create mode 100644 paths.patch create mode 100644 pkgconfig.patch create mode 100644 test-link.patch diff --git a/01-change-texture-size.patch b/01-change-texture-size.patch deleted file mode 100644 index a56cc09..0000000 --- a/01-change-texture-size.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: projectM.cpp -=================================================================== ---- projectM.cpp (revision 1048) -+++ projectM.cpp (revision 1049) -@@ -907,3 +907,13 @@ - } - - -+void projectM::changeTextureSize(int size) { -+ _settings.textureSize = size; -+ -+ delete renderer; -+ renderer = new Renderer(_settings.windowWidth, _settings.windowHeight, -+ _settings.meshX, _settings.meshY, -+ _settings.textureSize, beatDetect, _settings.presetURL, -+ _settings.titleFontURL, _settings.menuFontURL); -+} -+ -Index: projectM.hpp -=================================================================== ---- projectM.hpp (revision 1048) -+++ projectM.hpp (revision 1049) -@@ -153,9 +153,9 @@ - virtual ~projectM(); - - -+ void changeTextureSize(int size); - - -- - const Settings & settings() const { - return _settings; - } diff --git a/04-change-preset-duration.patch b/04-change-preset-duration.patch deleted file mode 100644 index 4df146b..0000000 --- a/04-change-preset-duration.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: TimeKeeper.hpp -=================================================================== ---- TimeKeeper.hpp (revision 1063) -+++ TimeKeeper.hpp (revision 1064) -@@ -37,6 +37,8 @@ - - double sampledPresetDuration(); - -+ void ChangePresetDuration(int seconds) { _presetDuration = seconds; } -+ - #ifndef WIN32 - /* The first ticks value of the application */ - struct timeval startTime; -Index: projectM.cpp -=================================================================== ---- projectM.cpp (revision 1063) -+++ projectM.cpp (revision 1064) -@@ -917,3 +917,7 @@ - _settings.titleFontURL, _settings.menuFontURL); - } - -+void projectM::changePresetDuration(int seconds) { -+ timeKeeper->ChangePresetDuration(seconds); -+} -+ -Index: projectM.hpp -=================================================================== ---- projectM.hpp (revision 1063) -+++ projectM.hpp (revision 1064) -@@ -154,6 +154,7 @@ - - - void changeTextureSize(int size); -+ void changePresetDuration(int seconds); - - - const Settings & settings() const { diff --git a/06-fix-numeric-locale.patch b/06-fix-numeric-locale.patch deleted file mode 100644 index dfbf59f..0000000 --- a/06-fix-numeric-locale.patch +++ /dev/null @@ -1,81 +0,0 @@ -Index: MilkdropPresetFactory/Parser.cpp -=================================================================== ---- MilkdropPresetFactory/Parser.cpp (revision 1510) -+++ MilkdropPresetFactory/Parser.cpp (working copy) -@@ -1269,28 +1269,13 @@ - /* Parses a floating point number */ - int Parser::string_to_float(char * string, float * float_ptr) - { -+ std::istringstream stream(string); -+ stream >> *float_ptr; - -- char ** error_ptr; -- -- if (*string == 0) -+ if (stream.fail()) - return PROJECTM_PARSE_ERROR; - -- error_ptr = (char**)wipemalloc(sizeof(char**)); -- -- (*float_ptr) = strtod(string, error_ptr); -- -- /* These imply a succesful parse of the string */ -- if ((**error_ptr == '\0') || (**error_ptr == '\r')) -- { -- free(error_ptr); -- error_ptr = NULL; -- return PROJECTM_SUCCESS; -- } -- -- (*float_ptr) = 0; -- free(error_ptr); -- error_ptr = NULL; -- return PROJECTM_PARSE_ERROR; -+ return PROJECTM_SUCCESS; - } - - /* Parses a floating point number */ -@@ -1298,11 +1283,9 @@ - { - - char string[MAX_TOKEN_SIZE]; -- char ** error_ptr; - token_t token; - int sign; - -- error_ptr =(char**) wipemalloc(sizeof(char**)); - - token = parseToken(fs, string); - -@@ -1322,28 +1305,13 @@ - - if (string[0] == 0) - { -- free(error_ptr); -- error_ptr = NULL; - return PROJECTM_PARSE_ERROR; - } - -- (*float_ptr) = sign*strtod(string, error_ptr); -+ std::istringstream stream(string); -+ stream >> *float_ptr; - -- /* No conversion was performed */ -- if ((**error_ptr == '\0') || (**error_ptr == '\r')) -- { -- free(error_ptr); -- error_ptr = NULL; -- return PROJECTM_SUCCESS; -- } -- -- if (PARSE_DEBUG) printf("parse_float: float conversion failed for string \"%s\"\n", string); -- -- (*float_ptr) = 0; -- free(error_ptr); -- error_ptr = NULL; -- return PROJECTM_PARSE_ERROR; -- -+ return PROJECTM_SUCCESS; - } - - /* Parses a per frame equation. That is, interprets a stream of data as a per frame equation */ diff --git a/as-needed.patch b/as-needed.patch deleted file mode 100644 index 794b77b..0000000 --- a/as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- projectM-2.0.1-Source/CMakeLists.txt~ 2010-07-07 10:17:35.000000000 +0300 -+++ projectM-2.0.1-Source/CMakeLists.txt 2010-07-07 10:18:19.717075182 +0300 -@@ -180,7 +180,7 @@ - TARGET_LINK_LIBRARIES(projectM-static ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) - endif(BUILD_PROJECTM_STATIC) - --TARGET_LINK_LIBRARIES(projectM-shared ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) -+TARGET_LINK_LIBRARIES(projectM-shared ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} m dl ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS}) - - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc.in" "${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc" @ONLY) - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_SOURCE_DIR}/config.inp" @ONLY) diff --git a/c++14.patch b/c++14.patch new file mode 100644 index 0000000..8cb409a --- /dev/null +++ b/c++14.patch @@ -0,0 +1,61 @@ +diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp +--- projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp 2012-05-20 04:43:26.000000000 +0100 ++++ projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp 2016-03-17 05:00:14.176905540 +0000 +@@ -63,7 +63,8 @@ extern FILE *fmemopen(void *buf, size_t + + #ifdef LINUX + #include +-#define projectM_isnan isnan ++#include ++#define projectM_isnan std::isnan + + #endif + +diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp +--- projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2012-05-20 04:43:26.000000000 +0100 ++++ projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2016-03-17 05:00:14.177905556 +0000 +@@ -1406,7 +1406,7 @@ PerFrameEqn * Parser::parse_implicit_per + PerFrameEqn * per_frame_eqn; + GenExpr * gen_expr; + +- if (fs == NULL) ++ if (!fs) + return NULL; + if (param_string == NULL) + return NULL; +@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_ + + if (preset == NULL) + return NULL; +- if (fs == NULL) ++ if (!fs) + return NULL; + + if ((token = parseToken(fs, name)) != tEq) +@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token + /* Null argument checks */ + if (preset == NULL) + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (token == NULL) + return PROJECTM_FAILURE; +@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std + + if (token == NULL) + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (preset == NULL) + return PROJECTM_FAILURE; +@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, st + if (token == NULL) + + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (preset == NULL) + return PROJECTM_FAILURE; diff --git a/freetype.patch b/freetype.patch deleted file mode 100644 index 2144c02..0000000 --- a/freetype.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- projectM-2.0.1-Source/cmake/FindFreetype2.cmake~ 2009-12-06 02:42:51.000000000 +0100 -+++ projectM-2.0.1-Source/cmake/FindFreetype2.cmake 2014-01-21 08:52:56.633206453 +0100 -@@ -68,6 +68,7 @@ - ) - - FIND_PATH(FREETYPE2_FT2BUILD ft2build.h -+ ${FREETYPE2_INCLUDE_DIR} - ${ADDITIONAL_INCLUDE_PATH} - /usr/include - /usr/X11/include diff --git a/libprojectM-fonts.patch b/libprojectM-fonts.patch deleted file mode 100644 index a468dbb..0000000 --- a/libprojectM-fonts.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libprojectM-1.2.0SVN12092008-orig/CMakeLists.txt 2008-12-09 00:39:53.000000000 -0500 -+++ libprojectM-1.2.0SVN12092008/CMakeLists.txt 2008-12-09 00:40:13.000000000 -0500 -@@ -169,8 +169,6 @@ - - FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga") - INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets) --FILE(GLOB fonts "fonts/*.ttf") --INSTALL(FILES ${fonts} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/fonts) - INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM) ---- libprojectM-2.0.1-orig/config.inp.in 2010-01-16 17:23:11.000000000 -0500 -+++ libprojectM-2.0.1/config.inp.in 2010-04-05 14:53:21.000000000 -0400 -@@ -17,6 +17,6 @@ - Aspect Correction = true # Custom Shape Aspect Correction - - Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location --Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf --Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf -+Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/TTF/Vera.ttf -+Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/TTF/VeraMono.ttf - diff --git a/libprojectM-pkgconfig.patch b/libprojectM-pkgconfig.patch deleted file mode 100644 index bb0f7b1..0000000 --- a/libprojectM-pkgconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- projectM-2.0.1-Source/CMakeLists.txt~ 2010-07-08 16:07:06.780358558 +0200 -+++ projectM-2.0.1-Source/CMakeLists.txt 2010-07-08 16:12:21.173660854 +0200 -@@ -35,6 +35,7 @@ - OPTION (DISABLE_MILKDROP_PRESETS "Turn off support for Milkdrop (.milk / .prjm) presets" OFF) - - ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"") -+ADD_DEFINITIONS(-DCMAKE_LIB_DIR="\\\"${CMAKE_LIB_DIR}\\\"") - - if (USE_NATIVE_GLEW) - ADD_DEFINITIONS(-DUSE_NATIVE_GLEW) ---- projectM-2.0.1-Source/libprojectM.pc.in~ 2009-12-06 02:42:51.000000000 +0100 -+++ projectM-2.0.1-Source/libprojectM.pc.in 2010-07-08 16:14:05.757817030 +0200 -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@LIB_INSTALL_DIR@ -+libdir=@CMAKE_LIB_DIR@ - includedir=@CMAKE_INSTALL_PREFIX@/include - pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ - sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ diff --git a/libprojectM-soname.patch b/libprojectM-soname.patch deleted file mode 100644 index 4e8f9c4..0000000 --- a/libprojectM-soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libprojectM-2.0.1-orig/CMakeLists.txt libprojectM-2.0.1/CMakeLists.txt ---- libprojectM-2.0.1-orig/CMakeLists.txt 2010-01-16 17:23:11.000000000 -0500 -+++ libprojectM-2.0.1/CMakeLists.txt 2010-01-16 17:23:40.000000000 -0500 -@@ -110,7 +110,7 @@ - ADD_LIBRARY(projectM SHARED ${projectM_SOURCES}) - endif(BUILD_PROJECTM_STATIC) - --SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2) -+SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2) - - ADD_DEFINITIONS(-DUSE_THREADS) - diff --git a/libprojectM-static.patch b/libprojectM-static.patch deleted file mode 100644 index db7cc24..0000000 --- a/libprojectM-static.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- projectM-2.0.1-Source/CMakeLists.txt~ 2010-07-07 09:10:35.000000000 +0300 -+++ projectM-2.0.1-Source/CMakeLists.txt 2010-07-07 09:13:39.657686690 +0300 -@@ -29,7 +29,7 @@ - - OPTION (USE_CG "Use Cg for Pixel Shader support" OFF) - --OPTION (BUILD_PROJECTM_STATIC "Build the projectM target library in the platform's native static (NOT shared) format." OFF) -+OPTION (BUILD_PROJECTM_STATIC "Build the projectM target library in the platform's native static format." OFF) - - OPTION (DISABLE_NATIVE_PRESETS "Turn off support for native (C++ style) presets" OFF) - OPTION (DISABLE_MILKDROP_PRESETS "Turn off support for Milkdrop (.milk / .prjm) presets" OFF) -@@ -48,12 +48,12 @@ - endif(USE_FBO) - - if (BUILD_PROJECTM_STATIC) --ADD_LIBRARY(projectM STATIC ${projectM_SOURCES}) --else(BUILD_PROJECTM_STATIC) --ADD_LIBRARY(projectM SHARED ${projectM_SOURCES}) -+ ADD_LIBRARY(projectM-static STATIC ${projectM_SOURCES}) -+ SET_TARGET_PROPERTIES(projectM-static PROPERTIES OUTPUT_NAME projectM) - endif(BUILD_PROJECTM_STATIC) -+ADD_LIBRARY(projectM-shared SHARED ${projectM_SOURCES}) - --SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2) -+SET_TARGET_PROPERTIES(projectM-shared PROPERTIES VERSION 2.0.1 SOVERSION 2 OUTPUT_NAME projectM) - - if (APPLE) - ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS) -@@ -177,13 +177,10 @@ - LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR}) - - if(BUILD_PROJECTM_STATIC) -- TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) --else(BUILD_PROJECTM_STATIC) -- --TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) -- -+ TARGET_LINK_LIBRARIES(projectM-static ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) - endif(BUILD_PROJECTM_STATIC) - -+TARGET_LINK_LIBRARIES(projectM-shared ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) - - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc.in" "${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc" @ONLY) - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_SOURCE_DIR}/config.inp" @ONLY) -@@ -196,4 +193,7 @@ - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_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${LIB_SUFFIX}) -+if (BUILD_PROJECTM_STATIC) -+ INSTALL(TARGETS projectM-static DESTINATION lib${LIB_SUFFIX}) -+endif(BUILD_PROJECTM_STATIC) -+INSTALL(TARGETS projectM-shared DESTINATION lib${LIB_SUFFIX}) diff --git a/libprojectM.spec b/libprojectM.spec index f0f49ff..b01ff3c 100644 --- a/libprojectM.spec +++ b/libprojectM.spec @@ -15,22 +15,17 @@ Summary: Awesome music visualizer Summary(pl.UTF-8): Imponujący wizualizator muzyki Name: libprojectM -Version: 2.0.1 -Release: 10 +Version: 2.1.0 +Release: 0.1 Epoch: 1 License: LGPL v2.1+ Group: Libraries -Source0: http://downloads.sourceforge.net/project/projectm/%{version}/projectM-%{version}-Source.tar.gz -# Source0-md5: f8bf795878cdbbef54784cf2390b4c89 -Patch0: %{name}-soname.patch -Patch1: %{name}-fonts.patch -Patch2: %{name}-static.patch -Patch3: as-needed.patch -Patch4: %{name}-pkgconfig.patch -Patch5: 01-change-texture-size.patch -Patch6: 04-change-preset-duration.patch -Patch7: 06-fix-numeric-locale.patch -Patch8: freetype.patch +Source0: http://downloads.sourceforge.net/project/projectm/%{version}/projectM-complete-%{version}-Source.tar.gz +# Source0-md5: debf30f7ce94ff0102f06fbb0cc4e92b +Patch0: paths.patch +Patch1: pkgconfig.patch +Patch2: c++14.patch +Patch3: test-link.patch URL: http://projectm.sourceforge.net/ BuildRequires: OpenGL-devel BuildRequires: cmake >= 2.6.0 @@ -71,37 +66,20 @@ Header files for projectM library. %description devel -l pl.UTF-8 Pliki nagłówkowe biblioteki projectM. -%package static -Summary: Static projectM library -Summary(pl.UTF-8): Statyczna biblioteka projectM -Group: Development/Libraries -Requires: %{name}-devel = %{epoch}:%{version}-%{release} - -%description static -Static projectM library. - -%description static -l pl.UTF-8 -Statyczna biblioteka projectM. - %prep -%setup -q -n projectM-%{version}-Source -%undos config.inp.in +%setup -q -n projectM-complete-%{version}-Source %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p0 -%patch6 -p0 -%patch7 -p0 -%patch8 -p1 %build install -d build cd build %cmake \ -DCMAKE_LIB_DIR=%{_libdir} \ - -DBUILD_PROJECTM_STATIC=yes \ + -DprojectM_FONT_MENU="/usr/share/fonts/TTF/Vera.ttf" \ + -DprojectM_FONT_TITLE="/usr/share/fonts/TTF/VeraMono.ttf" \ ../ %{__make} @@ -119,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) # COPYING is just license information, not actual LGPL text -%doc COPYING ChangeLog +%doc src/libprojectM/{COPYING,ChangeLog} %attr(755,root,root) %{_libdir}/libprojectM.so.*.* %attr(755,root,root) %ghost %{_libdir}/libprojectM.so.2 %dir %{_datadir}/%{pkgname} @@ -136,7 +114,3 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libprojectM.so %{_includedir}/%{name} %{_pkgconfigdir}/libprojectM.pc - -%files static -%defattr(644,root,root,755) -%{_libdir}/libprojectM.a diff --git a/paths.patch b/paths.patch new file mode 100644 index 0000000..72e4ebb --- /dev/null +++ b/paths.patch @@ -0,0 +1,33 @@ +--- projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt.orig 2012-05-19 23:43:26.000000000 -0400 ++++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt 2014-05-21 15:52:59.847413848 -0400 +@@ -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) + +@@ -131,6 +131,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) +@@ -234,7 +234,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}) diff --git a/pkgconfig.patch b/pkgconfig.patch new file mode 100644 index 0000000..2dbe791 --- /dev/null +++ b/pkgconfig.patch @@ -0,0 +1,20 @@ +--- projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt~ 2012-05-20 05:43:26.000000000 +0200 ++++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt 2017-03-12 00:27:28.921676820 +0100 +@@ -34,6 +34,7 @@ + # + + ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}") ++ADD_DEFINITIONS(-DCMAKE_LIB_DIR="${CMAKE_LIB_DIR}") + + SET(LIB_INSTALL_DIR "\${exec_prefix}/lib" + CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" +--- projectM-complete-2.1.0-Source/src/libprojectM/libprojectM.pc.in~ 2012-05-20 05:43:26.000000000 +0200 ++++ projectM-complete-2.1.0-Source/src/libprojectM/libprojectM.pc.in 2017-03-12 00:28:04.319482765 +0100 +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@LIB_INSTALL_DIR@ +++libdir=@CMAKE_LIB_DIR@ + includedir=@CMAKE_INSTALL_PREFIX@/include + pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ + sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ diff --git a/test-link.patch b/test-link.patch new file mode 100644 index 0000000..f7a69c5 --- /dev/null +++ b/test-link.patch @@ -0,0 +1,15 @@ +diff -ur projectM-complete-2.1.0-Source/src/projectM-test/CMakeLists.txt projectM-complete-2.1.0-Source-gl/src/projectM-test/CMakeLists.txt +--- projectM-complete-2.1.0-Source/src/projectM-test/CMakeLists.txt 2012-05-20 05:43:26.000000000 +0200 ++++ projectM-complete-2.1.0-Source-gl/src/projectM-test/CMakeLists.txt 2017-03-11 23:16:53.922207194 +0100 +@@ -38,8 +38,8 @@ + INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR}) + LINK_DIRECTORIES(${PROJECTM_LINK}) + +-TARGET_LINK_LIBRARIES(projectM-test projectM ${SDL_LIBRARY}) +-TARGET_LINK_LIBRARIES(projectM-test-memleak projectM ${SDL_LIBRARY} ) +-TARGET_LINK_LIBRARIES(projectM-test-texture projectM ${SDL_LIBRARY} ) ++TARGET_LINK_LIBRARIES(projectM-test projectM ${SDL_LIBRARY} ${OPENGL_LIBRARIES} ) ++TARGET_LINK_LIBRARIES(projectM-test-memleak projectM ${SDL_LIBRARY} ${OPENGL_LIBRARIES} ) ++TARGET_LINK_LIBRARIES(projectM-test-texture projectM ${SDL_LIBRARY} ${OPENGL_LIBRARIES} ) + + INSTALL(TARGETS projectM-test projectM-test-texture DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) -- 2.43.0