diff --git a/network/chat/telepathy-qt5/files/cmake.patch b/network/chat/telepathy-qt5/files/cmake.patch deleted file mode 100644 index 65fda3cd29..0000000000 --- a/network/chat/telepathy-qt5/files/cmake.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05fe3f4980bbc6b016e25dcf07e44afe29e377c0 Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Sun, 29 Sep 2013 22:19:27 +0000 -Subject: Fix compilation on new versions of cmake - -Recent cmake has changed the argument count to -qt4_create_moc_command, we need to adjust accordingly - -Reviewed-by: Dario Freddi ---- -diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake -index c2eac76..b3131f0 100644 ---- a/cmake/modules/FindQt.cmake -+++ b/cmake/modules/FindQt.cmake -@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS) - - MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options) - IF(QT_VERSION_MAJOR MATCHES 4) -- QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") -+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) - ELSE(QT_VERSION_MAJOR MATCHES 4) - IF(QT_VERSION_MAJOR MATCHES 5) -- QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") -+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) - ENDIF(QT_VERSION_MAJOR MATCHES 5) - ENDIF(QT_VERSION_MAJOR MATCHES 4) - ENDMACRO(QT_CREATE_MOC_COMMAND) --- -cgit v0.9.0.2-2-gbebe diff --git a/network/chat/telepathy-qt5/files/gstreamer-1.6.patch b/network/chat/telepathy-qt5/files/gstreamer-1.6.patch new file mode 100644 index 0000000000..a6802d04a0 --- /dev/null +++ b/network/chat/telepathy-qt5/files/gstreamer-1.6.patch @@ -0,0 +1,82 @@ +From ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb Mon Sep 17 00:00:00 2001 +From: Niels Ole Salscheider +Date: Tue, 29 Sep 2015 20:52:15 +0200 +Subject: Farstream: gst/gstconfig.h can be in LIBDIR, search for it explicitly + +Since GStreamer-1.5.1 config header file moved to LIBDIR. + +Reviewed-by: Alexandr Akulich + +diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt +index 250bfdb..dd71430 100644 +--- a/TelepathyQt/Farstream/CMakeLists.txt ++++ b/TelepathyQt/Farstream/CMakeLists.txt +@@ -2,7 +2,7 @@ if(FARSTREAM_COMPONENTS_FOUND) + include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR} + ${TELEPATHY_GLIB_INCLUDE_DIR} + ${FARSTREAM_INCLUDE_DIR} +- ${GSTREAMER_INCLUDE_DIR} ++ ${GSTREAMER_INCLUDE_DIRS} + ${GLIB2_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${DBUS_INCLUDE_DIR}) +diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake +index 63fb41c..ffdd7a9 100644 +--- a/cmake/modules/FindGStreamer.cmake ++++ b/cmake/modules/FindGStreamer.cmake +@@ -13,12 +13,12 @@ + + # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) + +-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) ++IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) + # in cache already + SET(GSTREAMER_FIND_QUIETLY TRUE) +-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) ++ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) + SET(GSTREAMER_FIND_QUIETLY FALSE) +-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) ++ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) + + IF (NOT WIN32) + # use pkg-config to get the directories and then use these values +@@ -38,6 +38,15 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h + PATH_SUFFIXES gstreamer-1.0 + ) + ++FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h ++ PATHS ++ ${PC_GSTREAMER_INCLUDEDIR} ++ ${PC_GSTREAMER_INCLUDE_DIRS} ++ PATH_SUFFIXES gstreamer-1.0 ++ ) ++ ++SET(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_CONF_INCLUDE_DIR}) ++ + FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 + PATHS + ${PC_GSTREAMER_LIBDIR} +@@ -57,6 +66,12 @@ ELSE (GSTREAMER_INCLUDE_DIR) + MESSAGE(STATUS "GStreamer: WARNING: include dir not found") + ENDIF (GSTREAMER_INCLUDE_DIR) + ++IF (GSTREAMER_CONF_INCLUDE_DIR) ++ #MESSAGE(STATUS "DEBUG: Found GStreamer config include dir: ${GSTREAMER_CONF_INCLUDE_DIR}") ++ELSE (GSTREAMER_CONF_INCLUDE_DIR) ++ MESSAGE(STATUS "GStreamer: WARNING: config include dir not found") ++ENDIF (GSTREAMER_CONF_INCLUDE_DIR) ++ + IF (GSTREAMER_LIBRARIES) + #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}") + ELSE (GSTREAMER_LIBRARIES) +@@ -65,6 +80,6 @@ ENDIF (GSTREAMER_LIBRARIES) + + + INCLUDE(FindPackageHandleStandardArgs) +-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIRS GSTREAMER_BASE_LIBRARY) + +-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) ++MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) +-- +cgit v0.10.2 \ No newline at end of file diff --git a/network/chat/telepathy-qt5/pspec.xml b/network/chat/telepathy-qt5/pspec.xml index 9cacea8790..6909294d67 100644 --- a/network/chat/telepathy-qt5/pspec.xml +++ b/network/chat/telepathy-qt5/pspec.xml @@ -16,7 +16,9 @@ http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.6.tar.gz cmake + qt5-doc qt5-base-devel + qt5-assistant-devel gobject-introspection-devel dbus-glib-devel libxml2-devel @@ -25,7 +27,7 @@ doxygen - + gstreamer-1.6.patch glibc-2.20.patch @@ -52,6 +54,8 @@ telepathy-qt5 qt5-base-devel + telepathy-glib-devel + telepathy-farstream-devel /usr/include @@ -61,7 +65,7 @@ - 2015-08-20 + 2016-03-30 0.9.6 First release Alihan Öztürk diff --git a/network/voip/farstream/actions.py b/network/voip/farstream/actions.py index c83d0956e8..b89981cded 100644 --- a/network/voip/farstream/actions.py +++ b/network/voip/farstream/actions.py @@ -9,16 +9,15 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): - autotools.autoreconf("-fi") + #autotools.autoreconf("-fi") autotools.configure("--prefix=/usr \ - --disable-static \ --with-html-dir=/%s/%s/html \ --with-package-name='PisiLinux farstream package' \ --with-package-origin='http://www.pisilinux.org'" % (get.docDIR(), get.srcNAME())) def build(): - autotools.make("-j1") + autotools.make() def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/network/voip/farstream/pspec.xml b/network/voip/farstream/pspec.xml index 2295a95d22..d002ec9394 100644 --- a/network/voip/farstream/pspec.xml +++ b/network/voip/farstream/pspec.xml @@ -16,14 +16,12 @@ http://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.7.tar.gz libnice-devel + valgrind + gobject-introspection-devel gstreamer-next-devel gstreamer-devel gst-plugins-base-next-devel - - - - @@ -51,7 +49,8 @@ Development files for farstream farstream - gstreamer-devel + gstreamer-next-devel + gst-plugins-base-next-devel /usr/include @@ -61,7 +60,7 @@ - 2015-10-27 + 2016-03-30 0.2.7 First release Alihan Öztürk