Hello community, here is the log from the commit of package gstreamer-0_10-plugins-qt for openSUSE:13.1 checked in at 2013-10-17 14:14:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/gstreamer-0_10-plugins-qt (Old) and /work/SRC/openSUSE:13.1/.gstreamer-0_10-plugins-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-0_10-plugins-qt" Changes: -------- --- /work/SRC/openSUSE:13.1/gstreamer-0_10-plugins-qt/gstreamer-0_10-plugins-qt.changes 2013-09-23 10:53:00.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.gstreamer-0_10-plugins-qt.new/gstreamer-0_10-plugins-qt.changes 2013-10-19 16:48:47.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Oct 15 00:10:36 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to final 0.10.3: + * Fixes: + + One build fix change with regards to Qt4/5 cmake var name +- Use bz2 tarball + +------------------------------------------------------------------- Old: ---- qt-gstreamer-0.10.2.2.tar.gz New: ---- qt-gstreamer-0.10.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-qt.spec ++++++ --- /var/tmp/diff_new_pack.KD6V2s/_old 2013-10-19 16:48:47.000000000 +0200 +++ /var/tmp/diff_new_pack.KD6V2s/_new 2013-10-19 16:48:47.000000000 +0200 @@ -21,13 +21,13 @@ %define gstmin 0 %define glibmin 0 Name: gstreamer-%{gstnum}-plugins-qt -Version: 0.10.2.2 +Version: 0.10.3 Release: 0 Summary: C++/Qt bindings for GStreamer License: LGPL-2.1+ Group: Productivity/Multimedia/Other Url: http://gstreamer.freedesktop.org/wiki/QtGStreamer -Source: http://gstreamer.freedesktop.org/src/qt-gstreamer/pre/qt-gstreamer-%{version}.tar.gz +Source: http://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-%{version}.tar.bz2 BuildRequires: bison BuildRequires: boost-devel BuildRequires: cmake >= 2.8.9 ++++++ qt-gstreamer-0.10.2.2.tar.gz -> qt-gstreamer-0.10.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-0.10.2.2/CMakeLists.txt new/qt-gstreamer-0.10.3/CMakeLists.txt --- old/qt-gstreamer-0.10.2.2/CMakeLists.txt 2013-06-09 18:29:54.000000000 +0200 +++ new/qt-gstreamer-0.10.3/CMakeLists.txt 2013-10-14 10:44:40.000000000 +0200 @@ -7,7 +7,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) -set(QTGSTREAMER_VERSION 0.10.2.2) +set(QTGSTREAMER_VERSION 0.10.3) option(QTGSTREAMER_STATIC "Build QtGStreamer as a static library" OFF) option(QTGSTREAMER_TESTS "Build QtGStreamer's tests" OFF) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-0.10.2.2/NEWS new/qt-gstreamer-0.10.3/NEWS --- old/qt-gstreamer-0.10.2.2/NEWS 2013-06-09 18:29:54.000000000 +0200 +++ new/qt-gstreamer-0.10.3/NEWS 2013-10-14 10:44:40.000000000 +0200 @@ -1,4 +1,4 @@ -qt-gstreamer 0.10.2.2 (2013-06-09) +qt-gstreamer 0.10.3 (2013-10-14) ================================== Additions: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-0.10.2.2/cmake/modules/FindQt4or5.cmake new/qt-gstreamer-0.10.3/cmake/modules/FindQt4or5.cmake --- old/qt-gstreamer-0.10.2.2/cmake/modules/FindQt4or5.cmake 2013-06-09 18:29:54.000000000 +0200 +++ new/qt-gstreamer-0.10.3/cmake/modules/FindQt4or5.cmake 2013-10-14 10:44:40.000000000 +0200 @@ -177,6 +177,13 @@ find_package_handle_standard_args(Qt4or5 REQUIRED_VARS _Qt4or5_FOUND HANDLE_COMPONENTS) set(Qt4or5_FOUND ${QT4OR5_FOUND}) +# Core library needed for compilation tests +if (${QT_VERSION} STREQUAL "4") + set (Qt4or5_Core_LIBRARIES ${QT_QTCORE_LIBRARY}) +else() + set (Qt4or5_Core_LIBRARIES ${Qt5Core_LIBRARIES}) +endif() + # qt4or5_use_modules(target [ LINK_PUBLIC | LINK_PRIVATE ] <modules>) # Supported modules: Core, Gui, Widgets, Quick1, Quick2, Test, OpenGL function(qt4or5_use_modules _target _link_type) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-0.10.2.2/cmake/modules/HandleImportedTargetsInCMakeRequiredLibraries.cmake new/qt-gstreamer-0.10.3/cmake/modules/HandleImportedTargetsInCMakeRequiredLibraries.cmake --- old/qt-gstreamer-0.10.2.2/cmake/modules/HandleImportedTargetsInCMakeRequiredLibraries.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/qt-gstreamer-0.10.3/cmake/modules/HandleImportedTargetsInCMakeRequiredLibraries.cmake 2013-10-14 10:44:40.000000000 +0200 @@ -0,0 +1,83 @@ +# This is a helper function used by CheckCXXSourceRuns.cmake and +# CheckCXXSourceCompiles.cmake. Actually it should be used by all macros which +# use TRY_COMPILE() or TRY_RUN(). +# It takes the CMAKE_REQUIRED_LIBRARY variable and searches it for imported +# (library) targets. Since the project created by TRY_COMPILE() (and TRY_RUN()) +# does not know about these imported targets, this macro here replaces these +# imported targets with the actual library files on disk and it also +# adds the libraries from the link interface of these imported targets. +# E.g the imported target KDE4__kdeui is replaced on my system with /opt/kdelibs/lib/libkdeui.so +# and the link interface libraries, which includes e.g. /opt/kdelibs/lib/libkdecore.so. +# This way imported targets work also when used with CHECK_CXX_SOURCE_COMPILES/RUNS(). + +# Copyright (c) 2009, Alexander Neundorf, <neund...@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +FUNCTION(HANDLE_IMPORTED_TARGETS_IN_CMAKE_REQUIRED_LIBRARIES _RESULT) +# handle imported library targets + SET(_CCSR_IMP_TARGETS_MAP) + SET(_CCSR_REQ_LIBS ${CMAKE_REQUIRED_LIBRARIES}) + SET(_CHECK_FOR_IMPORTED_TARGETS TRUE) + SET(_CCSR_LOOP_COUNTER 0) + WHILE(_CHECK_FOR_IMPORTED_TARGETS) + MATH(EXPR _CCSR_LOOP_COUNTER "${_CCSR_LOOP_COUNTER} + 1 ") + SET(_CCSR_NEW_REQ_LIBS ) + SET(_CHECK_FOR_IMPORTED_TARGETS FALSE) + FOREACH(_CURRENT_LIB ${_CCSR_REQ_LIBS}) + GET_TARGET_PROPERTY(_importedConfigs ${_CURRENT_LIB} IMPORTED_CONFIGURATIONS) + IF (_importedConfigs) + # Ok, so this is an imported target. + # First we get the imported configurations. + # Then we get the location of the actual library on disk of the first configuration. + # then we'll get its link interface libraries property, + # iterate through it and replace all imported targets we find there + # with there actual location. + + # guard against infinite loop: abort after 100 iterations ( 100 is arbitrary chosen) + IF ("${_CCSR_LOOP_COUNTER}" LESS 100) + SET(_CHECK_FOR_IMPORTED_TARGETS TRUE) +# ELSE ("${_CCSR_LOOP_COUNTER}" LESS 1) +# MESSAGE(STATUS "********* aborting loop, counter : ${_CCSR_LOOP_COUNTER}") + ENDIF ("${_CCSR_LOOP_COUNTER}" LESS 100) + + LIST(GET _importedConfigs 0 _firstImportedConfig) + GET_TARGET_PROPERTY(_firstImportedLocation ${_CURRENT_LIB} IMPORTED_LOCATION_${_firstImportedConfig}) + GET_TARGET_PROPERTY(_linkInterfaceLibs ${_CURRENT_LIB} IMPORTED_LINK_INTERFACE_LIBRARIES_${_firstImportedConfig} ) + + LIST(APPEND _CCSR_NEW_REQ_LIBS ${_firstImportedLocation}) +# MESSAGE(STATUS "Appending lib ${_CURRENT_LIB} as ${_firstImportedLocation}") + IF(_linkInterfaceLibs) + FOREACH(_currentLinkInterfaceLib ${_linkInterfaceLibs}) +# MESSAGE(STATUS "Appending link interface lib ${_currentLinkInterfaceLib}") + IF(_currentLinkInterfaceLib) + LIST(APPEND _CCSR_NEW_REQ_LIBS ${_currentLinkInterfaceLib} ) + ENDIF(_currentLinkInterfaceLib) + ENDFOREACH(_currentLinkInterfaceLib ${_linkInterfaceLibs}) + ENDIF(_linkInterfaceLibs) + ELSE(_importedConfigs) + # "Normal" libraries are just used as they are. + LIST(APPEND _CCSR_NEW_REQ_LIBS ${_CURRENT_LIB} ) +# MESSAGE(STATUS "Appending lib directly: ${_CURRENT_LIB}") + ENDIF(_importedConfigs) + ENDFOREACH(_CURRENT_LIB ${_CCSR_REQ_LIBS}) + + SET(_CCSR_REQ_LIBS ${_CCSR_NEW_REQ_LIBS} ) + ENDWHILE(_CHECK_FOR_IMPORTED_TARGETS) + + # Finally we iterate once more over all libraries. This loop only removes + # all remaining imported target names (there shouldn't be any left anyway). + SET(_CCSR_NEW_REQ_LIBS ) + FOREACH(_CURRENT_LIB ${_CCSR_REQ_LIBS}) + GET_TARGET_PROPERTY(_importedConfigs ${_CURRENT_LIB} IMPORTED_CONFIGURATIONS) + IF (NOT _importedConfigs) + LIST(APPEND _CCSR_NEW_REQ_LIBS ${_CURRENT_LIB} ) +# MESSAGE(STATUS "final: appending ${_CURRENT_LIB}") + ELSE (NOT _importedConfigs) +# MESSAGE(STATUS "final: skipping ${_CURRENT_LIB}") + ENDIF (NOT _importedConfigs) + ENDFOREACH(_CURRENT_LIB ${_CCSR_REQ_LIBS}) + SET(${_RESULT} ${_CCSR_NEW_REQ_LIBS} PARENT_SCOPE) + +ENDFUNCTION(HANDLE_IMPORTED_TARGETS_IN_CMAKE_REQUIRED_LIBRARIES _RESULT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-0.10.2.2/cmake/modules/QtGStreamerConfig.cmake.in new/qt-gstreamer-0.10.3/cmake/modules/QtGStreamerConfig.cmake.in --- old/qt-gstreamer-0.10.2.2/cmake/modules/QtGStreamerConfig.cmake.in 2013-06-09 18:29:54.000000000 +0200 +++ new/qt-gstreamer-0.10.3/cmake/modules/QtGStreamerConfig.cmake.in 2013-10-14 10:44:40.000000000 +0200 @@ -10,6 +10,7 @@ include(${_QTGSTREAMER_TARGETS_FILE}) unset(_QTGSTREAMER_TARGETS_FILE) +set(@QTGSTREAMER_PACKAGE_NAME@_FOUND TRUE) set(QTGLIB_LIBRARY @QTGLIB_LIBRARY@) set(QTGSTREAMER_LIBRARY @QTGSTREAMER_LIBRARY@) set(QTGSTREAMER_UI_LIBRARY @QTGSTREAMER_UI_LIBRARY@) @@ -70,3 +71,6 @@ PATHS ${_QTGSTREAMER_CONFIG_DIR} NO_DEFAULT_PATH) include(${_QTGSTREAMER_CONFIG_COMMON_FILE}) unset(_QTGSTREAMER_CONFIG_COMMON_FILE) + +# compatibility variable +set(QTGSTREAMER_FOUND ${@QTGSTREAMER_PACKAGE_NAME@_FOUND}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-0.10.2.2/tests/compilation/CompilationTests_CMakeLists.txt new/qt-gstreamer-0.10.3/tests/compilation/CompilationTests_CMakeLists.txt --- old/qt-gstreamer-0.10.2.2/tests/compilation/CompilationTests_CMakeLists.txt 2013-06-09 18:29:54.000000000 +0200 +++ new/qt-gstreamer-0.10.3/tests/compilation/CompilationTests_CMakeLists.txt 2013-10-14 10:44:40.000000000 +0200 @@ -11,7 +11,7 @@ include(QtGStreamerConfigCommon) include(MacroCXXCompilationTest) -set(CMAKE_REQUIRED_LIBRARIES ${QTGSTREAMER_LIBRARY} ${QTGLIB_LIBRARY}) +set(CMAKE_REQUIRED_LIBRARIES ${QTGSTREAMER_LIBRARY} ${QTGLIB_LIBRARY} ${Qt4or5_Core_LIBRARIES}) set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES}) set(CMAKE_REQUIRED_DEFINITIONS ${QTGSTREAMER_DEFINITIONS}) set(CMAKE_REQUIRED_FLAGS "${QTGSTREAMER_FLAGS}") @@ -24,6 +24,9 @@ ${GSTREAMER_INTERFACES_LIBRARY}) endif() +include(HandleImportedTargetsInCMakeRequiredLibraries) +handle_imported_targets_in_cmake_required_libraries(CMAKE_REQUIRED_LIBRARIES) + message("********* Begin running compilation tests *********") include(CompilationTests.cmake) evaluate_cxx_compilation_test_results() -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org