Changes of Revision 22

View file
obs-studio.changes Changed
​x
 
1
@@ -1,4 +1,12 @@
2
 -------------------------------------------------------------------
3
+Thu Jan 28 00:21:55 UTC 2016 - jimmy@boombatower.com
4
+
5
+- Update to 0.13.0 release.
6
+  https://github.com/jp9000/obs-studio/releases/tag/0.13.0
7
+- Add rpmlintrc for "bad" things obs-studio requires.
8
+- Add patch for gcc 4.8 compatability.
9
+
10
+-------------------------------------------------------------------
11
 Sat Dec 12 04:25:45 UTC 2015 - jimmy@boombatower.com
12
13
 - Update to 0.12.4 release.
14
​
View file
obs-studio.spec Changed
24
 
1
@@ -1,5 +1,5 @@
2
 Name:           obs-studio
3
-Version:        0.12.4+git20151211.2c8887b
4
+Version:        0.13.0+git20160127.514b59c
5
 Release:        0
6
 Summary:        A recording/broadcasting program
7
8
@@ -7,6 +7,7 @@
9
 License:        GPL-2.0
10
 URL:            https://obsproject.com/
11
 Source:         %{name}-%{version}.tar.xz
12
+Patch0:         0001-UI-Fix-GCC-4.8-compilation-issue.patch
13
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-build
14
15
 BuildRequires:  cmake >= 2.8.12
16
@@ -43,6 +44,7 @@
17
18
 %prep
19
 %setup -q
20
+%patch0 -p1
21
22
 %build
23
 mkdir -p build && cd build
24
​
View file
0001-UI-Fix-GCC-4.8-compilation-issue.patch Added
40
 
1
@@ -0,0 +1,38 @@
2
+From 8593c4bacd4b22b1503a0f1fedfc7cea17bf537c Mon Sep 17 00:00:00 2001
3
+From: boombatower <jimmy@boombatower.com>
4
+Date: Fri, 29 Jan 2016 13:58:45 -0600
5
+Subject: [PATCH] UI: Fix GCC 4.8 compilation issue
6
+
7
+Apparently using QPointer container for the QObject being given to the
8
+connect function makes it so it can't find the actual function to use.
9
+I'm guessing this is incomplete functionality or a bug that existed in
10
+GCC 4.8.  Doesn't happen in 4.9+.
11
+---
12
+ obs/window-basic-main-transitions.cpp | 4 ++--
13
+ 1 file changed, 2 insertions(+), 2 deletions(-)
14
+
15
+diff --git a/obs/window-basic-main-transitions.cpp b/obs/window-basic-main-transitions.cpp
16
+index bf49eb8..e230fab 100644
17
+--- a/obs/window-basic-main-transitions.cpp
18
++++ b/obs/window-basic-main-transitions.cpp
19
+@@ -407,7 +407,7 @@ void OBSBasic::CreateProgramDisplay()
20
+           ResizeProgram(ovi.base_width, ovi.base_height);
21
+   };
22
+
23
+-  connect(program, &OBSQTDisplay::DisplayResized,
24
++  connect(program.data(), &OBSQTDisplay::DisplayResized,
25
+           displayResize);
26
+
27
+   auto addDisplay = [this] (OBSQTDisplay *window)
28
+@@ -420,7 +420,7 @@ void OBSBasic::CreateProgramDisplay()
29
+           ResizeProgram(ovi.base_width, ovi.base_height);
30
+   };
31
+
32
+-  connect(program, &OBSQTDisplay::DisplayCreated, addDisplay);
33
++  connect(program.data(), &OBSQTDisplay::DisplayCreated, addDisplay);
34
+
35
+   program->setSizePolicy(QSizePolicy::Expanding,
36
+           QSizePolicy::Expanding);
37
+--
38
+2.7.0
39
+
40
​
View file
_service Changed
10
 
1
@@ -1,7 +1,7 @@
2
 <services>
3
   <service name="tar_scm" mode="disabled">
4
     <param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
5
-    <param name="revision">refs/tags/0.12.4</param>
6
+    <param name="revision">refs/tags/0.13.0</param>
7
     <param name="url">git://github.com/jp9000/obs-studio.git</param>
8
     <param name="scm">git</param>
9
   </service>
10
​
View file
obs-studio-0.12.4+git20151211.2c8887b.tar.xz Deleted
View file
obs-studio-0.13.0+git20160127.514b59c.tar.xz Added
View file
obs-studio-rpmlintrc Added
8
 
1
@@ -0,0 +1,6 @@
2
+# This line is mandatory to access the configuration functions
3
+from Config import *
4
+
5
+# TODO: Need to determine if these files are still required to be this way.
6
+addFilter("devel-file-in-non-devel-package.*/usr/lib64/libobs-opengl.so")
7
+addFilter("arch-dependent-file-in-usr-share.*/usr/share/obs/obs-plugins/obs-ffmpeg/ffmpeg-mux")
8
​
Locations
Help
Contact