Packman Build Service PMBS

slowmoVideo.changes Changed

slowmoVideo.spec Changed

@@ -17,49 +17,66 @@
 
 
 Name:           slowmoVideo
-Version:        0.3
+Version:        0.4
 Release:        0
-Summary:        slowmoVideo is an OpenSource program that creates slow-motion videos from your footage
-License:        GPL-2.0+
+Summary:        Video slow motion effect via interpolation
+License:        GPL-3.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Url:            https://github.com/slowmoVideo/slowmoVideo
-Source:         %{name}-sources-v%{version}.tar.bz2
+Url:            http://slowmovideo.granjow.net/
+Source:         https://github.com/slowmoVideo/slowmoVideo/archive/v0.4.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM link_libraries.patch avvissu@yandex.ru -- Add link to libraries and use a static library
+Patch0:         slowmoVideo-0.4_link_libraries.patch
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
 BuildRequires:  fdupes
 BuildRequires:  unzip
-BuildRequires:  libffmpeg-devel
-BuildRequires:  libqt4-devel >= 4.7
-BuildRequires:  gcc-c++
-BuildRequires:  cmake
-BuildRequires:  glew-devel
 BuildRequires:  freeglut-devel
-BuildRequires:  libSDL-devel
-BuildRequires:  opencv-devel
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libswscale)
+BuildRequires:  pkgconfig(QtCore) >= 4.7
+BuildRequires:  pkgconfig(QtGui)
+BuildRequires:  pkgconfig(QtTest)
+BuildRequires:  pkgconfig(QtScript)
+BuildRequires:  pkgconfig(glew)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(sdl)
+BuildRequires:  pkgconfig(opencv)
+BuildRequires:  ImageMagick
+BuildRequires:  update-desktop-files
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-slowmoVideo is an OpenSource program that creates slow-motion videos from your footage.
+Is an OpenSource program that creates slow-motion videos from your footage..
 
-But it does not simply make your videos play at 0.01× speed. You can smoothly slow down and speed up your footage, optionally with motion blur.
+But it does not simply make your videos play at 0.01× speed. You can 
+smoothly slow down and speed up your footage, optionally with motion blur.
 
-How does slow motion work? slowmoVideo tries to find out where pixels move in the video (this information is called Optical Flow), and then uses this information to calculate the additional frames between the ones recorded by your camera.
+How does slow motion work? slowmoVideo tries to find out where pixels move 
+in the video (this information is called Optical Flow), and then uses this 
+information to calculate the additional frames between the ones recorded by 
+your camera.
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q
+%patch0 -p1
 
 %build
-mkdir build 
-cd build
-cmake \
-	-DCMAKE_INSTALL_PREFIX:STRING=%{_prefix} \
+%cmake \
 	-DCMAKE_BUILD_TYPE:STRING=Release \
 	-DENABLE_TESTS:BOOL=false \
-    ../src
+	../src
 make %{?_smp_mflags}
 
 %install
-cd build
-make install DESTDIR=%{buildroot}
+%cmake_install
 #install -d %{buildroot}%{_var}/lib/%{name}
+
+convert src/%{name}/slowmoUI/res/AppIcon.png -resize 64x64 %{name}.png
+install -Dm 0644 %{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+%suse_update_desktop_file -c %{name} %{name} "Slowmotion Video" slowmoUI %{name} Qt Multimedia AudioVideoEditing
+
 %fdupes -s %{buildroot}
 
 %files
@@ -72,5 +89,7 @@
 %{_bindir}/slowmoUI
 %{_bindir}/slowmoVideoInfo
 %{_bindir}/slowmoVisualizeFlow
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/%{name}.desktop
 
 %changelog

slowmoVideo-0.4_link_libraries.patch Added

slowmoVideo-0.4.tar.gz/. Added

slowmoVideo-sources-v0.3.tar.bz2/.gitignore -> slowmoVideo-0.4.tar.gz/.gitignore Changed

slowmoVideo-sources-v0.3.tar.bz2/README.md -> slowmoVideo-0.4.tar.gz/README.md Changed

slowmoVideo-0.4.tar.gz/fixup_osx_lib.sh Added

@@ -0,0 +1,63 @@
+#!/bin/bash
+# script to fixup additionnal library on osx
+
+prog=$1.app/Contents/MacOS/$1
+lib=$1.app/Contents/Frameworks/lib
+
+function fixup_dylib
+{
+if test -h $1 ; then
+        echo "Skipping $1 because it is a symlink"
+        return 0
+    fi
+    
+    dy_check=$(otool -D $1 | tail -n 1 | grep "is not an object file")
+    if  $dy_check != ""  ; then
+        echo "Skipping $3 because it is not a library"
+        return 0
+    fi
+
+#get dylib name
+thislib=$(otool -D $1 | tail -1)
+thisLibraryFixed=$(echo "$thislib" | sed "s/^lib/@executable_path\/..\/Frameworks\/lib/g")
+
+# fixing ref lib
+echo "fixing referening libs"
+sharedLib=$(otool -L $1 | grep -v executable | grep -v "/usr/lib" | grep -v "/System/Library" | awk '{print $1}')
+for lib in $sharedLib 
+do
+	newlibrary=$(echo $lib | sed "s/^lib/@executable_path\/..\/Frameworks\/lib/g")
+	install_name_tool -change $lib  $newlibrary $1
+done
+
+# fixing id
+echo "making execute relative :  $thislib $thisLibraryFixed"
+install_name_tool -id $thisLibraryFixed $1
+return 1
+
+}
+
+
+function fixup_exe 
+{
+    if test -h $1 ; then
+        echo "Skipping $3 because it is a symlink"
+        return 0
+    fi
+
+sharedLib=$(otool -L $1 | grep -v executable | grep -v "/usr/lib" | grep -v "/System/Library" | awk '{print $1}')
+for lib in $sharedLib 
+do
+	newlibrary=$(echo $lib | sed "s/^lib/@executable_path\/..\/Frameworks\/lib/g")
+	install_name_tool -change $lib  $newlibrary $1
+done
+return 1
+}
+
+for lib in  $lib/*
+do
+	fixup_dylib "$lib"
+done
+
+fixup_exe "$prog"
+

slowmoVideo-sources-v0.3.tar.bz2/src/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/CMakeLists.txt Changed

@@ -3,18 +3,24 @@
 project(slowmoVideo)
 
 set (CMAKE_BUILD_TYPE Release)
+#set(CMAKE_BUILD_TYPE Debug)
 
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -DNDEBUG_GL -mtune=corei7")
-
-
+set(PROJECT_VERSION_MAJOR "0")
+set(PROJECT_VERSION_MINOR "3")
+set(PROJECT_VERSION_PATCH "1")
+set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 ### Compiler options ###
 
+if (APPLE)
 # To compile with clang:
 #set(CMAKE_CXX_COMPILER "clang++")
-set(CMAKE_BUILD_TYPE Debug)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall --verbose")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2 -mtune=corei7")
+else()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
+endif()
+
 if(CMAKE_TOOLCHAIN_FILE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMXE")
   set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -DMXE")
@@ -36,6 +42,8 @@
   ${slowmoVideo_SOURCE_DIR}/cmake
 )
 
+set(DEST "bin")
+
 include(cmake/macros.cmake)
 
 SET(QT_USE_QTXML TRUE)
@@ -52,9 +60,10 @@
     # Handled by MingwCrossEnv.cmake to avoid errors like:
     # libavformat.a(avisynth.o):avisynth.c:(.text+0x6b): undefined reference to `AVIStreamRelease@4'
 endif(NOT MSYS)
-include_directories(${FFMPEG_INCLUDE_DIR})
-include_directories("/usr/include/ffmpeg/")
-link_directories(${FFMPEG_LIBRARY_DIR})
+# not here anymore
+#include_directories(${FFMPEG_INCLUDE_DIR})
+#include_directories("/usr/include/ffmpeg/")
+#link_directories(${FFMPEG_LIBRARY_DIR})
 
 find_package(OpenCV)
 include_directories(${OPENCV_INCLUDE_DIRS})
@@ -67,7 +76,7 @@
 if(MSYS)
     set(EXTERNAL_LIBS ${FFMPEG_LIBRARIES} ${QT_LIBRARIES} ${OpenCV_LIBS_OPT} ${OpenCV_EXTRA_LIBS_OPT} ${ADDITIONAL_LIBS})
 else(MSYS)
-    set(EXTERNAL_LIBS ${FFMPEG_LIBRARIES} ${QT_LIBRARIES} ${OpenCV_LIBS} ${ADDITIONAL_LIBS})
+    set(EXTERNAL_LIBS ${QT_LIBRARIES} ${OpenCV_LIBS} ${ADDITIONAL_LIBS} ${FFMPEG_LIBRARIES})
 endif(MSYS)
 
 
@@ -120,7 +129,6 @@
 find_package(OpenGL)
 find_package(GLEW)
 find_package(GLUT)
-find_package(SDL)
 find_package(JPEG)
 find_package(PNG)
 find_package(ZLIB)
@@ -170,9 +178,9 @@
 
 
 set(BUILD_FLOW_BUILDER "NO")
-if(OPENGL_FOUND AND SDL_FOUND AND GLUT_FOUND AND GLEW_FOUND AND JPEG_FOUND AND PNG_FOUND)
+if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND AND JPEG_FOUND AND PNG_FOUND)
 	set(BUILD_FLOW_BUILDER "YES")
-endif(OPENGL_FOUND AND SDL_FOUND AND GLUT_FOUND AND GLEW_FOUND AND JPEG_FOUND AND PNG_FOUND)
+endif(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND AND JPEG_FOUND AND PNG_FOUND)
 
 set(INCLUDE_SOURCE "YES")
 if(DISABLE_INCLUDE_SOURCE)
@@ -183,7 +191,6 @@
 
 if (BUILD_FLOW_BUILDER)
     include_directories(${OPENGL_INCLUDE_DIR})
-    include_directories(${SDL_INCLUDE_DIR})
     include_directories(${GLUT_INCLUDE_DIR})
     include_directories(${GLEW_INCLUDE_DIR})
     include_directories(${JPEG_INCLUDE_DIR})
@@ -275,12 +282,6 @@
 	message("* (ok) GLEW found at ${GLEW_INCLUDE_DIR}")
 endif(NOT GLEW_FOUND)
 
-if(NOT SDL_FOUND)
-	message("* SDL could not be found.")
-else(NOT SDL_FOUND)
-	message("* (ok) SDL found in ${SDL_INCLUDE_DIR}")
-endif(NOT SDL_FOUND)
-
 if(NOT JPEG_FOUND)
 	message("* JPEG libraries could not be found.")
 else(NOT JPEG_FOUND)

slowmoVideo-sources-v0.3.tar.bz2/src/V3D/Apps/GL/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/V3D/Apps/GL/CMakeLists.txt Changed

slowmoVideo-sources-v0.3.tar.bz2/src/cmake/FindFFMPEG.cmake -> slowmoVideo-0.4.tar.gz/src/cmake/FindFFMPEG.cmake Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/lib/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/lib/CMakeLists.txt Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/lib/videoInfo_sV.c -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/lib/videoInfo_sV.c Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/libgui/imageDisplay.cpp -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/libgui/imageDisplay.cpp Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/project/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/project/CMakeLists.txt Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/project/flowSourceOpenCV_sV.cpp -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/project/flowSourceOpenCV_sV.cpp Changed

@@ -45,7 +45,7 @@
 
 
 
-
+// TODO: check usage of cflowmap ? create a branch ?
 void drawOptFlowMap(const Mat& flow, Mat& cflowmap, int step,
                     double, const Scalar& color, std::string flowname )
 {
@@ -83,7 +83,8 @@
             cv::Scalar col = cv::Scalar(offset + fxy.x*scale, offset + fxy.y*scale, offset);
             //line(cflowmap, Point(x,y), Point(cvRound(x+fxy.x), cvRound(y+fxy.y)),
             //     color);
-            circle(cflowmap, Point(x,y), 0, col, -1);
+            //TODO: usefullness ?
+            //circle(cflowmap, Point(x,y), 0, col, -1);
 
             if (fabs(fxy.x) > max_flow) max_flow = fabs(fxy.x);
             if (fabs(fxy.y) > max_flow) max_flow = fabs(fxy.y);
@@ -126,6 +127,8 @@
         QString path = project()->frameSource()->framePath(rightFrame, frameSize);
 //        namedWindow("flow", 1);
 
+		qDebug() << "Building flow for left frame " << leftFrame << " to right frame " << rightFrame << "; Size: " << frameSize;
+		
         prevgray = imread(prevpath.toStdString(), 0);
         gray = imread(path.toStdString(), 0);

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/project/videoFrameSource_sV.cpp -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/project/videoFrameSource_sV.cpp Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/slowmoCLI/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoCLI/CMakeLists.txt Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/slowmoFlowEdit/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoFlowEdit/CMakeLists.txt Changed

@@ -24,11 +24,47 @@
 qt4_wrap_ui(UI_H_OUT ${SRCS_UI})
 qt4_wrap_cpp(MOC_OUT ${SRCS_MOC})
 
+if(APPLE)
+        set(BUNDLE "slowmoFlowEdit")
+        set(ICONS_DIR "${${PROJECT_NAME}_SOURCE_DIR}/slowmoVideo/slowmoUI/res")
+        message( "OS X build" )
+        set(MACOSX_BUNDLE_INFO_STRING "${BUNDLE} ${PROJECT_VERSION}")
+        set(MACOSX_BUNDLE_BUNDLE_VERSION "${BUNDLE} ${PROJECT_VERSION}")
+        set(MACOSX_BUNDLE_LONG_VERSION_STRING "${BUNDLE} ${PROJECT_VERSION}")
+        set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}")
+        set(MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT_YEAR} ${PROJECT_VENDOR}")
+        set(MACOSX_BUNDLE_ICON_FILE "slowmoUI.icns")
+        set(MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_DOMAIN_SECOND}.${PROJECT_DOMAIN_FIRST}")
+        set(MACOSX_BUNDLE_BUNDLE_NAME "${BUNDLE}")
+
+        set(MACOSX_BUNDLE_RESOURCES "${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE}.app/Contents/Resources")
+        set(MACOSX_BUNDLE_ICON "${ICONS_DIR}/${MACOSX_BUNDLE_ICON_FILE}")
+        SET_SOURCE_FILES_PROPERTIES(
+           ${MACOSX_BUNDLE_ICON}
+            PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+        message(STATUS "Bundle will be : ${MACOSX_BUNDLE} =>  ${PROJECT_NAME} ")
+
+        set( SRCS ${SRCS} ${MACOSX_BUNDLE_ICON} )
+
+endif()
+
 include_directories(..)
 include_directories(${CMAKE_BINARY_DIR}/slowmoVideo/slowmoFlowEdit)
 include_directories(${CMAKE_BINARY_DIR}/slowmoVideo/libgui)
 
-add_executable(slowmoFlowEdit ${SRCS} ${MOC_OUT} ${UI_H_OUT})
+add_executable(slowmoFlowEdit WIN32 MACOSX_BUNDLE ${SRCS} ${MOC_OUT} ${UI_H_OUT})
 target_link_libraries(slowmoFlowEdit sVgui sVflow sVvis ${EXTERNAL_LIBS})
 
-install(TARGETS slowmoFlowEdit DESTINATION bin)
+install(TARGETS slowmoFlowEdit
+        BUNDLE DESTINATION . COMPONENT Runtime
+        RUNTIME DESTINATION ${DEST} COMPONENT Runtime)
+
+if (APPLE)
+        #install(TARGETS slowmoUI DESTINATION ".")
+       include(DeployQt4)
+       install_qt4_executable(slowmoUI.app "" ""  )
+
+else()
+        install(TARGETS slowmoFlowEdit DESTINATION ${DEST})
+endif()
+

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/slowmoInfo/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoInfo/CMakeLists.txt Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/slowmoRenderer/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoRenderer/CMakeLists.txt Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/slowmoUI/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoUI/CMakeLists.txt Changed

@@ -4,6 +4,7 @@
 # http://www.cmake.org/pipermail/cmake/2008-September/023908.html
 
 
+
 include_directories(${slowmoVideo_SOURCE_DIR})
 
 set(SRCS
@@ -59,6 +60,30 @@
 )
 
 
+if(APPLE)
+	set(BUNDLE "slowmoUI")
+	set(ICONS_DIR "${${PROJECT_NAME}_SOURCE_DIR}/slowmoVideo/slowmoUI/res")
+        message( "OS X build" )
+        set(MACOSX_BUNDLE_INFO_STRING "${BUNDLE} ${PROJECT_VERSION}")
+        set(MACOSX_BUNDLE_BUNDLE_VERSION "${BUNDLE} ${PROJECT_VERSION}")
+        set(MACOSX_BUNDLE_LONG_VERSION_STRING "${BUNDLE} ${PROJECT_VERSION}")
+        set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}")
+        set(MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT_YEAR} ${PROJECT_VENDOR}")
+        set(MACOSX_BUNDLE_ICON_FILE "slowmoUI.icns")
+        set(MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_DOMAIN_SECOND}.${PROJECT_DOMAIN_FIRST}")
+        set(MACOSX_BUNDLE_BUNDLE_NAME "${BUNDLE}")
+
+        set(MACOSX_BUNDLE_RESOURCES "${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE}.app/Contents/Resources")
+        set(MACOSX_BUNDLE_ICON "${ICONS_DIR}/${MACOSX_BUNDLE_ICON_FILE}")
+	SET_SOURCE_FILES_PROPERTIES(
+	   ${MACOSX_BUNDLE_ICON} 
+	    PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+        message(STATUS "Bundle will be : ${MACOSX_BUNDLE} =>  ${PROJECT_NAME} ")
+
+	set( SRCS ${SRCS} ${MACOSX_BUNDLE_ICON} )
+
+endif()
+
 # Without these includes the promoted widgets fail to compile
 # since the headers are not found. (For whatever reason.)
 include_directories(dialogues)
@@ -76,7 +101,27 @@
 # Include the generated header files
 include_directories(${CMAKE_BINARY_DIR}/slowmoVideo/slowmoUI)
 
-add_executable(slowmoUI ${SRCS} ${MOC_OUT} ${UI_H_OUT} ${RES_OUT})
+
+
+add_executable(slowmoUI WIN32 MACOSX_BUNDLE ${SRCS} ${MOC_OUT} ${UI_H_OUT} ${RES_OUT})
 target_link_libraries(slowmoUI sVproj sVvis sVgui ${EXTERNAL_LIBS})
 
-install(TARGETS slowmoUI DESTINATION bin)
+if(APPLE)
+  configure_file(${CMAKE_SOURCE_DIR}/slowmoVideo/slowmoUI/res/Info.plist.cmake ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
+  set_target_properties(${PROGNAME} PROPERTIES
+                        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
+endif()
+
+install(TARGETS ${slowmoUI}
+        BUNDLE DESTINATION . COMPONENT Runtime
+        RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT Runtime)
+
+if (APPLE)
+	install(TARGETS slowmoUI DESTINATION ".")
+       include(DeployQt4)
+       install_qt4_executable(slowmoUI.app "" ""  )
+	
+else()
+	install(TARGETS slowmoUI DESTINATION ${DEST})
+endif()
+

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/slowmoUI/dialogues/preferencesDialog.cpp -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoUI/dialogues/preferencesDialog.cpp Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/slowmoUI/dialogues/preferencesDialog.h -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoUI/dialogues/preferencesDialog.h Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/slowmoUI/dialogues/renderingDialog.cpp -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoUI/dialogues/renderingDialog.cpp Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/slowmoUI/main.cpp -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoUI/main.cpp Changed

slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoUI/res/Info.plist.cmake Added

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+		<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>sVproj</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>${MACOSX_BUNDLE_ICON_FILE}</string>
+			<key>CFBundleTypeName</key>
+			<string>slowmoVideo Project File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSTypeIsPackage</key>
+			<false/>
+			<key>NSPersistentStoreTypeKey</key>
+			<string>XML</string>
+		</dict>‹
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>${PROGNAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
+	<key>CFBundleIconFile</key>
+	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
+	<key>CFBundleIdentifier</key>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+	<key>CFBundleName</key>
+	<string>${BUNDLE}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+</dict>
+</plist>

slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoUI/res/slowmoUI.icns Added

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/slowmoUI/resources.qrc -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/slowmoUI/resources.qrc Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/test/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/test/CMakeLists.txt Changed

slowmoVideo-0.4.tar.gz/src/slowmoVideo/tr/slowmoVideo_fr.qm Added

slowmoVideo-0.4.tar.gz/src/slowmoVideo/tr/slowmoVideo_fr.ts Added

@@ -0,0 +1,1435 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr_FR">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../slowmoUI/dialogues/aboutDialog.ui" line="14"/>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/dialogues/aboutDialog.ui" line="28"/>
+        <source>About slowmoVideo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message utf8="true">
+        <location filename="../slowmoUI/dialogues/aboutDialog.ui" line="41"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Bitstream Vera Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;slowmoVideo&lt;/span&gt; is developed by Simon A. Eugster (aka. Granjow, co-author of Kdenlive) and licensed under GPLv3.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;slowmoVideo&lt;/span&gt; allows to change the speed of a video clip based upon a curve. If the speed becomes higher than 1×, an exposure (shutter) effect simulates motion blur. For lower speed, frames are interpolated with optical flow.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Thanks for contributing:&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Mirko Götze &lt;span style=&quot; font-style:italic;&quot;&gt;&amp;lt;mail@mgo80.de&amp;gt;&lt;/span&gt; for converting &lt;span style=&quot; font-weight:600;&quot;&gt;Cg to GLSL&lt;/span&gt; (Removing the nVidia dependency)&lt;/li&gt;
+&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Morten Sylvest Olsen &lt;span style=&quot; font-style:italic;&quot;&gt;&amp;lt;mso@kapowsoftware.com&amp;gt;&lt;/span&gt; for the &lt;span style=&quot; font-weight:600;&quot;&gt;V3D speedup&lt;/span&gt; and removing the unnecessary window&lt;/li&gt;
+&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Elias Vanderstuyft for displaying the &lt;span style=&quot; font-weight:600;&quot;&gt;shutter function&lt;/span&gt; on the canvas&lt;/li&gt;
+&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Christian Frisson &lt;span style=&quot; font-style:italic;&quot;&gt;&amp;lt;christian.frisson@umons.ac.be&amp;gt;&lt;/span&gt; for&lt;span style=&quot; font-weight:600;&quot;&gt; OpenCV on MXE&lt;/span&gt; (allowed me to compile slowmoVideo for Windows)&lt;/li&gt;
+&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Per &lt;span style=&quot; font-style:italic;&quot;&gt;&amp;lt;per@stuffmatic.com&amp;gt;&lt;/span&gt; for the&lt;span style=&quot; font-weight:600;&quot;&gt; OpenCV&lt;/span&gt; code (slowmoVideo can run on CPU only with it)&lt;/li&gt;&lt;/ul&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Visit &lt;a href=&quot;http://slowmoVideo.granjow.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;slowmoVideo.granjow.net&lt;/span&gt;&lt;/a&gt; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/dialogues/aboutDialog.ui" line="133"/>
+        <source>(c) 2012 Simon A. Eugster</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/dialogues/aboutDialog.cpp" line="23"/>
+        <source>Version %1, %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Canvas</name>
+    <message>
+        <location filename="../slowmoUI/canvas.ui" line="78"/>
+        <source>slowmoUI canvas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="105"/>
+        <source>&amp;Delete node</source>
+        <translation>Effacer le noeud</translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="106"/>
+        <source>&amp;Snap in node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="107"/>
+        <source>&amp;Delete tag</source>
+        <translation>Effacer le tag</translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="108"/>
+        <source>&amp;Rename tag</source>
+        <translation>Renomer le  tag</translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="109"/>
+        <source>Set tag &amp;time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="118"/>
+        <source>&amp;Linear curve</source>
+        <translation>Courbe Lineaire</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../slowmoUI/canvas.cpp" line="119"/>
+        <source>&amp;Bézier curve</source>
+        <translation>Courbe de Bezier</translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="123"/>
+        <source>Set &amp;custom speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="124"/>
+        <source>Set/edit shutter &amp;function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message utf8="true">
+        <location filename="../slowmoUI/canvas.cpp" line="130"/>
+        <source>Set speed to %1×</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="135"/>
+        <source>Reset left handle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="136"/>
+        <source>Reset right handle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message utf8="true">
+        <location filename="../slowmoUI/canvas.cpp" line="789"/>
+        <source>Segment replay &amp;speed …</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="800"/>
+        <source>Node %1</source>
+        <translation>Noeud %1</translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="803"/>
+        <source>Handle actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="811"/>
+        <source>Segment between node %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="830"/>
+        <source>Tag %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="1078"/>
+        <source>New tag name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="1078"/>
+        <source>Tag:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="1087"/>
+        <source>New tag time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="1087"/>
+        <source>Time:</source>
+        <translatorcomment>Temps</translatorcomment>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="1153"/>
+        <source>Replay speed for current segment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../slowmoUI/canvas.cpp" line="1153"/>
+        <source>Speed:</source>
+        <translation>Vitesse:</translation>
+    </message>
+</context>
+<context>
+    <name>FlowEditCanvas</name>
+    <message>
+        <location filename="../slowmoFlowEdit/flowEditCanvas.ui" line="77"/>
+        <source>Values at mouse position</source>
+        <translation>Valeurs à la position de la sourie</translation>
+    </message>
+</context>
+<context>
+    <name>FlowExaminer</name>
+    <message>
+        <location filename="../slowmoUI/dialogues/flowExaminer.ui" line="95"/>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+</context>
+<context>
+    <name>FrameMonitor</name>
+    <message>
+        <location filename="../slowmoUI/frameMonitor.ui" line="20"/>
+        <source>Input monitor</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageDisplay</name>
+    <message>
+        <location filename="../libgui/imageDisplay.cpp" line="28"/>
+        <source>Scale image to widget size</source>

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/unittests/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/unittests/CMakeLists.txt Changed

slowmoVideo-sources-v0.3.tar.bz2/src/slowmoVideo/visualizeFlow/CMakeLists.txt -> slowmoVideo-0.4.tar.gz/src/slowmoVideo/visualizeFlow/CMakeLists.txt Changed

slowmoVideo-sources-v0.3.tar.bz2/todo.org -> slowmoVideo-0.4.tar.gz/todo.org Changed

Changes of Revision 3