[telepathy-qt4] build against farstream 0.2 and GStreamer 1 on F21+ (#1092654)
Kevin Kofler
kkofler at fedoraproject.org
Wed Jul 23 16:47:33 UTC 2014
commit cbe923a8d94d8b4b3310918004e3b5e25e8383c5
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Wed Jul 23 18:47:20 2014 +0200
build against farstream 0.2 and GStreamer 1 on F21+ (#1092654)
* Wed Jul 23 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.3.1-0.3.20140403git0191a6dd
- build against farstream 0.2 and GStreamer 1 on F21+ (#1092654)
telepathy-qt-0.9.3-farstream02.patch | 41 +++++++++++++++++++
telepathy-qt-0.9.3-gstreamer1.patch | 72 ++++++++++++++++++++++++++++++++++
telepathy-qt4.spec | 45 +++++++++++++++++----
3 files changed, 150 insertions(+), 8 deletions(-)
---
diff --git a/telepathy-qt-0.9.3-farstream02.patch b/telepathy-qt-0.9.3-farstream02.patch
new file mode 100644
index 0000000..91a927b
--- /dev/null
+++ b/telepathy-qt-0.9.3-farstream02.patch
@@ -0,0 +1,41 @@
+From 47df2f7b2ef8c9a59a909fa558ce08308a2a69c6 Mon Sep 17 00:00:00 2001
+From: Diane Trout <diane at ghic.org>
+Date: Wed, 15 Jan 2014 22:29:00 -0800
+Subject: [PATCH 1/2] start updating TelepathyQt to use newer farstream
+
+---
+ cmake/modules/FindFarstream.cmake | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/FindFarstream.cmake b/cmake/modules/FindFarstream.cmake
+index de42c29..33139c3 100644
+--- a/cmake/modules/FindFarstream.cmake
++++ b/cmake/modules/FindFarstream.cmake
+@@ -23,9 +23,9 @@ if (NOT WIN32)
+ # 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 @@ find_path(FARSTREAM_INCLUDE_DIR farstream/fs-conference.h
+ 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}
+--
+1.8.3.1
+
diff --git a/telepathy-qt-0.9.3-gstreamer1.patch b/telepathy-qt-0.9.3-gstreamer1.patch
new file mode 100644
index 0000000..e920c76
--- /dev/null
+++ b/telepathy-qt-0.9.3-gstreamer1.patch
@@ -0,0 +1,72 @@
+From 5bb2ac31805de9710a66f2fa3faf35ce64983f30 Mon Sep 17 00:00:00 2001
+From: Alin Elena <alinm.elena at 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
+
diff --git a/telepathy-qt4.spec b/telepathy-qt4.spec
index 94ae176..2d4c93b 100644
--- a/telepathy-qt4.spec
+++ b/telepathy-qt4.spec
@@ -1,15 +1,23 @@
%if 0%{?fedora} > 16 || 0%{?rhel} >= 7
-%define farstream 1
+%global farstream 1
%endif
-%define snap 20140403
-%define git_commit 0191a6ddf0c094d9ae61b9ee48f1b282e13a9ef2
-%define git_hash 0191a6dd
+%if 0%{?fedora} > 20 || 0%{?rhel} > 7
+# use Farstream 0.2 and GStreamer 1 on F21+ and RHEL8+
+%global farstream02 1
+# We don't want to use GStreamer 1 where the rest of the Qt 4 stack doesn't,
+# or we run into symbol conflicts. So build against GStreamer 0.10 on Fedora up
+# to 20 and RHEL up to 7. (Up to RHEL 6, GStreamer 0.10 is the only option.)
+%endif
+
+%global snap 20140403
+%global git_commit 0191a6ddf0c094d9ae61b9ee48f1b282e13a9ef2
+%global git_hash 0191a6dd
Name: telepathy-qt4
Version: 0.9.3.1
-Release: 0.2.%{snap}git%{git_hash}%{?dist}
+Release: 0.3.%{snap}git%{git_hash}%{?dist}
Summary: High-level bindings for Telepathy
License: LGPLv2+
@@ -26,26 +34,39 @@ Source0: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{v
# kinda sorta, help find fedora's compat-telepathy-farstream pkg
Patch50: telepathy-qt-0.9.3-farstream_compat.patch
+## upstream patches
+# FindFarstream.cmake: look for farstream 0.2 instead of 0.1 (Diane Trout)
+Patch100: telepathy-qt-0.9.3-farstream02.patch
+# FindGStreamer.cmake: look for GStreamer 1 instead of 0.10 (Alin Elena)
+Patch101: telepathy-qt-0.9.3-gstreamer1.patch
+
Provides: telepathy-qt = %{version}-%{release}
Provides: telepathy-qt%{?_isa} = %{version}-%{release}
BuildRequires: cmake
BuildRequires: dbus-python python2-devel
BuildRequires: doxygen
-BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
BuildRequires: pkgconfig(QtDBus) pkgconfig(QtNetwork) pkgconfig(QtXml)
+%if 0%{?farstream02}
+BuildRequires: pkgconfig(gstreamer-1.0)
+BuildRequires: pkgconfig(farstream-0.2)
+BuildRequires: pkgconfig(telepathy-farstream)
+%else
+BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
%if 0%{?farstream}
BuildRequires: pkgconfig(farstream-0.1)
%if 0%{?fedora} > 17
## make sure to get the *right* telepathy-farstream
-%define compat_telepathy_farstream 1
+%global compat_telepathy_farstream 1
BuildRequires: compat-telepathy-farstream-devel
BuildRequires: pkgconfig(telepathy-farstream-0.4)
%else
BuildRequires: pkgconfig(telepathy-farstream)
%endif
+%endif
+%if 0%{?farstream}
## unit tests
-%define enable_tests -DENABLE_TESTS:BOOL=ON
+%global enable_tests -DENABLE_TESTS:BOOL=ON
BuildRequires: pkgconfig(telepathy-glib) >= 0.19
BuildRequires: pkgconfig(gio-2.0)
%endif
@@ -92,6 +113,11 @@ Provides: telepathy-qt-farstream = %{version}-%{release}
%patch50 -p1 -b .farstream_compat
%endif
+%if 0%{?farstream02}
+%patch100 -p1 -b .farstream02
+%patch101 -p1 -b .gstreamer1
+%endif
+
%build
mkdir -p %{_target_platform}
@@ -144,6 +170,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Wed Jul 23 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.3.1-0.3.20140403git0191a6dd
+- build against farstream 0.2 and GStreamer 1 on F21+ (#1092654)
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3.1-0.2.20140403git0191a6dd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list