File tupitube-pkgconfig.patch of Package tupitube
Index: tupitube.desk/configure.tests/quazip/quazip.pro
===================================================================
--- tupitube.desk.orig/configure.tests/quazip/quazip.pro
+++ tupitube.desk/configure.tests/quazip/quazip.pro
@@ -15,5 +15,9 @@ unix:!macx {
LIBS += -lz
+CONFIG += link_pkgconfig
+PKGCONFIG += quazip1-qt5
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
+
# Input
SOURCES += main.cpp
Index: tupitube.desk/configure.tests/libav/libav.pro
===================================================================
--- tupitube.desk.orig/configure.tests/libav/libav.pro
+++ tupitube.desk/configure.tests/libav/libav.pro
@@ -9,7 +9,10 @@ macx {
INCLUDEPATH += .
DEFINES += __STDC_CONSTANT_MACROS
-LIBS += -lavformat -lavcodec -lavutil -lavresample #-lswscale
+
+CONFIG += link_pkgconfig
+PKGCONFIG += libavformat libavcodec libavutil libavresample
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
# Input
SOURCES += main.cpp
Index: tupitube.desk/qonf/test.rb
===================================================================
--- tupitube.desk.orig/qonf/test.rb
+++ tupitube.desk/qonf/test.rb
@@ -40,6 +40,8 @@ require 'rexml/sax2listener'
require_relative 'info'
+require 'pkg-config'
+
module RQonf
class Test
@@ -103,8 +105,10 @@ class Test
qmakeLine = "'LIBS += #{extraLib}'"
qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
else
- extraLib = "-lquazip-qt5"
- qmakeLine = "'LIBS += #{extraLib}'"
+ extraInclude = PKGConfig.cflags_only_I("quazip1-qt5").gsub("-I", "")
+ extraLib = PKGConfig.libs("quazip1-qt5")
+ qmakeLine = "'INCLUDEPATH += #{extraInclude}'"
+ qmakeLine += "'LIBS += #{extraLib}'"
end
else
if File.dirname(@rules).end_with?("theora")
@@ -176,7 +180,7 @@ class Test
if conf.hasArgument?("with-quazip")
config.addLib("-lquazip")
else
- config.addLib("-lquazip-qt5")
+ config.addLib(PKGConfig.libs("quazip1-qt5"))
end
# config.addLib("-lquazip-qt5")
Index: tupitube.desk/configure.rb
===================================================================
--- tupitube.desk.orig/configure.rb
+++ tupitube.desk/configure.rb
@@ -43,6 +43,8 @@ require_relative 'qonf/configure'
require_relative 'qonf/info'
require_relative 'qonf/defaults'
+require 'pkg-config'
+
begin
conf = RQonf::Configure.new(ARGV)
@@ -142,6 +144,11 @@ _EOH_
Info.error << " ERROR: quazip directory does not exist!\n"
exit 0
end
+ else
+ quazipLib = PKGConfig.libs("quazip1-qt5")
+ quazipInclude = PKGConfig.cflags_only_I("quazip1-qt5").gsub("-I", "")
+ config.addLib(quazipLib)
+ config.addIncludePath(quazipInclude)
end
if conf.hasArgument?("with-theora")
Index: tupitube.desk/configure.tests/multimedia/multimedia.pro
===================================================================
--- tupitube.desk.orig/configure.tests/multimedia/multimedia.pro
+++ tupitube.desk/configure.tests/multimedia/multimedia.pro
@@ -9,7 +9,8 @@ macx {
QT += multimedia multimediawidgets
DEPENDPATH += .
-INCLUDEPATH += /usr/include/qt5/QtMultimedia /usr/include/qt5/QtMultimediaWidgets
+
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
# Input
SOURCES += main.cpp
Index: tupitube.desk/configure.tests/opengl/opengl.pro
===================================================================
--- tupitube.desk.orig/configure.tests/opengl/opengl.pro
+++ tupitube.desk/configure.tests/opengl/opengl.pro
@@ -11,5 +11,7 @@ QT += opengl
DEPENDPATH += .
INCLUDEPATH += .
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
+
# Input
SOURCES += main.cpp
Index: tupitube.desk/configure.tests/theora/theora.pro
===================================================================
--- tupitube.desk.orig/configure.tests/theora/theora.pro
+++ tupitube.desk/configure.tests/theora/theora.pro
@@ -11,5 +11,7 @@ macx {
LIBS += -ltheora -ltheoraenc -ltheoradec -logg
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
+
# Input
SOURCES += main.cpp
Index: tupitube.desk/configure.tests/zlib/zlib.pro
===================================================================
--- tupitube.desk.orig/configure.tests/zlib/zlib.pro
+++ tupitube.desk/configure.tests/zlib/zlib.pro
@@ -11,5 +11,7 @@ DEPENDPATH += .
INCLUDEPATH += .
LIBS += -lz
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
+
# Input
SOURCES += main.cpp
Index: tupitube.desk/src/plugins/export/libavplugin/libavplugin.pro
===================================================================
--- tupitube.desk.orig/src/plugins/export/libavplugin/libavplugin.pro
+++ tupitube.desk/src/plugins/export/libavplugin/libavplugin.pro
@@ -18,6 +18,10 @@ mac {
LIBS += -lavutil
}
+CONFIG += link_pkgconfig
+PKGCONFIG += libavutil
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
+
INSTALLS += target
target.path = /plugins/
Index: tupitube.desk/src/framework/gui/gui.pro
===================================================================
--- tupitube.desk.orig/src/framework/gui/gui.pro
+++ tupitube.desk/src/framework/gui/gui.pro
@@ -168,3 +168,4 @@ win32 {
LIBS += -L../core/release/ -ltupifwcore
INCLUDEPATH += ../core
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/store/store.pro
===================================================================
--- tupitube.desk.orig/src/store/store.pro
+++ tupitube.desk/src/store/store.pro
@@ -129,3 +129,4 @@ FRAMEWORK_DIR = "../framework"
include($$FRAMEWORK_DIR/framework.pri)
LIBTUPI_DIR = ../libtupi
include($$LIBTUPI_DIR/libtupi.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/framework/core/core.pro
===================================================================
--- tupitube.desk.orig/src/framework/core/core.pro
+++ tupitube.desk/src/framework/core/core.pro
@@ -46,3 +46,4 @@ unix {
SOURCES += tdebug.cpp
}
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/libtupi/libtupi.pro
===================================================================
--- tupitube.desk.orig/src/libtupi/libtupi.pro
+++ tupitube.desk/src/libtupi/libtupi.pro
@@ -67,3 +67,4 @@ SOURCES += tupgraphicalgorithm.cpp \
FRAMEWORK_DIR = "../framework"
include($$FRAMEWORK_DIR/framework.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/libbase/libbase.pro
===================================================================
--- tupitube.desk.orig/src/libbase/libbase.pro
+++ tupitube.desk/src/libbase/libbase.pro
@@ -61,3 +61,4 @@ LIBTUPI_DIR = ../libtupi
include($$LIBTUPI_DIR/libtupi.pri)
STORE_DIR = ../store
include($$STORE_DIR/store.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/net/net.pro
===================================================================
--- tupitube.desk.orig/src/net/net.pro
+++ tupitube.desk/src/net/net.pro
@@ -88,4 +88,4 @@ include(net_config.pri)
FRAMEWORK_DIR = "../framework"
include($$FRAMEWORK_DIR/framework.pri)
-
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/scenes/scenes.pro
===================================================================
--- tupitube.desk.orig/src/components/scenes/scenes.pro
+++ tupitube.desk/src/components/scenes/scenes.pro
@@ -51,3 +51,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/colorpalette/colorpalette.pro
===================================================================
--- tupitube.desk.orig/src/components/colorpalette/colorpalette.pro
+++ tupitube.desk/src/components/colorpalette/colorpalette.pro
@@ -70,3 +70,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/libui/libui.pro
===================================================================
--- tupitube.desk.orig/src/libui/libui.pro
+++ tupitube.desk/src/libui/libui.pro
@@ -54,3 +54,4 @@ FRAMEWORK_DIR = "../framework"
include($$FRAMEWORK_DIR/framework.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/export/export.pro
===================================================================
--- tupitube.desk.orig/src/components/export/export.pro
+++ tupitube.desk/src/components/export/export.pro
@@ -57,3 +57,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/import/import.pro
===================================================================
--- tupitube.desk.orig/src/components/import/import.pro
+++ tupitube.desk/src/components/import/import.pro
@@ -46,3 +46,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/library/library.pro
===================================================================
--- tupitube.desk.orig/src/components/library/library.pro
+++ tupitube.desk/src/components/library/library.pro
@@ -59,3 +59,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/exposure/exposure.pro
===================================================================
--- tupitube.desk.orig/src/components/exposure/exposure.pro
+++ tupitube.desk/src/components/exposure/exposure.pro
@@ -53,3 +53,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/shear/shear.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/shear/shear.pro
+++ tupitube.desk/src/plugins/tools/shear/shear.pro
@@ -36,3 +36,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/shell/shell.pro
===================================================================
--- tupitube.desk.orig/src/shell/shell.pro
+++ tupitube.desk/src/shell/shell.pro
@@ -113,3 +113,4 @@ win32 {
}
include(shell_config.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/player/player.pro
===================================================================
--- tupitube.desk.orig/src/components/player/player.pro
+++ tupitube.desk/src/components/player/player.pro
@@ -60,3 +60,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/timeline/timeline.pro
===================================================================
--- tupitube.desk.orig/src/components/timeline/timeline.pro
+++ tupitube.desk/src/components/timeline/timeline.pro
@@ -57,3 +57,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/brush/brush.pro
===================================================================
--- tupitube.desk.orig/src/components/brush/brush.pro
+++ tupitube.desk/src/components/brush/brush.pro
@@ -48,3 +48,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/workspace/workspace.pro
===================================================================
--- tupitube.desk.orig/src/components/workspace/workspace.pro
+++ tupitube.desk/src/components/workspace/workspace.pro
@@ -114,3 +114,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/papagayo/papagayo.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/papagayo/papagayo.pro
+++ tupitube.desk/src/plugins/tools/papagayo/papagayo.pro
@@ -40,3 +40,4 @@ LIBTUPI_DIR = ../../../libtupi
include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/pencil/pencil.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/pencil/pencil.pro
+++ tupitube.desk/src/plugins/tools/pencil/pencil.pro
@@ -34,4 +34,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
-~
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/ink/ink.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/ink/ink.pro
+++ tupitube.desk/src/plugins/tools/ink/ink.pro
@@ -34,3 +34,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/geometric/geometric.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/geometric/geometric.pro
+++ tupitube.desk/src/plugins/tools/geometric/geometric.pro
@@ -34,3 +34,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/components/twitter/twitter.pro
===================================================================
--- tupitube.desk.orig/src/components/twitter/twitter.pro
+++ tupitube.desk/src/components/twitter/twitter.pro
@@ -49,3 +49,4 @@ win32 {
INCLUDEPATH += $$LIBTUPI_DIR
LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/common/common.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/common/common.pro
+++ tupitube.desk/src/plugins/tools/common/common.pro
@@ -43,3 +43,4 @@ LIBBASE_DIR = ../../../libbase
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$LIBBASE_DIR/libbase.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/selection/selection.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/selection/selection.pro
+++ tupitube.desk/src/plugins/tools/selection/selection.pro
@@ -38,3 +38,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/polyline/polyline.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/polyline/polyline.pro
+++ tupitube.desk/src/plugins/tools/polyline/polyline.pro
@@ -34,3 +34,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/fill/fill.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/fill/fill.pro
+++ tupitube.desk/src/plugins/tools/fill/fill.pro
@@ -32,3 +32,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/nodes/nodes.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/nodes/nodes.pro
+++ tupitube.desk/src/plugins/tools/nodes/nodes.pro
@@ -32,3 +32,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/color/color.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/color/color.pro
+++ tupitube.desk/src/plugins/tools/color/color.pro
@@ -36,3 +36,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/opacity/opacity.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/opacity/opacity.pro
+++ tupitube.desk/src/plugins/tools/opacity/opacity.pro
@@ -36,3 +36,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/position/position.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/position/position.pro
+++ tupitube.desk/src/plugins/tools/position/position.pro
@@ -36,3 +36,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/rotation/rotation.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/rotation/rotation.pro
+++ tupitube.desk/src/plugins/tools/rotation/rotation.pro
@@ -36,3 +36,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/composed/composed.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/composed/composed.pro
+++ tupitube.desk/src/plugins/tools/composed/composed.pro
@@ -41,3 +41,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/tools/scale/scale.pro
===================================================================
--- tupitube.desk.orig/src/plugins/tools/scale/scale.pro
+++ tupitube.desk/src/plugins/tools/scale/scale.pro
@@ -36,3 +36,4 @@ include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
include($$COMMON_DIR/common.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/export/imageplugin/imageplugin.pro
===================================================================
--- tupitube.desk.orig/src/plugins/export/imageplugin/imageplugin.pro
+++ tupitube.desk/src/plugins/export/imageplugin/imageplugin.pro
@@ -29,3 +29,4 @@ LIBTUPI_DIR = ../../../libtupi
include($$LIBBASE_DIR/libbase.pri)
include($$STORE_DIR/store.pri)
include($$LIBTUPI_DIR/libtupi.pri)
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)
Index: tupitube.desk/src/plugins/export/theoraplugin/theoraplugin.pro
===================================================================
--- tupitube.desk.orig/src/plugins/export/theoraplugin/theoraplugin.pro
+++ tupitube.desk/src/plugins/export/theoraplugin/theoraplugin.pro
@@ -33,3 +33,4 @@ unix {
win32 {
include(../../../../win.pri)
}
+QMAKE_CXXFLAGS += $$(RPM_OPT_FLAGS)