Overview

Request 1387 (accepted)

- added patch and dependencies to enable build on ARM CPU
- removed some unneeded dependencies

Submit package home:enzokiel:...hes:Multimedia / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed
x
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Sat Nov 08 2014 - joerg.lorenzen@ki.tng.de
4
+- added patch and dependencies to enable build on ARM CPU
5
+- removed some unneeded dependencies
6
+
7
+-------------------------------------------------------------------
8
 Wed Nov 05 2014 - joerg.lorenzen@ki.tng.de
9
 - update internal ffmpeg to version 1.2.10
10
 
11
avidemux3.spec Changed
149
 
1
@@ -1,7 +1,7 @@
2
 #
3
 # spec file for package avidemux3
4
 #
5
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
6
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
7
 #
8
 # All modifications and additions to the file contributed by third parties
9
 # remain the property of their copyright owners, unless otherwise agreed
10
@@ -34,10 +34,22 @@
11
 Patch2:         avidemux-x264_plugins.patch
12
 Patch3:         avidemux-package_version.patch
13
 Patch4:         avidemux-bootStrap.patch
14
+Patch5:         avidemux-cpu_armel.patch
15
 License:        GPL-2.0
16
 Group:          Productivity/Multimedia/Video/Editors and Convertors
17
 
18
-# Utilities
19
+%ifarch armv6l || armv6hl || armv7l || armv7hl
20
+BuildRequires:  Mesa-libEGL1
21
+BuildRequires:  Mesa-libEGL-devel
22
+BuildRequires:  Mesa-libGLESv1_CM1
23
+BuildRequires:  Mesa-libGLESv1_CM-devel
24
+BuildRequires:  Mesa-libGLESv2-2
25
+BuildRequires:  Mesa-libGLESv2-devel
26
+BuildRequires:  -raspberrypi-userland
27
+BuildRequires:  -raspberrypi-userland-devel
28
+%endif
29
+
30
+# Utilities / Libraries
31
 BuildRequires:  cmake
32
 BuildRequires:  gettext-tools
33
 BuildRequires:  intltool
34
@@ -45,36 +57,23 @@
35
 BuildRequires:  pkg-config
36
 BuildRequires:  fdupes
37
 BuildRequires:  dos2unix
38
+BuildRequires:  yasm
39
+BuildRequires:  pkgconfig(fribidi)
40
 BuildRequires:  pkgconfig(libxslt)
41
-%if 0%{?sles_version}
42
-BuildRequires:  sqlite-devel
43
-%else
44
-BuildRequires:  pkgconfig(sqlite3)
45
-%endif
46
-
47
-# Libraries
48
-BuildRequires:  yasm-devel
49
 BuildRequires:  pkgconfig(libxml-2.0)
50
+BuildRequires:  pkgconfig(xmu)
51
 BuildRequires:  pkgconfig(fontconfig)
52
 BuildRequires:  pkgconfig(freetype2)
53
-%if 0%{?suse_version} > 1140
54
-BuildRequires:  pkgconfig(mozjs185)
55
-%else
56
 %if 0%{?sles_version}
57
-BuildRequires:  mozilla-xulrunner192-devel
58
+BuildRequires:  sqlite-devel
59
 %else
60
-BuildRequires:  pkgconfig(mozilla-js) >= 2.0
61
-%endif
62
+BuildRequires:  pkgconfig(sqlite3)
63
 %endif
64
-BuildRequires:  pkgconfig(xv)
65
-BuildRequires:  pkgconfig(xmu)
66
-BuildRequires:  pkgconfig(samplerate)
67
-BuildRequires:  pkgconfig(jack)
68
-BuildRequires:  pkgconfig(libass)
69
 
70
 # Sound out
71
 BuildRequires:  arts-devel
72
 BuildRequires:  pkgconfig(alsa)
73
+BuildRequires:  pkgconfig(jack)
74
 BuildRequires:  pkgconfig(libpulse)
75
 %if 0%{?sles_version}
76
 BuildRequires:  libesd-devel
77
@@ -87,6 +86,7 @@
78
 BuildRequires:  pkgconfig(gl)
79
 BuildRequires:  pkgconfig(glu)
80
 BuildRequires:  pkgconfig(vdpau)
81
+BuildRequires:  pkgconfig(xv)
82
 ## newer version of libav are not compatible to avidemux
83
 %if 0%{?suse_version} < 1310
84
 BuildRequires:  pkgconfig(libva)
85
@@ -97,6 +97,8 @@
86
 BuildRequires:  libfaad-devel
87
 BuildRequires:  libmp3lame-devel
88
 BuildRequires:  libaften-devel
89
+BuildRequires:  pkgconfig(ogg)
90
+BuildRequires:  pkgconfig(samplerate)
91
 %if 0%{?sles_version}
92
 BuildRequires:  liba52-devel
93
 BuildRequires:  libmad-devel
94
@@ -116,10 +118,10 @@
95
 BuildRequires:  pkgconfig(twolame)
96
 BuildRequires:  pkgconfig(dcaenc)
97
 %endif
98
-BuildRequires:  pkgconfig(ogg)
99
 
100
 # Video Codecs
101
 BuildRequires:  libxvidcore-devel
102
+BuildRequires:  pkgconfig(libass)
103
 %if 0%{?sles_version}
104
 BuildRequires:  libx264-devel
105
 %else
106
@@ -258,6 +260,7 @@
107
 %patch2 -p0
108
 %patch3 -p0
109
 %patch4 -p0
110
+%patch5 -p0
111
 
112
 %build
113
 %if ! 0%{?sles_version}
114
@@ -313,7 +316,6 @@
115
 
116
 %files
117
 %defattr(-,root,root)
118
-%{_libdir}/libADM6postproc.so.52
119
 %{_libdir}/libADM6avcodec.so.54
120
 %{_libdir}/libADM6avformat.so.54
121
 %{_libdir}/libADM6avutil.so.52
122
@@ -463,14 +465,11 @@
123
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_removePlane.so
124
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so
125
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_rotate.so
126
-%if 0%{?sles_version}
127
+%if 0%{?sles_version} || 0%{?suse_version} > 1210
128
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ssa.so
129
 %endif
130
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_separateField.so
131
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sharpen.so
132
-%if 0%{?suse_version} > 1210
133
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ssa.so
134
-%endif
135
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_stackField.so
136
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swapUV.so
137
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_telecide.so
138
@@ -479,9 +478,9 @@
139
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
140
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so
141
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so
142
+%if ! 0%{?sles_version}
143
 %dir %{_datadir}/ADM6_addons
144
 %dir %{_datadir}/ADM6_addons/avsfilter
145
-%if ! 0%{?sles_version}
146
 %{_datadir}/ADM6_addons/avsfilter/avsload.exe
147
 %{_datadir}/ADM6_addons/avsfilter/pipe_source.dll
148
 %{_datadir}/pixmaps/avidemux3.png
149
avidemux-cpu_armel.patch Added
13
 
1
@@ -0,0 +1,11 @@
2
+--- avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt.orig  2014-11-06 19:55:57.065531381 +0100
3
++++ avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt   2014-11-06 19:55:57.085531012 +0100
4
+@@ -6,6 +6,8 @@
5
+   ADD_DEFINITIONS("-DFPM_DEFAULT")
6
+ ELSEIF (ADM_CPU_PPC)
7
+   ADD_DEFINITIONS("-DFPM_PPC")
8
++ELSE  (ADM_CPU_PPC)
9
++  ADD_DEFINITIONS("-DFPM_DEFAULT")
10
+ ENDIF (ADM_CPU_X86_32)
11
+ 
12
+ ADD_SUBDIRECTORY(ADM_libMad)
13
Refresh
Refresh
Request History
enzokiel's avatar

enzokiel created request over 10 years ago

- added patch and dependencies to enable build on ARM CPU
- removed some unneeded dependencies


enzokiel's avatar

enzokiel accepted request over 10 years ago

OK.