Accepting request 323264 from GNOME:Apps

Follow pidgin port to gst-1.0

OBS-URL: https://build.opensuse.org/request/show/323264
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin-sipe?expand=0&rev=52
This commit is contained in:
Dominique Leuenberger 2015-08-17 09:52:19 +00:00 committed by Git OBS Bridge
parent 21f4628360
commit c00be3bfd9
3 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,20 @@
diff --git a/configure.ac b/configure.ac
index 1129a18..bbd7371 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,7 +346,11 @@ AS_IF([test "x$enable_purple" != xno],
dnl check whether enable voice and video support
AS_IF([test "x$with_vv" = xno], [], dnl disabled by user
[test "x$with_vv" = xcheck], dnl autodetect
- [AC_MSG_CHECKING(for purple voice and video support)
+ [dnl Let purple pkgconfig correct our assumptions about GStreamer
+ purple_gst=`$PKG_CONFIG --variable=gstreamer $purple_pkgconfig`
+ AS_IF([test "x$purple_gst" != "x"],
+ [gstreamer_pkgconfig=gstreamer-$purple_gst])
+ AC_MSG_CHECKING(for purple voice and video support)
AC_RUN_IFELSE(
[AC_LANG_PROGRAM([[
#include <media.h>

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Jun 30 15:14:25 UTC 2015 - dimstar@opensuse.org
- Port to GStreamer 1.0 (follow pidin's port):
+ Add pidgin-sipe-gstreamer-1.0.patch
+ Replace pkgconfig(gstreamer-0.10) BuildRequires with
pkgconfig(gstreamer-1.0).
+ Add autoreconf call, as the patch touches the buildsystem.
+ Pass --with-vv to configure, to ensure we do not lose Voice &
Video support.
-------------------------------------------------------------------
Tue Apr 7 16:35:34 UTC 2015 - dimstar@opensuse.org

View File

@ -26,6 +26,8 @@ License: GPL-2.0+
Group: Productivity/Networking/Instant Messenger
Url: http://sipe.sourceforge.net/
Source: http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.19.1/%{name}-%{version}.tar.xz
# PATCH-FEATURE-UPSTREAM pidgin-sipe-gstreamer-1.0.patch dimstar@opensuse.org -- Read the GStreamer branch to be used from purple.pc; taken from https://pidgin.im/pipermail/devel/2015-March/023647.html
Patch0: pidgin-sipe-gstreamer-1.0.patch
BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 2.12.0
BuildRequires: gmime-devel
@ -38,7 +40,7 @@ BuildRequires: pidgin
BuildRequires: translation-update-upstream
%if 0%{?suse_version} > 1140
# Put gstreamer in the %%if too, since it's only checked if we have libnice
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(nice) >= 0.1.0
%endif
BuildRequires: pkgconfig(nss)
@ -95,13 +97,16 @@ various products:
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build
%{?env_options}
autoreconf -fiv
%configure \
--with-krb5 \
--enable-purple \
--with-vv \
%if %{build_telepathy}
--enable-telepathy
%else