diff -Nru tupi-0.2+git04/configure tupi-0.2+git05/configure
--- tupi-0.2+git04/configure 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure 2014-12-15 14:21:32.000000000 +0000
@@ -35,12 +35,8 @@
# along with this program. If not, see . #
###########################################################################
-function checkQt {
- hash qmake-qt4 2>&- || { echo >&2 "Fatal error: Package \"qmake/qmake-qt4\" is not installed on your system. Aborting..."; exit 1; }
-}
-
hash ruby 2>&- || { echo >&2 "Fatal error: Package \"ruby\" is not installed on your system. Aborting..."; exit 1; }
-hash qmake 2>&- || checkQt
+hash qmake 2>&- || { echo >&2 "Fatal error: Package \"qmake\" is not installed on your system. Aborting..."; exit 1; }
export RUBYLIB=.:${RUBYLIB}
ruby configure.rb $*
diff -Nru tupi-0.2+git04/configure.rb tupi-0.2+git05/configure.rb
--- tupi-0.2+git04/configure.rb 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.rb 2014-12-15 14:21:32.000000000 +0000
@@ -55,8 +55,10 @@
--bindir=[path]: Set binaries path [/usr/bin]
--libdir=[path]: Set library path [/usr/lib/tupi | /usr/lib64/tupi]
--sharedir=[path]: Set data path [/usr/share]
- --with-ffmpeg=[path]: Set ffmpeg installation path [/usr]
- --without-ffmpeg: Disable ffmpeg support
+ --with-libav=[path]: Set libav installation path [/usr]
+ --with-quazip=[path]: Set quazip installation path [/usr]
+ --with-theora=[path]: Set theora installation path [/usr]
+ --without-libav: Disable libav support
--without-debug: Disable debug
--with-qtdir=[path]: Set Qt directory [i.e. /usr/local/qt]
--package-build: Option exclusive for package maintainers
@@ -70,104 +72,67 @@
debug = 0
end
- if conf.hasArgument?("with-ffmpeg") and conf.hasArgument?("without-ffmpeg")
- Info.error << " ERROR: Options --with-ffmpeg and --without-ffmpeg are mutually exclusive\n"
+ if conf.hasArgument?("with-libav") and conf.hasArgument?("without-libav")
+ Info.error << " ERROR: Options --with-libav and --without-libav are mutually exclusive\n"
exit 0
end
config = RQonf::Config.new
- distro = ""
- if FileTest.exists?("/etc/lsb-release")
- conf.load_properties("/etc/lsb-release")
- if conf.hasProperty?("DISTRIB_CODENAME")
- distro = conf.propertyValue("DISTRIB_CODENAME")
- end
- if conf.hasProperty?("DISTRIB_ID")
- distroName = conf.propertyValue("DISTRIB_ID")
- if distroName == "Ubuntu"
- config.addDefine("UBUNTU")
- end
- end
- end
-
if conf.hasArgument?("with-qtdir")
qtdir = conf.argumentValue("with-qtdir")
- conf.verifyQtVersion("4.7.0", debug, qtdir)
- if distro == "lucid"
- config.addDefine("K_LUCID")
- end
+ conf.verifyQtVersion("5.2.0", debug, qtdir)
else
- if distro == "lucid"
- Info.error << " ERROR: If you are using Ubuntu Lucid (10.04). You must use the parameter --with-qtdir\n"
- Info.error << " Try the option --help for more info\n"
- exit 0
- else
- conf.verifyQtVersion("4.7.0", debug, "")
- end
+ conf.verifyQtVersion("5.2.0", debug, "")
end
- avcodecFile = "/usr/include/libavcodec/version.h"
-
- if conf.hasArgument?("with-ffmpeg")
- ffmpegDir = conf.argumentValue("with-ffmpeg")
- if File.directory? ffmpegDir
- ffmpegLib = conf.argumentValue("with-ffmpeg") + "/lib"
- ffmpegInclude = conf.argumentValue("with-ffmpeg") + "/include"
- avcodecFile = ffmpegInclude + "/libavcodec/version.h"
- config.addLib("-L" + ffmpegLib)
- config.addIncludePath(ffmpegInclude)
+ if conf.hasArgument?("with-libav")
+ libavDir = conf.argumentValue("with-libav")
+ if File.directory? libavDir
+ libavLib = libavDir + "/lib"
+ libavInclude = libavDir + "/include"
+ config.addLib("-L" + libavLib)
+ config.addIncludePath(libavInclude)
else
- Info.error << " ERROR: ffmpeg directory does not exist!\n"
+ Info.error << " ERROR: libav directory does not exist!\n"
exit 0
end
+ else
+ if conf.hasArgument?("without-libav")
+ Info.warn << "Disabling libav support: " << $endl
+ conf.disableFFmpeg()
+ end
end
- if FileTest.exists?(avcodecFile)
- major = `egrep LIBAVCODEC_VERSION_MAJOR #{avcodecFile} | head -n 1`
- minor = `egrep LIBAVCODEC_VERSION_MINOR #{avcodecFile} | head -n 1`
- majorVersion = major.split
- minorVersion = minor.split
- destination = "src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp"
-
- if FileTest.exists?("/etc/debian_version")
- if FileTest.exists?("/etc/lsb-release") # Ubuntu
- if majorVersion[2] >= "54" and minorVersion[2] >= "35"
- FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.new.cpp", destination)
- else
- FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.old.cpp", destination)
- end
- else # Debian
- if majorVersion[2] >= "54" and minorVersion[2] == "35"
- FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.debian.cpp", destination)
- end
- end
- else # Other distros
- if FileTest.exists?("/usr/bin/pacman") # Arch / Manjaro
- FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.arch.cpp", destination)
- else
- if majorVersion[2] >= "54" and minorVersion[2] >= "35"
- FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.new.cpp", destination)
- else
- FileUtils.cp("src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.old.cpp", destination)
- end
- end
+ if conf.hasArgument?("with-quazip")
+ quazipDir = conf.argumentValue("with-quazip")
+ if File.directory? quazipDir
+ quazipLib = quazipDir + "/lib"
+ quazipInclude = quazipDir + "/include"
+ config.addLib("-L" + quazipLib)
+ config.addIncludePath(quazipInclude)
+ else
+ Info.error << " ERROR: quazip directory does not exist!\n"
+ exit 0
end
end
- if conf.hasArgument?("without-ffmpeg")
- Info.warn << "Disabling ffmpeg support: " << $endl
- conf.disableFFmpeg()
+ if conf.hasArgument?("with-theora")
+ theoraDir = conf.argumentValue("with-theora")
+ if File.directory? theoraDir
+ theoraLib = theoraDir + "/lib"
+ theoraInclude = theoraDir + "/include"
+ config.addLib("-L" + theoraLib)
+ config.addIncludePath(theoraInclude)
+ else
+ Info.error << " ERROR: theora directory does not exist!\n"
+ exit 0
+ end
end
conf.createTests
conf.setTestDir("configure.tests")
-
- if distro == "lucid"
- conf.runTests(config, conf, debug, true)
- else
- conf.runTests(config, conf, debug, false)
- end
+ conf.runTests(config, conf, debug)
config.addModule("core")
config.addModule("gui")
@@ -180,8 +145,8 @@
# config.addLib("-ltupifwsound")
config.addDefine('VERSION=\\\\\"0.2\\\\\"')
- config.addDefine('CODE_NAME=\\\\\"Argentum\\\\\"')
- config.addDefine('REVISION=\\\\\"git04\\\\\"')
+ config.addDefine('CODE_NAME=\\\\\"Amandy\\\\\"')
+ config.addDefine('REVISION=\\\\\"git05\\\\\"')
if conf.hasArgument?("install-headers")
config.addDefine("ADD_HEADERS");
@@ -197,13 +162,16 @@
config.addOption("silent")
print "[ \033[91mOFF\033[0m ]\n"
end
-
+
+ if File.exists?('/etc/canaima_version')
+ config.addDefine("CANAIMA")
+ end
+
unix = config.addScope("unix")
unix.addVariable("MOC_DIR", ".moc")
unix.addVariable("UI_DIR", ".ui")
unix.addVariable("OBJECTS_DIR", ".obj")
- # The file tupiglobal.pri contains all the global variables for the compilation process
config.save("tupiglobal.pri")
conf.createMakefiles
diff -Nru tupi-0.2+git04/configure.tests/ffmpeg/ffmpeg.pro tupi-0.2+git05/configure.tests/ffmpeg/ffmpeg.pro
--- tupi-0.2+git04/configure.tests/ffmpeg/ffmpeg.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/ffmpeg/ffmpeg.pro 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-######################################################################
-# Automatically generated by qmake (1.07a) Fri Jan 20 09:41:23 2006
-######################################################################
-
-TEMPLATE = app
-CONFIG -= moc
-
-macx {
- CONFIG -= app_bundle
- CONFIG += warn_on static console
-}
-
-INCLUDEPATH += .
-INCLUDEPATH += /usr/include/ffmpeg
-DEFINES += __STDC_CONSTANT_MACROS
-
-LIBS += -lavformat -lavcodec -lavutil
-# Input
-SOURCES += main.cpp
diff -Nru tupi-0.2+git04/configure.tests/ffmpeg/ffmpeg.qonf tupi-0.2+git05/configure.tests/ffmpeg/ffmpeg.qonf
--- tupi-0.2+git04/configure.tests/ffmpeg/ffmpeg.qonf 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/ffmpeg/ffmpeg.qonf 1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru tupi-0.2+git04/configure.tests/ffmpeg/main.cpp tupi-0.2+git05/configure.tests/ffmpeg/main.cpp
--- tupi-0.2+git04/configure.tests/ffmpeg/main.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/ffmpeg/main.cpp 1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/***************************************************************************
- * Project TUPI: Magia 2D *
- * Project Contact: info@maefloresta.com *
- * Project Website: http://www.maefloresta.com *
- * Project Leader: Gustav Gonzalez *
- * *
- * Developers: *
- * 2010: *
- * Gustavo Gonzalez / xtingray *
- * *
- * KTooN's versions: *
- * *
- * 2006: *
- * David Cuadrado *
- * Jorge Cuadrado *
- * 2003: *
- * Fernado Roldan *
- * Simena Dinas *
- * *
- * Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com *
- * License: *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- ***************************************************************************/
-
-#ifdef __cplusplus
-extern "C" {
- #include "libavformat/avformat.h"
- #include "libavcodec/avcodec.h"
-}
-#endif
-
-#include
-
-int main()
-{
- av_register_all();
-
- #if defined(K_LUCID)
- AVOutputFormat *fmt = guess_format("mpeg", NULL, NULL);
- #else
- AVOutputFormat *fmt = av_guess_format("mpeg", NULL, NULL);
- #endif
-
- AVFormatContext *oc = avformat_alloc_context();
- oc->oformat = fmt;
-
- AVCodecContext *c;
- AVStream *st;
-
- // st = av_new_stream(oc, 0);
- st = avformat_new_stream(oc, 0);
-
- c = st->codec;
- c->time_base.den = 24;
- c->time_base.num = 1;
- c->gop_size = 12;
- c->pix_fmt = PIX_FMT_YUV420P;
-
- av_free(oc);
-
- return 0;
-}
-
diff -Nru tupi-0.2+git04/configure.tests/libav/libav.pro tupi-0.2+git05/configure.tests/libav/libav.pro
--- tupi-0.2+git04/configure.tests/libav/libav.pro 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/libav/libav.pro 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,15 @@
+TEMPLATE = app
+CONFIG -= moc
+TARGET = libav
+
+macx {
+ CONFIG -= app_bundle
+ CONFIG += warn_on static console
+}
+
+INCLUDEPATH += .
+DEFINES += __STDC_CONSTANT_MACROS
+LIBS += -lavformat -lavcodec -lavutil
+
+# Input
+SOURCES += main.cpp
diff -Nru tupi-0.2+git04/configure.tests/libav/libav.qonf tupi-0.2+git05/configure.tests/libav/libav.qonf
--- tupi-0.2+git04/configure.tests/libav/libav.qonf 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/libav/libav.qonf 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru tupi-0.2+git04/configure.tests/libav/main.cpp tupi-0.2+git05/configure.tests/libav/main.cpp
--- tupi-0.2+git04/configure.tests/libav/main.cpp 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/libav/main.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,74 @@
+/***************************************************************************
+ * Project TUPI: Magia 2D *
+ * Project Contact: info@maefloresta.com *
+ * Project Website: http://www.maefloresta.com *
+ * Project Leader: Gustav Gonzalez *
+ * *
+ * Developers: *
+ * 2010: *
+ * Gustavo Gonzalez / xtingray *
+ * *
+ * KTooN's versions: *
+ * *
+ * 2006: *
+ * David Cuadrado *
+ * Jorge Cuadrado *
+ * 2003: *
+ * Fernado Roldan *
+ * Simena Dinas *
+ * *
+ * Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com *
+ * License: *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see . *
+ ***************************************************************************/
+
+#ifdef __cplusplus
+extern "C" {
+ #include "libavformat/avformat.h"
+ #include "libavcodec/avcodec.h"
+}
+#endif
+
+#include
+
+int main()
+{
+ av_register_all();
+
+ #if defined(K_LUCID)
+ AVOutputFormat *fmt = guess_format("mpeg", NULL, NULL);
+ #else
+ AVOutputFormat *fmt = av_guess_format("mpeg", NULL, NULL);
+ #endif
+
+ AVFormatContext *oc = avformat_alloc_context();
+ oc->oformat = fmt;
+
+ AVCodecContext *c;
+ AVStream *st;
+
+ // st = av_new_stream(oc, 0);
+ st = avformat_new_stream(oc, 0);
+
+ c = st->codec;
+ c->time_base.den = 24;
+ c->time_base.num = 1;
+ c->gop_size = 12;
+ c->pix_fmt = PIX_FMT_YUV420P;
+
+ av_free(oc);
+
+ return 0;
+}
+
diff -Nru tupi-0.2+git04/configure.tests/libav/Makefile tupi-0.2+git05/configure.tests/libav/Makefile
--- tupi-0.2+git04/configure.tests/libav/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/libav/Makefile 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,311 @@
+#############################################################################
+# Makefile for building: libav
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project: libav.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile libav.pro
+#############################################################################
+
+MAKEFILE = Makefile
+
+####### Compiler, tools and options
+
+CC = gcc
+CXX = g++
+DEFINES = -D__STDC_CONSTANT_MACROS -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -I. -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK = g++
+LFLAGS = -m64 -Wl,-O1
+LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -lavformat -lavcodec -lavutil -lQt5Gui -L/usr/lib/x86_64-linux-gnu -lQt5Core -lGL -lpthread
+AR = ar cqs
+RANLIB =
+QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR = tar -cf
+COMPRESS = gzip -9f
+COPY = cp -f
+SED = sed
+COPY_FILE = cp -f
+COPY_DIR = cp -f -R
+STRIP = strip
+INSTALL_FILE = install -m 644 -p
+INSTALL_DIR = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE = rm -f
+SYMLINK = ln -f -s
+DEL_DIR = rmdir
+MOVE = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR = ./
+
+####### Files
+
+SOURCES = main.cpp
+OBJECTS = main.o
+DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ libav.pro main.cpp
+QMAKE_TARGET = libav
+TARGET = libav
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: libav.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ libav.pro \
+ /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Core.prl
+ $(QMAKE) -o Makefile libav.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+libav.pro:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+qmake: FORCE
+ @$(QMAKE) -o Makefile libav.pro
+
+qmake_all: FORCE
+
+dist:
+ @test -d .tmp/libav1.0.0 || mkdir -p .tmp/libav1.0.0
+ $(COPY_FILE) --parents $(DIST) .tmp/libav1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/libav1.0.0/ && (cd `dirname .tmp/libav1.0.0` && $(TAR) libav1.0.0.tar libav1.0.0 && $(COMPRESS) libav1.0.0.tar) && $(MOVE) `dirname .tmp/libav1.0.0`/libav1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/libav1.0.0
+
+
+clean:compiler_clean
+ -$(DEL_FILE) $(OBJECTS)
+ -$(DEL_FILE) *~ core *.core
+
+
+distclean: clean
+ -$(DEL_FILE) $(TARGET)
+ -$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean:
+
+####### Compile
+
+main.o: main.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install: FORCE
+
+uninstall: FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/mobility/main.cpp tupi-0.2+git05/configure.tests/mobility/main.cpp
--- tupi-0.2+git04/configure.tests/mobility/main.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/mobility/main.cpp 1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/***************************************************************************
- * Project TUPI: Magia 2D *
- * Project Contact: info@maefloresta.com *
- * Project Website: http://www.maefloresta.com *
- * Project Leader: Gustav Gonzalez *
- * *
- * Developers: *
- * 2010: *
- * Gustavo Gonzalez / xtingray *
- * *
- * KTooN's versions: *
- * *
- * 2006: *
- * David Cuadrado *
- * Jorge Cuadrado *
- * 2003: *
- * Fernado Roldan *
- * Simena Dinas *
- * *
- * Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com *
- * License: *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see . *
- ***************************************************************************/
-
-/*
-#include
-#include
-#include "zlib.h"
-*/
-
-#include
-#include
-#include
-
-int main()
-{
- QByteArray cameraDevice = QCamera::availableDevices()[0];
- QCamera *camera = new QCamera(cameraDevice);
- QCameraViewfinder *viewFinder = new QCameraViewfinder();
- camera->setViewfinder(viewFinder);
-
- camera->setCaptureMode(QCamera::CaptureStillImage);
- new QCameraImageCapture(camera);
-
- if (camera->state() == QCamera::ActiveState)
- camera->stop();
-
- camera->start();
-}
diff -Nru tupi-0.2+git04/configure.tests/mobility/mobility.pro tupi-0.2+git05/configure.tests/mobility/mobility.pro
--- tupi-0.2+git04/configure.tests/mobility/mobility.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/mobility/mobility.pro 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-DEPENDPATH += .
-INCLUDEPATH += /usr/include/QtMobility /usr/include/QtMultimediaKit
-
-macx {
- CONFIG -= app_bundle
- CONFIG += warn_on static console
-}
-
-# Input
-SOURCES += main.cpp
-LIBS += -lQtMultimediaKit
diff -Nru tupi-0.2+git04/configure.tests/mobility/mobility.qonf tupi-0.2+git05/configure.tests/mobility/mobility.qonf
--- tupi-0.2+git04/configure.tests/mobility/mobility.qonf 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/mobility/mobility.qonf 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru tupi-0.2+git04/configure.tests/multimedia/main.cpp tupi-0.2+git05/configure.tests/multimedia/main.cpp
--- tupi-0.2+git04/configure.tests/multimedia/main.cpp 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/multimedia/main.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,60 @@
+/***************************************************************************
+ * Project TUPI: Magia 2D *
+ * Project Contact: info@maefloresta.com *
+ * Project Website: http://www.maefloresta.com *
+ * Project Leader: Gustav Gonzalez *
+ * *
+ * Developers: *
+ * 2010: *
+ * Gustavo Gonzalez / xtingray *
+ * *
+ * KTooN's versions: *
+ * *
+ * 2006: *
+ * David Cuadrado *
+ * Jorge Cuadrado *
+ * 2003: *
+ * Fernado Roldan *
+ * Simena Dinas *
+ * *
+ * Copyright (C) 2010 Gustav Gonzalez - http://www.maefloresta.com *
+ * License: *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see . *
+ ***************************************************************************/
+
+/*
+#include
+#include
+#include "zlib.h"
+*/
+
+#include
+#include
+#include
+
+int main()
+{
+ QByteArray cameraDevice = QCamera::availableDevices()[0];
+ QCamera *camera = new QCamera(cameraDevice);
+ QCameraViewfinder *viewFinder = new QCameraViewfinder();
+ camera->setViewfinder(viewFinder);
+
+ camera->setCaptureMode(QCamera::CaptureStillImage);
+ new QCameraImageCapture(camera);
+
+ if (camera->state() == QCamera::ActiveState)
+ camera->stop();
+
+ camera->start();
+}
diff -Nru tupi-0.2+git04/configure.tests/multimedia/Makefile tupi-0.2+git05/configure.tests/multimedia/Makefile
--- tupi-0.2+git04/configure.tests/multimedia/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/multimedia/Makefile 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,324 @@
+#############################################################################
+# Makefile for building: multimedia
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project: multimedia.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile multimedia.pro
+#############################################################################
+
+MAKEFILE = Makefile
+
+####### Compiler, tools and options
+
+CC = gcc
+CXX = g++
+DEFINES = -DQT_NO_DEBUG -DQT_MULTIMEDIAWIDGETS_LIB -DQT_MULTIMEDIA_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -isystem /usr/include/qt5/QtMultimedia -isystem /usr/include/qt5/QtMultimediaWidgets -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtMultimediaWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtMultimedia -isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtNetwork -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK = g++
+LFLAGS = -m64 -Wl,-O1 -Wl,-rpath-link,/usr/lib/x86_64-linux-gnu
+LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -lQt5MultimediaWidgets -L/usr/lib/x86_64-linux-gnu -lQt5Multimedia -lQt5Widgets -lQt5Network -lQt5Gui -lQt5Core -lGL -lpthread
+AR = ar cqs
+RANLIB =
+QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR = tar -cf
+COMPRESS = gzip -9f
+COPY = cp -f
+SED = sed
+COPY_FILE = cp -f
+COPY_DIR = cp -f -R
+STRIP = strip
+INSTALL_FILE = install -m 644 -p
+INSTALL_DIR = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE = rm -f
+SYMLINK = ln -f -s
+DEL_DIR = rmdir
+MOVE = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR = ./
+
+####### Files
+
+SOURCES = main.cpp
+OBJECTS = main.o
+DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ multimedia.pro main.cpp
+QMAKE_TARGET = multimedia
+TARGET = multimedia
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: multimedia.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ multimedia.pro \
+ /usr/lib/x86_64-linux-gnu/libQt5MultimediaWidgets.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Multimedia.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Core.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Network.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Widgets.prl
+ $(QMAKE) -o Makefile multimedia.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+multimedia.pro:
+/usr/lib/x86_64-linux-gnu/libQt5MultimediaWidgets.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Multimedia.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Network.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl:
+qmake: FORCE
+ @$(QMAKE) -o Makefile multimedia.pro
+
+qmake_all: FORCE
+
+dist:
+ @test -d .tmp/multimedia1.0.0 || mkdir -p .tmp/multimedia1.0.0
+ $(COPY_FILE) --parents $(DIST) .tmp/multimedia1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/multimedia1.0.0/ && (cd `dirname .tmp/multimedia1.0.0` && $(TAR) multimedia1.0.0.tar multimedia1.0.0 && $(COMPRESS) multimedia1.0.0.tar) && $(MOVE) `dirname .tmp/multimedia1.0.0`/multimedia1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/multimedia1.0.0
+
+
+clean:compiler_clean
+ -$(DEL_FILE) $(OBJECTS)
+ -$(DEL_FILE) *~ core *.core
+
+
+distclean: clean
+ -$(DEL_FILE) $(TARGET)
+ -$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_uic_make_all:
+compiler_uic_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean:
+
+####### Compile
+
+main.o: main.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install: FORCE
+
+uninstall: FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/multimedia/multimedia.pro tupi-0.2+git05/configure.tests/multimedia/multimedia.pro
--- tupi-0.2+git04/configure.tests/multimedia/multimedia.pro 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/multimedia/multimedia.pro 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,15 @@
+TEMPLATE = app
+CONFIG -= moc
+TARGET = multimedia
+
+macx {
+ CONFIG -= app_bundle
+ CONFIG += warn_on static console
+}
+
+QT += multimedia multimediawidgets
+DEPENDPATH += .
+INCLUDEPATH += /usr/include/qt5/QtMultimedia /usr/include/qt5/QtMultimediaWidgets
+
+# Input
+SOURCES += main.cpp
diff -Nru tupi-0.2+git04/configure.tests/multimedia/multimedia.qonf tupi-0.2+git05/configure.tests/multimedia/multimedia.qonf
--- tupi-0.2+git04/configure.tests/multimedia/multimedia.qonf 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/multimedia/multimedia.qonf 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru tupi-0.2+git04/configure.tests/opengl/Makefile tupi-0.2+git05/configure.tests/opengl/Makefile
--- tupi-0.2+git04/configure.tests/opengl/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/opengl/Makefile 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,320 @@
+#############################################################################
+# Makefile for building: opengl
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project: opengl.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile opengl.pro
+#############################################################################
+
+MAKEFILE = Makefile
+
+####### Compiler, tools and options
+
+CC = gcc
+CXX = g++
+DEFINES = -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -I. -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtOpenGL -isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK = g++
+LFLAGS = -m64 -Wl,-O1
+LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -lQt5OpenGL -L/usr/lib/x86_64-linux-gnu -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread
+AR = ar cqs
+RANLIB =
+QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR = tar -cf
+COMPRESS = gzip -9f
+COPY = cp -f
+SED = sed
+COPY_FILE = cp -f
+COPY_DIR = cp -f -R
+STRIP = strip
+INSTALL_FILE = install -m 644 -p
+INSTALL_DIR = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE = rm -f
+SYMLINK = ln -f -s
+DEL_DIR = rmdir
+MOVE = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR = ./
+
+####### Files
+
+SOURCES = main.cpp
+OBJECTS = main.o
+DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ opengl.pro main.cpp
+QMAKE_TARGET = opengl
+TARGET = opengl
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: opengl.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ opengl.pro \
+ /usr/lib/x86_64-linux-gnu/libQt5OpenGL.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Widgets.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Core.prl
+ $(QMAKE) -o Makefile opengl.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/uic.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+opengl.pro:
+/usr/lib/x86_64-linux-gnu/libQt5OpenGL.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+qmake: FORCE
+ @$(QMAKE) -o Makefile opengl.pro
+
+qmake_all: FORCE
+
+dist:
+ @test -d .tmp/opengl1.0.0 || mkdir -p .tmp/opengl1.0.0
+ $(COPY_FILE) --parents $(DIST) .tmp/opengl1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/opengl1.0.0/ && (cd `dirname .tmp/opengl1.0.0` && $(TAR) opengl1.0.0.tar opengl1.0.0 && $(COMPRESS) opengl1.0.0.tar) && $(MOVE) `dirname .tmp/opengl1.0.0`/opengl1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/opengl1.0.0
+
+
+clean:compiler_clean
+ -$(DEL_FILE) $(OBJECTS)
+ -$(DEL_FILE) *~ core *.core
+
+
+distclean: clean
+ -$(DEL_FILE) $(TARGET)
+ -$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_uic_make_all:
+compiler_uic_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean:
+
+####### Compile
+
+main.o: main.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install: FORCE
+
+uninstall: FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/opengl/opengl.pro tupi-0.2+git05/configure.tests/opengl/opengl.pro
--- tupi-0.2+git04/configure.tests/opengl/opengl.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/opengl/opengl.pro 2014-12-15 14:21:32.000000000 +0000
@@ -1,17 +1,15 @@
-######################################################################
-# Automatically generated by qmake (2.00a) Tue Jan 2 12:58:43 2007
-######################################################################
-
TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
+CONFIG -= moc
+TARGET = opengl
macx {
CONFIG -= app_bundle
CONFIG += warn_on static console
}
+QT += opengl
+DEPENDPATH += .
+INCLUDEPATH += .
+
# Input
SOURCES += main.cpp
-
-QT += opengl
diff -Nru tupi-0.2+git04/configure.tests/quazip/Makefile tupi-0.2+git05/configure.tests/quazip/Makefile
--- tupi-0.2+git04/configure.tests/quazip/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/quazip/Makefile 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,311 @@
+#############################################################################
+# Makefile for building: quazip
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project: quazip.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake LIBS\ +=\ -lquazip-qt5 -o Makefile quazip.pro
+#############################################################################
+
+MAKEFILE = Makefile
+
+####### Compiler, tools and options
+
+CC = gcc
+CXX = g++
+DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -isystem /usr/include/quazip -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK = g++
+LFLAGS = -m64 -Wl,-O1
+LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -lquazip-qt5 -lz -lQt5Gui -L/usr/lib/x86_64-linux-gnu -lQt5Core -lGL -lpthread
+AR = ar cqs
+RANLIB =
+QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR = tar -cf
+COMPRESS = gzip -9f
+COPY = cp -f
+SED = sed
+COPY_FILE = cp -f
+COPY_DIR = cp -f -R
+STRIP = strip
+INSTALL_FILE = install -m 644 -p
+INSTALL_DIR = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE = rm -f
+SYMLINK = ln -f -s
+DEL_DIR = rmdir
+MOVE = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR = ./
+
+####### Files
+
+SOURCES = main.cpp
+OBJECTS = main.o
+DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ quazip.pro main.cpp
+QMAKE_TARGET = quazip
+TARGET = quazip
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: quazip.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ quazip.pro \
+ /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Core.prl
+ $(QMAKE) LIBS\ +=\ -lquazip-qt5 -o Makefile quazip.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+quazip.pro:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+qmake: FORCE
+ @$(QMAKE) LIBS\ +=\ -lquazip-qt5 -o Makefile quazip.pro
+
+qmake_all: FORCE
+
+dist:
+ @test -d .tmp/quazip1.0.0 || mkdir -p .tmp/quazip1.0.0
+ $(COPY_FILE) --parents $(DIST) .tmp/quazip1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/quazip1.0.0/ && (cd `dirname .tmp/quazip1.0.0` && $(TAR) quazip1.0.0.tar quazip1.0.0 && $(COMPRESS) quazip1.0.0.tar) && $(MOVE) `dirname .tmp/quazip1.0.0`/quazip1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/quazip1.0.0
+
+
+clean:compiler_clean
+ -$(DEL_FILE) $(OBJECTS)
+ -$(DEL_FILE) *~ core *.core
+
+
+distclean: clean
+ -$(DEL_FILE) $(TARGET)
+ -$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean:
+
+####### Compile
+
+main.o: main.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install: FORCE
+
+uninstall: FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/quazip/quazip.pro tupi-0.2+git05/configure.tests/quazip/quazip.pro
--- tupi-0.2+git04/configure.tests/quazip/quazip.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/quazip/quazip.pro 2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,10 @@
+TEMPLATE = app
+CONFIG -= moc
+TARGET = quazip
DEPENDPATH += .
macx {
- INCLUDEPATH += /usr/local/include/quazip
+ INCLUDEPATH += /usr/local/include
CONFIG -= app_bundle
CONFIG += warn_on static console
}
@@ -10,6 +13,7 @@
INCLUDEPATH += /usr/include/quazip
}
+LIBS += -lz
+
# Input
SOURCES += main.cpp
-LIBS += -lquazip
diff -Nru tupi-0.2+git04/configure.tests/quazip/quazip.qonf tupi-0.2+git05/configure.tests/quazip/quazip.qonf
--- tupi-0.2+git04/configure.tests/quazip/quazip.qonf 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/quazip/quazip.qonf 2014-12-15 14:21:32.000000000 +0000
@@ -7,9 +7,6 @@
-
-
-
diff -Nru tupi-0.2+git04/configure.tests/theora/Makefile tupi-0.2+git05/configure.tests/theora/Makefile
--- tupi-0.2+git04/configure.tests/theora/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/theora/Makefile 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,311 @@
+#############################################################################
+# Makefile for building: theora
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project: theora.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile theora.pro
+#############################################################################
+
+MAKEFILE = Makefile
+
+####### Compiler, tools and options
+
+CC = gcc
+CXX = g++
+DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -I. -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK = g++
+LFLAGS = -m64 -Wl,-O1
+LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -ltheora -ltheoraenc -ltheoradec -logg -lQt5Gui -L/usr/lib/x86_64-linux-gnu -lQt5Core -lGL -lpthread
+AR = ar cqs
+RANLIB =
+QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR = tar -cf
+COMPRESS = gzip -9f
+COPY = cp -f
+SED = sed
+COPY_FILE = cp -f
+COPY_DIR = cp -f -R
+STRIP = strip
+INSTALL_FILE = install -m 644 -p
+INSTALL_DIR = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE = rm -f
+SYMLINK = ln -f -s
+DEL_DIR = rmdir
+MOVE = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR = ./
+
+####### Files
+
+SOURCES = main.cpp
+OBJECTS = main.o
+DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ theora.pro main.cpp
+QMAKE_TARGET = theora
+TARGET = theora
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: theora.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ theora.pro \
+ /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Core.prl
+ $(QMAKE) -o Makefile theora.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+theora.pro:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+qmake: FORCE
+ @$(QMAKE) -o Makefile theora.pro
+
+qmake_all: FORCE
+
+dist:
+ @test -d .tmp/theora1.0.0 || mkdir -p .tmp/theora1.0.0
+ $(COPY_FILE) --parents $(DIST) .tmp/theora1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/theora1.0.0/ && (cd `dirname .tmp/theora1.0.0` && $(TAR) theora1.0.0.tar theora1.0.0 && $(COMPRESS) theora1.0.0.tar) && $(MOVE) `dirname .tmp/theora1.0.0`/theora1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/theora1.0.0
+
+
+clean:compiler_clean
+ -$(DEL_FILE) $(OBJECTS)
+ -$(DEL_FILE) *~ core *.core
+
+
+distclean: clean
+ -$(DEL_FILE) $(TARGET)
+ -$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean:
+
+####### Compile
+
+main.o: main.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install: FORCE
+
+uninstall: FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/theora/theora.pro tupi-0.2+git05/configure.tests/theora/theora.pro
--- tupi-0.2+git04/configure.tests/theora/theora.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/theora/theora.pro 2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,6 @@
TEMPLATE = app
CONFIG -= moc
+TARGET = theora
macx {
CONFIG -= app_bundle
@@ -7,7 +8,7 @@
}
INCLUDEPATH += .
-
LIBS += -ltheora -ltheoraenc -ltheoradec -logg
+# Input
SOURCES += main.cpp
diff -Nru tupi-0.2+git04/configure.tests/zlib/Makefile tupi-0.2+git05/configure.tests/zlib/Makefile
--- tupi-0.2+git04/configure.tests/zlib/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/configure.tests/zlib/Makefile 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,311 @@
+#############################################################################
+# Makefile for building: zlib
+# Generated by qmake (3.0) (Qt 5.3.0)
+# Project: zlib.pro
+# Template: app
+# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -o Makefile zlib.pro
+#############################################################################
+
+MAKEFILE = Makefile
+
+####### Compiler, tools and options
+
+CC = gcc
+CXX = g++
+DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+CXXFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
+INCPATH = -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I. -I. -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I.
+LINK = g++
+LFLAGS = -m64 -Wl,-O1
+LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -lz -lQt5Gui -L/usr/lib/x86_64-linux-gnu -lQt5Core -lGL -lpthread
+AR = ar cqs
+RANLIB =
+QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+TAR = tar -cf
+COMPRESS = gzip -9f
+COPY = cp -f
+SED = sed
+COPY_FILE = cp -f
+COPY_DIR = cp -f -R
+STRIP = strip
+INSTALL_FILE = install -m 644 -p
+INSTALL_DIR = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE = rm -f
+SYMLINK = ln -f -s
+DEL_DIR = rmdir
+MOVE = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR = ./
+
+####### Files
+
+SOURCES = main.cpp
+OBJECTS = main.o
+DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ zlib.pro main.cpp
+QMAKE_TARGET = zlib
+TARGET = zlib
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: zlib.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \
+ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \
+ zlib.pro \
+ /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \
+ /usr/lib/x86_64-linux-gnu/libQt5Core.prl
+ $(QMAKE) -o Makefile zlib.pro
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/shell-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/linux.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/gcc-base-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resolve_config.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/thread.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/testcase_targets.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exceptions.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf:
+/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf:
+zlib.pro:
+/usr/lib/x86_64-linux-gnu/libQt5Gui.prl:
+/usr/lib/x86_64-linux-gnu/libQt5Core.prl:
+qmake: FORCE
+ @$(QMAKE) -o Makefile zlib.pro
+
+qmake_all: FORCE
+
+dist:
+ @test -d .tmp/zlib1.0.0 || mkdir -p .tmp/zlib1.0.0
+ $(COPY_FILE) --parents $(DIST) .tmp/zlib1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/zlib1.0.0/ && (cd `dirname .tmp/zlib1.0.0` && $(TAR) zlib1.0.0.tar zlib1.0.0 && $(COMPRESS) zlib1.0.0.tar) && $(MOVE) `dirname .tmp/zlib1.0.0`/zlib1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/zlib1.0.0
+
+
+clean:compiler_clean
+ -$(DEL_FILE) $(OBJECTS)
+ -$(DEL_FILE) *~ core *.core
+
+
+distclean: clean
+ -$(DEL_FILE) $(TARGET)
+ -$(DEL_FILE) Makefile
+
+
+####### Sub-libraries
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+check: first
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_moc_header_make_all:
+compiler_moc_header_clean:
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean:
+
+####### Compile
+
+main.o: main.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+
+####### Install
+
+install: FORCE
+
+uninstall: FORCE
+
+FORCE:
+
diff -Nru tupi-0.2+git04/configure.tests/zlib/zlib.pro tupi-0.2+git05/configure.tests/zlib/zlib.pro
--- tupi-0.2+git04/configure.tests/zlib/zlib.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/configure.tests/zlib/zlib.pro 2014-12-15 14:21:32.000000000 +0000
@@ -1,11 +1,15 @@
-DEPENDPATH += .
-INCLUDEPATH += .
+TEMPLATE = app
+CONFIG -= moc
+TARGET = zlib
macx {
CONFIG -= app_bundle
CONFIG += warn_on static console
}
+DEPENDPATH += .
+INCLUDEPATH += .
+LIBS += -lz
+
# Input
SOURCES += main.cpp
-LIBS += -lz
diff -Nru tupi-0.2+git04/debian/changelog tupi-0.2+git05/debian/changelog
--- tupi-0.2+git04/debian/changelog 2014-09-18 10:11:54.000000000 +0000
+++ tupi-0.2+git05/debian/changelog 2015-05-21 04:55:03.000000000 +0000
@@ -1,20 +1,43 @@
-tupi (0.2+git04-2build3) utopic; urgency=medium
+tupi (0.2+git05-3) unstable; urgency=medium
- * Rebuild against libquazip1.
+ * Upload to unstable (Closes: #786337).
- -- Colin Watson Thu, 18 Sep 2014 11:11:54 +0100
+ -- Dmitry Smirnov Thu, 21 May 2015 14:54:58 +1000
-tupi (0.2+git04-2build2) utopic; urgency=medium
+tupi (0.2+git05-2) experimental; urgency=low
- * Rebuild against libav11.
+ * override_dh_fixperms: check if -data package is built to fix
+ FTBFS "-B" type, like on buildd servers.
+
+ -- Dmitry Smirnov Mon, 05 Jan 2015 10:25:13 +1100
+
+tupi (0.2+git05-1) experimental; urgency=low
+
+ * New upstream release [December 2014].
+ * Build-Depends:
+ - pkg-config
+ - qtmobility-dev
+ - qt4-linguist-tools
+ + qttools5-dev-tools
+ - qt4-qmake
+ + qt5-qmake
+ + qtmultimedia5-dev
+ - libqt4-opengl-dev
+ + libqt5opengl5-dev
+ + libqt5svg5-dev
+ - libquazip-dev
+ + libquazip-qt5-dev
+ * Build with "--without-debug"; added new patch to enable verbose build.
+ * Do not inject "-Wl,--as-needed" to LDFLAGS.
+ * Added new patch to disable defective libquazip detection.
+ * Standards-Version: 3.9.6.
+ * Updated Vcs-Browser URL.
+ * Updated "debian/watch" file.
+ * Updated link to new upstream repository.
+ * tupi-data: new lintian-override for "extra-license-file".
+ * "debian/rules": --parallel build; minor cleanup; override_dh_fixperms.
- -- Colin Watson Fri, 05 Sep 2014 02:39:17 +0100
-
-tupi (0.2+git04-2build1) utopic; urgency=medium
-
- * No-change rebuild against libav10.
-
- -- Logan Rosen Fri, 30 May 2014 23:28:15 -0400
+ -- Dmitry Smirnov Sun, 04 Jan 2015 18:42:38 +1100
tupi (0.2+git04-2) unstable; urgency=low
diff -Nru tupi-0.2+git04/debian/clean tupi-0.2+git05/debian/clean
--- tupi-0.2+git04/debian/clean 2014-05-17 11:55:17.000000000 +0000
+++ tupi-0.2+git05/debian/clean 2015-01-07 06:11:38.000000000 +0000
@@ -1,8 +1,8 @@
debian/*.xpm
+bin/tupi.bin
tupiglobal.pri
launcher/tupi
launcher/tupi.desktop
-src/components/help/help/css/tupi.css
src/framework/tupconfig.pri
src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp
src/components/help/man/*.1.gz
diff -Nru tupi-0.2+git04/debian/control tupi-0.2+git05/debian/control
--- tupi-0.2+git04/debian/control 2014-05-17 10:33:21.000000000 +0000
+++ tupi-0.2+git05/debian/control 2015-05-21 04:54:38.000000000 +0000
@@ -2,22 +2,24 @@
Section: graphics
Priority: optional
Maintainer: Dmitry Smirnov
-Build-Depends: debhelper (>= 9), ruby (>= 4.9), perl, qt4-qmake, pkg-config
+Build-Depends: debhelper (>= 9), ruby (>= 4.9), perl
,imagemagick ,rdfind ,symlinks
- ,qt4-linguist-tools
- ,qtmobility-dev
,libaspell-dev (>= 0.60.7~)
,libavformat-dev
,libavutil-dev
,libogg-dev
- ,libqt4-opengl-dev
- ,libquazip-dev
+ ,qt5-qmake
+ ,qttools5-dev-tools
+ ,qtmultimedia5-dev
+ ,libqt5opengl5-dev
+ ,libqt5svg5-dev
+ ,libquazip-qt5-dev
,libtheora-dev
,zlib1g-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.maefloresta.com/portal
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/tupi.git
Vcs-Git: git://anonscm.debian.org/collab-maint/tupi.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/tupi.git
Package: tupi
Architecture: linux-any
diff -Nru tupi-0.2+git04/debian/copyright tupi-0.2+git05/debian/copyright
--- tupi-0.2+git04/debian/copyright 2014-03-01 07:09:28.000000000 +0000
+++ tupi-0.2+git05/debian/copyright 2015-01-01 11:30:56.000000000 +0000
@@ -1,20 +1,20 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: tupi
Upstream-Contact: Gustav Gonzalez
-Source: https://github.com/xtingray/tupi
-
-Files: debian/*
-Copyright: 2011-2014 Dmitry Smirnov
-License: GPL-2+
+Source: https://projects.kde.org/projects/playground/artwork/tupi/repository
Files: *
-Copyright: 2010-2013 Gustav Gonzalez
+Copyright: 2010-2014 Gustav Gonzalez
2006 David Cuadrado
2006 Jorge Cuadrado
2003 Fernado Roldan
2003 Simena Dinas
License: GPL-2+
+Files: debian/*
+Copyright: 2011-2015 Dmitry Smirnov
+License: GPL-2+
+
License: GPL-2+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -Nru tupi-0.2+git04/debian/patches/quazip.patch tupi-0.2+git05/debian/patches/quazip.patch
--- tupi-0.2+git04/debian/patches/quazip.patch 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/debian/patches/quazip.patch 2015-01-01 21:42:21.000000000 +0000
@@ -0,0 +1,37 @@
+Last-Update: 2015-01-02
+Forwarded: yes
+Author: Dmitry Smirnov
+Description: drop stupid quazip detection.
+
+--- a/qonf/test.rb
++++ b/qonf/test.rb
+@@ -102,13 +102,9 @@
+ extraInclude = quazipDir + "/include"
+ qmakeLine = "'LIBS += #{extraLib}'"
+ qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
+ else
+- if parser.os.eql? "14.10"
+- extraLib = "-lquazip-qt5"
+- else
+- extraLib = "-lquazip"
+- end
++ extraLib = "-lquazip-qt5"
+ qmakeLine = "'LIBS += #{extraLib}'"
+ end
+ else
+ if File.dirname(@rules).end_with?("theora")
+@@ -176,13 +172,9 @@
+ parser.libs.each { |lib|
+ config.addLib(lib)
+ }
+
+- if parser.os.eql? "14.10"
+- config.addLib("-lquazip-qt5")
+- else
+- config.addLib("-lquazip")
+- end
++ config.addLib("-lquazip-qt5")
+
+ parser.defines.each { |define|
+ config.addDefine(define)
+ }
diff -Nru tupi-0.2+git04/debian/patches/series tupi-0.2+git05/debian/patches/series
--- tupi-0.2+git04/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/debian/patches/series 2015-01-16 18:26:31.000000000 +0000
@@ -0,0 +1,2 @@
+quazip.patch
+verbose-build.patch
diff -Nru tupi-0.2+git04/debian/patches/verbose-build.patch tupi-0.2+git05/debian/patches/verbose-build.patch
--- tupi-0.2+git04/debian/patches/verbose-build.patch 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/debian/patches/verbose-build.patch 2015-01-04 06:18:08.000000000 +0000
@@ -0,0 +1,17 @@
+Last-Update: 2015-01-04
+Forwarded: no
+Author: Dmitry Smirnov
+Description: enable verbose build.
+
+--- a/configure.rb
++++ b/configure.rb
+@@ -158,9 +158,8 @@
+ config.addDefine("K_DEBUG")
+ print "[ \033[92mON\033[0m ]\n"
+ else
+ config.addDefine("K_NODEBUG")
+- config.addOption("silent")
+ print "[ \033[91mOFF\033[0m ]\n"
+ end
+
+ if File.exists?('/etc/canaima_version')
diff -Nru tupi-0.2+git04/debian/rules tupi-0.2+git05/debian/rules
--- tupi-0.2+git04/debian/rules 2014-05-17 11:55:06.000000000 +0000
+++ tupi-0.2+git05/debian/rules 2015-01-04 23:06:57.000000000 +0000
@@ -4,25 +4,20 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export QT_SELECT=5
QM_FILES := $(patsubst %.ts, %.qm, $(wildcard src/shell/data/translations/*.ts))
%:
- dh $@
+ dh $@ --parallel
override_dh_auto_clean:
- # remove pre-generated binaries; the following is intentional:
- # trick lintian and always use Makefile.common to clean generated files.
- -true && $(MAKE) -f Makefile.common confclean
$(RM) -v configure.tests/*/Makefile $(QM_FILES)
dh_auto_clean
override_dh_auto_configure:
- # arch-dependent patching
- cat debian/patches/series.$(DEB_HOST_ARCH_OS) >> debian/patches/series \
- && $(RM) debian/patches/series.$(DEB_HOST_ARCH_OS) \
- && dh_quilt_patch || true
# override qonf/defaults.rb
ruby configure.rb \
+ --without-debug \
--prefix=/usr \
--bindir=/usr/lib/tupi/bin \
--libdir=/usr/lib/tupi \
@@ -30,19 +25,10 @@
--includedir=/usr/include/tupi
# force qmake-generated Makefiles to respect dpkg-provided flags and don't strip
perl -0pi -e 's[(CXXFLAGS\s*=)][$$1 $$ENV{CFLAGS} $$ENV{CPPFLAGS}]; \
- s[(LFLAGS\s*=)][$$1 -Wl,--as-needed $$ENV{LDFLAGS}]; \
- s[(CFLAGS\s*=)][$$1 $$ENV{CFLAGS} $$ENV{CPPFLAGS}]; \
+ s[(LFLAGS\s*=)][$$1 $$ENV{LDFLAGS}]; \
+ s[(CFLAGS\s*=)][$$1 $$ENV{CFLAGS}]; \
s[(STRIP\s*=)\s*\w+][$$1 true];' \
$$(find . -name Makefile)
- ## libav9 and older: ugly override for upstream libav detection:
- ## FTBFS: "WARNING: Failure to find: tffmpegmoviegenerator.cpp"
- ## https://github.com/xtingray/tupi/issues/2
- ## remove "pkg-config" fron Build-Depends when this will not be needed.
- dpkg --compare-versions $$(pkg-config --modversion libavcodec) lt 54.35.0 \
- && cp -v src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.old.cpp \
- src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp \
- || cp -v src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.debian.cpp \
- src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp
$(QM_FILES):
# rebuild translations
@@ -54,6 +40,13 @@
cd src/components/help/man && gzip -9 -c tupi.man > tupi.1.gz
dh_auto_build
+override_dh_fixperms:
+ dh_fixperms
+ if [ -d "$(CURDIR)/debian/tupi-data" ]; then \
+ find $(CURDIR)/debian/tupi-data/usr/share/tupi/data/xml/ \
+ -type f -executable -exec chmod -c a-x '{}' \;\
+ ;fi
+
override_dh_install:
dh_install
# De-duplication (http://wiki.debian.org/dedup.debian.net):
@@ -68,10 +61,7 @@
dh_makeshlibs --noscripts
override_dh_strip:
- dh_strip -v --dbg-package=tupi-dbg
-
-override_dh_builddeb:
- dh_builddeb -- -Zxz
+ dh_strip --dbg-package=tupi-dbg
PKD = $(abspath $(dir $(MAKEFILE_LIST)))
PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
diff -Nru tupi-0.2+git04/debian/tupi-data.lintian-overrides tupi-0.2+git05/debian/tupi-data.lintian-overrides
--- tupi-0.2+git04/debian/tupi-data.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/debian/tupi-data.lintian-overrides 2015-01-01 11:30:56.000000000 +0000
@@ -0,0 +1,2 @@
+## False-positive, this is a CSS file, not a text of the license:
+extra-license-file usr/share/tupi/data/xml/en/gpl.css
diff -Nru tupi-0.2+git04/debian/tupi.lintian-overrides tupi-0.2+git05/debian/tupi.lintian-overrides
--- tupi-0.2+git04/debian/tupi.lintian-overrides 2014-04-26 12:12:03.000000000 +0000
+++ tupi-0.2+git05/debian/tupi.lintian-overrides 2015-01-04 06:21:57.000000000 +0000
@@ -1,3 +1,3 @@
## false-positives:
-hardening-no-fortify-functions usr/lib/tupi/bin/tupi.bin
+hardening-no-fortify-functions usr/lib/tupi/libtupifwcore.so.1.0.0
diff -Nru tupi-0.2+git04/debian/watch tupi-0.2+git05/debian/watch
--- tupi-0.2+git04/debian/watch 2013-06-23 02:22:36.000000000 +0000
+++ tupi-0.2+git05/debian/watch 2015-01-01 07:47:31.000000000 +0000
@@ -10,6 +10,7 @@
uversionmangle=s/\-git/+git/ \
https://github.com/xtingray/tupi/tags .*/archive/v?(\d[-\d\.git]+)\.tar\.(?:gz|bzip2|xz)
+## Redirector http://qa.debian.org/watch/sf.php/tupi2d/
opts=\
uversionmangle=s/\-git/\+git/ \
- http://sf.net/tupi.berlios/tupi_([0-9.]+\-git[0-9]+)\.tar\.(?:gz|bzip2|xz)
+ http://sf.net/tupi2d/tupi[_-]([0-9.]+\-git[0-9]+)\.tar\.(?:gz|bzip2|xz)
diff -Nru tupi-0.2+git04/.gitignore tupi-0.2+git05/.gitignore
--- tupi-0.2+git04/.gitignore 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/.gitignore 2014-12-15 14:21:32.000000000 +0000
@@ -7,6 +7,10 @@
*.1
*.dylib
*.pro.user
+*.moc
+*.Debug
+*.Release
+moc_*
bin/
src/framework/tgui/qrc_tgui_images.cpp
@@ -27,6 +31,7 @@
launcher/tupi
launcher/tupi.desktop
+src/components/help/help/css/tupi.css
3rdparty/Makefile
3rdparty/potrace/Makefile
diff -Nru tupi-0.2+git04/INSTALL tupi-0.2+git05/INSTALL
--- tupi-0.2+git04/INSTALL 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/INSTALL 2014-12-15 14:21:32.000000000 +0000
@@ -18,9 +18,9 @@
* Qt: The full development toolkit used to create Tupi
* ruby: A script language used to do the configuration process previous
to the compilation
- * libavcodec-dev: A subcomponent of the project ffmpeg, to deal with
+ * libavcodec-dev: A subcomponent of the project libav, to deal with
video manipulation
- * libavformat-dev: A subcomponent of the project ffmpeg, to deal with
+ * libavformat-dev: A subcomponent of the project libav, to deal with
video manipulation
* zlib-dev: A file-compression library
* quazip: A very handy API to deal with zip files
@@ -70,3 +70,4 @@
Additional info: http://www.maefloresta.com
+
diff -Nru tupi-0.2+git04/INSTALL.md tupi-0.2+git05/INSTALL.md
--- tupi-0.2+git04/INSTALL.md 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/INSTALL.md 2014-12-15 14:21:32.000000000 +0000
@@ -18,9 +18,9 @@
* Qt: The full development toolkit used to create Tupi
* ruby: A script language used to do the configuration process previous
to the compilation
-* libavcodec-dev: A subcomponent of the project ffmpeg, to deal with
+* libavcodec-dev: A subcomponent of the project libav, to deal with
video manipulation
-* libavformat-dev: A subcomponent of the project ffmpeg, to deal with
+* libavformat-dev: A subcomponent of the project libav, to deal with
video manipulation
* zlib-dev: A file-compression library
* quazip: A very handy API to deal with zip files
diff -Nru tupi-0.2+git04/INSTALL.osx tupi-0.2+git05/INSTALL.osx
--- tupi-0.2+git04/INSTALL.osx 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/INSTALL.osx 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,56 @@
+* Warning: Guide pending for update!
+
+ Tupi basic installation guide for Mac OSX
+
+Note: Currently, to build and install Tupi on Mac OSX the Terminal application
+is required. This tool can be located at /Applications/Utilities/Terminal using
+the Finder application.
+The Terminal is just a command console, so if you have no experience using it,
+we recommend you to take a look at this little guide:
+ http://www.hacktheday.com/beginners-guide-to-apple-terminal-part-1/
+
+Now, to compile/install Tupi from source code, please follow the instructions
+below:
+
+1. Install the XCode Developer Tools available at:
+ https://developer.apple.com/downloads/index.action
+ If your OSX version is Lion, try version 4.1 or later and include the
+ package called "Command Line Tools for Xcode"
+ If your OSX version is Snow Leopard, try version 3.2 or later
+
+ Note: an Apple ID account is required to download XCode
+
+2. Install the Macports (package manager) available at:
+ http://www.macports.org/
+ Read the installation instructions at:
+ http://www.macports.org/install.php
+
+3. Install required ports:
+ $ sudo port install zlib
+ $ sudo port install ffmpeg +nonfree
+ $ sudo port install aspell
+ $ sudo port install git-core
+ $ sudo port install qt4-mac
+
+4. Download Tupi source code from Gitorious:
+ $ git clone -b experimental https://git.gitorious.org/tupi/tupi.git
+
+5. Move into project's directory:
+ $ cd tupi
+
+6. Run the configure script:
+ $ ./configure --prefix=/opt/local --bindir=/opt/local/bin/ --libdir=/opt/local/lib
+ --sharedir=/opt/local/share --with-debug
+
+7. Compile the project:
+ $ make
+
+8. Install binaries and resources:
+ $ sudo make install
+
+9. Run Tupi:
+ /opt/local/bin/tupi
+
+TODO:
+1. To make Tupi port file for Macports
+2. To build App Bundle for easy install (.dmg)
diff -Nru tupi-0.2+git04/launcher/tupi tupi-0.2+git05/launcher/tupi
--- tupi-0.2+git04/launcher/tupi 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/launcher/tupi 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export TUPI_HOME="/usr/local/tupi"
+export TUPI_SHARE="/usr/local/tupi/share/tupi"
+export TUPI_LIB="/usr/local/tupi/lib/tupi"
+export TUPI_PLUGIN="/usr/local/tupi/lib/tupi/plugins"
+export TUPI_BIN="/usr/local/tupi/bin"
+
+export LD_LIBRARY_PATH="${TUPI_LIB}:${TUPI_PLUGIN}:$LD_LIBRARY_PATH"
+
+exec ${TUPI_BIN}/tupi.bin $*
\ No newline at end of file
diff -Nru tupi-0.2+git04/launcher/tupi.desktop tupi-0.2+git05/launcher/tupi.desktop
--- tupi-0.2+git04/launcher/tupi.desktop 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/launcher/tupi.desktop 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=Tupi: Open 2D Magic
+Name[es]=Tupí: Magia 2D Libre
+Name[pt]=Tupí: Magia 2D Libre
+Name[ru]=Tupi: Open 2D Magic
+Exec=/usr/local/tupi/bin/tupi
+Icon=tupi
+Type=Application
+MimeType=application/tup;
+Categories=Graphics;2DGraphics;RasterGraphics;
+Comment=2D Animation Toolkit
+Comment[es]=Herramienta para Animación 2D
+Comment[pt]=Ferramenta de animação 2D
+Comment[ru]=Создание двухмерной векторной анимации
+Terminal=false
diff -Nru tupi-0.2+git04/libav.win.pri tupi-0.2+git05/libav.win.pri
--- tupi-0.2+git04/libav.win.pri 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/libav.win.pri 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,2 @@
+LIBS += -LC:\libav\bin\ -lavformat -lavcodec -lavutil
+INCLUDEPATH += C:\libav\include
\ No newline at end of file
diff -Nru tupi-0.2+git04/qonf/config.rb tupi-0.2+git05/qonf/config.rb
--- tupi-0.2+git04/qonf/config.rb 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/config.rb 2014-12-15 14:21:32.000000000 +0000
@@ -109,20 +109,18 @@
}
File.open("src/framework/tupconfig.pri", "w") { |f|
- f << "# Generated automatically at #{Time.now}! PLEASE DO NOT EDIT!"<< $endl
- f << "contains(DEFINES, HAVE_FFMPEG){" << $endl
- f << "LIBS += -lavcodec -lavformat -lavutil" << $endl
- f << "}" << $endl
+ # f << "# Generated automatically at #{Time.now}! PLEASE DO NOT EDIT!"<< $endl
+ # f << "contains(DEFINES, HAVE_LIBAV){" << $endl
+ # f << "LIBS += -lavcodec -lavformat -lavutil" << $endl
+ # f << "}" << $endl
if @defines.include? 'ADD_HEADERS'
f << "DEFINES += ADD_HEADERS" << $endl
end
f << $endl
- f << "QT += opengl core gui svg xml network" << $endl
- f << "unix {" << $endl
- f << " OBJECTS_DIR = .obj" << $endl
- f << " UI_DIR = .ui" << $endl
- f << " MOC_DIR = .moc" << $endl
- f << "}" << $endl
+
+ if not @defines.empty?
+ f << "DEFINES += " << @defines.uniq.join(" ") << $endl
+ end
if not @options.empty?
f << "CONFIG += " << @options.uniq.join(" ") << $endl
diff -Nru tupi-0.2+git04/qonf/configure.rb tupi-0.2+git05/qonf/configure.rb
--- tupi-0.2+git04/qonf/configure.rb 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/configure.rb 2014-12-15 14:21:32.000000000 +0000
@@ -67,7 +67,7 @@
@qmake = QMake.new
@properties = {}
- @ffmpeg = true
+ @libav = true
setPath()
Makefile::setArgs(@options)
@@ -111,17 +111,17 @@
end
def disableFFmpeg()
- @ffmpeg = false
+ @libav = false
end
def verifyQtVersion(minqtversion, verbose, qtdir)
- Info.info << "Checking for Qt >= " << minqtversion << " and Qt < 5.x ..." << $endl
+ Info.info << "Checking for Qt >= " << minqtversion << $endl
if @qmake.findQMake(minqtversion, verbose, qtdir)
print "[ \033[92mOK\033[0m ]\n"
else
print "[ \033[91mFAILED\033[0m ]\n"
- raise QonfException.new("\033[91mInvalid Qt version\033[0m.\n Please, upgrade to #{minqtversion} or higher (Visit: http://qt.nokia.com)")
+ raise QonfException.new("\033[91mInvalid Qt version\033[0m.\n Please, upgrade to #{minqtversion} or higher (Visit: http://qt-project.org)")
end
end
@@ -130,10 +130,10 @@
findTest(@testsDir)
end
- def runTests(config, conf, debug, isLucid)
+ def runTests(config, conf, debug)
@tests.each { |test|
- if not test.run(config, conf, debug, isLucid) and not test.optional
- raise QonfException.new("\033[91mMissing required dependency\033[0m")
+ if not test.run(config, conf, debug) and not test.optional
+ raise QonfException.new("\033[91mMissing required dependency\033[0m")
end
}
end
@@ -142,7 +142,7 @@
Info.info << "Creating makefiles..." << $endl
if RUBY_PLATFORM.downcase.include?("darwin")
- qmakeLine = "'CONFIG += console warn_on' 'INCLUDEPATH += /usr/local/include/quazip LIBS += -L/usr/local/lib -lavcodec -lavutil -lavformat -framework CoreFoundation'"
+ qmakeLine = "'CONFIG += console warn_on' 'INCLUDEPATH += /opt/local/include LIBS += -L/opt/local/lib -lavcodec -lavutil -lavformat -framework CoreFoundation'"
@qmake.run(qmakeLine, true)
else
@qmake.run("", true)
@@ -203,9 +203,9 @@
findTest(file)
end
elsif file =~ /.qonf$/
- if file.include? "ffmpeg"
- if @ffmpeg
- Info.warn << "Adding ffmpeg support: " << @ffmpeg << $endl
+ if file.include? "libav"
+ if @libav
+ Info.warn << "Adding libav support: " << @libav << $endl
@tests << Test.new(file, @qmake)
end
else
@@ -269,15 +269,27 @@
newfile += "export TUPI_PLUGIN=\"" + launcher_libdir + "/plugins\"\n"
newfile += "export TUPI_BIN=\"" + launcher_bindir + "\"\n\n"
+ path = ""
+ unless @options['with-libav'].nil? then
+ value = @options['with-libav']
+ path = value + "/lib:"
+ end
+
+ unless @options['with-quazip'].nil? then
+ value = @options['with-quazip']
+ path += value + "/lib:"
+ end
+
+ unless @options['with-theora'].nil? then
+ value = @options['with-theora']
+ path += value + "/lib:"
+ end
+
if RUBY_PLATFORM.downcase.include?("darwin")
- newfile += "export DYLD_FALLBACK_LIBRARY_PATH=\"\$\{TUPI_LIB\}:\$\{TUPI_PLUGIN\}:$DYLD_FALLBACK_LIBRARY_PATH\"\n\n"
+ newfile += "export DYLD_FALLBACK_LIBRARY_PATH=\"" + path + "\$\{TUPI_LIB\}:\$\{TUPI_PLUGIN\}:$DYLD_FALLBACK_LIBRARY_PATH\"\n\n"
newfile += "open ${TUPI_BIN}/Tupi.app $*"
else
- if @options['with-ffmpeg'].nil? then
- newfile += "export LD_LIBRARY_PATH=\"\$\{TUPI_LIB\}:\$\{TUPI_PLUGIN\}:$LD_LIBRARY_PATH\"\n\n"
- else
- newfile += "export LD_LIBRARY_PATH=\"" + @options['with-ffmpeg'] + "/lib:\$\{TUPI_LIB\}:\$\{TUPI_PLUGIN\}:$LD_LIBRARY_PATH\"\n\n"
- end
+ newfile += "export LD_LIBRARY_PATH=\"" + path + "\$\{TUPI_LIB\}:\$\{TUPI_PLUGIN\}:$LD_LIBRARY_PATH\"\n\n"
newfile += "exec ${TUPI_BIN}/tupi.bin $*"
end
@@ -285,26 +297,26 @@
f << newfile
}
- newfile = "[Desktop Entry]\n"
- # newfile += "Encoding=UTF-8\n"
- newfile += "Name=Tupi: Open 2D Magic\n"
- newfile += "Name[es]=Tupí: Magia 2D Libre\n"
- newfile += "Name[pt]=Tupí: Magia 2D Libre\n"
- newfile += "Name[ru]=Tupi: Open 2D Magic\n"
- newfile += "Exec=" + launcher_bindir + "/tupi\n"
- newfile += "Icon=tupi\n"
- newfile += "Type=Application\n"
- newfile += "MimeType=application/tup;\n"
- newfile += "Categories=Graphics;2DGraphics;RasterGraphics;\n"
- newfile += "Comment=2D Animation Toolkit\n"
- newfile += "Comment[es]=Herramienta para Animación 2D\n"
- newfile += "Comment[pt]=Ferramenta de animação 2D\n"
- newfile += "Comment[ru]=Создание двухмерной векторной анимации\n"
- newfile += "Terminal=false\n"
-
- File.open("launcher/tupi.desktop", "w") { |f|
- f << newfile
- }
+ newfile = "[Desktop Entry]\n"
+ # newfile += "Encoding=UTF-8\n"
+ newfile += "Name=Tupi: Open 2D Magic\n"
+ newfile += "Name[es]=Tupí: Magia 2D Libre\n"
+ newfile += "Name[pt]=Tupí: Magia 2D Libre\n"
+ newfile += "Name[ru]=Tupi: Open 2D Magic\n"
+ newfile += "Exec=" + launcher_bindir + "/tupi\n"
+ newfile += "Icon=tupi\n"
+ newfile += "Type=Application\n"
+ newfile += "MimeType=application/tup;\n"
+ newfile += "Categories=Graphics;2DGraphics;RasterGraphics;\n"
+ newfile += "Comment=2D Animation Toolkit\n"
+ newfile += "Comment[es]=Herramienta para Animación 2D\n"
+ newfile += "Comment[pt]=Ferramenta de animação 2D\n"
+ newfile += "Comment[ru]=Создание двухмерной векторной анимации\n"
+ newfile += "Terminal=false\n"
+
+ File.open("launcher/tupi.desktop", "w") { |f|
+ f << newfile
+ }
end
end
diff -Nru tupi-0.2+git04/qonf/defaults.rb tupi-0.2+git05/qonf/defaults.rb
--- tupi-0.2+git04/qonf/defaults.rb 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/defaults.rb 2014-12-15 14:21:32.000000000 +0000
@@ -40,5 +40,5 @@
CONFIG["libdir"] = "/usr/local/tupi/lib"
CONFIG["includedir"] = "/usr/local/tupi/include"
CONFIG["sharedir"] = "/usr/local/tupi/share"
- CONFIG["ffmpegdir"] = "/usr"
+ CONFIG["libavdir"] = "/usr"
end
diff -Nru tupi-0.2+git04/qonf/detectos.rb tupi-0.2+git05/qonf/detectos.rb
--- tupi-0.2+git04/qonf/detectos.rb 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/detectos.rb 2014-12-15 14:21:32.000000000 +0000
@@ -43,6 +43,8 @@
3 => "Linux",
31 => "Debian",
311 => "Ubuntu",
+ 312 => "14.04",
+ 313 => "14.10",
32 => "Gentoo",
4 => "Mac OS X"
}
@@ -58,38 +60,43 @@
@os = linux if linux > 0
end
-
return @os
end
def self.tryToFindLinuxDistribution
- cwd = Dir.getwd
- Dir.chdir("/etc/")
-
- Dir["*{-,_}{version,release}"].each { |path|
- if path.downcase =~ /^(\w*)(-|_)(version|release)/
- DetectOS::OS.each { |id, os|
- if os.downcase == $1
- Dir.chdir(cwd)
-
- if $1 == "debian"
- if `apt-cache -v`.include?("ubuntu")
- return 311
- end
- end
-
- return id
- end
- }
- end
- }
-
- Dir.chdir(cwd)
+ lsb = "/etc/lsb-release"
+ if File.exist?(lsb)
+ distro = ""
+ version = ""
+ File.open(lsb, "r") do |f|
+ f.each_line do |line|
+ line = line.chop
+ tag, value = line.split("=")
+
+ if tag.eql? "DISTRIB_ID"
+ distro = value
+ end
+ if tag.eql? "DISTRIB_RELEASE"
+ version = value
+ end
+ end
+ end
+
+ if distro.eql? "Ubuntu"
+ if version.eql? "14.04"
+ return 312
+ end
+ if version.eql? "14.10"
+ return 313
+ end
+ return 311
+ end
+ end
if `uname`.downcase == "linux"
return 2
end
-
+
return 0
end
end
diff -Nru tupi-0.2+git04/qonf/qmake.rb tupi-0.2+git05/qonf/qmake.rb
--- tupi-0.2+git04/qonf/qmake.rb 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/qmake.rb 2014-12-15 14:21:32.000000000 +0000
@@ -48,88 +48,66 @@
# This method check if the current version of Qt is valid for Tupi compilation
def findQMake(minqtversion, verbose, qtdir)
+ path = "qmake"
+ command = ""
+
+ Info.info << "Testing for #{path}... "
+
+ IO.popen("which #{path}") { |result|
+ if qtdir.length > 0
+ command = qtdir + "/bin/qmake"
+ else
+ pathVar = result.readlines.join("").split(":")
+ if pathVar.length > 0
+ command = pathVar[0].chop
+ end
+ end
+
+ if command.length == 0
+ return false
+ end
+ }
+
qtversion = ""
- paths = [ "qmake", "qmake-qt4", "qmake4" ]
+ version = []
+
+ IO.popen("#{command} -query QT_VERSION") { |prc|
+ found = prc.readlines.join("")
+ version = found.split(".")
+ if (found.length != 0)
+ qtversion = found.chop
+ end
+ }
+
minver = minqtversion.split(".")
- valid = true
- count = 0
- paths.each { |path|
- begin
- Info.info << "Testing for #{path}... "
- valid = true
- version = []
- sites = []
- distance = 0
- IO.popen("which #{path}") { |result|
- sites = result.readlines.join("").split(":")
- word = ""
- if qtdir.length > 0
- word = qtdir + "/bin/qmake"
- else
- if sites.length > 0
- word = sites[0].chop
- end
- end
- distance = word.length
- }
-
- if distance > 0
- IO.popen("#{path} -query QT_VERSION") { |prc|
- found = prc.readlines.join("")
- version = found.split(".")
- if (found.length != 0)
- qtversion = found.chop
- if (qtversion.start_with?('5'))
- return false
- end
- end
- }
- next if $? != 0
-
- version.size.times { |i|
- if i == 0
- if version[i] < minver[i]
- return false
- elsif version[i] > minver[i]
- return true
- end
- end
-
- if i == 1
- if version[i] < minver[i]
- return false
- end
- end
-
- if i == 2
- if version[i] < minver[i]
- return false
- end
- end
- }
-
- if valid
- @path = path
- break
- end
+ version.size.times { |i|
+ if i == 0
+ if version[i] < minver[i]
+ return false
+ end
+ end
- else
- count = count + 1
+ if i == 1
+ if version[i] < minver[i]
+ return false
+ end
end
- end
+ if i == 2
+ if version[i] < minver[i]
+ return false
+ end
+ end
}
+
+ @path = command
- if count == 3
- return false
- end
-
- if verbose == 1 && valid
+ if verbose == 1
print "(Found: #{qtversion}) "
end
- return valid
+ return true
end
def query(var)
@@ -143,8 +121,8 @@
if recur
options += "-r"
end
-
- output = `#{@path} #{args} #{options} `
+
+ output = `#{@path} #{args} #{options}`
if output.strip.empty?
return true
diff -Nru tupi-0.2+git04/qonf/test.rb tupi-0.2+git05/qonf/test.rb
--- tupi-0.2+git04/qonf/test.rb 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/qonf/test.rb 2014-12-15 14:21:32.000000000 +0000
@@ -55,13 +55,13 @@
@optional = false
end
- def run(config, conf, debug, isLucid)
+ def run(config, conf, debug)
parser = Parser.new
parser.os = DetectOS::OS[DetectOS.whatOS].to_s.downcase
-
+
return false if not parser.parse(@rules) or parser.name.empty?
-
+
@optional = parser.optional
Info.info << "Checking for " << parser.name << "... "
@@ -84,25 +84,51 @@
extraLib = "-L/usr/lib64 "
end
- if File.dirname(@rules).end_with?("ffmpeg")
- if conf.hasArgument?("with-ffmpeg")
- ffmpegLib = conf.argumentValue("with-ffmpeg") + "/lib"
- extraLib += "-L#{ffmpegLib}"
- extraInclude = conf.argumentValue("with-ffmpeg") + "/include"
+ if File.dirname(@rules).end_with?("libav")
+ if conf.hasArgument?("with-libav")
+ libavDir = conf.argumentValue("with-libav")
+ libavLib = libavDir + "/lib"
+ extraLib += "-L#{libavLib}"
+ extraInclude = libavDir + "/include"
qmakeLine = "'LIBS += #{extraLib}'";
qmakeLine += " 'INCLUDEPATH += #{extraInclude}'";
end
else
- qmakeLine = ""
- if extraLib.length > 0
- qmakeLine = "'LIBS += #{extraLib} #{parser.libs.join(" ")}'";
+ if File.dirname(@rules).end_with?("quazip")
+ if conf.hasArgument?("with-quazip")
+ quazipDir = conf.argumentValue("with-quazip")
+ quazipLib = quazipDir + "/lib"
+ extraLib += "-L#{quazipLib} -lquazip"
+ extraInclude = quazipDir + "/include"
+ qmakeLine = "'LIBS += #{extraLib}'"
+ qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
+ else
+ if parser.os.eql? "14.10"
+ extraLib = "-lquazip-qt5"
+ else
+ extraLib = "-lquazip"
+ end
+ qmakeLine = "'LIBS += #{extraLib}'"
+ end
+ else
+ if File.dirname(@rules).end_with?("theora")
+ if conf.hasArgument?("with-theora")
+ theoraDir = conf.argumentValue("with-theora")
+ theoraLib = theoraDir + "/lib"
+ extraLib += "-L#{theoraLib}"
+ extraInclude = theoraDir + "/include"
+ qmakeLine = "'LIBS += #{extraLib}'"
+ qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
+ end
+ else
+ qmakeLine = ""
+ if extraLib.length > 0
+ qmakeLine = "'LIBS += #{extraLib} #{parser.libs.join(" ")}'"
+ end
+ end
end
end
- if isLucid
- qmakeLine = "'DEFINES += K_LUCID' " + qmakeLine
- end
-
@qmake.run(qmakeLine, true)
if not @qmake.compile(debug)
@@ -150,6 +176,12 @@
parser.libs.each { |lib|
config.addLib(lib)
}
+
+ if parser.os.eql? "14.10"
+ config.addLib("-lquazip-qt5")
+ else
+ config.addLib("-lquazip")
+ end
parser.defines.each { |define|
config.addDefine(define)
diff -Nru tupi-0.2+git04/quazip.win.pri tupi-0.2+git05/quazip.win.pri
--- tupi-0.2+git04/quazip.win.pri 1970-01-01 00:00:00.000000000 +0000
+++ tupi-0.2+git05/quazip.win.pri 2014-12-15 14:21:32.000000000 +0000
@@ -0,0 +1,2 @@
+LIBS += -LC:/Quazip/lib/ -lquazip
+INCLUDEPATH += C:\Quazip\include\quazip
\ No newline at end of file
diff -Nru tupi-0.2+git04/src/components/animation/animation.pri tupi-0.2+git05/src/components/animation/animation.pri
--- tupi-0.2+git04/src/components/animation/animation.pri 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/animation.pri 2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
INCLUDEPATH += $$ANIMATION_DIR
-LIBS += -L$$ANIMATION_DIR -ltupianimation
+
+unix {
+ LIBS += -L$$ANIMATION_DIR -ltupianimation
+}
+
+win32 {
+ LIBS += -L$$ANIMATION_DIR/release/ -ltupianimation
+}
linux-g++ {
PRE_TARGETDEPS += $$ANIMATION_DIR/libtupianimation.so
diff -Nru tupi-0.2+git04/src/components/animation/animation.pro tupi-0.2+git05/src/components/animation/animation.pro
--- tupi-0.2+git04/src/components/animation/animation.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/animation.pro 2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager.
-# -------------------------------------------
-# Subdir relative project main directory: ./src/components/animation
-# Target is a library: animation
+QT += opengl core gui svg xml network multimedia
INSTALLS += target
target.path = /lib/
@@ -34,4 +31,37 @@
FRAMEWORK_DIR = "../../framework"
include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+ STORE_DIR = ../../store/
+ INCLUDEPATH += $$STORE_DIR
+ LIBS += -L$$STORE_DIR -ltupistore
+
+ LIBBASE_DIR = ../../libbase/
+ INCLUDEPATH += $$LIBBASE_DIR
+ LIBS += -L$$LIBBASE_DIR -ltupibase
+
+ LIBTUPI_DIR = ../../libtupi/
+ INCLUDEPATH += $$LIBTUPI_DIR
+ LIBS += -L$$LIBTUPI_DIR -ltupi
+
+ !include(../../../tupiglobal.pri) {
+ error("Run ./configure first!")
+ }
+}
+
+win32 {
+ include(../../../win.pri)
+
+ STORE_DIR = ../../store/
+ INCLUDEPATH += $$STORE_DIR
+ LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+ LIBBASE_DIR = ../../libbase/
+ INCLUDEPATH += $$LIBBASE_DIR
+ LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+ LIBTUPI_DIR = ../../libtupi/
+ INCLUDEPATH += $$LIBTUPI_DIR
+ LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
+}
diff -Nru tupi-0.2+git04/src/components/animation/tupanimationspace.cpp tupi-0.2+git05/src/components/animation/tupanimationspace.cpp
--- tupi-0.2+git04/src/components/animation/tupanimationspace.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupanimationspace.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,12 +34,6 @@
***************************************************************************/
#include "tupanimationspace.h"
-#include "tdebug.h"
-
-#include
-#include
-#include
-#include
/**
* This class defines the space which contains the Animation Mode interface.
diff -Nru tupi-0.2+git04/src/components/animation/tupanimationspace.h tupi-0.2+git05/src/components/animation/tupanimationspace.h
--- tupi-0.2+git04/src/components/animation/tupanimationspace.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupanimationspace.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,14 +36,20 @@
#ifndef TUPWORKSPACE_H
#define TUPWORKSPACE_H
+#include "tglobal.h"
#include "tupcamerawidget.h"
+
#include
+#include
+#include
+#include
+#include
/**
* @author David Cuadrado
**/
-class TupAnimationspace : public QMainWindow
+class TUPI_EXPORT TupAnimationspace : public QMainWindow
{
Q_OBJECT
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerabar.cpp tupi-0.2+git05/src/components/animation/tupcamerabar.cpp
--- tupi-0.2+git04/src/components/animation/tupcamerabar.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerabar.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,17 +34,15 @@
***************************************************************************/
#include "tupcamerabar.h"
-#include "tdebug.h"
-#include "tglobal.h"
-#include
-
-
-TupCameraBar::TupCameraBar(QWidget *parent)
- : QFrame(parent)
+TupCameraBar::TupCameraBar(QWidget *parent) : QFrame(parent)
{
#ifdef K_DEBUG
- TINIT;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupCameraBar()]";
+ #else
+ TINIT;
+ #endif
#endif
setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
@@ -89,7 +87,11 @@
TupCameraBar::~TupCameraBar()
{
#ifdef K_DEBUG
+ #ifdef Q_OS_WIN32
+ qDebug() << "[~TupCameraBar()]";
+ #else
TEND;
+ #endif
#endif
}
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerabar.h tupi-0.2+git05/src/components/animation/tupcamerabar.h
--- tupi-0.2+git04/src/components/animation/tupcamerabar.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerabar.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,18 +36,20 @@
#ifndef TUPCAMERABAR_H
#define TUPCAMERABAR_H
+#include "tglobal.h"
#include "timagebutton.h"
#include "tapplicationproperties.h"
#include
#include
#include
+#include
/**
* @author David Cuadrado
*/
-class TupCameraBar : public QFrame
+class TUPI_EXPORT TupCameraBar : public QFrame
{
Q_OBJECT
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerastatus.cpp tupi-0.2+git05/src/components/animation/tupcamerastatus.cpp
--- tupi-0.2+git04/src/components/animation/tupcamerastatus.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerastatus.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,22 +34,9 @@
***************************************************************************/
#include "tupcamerastatus.h"
-#include "tupexportwidget.h"
-#include "tdebug.h"
-#include "tconfig.h"
-#include "tseparator.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
struct TupCameraStatus::Private
{
- // QComboBox *fps;
QSpinBox *fps;
QComboBox *scenes;
QLabel *framesTotal;
@@ -60,7 +47,11 @@
TupCameraStatus::TupCameraStatus(TupCameraWidget *camera, bool isNetworked, QWidget *parent) : QFrame(parent), k(new Private)
{
#ifdef K_DEBUG
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupCameraStatus()]";
+ #else
TINIT;
+ #endif
#endif
setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
@@ -159,7 +150,11 @@
TupCameraStatus::~TupCameraStatus()
{
#ifdef K_DEBUG
- TEND;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[~TupCameraStatus()]";
+ #else
+ TEND;
+ #endif
#endif
}
@@ -187,9 +182,12 @@
if (k->scenes->count())
k->scenes->clear();
- foreach (TupScene *scene, project->scenes().values()) {
- if (scene)
- k->scenes->addItem(scene->sceneName());
+ int scenesTotal = project->scenes().size();
+ for (int i = 0; i < scenesTotal; i++) {
+ TupScene *scene = project->scenes().at(i);
+ if (scene)
+ k->scenes->addItem(scene->sceneName());
+
}
}
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerastatus.h tupi-0.2+git05/src/components/animation/tupcamerastatus.h
--- tupi-0.2+git04/src/components/animation/tupcamerastatus.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerastatus.h 2014-12-15 14:21:32.000000000 +0000
@@ -37,16 +37,22 @@
#define TUPCAMERASTATUS_H
#include "tupcamerawidget.h"
+#include "tupexportwidget.h"
+#include "tconfig.h"
+#include "tseparator.h"
#include
#include
#include
#include
#include
+#include
+#include
+#include
class TupCameraWidget;
-class TupCameraStatus : public QFrame
+class TUPI_EXPORT TupCameraStatus : public QFrame
{
Q_OBJECT
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerawidget.cpp tupi-0.2+git05/src/components/animation/tupcamerawidget.cpp
--- tupi-0.2+git04/src/components/animation/tupcamerawidget.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerawidget.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,22 +34,13 @@
***************************************************************************/
#include "tupcamerawidget.h"
-#include "tupexportwidget.h"
-#include "tdebug.h"
-#include "tseparator.h"
-#include "tupprojectrequest.h"
-#include "tupprojectresponse.h"
-#include "tuprequestbuilder.h"
-
-#include
-#include
-#include
-#include
struct TupCameraWidget::Private
{
QFrame *container;
TupScreen *screen;
+ TupCameraBar *cameraBar;
+ QProgressBar *progressBar;
TupCameraStatus *status;
TupProject *project;
int currentSceneIndex;
@@ -62,7 +53,11 @@
TupCameraWidget::TupCameraWidget(TupProject *project, bool isNetworked, QWidget *parent) : QFrame(parent), k(new Private)
{
#ifdef K_DEBUG
- TINIT;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupCameraWidget()]";
+ #else
+ TINIT;
+ #endif
#endif
QDesktopWidget desktop;
@@ -118,18 +113,27 @@
layout->addWidget(scaleWidget, 0, Qt::AlignCenter);
layout->addLayout(labelLayout, Qt::AlignCenter);
+ k->progressBar = new QProgressBar(this);
+ QString style = "QProgressBar { background-color: #DDDDDD; text-align: center; color: #FFFFFF; border-radius: 2px; } QProgressBar::chunk { background-color: #009500; border-radius: 2px; }";
+ k->progressBar->setStyleSheet(style);
+ k->progressBar->setMaximumHeight(5);
+ k->progressBar->setTextVisible(false);
+ k->progressBar->setRange(1, 100);
+ layout->addWidget(k->progressBar, 0, Qt::AlignCenter);
+
k->screen = new TupScreen(k->project, k->playerDimension, k->isScaled);
+ connect(k->screen, SIGNAL(isRendering(int)), this, SLOT(updateProgressBar(int)));
+
layout->addWidget(k->screen, 0, Qt::AlignCenter);
- TupCameraBar *cameraBar = new TupCameraBar;
- layout->addWidget(cameraBar, 0, Qt::AlignCenter);
- cameraBar->show();
-
- connect(cameraBar, SIGNAL(play()), this, SLOT(doPlay()));
- connect(cameraBar, SIGNAL(playBack()), this, SLOT(doPlayBack()));
- connect(cameraBar, SIGNAL(stop()), k->screen, SLOT(stop()));
- connect(cameraBar, SIGNAL(ff()), k->screen, SLOT(nextFrame()));
- connect(cameraBar, SIGNAL(rew()), k->screen, SLOT(previousFrame()));
+ k->cameraBar = new TupCameraBar;
+ layout->addWidget(k->cameraBar, 0, Qt::AlignCenter);
+
+ connect(k->cameraBar, SIGNAL(play()), this, SLOT(doPlay()));
+ connect(k->cameraBar, SIGNAL(playBack()), this, SLOT(doPlayBack()));
+ connect(k->cameraBar, SIGNAL(stop()), k->screen, SLOT(stop()));
+ connect(k->cameraBar, SIGNAL(ff()), k->screen, SLOT(nextFrame()));
+ connect(k->cameraBar, SIGNAL(rew()), k->screen, SLOT(previousFrame()));
k->status = new TupCameraStatus(this, isNetworked);
k->status->setScenes(k->project);
@@ -147,7 +151,11 @@
TupCameraWidget::~TupCameraWidget()
{
#ifdef K_DEBUG
- TEND;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[~TupCameraWidget()]";
+ #else
+ TEND;
+ #endif
#endif
}
@@ -228,7 +236,11 @@
bool TupCameraWidget::handleProjectResponse(TupProjectResponse *response)
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupCameraWidget::handleProjectResponse()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
if (TupSceneResponse *sceneResponse = static_cast(response)) {
@@ -276,7 +288,12 @@
default:
{
#ifdef K_DEBUG
- tFatal() << "TupCameraWidget::handleProjectResponse() - Unknown/Unhandled project action: " << sceneResponse->action();
+ QString msg = "TupCameraWidget::handleProjectResponse() - Unknown/Unhandled project action: " + QString::number(sceneResponse->action());
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tFatal() << msg;
+ #endif
#endif
}
break;
@@ -293,13 +310,23 @@
k->screen->setFPS(fps);
}
+void TupCameraWidget::setStatusFPS(int fps)
+{
+ k->status->blockSignals(true);
+ k->status->setFPS(fps);
+ k->status->blockSignals(false);
+
+ k->project->setFPS(fps);
+ k->screen->setFPS(fps);
+}
+
void TupCameraWidget::updateFramesTotal(int sceneIndex)
{
TupScene *scene = k->project->scene(sceneIndex);
if (scene) {
- QString total = "";
- total = total.setNum(scene->framesTotal());
- k->status->setFramesTotal(total);
+ int total = scene->framesTotal();
+ k->status->setFramesTotal(QString::number(total));
+ k->progressBar->setRange(0, total);
}
}
@@ -352,3 +379,8 @@
{
k->screen->updateAnimationArea();
}
+
+void TupCameraWidget::updateProgressBar(int advance)
+{
+ k->progressBar->setValue(advance);
+}
diff -Nru tupi-0.2+git04/src/components/animation/tupcamerawidget.h tupi-0.2+git05/src/components/animation/tupcamerawidget.h
--- tupi-0.2+git04/src/components/animation/tupcamerawidget.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupcamerawidget.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,6 +36,12 @@
#ifndef TUPCAMERAWIDGET_H
#define TUPCAMERAWIDGET_H
+#include "tglobal.h"
+#include "tupexportwidget.h"
+#include "tseparator.h"
+#include "tupprojectrequest.h"
+#include "tupprojectresponse.h"
+#include "tuprequestbuilder.h"
#include "tcirclebuttonbar.h"
#include "tvhbox.h"
#include "tupscreen.h"
@@ -44,6 +50,11 @@
#include
#include
+#include
+#include
+#include
+#include
+#include
class TupProjectResponse;
class QCheckBox;
@@ -53,7 +64,7 @@
* @author David Cuadrado
*/
-class TupCameraWidget : public QFrame
+class TUPI_EXPORT TupCameraWidget : public QFrame
{
Q_OBJECT
@@ -68,10 +79,12 @@
private slots:
void setLoop();
void selectScene(int index);
+ void updateProgressBar(int advance);
public slots:
bool handleProjectResponse(TupProjectResponse *event);
void setFPS(int fps);
+ void setStatusFPS(int fps);
void updateFramesTotal(int sceneIndex);
void exportDialog();
void postDialog();
diff -Nru tupi-0.2+git04/src/components/animation/tupscreen.cpp tupi-0.2+git05/src/components/animation/tupscreen.cpp
--- tupi-0.2+git04/src/components/animation/tupscreen.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupscreen.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,19 +34,6 @@
***************************************************************************/
#include "tupscreen.h"
-#include "tupprojectresponse.h"
-#include "tupgraphicobject.h"
-#include "tupgraphicsscene.h"
-#include "tupanimationrenderer.h"
-#include "tupsoundlayer.h"
-#include "tdebug.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
typedef QList photoArray;
@@ -54,6 +41,7 @@
{
QWidget *container;
QImage renderCamera;
+ QPoint imagePos;
bool firstShoot;
bool isScaled;
const TupProject *project;
@@ -70,24 +58,35 @@
QList animationList;
QList renderControl;
QSize screenDimension;
+
+ TupLibrary *library;
+ QList > lipSyncRecords;
+ QMediaPlayer *soundPlayer;
+
+ bool isPlaying;
};
-TupScreen::TupScreen(const TupProject *project, const QSize viewSize, bool isScaled, QWidget *parent) : QFrame(parent), k(new Private)
+TupScreen::TupScreen(TupProject *project, const QSize viewSize, bool isScaled, QWidget *parent) : QFrame(parent), k(new Private)
{
#ifdef K_DEBUG
- TINIT;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen()]";
+ #else
+ TINIT;
+ #endif
#endif
k->container = parent;
k->project = project;
+ k->library = project->library();
k->isScaled = isScaled;
-
k->screenDimension = viewSize;
-
k->cyclicAnimation = false;
k->fps = 24;
k->currentSceneIndex = 0;
k->currentFramePosition = 0;
+ k->soundPlayer = new QMediaPlayer;
+ k->isPlaying = false;
k->timer = new QTimer(this);
k->playBackTimer = new QTimer(this);
@@ -96,15 +95,19 @@
connect(k->playBackTimer, SIGNAL(timeout()), this, SLOT(back()));
initPhotogramsArray();
- updateFirstFrame();
updateSceneIndex(0);
+ updateFirstFrame();
}
TupScreen::~TupScreen()
{
#ifdef K_DEBUG
- TEND;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[~TupScreen()]";
+ #else
+ TEND;
+ #endif
#endif
k->timer->stop();
@@ -122,7 +125,11 @@
void TupScreen::resetPhotograms(int sceneIndex)
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::resetPhotograms()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
if (sceneIndex > -1) {
@@ -139,7 +146,11 @@
void TupScreen::initPhotogramsArray()
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::initPhotogramsArray()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
k->renderControl.clear();
@@ -154,95 +165,124 @@
void TupScreen::setFPS(int fps)
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::setFPS()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
- k->fps = fps;
+ k->fps = fps;
- if (k->timer->isActive()) {
- k->timer->stop();
- play();
- }
+ if (k->timer->isActive()) {
+ k->timer->stop();
+ play();
+ }
- if (k->playBackTimer->isActive()) {
- k->playBackTimer->stop();
- playBack();
- }
+ if (k->playBackTimer->isActive()) {
+ k->playBackTimer->stop();
+ playBack();
+ }
}
void TupScreen::paintEvent(QPaintEvent *)
{
- /*
- #ifdef K_DEBUG
- T_FUNCINFO;
- #endif
- */
-
- if (!k->firstShoot) {
- if (k->currentFramePosition > -1 && k->currentFramePosition < k->photograms.count())
- k->renderCamera = k->photograms[k->currentFramePosition];
- } else {
- k->firstShoot = false;
- }
+ /*
+ #ifdef K_DEBUG
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::paintEvent()]";
+ #else
+ T_FUNCINFO;
+ #endif
+ #endif
+ */
- QPainter painter;
- painter.begin(this);
+ if (k->isPlaying)
+ playLipSyncAt(k->currentFramePosition);
- int x = (frameSize().width() - k->renderCamera.size().width()) / 2;
- int y = (frameSize().height() - k->renderCamera.size().height()) / 2;
- painter.drawImage(QPoint(x, y), k->renderCamera);
-
- // SQA: Border for the player. Useful for some tests
- // painter.setPen(QPen(Qt::gray, 0.5, Qt::SolidLine));
- // painter.drawRect(x, y, k->renderCamera.size().width()-1, k->renderCamera.size().height()-1);
+ if (!k->firstShoot) {
+ if (k->currentFramePosition > -1 && k->currentFramePosition < k->photograms.count())
+ k->renderCamera = k->photograms[k->currentFramePosition];
+ } else {
+ k->firstShoot = false;
+ }
+
+ QPainter painter;
+ painter.begin(this);
+
+ painter.drawImage(k->imagePos, k->renderCamera);
+
+ // SQA: Border for the player. Useful for some tests
+ // painter.setPen(QPen(Qt::gray, 0.5, Qt::SolidLine));
+ // painter.drawRect(x, y, k->renderCamera.size().width()-1, k->renderCamera.size().height()-1);
}
void TupScreen::play()
{
- #ifdef K_DEBUG
- tWarning("camera") << "TupScreen::play() - Playing at " << k->fps << " FPS";
- #endif
-
- if (k->playBackTimer->isActive())
- stop();
-
- k->currentFramePosition = 0;
-
- if (!k->timer->isActive()) {
- if (!k->renderControl.at(k->currentSceneIndex)) {
- QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
- render();
- QApplication::restoreOverrideCursor();
- }
+ #ifdef K_DEBUG
+ QString msg = "TupScreen::play() - Playing at " + QString::number(k->fps) + " FPS";
+ #ifdef Q_OS_WIN32
+ qWarning() << msg;
+ #else
+ tWarning("camera") << msg;
+ #endif
+ #endif
- if (k->renderControl.at(k->currentSceneIndex))
- k->timer->start(1000 / k->fps);
- }
+ k->isPlaying = true;
+
+ if (k->playBackTimer->isActive())
+ stop();
+
+ k->currentFramePosition = 0;
+
+ if (!k->timer->isActive()) {
+ if (!k->renderControl.at(k->currentSceneIndex)) {
+ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ render();
+ QApplication::restoreOverrideCursor();
+ }
+
+ if (k->renderControl.at(k->currentSceneIndex))
+ k->timer->start(1000 / k->fps);
+ }
}
void TupScreen::playBack()
{
- #ifdef K_DEBUG
- tWarning("camera") << "TupScreen::playBack() - Starting procedure...";
- #endif
-
- if (k->timer->isActive())
- stop();
-
- k->currentFramePosition = k->photograms.count() - 1;
-
- if (!k->playBackTimer->isActive()) {
- if (!k->renderControl.at(k->currentSceneIndex))
- render();
- k->playBackTimer->start(1000 / k->fps);
- }
+ #ifdef K_DEBUG
+ QString msg = "TupScreen::playBack() - Starting procedure...";
+ #ifdef Q_OS_WIN32
+ qWarning() << msg;
+ #else
+ tWarning("camera") << msg;
+ #endif
+ #endif
+
+ if (k->timer->isActive())
+ stop();
+
+ k->currentFramePosition = k->photograms.count() - 1;
+
+ if (!k->playBackTimer->isActive()) {
+ if (!k->renderControl.at(k->currentSceneIndex))
+ render();
+ k->playBackTimer->start(1000 / k->fps);
+ }
}
void TupScreen::stop()
{
#ifdef K_DEBUG
- tWarning("camera") << "TupScreen::stop() - Stopping player!";
+ QString msg = "TupScreen::stop() - Stopping player!";
+ #ifdef Q_OS_WIN32
+ qWarning() << msg;
+ #else
+ tWarning("camera") << msg;
+ #endif
#endif
+
+ k->isPlaying = false;
+ k->soundPlayer->stop();
if (k->timer->isActive())
k->timer->stop();
@@ -260,26 +300,44 @@
void TupScreen::nextFrame()
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::nextFrame()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
if (!k->renderControl.at(k->currentSceneIndex))
render();
k->currentFramePosition += 1;
+
+ if (k->currentFramePosition == k->photograms.count())
+ k->currentFramePosition = 0;
+
repaint();
}
void TupScreen::previousFrame()
{
+ /*
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::previousFrame()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
+ */
if (!k->renderControl.at(k->currentSceneIndex))
render();
k->currentFramePosition -= 1;
+
+ if (k->currentFramePosition < 0)
+ k->currentFramePosition = k->photograms.count() - 1;
+
repaint();
}
@@ -287,7 +345,11 @@
{
/*
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::advance()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
*/
@@ -310,7 +372,11 @@
void TupScreen::back()
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::back()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
if (k->cyclicAnimation && k->currentFramePosition < 0)
@@ -335,7 +401,11 @@
void TupScreen::sceneResponse(TupSceneResponse *event)
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::sceneResponse()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
int index = event->sceneIndex();
@@ -393,40 +463,43 @@
void TupScreen::render()
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::render()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
+ emit isRendering(0);
+
TupScene *scene = k->project->scene(k->currentSceneIndex);
if (!scene) {
#ifdef K_DEBUG
- tError() << "TupScreen::render() - [ Fatal Error ] - Scene is NULL! -> index: " << k->currentSceneIndex;
+ QString msg = "TupScreen::render() - [ Fatal Error ] - Scene is NULL! -> index: " + QString::number(k->currentSceneIndex);
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
return;
}
k->sounds.clear();
- foreach (TupSoundLayer *layer, scene->soundLayers().values())
- k->sounds << layer;
+ int soundLayersTotal = scene->soundLayers().size();
+ for (int i = 0; i < soundLayersTotal; i++) {
+ TupSoundLayer *layer = scene->soundLayers().at(i);
+ k->sounds << layer;
+ }
- TupAnimationRenderer renderer(k->project->bgColor());
+ TupAnimationRenderer renderer(k->project->bgColor(), k->library);
renderer.setScene(scene, k->project->dimension());
QFont font = this->font();
font.setPointSize(8);
- QProgressDialog progressDialog(this, Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::Dialog);
- progressDialog.setFont(font);
- progressDialog.setLabelText(tr("Rendering..."));
- progressDialog.setCancelButton(0);
- progressDialog.setRange(1, renderer.totalPhotograms());
-
- QDesktopWidget desktop;
- progressDialog.move((int) (desktop.screenGeometry().width() - progressDialog.width())/2,
- (int) (desktop.screenGeometry().height() - progressDialog.height())/2);
- progressDialog.show();
-
QList photogramList;
int i = 1;
@@ -444,19 +517,25 @@
photogramList << renderized;
}
- progressDialog.setValue(i);
+ emit isRendering(i);
i++;
}
k->photograms = photogramList;
k->animationList.replace(k->currentSceneIndex, photogramList);
k->renderControl.replace(k->currentSceneIndex, true);
+
+ emit isRendering(0);
}
QSize TupScreen::sizeHint() const
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::sizeHint()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
return k->renderCamera.size();
@@ -465,7 +544,11 @@
void TupScreen::resizeEvent(QResizeEvent *event)
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::resizeEvent()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
QFrame::resizeEvent(event);
@@ -478,7 +561,12 @@
update();
} else {
#ifdef K_DEBUG
- tError() << "TupScreen::resizeEvent() - [ Error ] - Current index is invalid -> " << k->currentSceneIndex;
+ QString msg = "TupScreen::resizeEvent() - [ Error ] - Current index is invalid -> " + QString::number(k->currentSceneIndex);
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
}
}
@@ -486,7 +574,11 @@
void TupScreen::setLoop(bool loop)
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::setLoop()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
k->cyclicAnimation = loop;
@@ -495,7 +587,11 @@
void TupScreen::updateSceneIndex(int index)
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::updateSceneIndex()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
k->currentSceneIndex = index;
@@ -504,7 +600,12 @@
k->photograms = k->animationList.at(k->currentSceneIndex);
} else {
#ifdef K_DEBUG
- tError() << "TupScreen::updateSceneIndex() - [ Error ] - Can't set current photogram array -> " << k->currentSceneIndex;
+ QString msg = "TupScreen::updateSceneIndex() - [ Error ] - Can't set current photogram array -> " + QString::number(k->currentSceneIndex);
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
}
}
@@ -517,7 +618,11 @@
TupScene *TupScreen::currentScene() const
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::currentScene()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
if (k->currentSceneIndex > -1) {
@@ -539,7 +644,11 @@
void TupScreen::updateAnimationArea()
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::updateAnimationArea()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
if (k->currentSceneIndex > -1 && k->currentSceneIndex < k->animationList.count()) {
@@ -549,7 +658,12 @@
update();
} else {
#ifdef K_DEBUG
- tError() << "TupScreen::updateAnimationArea() - [ Fatal Error ] - Can't access to scene index: " << k->currentSceneIndex;
+ QString msg = "TupScreen::updateAnimationArea() - [ Fatal Error ] - Can't access to scene index: " + QString::number(k->currentSceneIndex);
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
}
}
@@ -561,13 +675,19 @@
void TupScreen::updateFirstFrame()
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::updateFirstFrame()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
if (k->currentSceneIndex > -1 && k->currentSceneIndex < k->animationList.count()) {
TupScene *scene = k->project->scene(k->currentSceneIndex);
if (scene) {
- TupAnimationRenderer renderer(k->project->bgColor());
+ setLipSyncSettings();
+
+ TupAnimationRenderer renderer(k->project->bgColor(), k->library);
renderer.setScene(scene, k->project->dimension());
renderer.renderPhotogram(0);
@@ -584,15 +704,29 @@
k->renderCamera = firstFrame;
}
+ int x = (frameSize().width() - k->renderCamera.size().width()) / 2;
+ int y = (frameSize().height() - k->renderCamera.size().height()) / 2;
+ k->imagePos = QPoint(x, y);
+
k->firstShoot = true;
} else {
#ifdef K_DEBUG
- tError() << "TupScreen::updateFirstFrame() - [ Fatal Error ] - Null scene at index: " << k->currentSceneIndex;
+ QString msg = "TupScreen::updateFirstFrame() - [ Fatal Error ] - Null scene at index: " + QString::number(k->currentSceneIndex);
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
}
} else {
#ifdef K_DEBUG
- tError() << "TupScreen::updateFirstFrame() - [ Fatal Error ] - Can't access to scene index: " << k->currentSceneIndex;
+ QString msg = "TupScreen::updateFirstFrame() - [ Fatal Error ] - Can't access to scene index: " + QString::number(k->currentSceneIndex);
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
}
}
@@ -600,7 +734,11 @@
void TupScreen::addPhotogramsArray(int sceneIndex)
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupScreen::addPhotogramsArray()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
if (sceneIndex > -1) {
@@ -609,3 +747,40 @@
k->animationList.insert(sceneIndex, photograms);
}
}
+
+void TupScreen::setLipSyncSettings()
+{
+ TupScene *scene = k->project->scene(k->currentSceneIndex);
+ if (scene) {
+ if (scene->lipSyncTotal() > 0) {
+ k->lipSyncRecords.clear();
+ Mouths mouths = scene->getLipSyncList();
+ foreach(TupLipSync *lipsync, mouths) {
+ TupLibraryFolder *folder = k->library->getFolder(lipsync->name());
+ if (folder) {
+ TupLibraryObject *sound = folder->getObject(lipsync->soundFile());
+ if (sound) {
+ QPair soundRecord;
+ soundRecord.first = lipsync->initFrame();
+ soundRecord.second = sound->dataPath();
+ k->lipSyncRecords << soundRecord;
+ }
+ }
+ }
+ }
+ }
+}
+
+void TupScreen::playLipSyncAt(int frame)
+{
+ int size = k->lipSyncRecords.count();
+ for(int i=0; i soundRecord = k->lipSyncRecords.at(i);
+ if (frame == soundRecord.first) {
+ QString path = soundRecord.second;
+ k->soundPlayer->setMedia(QUrl::fromLocalFile(soundRecord.second));
+ k->soundPlayer->play();
+ }
+ }
+}
+
diff -Nru tupi-0.2+git04/src/components/animation/tupscreen.h tupi-0.2+git05/src/components/animation/tupscreen.h
--- tupi-0.2+git04/src/components/animation/tupscreen.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/animation/tupscreen.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,14 +36,27 @@
#ifndef TUPSCREEN_H
#define TUPSCREEN_H
+#include "tglobal.h"
#include "tupscene.h"
-#include "tupglobal.h"
#include "tupabstractprojectresponsehandler.h"
+#include "tupprojectresponse.h"
+#include "tupgraphicobject.h"
+#include "tupgraphicsscene.h"
+#include "tupanimationrenderer.h"
+#include "tupsoundlayer.h"
+#include "tuplibrary.h"
#include
#include
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
/**
* @author David Cuadrado
@@ -54,7 +67,7 @@
Q_OBJECT
public:
- TupScreen(const TupProject *project, const QSize viewSize = QSize(), bool isScaled = false, QWidget *parent = 0);
+ TupScreen(TupProject *project, const QSize viewSize = QSize(), bool isScaled = false, QWidget *parent = 0);
~TupScreen();
QSize sizeHint() const;
@@ -92,6 +105,7 @@
void toStatusBar(const QString &, int);
void sceneChanged(const TupScene *newScene);
void requestTriggered(const TupProjectRequest *event);
+ void isRendering(int advance);
protected:
void paintEvent(QPaintEvent *event);
@@ -101,6 +115,9 @@
void initPhotogramsArray();
void addPhotogramsArray(int index);
void updateFirstFrame();
+ void setLipSyncSettings();
+ void playLipSyncAt(int frame);
+
struct Private;
Private *const k;
};
diff -Nru tupi-0.2+git04/src/components/colorpalette/colorpalette.pri tupi-0.2+git05/src/components/colorpalette/colorpalette.pri
--- tupi-0.2+git04/src/components/colorpalette/colorpalette.pri 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/colorpalette.pri 2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
INCLUDEPATH += $$COLORPALETTE_DIR
-LIBS += -L$$COLORPALETTE_DIR -ltupicolorpalette
+
+unix {
+ LIBS += -L$$COLORPALETTE_DIR -ltupicolorpalette
+}
+
+win32 {
+ LIBS += -L$$COLORPALETTE_DIR/release -ltupicolorpalette
+}
linux-g++ {
PRE_TARGETDEPS += $$COLORPALETTE_DIR/libtupicolorpalette.so
diff -Nru tupi-0.2+git04/src/components/colorpalette/colorpalette.pro tupi-0.2+git05/src/components/colorpalette/colorpalette.pro
--- tupi-0.2+git04/src/components/colorpalette/colorpalette.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/colorpalette.pro 2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager.
-# -------------------------------------------
-# Subdir relative project main directory: ./src/components/colorpalette
-# Target is a library:
+QT += opengl core gui svg xml network
INSTALLS += tpal
@@ -35,10 +32,43 @@
*:!macx{
CONFIG += dll warn_on
}
+
TEMPLATE = lib
TARGET = tupicolorpalette
FRAMEWORK_DIR = "../../framework"
include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+unix {
+ STORE_DIR = ../../store/
+ INCLUDEPATH += $$STORE_DIR
+ LIBS += -L$$STORE_DIR -ltupistore
+
+ LIBBASE_DIR = ../../libbase/
+ INCLUDEPATH += $$LIBBASE_DIR
+ LIBS += -L$$LIBBASE_DIR -ltupibase
+
+ LIBTUPI_DIR = ../../libtupi/
+ INCLUDEPATH += $$LIBTUPI_DIR
+ LIBS += -L$$LIBTUPI_DIR -ltupi
+
+ !include(../../../tupiglobal.pri) {
+ error("Run ./configure first!")
+ }
+}
+
+win32 {
+ include(../../../win.pri)
+
+ STORE_DIR = ../../store/
+ INCLUDEPATH += $$STORE_DIR
+ LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+ LIBBASE_DIR = ../../libbase/
+ INCLUDEPATH += $$LIBBASE_DIR
+ LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+ LIBTUPI_DIR = ../../libtupi/
+ INCLUDEPATH += $$LIBTUPI_DIR
+ LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
+}
diff -Nru tupi-0.2+git04/src/components/colorpalette/palettes/Default.tpal tupi-0.2+git05/src/components/colorpalette/palettes/Default.tpal
--- tupi-0.2+git04/src/components/colorpalette/palettes/Default.tpal 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/palettes/Default.tpal 2014-12-15 14:21:32.000000000 +0000
@@ -1,26 +1,211 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcellscolor.cpp tupi-0.2+git05/src/components/colorpalette/tupcellscolor.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupcellscolor.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcellscolor.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,15 +34,6 @@
***************************************************************************/
#include "tupcellscolor.h"
-#include "tdebug.h"
-#include "tuppalettedocument.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
struct TupCellsColor::Private
{
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcellscolor.h tupi-0.2+git05/src/components/colorpalette/tupcellscolor.h
--- tupi-0.2+git04/src/components/colorpalette/tupcellscolor.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcellscolor.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,13 +36,24 @@
#ifndef TUPCELLSCOLOR_H
#define TUPCELLSCOLOR_H
+#include "tglobal.h"
#include "tcellview.h"
+#include "tuppalettedocument.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
/**
* @author Jorge Cuadrado
**/
-class TupCellsColor : public TCellView
+class TUPI_EXPORT TupCellsColor : public TCellView
{
Q_OBJECT
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorpalette.cpp tupi-0.2+git05/src/components/colorpalette/tupcolorpalette.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupcolorpalette.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorpalette.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,28 +34,6 @@
***************************************************************************/
#include "tupcolorpalette.h"
-#include "tdebug.h"
-#include "timagebutton.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "tuppaintareaevent.h"
-#include "tupcolorvalue.h"
-#include "tupviewcolorcells.h"
-#include "tupcolorpicker.h"
-#include "tupluminancepicker.h"
-#include "tupgradientcreator.h"
-#include "tvhbox.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
struct TupColorPalette::Private
{
@@ -84,7 +62,11 @@
TupColorPalette::TupColorPalette(QWidget *parent) : TupModuleWidgetBase(parent), k(new Private)
{
#ifdef K_DEBUG
- TINIT;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupColorPalette()]";
+ #else
+ TINIT;
+ #endif
#endif
k->currentOutlineColor = Qt::black;
@@ -96,6 +78,7 @@
setWindowIcon(QPixmap(THEME_DIR + "icons/color_palette.png"));
k->splitter = new QSplitter(Qt::Vertical, this);
+
k->tab = new QTabWidget;
connect(k->tab, SIGNAL(currentChanged(int)), this, SLOT(updateColorType(int)));
@@ -108,8 +91,11 @@
setupGradientManager();
k->tab->setPalette(palette());
+ k->tab->setMinimumHeight(300);
k->splitter->addWidget(k->tab);
+ setMinimumWidth(316);
+
TCONFIG->beginGroup("ColorPalette");
// QColor foreground = QColor(TCONFIG->value("LastForegroundColor", Qt::black).toString());
// QColor background = QColor(TCONFIG->value("LastBackgroundColor", Qt::transparent).toString());
@@ -118,8 +104,12 @@
TupColorPalette::~TupColorPalette()
{
#ifdef K_DEBUG
- TEND;
- #endif
+ #ifdef Q_OS_WIN32
+ qDebug() << "[~TupColorPalette()]";
+ #else
+ TEND;
+ #endif
+ #endif
TCONFIG->beginGroup("ColorPalette");
TCONFIG->setValue("LastForegroundColor", color().first);
@@ -159,8 +149,11 @@
QBoxLayout *layoutName = new QBoxLayout(QBoxLayout::TopToBottom);
layoutName->setMargin(0);
+ layoutName->setSpacing(1);
- layoutName->addWidget(new QLabel("HTML", viewColor));
+ QLabel *html = new QLabel(tr("HTML"), viewColor);
+ html->setAlignment(Qt::AlignHCenter);
+ layoutName->addWidget(html);
k->htmlNameColor = new QLineEdit(viewColor);
k->htmlNameColor->setMaximumWidth(70);
k->htmlNameColor->setMaxLength(7);
@@ -267,12 +260,12 @@
*/
}
- tFatal() << "TupColorPalette::setColor() - Updating background color!";
+ // tFatal() << "TupColorPalette::setColor() - Updating background color!";
// TupPaintAreaEvent event(TupPaintAreaEvent::ChangeBrush, k->outlineAndFillColors->background().color());
TupPaintAreaEvent event(TupPaintAreaEvent::ChangeBrush, brush);
emit paintAreaEventTriggered(&event);
- tFatal() << "TupColorPalette::setColor() - Updating foreground color!";
+ // tFatal() << "TupColorPalette::setColor() - Updating foreground color!";
TupPaintAreaEvent event2(TupPaintAreaEvent::ChangeColorPen, k->outlineAndFillColors->foreground().color());
emit paintAreaEventTriggered(&event2);
}
@@ -309,7 +302,7 @@
void TupColorPalette::updateColorFromDisplay(const QBrush &brush)
{
- tFatal() << "TupColorPalette::updateColorFromDisplay() - Just tracing color: " << brush.color().name();
+ // tFatal() << "TupColorPalette::updateColorFromDisplay() - Just tracing color: " << brush.color().name();
setGlobalColors(brush);
QColor color = brush.color();
@@ -330,9 +323,9 @@
k->labelType->setCurrentIndex(k->currentSpace);
- tFatal() << "TupColorPalette::updateColorSpace() - Picking button #" << space;
- tFatal() << "TupColorPalette::updateColorSpace() - Color: " << color.name();
- tFatal() << "TupColorPalette::updateColorSpace() - Alpha: " << color.alpha();
+ // tFatal() << "TupColorPalette::updateColorSpace() - Picking button #" << space;
+ // tFatal() << "TupColorPalette::updateColorSpace() - Color: " << color.name();
+ // tFatal() << "TupColorPalette::updateColorSpace() - Alpha: " << color.alpha();
k->htmlNameColor->setText(color.name());
k->luminancePicker->setColor(color.hue(), color.saturation(), color.value());
@@ -341,7 +334,7 @@
void TupColorPalette::updateGradientColor(const QBrush &brush)
{
- tFatal() << "TupColorPalette::updateGradientColor() - Just tracing!";
+ // tFatal() << "TupColorPalette::updateGradientColor() - Just tracing!";
setGlobalColors(brush);
}
@@ -357,8 +350,8 @@
void TupColorPalette::setHS(int hue, int saturation)
{
- tFatal() << "TupColorPalette::setHS() - H: " << hue;
- tFatal() << "TupColorPalette::setHS() - S: " << saturation;
+ // tFatal() << "TupColorPalette::setHS() - H: " << hue;
+ // tFatal() << "TupColorPalette::setHS() - S: " << saturation;
int luminance = 255;
if (hue == 0 && saturation == 0)
@@ -369,8 +362,8 @@
k->luminancePicker->setColor(color.hue(), color.saturation(), color.value());
k->displayColorForms->setColor(color);
- tFatal() << "TupColorPalette::setHS() - Color: " << color.name();
- tDebug() << "";
+ // tFatal() << "TupColorPalette::setHS() - Color: " << color.name();
+ // tDebug() << "";
setGlobalColors(QBrush(color));
}
@@ -455,7 +448,7 @@
k->displayColorForms->setColor(color);
k->gradientManager->setCurrentColor(Qt::white);
- TupPaintAreaEvent event(TupPaintAreaEvent::ChangeColorPen, Qt::black);
+ TupPaintAreaEvent event(TupPaintAreaEvent::ChangeColorPen, QColor(Qt::black));
emit paintAreaEventTriggered(&event);
event = TupPaintAreaEvent(TupPaintAreaEvent::ChangeBrush, brush);
@@ -549,13 +542,13 @@
void TupColorPalette::updateColorType(int index)
{
if (index == TupColorPalette::Solid) {
- tFatal() << "TupColorPalette::updateColorType() - Solid Color!";
+ // tFatal() << "TupColorPalette::updateColorType() - Solid Color!";
if (k->currentSpace == TDualColorButton::Foreground)
k->fgType = Solid;
else
k->bgType = Solid;
} else {
- tFatal() << "TupColorPalette::updateColorType() - Gradient Color!";
+ // tFatal() << "TupColorPalette::updateColorType() - Gradient Color!";
if (k->currentSpace == TDualColorButton::Foreground)
k->fgType = Gradient;
else
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorpalette.h tupi-0.2+git05/src/components/colorpalette/tupcolorpalette.h
--- tupi-0.2+git04/src/components/colorpalette/tupcolorpalette.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorpalette.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,9 +36,30 @@
#ifndef TUPCOLORPALETTE_H
#define TUPCOLORPALETTE_H
+#include "tglobal.h"
#include "tupmodulewidgetbase.h"
#include "tdualcolorbutton.h"
#include "ticon.h"
+#include "timagebutton.h"
+#include "tconfig.h"
+#include "tuppaintareaevent.h"
+#include "tupcolorvalue.h"
+#include "tupviewcolorcells.h"
+#include "tupcolorpicker.h"
+#include "tupluminancepicker.h"
+#include "tupgradientcreator.h"
+#include "tvhbox.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
class TupColorPalette;
@@ -46,7 +67,7 @@
* @author Jorge Cuadrado
*/
-class TupColorPalette : public TupModuleWidgetBase
+class TUPI_EXPORT TupColorPalette : public TupModuleWidgetBase
{
Q_OBJECT
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorpicker.cpp tupi-0.2+git05/src/components/colorpalette/tupcolorpicker.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupcolorpicker.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorpicker.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,17 +34,6 @@
***************************************************************************/
#include "tupcolorpicker.h"
-#include "tdebug.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
static int pWidth = 100;
static int pHeight = 80;
@@ -81,8 +70,13 @@
TupColorPicker::~TupColorPicker()
{
delete k;
+
#ifdef K_DEBUG
- TEND;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[~TupColorPicker()]";
+ #else
+ TEND;
+ #endif
#endif
}
@@ -125,7 +119,7 @@
QRect rect(colorPoint(), QSize(20,20));
k->hue = nhue;
k->saturation = nsat;
- rect = rect.unite(QRect(colorPoint(), QSize(20,20)));
+ rect = rect.united(QRect(colorPoint(), QSize(20,20)));
rect.translate(contentsRect().x()-9, contentsRect().y()-9);
repaint(rect);
@@ -139,7 +133,7 @@
QRect rect(colorPoint(), QSize(20, 20));
k->hue = newHue;
- rect = rect.unite(QRect(colorPoint(), QSize(20, 20)));
+ rect = rect.united(QRect(colorPoint(), QSize(20, 20)));
rect.translate(contentsRect().x()-9, contentsRect().y()-9);
repaint(rect);
@@ -153,7 +147,7 @@
QRect rect(colorPoint(), QSize(20,20));
k->saturation = newSat;
- rect = rect.unite(QRect(colorPoint(), QSize(20,20)));
+ rect = rect.united(QRect(colorPoint(), QSize(20,20)));
rect.translate(contentsRect().x()-9, contentsRect().y()-9);
repaint(rect);
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorpicker.h tupi-0.2+git05/src/components/colorpalette/tupcolorpicker.h
--- tupi-0.2+git04/src/components/colorpalette/tupcolorpicker.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorpicker.h 2014-12-15 14:21:32.000000000 +0000
@@ -33,12 +33,23 @@
* along with this program. If not, see . *
***************************************************************************/
-#include
-
#ifndef TUPCOLORPICKER_H
#define TUPCOLORPICKER_H
-class TupColorPicker : public QFrame
+#include "tglobal.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+class TUPI_EXPORT TupColorPicker : public QFrame
{
Q_OBJECT
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorvalue.cpp tupi-0.2+git05/src/components/colorpalette/tupcolorvalue.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupcolorvalue.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorvalue.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,18 +34,6 @@
***************************************************************************/
#include "tupcolorvalue.h"
-#include "tdebug.h"
-#include "tdoublecombobox.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
struct TupItemColorValue::Private
{
@@ -125,7 +113,11 @@
TupColorValue::TupColorValue(QWidget *parent) : QFrame(parent), k(new Private)
{
#ifdef K_DEBUG
- TINIT;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupColorValue()]";
+ #else
+ TINIT;
+ #endif
#endif
k->ok = true;
@@ -137,7 +129,11 @@
TupColorValue::~TupColorValue()
{
#ifdef K_DEBUG
- TEND;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[~TupColorValue()]";
+ #else
+ TEND;
+ #endif
#endif
}
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupcolorvalue.h tupi-0.2+git05/src/components/colorpalette/tupcolorvalue.h
--- tupi-0.2+git04/src/components/colorpalette/tupcolorvalue.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupcolorvalue.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,13 +36,24 @@
#ifndef TUPVALUECOLOR_H
#define TUPVALUECOLOR_H
+#include "tglobal.h"
+#include "tdoublecombobox.h"
+
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
/**
* @author Jorge Cuadrado
**/
-class TupItemColorValue : public QFrame
+class TUPI_EXPORT TupItemColorValue : public QFrame
{
Q_OBJECT
@@ -67,7 +78,7 @@
void editingFinished();
};
-class TupColorValue : public QFrame
+class TUPI_EXPORT TupColorValue : public QFrame
{
Q_OBJECT
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupluminancepicker.cpp tupi-0.2+git05/src/components/colorpalette/tupluminancepicker.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupluminancepicker.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupluminancepicker.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,10 +34,6 @@
***************************************************************************/
#include "tupluminancepicker.h"
-#include "tdebug.h"
-
-#include
-#include
struct TupLuminancePicker::Private
{
@@ -75,9 +71,14 @@
TupLuminancePicker::~TupLuminancePicker()
{
delete k;
+
#ifdef K_DEBUG
- TEND;
- #endif
+ #ifdef Q_OS_WIN32
+ qDebug() << "[~TupLuminancePicker()]";
+ #else
+ TEND;
+ #endif
+ #endif
}
void TupLuminancePicker::mouseMoveEvent(QMouseEvent *event)
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupluminancepicker.h tupi-0.2+git05/src/components/colorpalette/tupluminancepicker.h
--- tupi-0.2+git04/src/components/colorpalette/tupluminancepicker.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupluminancepicker.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,12 +36,16 @@
#ifndef TUPLUMINACEPICKER_H
#define TUPLUMINACEPICKER_H
+#include "tglobal.h"
+
+#include
+#include
#include
#include
#include
#include
-class TupLuminancePicker : public QWidget
+class TUPI_EXPORT TupLuminancePicker : public QWidget
{
Q_OBJECT
diff -Nru tupi-0.2+git04/src/components/colorpalette/tuppaletteparser.cpp tupi-0.2+git05/src/components/colorpalette/tuppaletteparser.cpp
--- tupi-0.2+git04/src/components/colorpalette/tuppaletteparser.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tuppaletteparser.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,7 +34,6 @@
***************************************************************************/
#include "tuppaletteparser.h"
-#include "tdebug.h"
struct TupPaletteParser::Private
{
@@ -54,17 +53,14 @@
TupPaletteParser::TupPaletteParser(): TXmlParserBase(), k(new Private)
{
- // TINIT;
k->paletteName = "";
k->isEditable = false;
k->gradient = 0;
}
-
TupPaletteParser::~TupPaletteParser()
{
delete k;
- // TEND;
}
bool TupPaletteParser::startTag(const QString &tag, const QXmlAttributes &atts)
@@ -83,9 +79,14 @@
if (c.isValid()) {
k->brushes << c;
} else {
- #ifdef K_DEBUG
- tError() << "Invalid Color";
- #endif
+ #ifdef K_DEBUG
+ QString msg = "TupPaletteParser::startTag() - Error: Invalid color!";
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
+ #endif
}
} else if (tag == "Gradient") {
if (k->gradient)
@@ -121,7 +122,12 @@
default:
{
#ifdef K_DEBUG
- tFatal() << "No gradient type: " << type;
+ QString msg = "TupPaletteParser::startTag() - No gradient type: " + QString::number(type);
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tFatal() << msg;
+ #endif
#endif
}
break;
diff -Nru tupi-0.2+git04/src/components/colorpalette/tuppaletteparser.h tupi-0.2+git05/src/components/colorpalette/tuppaletteparser.h
--- tupi-0.2+git04/src/components/colorpalette/tuppaletteparser.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tuppaletteparser.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,6 +36,7 @@
#ifndef TUPPALETTEPARSER_H
#define TUPPALETTEPARSER_H
+#include "tglobal.h"
#include "txmlparserbase.h"
#include
@@ -50,7 +51,7 @@
//TODO TupPaletteParser: portar a TXmlParserBase
-class TupPaletteParser : public TXmlParserBase
+class TUPI_EXPORT TupPaletteParser : public TXmlParserBase
{
public:
TupPaletteParser();
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupviewcolorcells.cpp tupi-0.2+git05/src/components/colorpalette/tupviewcolorcells.cpp
--- tupi-0.2+git04/src/components/colorpalette/tupviewcolorcells.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupviewcolorcells.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,13 +34,6 @@
***************************************************************************/
#include "tupviewcolorcells.h"
-#include "tdebug.h"
-#include "tglobal.h"
-#include "timagebutton.h"
-#include "tconfig.h"
-
-#include
-#include
struct TupViewColorCells::Private
{
@@ -70,7 +63,7 @@
TupViewColorCells::~TupViewColorCells()
{
TCONFIG->beginGroup("ColorPalette");
- TCONFIG->setValue("LastPalette", k->chooserPalette->currentIndex());;
+ TCONFIG->setValue("LastPalette", k->chooserPalette->currentIndex());
QDir brushesDir(CONFIG_DIR + "palettes");
@@ -78,21 +71,30 @@
brushesDir.mkdir(brushesDir.path());
#ifdef K_DEBUG
- tWarning("palette") << "TupViewColorCells::~TupViewColorCells() - Saving color palettes in: " << brushesDir.path();
+ QString msg = "TupViewColorCells::~TupViewColorCells() - Saving color palettes in: " + brushesDir.path();
+ #ifdef Q_OS_WIN32
+ qWarning() << msg;
+ #else
+ tWarning("palette") << msg;
+ #endif
#endif
for (int i = 0; i < k->containerPalette->count(); i++) {
TupCellsColor *palette = qobject_cast(k->containerPalette->widget(i));
if (palette) {
if (!palette->isReadOnly())
- palette->save(CONFIG_DIR + "palettes/" + palette->name() + ".tpal");
+ palette->save(CONFIG_DIR + "palettes" + QDir::separator() + palette->name() + ".tpal");
}
}
delete k;
#ifdef K_DEBUG
- TEND;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[~TupViewColorCells()]";
+ #else
+ TEND;
+ #endif
#endif
}
@@ -107,52 +109,66 @@
// Default Palette
k->defaultPalette = new TupCellsColor(k->containerPalette);
k->defaultPalette->setName(tr("Default Palette"));
- k->defaultPalette->setReadOnly( true);
-
- fillDefaultColors();
+ k->defaultPalette->setReadOnly(true);
+ // fillDefaultColors();
addPalette(k->defaultPalette);
//Named Colors
k->qtColorPalette = new TupCellsColor(k->containerPalette);
k->qtColorPalette->setReadOnly(true);
k->qtColorPalette->setName(tr("Named Colors"));
- addPalette(k->qtColorPalette);
-
fillNamedColor();
+ addPalette(k->qtColorPalette);
//Custom Color Palette
+ // SQA: This palette must be implemented
k->customColorPalette = new TupCellsColor(k->containerPalette);
k->customColorPalette->setName(tr("Custom Color Palette"));
addPalette(k->customColorPalette);
//Custom Gradient Palette
+ // SQA: This palette must be implemented
k->customGradientPalette = new TupCellsColor(k->containerPalette);
k->customGradientPalette->setName(tr("Custom Gradient Palette"));
k->customGradientPalette->setType(TupCellsColor::Gradient);
addPalette(k->customGradientPalette);
- connect(k->chooserPalette, SIGNAL(activated(int )), k->containerPalette, SLOT(setCurrentIndex(int )));
+#ifdef Q_OS_WIN32
+ QString palettesPath = SHARE_DIR + "palettes";
+#else
+ QString palettesPath = SHARE_DIR + "data" + QDir::separator() + "palettes";
+#endif
+ readPalettes(palettesPath); // Pre-installed
+ readPalettes(CONFIG_DIR + "palettes"); // Locals
+
+ // fillDefaultColors(palettesPath);
+
+ connect(k->chooserPalette, SIGNAL(activated(int)), k->containerPalette, SLOT(setCurrentIndex(int)));
TCONFIG->beginGroup("ColorPalette");
int lastIndex = TCONFIG->value("LastPalette").toInt();
- if (lastIndex > 0) {
- k->chooserPalette->setCurrentIndex(lastIndex);
- k->containerPalette->setCurrentIndex(lastIndex);
- }
-
- readPalettes(SHARE_DIR + "data/palettes"); // Pre-installed
- readPalettes(CONFIG_DIR + "palettes"); // Locals
+ if (lastIndex < 0)
+ lastIndex = 0;
+
+ k->chooserPalette->setCurrentIndex(lastIndex);
+ k->containerPalette->setCurrentIndex(lastIndex);
}
void TupViewColorCells::readPalettes(const QString &paletteDir)
{
#ifdef K_DEBUG
- tDebug("palette") << "Reading palettes from: " << paletteDir;
+ QString msg = "TupViewColorCells::readPalettes() - Reading palettes from: " + paletteDir;
+ #ifdef Q_OS_WIN32
+ qWarning() << msg;
+ #else
+ tWarning("palette") << msg;
+ #endif
#endif
+
QDir dir(paletteDir);
- if (dir.exists ()) {
+ if (dir.exists()) {
QStringList files = dir.entryList(QStringList() << "*.tpal");
QStringList::ConstIterator it = files.begin();
@@ -160,7 +176,16 @@
readPaletteFile(dir.path() + "/" + *it);
++it;
}
- }
+ } else {
+ #ifdef K_DEBUG
+ QString msg = "TupViewColorCells::readPalettes() - Error: Invalid path -> " + paletteDir;
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError("palette") << msg;
+ #endif
+ #endif
+ }
}
void TupViewColorCells::readPaletteFile(const QString &file)
@@ -171,21 +196,33 @@
QList brushes = parser.brushes();
QString name = parser.paletteName();
bool editable = parser.paletteIsEditable();
- addPalette(name,brushes,editable );
+ addPalette(name, brushes, editable);
} else {
#ifdef K_DEBUG
- tError() << "Error while parse palette file: " << file;
+ QString msg = "TupViewColorCells::readPaletteFile() - Error while parse palette file: " + file;
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
}
}
-void TupViewColorCells::addPalette(const QString & name, const QList & brushes, bool editable )
+void TupViewColorCells::addPalette(const QString & name, const QList & brushes, bool editable)
{
- if (name == k->customColorPalette->name()) {
+ if (name == "Default Palette") {
QList::ConstIterator it = brushes.begin();
while (it != brushes.end()) {
- k->customColorPalette->addItem( *it);
+ k->defaultPalette->addItem(*it);
+ ++it;
+ }
+ } else if (name == k->customColorPalette->name()) {
+ QList::ConstIterator it = brushes.begin();
+
+ while (it != brushes.end()) {
+ k->customColorPalette->addItem(*it);
++it;
}
} else if (name == k->customGradientPalette->name()) {
@@ -222,13 +259,18 @@
void TupViewColorCells::changeColor(QTableWidgetItem* item)
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupViewColorCells::changeColor()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
if (item)
emit selectColor(item->background());
}
+/*
void TupViewColorCells::fillDefaultColors()
{
int i;
@@ -282,6 +324,7 @@
k->defaultPalette->addItem(QColor(255, (j - 13) * 51, (i - 6) * 51));
}
}
+*/
void TupViewColorCells::fillNamedColor()
{
diff -Nru tupi-0.2+git04/src/components/colorpalette/tupviewcolorcells.h tupi-0.2+git05/src/components/colorpalette/tupviewcolorcells.h
--- tupi-0.2+git04/src/components/colorpalette/tupviewcolorcells.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/colorpalette/tupviewcolorcells.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,21 +36,26 @@
#ifndef TUPVIEWCOLORCELLS_H
#define TUPVIEWCOLORCELLS_H
+#include "tglobal.h"
+#include "tconfig.h"
+#include "timagebutton.h"
+#include "tupcellscolor.h"
+#include "tuppaletteparser.h"
+#include "tapplicationproperties.h"
+
#include
#include
#include
#include
#include
-
-#include "tupcellscolor.h"
-#include "tuppaletteparser.h"
-#include "tapplicationproperties.h"
+#include
+#include
/**
@author Jorge Cuadrado
**/
-class TupViewColorCells : public QFrame
+class TUPI_EXPORT TupViewColorCells : public QFrame
{
Q_OBJECT
@@ -67,13 +72,14 @@
private:
void setupForm();
void setupButtons();
- void fillDefaultColors();
+ // void fillDefaultColors();
void addDefaultColor(int i, int j, const QColor &);
void fillNamedColor();
void readPalettes(const QString &paletteDir);
void addPalette(TupCellsColor *palette);
- protected:
+ // protected:
+ // QSize sizeHint() const;
signals:
void selectColor(const QBrush &);
diff -Nru tupi-0.2+git04/src/components/components_config.pri tupi-0.2+git05/src/components/components_config.pri
--- tupi-0.2+git04/src/components/components_config.pri 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/components_config.pri 1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-
-STORE_DIR = ../../store
-LIBTUPI_DIR = ../../libtupi
-LIBBASE_DIR = ../../libbase
-
-include($$STORE_DIR/store.pri)
-include($$LIBTUPI_DIR/libtupi.pri)
-include($$LIBBASE_DIR/libbase.pri)
-
-include(../../../tupiglobal.pri)
-
-INCLUDEPATH += ../../shell
-
-QT += xml
diff -Nru tupi-0.2+git04/src/components/components.pro tupi-0.2+git05/src/components/components.pro
--- tupi-0.2+git04/src/components/components.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/components.pro 2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager.
-# -------------------------------------------
-# Subdir relative project main directory: ./src/components
-# Target is a subdirs project
+# QT += xml opengl network
SUBDIRS += scenes \
colorpalette \
@@ -11,16 +8,15 @@
export \
import \
help \
- kinas \
+ # kinas \
pen \
paintarea \
twitter \
- animation \
- debug
+ animation
+
+unix {
+ SUBDIRS += debug
+}
CONFIG += ordered warn_on
TEMPLATE = subdirs
-
-QT += xml opengl network
-
-#QT += qt3support xml opengl network
diff -Nru tupi-0.2+git04/src/components/debug/debug.pri tupi-0.2+git05/src/components/debug/debug.pri
--- tupi-0.2+git04/src/components/debug/debug.pri 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/debug.pri 2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
INCLUDEPATH += $$DEBUG_DIR
-LIBS += -L$$DEBUG_DIR -ltupidebug
+
+unix {
+ LIBS += -L$$DEBUG_DIR -ltupidebug
+}
+
+win32 {
+ LIBS += -L$$DEBUG_DIR/release/ -ltupidebug
+}
linux-g++ {
PRE_TARGETDEPS += $$DEBUG_DIR/libtupidebug.so
diff -Nru tupi-0.2+git04/src/components/debug/debug.pro tupi-0.2+git05/src/components/debug/debug.pro
--- tupi-0.2+git04/src/components/debug/debug.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/debug.pro 2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager.
-# -------------------------------------------
-# Subdir relative project main directory: ./src/components/debug
-# Target is a library:
+QT += opengl core gui svg xml network
INSTALLS += target
target.path = /lib/
@@ -24,5 +21,37 @@
FRAMEWORK_DIR = "../../framework"
include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+unix {
+ STORE_DIR = ../../store/
+ INCLUDEPATH += $$STORE_DIR
+ LIBS += -L$$STORE_DIR -ltupistore
+
+ LIBBASE_DIR = ../../libbase/
+ INCLUDEPATH += $$LIBBASE_DIR
+ LIBS += -L$$LIBBASE_DIR -ltupibase
+
+ LIBTUPI_DIR = ../../libtupi/
+ INCLUDEPATH += $$LIBTUPI_DIR
+ LIBS += -L$$LIBTUPI_DIR -ltupi
+
+ !include(../../../tupiglobal.pri) {
+ error("Run ./configure first!")
+ }
+}
+
+win32 {
+ include(../../../win.pri)
+
+ STORE_DIR = ../../store/
+ INCLUDEPATH += $$STORE_DIR
+ LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+ LIBBASE_DIR = ../../libbase/
+ INCLUDEPATH += $$LIBBASE_DIR
+ LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+ LIBTUPI_DIR = ../../libtupi/
+ INCLUDEPATH += $$LIBTUPI_DIR
+ LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
+}
diff -Nru tupi-0.2+git04/src/components/debug/tupdebugterm.cpp tupi-0.2+git05/src/components/debug/tupdebugterm.cpp
--- tupi-0.2+git04/src/components/debug/tupdebugterm.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/tupdebugterm.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,26 +34,26 @@
***************************************************************************/
#include "tupdebugterm.h"
-#include "tdebug.h"
-#include
-#include
-#include
+#ifdef K_DEBUG
TupDebugTerm::TupDebugTerm(QWidget *parent, int width) : QWidget(parent)
{
- #ifdef K_DEBUG
- TINIT;
- QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
- mainLayout->setSizeConstraint(QLayout::SetMaximumSize);
- debugBrowser = TDebug::browser(this, width);
- mainLayout->addWidget(debugBrowser);
- #endif
+ TINIT;
+ QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
+ mainLayout->setSizeConstraint(QLayout::SetMaximumSize);
+ debugBrowser = TDebug::browser(this, width);
+ mainLayout->addWidget(debugBrowser);
}
TupDebugTerm::~TupDebugTerm()
{
- #ifdef K_DEBUG
- TEND;
- #endif
+ TEND;
}
+
+void TupDebugTerm::setProjectStatus(bool status)
+{
+ TDebug::setProjectStatus(status);
+}
+
+#endif
diff -Nru tupi-0.2+git04/src/components/debug/tupdebugterm.h tupi-0.2+git05/src/components/debug/tupdebugterm.h
--- tupi-0.2+git04/src/components/debug/tupdebugterm.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/tupdebugterm.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,23 +36,32 @@
#ifndef TUPDEBUGTERM_H
#define TUPDEBUGTERM_H
+#ifdef K_DEBUG
+
+#include "tglobal.h"
+
#include
#include
+#include
+#include
+#include
/**
* @author Gustav Gonzalez
*/
-class TupDebugTerm : public QWidget
+class TUPI_EXPORT TupDebugTerm : public QWidget
{
Q_OBJECT
public:
TupDebugTerm(QWidget *parent = 0, int width = 0);
~TupDebugTerm();
+ void setProjectStatus(bool status);
private:
QTextEdit *debugBrowser;
};
#endif
+#endif
diff -Nru tupi-0.2+git04/src/components/debug/tupdebugwidget.cpp tupi-0.2+git05/src/components/debug/tupdebugwidget.cpp
--- tupi-0.2+git04/src/components/debug/tupdebugwidget.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/tupdebugwidget.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,16 +34,12 @@
***************************************************************************/
#include "tupdebugwidget.h"
-#include "tupdebugterm.h"
-#include "tdebug.h"
-#include
+#ifdef K_DEBUG
TupDebugWidget::TupDebugWidget(QWidget *parent, int width) : TupModuleWidgetBase(parent, "Debug Terminal")
{
- #ifdef K_DEBUG
- TINIT;
- #endif
+ TINIT;
setWindowTitle(tr("Debug Console"));
setWindowIcon(QIcon(THEME_DIR + "icons/debug.png"));
@@ -53,13 +49,18 @@
setFixedHeight(120);
- TupDebugTerm *term = new TupDebugTerm(this, width);
+ term = new TupDebugTerm(this, width);
addChild(term);
}
TupDebugWidget::~TupDebugWidget()
{
- #ifdef K_DEBUG
- TEND;
- #endif
+ TEND;
}
+
+void TupDebugWidget::setProjectStatus(bool status)
+{
+ term->setProjectStatus(status);
+}
+
+#endif
diff -Nru tupi-0.2+git04/src/components/debug/tupdebugwidget.h tupi-0.2+git05/src/components/debug/tupdebugwidget.h
--- tupi-0.2+git04/src/components/debug/tupdebugwidget.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/debug/tupdebugwidget.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,17 +36,30 @@
#ifndef TUPDEBUGWIDGET_H
#define TUPDEBUGWIDGET_H
-#include
+#ifdef K_DEBUG
+
+#include "tglobal.h"
+#include "tupmodulewidgetbase.h"
+#include "tupdebugterm.h"
+
+#include
/**
* @author Gustav Gonzalez
*/
-class TupDebugWidget : public TupModuleWidgetBase
+
+class TUPI_EXPORT TupDebugWidget : public TupModuleWidgetBase
{
Q_OBJECT
+
public:
TupDebugWidget(QWidget *parent = 0, int width = 0);
~TupDebugWidget();
+ void setProjectStatus(bool status);
+
+ private:
+ TupDebugTerm *term;
};
#endif
+#endif
diff -Nru tupi-0.2+git04/src/components/export/export.pri tupi-0.2+git05/src/components/export/export.pri
--- tupi-0.2+git04/src/components/export/export.pri 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/export.pri 2014-12-15 14:21:32.000000000 +0000
@@ -1,5 +1,12 @@
INCLUDEPATH += $$EXPORT_DIR
-LIBS += -L$$EXPORT_DIR -ltupiexport
+
+unix {
+ LIBS += -L$$EXPORT_DIR -ltupiexport
+}
+
+win32 {
+ LIBS += -L$$EXPORT_DIR/release/ -ltupiexport
+}
linux-g++ {
PRE_TARGETDEPS += $$EXPORT_DIR/libtupiexport.so
diff -Nru tupi-0.2+git04/src/components/export/export.pro tupi-0.2+git05/src/components/export/export.pro
--- tupi-0.2+git04/src/components/export/export.pro 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/export.pro 2014-12-15 14:21:32.000000000 +0000
@@ -1,7 +1,4 @@
-# File generated by kdevelop's qmake manager.
-# -------------------------------------------
-# Subdir relative project main directory: ./src/components/export
-# Target is a library:
+QT += opengl core gui svg xml network
INSTALLS += target
target.path = /lib/
@@ -25,4 +22,37 @@
FRAMEWORK_DIR = "../../framework"
include($$FRAMEWORK_DIR/framework.pri)
-include(../components_config.pri)
+
+unix {
+ STORE_DIR = ../../store/
+ INCLUDEPATH += $$STORE_DIR
+ LIBS += -L$$STORE_DIR -ltupistore
+
+ LIBBASE_DIR = ../../libbase/
+ INCLUDEPATH += $$LIBBASE_DIR
+ LIBS += -L$$LIBBASE_DIR -ltupibase
+
+ LIBTUPI_DIR = ../../libtupi/
+ INCLUDEPATH += $$LIBTUPI_DIR
+ LIBS += -L$$LIBTUPI_DIR -ltupi
+
+ !include(../../../tupiglobal.pri) {
+ error("Run ./configure first!")
+ }
+}
+
+win32 {
+ include(../../../win.pri)
+
+ STORE_DIR = ../../store/
+ INCLUDEPATH += $$STORE_DIR
+ LIBS += -L$$STORE_DIR/release/ -ltupistore
+
+ LIBBASE_DIR = ../../libbase/
+ INCLUDEPATH += $$LIBBASE_DIR
+ LIBS += -L$$LIBBASE_DIR/release/ -ltupibase
+
+ LIBTUPI_DIR = ../../libtupi/
+ INCLUDEPATH += $$LIBTUPI_DIR
+ LIBS += -L$$LIBTUPI_DIR/release/ -ltupi
+}
diff -Nru tupi-0.2+git04/src/components/export/tupexportwidget.cpp tupi-0.2+git05/src/components/export/tupexportwidget.cpp
--- tupi-0.2+git04/src/components/export/tupexportwidget.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/tupexportwidget.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,30 +34,6 @@
***************************************************************************/
#include "tupexportwidget.h"
-#include "tuppluginmanager.h"
-#include "tglobal.h"
-#include "tdebug.h"
-#include "titemselector.h"
-#include "txyspinbox.h"
-
-// Qt
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
/**
* This class handles the whole process to export a project into a movie format.
@@ -65,7 +41,7 @@
* @author David Cuadrado
*/
-class SelectPlugin : public TupExportWizardPage
+class TUPI_EXPORT SelectPlugin : public TupExportWizardPage
{
Q_OBJECT
@@ -136,7 +112,17 @@
void SelectPlugin::addPlugin(const QString &plugin)
{
- new QListWidgetItem(plugin, m_exporterList);
+ qDebug() << "SelectPlugin::addPlugin() - plugin: " << plugin;
+ #ifdef Q_OS_WIN32
+ if (QSysInfo::windowsVersion() != QSysInfo::WV_XP) {
+ new QListWidgetItem(plugin, m_exporterList);
+ } else {
+ if (plugin.compare(tr("Video Formats")) != 0)
+ new QListWidgetItem(plugin, m_exporterList);
+ }
+ #else
+ new QListWidgetItem(plugin, m_exporterList);
+ #endif
}
void SelectPlugin::selectedPluginItem(QListWidgetItem *item)
@@ -167,10 +153,12 @@
format->setData(3124, TupExportInterface::WEBM);
}
+#ifdef Q_OS_UNIX
if (formats & TupExportInterface::OGV) {
QListWidgetItem *format = new QListWidgetItem(tr("OGV Video"), m_formatList);
format->setData(3124, TupExportInterface::OGV);
}
+#endif
if (formats & TupExportInterface::MPEG) {
QListWidgetItem *format = new QListWidgetItem(tr("MPEG Video"), m_formatList);
@@ -197,7 +185,7 @@
format->setData(3124, TupExportInterface::MOV);
}
- // SQA: The ffmpeg procedure to export animated GIF files must be implemented
+ // SQA: The libav procedure to export animated GIF files must be implemented
/*
if (formats & TupExportInterface::GIF) {
QListWidgetItem *format = new QListWidgetItem(tr("Gif Image"), m_formatList);
@@ -232,8 +220,10 @@
if (format.compare(tr("WEBM Video")) == 0)
return ".webm";
+#ifdef Q_OS_UNIX
if (format.compare(tr("OGV Video")) == 0)
return ".ogv";
+#endif
if (format.compare(tr("MPEG Video")) == 0)
return ".mpg";
@@ -299,7 +289,7 @@
return extension;
}
-class SelectScenes : public TupExportWizardPage
+class TUPI_EXPORT SelectScenes : public TupExportWizardPage
{
Q_OBJECT
@@ -352,7 +342,11 @@
void SelectScenes::setScenes(const QList &scenes)
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[SelectScenes::setScenes()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
m_selector->clear();
@@ -360,14 +354,25 @@
foreach (TupScene *scene, scenes) {
#ifdef K_DEBUG
- tDebug("export") << "SelectScenes::setScenes() - Adding " << scene->sceneName();
+ QString msg = "SelectScenes::setScenes() - Adding " + scene->sceneName();
+ #ifdef Q_OS_WIN32
+ qWarning() << msg;
+ #else
+ tWarning("export") << msg;
+ #endif
#endif
+
m_selector->addItem(QString("%1: ").arg(pos) + scene->sceneName());
pos++;
}
#ifdef K_DEBUG
- tWarning("export") << "SelectScenes::setScenes() - Available Scenes: " << pos - 1;
+ QString msg = "SelectScenes::setScenes() - Available Scenes: " + QString::number(pos - 1);
+ #ifdef Q_OS_WIN32
+ qWarning() << msg;
+ #else
+ tWarning() << msg;
+ #endif
#endif
m_selector->selectFirstItem();
@@ -388,12 +393,12 @@
// SQA: Pending code right over here
}
-class ExportTo : public TupExportWizardPage
+class TUPI_EXPORT ExportTo : public TupExportWizardPage
{
Q_OBJECT
public:
- ExportTo(const TupProject *project, TupExportWidget::OutputFormat output, QString title, const TupExportWidget *widget);
+ ExportTo(TupProject *project, TupExportWidget::OutputFormat output, QString title, const TupExportWidget *widget);
~ExportTo();
bool isComplete() const;
@@ -431,7 +436,8 @@
TupExportInterface::Format m_currentFormat;
TupExportWidget::OutputFormat output;
- const TupProject *m_project;
+ // const TupProject *m_project;
+ TupProject *m_project;
QLineEdit *m_filePath;
QLineEdit *m_prefix;
QSpinBox *m_fps;
@@ -443,9 +449,17 @@
bool transparency;
};
-ExportTo::ExportTo(const TupProject *project, TupExportWidget::OutputFormat outputFormat, QString title, const TupExportWidget *widget) : TupExportWizardPage(title), m_currentExporter(0),
+ExportTo::ExportTo(TupProject *project, TupExportWidget::OutputFormat outputFormat, QString title, const TupExportWidget *widget) : TupExportWizardPage(title), m_currentExporter(0),
m_currentFormat(TupExportInterface::NONE), m_project(project)
{
+ #ifdef K_DEBUG
+ #ifdef Q_OS_WIN32
+ qDebug() << "[ExportTo::ExportTo()]";
+ #else
+ TINIT;
+ #endif
+ #endif
+
output = outputFormat;
transparency = false;
@@ -461,7 +475,8 @@
QWidget *container = new QWidget;
QVBoxLayout *layout = new QVBoxLayout(container);
- path = getenv("HOME");
+ // path = getenv("HOME");
+ path = QDir::homePath();
////////////////
@@ -504,11 +519,10 @@
QToolButton *button = new QToolButton;
button->setIcon(QIcon(THEME_DIR + "icons" + QDir::separator() + "open.png"));
- if (output == TupExportWidget::ImagesArray) {
+ if (output == TupExportWidget::ImagesArray)
connect(button, SIGNAL(clicked()), this, SLOT(chooseDirectory()));
- } else {
+ else
connect(button, SIGNAL(clicked()), this, SLOT(chooseFile()));
- }
filePathLayout->addWidget(button);
@@ -600,16 +614,18 @@
extension = value;
filename = path;
-#if defined(Q_OS_UNIX)
-
if (m_currentFormat == TupExportInterface::APNG || (m_currentFormat != TupExportInterface::PNG && m_currentFormat != TupExportInterface::JPEG)) { // Animated Image or Animation
if (!filename.endsWith(QDir::separator()))
filename += QDir::separator();
filename += m_project->projectName();
filename += extension;
+
+ qDebug() << "ExportTo::setCurrentFormat() - Tracing name: " << filename;
+
} else { // Images Array
- filename = getenv("HOME");
+ // filename = getenv("HOME");
+ filename = QDir::homePath();
if (m_currentFormat == TupExportInterface::JPEG) {
if (bgTransparency->isEnabled())
@@ -618,18 +634,21 @@
if (!bgTransparency->isEnabled())
bgTransparency->setEnabled(true);
}
+
+ qDebug() << "ExportTo::setCurrentFormat() - Tracing name: " << filename;
}
+ #ifdef Q_OS_WIN32
+ filename.replace(QString("/"), QString("\\"));
+ #endif
+
m_filePath->setText(filename);
-
-#endif
}
void ExportTo::updateNameField()
{
- if (filename.length() > 0) {
+ if (filename.length() > 0)
m_filePath->setText(filename);
- }
}
void ExportTo::enableTransparency(bool flag)
@@ -654,7 +673,8 @@
void ExportTo::chooseDirectory()
{
- QString dir = getenv("HOME");
+ // QString dir = getenv("HOME");
+ QString dir = QDir::homePath();
filename = QFileDialog::getExistingDirectory(this, tr("Choose a directory..."), dir,
QFileDialog::ShowDirsOnly
| QFileDialog::DontResolveSymlinks);
@@ -675,7 +695,11 @@
void ExportTo::exportIt()
{
#ifdef K_DEBUG
- T_FUNCINFO;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[ExportTo::exportIt()]";
+ #else
+ T_FUNCINFO;
+ #endif
#endif
bool done = false;
@@ -691,7 +715,8 @@
}
if (path.length() == 0)
- path = getenv("HOME");
+ path = QDir::homePath();
+ // path = getenv("HOME");
filename = path + QDir::separator() + name;
} else { // Animation or Animated Image
@@ -699,9 +724,15 @@
if (filename.length() == 0) {
TOsd::self()->display(tr("Error"), tr("Directory doesn't exist! Please, choose another path."), TOsd::Error);
+
#ifdef K_DEBUG
- QString file = path.toLocal8Bit();
- tError() << "ExportTo::exportIt() - Fatal Error: Directory doesn't exist! -> " << file;
+ QString file = path.toLocal8Bit();
+ QString msg = "ExportTo::exportIt() - Fatal Error: Directory doesn't exist! -> " + file;
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
return;
}
@@ -715,7 +746,8 @@
name += extension;
if (path.length() == 0) {
- path = getenv("HOME");
+ //path = getenv("HOME");
+ path = QDir::homePath();
filename = path + QDir::separator() + name;
}
@@ -734,8 +766,13 @@
if (!directory.exists()) {
TOsd::self()->display(tr("Error"), tr("Directory doesn't exist! Please, choose another path."), TOsd::Error);
#ifdef K_DEBUG
- QString file = path.toLocal8Bit();
- tError() << "ExportTo::exportIt() - Fatal Error: Directory doesn't exist! -> " << file;
+ QString file = path.toLocal8Bit();
+ QString msg = "ExportTo::exportIt() - Fatal Error: Directory doesn't exist! -> " + file;
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
return;
} else {
@@ -752,19 +789,30 @@
if (m_currentExporter) {
#ifdef K_DEBUG
- tWarning() << "ExportTo::exportIt() - Exporting to file: " << filename;
+ QString file = path.toLocal8Bit();
+ QString msg = "ExportTo::exportIt() - Exporting to file: " + file;
+ #ifdef Q_OS_WIN32
+ qWarning() << msg;
+ #else
+ tWarning() << msg;
+ #endif
#endif
QList scenes = scenesToExport();
#ifdef K_DEBUG
- tWarning() << "ExportTo::exportIt() - Exporting " << scenes.count() << " scenes";
+ QString msg1 = "ExportTo::exportIt() - Exporting " + QString::number(scenes.count()) + " scenes";
+ #ifdef Q_OS_WIN32
+ qWarning() << msg1;
+ #else
+ tWarning() << msg1;
+ #endif
#endif
if (scenes.count() > 0) {
int width = (int) m_size->x();
int height = (int) m_size->y();
- /* ffmpeg requirement: resolution must be a multiple of two */
+ /* libav requirement: resolution must be a multiple of two */
if (width%2 != 0)
width++;
if (height%2 != 0)
@@ -779,7 +827,7 @@
}
done = m_currentExporter->exportToFormat(color, filename, scenes, m_currentFormat,
- QSize(width, height), m_fps->value());
+ QSize(width, height), m_fps->value(), m_project->library());
}
} else {
TOsd::self()->display(tr("Error"), tr("Format problem. Tupi Internal error."), TOsd::Error);
@@ -806,7 +854,7 @@
return scenes;
}
-class VideoProperties : public TupExportWizardPage
+class TUPI_EXPORT VideoProperties : public TupExportWizardPage
{
Q_OBJECT
@@ -983,10 +1031,14 @@
}
*/
-TupExportWidget::TupExportWidget(const TupProject *project, QWidget *parent, bool isLocal) : TupExportWizard(parent), m_project(project)
+TupExportWidget::TupExportWidget(TupProject *project, QWidget *parent, bool isLocal) : TupExportWizard(parent), m_project(project)
{
#ifdef K_DEBUG
- TINIT;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[TupExportWidget()]";
+ #else
+ TINIT;
+ #endif
#endif
if (isLocal) {
@@ -997,7 +1049,8 @@
addPage(m_pluginSelectionPage);
m_scenesSelectionPage = new SelectScenes(this);
- m_scenesSelectionPage->setScenes(project->scenes().values());
+ // m_scenesSelectionPage->setScenes(project->scenes().values());
+ m_scenesSelectionPage->setScenes(project->scenes());
addPage(m_scenesSelectionPage);
m_exportAnimation = new ExportTo(project, TupExportWidget::Animation, tr("Export to Video File"), this);
@@ -1026,7 +1079,8 @@
setWindowIcon(QIcon(THEME_DIR + "icons" + QDir::separator() + "net_document.png"));
m_scenesSelectionPage = new SelectScenes(this);
- m_scenesSelectionPage->setScenes(project->scenes().values());
+ // m_scenesSelectionPage->setScenes(project->scenes().values());
+ m_scenesSelectionPage->setScenes(project->scenes());
addPage(m_scenesSelectionPage);
videoProperties = new VideoProperties(this);
@@ -1039,7 +1093,11 @@
TupExportWidget::~TupExportWidget()
{
#ifdef K_DEBUG
- TEND;
+ #ifdef Q_OS_WIN32
+ qDebug() << "[~TupExportWidget()]";
+ #else
+ TEND;
+ #endif
#endif
}
@@ -1063,7 +1121,12 @@
pluginList.insert(index, exporter);
} else {
#ifdef K_DEBUG
- tError() << "TupExportWidget::loadPlugins() - [ Fatal Error ] - Can't load export plugin";
+ QString msg = "TupExportWidget::loadPlugins() - [ Fatal Error ] - Can't load export plugin";
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
}
}
@@ -1088,7 +1151,12 @@
m_exportImagesArray->setCurrentExporter(currentExporter);
} else {
#ifdef K_DEBUG
- tError() << "TupExportWidget::setExporter() - [ Fatal Error ] - Can't load export plugin";
+ QString msg = "TupExportWidget::setExporter() - [ Fatal Error ] - Can't load export plugin -> " + plugin;
+ #ifdef Q_OS_WIN32
+ qDebug() << msg;
+ #else
+ tError() << msg;
+ #endif
#endif
}
}
diff -Nru tupi-0.2+git04/src/components/export/tupexportwidget.h tupi-0.2+git05/src/components/export/tupexportwidget.h
--- tupi-0.2+git04/src/components/export/tupexportwidget.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/tupexportwidget.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,16 +36,39 @@
#ifndef TUPEXPORTWIDGET_H
#define TUPEXPORTWIDGET_H
+#include "tglobal.h"
#include "tupmodulewidgetbase.h"
#include "tupproject.h"
#include "tupexportpluginobject.h"
#include "tupexportwizard.h"
+#include "titemselector.h"
+#include "txyspinbox.h"
+#include "tuppluginmanager.h"
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
-class QButtonGroup;
-class QLineEdit;
+// class QButtonGroup;
+// class QLineEdit;
class SelectPlugin;
class SelectScenes;
class ExportTo;
@@ -55,13 +78,13 @@
* @author David Cuadrado
*/
-class TupExportWidget : public TupExportWizard
+class TUPI_EXPORT TupExportWidget : public TupExportWizard
{
Q_OBJECT
public:
enum OutputFormat { Animation = 0, ImagesArray, AnimatedImage };
- TupExportWidget(const TupProject *project, QWidget *parent = 0, bool isLocal = true);
+ TupExportWidget(TupProject *project, QWidget *parent = 0, bool isLocal = true);
~TupExportWidget();
QString videoTitle() const;
QString videoTopics() const;
diff -Nru tupi-0.2+git04/src/components/export/tupexportwizard.cpp tupi-0.2+git05/src/components/export/tupexportwizard.cpp
--- tupi-0.2+git04/src/components/export/tupexportwizard.cpp 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/tupexportwizard.cpp 2014-12-15 14:21:32.000000000 +0000
@@ -34,14 +34,6 @@
***************************************************************************/
#include "tupexportwizard.h"
-#include "tvhbox.h"
-#include "tseparator.h"
-#include "tdebug.h"
-
-// Qt
-#include
-#include
-#include
struct TupExportWizard::Private
{
@@ -265,9 +257,9 @@
hide();
}
-void TupExportWizardPage::setPixmap(const QPixmap &px)
+void TupExportWizardPage::setPixmap(const QPixmap &pixmap)
{
- k->image->setPixmap(px);
+ k->image->setPixmap(pixmap);
k->image->show();
}
@@ -286,4 +278,6 @@
return k->tag;
}
-TupExportWizardPage::~TupExportWizardPage() {};
+TupExportWizardPage::~TupExportWizardPage()
+{
+}
diff -Nru tupi-0.2+git04/src/components/export/tupexportwizard.h tupi-0.2+git05/src/components/export/tupexportwizard.h
--- tupi-0.2+git04/src/components/export/tupexportwizard.h 2014-04-19 13:45:41.000000000 +0000
+++ tupi-0.2+git05/src/components/export/tupexportwizard.h 2014-12-15 14:21:32.000000000 +0000
@@ -36,15 +36,18 @@
#ifndef TUPEXPORTWIZARD_H
#define TUPEXPORTWIZARD_H
-#include "tvhbox.h"
#include "tglobal.h"
+#include "tvhbox.h"
#include "toolview.h"
+#include "tseparator.h"
#include
#include
#include
#include
#include
+#include
+#include
class TupExportWizardPage;
@@ -52,7 +55,7 @@
* @author David Cuadrado
*/
-class TupExportWizard : public QDialog
+class TUPI_EXPORT TupExportWizard : public QDialog
{
Q_OBJECT
@@ -94,7 +97,7 @@
#include
#include