diff -Nru kamoso-2.0.2/debian/changelog kamoso-2.0.2/debian/changelog --- kamoso-2.0.2/debian/changelog 2015-05-28 21:43:24.000000000 +0800 +++ kamoso-2.0.2/debian/changelog 2015-10-12 18:16:11.000000000 +0800 @@ -1,3 +1,10 @@ +kamoso (2.0.2-3.1) unstable; urgency=medium + + * Non-maintainer upload. + Also include /usr/lib//gstreamer-/include. + + -- YunQiang Su Mon, 12 Oct 2015 18:11:57 +0800 + kamoso (2.0.2-3) unstable; urgency=medium * Team upload. diff -Nru kamoso-2.0.2/debian/patches/qt-gstreamer-1.0.diff kamoso-2.0.2/debian/patches/qt-gstreamer-1.0.diff --- kamoso-2.0.2/debian/patches/qt-gstreamer-1.0.diff 2015-05-27 11:12:03.000000000 +0800 +++ kamoso-2.0.2/debian/patches/qt-gstreamer-1.0.diff 2015-10-12 18:07:09.000000000 +0800 @@ -1,9 +1,11 @@ Author: Andreas Cord-Landwehr Description: Porting to GStreamer-1.0 API and QtGstreamer 1.2 Applied-Upstream: https://projects.kde.org/projects/extragear/multimedia/kamoso/repository/revisions/b85e8c187b4eabf9765bc05348f6232ba32c9493 +Index: b/CMakeLists.txt +=================================================================== --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -6,8 +6,8 @@ +@@ -6,8 +6,8 @@ find_package(KDE4 REQUIRED) find_package(Kipi REQUIRED) find_package(Phonon REQUIRED) find_package(GLIB2 REQUIRED) @@ -14,7 +16,7 @@ macro_optional_find_package(Nepomuk) macro_log_feature(NEPOMUK_FOUND "Nepomuk" "Handles all kinds of metadata on the KDE desktop to provide a semantic desktop" "http://nepomuk.kde.org/" FALSE "" "STRONGLY_RECOMMENDED: Nepomuk is used to provide metadata on objects like files, emails etc. to provide a semantic desktop.") -@@ -15,6 +15,10 @@ +@@ -15,6 +15,10 @@ macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPO macro_display_feature_log() include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -25,9 +27,11 @@ add_subdirectory(src) add_subdirectory(icons) +Index: b/cmake/FindGStreamer.cmake +=================================================================== --- a/cmake/FindGStreamer.cmake +++ b/cmake/FindGStreamer.cmake -@@ -15,40 +15,38 @@ +@@ -15,40 +15,44 @@ # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) @@ -59,11 +63,14 @@ PATHS ${PKG_GSTREAMER_INCLUDE_DIRS} - PATH_SUFFIXES gstreamer-0.10 -- ) -- ++ PATH_SUFFIXES gstreamer-${GSTREAMER_API_VERSION} + ) + -FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10 -- PATHS ++FIND_PATH(GSTREAMER_ARCH_INCLUDE_DIR gst/gstconfig.h + PATHS - ${PKG_GSTREAMER_LIBRARY_DIRS} ++ ${PKG_GSTREAMER_INCLUDE_DIRS} + PATH_SUFFIXES gstreamer-${GSTREAMER_API_VERSION} ) @@ -78,7 +85,7 @@ PATHS ${PKG_GSTREAMER_LIBRARY_DIRS} ) -@@ -63,12 +61,7 @@ +@@ -63,12 +67,7 @@ ELSE (GSTREAMER_LIBRARIES) MESSAGE(STATUS "GStreamer: WARNING: library not found") ENDIF (GSTREAMER_LIBRARIES) @@ -93,6 +100,8 @@ -MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY) +MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) +Index: b/src/webcamwidget.cpp +=================================================================== --- a/src/webcamwidget.cpp +++ b/src/webcamwidget.cpp @@ -55,8 +55,9 @@ @@ -106,7 +115,7 @@ #include #include #include -@@ -130,8 +131,7 @@ +@@ -130,8 +131,7 @@ void WebcamWidget::playFile(const Device QByteArray pipe = basicPipe(); //Set the right colorspace to convert to QImage @@ -116,7 +125,7 @@ " ! fakesink name=fakesink"; kDebug() << "================ PIPELINE ================"; -@@ -157,7 +157,7 @@ +@@ -157,7 +157,7 @@ void WebcamWidget::playFile(const Device setVideoSettings(); kDebug() << "================ Capabilities ================"; @@ -125,7 +134,7 @@ d->m_pipeline->setState(QGst::StatePlaying); } -@@ -179,34 +179,51 @@ +@@ -179,34 +179,51 @@ bool WebcamWidget::takePhoto(const KUrl } kDebug() << dest; d->destination = dest; @@ -181,7 +190,7 @@ for (int y=0; ym_bin->getElementByName("videosink").staticCast(); @@ -249,3 +258,13 @@ if (over->findProperty("force-aspect-ratio")) { kDebug() << "Setting aspect ratio"; +Index: b/src/CMakeLists.txt +=================================================================== +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,4 +1,4 @@ +-include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KIPI_INCLUDE_DIR} ${QTGSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIR}) ++include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KIPI_INCLUDE_DIR} ${QTGSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_ARCH_INCLUDE_DIR}) + + add_definitions(-DGST_DISABLE_DEPRECATED) + add_definitions(-fexceptions)