Commit 283edfd1 authored by Xuetian Weng's avatar Xuetian Weng
Browse files

update telepathy-qt

parent e6cdab66
# maintainer abveritas@chakra-project.org
pkgname=telepathy-qt
pkgver=0.9.4
pkgrel=5
pkgver=0.9.5
pkgrel=1
pkgdesc="A library for Qt-based Telepathy clients."
arch=('x86_64')
url="http://telepathy.freedesktop.org"
......@@ -10,20 +10,16 @@ groups=('telepathy')
license=('LGPL')
depends=('qt' 'telepathy-farstream' 'python2-dbus')
makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
options=('staticlibs')
conflicts=('telepathy-qt4')
provides=('telepathy-qt4')
source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
"farstream-0.2.patch"
"gstreamer1.patch")
sha256sums=('f1b1db3a9f96ece92df430a8de4d30317f4c58a06fe99e82cc2c6875791e61f2'
'5eb39f16b3988f0b50da29a64838af36e96aec38a1e9353a22242eec76ec0f8a')
source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz")
sha256sums=('93474858efe55bf45ee9352f88b852d4a24505939dc81a3a3c6fa5a686809c8e')
prepare() {
mkdir build
cd ${pkgname}-${pkgver}
patch -p1 -i "${srcdir}"/farstream-0.2.patch
patch -p1 -i "${srcdir}"/gstreamer1.patch
}
build() {
......@@ -39,6 +35,3 @@ package() {
cd "${srcdir}"/build
make DESTDIR="$pkgdir" install
}
sha256sums=('f1b1db3a9f96ece92df430a8de4d30317f4c58a06fe99e82cc2c6875791e61f2'
'5eb39f16b3988f0b50da29a64838af36e96aec38a1e9353a22242eec76ec0f8a'
'f4a9272fdfbe29b41645e5c63f6dada764b3eb9c8eaa4f46cd1ec75f9266e828')
diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake
--- telepathy-qt/cmake/modules/FindFarstream.cmake 2012-04-25 22:14:22.275967164 +0200
+++ new/cmake/modules/FindFarstream.cmake 2012-10-07 12:19:46.543103512 +0200
@@ -23,9 +23,9 @@
# in the find_path() and find_library() calls
find_package(PkgConfig)
if (FARSTREAM_MIN_VERSION)
- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION})
+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
else (FARSTREAM_MIN_VERSION)
- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1)
+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
endif (FARSTREAM_MIN_VERSION)
set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
endif (NOT WIN32)
@@ -34,10 +34,10 @@
PATHS
${PC_FARSTREAM_INCLUDEDIR}
${PC_FARSTREAM_INCLUDE_DIRS}
- PATH_SUFFIXES farstream-0.1
+ PATH_SUFFIXES farstream-0.2
)
-find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1
+find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
PATHS
${PC_FARSTREAM_LIBDIR}
${PC_FARSTREAM_LIBRARY_DIRS}
From 5bb2ac31805de9710a66f2fa3faf35ce64983f30 Mon Sep 17 00:00:00 2001
From: Alin Elena <alinm.elena@gmail.com>
Date: Wed, 29 Jan 2014 11:53:48 +0100
Subject: [PATCH 2/2] Update FindGStreamer0.10 -> FindGStreamer1.0
Reviewed-by: David Edmundson
---
cmake/modules/FindGStreamer.cmake | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
index f6c5681..63fb41c 100644
--- a/cmake/modules/FindGStreamer.cmake
+++ b/cmake/modules/FindGStreamer.cmake
@@ -24,7 +24,7 @@ IF (NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
FIND_PACKAGE(PkgConfig)
- PKG_CHECK_MODULES(PC_GSTREAMER gstreamer-0.10)
+ PKG_CHECK_MODULES(PC_GSTREAMER gstreamer-1.0)
#MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}")
#MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}")
#MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}")
@@ -35,26 +35,21 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
PATHS
${PC_GSTREAMER_INCLUDEDIR}
${PC_GSTREAMER_INCLUDE_DIRS}
- PATH_SUFFIXES gstreamer-0.10
+ PATH_SUFFIXES gstreamer-1.0
)
-FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10
+FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
PATHS
${PC_GSTREAMER_LIBDIR}
${PC_GSTREAMER_LIBRARY_DIRS}
)
-FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10
+FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0
PATHS
${PC_GSTREAMER_LIBDIR}
${PC_GSTREAMER_LIBRARY_DIRS}
)
-FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10
- PATHS
- ${PC_GSTREAMER_LIBDIR}
- ${PC_GSTREAMER_LIBRARY_DIRS}
- )
IF (GSTREAMER_INCLUDE_DIR)
#MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}")
@@ -68,13 +63,8 @@ ELSE (GSTREAMER_LIBRARIES)
MESSAGE(STATUS "GStreamer: WARNING: library not found")
ENDIF (GSTREAMER_LIBRARIES)
-IF (GSTREAMER_INTERFACE_LIBRARY)
- #MESSAGE(STATUS "DEBUG: Found GStreamer interface library: ${GSTREAMER_INTERFACE_LIBRARY}")
-ELSE (GSTREAMER_INTERFACE_LIBRARY)
- MESSAGE(STATUS "GStreamer: WARNING: interface library not found")
-ENDIF (GSTREAMER_INTERFACE_LIBRARY)
INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)
-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)
--
1.8.3.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment