From b9519944e30104cb06401f9ee6034bdb1f7390a4 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 21 Nov 2018 23:09:43 +1000 Subject: [PATCH] QMPlay2: bump version --- ....03.patchset => qmplay2-18.11.20.patchset} | 34 +++++++++++++++---- ...8.07.03.recipe => qmplay2-18.11.20.recipe} | 9 ++--- 2 files changed, 33 insertions(+), 10 deletions(-) rename media-video/qmplay2/patches/{qmplay2-18.07.03.patchset => qmplay2-18.11.20.patchset} (85%) rename media-video/qmplay2/{qmplay2-18.07.03.recipe => qmplay2-18.11.20.recipe} (92%) diff --git a/media-video/qmplay2/patches/qmplay2-18.07.03.patchset b/media-video/qmplay2/patches/qmplay2-18.11.20.patchset similarity index 85% rename from media-video/qmplay2/patches/qmplay2-18.07.03.patchset rename to media-video/qmplay2/patches/qmplay2-18.11.20.patchset index ca05482c4..556e3e454 100644 --- a/media-video/qmplay2/patches/qmplay2-18.07.03.patchset +++ b/media-video/qmplay2/patches/qmplay2-18.11.20.patchset @@ -1,4 +1,4 @@ -From ba1d6bca5acbbc5c0ee129f624d8ddbc80477706 Mon Sep 17 00:00:00 2001 +From 93bfa2cc47f5bbf0aa0583401fd003999cbd2984 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 9 Apr 2018 13:08:13 +0300 Subject: Add haiku support @@ -28,7 +28,7 @@ index 9765360..dddd5df 100644 libPath = QMPlay2CoreClass::getLibDir(); if (libPath.isEmpty() || !QDir(libPath).exists("qmplay2")) diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp -index 8183ebb..0f405c5 100644 +index d4853ee..dc6ef54 100644 --- a/src/gui/MainWidget.cpp +++ b/src/gui/MainWidget.cpp @@ -145,7 +145,7 @@ MainWidget::MainWidget(QList> &arguments) : @@ -174,7 +174,6 @@ index 0000000..16920f6 + QCheckBox *enabledB; + QDoubleSpinBox *delayB; +}; - diff --git a/src/modules/MediaKit/MediaKit.pro b/src/modules/MediaKit/MediaKit.pro new file mode 100644 index 0000000..bf0c648 @@ -704,7 +703,7 @@ index 6e853ea..d0f6c21 100644 packagesExist(libpulse-simple): SUBDIRS += PulseAudio diff --git a/src/qmplay2/QMPlay2Core.cpp b/src/qmplay2/QMPlay2Core.cpp -index 09ee075..d77af21 100644 +index 0216942..ec10a86 100644 --- a/src/qmplay2/QMPlay2Core.cpp +++ b/src/qmplay2/QMPlay2Core.cpp @@ -189,7 +189,7 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri @@ -716,7 +715,7 @@ index 09ee075..d77af21 100644 settingsDir = QFileInfo(QSettings(QSettings::IniFormat, QSettings::UserScope, QString()).fileName()).absolutePath() + "/QMPlay2/"; #elif defined(Q_OS_MACOS) settingsDir = Functions::cleanPath(QStandardPaths::standardLocations(QStandardPaths::DataLocation).value(0, settingsDir)); -@@ -384,6 +384,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const +@@ -386,6 +386,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const #elif defined Q_OS_WIN if (type == "videoWriters") defaultModules << "OpenGL 2" << "DirectDraw"; @@ -729,5 +728,28 @@ index 09ee075..d77af21 100644 if (type == "decoders") defaultModules << "FFmpeg Decoder"; -- -2.16.2 +2.19.1 + + +From d17a1672b1df7d372c8c3a6f4a82395fb18028a2 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Wed, 21 Nov 2018 23:07:39 +1000 +Subject: Disable DBUS for Haiku + + +diff --git a/src/qmplay2/qmplay2.pro b/src/qmplay2/qmplay2.pro +index b23451d..0ea5840 100644 +--- a/src/qmplay2/qmplay2.pro ++++ b/src/qmplay2/qmplay2.pro +@@ -31,7 +31,7 @@ DEPENDPATH += . headers + HEADERS += headers/QMPlay2Core.hpp headers/Functions.hpp headers/Settings.hpp headers/Module.hpp headers/ModuleParams.hpp headers/ModuleCommon.hpp headers/Playlist.hpp headers/Reader.hpp headers/Demuxer.hpp headers/Decoder.hpp headers/VideoFilters.hpp headers/VideoFilter.hpp headers/DeintFilter.hpp headers/AudioFilter.hpp headers/Writer.hpp headers/QMPlay2Extensions.hpp headers/LineEdit.hpp headers/Slider.hpp headers/QMPlay2OSD.hpp headers/InDockW.hpp headers/LibASS.hpp headers/ColorButton.hpp headers/ImgScaler.hpp headers/SndResampler.hpp headers/VideoWriter.hpp headers/SubsDec.hpp headers/ByteArray.hpp headers/TimeStamp.hpp headers/Packet.hpp headers/VideoFrame.hpp headers/StreamInfo.hpp headers/DockWidget.hpp headers/IOController.hpp headers/ChapterProgramInfo.hpp headers/PacketBuffer.hpp headers/Buffer.hpp headers/NetworkAccess.hpp headers/YouTubeDL.hpp headers/Notifies.hpp headers/NotifiesTray.hpp headers/Version.hpp headers/IPC.hpp headers/MkvMuxer.hpp PixelFormats.hpp headers/CPU.hpp headers/PixelFormats.hpp headers/HWAccelInterface.hpp headers/VideoAdjustment.hpp headers/CppUtils.hpp + SOURCES += QMPlay2Core.cpp Functions.cpp Settings.cpp Module.cpp ModuleParams.cpp ModuleCommon.cpp Playlist.cpp Reader.cpp Demuxer.cpp Decoder.cpp VideoFilters.cpp VideoFilter.cpp DeintFilter.cpp AudioFilter.cpp Writer.cpp QMPlay2Extensions.cpp LineEdit.cpp Slider.cpp QMPlay2OSD.cpp InDockW.cpp LibASS.cpp ColorButton.cpp ImgScaler.cpp SndResampler.cpp VideoWriter.cpp SubsDec.cpp VideoFrame.cpp StreamInfo.cpp DockWidget.cpp PacketBuffer.cpp Buffer.cpp NetworkAccess.cpp YouTubeDL.cpp Notifies.cpp NotifiesTray.cpp Version.cpp IPC_Unix.cpp MkvMuxer.cpp PixelFormats.cpp + +-unix:!android { ++unix:!android:!haiku { + QT += dbus + DBUS_INTERFACES += org.freedesktop.Notifications.xml + HEADERS += headers/NotifiesFreedesktop.hpp +-- +2.19.1 diff --git a/media-video/qmplay2/qmplay2-18.07.03.recipe b/media-video/qmplay2/qmplay2-18.11.20.recipe similarity index 92% rename from media-video/qmplay2/qmplay2-18.07.03.recipe rename to media-video/qmplay2/qmplay2-18.11.20.recipe index bcd65abbc..f98d8f9b7 100644 --- a/media-video/qmplay2/qmplay2-18.07.03.recipe +++ b/media-video/qmplay2/qmplay2-18.11.20.recipe @@ -6,10 +6,10 @@ r browser." HOMEPAGE="http://zaps166.sourceforge.net" COPYRIGHT="2010-2018 Błażej Szczygieł" LICENSE="GNU GPL v3" -REVISION="3" -SOURCE_URI="https://github.com/zaps166/QMPlay2/releases/download/$portVersion/QMPlay2-src-$portVersion.tar.xz" -CHECKSUM_SHA256="78cdadea21728f7a902ae240aae15481bcad2b9f34598c20ee7711feeff79122" -SOURCE_DIR="QMPlay2-src-$portVersion" +REVISION="1" +SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="1114e80e8f04202087c42120582c4cc928317183092d0a1c7d07550684d5dfeb" +SOURCE_DIR="QMPlay2-$portVersion" PATCHES="qmplay2-$portVersion.patchset" ADDITIONAL_FILES=" qmplay2.rdef.in @@ -64,6 +64,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:pkg_config$secondaryArchSuffix cmd:qmake$secondaryArchSuffix >= 5 + cmd:lrelease$secondaryArchSuffix >= 5 " BUILD()