[libopenshot-audio] Completely remove Xinerama dependency
commit 5960adb3864cd316a9cbc8b120b6e86744dfce57
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Sep 24 03:17:47 2018 -0400
Completely remove Xinerama dependency
libopenshot-audio-0.0.3-libs.patch | 12 ------------
libopenshot-audio-noXinerama.patch | 26 ++++++++++++++++++++++++++
libopenshot-audio.spec | 4 ++--
3 files changed, 28 insertions(+), 14 deletions(-)
---
diff --git a/libopenshot-audio-noXinerama.patch b/libopenshot-audio-noXinerama.patch
new file mode 100644
index 0000000..fe7fd03
--- /dev/null
+++ b/libopenshot-audio-noXinerama.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e0e2433..cd3e0fa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -132,7 +132,7 @@ ELSE (WIN32)
+ INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
+ INCLUDE_DIRECTORIES(/usr/include/freetype2)
+ ADD_DEFINITIONS(-DLINUX)
+- SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES ${X11_LIBRARIES} asound freetype Xinerama)
++ SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES ${X11_LIBRARIES} asound freetype)
+ ENDIF(APPLE)
+ ENDIF(UNIX)
+ ENDIF(WIN32)
+diff --git a/JuceLibraryCode/AppConfig.h b/JuceLibraryCode/AppConfig.h
+index 16bebe0..78a392a 100644
+--- a/JuceLibraryCode/AppConfig.h
++++ b/JuceLibraryCode/AppConfig.h
+@@ -17,7 +17,7 @@
+ //==============================================================================
+ // [BEGIN_USER_CODE_SECTION]
+
+-// (You can add your own code in this section, and the Introjucer will not overwrite
it)
++#define JUCE_USE_XINERAMA 0
+
+ // [END_USER_CODE_SECTION]
+
diff --git a/libopenshot-audio.spec b/libopenshot-audio.spec
index 96cca8b..eb2760a 100644
--- a/libopenshot-audio.spec
+++ b/libopenshot-audio.spec
@@ -7,7 +7,7 @@ License: GPLv3+
URL: http://openshot.org/
Source0:
https://github.com/OpenShot/%{name}/archive/v%{version}/%{name}-%{version...
-Patch0: libopenshot-audio-0.0.3-libs.patch
+Patch0: libopenshot-audio-noXinerama.patch
Patch1: libopenshot-audio-isfinite.patch
BuildRequires: gcc-c++
@@ -15,7 +15,6 @@ BuildRequires: cmake
BuildRequires: freetype-devel
BuildRequires: alsa-lib-devel
BuildRequires: libX11-devel
-BuildRequires: libXinerama-devel
BuildRequires: libXcursor-devel
BuildRequires: libXrandr-devel
@@ -70,6 +69,7 @@ make %{?_smp_mflags}
%changelog
* Mon Sep 24 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.1.7-1
- New upstream release
+- Update patch to completely remove Xinerama dependency
* Tue Jul 31 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.1.6-1
- New upstream release