commit visualjackm for openSUSE:Factory

Hello community, here is the log from the commit of package visualjackm for openSUSE:Factory checked in at 2017-08-16 16:13:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/visualjackm (Old) and /work/SRC/openSUSE:Factory/.visualjackm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "visualjackm" Wed Aug 16 16:13:48 2017 rev:2 rq:515891 version:0.0+20120307 Changes: -------- --- /work/SRC/openSUSE:Factory/visualjackm/visualjackm.changes 2017-02-03 20:04:38.942233199 +0100 +++ /work/SRC/openSUSE:Factory/.visualjackm.new/visualjackm.changes 2017-08-16 16:13:57.131374855 +0200 @@ -1,0 +2,6 @@ +Wed Jul 26 20:04:27 UTC 2017 - aloisio@gmx.com + +- Added visualjackm-projectM-qt5.patch and switched build to Qt5 +- Added visualjackm.png as app icon + +------------------------------------------------------------------- New: ---- visualjackm-projectM-qt5.patch visualjackm.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ visualjackm.spec ++++++ --- /var/tmp/diff_new_pack.gptehQ/_old 2017-08-16 16:13:57.903266506 +0200 +++ /var/tmp/diff_new_pack.gptehQ/_new 2017-08-16 16:13:57.907265945 +0200 @@ -24,47 +24,49 @@ License: GPL-2.0+ Group: System/Sound Daemons Url: https://bitbucket.org/asiniscalchi/visualjackm -Source: visualjackm-20120307.tar.bz2 +Source0: visualjackm-20120307.tar.bz2 +Source1: visualjackm.png +# PATCH-FIX-OPENSUSE visualjackm-projectM-qt5.patch -- build with Qt5 +Patch0: visualjackm-projectM-qt5.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: glibc-devel BuildRequires: libqjack-devel BuildRequires: make BuildRequires: pkgconfig -BuildRequires: projectM-devel BuildRequires: update-desktop-files -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(libprojectM-qt-qt5) +BuildRequires: pkgconfig(libprojectM-qt5) +Requires: jack %description This application lets you connect projectM visualization to jack. %prep %setup -q -n visualjackm +%patch0 -p1 %build -install -d build -pushd build -cmake \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DCMAKE_SKIP_RPATH=TRUE \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \ - -DCMAKE_CXX_FLAGS="%{optflags}" \ - .. +%cmake -DBUILD_SHARED_LIBS:BOOL=OFF make %{?_smp_mflags} -popd %install install -D -m0755 build/visualjackm \ - "%{buildroot}%{_bindir}/visualjackm" + %{buildroot}%{_bindir}/%{name} +install -D -m0644 %{SOURCE1} \ + %{buildroot}%{_datadir}/pixmaps/%{name}.png -%suse_update_desktop_file -c "%{name}" "%{name}" "Connect Jack to ProjectM" visualjackm "" AudioVideo Audio Midi -sed -i '/^Icon=/d' "%{buildroot}%{_datadir}/applications/%{name}.desktop" +%suse_update_desktop_file -c "%{name}" "%{name}" "Connect Jack to ProjectM" %{name} %{name} AudioVideo Midi %files %defattr(-,root,root) %doc README %{_bindir}/visualjackm %{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png %changelog ++++++ visualjackm-projectM-qt5.patch ++++++ From: Luigi Baldoni Date: 2017-07-25 20:19:47 +0200 Subject: Build with Qt5 Unofficial patch to build against Qt5 libraries Index: visualjackm/CMakeLists.txt =================================================================== --- visualjackm.orig/CMakeLists.txt +++ visualjackm/CMakeLists.txt @@ -1,15 +1,15 @@ project(VisualJackM) -cmake_minimum_required(VERSION 2.6) -find_package(Qt4 REQUIRED) +cmake_minimum_required(VERSION 2.8.11) -include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) -include_directories("/usr/include/libprojectM/") -#include_directories("/usr/include/libprojectM-qt/qprojectm_mainwindow.hpp") +find_package(Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(projectM-Qt5 REQUIRED libprojectM-qt5 libprojectM-qt-qt5) add_subdirectory(src) set(VisualJackM_SRCS main.cpp) -qt4_automoc(${VisualJackM_SRCS}) add_executable(visualjackm ${VisualJackM_SRCS}) -target_link_libraries(visualjackm ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} vjm projectM projectM-qt qjack jack) + +target_link_libraries(visualjackm Qt5::Widgets Qt5::OpenGL ${projectM-Qt5_LIBRARIES} vjm qjack) +target_include_directories(visualjackm PRIVATE ${projectM-Qt5_INCLUDE_DIRS}) Index: visualjackm/main.cpp =================================================================== --- visualjackm.orig/main.cpp +++ visualjackm/main.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include "src/visualjackm.h" @@ -8,7 +8,7 @@ int main(int argc, char** argv) { QApplication app(argc, argv); - VisualJackM * mainWindow = new VisualJackM("/usr/share/projectM/config.inp"); + VisualJackM * mainWindow = new VisualJackM("/usr/share/projectM-qt5/config.inp"); mainWindow->show(); mainWindow->start(); Index: visualjackm/src/visualjackm.h =================================================================== --- visualjackm.orig/src/visualjackm.h +++ visualjackm/src/visualjackm.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include class VisualJackM : public QProjectM_MainWindow { Index: visualjackm/src/CMakeLists.txt =================================================================== --- visualjackm.orig/src/CMakeLists.txt +++ visualjackm/src/CMakeLists.txt @@ -1,7 +1,8 @@ -include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${projectM-Qt5_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) set(VisualJackM_lib_SRCS visualjackm.cpp) -qt4_automoc(${VisualJackM_lib_SRCS}) +set(CMAKE_AUTOMOC ON) add_library(vjm ${VisualJackM_lib_SRCS}) +target_link_libraries(vjm Qt5::Widgets Qt5::OpenGL ${projectM-Qt5_LIBRARIES} qjack) Index: visualjackm/src/visualjackm.cpp =================================================================== --- visualjackm.orig/src/visualjackm.cpp +++ visualjackm/src/visualjackm.cpp @@ -20,7 +20,7 @@ #include "visualjackm.h" VisualJackM::VisualJackM(QString configFile): - QProjectM_MainWindow(configFile.toAscii().data(),0) + QProjectM_MainWindow(configFile.toLatin1().data(),0) { m_jClient = new QJack::QJackClient("VJM", this);