Overview

Request 215 (accepted)

fix build on 12.1 and later

Submit package home:seife:...:Multimedia / openmovieeditor to package Multimedia / openmovieeditor

openmovieeditor.changes Changed
x
 
1
@@ -1,4 +1,16 @@
2
 -------------------------------------------------------------------
3
+Sat May 19 10:03:01 UTC 2012 - seife+obs@b1-systems.com
4
+
5
+- add a missing include to fix build with gcc 4.7
6
+- add "BuildRequires: autoconf automake libtool" to fix >12.1 build
7
+
8
+-------------------------------------------------------------------
9
+Thu May 17 19:49:59 UTC 2012 - seife+obs@b1-systems.com
10
+
11
+- fix build on 12.1+ by adding -fpermissive for newer c++ compiler
12
+  and changing short* to int* for changed(?) fltk interface
13
+
14
+-------------------------------------------------------------------
15
 Thu Sep 22 18:33:15 UTC 2011 - malcolmlewis@opensuse.org
16
 
17
 - Initial build
18
openmovieeditor.spec Changed
27
 
1
@@ -19,6 +19,12 @@
2
 Patch0:         openmovieeditor-fix-gcc45-errors.patch
3
 # PATCH-FIX-OPENSUSE openmovieeditor-non-fatal-libquicktime.patch malcolmlewis@opensuse.org -- Don't fail if libquicktime lacks lame and x264.
4
 Patch1:         openmovieeditor-non-fatal-libquicktime.patch
5
+Patch2:         openmovieeditor-fpermissive.patch
6
+Patch3:         openmovieeditor-fltk-fix.patch
7
+Patch4:         openmovieeditor-fix-gcc47-includes.patch
8
+BuildRequires:  autoconf
9
+BuildRequires:  automake
10
+BuildRequires:  libtool
11
 BuildRequires:  fltk-devel
12
 BuildRequires:  gcc-c++
13
 BuildRequires:  glib2-devel
14
@@ -42,6 +48,12 @@
15
 %setup -q
16
 %patch0
17
 %patch1
18
+%patch2 -p1
19
+%if 0%{?suse_version} > 1200
20
+# fltk seems to have changed an interface from short* to int* in the 12.1 version
21
+%patch3 -p1
22
+%endif
23
+%patch4 -p1
24
 
25
 %build
26
 autoreconf -fi
27
openmovieeditor-fix-gcc47-includes.patch Added
18
 
1
@@ -0,0 +1,16 @@
2
+Index: b/src/DiskCache.cxx
3
+===================================================================
4
+--- a/src/DiskCache.cxx
5
++++ b/src/DiskCache.cxx
6
+@@ -21,10 +21,11 @@
7
+ 
8
+ #include <cstdio>
9
+ #include <cassert>
10
+ #include <sys/types.h>
11
+ #include <sys/stat.h>
12
++#include <unistd.h>
13
+ #include <cerrno>
14
+ #include <cstring>
15
+ 
16
+ #include "DiskCache.H"
17
+ #include "globals.H"
18
openmovieeditor-fltk-fix.patch Added
47
 
1
@@ -0,0 +1,45 @@
2
+Index: b/src/Fl_Split.cpp
3
+===================================================================
4
+--- a/src/Fl_Split.cpp
5
++++ b/src/Fl_Split.cpp
6
+@@ -36,11 +36,11 @@
7
+ // Drag the edges that were initially at oldx,oldy to newx,newy:
8
+ // pass zero as oldx or oldy to disable drag in that direction:
9
+ 
10
+ void Fl_Split::position(int oix, int oiy, int newx, int newy) {
11
+   Fl_Widget*const* a = array();
12
+-  short* p = sizes();
13
++  int* p = sizes();
14
+   p += 8; // skip group & resizable's saved size
15
+   for (int i=children(); i--; p += 4) {
16
+     Fl_Widget* o = *a++;
17
+     if (o == resizable()) continue;
18
+     int X = o->x();
19
+@@ -86,11 +86,11 @@ void Fl_Split :: resize(int X,int Y,int
20
+       o->resize(o->x()+dx, o->y()+dy, o->w(), o->h()); 
21
+     }
22
+     return;
23
+   }
24
+ 
25
+-  short* p = sizes();
26
++  int* p = sizes();
27
+   // resize this (skip the Fl_Group resize):
28
+   Fl_Widget::resize(X,Y,W,H);
29
+ 
30
+   // find bottom-right of resizable:
31
+   int OR = p5;
32
+@@ -153,12 +153,12 @@ int Fl_Split::handle(int event)
33
+         int mindx = GRABAREA*2;
34
+         int mindy = GRABAREA*2;
35
+         int oldx = 0;
36
+         int oldy = 0;
37
+         Fl_Widget*const* a = array();
38
+-        short* q = sizes();
39
+-        short* p = q+8;
40
++        int* q = sizes();
41
++        int* p = q+8;
42
+         //printf("cursor(%d,%d)\n", mx,my);
43
+         for (int i=children(); i--; p += 4) {
44
+             Fl_Widget* o = *a++;
45
+             if (o == resizable()) 
46
+                 continue;
47
openmovieeditor-fpermissive.patch Added
18
 
1
@@ -0,0 +1,16 @@
2
+Index: b/src/Makefile.am
3
+===================================================================
4
+--- a/src/Makefile.am
5
++++ b/src/Makefile.am
6
+@@ -13,10 +13,11 @@ SUBDIRS = tinyxml timeline ProgressDialo
7
+           RenderDialog
8
+ 
9
+ EXTRA_DIST = nle.fl FilterItemWidget.fl SaveAsDialog.fl
10
+ #AM_CPPFLAGS = -ggdb -Wall -Werror @CPPFLAGS@ -I$(top_srcdir)/icons -I$(top_srcdir)/src -I$(top_srcdir)/src/tinyxml -I$(top_srcdir)/src/sl
11
+ AM_CPPFLAGS =  -D__STDC_CONSTANT_MACROS -ggdb -DINSTALL_PREFIX="\"$(prefix)\"" -I$(top_srcdir)/icons -I$(top_srcdir)/src -I$(top_srcdir)/src/tinyxml -I$(top_srcdir)/src/sl @CPPFLAGS@
12
++AM_CXXFLAGS = -fpermissive
13
+ 
14
+ bin_PROGRAMS = openmovieeditor
15
+ openmovieeditor_LDADD = tinyxml/libtinyxml.a timeline/libtimeline.a\
16
+   ProgressDialog/libProgressDialog.a\
17
+   sl/libsl.a\
18
Refresh
Refresh
Request History
Stefan Seyfried's avatar

seife created request over 11 years ago

fix build on 12.1 and later


Stefan Seyfried's avatar

seife accepted request almost 13 years ago

fix build on 12.1 and later