forked from pool/farstream
Accepting request 795017 from GNOME:Next
Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/795017 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/farstream?expand=0&rev=38
This commit is contained in:
Git OBS Bridge
parent
f4177c8dd9
commit
cc33730cd0
6
_service
6
_service
@ -3,9 +3,11 @@
|
||||
<service name="obs_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://gitlab.freedesktop.org/farstream/farstream.git</param>
|
||||
<param name="revision">092d884d</param>
|
||||
<param name="revision">46d7b108</param>
|
||||
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
|
||||
</service>
|
||||
<param name="versionrewrite-pattern">(.*)\+0</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
</service>
|
||||
<service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="file">*.tar</param>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c1c286655b0d74475daf9f6b338086e82a41c659ef5c0263dc9e6edac1cd64c1
|
||||
size 2553356
|
||||
3
farstream-0.2.9+4.obscpio
Normal file
3
farstream-0.2.9+4.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0c5ce6e2117df553065726969a6c9965c96732962e488f7a25977bb4f74c3cc5
|
||||
size 2554380
|
||||
@ -1,33 +0,0 @@
|
||||
From 573e29a3f6b379c1bd1dba8c73c65a5f885176a0 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Becker <chemobejk@gmail.com>
|
||||
Date: Thu, 4 Jul 2019 10:54:03 +0300
|
||||
Subject: [PATCH] configure: add check for glib-mkenums
|
||||
|
||||
This fixes build failure for latest source with autoconf. Add the check
|
||||
glib-mkenums and definition of GLIB_MKENUMS to configure.ac
|
||||
|
||||
Fixes #16
|
||||
---
|
||||
configure.ac | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 31be2770..431aa2da 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -264,6 +264,12 @@ FS_PREFIX="`$PKG_CONFIG --variable=prefix farstream-$FS_APIVERSION`"
|
||||
AC_SUBST(GLIB_PREFIX)
|
||||
AC_SUBST(FS_PREFIX)
|
||||
|
||||
+dnl Check for glib-2.0 tools
|
||||
+AC_MSG_CHECKING([for glib-mkenums])
|
||||
+GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`"
|
||||
+AC_SUBST(GLIB_MKENUMS)
|
||||
+AC_MSG_RESULT($GLIB_MKENUMS)
|
||||
+
|
||||
dnl *** set variables based on configure arguments ***
|
||||
|
||||
dnl set license and copyright notice
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 59b20c54317b4b934ef193863602e4965bb6e343 Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Adam <jakub.adam@collabora.com>
|
||||
Date: Wed, 15 Jan 2020 15:01:51 +0100
|
||||
Subject: [PATCH] Fix build with GStreamer 1.16
|
||||
|
||||
gst_clear_mini_object() macro introduced in GStreamer 1.16 references
|
||||
g_clear_pointer() defined in GLib 2.34. Bump GLIB_VERSION_MAX_ALLOWED
|
||||
accordingly to avoid FTBFS when compiling with -Werror.
|
||||
---
|
||||
configure.ac | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 31be2770..9bf5646f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -242,7 +242,8 @@ dnl *** checks for dependency libraries ***
|
||||
dnl GLib is required
|
||||
AG_GST_GLIB_CHECK([2.32])
|
||||
AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_32, [Ignore post 2.32 deprecations])
|
||||
-AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_32, [Prevent post 2.32 APIs])
|
||||
+dnl 2.34 APIs needed due to g_clear_pointer referenced in GStreamer headers since 1.16
|
||||
+AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_34, [Prevent post 2.34 APIs])
|
||||
|
||||
|
||||
PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.32, [HAVE_GIO_UNIX=true],[HAVE_GIO_UNIX=false])
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From aa9603c6ca6055499fa5b3dcd8eb9c6cb060c86e Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Wed, 22 Jan 2020 12:42:57 +0100
|
||||
Subject: [PATCH] autotools: Fix build with make-4.3
|
||||
|
||||
make-4.3 introduced an incompatible change where \# is no longer necessary
|
||||
inside of macro references in order to get a literal hash character.
|
||||
|
||||
The provided fix keeps compatibility with both make-4.3 and older make
|
||||
releases
|
||||
|
||||
Gentoo-bug: https://bugs.gentoo.org/706080
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
---
|
||||
common-modified/gst-glib-gen.mak | 4 +++-
|
||||
farstream/Makefile.am | 4 +++-
|
||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
|
||||
index 14f1ba37..69ef0273 100644
|
||||
--- a/common-modified/gst-glib-gen.mak
|
||||
+++ b/common-modified/gst-glib-gen.mak
|
||||
@@ -1,12 +1,14 @@
|
||||
# these are the variables your Makefile.am should set
|
||||
# the example is based on the colorbalance interface
|
||||
|
||||
+H := \#
|
||||
+
|
||||
#glib_enum_headers=$(colorbalance_headers)
|
||||
#glib_enum_define=GST_COLOR_BALANCE
|
||||
#glib_gen_prefix=gst_color_balance
|
||||
#glib_gen_basename=colorbalance
|
||||
|
||||
-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
|
||||
+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
|
||||
|
||||
# these are all the rules generating the relevant files
|
||||
$(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
|
||||
diff --git a/farstream/Makefile.am b/farstream/Makefile.am
|
||||
index e6b509c1..ddf03a0b 100644
|
||||
--- a/farstream/Makefile.am
|
||||
+++ b/farstream/Makefile.am
|
||||
@@ -69,11 +69,13 @@ public_headers = fs-candidate.h \
|
||||
fs-conference.h \
|
||||
fs-utils.h
|
||||
|
||||
+H := \#
|
||||
+
|
||||
glib_enum_headers=$(public_headers)
|
||||
glib_enum_define=FS
|
||||
glib_gen_prefix=_fs
|
||||
glib_gen_basename=fs
|
||||
-glib_gen_decl_include=\#include <glib-object.h>
|
||||
+glib_gen_decl_include=$(H)include <glib-object.h>
|
||||
|
||||
include $(top_srcdir)/common-modified/gst-glib-gen.mak
|
||||
|
||||
--
|
||||
2.25.0
|
||||
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 12 21:01:17 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to 2.4.9+4:
|
||||
+ nice agent: keep the main context alive until the agent is
|
||||
destroyed.
|
||||
+ configure: add check for glib-mkenums.
|
||||
+ build: Adapt to backwards incompatible change in GNU Make 4.3.
|
||||
- Following this, drop upstream fixed patches:
|
||||
+ farstream-add-check-for-glib-mkenums.patch
|
||||
+ farstream-fix-make43.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 12 10:10:03 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 0.2.9:
|
||||
+ Add OPUS specific SDP OA negotiation to match RFC.
|
||||
+ Switch VP8 to standard encoding name.
|
||||
+ Removed MSN plugin, MSN Messenger is long dead.
|
||||
+ Port away from deprecated libnice signals.
|
||||
+ Bug fixes.
|
||||
- Drop farstream-fix-build-gst116.patch: Fixed differently
|
||||
upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 4 13:50:58 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: farstream
|
||||
version: 0.2.8+30
|
||||
mtime: 1541113066
|
||||
commit: 092d884da4c91967692dcaddaf583413a39d59d4
|
||||
version: 0.2.9+4
|
||||
mtime: 1584023844
|
||||
commit: 46d7b108179b477a00464fc47dc8aa1c6389ee03
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%define gst_pluginsdir %(pkg-config --variable pluginsdir gstreamer-1.0)
|
||||
Name: farstream
|
||||
Version: 0.2.8+30
|
||||
Version: 0.2.9+4
|
||||
Release: 0
|
||||
# License note: the only GPL-2.0+ files are farstream-0.1.1/common/coverage/*
|
||||
# and common/gstdoc-scangobj; those are just used during the build and do not
|
||||
@ -32,12 +32,6 @@ Source1: baselibs.conf
|
||||
|
||||
# PATCH-FEATURE-OPENSUSE farstream-plugin-path.patch fcrozat@suse.com -- Use library policy compliant path for plugin
|
||||
Patch0: farstream-plugin-path.patch
|
||||
# PATCH-FIX-UPSTREAM farstream-fix-build-gst116.patch -- Fix build with gstreamer 1.16.x
|
||||
Patch1: farstream-fix-build-gst116.patch
|
||||
# PATCH-FIX-UPSTREAM farstream-add-check-for-glib-mkenums.patch -- Fix autoconf build failure for glib-mkenums
|
||||
Patch2: farstream-add-check-for-glib-mkenums.patch
|
||||
# PATCH-FIX-UPSTREAM farstream-fix-make43.patch -- Fix build with make-4.3
|
||||
Patch3: farstream-fix-make43.patch
|
||||
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: glib2-devel >= 2.32
|
||||
@ -47,7 +41,7 @@ BuildRequires: gtk-doc
|
||||
#needed by patch0
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.16
|
||||
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.40
|
||||
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.4
|
||||
BuildRequires: pkgconfig(gupnp-igd-1.0) >= 0.2
|
||||
BuildRequires: pkgconfig(nice) >= 0.1.8
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user