Overview
Request 314 (accepted)
fix sles and < 1140 builds in Essentials
- Created by marguerite over 11 years ago
- In state accepted
Submit package home:marguerite:branches:Essentials / gpac to package Essentials / gpac
gpac.changes
Changed
x
1
2
-------------------------------------------------------------------
3
+Mon Nov 5 00:54:51 UTC 2012 - i@margueirte.su
4
+
5
+- fix sles and < 1140 builds.
6
+
7
+-------------------------------------------------------------------
8
Wed Oct 31 23:50:15 UTC 2012 - i@margueirte.su
9
10
- fix Tumbleweed builds.
11
gpac.spec
Changed
148
1
2
BuildRequires: alsa-devel
3
BuildRequires: dos2unix
4
BuildRequires: doxygen
5
-BuildRequires: fdupes
6
+BuildRequires: fdupes
7
BuildRequires: freeglut-devel
8
BuildRequires: freetype2-devel
9
BuildRequires: gcc-c++
10
-%if 0%{?suse_version} == 1140
11
-BuildRequires: mozilla-js192
12
-%endif
13
-%if 0%{?suse_version} > 1140
14
-BuildRequires: js-devel
15
+%if 0%{?suse_version} >= 1140
16
+BuildRequires: libSDL-devel
17
+%else
18
+BuildRequires: SDL-devel
19
%endif
20
BuildRequires: liba52-devel
21
BuildRequires: libfaad-devel
22
BuildRequires: libffmpeg-devel
23
+# fix for evergreen 11
24
+%if 0%{?suse_version} == 1110
25
+BuildRequires: libidl
26
+%endif
27
BuildRequires: libjpeg-devel
28
BuildRequires: libmad-devel
29
BuildRequires: libogg-devel
30
31
BuildRequires: libtheora-devel
32
BuildRequires: libvorbis-devel
33
BuildRequires: libxvidcore-devel
34
-BuildRequires: pkgconfig(libopenjpeg)
35
-BuildRequires: pkgconfig(libxml-2.0)
36
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
37
%if 0%{?suse_version} == 1140
38
-BuildRequires: mozilla-xulrunner192-devel
39
+BuildRequires: mozilla-js192
40
%endif
41
%if 0%{?suse_version} > 1140
42
+BuildRequires: js-devel
43
+%endif
44
+%if 0%{?suse_version} <= 1140
45
+%if ! 0%{?sles_version}
46
+BuildRequires: mozilla-xulrunner192-devel
47
+%endif
48
+%else
49
BuildRequires: xulrunner-devel
50
%endif
51
-BuildRequires: libSDL-devel
52
BuildRequires: libopenssl-devel
53
+%if 0%{?suse_version} >= 1140
54
+BuildRequires: pkgconfig(libopenjpeg)
55
+%endif
56
+BuildRequires: pkgconfig(libxml-2.0)
57
BuildRequires: unzip
58
BuildRequires: update-desktop-files
59
%if 0%{?suse_version} >= 1140
60
61
BuildRequires: wxGTK-devel
62
%endif
63
BuildRequires: zlib-devel
64
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
65
66
%description
67
GPAC is a multimedia framework for MPEG-4, VRML/X3D and SVG/SMIL.
68
69
* applications benefiting from MPEG-7 and MPEG-21 advances: meta-data,
70
encryption, watermarking, rights management
71
72
+%if ! 0%{?sles_version}
73
%package browser-plugin
74
Summary: Osmozilla is a GPAC plugin for Mozilla-based browsers
75
Group: Productivity/Networking/Web/Utilities
76
77
78
%description browser-plugin
79
Osmozilla is a GPAC plugin for Mozilla-based browsers.
80
+%endif
81
82
%prep
83
%setup -q
84
85
rm -rf doc/ipmpx_syntax.bt.origine
86
87
%build
88
-%if 0%{?suse_version} > 1140
89
# regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
90
+%if 0%{?suse_version} > 1140
91
pushd applications/osmozilla
92
chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
93
chmod 666 nsIOsmozilla.h
94
95
cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
96
popd
97
%else
98
-# regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
99
+%if ! 0%{?sles_version}
100
pushd applications/osmozilla
101
chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
102
chmod 666 nsIOsmozilla.h
103
104
cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
105
popd
106
%endif
107
+%endif
108
109
# configure the beast
110
./configure \
111
112
--libdir=lib64 \
113
%endif
114
--mandir=%{_mandir} \
115
+%if ! 0%{?sles_version}
116
--xulsdk-path=`pkg-config --variable=sdkdir libxul` \
117
+%endif
118
--extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC"
119
120
# make the beast (NO parallel build possible ...)
121
122
DESTDIR=%{buildroot}
123
124
# browser-plugin
125
+%if ! 0%{?sles_version}
126
install -dm 755 %{buildroot}%{_libdir}/browser-plugins
127
install -m 755 bin/gcc/nposmozilla.so \
128
%{buildroot}%{_libdir}/browser-plugins
129
install -m 755 bin/gcc/nposmozilla.xpt \
130
%{buildroot}%{_libdir}/browser-plugins
131
+%endif
132
133
# generated sggen binaries
134
for i in MPEG4 SVG X3D; do
135
136
%{_datadir}/pixmaps/Osmo4.png
137
%{_datadir}/applications/Osmo4.desktop
138
139
+%if ! 0%{?sles_version}
140
%files browser-plugin
141
%defattr(-,root,root)
142
%{_libdir}/browser-plugins/nposmozilla.*
143
+%endif
144
145
-%changelog
146
+%changelog
147
\ No newline at end of file
148
gpac-0.5.0-64bit-portability.patch
Changed
57
1
2
-Index: gpac/applications/generators/SVG/svggen.h
3
-===================================================================
4
---- gpac.old/applications/generators/SVG/svggen.h (版本 4214)
5
-+++ gpac/applications/generators/SVG/svggen.h (工作副本)
6
-@@ -190,6 +190,17 @@
7
-
8
- FILE *BeginFile(u32 type);
9
- void EndFile(FILE *f, u32 type);
10
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
11
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
12
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
13
-+void generate_laser_tables(GF_List *svg_elements);
14
-+void generate_table(GF_List *elements);
15
-+void generateSVGCode_V1(GF_List *svg_elements);
16
-+void generateSVGCode_V2(GF_List *svg_elements);
17
-+void generateSVGCode_V3(GF_List *svg_elements);
18
-+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
19
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
20
-+void generate_laser_tables_da(GF_List *atts);
21
-
22
-
23
- #endif // _SVGGEN_H_
24
+diff -urN gpac-0.5.0.svn4192.orig/applications/generators/SVG/svggen.h gpac-0.5.0.svn4192/applications/generators/SVG/svggen.h
25
+--- gpac-0.5.0.svn4192.orig/applications/generators/SVG/svggen.h 2012-11-03 00:19:59.723621042 +0800
26
++++ gpac-0.5.0.svn4192/applications/generators/SVG/svggen.h 2012-11-05 08:53:01.166895888 +0800
27
+@@ -190,6 +190,16 @@
28
+
29
+ FILE *BeginFile(u32 type);
30
+ void EndFile(FILE *f, u32 type);
31
+-
32
++SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
33
++void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
34
++u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
35
++void generate_laser_tables(GF_List *svg_elements);
36
++void generate_table(GF_List *elements);
37
++void generateSVGCode_V1(GF_List *svg_elements);
38
++void generateSVGCode_V2(GF_List *svg_elements);
39
++void generateSVGCode_V3(GF_List *svg_elements);
40
++void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
41
++u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
42
++void generate_laser_tables_da(GF_List *atts);
43
+
44
+ #endif // _SVGGEN_H_
45
+diff -urN gpac-0.5.0.svn4192.orig/src/scene_manager/scene_manager.c gpac-0.5.0.svn4192/src/scene_manager/scene_manager.c
46
+--- gpac-0.5.0.svn4192.orig/src/scene_manager/scene_manager.c 2012-11-03 00:19:59.746621159 +0800
47
++++ gpac-0.5.0.svn4192/src/scene_manager/scene_manager.c 2012-11-05 08:50:16.795465561 +0800
48
+@@ -29,7 +29,7 @@
49
+ #include <gpac/bifs.h>
50
+ #include <gpac/xml.h>
51
+ #include <gpac/internal/scenegraph_dev.h>
52
+-
53
++#include <gpac/network.h>
54
+
55
+ GF_EXPORT
56
+ GF_SceneManager *gf_sm_new(GF_SceneGraph *graph)
57
Refresh
Refresh
Login required, please
login
or
signup
in order to comment
Request History
marguerite created request over 11 years ago
fix sles and < 1140 builds in Essentials
mrdocs accepted request over 12 years ago
Thanks. Looks good to me!