pool/qmmp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 680984 from home:alois:branches:multimedia:apps

Browse Source 
- Update to version 1.3.1
  * added projectM 3.1 support
  * added feature to determine plugin prefix via pkgconfig (Chris
    Spiegel)
  * fixed current track text color in the qsui plugin
  * fixed command line processing under Windows
  * fixed AAC support
  * fixed kwin.sh script (D1mon)
  * updated Polish translation (mrerexx)
  * updated Portuguese translation (Sérgio Marques)
  * updated Finnish translation (Jiri Grönroos)
  * updated Russian translation (Alexey Loginov)
- Dropped qmmp-projectM-qt5.patch

OBS-URL: https://build.opensuse.org/request/show/680984
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=131
This commit is contained in:
Alexei Sorokin 2019-03-02 18:30:27 +00:00 committed by Git OBS Bridge
parent e0840d0671
commit 39d089c936
5 changed files with 23 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmmp-1.3.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4da9884b598ac7157a353178eb022f3d56017df3096b3c367b9ae8e8b5dd2cfe
size 1220426

3
qmmp-1.3.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1cd2dd430a12e987720d30832e9ead8220ce9fcc9b871d45bed0e4bbe25fbeb6
size 1221322

52
qmmp-projectM-qt5.patch
View File

@ -1,52 +0,0 @@
--- a/src/plugins/Visual/projectm/CMakeLists.txt
+++ b/src/plugins/Visual/projectm/CMakeLists.txt
@@ -9,14 +9,14 @@ link_directories(${CMAKE_CURRENT_BINARY_
# projectM
MESSAGE(STATUS "Found OpenGL implementation: ${Qt5Gui_OPENGL_IMPLEMENTATION}")
IF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
- pkg_search_module(PROJECTM libprojectM>=2.0.0)
+ pkg_search_module(PROJECTM libprojectM-qt5>=2.0.0)
ADD_DEFINITIONS(${PROJECTM_CFLAGS})
ELSE(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
MESSAGE(WARNING "Unsuppoted OpenGL implementation, projectM disabled")
ENDIF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
find_file(PROJECTM_CONFIG config.inp
- PATHS "/usr/share/projectM/" "/usr/local/share/projectM/")
+ PATHS "/usr/share/projectM-qt5/" "/usr/local/share/projectM/")
IF(PROJECTM_CONFIG)
SET(libprojectm_DEFINES PROJECTM_CONFIG=\"${PROJECTM_CONFIG}\")
--- a/src/plugins/Visual/projectm/projectmplugin.cpp
+++ b/src/plugins/Visual/projectm/projectmplugin.cpp
@@ -28,7 +28,7 @@
#include <math.h>
#include <stdlib.h>
#include <locale.h>
-#include <libprojectM/projectM.hpp>
+#include <libprojectM-qt5/projectM.hpp>
#include <qmmp/buffer.h>
#include <qmmp/output.h>
#include "projectmwidget.h"
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
@@ -35,7 +35,7 @@
#include "projectmwidget.h"
#ifndef PROJECTM_CONFIG
-#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
+#define PROJECTM_CONFIG "/usr/share/projectM-qt5/config.inp"
#endif
ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
--- a/src/plugins/Visual/projectm/projectmwrapper.h
+++ b/src/plugins/Visual/projectm/projectmwrapper.h
@@ -22,7 +22,7 @@
#define PROJECTMWRAPPER_H
#include <QObject>
-#include <libprojectM/projectM.hpp>
+#include <libprojectM-qt5/projectM.hpp>
class ProjectMWrapper : public QObject, public projectM
{

18
qmmp.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Sat Mar 2 16:11:19 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
- Update to version 1.3.1
* added projectM 3.1 support
* added feature to determine plugin prefix via pkgconfig (Chris
Spiegel)
* fixed current track text color in the qsui plugin
* fixed command line processing under Windows
* fixed AAC support
* fixed kwin.sh script (D1mon)
* updated Polish translation (mrerexx)
* updated Portuguese translation (Sérgio Marques)
* updated Finnish translation (Jiri Grönroos)
* updated Russian translation (Alexey Loginov)
- Dropped qmmp-projectM-qt5.patch
-------------------------------------------------------------------
Fri Mar 1 15:55:31 UTC 2019 - olaf@aepfle.de

7
qmmp.spec
View File

@ -21,7 +21,7 @@
%bcond_with faad
%bcond_with restricted
Name: qmmp
Version: 1.3.0
Version: 1.3.1
Release: 0
Summary: Qt-based Multimedia Player
License: GPL-2.0-or-later
@ -36,8 +36,6 @@ Patch0: %{name}-fix_cdda_version.patch
Patch1: %{name}-default-pulse.patch
# PATCH-FIX-OPENSUSE qmmp-fix-openmpt.patch -- Fix OpenMPT compatibility.
Patch2: %{name}-fix-openmpt.patch
# PATCH-FIX-OPENSUSE qmmp-projectM-qt5.patch -- links to projectM-qt5
Patch3: %{name}-projectM-qt5.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
@ -67,7 +65,7 @@ BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libgme)
BuildRequires: pkgconfig(libmms)
BuildRequires: pkgconfig(libmodplug)
BuildRequires: pkgconfig(libprojectM-qt5)
BuildRequires: pkgconfig(libprojectM) >= 3.1.0
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libpulse-simple)
BuildRequires: pkgconfig(libsidplayfp)
@ -147,7 +145,6 @@ Development files for libqmmp.
%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%cmake \