Skip to content

Commit

Permalink
#1267: default to gstreamer 0.10 on centos 7.0 and 7.1 as this seems …
Browse files Browse the repository at this point in the history
…to have a better chance of working

git-svn-id: https://xpra.org/svn/Xpra/trunk@13194 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Aug 3, 2016
1 parent e2bfbc0 commit 6e4727e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
3 changes: 3 additions & 0 deletions rpmbuild/xpra.spec
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ Vendor: http://xpra.org/
Source: xpra-%{version}.tar.bz2
Patch0: centos-ignore-invalid-gcc-warning.patch
Patch1: centos7-buffer-fill-fix.patch
Patch2: gstreamer010.patch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root

Requires: python %{requires_opengl} %{requires_sound} %{requires_lzo} %{requires_websockify} %{requires_printing} %{requires_webcam}
Expand Down Expand Up @@ -301,9 +302,11 @@ cd $RPM_BUILD_DIR/xpra-%{version}
#workaround old gstreamer gi bindings on centos < 7.2:
%if "%{?dist}"==".el7_0"
%patch1 -p1
%patch2 -p1
%endif
%if "%{?dist}"==".el7_1"
%patch1 -p1
%patch2 -p1
%endif
mv $RPM_BUILD_DIR/xpra-%{version} $RPM_BUILD_DIR/xpra-%{version}-python2
%if %{with_python3}
Expand Down
13 changes: 13 additions & 0 deletions src/patches/gstreamer010.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Index: xpra/sound/gstreamer_util.py
===================================================================
--- a/xpra/sound/gstreamer_util.py (revision 13108)
+++ b/xpra/sound/gstreamer_util.py (working copy)
@@ -45,7 +45,7 @@
OSX = sys.platform.startswith("darwin")

ALLOW_SOUND_LOOP = os.environ.get("XPRA_ALLOW_SOUND_LOOP", "0")=="1"
-GSTREAMER1 = os.environ.get("XPRA_GSTREAMER1", "1")=="1"
+GSTREAMER1 = os.environ.get("XPRA_GSTREAMER1", "0")=="1"
PULSEAUDIO_DEVICE_NAME = os.environ.get("XPRA_PULSEAUDIO_DEVICE_NAME", "")
USE_DEFAULT_DEVICE = os.environ.get("XPRA_USE_DEFAULT_DEVICE", "1")=="1"
def force_enabled(codec_name):

0 comments on commit 6e4727e

Please sign in to comment.