qmmp: bump version

This commit is contained in:
Gerasim Troeglazov
2025-03-08 23:34:08 +10:00
parent 32fbd198de
commit c872f05fc1
2 changed files with 113 additions and 176 deletions

View File

@@ -1,58 +1,71 @@
From 24f5b1d3dc8349cc4501267274f22d8c1bf927f4 Mon Sep 17 00:00:00 2001
From d8b8bfadf860e6139c1759a56eb17399b091de8e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 9 Jan 2022 00:21:32 +1000
Subject: Add haiku support
Date: Sat, 8 Mar 2025 23:09:49 +1000
Subject: Fix for Haiku
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 30255e3..9a9fa96 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -18,6 +18,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(qmmp ${app_SRCS})
target_link_libraries(qmmp PRIVATE Qt6::Widgets Qt6::Network libqmmp libqmmpui)
+if (HAIKU)
+ target_link_libraries(qmmp PRIVATE network)
+endif()
set_target_properties(qmmp PROPERTIES OUTPUT_NAME qmmp${APP_NAME_SUFFIX})
install(TARGETS qmmp DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt
index 9fd9cb0..7b1f703 100644
index 0fe4df1..af3fb93 100644
--- a/src/plugins/Input/gme/CMakeLists.txt
+++ b/src/plugins/Input/gme/CMakeLists.txt
@@ -9,16 +9,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
@@ -3,15 +3,10 @@ project(libgme)
include(CheckIncludeFileCXX)
# libgme
-CHECK_INCLUDE_FILE_CXX(gme/gme.h GME_HEADER_FOUND)
-FIND_LIBRARY(GME_LIB NAME gme PATHS /usr/lib /usr/lib32 /usr/local/lib /usr/local/lib32)
-
-IF(GME_HEADER_FOUND AND (NOT GME_LIB MATCHES "^.*-NOTFOUND"))
-SET(GME_FOUND TRUE CACHE INTERNAL "GME")
-MESSAGE(STATUS "Found Game Music Emu: ${GME_LIB}")
-ELSE(GME_HEADER_FOUND AND (NOT GME_LIB MATCHES "^.*-NOTFOUND"))
-MESSAGE(STATUS "Could not find Game Music Emu library")
-ENDIF(GME_HEADER_FOUND AND (NOT GME_LIB MATCHES "^.*-NOTFOUND"))
-check_include_file_cxx(gme/gme.h GME_HEADER_FOUND)
-find_library(GME_LIB NAME gme PATHS /usr/lib /usr/lib32 /usr/local/lib /usr/local/lib32)
-
-if(GME_HEADER_FOUND AND (NOT GME_LIB MATCHES "^.*-NOTFOUND"))
- set(GME_FOUND TRUE CACHE INTERNAL "GME")
- message(STATUS "Found Game Music Emu: ${GME_LIB}")
-else(GME_HEADER_FOUND AND (NOT GME_LIB MATCHES "^.*-NOTFOUND"))
- message(STATUS "Could not find Game Music Emu library")
-endif(GME_HEADER_FOUND AND (NOT GME_LIB MATCHES "^.*-NOTFOUND"))
+pkg_search_module(GME libgme)
+include_directories(${GME_INCLUDE_DIRS})
+link_directories(${GME_LIBRARY_DIRS})
+ADD_DEFINITIONS(${GME_CFLAGS})
SET(libgme_SRCS
decoder_gme.cpp
@@ -36,6 +30,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
IF(GME_FOUND)
ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_RCC_SRCS})
add_dependencies(gme libqmmp)
-target_link_libraries(gme PRIVATE Qt6::Widgets libqmmp ${GME_LIB})
+target_link_libraries(gme PRIVATE Qt6::Widgets libqmmp ${GME_LDFLAGS})
install(TARGETS gme DESTINATION ${PLUGIN_DIR}/Input)
ENDIF(GME_FOUND)
@@ -29,6 +24,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
if(GME_FOUND)
add_library(gme MODULE ${libgme_SRCS} ${libgme_RCC_SRCS})
- target_link_libraries(gme PRIVATE Qt6::Widgets libqmmp ${GME_LIB})
+ target_link_libraries(gme PRIVATE Qt6::Widgets libqmmp ${GME_LDFLAGS})
install(TARGETS gme DESTINATION ${PLUGIN_DIR}/Input)
endif(GME_FOUND)
diff --git a/src/plugins/Output/CMakeLists.txt b/src/plugins/Output/CMakeLists.txt
index c423f60..685bda0 100644
index f8929d2..b20bf44 100644
--- a/src/plugins/Output/CMakeLists.txt
+++ b/src/plugins/Output/CMakeLists.txt
@@ -10,6 +10,7 @@ SET(USE_DSOUND TRUE CACHE BOOL "enable/disable DirectSound plugin")
SET(USE_QTMULTIMEDIA TRUE CACHE BOOL "enable/disable Qt Multimedia output plugin")
SET(USE_WASAPI TRUE CACHE BOOL "enable/disable WASAPI plugin")
SET(USE_SHOUT TRUE CACHE BOOL "enable/disable Icecast plugin")
@@ -10,6 +10,7 @@ set(USE_DSOUND TRUE CACHE BOOL "enable/disable DirectSound plugin")
set(USE_QTMULTIMEDIA TRUE CACHE BOOL "enable/disable Qt Multimedia output plugin")
set(USE_WASAPI TRUE CACHE BOOL "enable/disable WASAPI plugin")
set(USE_SHOUT TRUE CACHE BOOL "enable/disable Icecast plugin")
+SET(USE_MEDIAKIT TRUE CACHE BOOL "enable/disable MediaKit plugin")
IF(USE_ALSA)
add_subdirectory(alsa)
@@ -58,3 +59,7 @@ ENDIF(USE_WASAPI)
IF(USE_SHOUT)
add_subdirectory(shout)
ENDIF(USE_SHOUT)
if(USE_ALSA)
add_subdirectory(alsa)
@@ -58,3 +59,7 @@ endif(USE_WASAPI)
if(USE_SHOUT)
add_subdirectory(shout)
endif(USE_SHOUT)
+
+IF(USE_MEDIAKIT)
+add_subdirectory(mediakit)
@@ -329,10 +342,10 @@ index 0000000..cc1af5b
+#endif // OUTPUTMEDIAKIT_H
diff --git a/src/plugins/Output/mediakit/outputmediakitfactory.cpp b/src/plugins/Output/mediakit/outputmediakitfactory.cpp
new file mode 100644
index 0000000..a503603
index 0000000..3303b23
--- /dev/null
+++ b/src/plugins/Output/mediakit/outputmediakitfactory.cpp
@@ -0,0 +1,65 @@
@@ -0,0 +1,66 @@
+/***************************************************************************
+ * Copyright (C) 2013-2019 by Gerasim Troeglazov *
+ * 3dEyes@gmail.com *
@@ -381,9 +394,10 @@ index 0000000..a503603
+ return 0;
+}
+
+void OutputMediaKitFactory::showSettings(QWidget* parent)
+QDialog *OutputMediaKitFactory::createSettings(QWidget *parent)
+{
+ Q_UNUSED(parent);
+ return nullptr;
+}
+
+void OutputMediaKitFactory::showAbout(QWidget *parent)
@@ -400,7 +414,7 @@ index 0000000..a503603
+//Q_EXPORT_PLUGIN2(mediakit, OutputMediaKitFactory)
diff --git a/src/plugins/Output/mediakit/outputmediakitfactory.h b/src/plugins/Output/mediakit/outputmediakitfactory.h
new file mode 100644
index 0000000..e90eb23
index 0000000..ec26dc7
--- /dev/null
+++ b/src/plugins/Output/mediakit/outputmediakitfactory.h
@@ -0,0 +1,50 @@
@@ -448,12 +462,22 @@ index 0000000..e90eb23
+ OutputProperties properties() const override;
+ Output* create() override;
+ Volume *createVolume() override;
+ void showSettings(QWidget* parent) override;
+ QDialog *createSettings(QWidget *parent) override;
+ void showAbout(QWidget *parent) override;
+ QString translation() const override;
+};
+
+#endif
diff --git a/src/plugins/Output/mediakit/translations/mediakit_plugin_en.qm b/src/plugins/Output/mediakit/translations/mediakit_plugin_en.qm
new file mode 100644
index 0000000000000000000000000000000000000000..937ea3e78662d66ef3264d8fa715599d03e338ed
GIT binary patch
literal 33
ocmcE7ks@*G{hX<16=n7(EZlo{IRgU&YieG6XmAIR#l*-60Q^r2(EtDd
literal 0
HcmV?d00001
diff --git a/src/plugins/Output/mediakit/translations/mediakit_plugin_en.ts b/src/plugins/Output/mediakit/translations/mediakit_plugin_en.ts
new file mode 100644
index 0000000..48f6632
@@ -478,142 +502,55 @@ index 0000000..f678c61
+ <qresource>
+ </qresource>
+</RCC>
diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt
index 133df96..21d15d5 100644
--- a/src/plugins/Ui/qsui/CMakeLists.txt
+++ b/src/plugins/Ui/qsui/CMakeLists.txt
@@ -1,7 +1,7 @@
project(qsui)
# libqmmpui & libqmmp
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../ ${CMAKE_CURRENT_SOURCE_DIR})
link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index a40b99e..b27d5cd 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -321,6 +321,7 @@ void MainWindow::showSettings()
diff --git a/src/plugins/Ui/qsui/qsuimainwindow.cpp b/src/plugins/Ui/qsui/qsuimainwindow.cpp
index 3d2700a..01e87d5 100644
--- a/src/plugins/Ui/qsui/qsuimainwindow.cpp
+++ b/src/plugins/Ui/qsui/qsuimainwindow.cpp
@@ -334,6 +334,7 @@ void QSUiMainWindow::showSettings()
QSUiSettings *simpleSettings = new QSUiSettings(this);
confDialog->addPage(tr("Appearance"), simpleSettings, QIcon(":/qsui/qsui_settings.png"));
confDialog->addPage(tr("Shortcuts"), new HotkeyEditor(this), QIcon(":/qsui/qsui_shortcuts.png"));
+ confDialog->setModal(false);
confDialog->addPage(tr("Appearance"), simpleSettings, QIcon(u":/qsui/qsui_settings.png"_s));
confDialog->addPage(tr("Shortcuts"), new QSUiHotkeyEditor(this), QIcon(u":/qsui/qsui_shortcuts.png"_s));
+ confDialog->setModal(false);
confDialog->exec();
simpleSettings->writeSettings();
confDialog->deleteLater();
diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt
index 71e998e..6b65b94 100644
--- a/src/plugins/Ui/skinned/CMakeLists.txt
+++ b/src/plugins/Ui/skinned/CMakeLists.txt
@@ -1,15 +1,10 @@
project(skinned)
# libqmmpui & libqmmp
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../ ${CMAKE_CURRENT_SOURCE_DIR})
link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
-# X11
-include_directories(${X11_INCLUDE_DIRS})
-link_directories(${X11_LIBRARY_DIRS})
-ADD_DEFINITIONS(${X11_CFLAGS})
-
SET(skinned_SRCS
fft.c
balancebar.cpp
diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp
index 3f89d9f..7ba992e 100644
--- a/src/plugins/Ui/skinned/display.cpp
+++ b/src/plugins/Ui/skinned/display.cpp
@@ -344,7 +344,9 @@ void MainDisplay::mousePressEvent(QMouseEvent *e)
{
if (e->button() == Qt::RightButton)
m_mw->menu()->exec(e->globalPosition().toPoint());
+#ifndef Q_OS_HAIKU
else if(e->button() == Qt::LeftButton && m_aboutWidget->underMouse())
m_mw->about();
+#endif
PixmapWidget::mousePressEvent(e);
}
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 94afe4f..4bca5ee 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -358,6 +358,7 @@ void MainWindow::showSettings()
diff --git a/src/plugins/Ui/skinned/skinnedmainwindow.cpp b/src/plugins/Ui/skinned/skinnedmainwindow.cpp
index 4cfa8df..76000fc 100644
--- a/src/plugins/Ui/skinned/skinnedmainwindow.cpp
+++ b/src/plugins/Ui/skinned/skinnedmainwindow.cpp
@@ -357,6 +357,7 @@ void SkinnedMainWindow::showSettings()
SkinnedSettings *skinnedSettings = new SkinnedSettings(this);
confDialog->addPage(tr("Appearance"), skinnedSettings, QIcon(":/skinned/interface.png"));
confDialog->addPage(tr("Shortcuts"), new HotkeyEditor(this), QIcon(":/skinned/shortcuts.png"));
confDialog->addPage(tr("Appearance"), skinnedSettings, QIcon(u":/skinned/interface.png"_s));
confDialog->addPage(tr("Shortcuts"), new SkinnedHotkeyEditor(this), QIcon(u":/skinned/shortcuts.png"_s));
+ confDialog->setModal(false);
confDialog->exec();
skinnedSettings->writeSettings();
confDialog->deleteLater();
diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp
index 75d58d0..b7446ad 100644
--- a/src/plugins/Ui/skinned/skinreader.cpp
+++ b/src/plugins/Ui/skinned/skinreader.cpp
@@ -50,7 +50,7 @@ void SkinReader::generateThumbs()
QDir dir(Qmmp::configDir() + "/skins");
dir.setFilter( QDir::Files | QDir::Hidden);
QFileInfoList f = dir.entryInfoList();
-#if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN)
+#if (defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN)) || defined(Q_OS_HAIKU)
dir.setPath(qApp->applicationDirPath() + "/skins");
#else
dir.setPath(Qmmp::dataPath() + "/skins");
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
index 477deca..f411e69 100644
index 90c85bb..ce45d7f 100644
--- a/src/qmmp/qmmp.cpp
+++ b/src/qmmp/qmmp.cpp
@@ -54,6 +54,8 @@ QString Qmmp::configDir()
@@ -57,6 +57,8 @@ QString Qmmp::configDir()
return QDir::homePath() + u"/.qmmp"_s;
}
else
return m_configDir;
+#elif defined(Q_OS_HAIKU)
+ return m_configDir.isEmpty() ? QDir::homePath() +"/config/settings/Qmmp/" : m_configDir;
#else
return m_configDir.isEmpty() ? QDir::homePath() + QLatin1String("/.qmmp") : m_configDir;
#endif
@@ -86,9 +88,9 @@ QString Qmmp::pluginPath()
if(m_configDir.isEmpty())
return QStringLiteral("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation),
@@ -105,9 +107,9 @@ QString Qmmp::pluginPath()
if(!path.isEmpty())
return path;
QString fallbackPath = qApp->applicationDirPath() + "/../lib/qmmp-" STR(QMMP_VERSION_MAJOR) "." STR(QMMP_VERSION_MINOR);
return QString::fromLocal8Bit(path);
QString fallbackPath = QStringLiteral("%1/../lib/qmmp-" STR(QMMP_VERSION_MAJOR) "." STR(QMMP_VERSION_MINOR)).arg(qApp->applicationDirPath());
-#ifdef QMMP_PLUGIN_DIR
+#if defined(QMMP_PLUGIN_DIR) && !defined(Q_OS_HAIKU)
QDir dir(QMMP_PLUGIN_DIR);
QDir dir(QStringLiteral(QMMP_PLUGIN_DIR));
-#elif defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN)
+#elif defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) || defined(Q_OS_HAIKU)
QDir dir(qApp->applicationDirPath() + "/plugins");
QDir dir(qApp->applicationDirPath() + u"/plugins"_s);
#else
QDir dir(fallbackPath);
--
2.45.2
From 083bea2fe0e953be8ccce0ca720517b210feb3d2 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 31 Aug 2024 09:16:51 +0200
Subject: Build fix
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 8e4175f..14ce070 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -299,9 +299,9 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
if(title)
info->setValue(Qmmp::TITLE, QString::fromUtf8(title->value).trimmed());
if(year)
- info->setValue(Qmmp::YEAR, year->value);
+ info->setValue(Qmmp::YEAR, QString::fromUtf8(year->value).trimmed());
if(track)
- info->setValue(Qmmp::TRACK, track->value);
+ info->setValue(Qmmp::TRACK, QString::fromUtf8(track->value).trimmed());
if(in->nb_chapters > 1 && filePath.endsWith(".m4b", Qt::CaseInsensitive))
{
--
2.45.2
2.48.1

View File

@@ -2,11 +2,11 @@ SUMMARY="Qt-based audio player with winamp/xmms skins support"
DESCRIPTION="This program is an audio-player, written with the help of the Qt library. \
The user interface is similar to winamp or xmms."
HOMEPAGE="http://qmmp.ylsoftware.com/"
COPYRIGHT="2006-2022 Qmmp Development Team"
COPYRIGHT="2006-2025 Qmmp Development Team"
LICENSE="GNU GPL v2"
REVISION="2"
SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp/2.0/qmmp-$portVersion.tar.bz2"
CHECKSUM_SHA256="3786a687b366abec91e279772176b6881e44daa9102136026be765f903b9822e"
REVISION="1"
SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp/2.2/qmmp-$portVersion.tar.bz2"
CHECKSUM_SHA256="993e57d8e11b083bb6f246738505edf35d498ffe82a1936f3129b8bb09eab244"
PATCHES="qmmp-$portVersion.patchset"
ADDITIONAL_FILES="
qmmp.rdef.in
@@ -46,7 +46,6 @@ REQUIRES="
lib:libintl$secondaryArchSuffix
lib:libmad$secondaryArchSuffix
lib:libmms$secondaryArchSuffix
lib:libmodplug$secondaryArchSuffix
lib:libmpcdec$secondaryArchSuffix
lib:libmpg123$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
@@ -55,6 +54,7 @@ REQUIRES="
lib:libQt6Core$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Widgets$secondaryArchSuffix
lib:libshout$secondaryArchSuffix
lib:libsidplayfp$secondaryArchSuffix
lib:libsndfile$secondaryArchSuffix
lib:libsoxr$secondaryArchSuffix
@@ -62,6 +62,7 @@ REQUIRES="
lib:libvorbis$secondaryArchSuffix
lib:libwavpack$secondaryArchSuffix
lib:libwildmidi$secondaryArchSuffix
lib:libxmp$secondaryArchSuffix
"
PROVIDES_devel="
@@ -77,8 +78,8 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
qt6_tools${secondaryArchSuffix}_devel
devel:libarchive$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
devel:libavformat$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix > 60
devel:libavformat$secondaryArchSuffix > 60
devel:libbs2b$secondaryArchSuffix
devel:libcddb$secondaryArchSuffix
devel:libcdio$secondaryArchSuffix >= 19
@@ -94,15 +95,17 @@ BUILD_REQUIRES="
devel:libintl$secondaryArchSuffix
devel:libmad$secondaryArchSuffix
devel:libmms$secondaryArchSuffix
devel:libmodplug$secondaryArchSuffix
devel:libmpcdec$secondaryArchSuffix
devel:libmpg123$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libopenal$secondaryArchSuffix
devel:libopus$secondaryArchSuffix
devel:libopusfile$secondaryArchSuffix
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
devel:libQt6Multimedia$secondaryArchSuffix
devel:libshout$secondaryArchSuffix
devel:libsidplayfp$secondaryArchSuffix
devel:libsndfile$secondaryArchSuffix
devel:libsoxr$secondaryArchSuffix
@@ -110,6 +113,7 @@ BUILD_REQUIRES="
devel:libvorbis$secondaryArchSuffix
devel:libwavpack$secondaryArchSuffix
devel:libwildmidi$secondaryArchSuffix
devel:libxmp$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
@@ -118,7 +122,6 @@ BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:qmake6$secondaryArchSuffix
cmd:unzip
cmd:xargs
cmd:yacc
@@ -133,10 +136,11 @@ BUILD()
{
mkdir -p build
cd build
cmake .. -DCMAKE_BUILD_TYPE=RELEASE \
$cmakeDirArgs \
cmake .. $cmakeDirArgs \
-DCMAKE_INSTALL_PREFIX=$appsDir/Qmmp \
-DCMAKE_INSTALL_BINDIR=$appsDir/Qmmp \
-DPLUGIN_DIR=$appsDir/Qmmp/plugins \
-DCMAKE_BUILD_TYPE=RELEASE \
-DUSE_GNOMEHOTKEY=OFF \
-DUSE_HAL=OFF \
-DUSE_HOTKEY=OFF \
@@ -155,11 +159,15 @@ INSTALL()
{
cd build
make install
mkdir -p $appsDir/Qmmp/skins
mkdir -p $appsDir/Qmmp/skins $libDir
mv $appsDir/Qmmp/lib/* $libDir
cp -f $portDir/additional-files/*.wsz $appsDir/Qmmp/skins
mv $appsDir/Qmmp/qmmp $appsDir/Qmmp/Qmmp
rm -rf $dataDir/{applications,icons,metainfo,qmmp,solid}
rm -rf $dataDir
fixPkgconfig
prepareInstalledDevelLibs libqmmp libqmmpui
packageEntries devel $developDir
local APP_SIGNATURE="application/x-vnd.qt5-qmmp"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -176,12 +184,4 @@ INSTALL()
addResourcesToBinaries qmmp.rdef $appsDir/Qmmp/Qmmp
addAppDeskbarSymlink $appsDir/Qmmp/Qmmp
prepareInstalledDevelLibs \
libqmmp \
libqmmpui
fixPkgconfig
packageEntries devel \
$developDir
}