Overview

Request 315 (accepted)

builds with ffmpeg, ffms2 and gpac

Submit package home:marguerite:branches:Essentials / x264 to package Essentials / x264

x264.changes Changed
x
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Fri Nov  2 04:40:49 UTC 2012 - i@margueirte.su
4
+
5
+- selectively build with ffmpeg, ffms2 and gpac.
6
+
7
+-------------------------------------------------------------------
8
 Thu Nov  1 19:54:46 UTC 2012 - pascal.bleser@opensuse.org
9
 
10
 - only build the x264 binary, with ffmpeg support; the library now
11
x264.spec Changed
37
 
1
@@ -22,6 +22,21 @@
2
 Url:            http://developers.videolan.org/%{name}.html
3
 Group:          Productivity/Multimedia/Video/Editors and Convertors
4
 Source0:        ftp://ftp.videolan.org/pub/videolan/%{name}/snapshots/%{name}-snapshot-%{svn}-2245.tar.bz2
5
+Patch:     %{name}-gpac-shared-library.patch
6
+%if 0%{?suse_version} >= 1140
7
+BuildRequires: libffmpeg-devel
8
+BuildRequires: libffms2-devel
9
+%endif
10
+BuildRequires: libgpac-devel
11
+# resolve conflicts
12
+%if 0%{?suse_version} <= 1140
13
+%if ! 0%{?sles_version}
14
+BuildRequires:  mozilla-js192
15
+%endif
16
+%endif
17
+%if 0%{?suse_version} == 1210
18
+BuildRequires:  mozilla-js
19
+%endif
20
 BuildRequires:  nasm
21
 BuildRequires:  pkg-config
22
 BuildRequires:  yasm >= 1.0.1
23
@@ -60,11 +75,12 @@
24
 
25
 %prep
26
 %setup -q -n "%{name}-snapshot-%{svn}-2245"
27
+%patch -p1
28
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
29
 sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" %{name}.c
30
 
31
 %build
32
-%configure --enable-pic
33
+%configure --enable-pic --enable-visualize
34
 make %{?_smp_mflags}
35
 
36
 %install
37
x264-gpac-shared-library.patch Added
15
 
1
@@ -0,0 +1,13 @@
2
+Index: x264-snapshot-20120928-2245/configure
3
+===================================================================
4
+--- x264-snapshot-20120928-2245.orig/configure
5
++++ x264-snapshot-20120928-2245/configure
6
+@@ -887,7 +887,7 @@ fi
7
+ 
8
+ if  "$gpac" = "auto"  ; then
9
+     gpac="no"
10
+-    cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz" || GPAC_LIBS="-lgpac_static"
11
++    cc_check "" -lz && GPAC_LIBS="-lgpac -lz" || GPAC_LIBS="-lgpac"
12
+     if  "$SYS" = "WINDOWS"  ; then
13
+         GPAC_LIBS="$GPAC_LIBS -lwinmm"
14
+     fi
15
Refresh

No build results available

Refresh
Request History
Marguerite Su's avatar

marguerite created request over 11 years ago

builds with ffmpeg, ffms2 and gpac


Manfred Tremmel's avatar

mantre accepted request over 12 years ago

OK