Skip to content

Commit

Permalink
macdeployqt: Remove optional plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaski committed Mar 11, 2022
1 parent 9ada35c commit 94cf1f8
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions 3rdparty/macdeployqt/shared.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,6 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl

// GStreamer plugins.
QStringList gstreamer_plugins = QStringList()
<< "libgstaes.dylib"
<< "libgstaiff.dylib"
<< "libgstapetag.dylib"
<< "libgstapp.dylib"
Expand Down Expand Up @@ -1324,8 +1323,6 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
<< "libgstwavparse.dylib"
<< "libgstxingmux.dylib";

QStringList gstreamer_plugins_optional = QStringList();

QString gstreamer_plugins_dir = qgetenv("GST_PLUGIN_PATH");
if (gstreamer_plugins_dir.isEmpty()) {
if (QDir().exists("/usr/local/lib/gstreamer-1.0")) {
Expand Down Expand Up @@ -1357,24 +1354,6 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
}
}

for (const QString &plugin : gstreamer_plugins_optional) {
QFileInfo info(gstreamer_plugins_dir + "/" + plugin);
if (!info.exists()) {
info.setFile(gstreamer_plugins_dir + "/" + info.baseName() + QString(".so"));
if (!info.exists()) {
LogWarning() << "Skip missing gstreamer plugin" << info.baseName();
continue;
}
}
const QString &sourcePath = info.filePath();
const QString destinationPath = appBundleInfo.path + "/Contents/PlugIns/gstreamer/" + info.fileName();
if (QDir().mkpath(QFileInfo(destinationPath).path()) && copyFilePrintStatus(sourcePath, destinationPath)) {
runStrip(destinationPath);
QList<FrameworkInfo> frameworks = getQtFrameworks(destinationPath, appBundleInfo.path, deploymentInfo.rpathsUsed, useDebugLibs);
deployQtFrameworks(frameworks, appBundleInfo.path, QStringList() << destinationPath, useDebugLibs, deploymentInfo.useLoaderPath);
}
}

}

void createQtConf(const QString &appBundlePath)
Expand Down

0 comments on commit 94cf1f8

Please sign in to comment.