Overview

Request 310 (accepted)

[Final]update to 0.5.0. fix a lot of things. can be used by x264 now.

Submit package home:marguerite:branches:Multimedia / gpac to package Multimedia / gpac

gpac.changes Changed
x
 
1
@@ -1,4 +1,50 @@
2
 -------------------------------------------------------------------
3
+Wed Oct 31 23:50:15 UTC 2012 - i@margueirte.su
4
+
5
+- fix Tumbleweed builds.
6
+- adjust enable_V4Studio.patch.
7
+  * do not use static lib for linking.
8
+
9
+-------------------------------------------------------------------
10
+Thu Oct  4 06:42:47 UTC 2012 - i@marguerite.su
11
+
12
+- update to 0.5.0
13
+  * MPEG-DASH and HLS support (players and MP4Box)
14
+  * MPEG-U Widgets and UPnP support in the player
15
+  * Stereo and multiview display support
16
+  * Better AVC and SVC support including OpenSVC decoder integration
17
+  * More live tools: RTP, MPEG-TS, T-DMB support, scene encoders (BIFS and RME/DIMS)
18
+  * iOS and Android support
19
+  * and many other good things
20
+- svn4192 fixes sf#3574796:
21
+  * Osmozilla: change switch_up type from int to long, since xulrunner 15 doesn't support int type directly.
22
+  * change bogus uuid in Osmozilla.
23
+  * fix mozjs15 depreciated JS_ConstructObject to JS_New.
24
+- enable_V4Studio patch
25
+  * upstream masked Osmo4_wx and osmozilla. I enabled them and fix linker errors.
26
+- smjs_call_prop_stub.patch
27
+  * fix openSUSE xulrunner version.
28
+- SVGGen_abuild.patch
29
+  * fix applications/generators/SVG linker errors.
30
+- 64bit-portability.patch
31
+  * fix OBS errors and warnings.
32
+- enable build udptsseg, a HTTP streaming tool.
33
+- spec clean.
34
+  * remove _with_amr. we're already in PMBS.
35
+  * correct BuildRequires package names and remove unneeded Requires.
36
+  * remove dos2unix fixes
37
+  * remove 64bit adjustments. we use upstream options.
38
+  * remove libpng-1.4.0 fix. no longer need.
39
+  * remove SONAME. upstream did that.
40
+  * remove openjpeg fix. 
41
+  * remove unneeded configure options.
42
+  * remove < 1140 conditionals.
43
+  * use new ffmpeg. upstream code change.
44
+  * add IDL regeneration for newer xulrunner.
45
+  * enable osmozilla for all openSUSE versions. although few need it.
46
+- TODO: enable hbbtvplayer builds.
47
+
48
+-------------------------------------------------------------------
49
 Fri Dec 16 20:38:01 UTC 2011 - pascal.bleser@opensuse.org
50
 
51
 - fix build on recent openSUSE versions, failure was introduced by missing OPENJPEG_VERSION
52
@@ -82,4 +128,3 @@
53
 Fri Dec  8 00:00:00 UTC 2006 - toni@links2linux.de
54
 
55
 - initial build 0.4.3-cvs20061114
56
-
57
gpac.spec Changed
520
 
1
@@ -1,61 +1,89 @@
2
-# vim: set ts=4 sw=4 et:
3
-# Copyright (c) 2006-2010 oc2pus
4
-# This file and all modifications and additions to the pristine
5
-# package are under the same license as the package itself.
6
 #
7
-# Please submit bugfixes or comments to packman@links2linux.de
8
+# spec file for package gpac
9
+#
10
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
11
+#
12
+# All modifications and additions to the file contributed by third parties
13
+# remain the property of their copyright owners, unless otherwise agreed
14
+# upon. The license for this file, and modifications and additions to the
15
+# file, is the same license as for the pristine package itself (unless the
16
+# license for the pristine package is not an Open Source License, in which
17
+# case the license is the MIT License). An "Open Source License" is a
18
+# license that conforms to the Open Source Definition (Version 1.9)
19
+# published by the Open Source Initiative.
20
+
21
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
22
+#
23
+
24
+%define soname     2
25
 
26
-%define _with_amr  1
27
-%define soname     0
28
+# workaround for Tumbleweed. Because we can't detect it directly.
29
+%if 0%{?suse_version} >= 1210
30
+%define xulrunner_version %(rpm -q --qf '%%{VERSION}' xulrunner-devel | sed 's|\\..*$||')
31
+%else
32
+%define xulrunner192_version %(rpm -q --qf '%%{VERSION}' mozilla-xulrunner192-devel | sed 's|\\..*$||')
33
+%endif
34
 
35
 Name:           gpac
36
-Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
37
-Version:        0.4.5
38
+Version:        0.5.0.svn4192
39
 Release:        1.pm.1
40
+License:        LGPL-2.1+
41
+Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
42
+Group:          Productivity/Multimedia/Video/Editors and Convertors
43
 Source:         gpac-%{version}.tar.bz2
44
-%if "%{_with_amr}" == "1"
45
-Source1:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-610.zip
46
-Source2:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-600.zip
47
-%endif
48
+Source1:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-b00.zip
49
+Source2:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip
50
+Url:            http://gpac.sourceforge.net
51
 Source90:       %{name}-rpmlintrc
52
-Patch0:         %{name}-bufferoverflow.patch
53
-Patch1:         %{name}-a52dec.patch
54
-%if %suse_version > 1140
55
-Patch2:         buildfix-for-factory.diff
56
-%endif
57
-URL:            http://gpac.sourceforge.net/
58
-License:        GNU Lesser General Public License version 2.1 or later (LGPLv2.1 or later)
59
-Group:          Productivity/Multimedia/Video/Editors and Convertors
60
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
61
+#PATCH-FIX-openSUSE i@marguerite.su - openSUSE only fix for sf#3574796
62
+Patch0:         gpac-0.5.0-smjs_call_prop_stub.patch
63
+#PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
64
+Patch1:        gpac-0.5.0-enable_V4Studio.patch
65
+#PATCH-FIX-UPSTREAM i@marguerite.su - fix SVGGen ldflags
66
+Patch2:        gpac-0.5.0-SVGGen_abuild.patch
67
+#PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
68
+Patch3:        gpac-0.5.0-64bit-portability.patch
69
+#PATCH-FIX-UPSTREAM i@marguerite.su - export functions x264 needs
70
+Patch4:        gpac-0.5.0-x264-export.patch
71
+BuildRequires:  DirectFB-devel
72
+BuildRequires:  ImageMagick
73
+BuildRequires:  Mesa-devel
74
 BuildRequires:  alsa-devel
75
 BuildRequires:  dos2unix
76
 BuildRequires:  doxygen
77
-BuildRequires:  freetype2-devel
78
+BuildRequires: fdupes
79
 BuildRequires:  freeglut-devel
80
+BuildRequires:  freetype2-devel
81
 BuildRequires:  gcc-c++
82
-BuildRequires:  ImageMagick
83
+%if 0%{?suse_version} == 1140
84
+BuildRequires:  mozilla-js192
85
+%endif
86
+%if 0%{?suse_version} > 1140
87
+BuildRequires:  js-devel
88
+%endif
89
 BuildRequires:  liba52-devel
90
-#BuildRequires:    libamrnb-devel
91
-#BuildRequires:    libamrwb-devel
92
-BuildRequires:  libfaad2-devel
93
-BuildRequires:  libffmpeg_oldabi-devel
94
+BuildRequires:  libfaad-devel
95
+BuildRequires:  libffmpeg-devel
96
 BuildRequires:  libjpeg-devel
97
-BuildRequires:  libjs-devel
98
 BuildRequires:  libmad-devel
99
 BuildRequires:  libogg-devel
100
-BuildRequires:  pkgconfig(libopenjpeg)
101
 BuildRequires:  libpng-devel
102
-BuildRequires:  librsvg2-devel >= 2.5.0
103
+BuildRequires:  libpulse-devel
104
+BuildRequires:  librsvg-devel >= 2.5.0
105
 BuildRequires:  libtheora-devel
106
 BuildRequires:  libvorbis-devel
107
-BuildRequires:  libxml2-devel
108
 BuildRequires:  libxvidcore-devel
109
-BuildRequires:  Mesa-devel
110
-%if %suse_version >= 1140
111
+BuildRequires:  pkgconfig(libopenjpeg)
112
+BuildRequires:  pkgconfig(libxml-2.0)
113
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
114
+%if 0%{?suse_version} == 1140
115
 BuildRequires:  mozilla-xulrunner192-devel
116
 %endif
117
-BuildRequires:  openssl-devel
118
-BuildRequires:  SDL-devel
119
+%if 0%{?suse_version} > 1140
120
+BuildRequires:  xulrunner-devel
121
+%endif
122
+BuildRequires:  libSDL-devel
123
+BuildRequires:  libopenssl-devel
124
 BuildRequires:  unzip
125
 BuildRequires:  update-desktop-files
126
 %if 0%{?suse_version} >= 1140
127
@@ -104,41 +132,9 @@
128
 Summary:        Development files for gpac
129
 Group:          Development/Languages/C and C++
130
 Requires:       libgpac%{soname} = %{version}
131
-Requires:       freetype2-devel
132
-Requires:       freeglut-devel
133
-Requires:       ImageMagick
134
-Requires:       liba52-devel
135
-#Requires: libamrnb-devel
136
-#Requires: libamrwb-devel
137
-Requires:       libfaad2-devel
138
-Requires:       libffmpeg_oldabi-devel
139
-Requires:       libjpeg-devel
140
-Requires:       libjs-devel libjs1
141
-Requires:       libmad-devel
142
-Requires:       libopenjpeg-devel
143
-Requires:       libogg-devel
144
-Requires:       libpng-devel
145
-Requires:       libtheora-devel
146
-Requires:       libvorbis-devel
147
-Requires:       libxml2-devel
148
-Requires:       libxvidcore-devel
149
-Requires:       Mesa-devel
150
-%if %suse_version <= 1110
151
-Requires:       mozilla-xulrunner190-devel
152
-%else
153
-Requires:       mozilla-xulrunner191-devel
154
-%endif
155
-Requires:       openssl-devel
156
-Requires:       SDL-devel
157
-%if 0%{?suse_version} >= 1140
158
-Requires:       wxWidgets-wxcontainer-devel
159
-%else
160
-Requires:       wxGTK-devel
161
-%endif
162
-Requires:       zlib-devel
163
 # old name
164
-Provides:       gpac-devel = 0.4.4
165
-Obsoletes:      gpac-devel < 0.4.4
166
+Provides:       gpac-devel = %{version}
167
+Obsoletes:      gpac-devel < %{version}
168
 
169
 %description -n libgpac-devel
170
 Development files for gpac.
171
@@ -170,7 +166,6 @@
172
 * applications benefiting from MPEG-7 and MPEG-21 advances: meta-data,
173
   encryption, watermarking, rights management
174
 
175
-%if %suse_version <= 1030
176
 %package browser-plugin
177
 Summary:        Osmozilla is a GPAC plugin for Mozilla-based browsers
178
 Group:          Productivity/Networking/Web/Utilities
179
@@ -178,141 +173,111 @@
180
 
181
 %description browser-plugin
182
 Osmozilla is a GPAC plugin for Mozilla-based browsers.
183
-%endif
184
 
185
 %prep
186
-%setup -q -n %{name}
187
+%setup -q
188
+%if 0%{?suse_version} >= 1210
189
+%if 0%{?xulrunner_version} >= 16
190
+%patch0 -p1
191
+%endif
192
+%else
193
 %patch0 -p1
194
+%endif
195
 %patch1 -p1
196
-%if %suse_version > 1140
197
 %patch2 -p1
198
-%endif
199
-
200
-dos2unix     configure
201
-%__chmod 755 configure
202
-dos2unix     AUTHORS BUGS Changelog COPYING README TODO
203
-%__chmod 644 AUTHORS BUGS Changelog COPYING README TODO
204
-dos2unix     doc/CODING_STYLE doc/ipmpx_syntax.bt
205
-%__chmod 644 doc/CODING_STYLE doc/ipmpx_syntax.bt
206
-
207
-# 64bit adjustments ...
208
-%__perl -p -i -e 's/lGLU/lGLU\ \-L\/usr\/X11R6\/%{_lib}/g' \
209
-    configure
210
-%__perl -p -i -e 's,\$prefix/lib/gpac,\$prefix/%{_lib}/gpac,' \
211
-    configure
212
-%__perl -p -i -e 's,\$\(prefix\)/lib,\$(prefix)/%{_lib},' \
213
-    Makefile
214
-%__perl -p -i -e 's/Wall/w/g' `find -name \
215
-    Makefile`
216
-
217
-# libpng-1.4.0 needs this
218
-%__sed -i -e 's|png_infopp_NULL|NULL|g' \
219
-    src/media_tools/img.c
220
-
221
-# define SONAME number from the first number of gpac version
222
-%__sed -i -e 's|EXTRALIBS+=$(GPAC_SH_FLAGS)|EXTRALIBS+=$(GPAC_SH_FLAGS)\nLDFLAGS+="-Wl,-soname,libgpac.so.%{soname}"|' \
223
-    src/Makefile
224
+%patch3 -p1
225
+%patch4 -p1
226
 
227
 # unpack amr files
228
-%if "%{_with_amr}" == "1"
229
-%__install -dm 755 modules/amr_float_dec/amr_nb_ft
230
+install -dm 755 modules/amr_float_dec/amr_nb_ft
231
 pushd modules/amr_float_dec/amr_nb_ft
232
-    %__unzip -q %{SOURCE1}
233
-    %__unzip -qj 26104-610_ANSI_C_source_code.zip
234
+    unzip -q %{SOURCE1}
235
+    unzip -qj 26104-b00_ANSI_C_source_code.zip
236
 popd
237
 
238
-%__install -dm 755 modules/amr_float_dec/amr_wb_ft
239
+install -dm 755 modules/amr_float_dec/amr_wb_ft
240
 pushd modules/amr_float_dec/amr_wb_ft
241
-    %__unzip -q %{SOURCE2}
242
-    %__unzip -qj 26204-600_ANSI-C_source_code.zip
243
+    unzip -q %{SOURCE2}
244
+    unzip -qj 26204-b00_ANSI-C_source_code.zip
245
 popd
246
-%endif
247
-
248
-# new ffmpeg-API ...
249
-%__sed -i -e 's|ffd->ctx->bits_per_sample|ffd->ctx->bits_per_coded_sample|g' \
250
-    modules/ffmpeg_in/ffmpeg_decode.c
251
-%__sed -i -e 's|CODEC_ID_MP3LAME|CODEC_ID_MP3|g' \
252
-    modules/ffmpeg_in/ffmpeg_decode.c
253
-%__sed -i -e 's|dec->bits_per_sample|dec->bits_per_coded_sample|g' \
254
-    modules/ffmpeg_in/ffmpeg_demux.c
255
-%__sed -i -e 's|avcodec_decode_audio|avcodec_decode_audio2|g' \
256
-    modules/ffmpeg_in/ffmpeg_decode.c
257
-%__sed -i -e 's|ffd->ctx->height->codec->height|ffd->ctx->height|g' \
258
-    modules/ffmpeg_in/ffmpeg_decode.c
259
-
260
-# use system openjpeg
261
-%__sed -i -e 's|openjpeg.h|openjpeg/openjpeg.h|' \
262
-    configure modules/img_in/jp2_dec.c
263
 
264
 # Fix encoding warnings
265
-%__cp -p Changelog Changelog.origine
266
+cp -p Changelog Changelog.origine
267
 iconv -f ISO-8859-1 -t UTF8 Changelog.origine > Changelog
268
 touch -r Changelog.origine Changelog
269
-%__rm -rf Changelog.origine
270
+rm -rf Changelog.origine
271
 
272
-%__cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine
273
+cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine
274
 iconv -f ISO-8859-1 -t UTF8 doc/ipmpx_syntax.bt.origine > doc/ipmpx_syntax.bt
275
 touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt
276
-%__rm -rf doc/ipmpx_syntax.bt.origine
277
+rm -rf doc/ipmpx_syntax.bt.origine
278
 
279
 %build
280
+%if 0%{?suse_version} > 1140
281
+# regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
282
+pushd applications/osmozilla
283
+    chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
284
+    chmod 666 nsIOsmozilla.h
285
+    chmod 666 nsIOsmozilla.idl
286
+
287
+    %define _IDL_DIR `pkg-config --variable=idldir libxul`
288
+    %define _SDK_DIR `pkg-config --variable=sdkdir libxul`
289
+
290
+    %{_SDK_DIR}/sdk/bin/header.py \
291
+       -I%{_IDL_DIR} \
292
+        -o nsIOsmozilla.h \
293
+       nsIOsmozilla.idl
294
+        %{_SDK_DIR}/sdk/bin/typelib.py \
295
+       -I%{_IDL_DIR} \
296
+       -o nsIOsmozilla.xpt \
297
+       nsIOsmozilla.idl
298
+
299
+    cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
300
+popd
301
+%else
302
 # regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
303
 pushd applications/osmozilla
304
-    %__chmod 666 nsIOsmozilla.xpt_linux; %__rm nsIOsmozilla.xpt_linux
305
-    %__chmod 666 nsIOsmozilla.h
306
-    %__chmod 666 nsIOsmozilla.idl
307
+    chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
308
+    chmod 666 nsIOsmozilla.h
309
+    chmod 666 nsIOsmozilla.idl
310
 
311
     %define _IDL_DIR `pkg-config --variable=idldir libxul`
312
     %define _INC_DIR `pkg-config --variable=includedir libxul`
313
     %define _LIB_DIR `pkg-config --variable=libdir libxul`
314
-    
315
+
316
     %{_LIB_DIR}/xpidl \
317
-       -m header \
318
-       -I%{_IDL_DIR} \
319
-       -I%{_INC_DIR}/xpcom/idl \
320
-       nsIOsmozilla.idl
321
+        -m header \
322
+        -I%{_IDL_DIR} \
323
+        -I%{_INC_DIR}/xpcom/idl \
324
+        nsIOsmozilla.idl
325
     %{_LIB_DIR}/xpidl \
326
-       -m typelib \
327
-       -I%{_IDL_DIR} \
328
-       -I%{_INC_DIR}/xpcom/idl \
329
-       nsIOsmozilla.idl
330
+        -m typelib \
331
+        -I%{_IDL_DIR} \
332
+        -I%{_INC_DIR}/xpcom/idl \
333
+        nsIOsmozilla.idl
334
     %{_LIB_DIR}/xpt_link \
335
-       nposmozilla.xpt nsIOsmozilla.xpt
336
-    
337
-    %__cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
338
-popd
339
+        nposmozilla.xpt nsIOsmozilla.xpt
340
 
341
-# for some reason, OPENJPEG_VERSION is not defined, so pass it directly
342
-OPENJPEG_VERSION="$(rpm -q --qf='%{version}' openjpeg-devel)"
343
+    cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
344
+popd
345
+%endif
346
 
347
 # configure the beast
348
 ./configure \
349
     --prefix=%{_prefix} \
350
-    --mandir=%{_mandir} \
351
-    --X11-libs=/usr/X11R6/%{_lib} \
352
-%if "%{_with_amr}" == "1"
353
-    --enable-amr \
354
+%ifarch x86_64
355
+    --libdir=lib64 \
356
 %endif
357
-    --enable-oss-audio \
358
-    --xulsdk-path=`pkg-config --variable=includedir libxul` \
359
-    --mozdir=%{_libdir}/browser-plugins \
360
-    --use-openjpeg=system \
361
-    --use-ogg=system \
362
-    --use-vorbis=system \
363
-    --use-theora=system \
364
-    --extra-cflags="%optflags -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -I%{_includedir}/js -DXP_UNIX -fPIC -DOPENJPEG_VERSION=\\\"$OPENJPEG_VERSION\\\""
365
+    --mandir=%{_mandir} \
366
+    --xulsdk-path=`pkg-config --variable=sdkdir libxul` \
367
+    --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC" 
368
 
369
 # make the beast (NO parallel build possible ...)
370
-%__make all
371
-%__make sggen
372
-
373
-%if %suse_version <= 1030
374
-# mozilla-xulrunner191 has no npupp.h ...
375
-
376
-# make browser-plugin
377
-%__make -C applications/osmozilla \
378
-    XUL_CFLAGS="`pkg-config --define-variable=includetype=unstable --cflags libxul` `pkg-config --cflags nspr`"
379
-%endif
380
+# fix I: File is compiled without RPM_OPT_FLAGS gpac doesn't respect any flags at all
381
+make all CFLAG="%{optflags}"
382
+make sggen 
383
+make -C applications/generators/SVG
384
+make -C applications/udptsseg
385
 
386
 # create dev-docs
387
 pushd doc
388
@@ -321,50 +286,45 @@
389
 popd
390
 
391
 %install
392
-%__install -dm 755 %{buildroot}%{_bindir}
393
+%make_install 
394
 
395
-%makeinstall \
396
-    INSTFLAGS=""
397
-%__make install-lib \
398
+# header files
399
+make install-lib \
400
     DESTDIR=%{buildroot}
401
 
402
-%if %suse_version <= 1030
403
 # browser-plugin
404
-#%__make -C applications/osmozilla install \
405
-#  XUL_CFLAGS="`pkg-config --cflags libxul nspr`"
406
-%__install -dm 755 %{buildroot}%{_libdir}/browser-plugins
407
-%__install -m 644 bin/gcc/nposmozilla.so \
408
+install -dm 755 %{buildroot}%{_libdir}/browser-plugins
409
+install -m 755 bin/gcc/nposmozilla.so \
410
     %{buildroot}%{_libdir}/browser-plugins
411
-%__install -m 644 bin/gcc/nposmozilla.xpt \
412
+install -m 755 bin/gcc/nposmozilla.xpt \
413
     %{buildroot}%{_libdir}/browser-plugins
414
-%endif
415
 
416
-# install generated sggen binaries
417
-for i in MPEG4 X3D; do
418
-    %__install -m 755 applications/generators/$i/${i}Gen \
419
+# generated sggen binaries
420
+for i in MPEG4 SVG X3D; do
421
+    install -m 755 applications/generators/$i/${i}Gen \
422
        %{buildroot}%{_bindir}
423
 done
424
-%__install -m 755 bin/gcc/mp4* \
425
+install -m 755 bin/gcc/mp4* \
426
     %{buildroot}%{_bindir}
427
 
428
-# create links for so-name
429
-%__mv %{buildroot}%{_libdir}/libgpac-%{version}.so \
430
-    %{buildroot}%{_libdir}/libgpac.so.%{version}
431
-ln -sf libgpac.so.%{version} \
432
-    %{buildroot}%{_libdir}/libgpac.so.0
433
-ln -sf libgpac.so.0 \
434
-    %{buildroot}%{_libdir}/libgpac.so
435
+# Osmo4
436
+install -m 755 bin/gcc/Osmo4 \
437
+    %{buildroot}%{_bindir}
438
+
439
+# udptsseg
440
+install -m 755 bin/gcc/udptsseg \
441
+    %{buildroot}%{_bindir}
442
 
443
 # icon
444
-%__install -dm 755 %{buildroot}%{_datadir}/pixmaps
445
+install -dm 755 %{buildroot}%{_datadir}/pixmaps
446
 convert -size 48x48 applications/osmo4_wx/osmo4.xpm \
447
     Osmo4.png
448
-%__install -m 644 Osmo4.png \
449
+install -m 644 Osmo4.png \
450
     %{buildroot}%{_datadir}/pixmaps
451
 
452
 # menu-entry
453
-%__install -dm 755 %{buildroot}%{_datadir}/applications
454
-%__cat > Osmo4.desktop << EOF
455
+install -dm 755 %{buildroot}%{_datadir}/applications
456
+cat > Osmo4.desktop << EOF
457
 Desktop Entry
458
 Comment=MPEG-4 Media player based on gpac
459
 Name=Osmo4
460
@@ -372,16 +332,14 @@
461
 Type=Application
462
 Exec=Osmo4
463
 Icon=Osmo4
464
-#Encoding=UTF-8
465
 Terminal=false
466
-#Categories=AudioVideo;Player;
467
 EOF
468
 %suse_update_desktop_file -i Osmo4 AudioVideo Player
469
 
470
-%__rm %{buildroot}%{_libdir}/*.a
471
+# static lib
472
+rm -rf %{buildroot}%{_libdir}/*.a
473
 
474
-%clean
475
-%{?buildroot:%__rm -rf "%{buildroot}"}
476
+%fdupes %{buildroot}
477
 
478
 %post -n libgpac%{soname} -p /sbin/ldconfig
479
 
480
@@ -395,12 +353,11 @@
481
 %{_bindir}/MP4Client
482
 %{_bindir}/MPEG4Gen
483
 %{_bindir}/X3DGen
484
+%{_bindir}/SVGGen
485
 %{_bindir}/mp42ts
486
-%{_bindir}/mp4_streamer
487
-%dir %{_libdir}/%{name}
488
-%{_libdir}/%{name}/*
489
-%dir %{_datadir}/%{name}
490
-%{_datadir}/%{name}/*
491
+%{_bindir}/udptsseg
492
+%{_libdir}/%{name}/
493
+%{_datadir}/%{name}/
494
 %{_mandir}/man1/*
495
 
496
 %files -n libgpac%{soname}
497
@@ -412,21 +369,17 @@
498
 %defattr(-,root,root)
499
 %doc doc/CODING_STYLE doc/ipmpx_syntax.bt
500
 %doc doc/html/*
501
-%dir %{_includedir}/%{name}
502
-%{_includedir}/%{name}/*
503
+%{_includedir}/%{name}/
504
 %{_libdir}/*.so
505
 
506
 %files -n Osmo4
507
 %defattr(-,root,root)
508
-#%doc doc/osmo4*
509
 %{_bindir}/Osmo4
510
 %{_datadir}/pixmaps/Osmo4.png
511
 %{_datadir}/applications/Osmo4.desktop
512
 
513
-%if %suse_version <= 1030
514
 %files browser-plugin
515
 %defattr(-,root,root)
516
 %{_libdir}/browser-plugins/nposmozilla.*
517
-%endif
518
 
519
 %changelog
520
buildfix-for-factory.diff Deleted
24
 
1
@@ -1,22 +0,0 @@
2
---- gpac/applications/osmo4_wx/Makefile    2008-11-24 09:48:32.000000000 +0100
3
-+++ new/applications/osmo4_wx/Makefile 2011-10-19 13:15:36.599504794 +0200
4
-@@ -41,7 +41,7 @@
5
- all: $(PROG)
6
- 
7
- Osmo4$(EXE): $(OBJS)
8
--  $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) -lz
9
-+  $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) -lz -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11
10
- 
11
- %.o: %.cpp
12
-   $(CXX) $(CFLAGS) $(INSTALL_FLAGS) $(WX_CFLAGS) -c -o $@ $< 
13
---- gpac/configure 2008-12-02 19:04:42.000000000 +0100
14
-+++ new/configure  2011-10-18 19:42:32.018255755 +0200
15
-@@ -102,7 +102,7 @@
16
- bigendian="no"
17
- SHFLAGS=-shared
18
- need_inet_aton="no"
19
--LDFLAGS="$LDFLAGS -Wl --warn-common"
20
-+LDFLAGS="$LDFLAGS -Wl "
21
- CFLAGS=""
22
- CPPFLAGS=""
23
- GPAC_SH_FLAGS=-lpthread
24
gpac-0.4.5-shared_amr.patch Deleted
143
 
1
@@ -1,141 +0,0 @@
2
-diff -up gpac/modules/amr_dec/amr_dec.c.amr gpac/modules/amr_dec/amr_dec.c
3
---- gpac/modules/amr_dec/amr_dec.c.amr 2008-02-17 23:43:55.000000000 +0100
4
-+++ gpac/modules/amr_dec/amr_dec.c 2008-02-17 23:44:20.000000000 +0100
5
-@@ -29,8 +29,8 @@
6
- #include <gpac/modules/service.h>
7
- #include <gpac/constants.h>
8
- 
9
--#include "amr_nb/sp_dec.h"
10
--#include "amr_nb/d_homing.h"
11
-+#include <amrnb/sp_dec.h>
12
-+#include <amrnb/d_homing.h>
13
- 
14
- 
15
- /*default size in CU of composition memory for audio*/
16
-diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile
17
---- gpac/modules/amr_dec/Makefile.amr  2008-02-17 23:39:25.000000000 +0100
18
-+++ gpac/modules/amr_dec/Makefile  2008-02-17 23:43:23.000000000 +0100
19
-@@ -17,30 +17,30 @@ LDFLAGS+=-pg
20
- endif
21
- 
22
- #common obj
23
--OBJS=amr_in.o amr_dec.o \
24
--  ./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
25
--  ./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \
26
--  ./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \
27
--  ./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \
28
--  ./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
29
--  ./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
30
--  ./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
31
--  ./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \
32
--  ./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
33
--  ./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
34
--  ./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \
35
--  ./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \
36
--  ./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
37
--  ./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
38
--  ./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
39
--  ./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
40
--  ./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \
41
--  ./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \
42
--  ./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \
43
--  ./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
44
--  ./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
45
--  ./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
46
--  ./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
47
-+OBJS=amr_in.o amr_dec.o
48
-+# ./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
49
-+# ./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \
50
-+# ./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \
51
-+# ./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \
52
-+# ./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
53
-+# ./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
54
-+# ./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
55
-+# ./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \
56
-+# ./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
57
-+# ./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
58
-+# ./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \
59
-+# ./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \
60
-+# ./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
61
-+# ./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
62
-+# ./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
63
-+# ./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
64
-+# ./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \
65
-+# ./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \
66
-+# ./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \
67
-+# ./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
68
-+# ./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
69
-+# ./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
70
-+# ./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
71
- 
72
- 
73
- SRCS := $(OBJS:.o=.c) 
74
-@@ -55,12 +55,14 @@ OBJSPIC=$(OBJS:.o=.opic)
75
- else
76
- OBJSPIC=$(OBJS)
77
- endif
78
-+AMR_NB_LIBS=-lamrnb
79
-+AMR_WB_LIBS=-lamrwb
80
- 
81
- all: $(LIB)
82
- 
83
- 
84
- $(LIB): $(OBJS)
85
--  $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
86
-+  $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
87
- 
88
- 
89
- %.o: %.c
90
-diff -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Makefile
91
---- gpac/modules/amr_float_dec/Makefile.amr    2008-02-17 23:26:57.000000000 +0100
92
-+++ gpac/modules/amr_float_dec/Makefile    2008-02-17 23:35:00.000000000 +0100
93
-@@ -21,16 +21,18 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o
94
- #AMR NB obj
95
- CFLAGS+=-DGPAC_HAS_AMR_FT
96
- ifeq ($(CONFIG_AMR_NB_FT), yes)
97
--OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
98
-+#OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
99
-+AMR_NB_LIBS=-lamrnb
100
- endif
101
- 
102
- 
103
- #AMR WB obj
104
- CFLAGS+=-DGPAC_HAS_AMR_FT_WB
105
- ifeq ($(CONFIG_AMR_WB_FT), yes)
106
--OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
107
--  ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
108
--  ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o 
109
-+#OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
110
-+# ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
111
-+# ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o 
112
-+AMR_WB_LIBS=-lamrwb
113
- endif
114
- 
115
- 
116
-@@ -51,7 +53,7 @@ all: $(LIB)
117
- 
118
- 
119
- $(LIB): $(OBJSPIC)
120
--  $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
121
-+  $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
122
- 
123
- 
124
- %.o: %.c
125
-diff -up gpac/modules/amr_float_dec/amr_float_dec.c.amr gpac/modules/amr_float_dec/amr_float_dec.c
126
---- gpac/modules/amr_float_dec/amr_float_dec.c.amr 2006-12-13 16:12:05.000000000 +0100
127
-+++ gpac/modules/amr_float_dec/amr_float_dec.c 2008-02-17 23:38:03.000000000 +0100
128
-@@ -31,12 +31,12 @@
129
- 
130
- #ifdef GPAC_HAS_AMR_FT
131
- /*AMR NB*/
132
--#include "amr_nb_ft/interf_dec.h"
133
-+#include "amrnb/interf_dec.h"
134
- #endif
135
- 
136
- #ifdef GPAC_HAS_AMR_FT_WB
137
- /*AMR WB*/
138
--#include "amr_wb_ft/dec_if.h"
139
-+#include "amrwb/dec_if.h"
140
- #endif
141
- 
142
- /*default size in CU of composition memory for audio*/
143
gpac-0.5.0-64bit-portability.patch Added
24
 
1
@@ -0,0 +1,22 @@
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_name50);
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
gpac-0.5.0-SVGGen_abuild.patch Added
14
 
1
@@ -0,0 +1,12 @@
2
+diff -urN gpac-0.5.0.svn4192.orig/applications/generators/SVG/Makefile gpac-0.5.0.svn4192/applications/generators/SVG/Makefile
3
+--- gpac-0.5.0.svn4192.orig/applications/generators/SVG/Makefile   2012-10-31 04:14:54.011804771 +0800
4
++++ gpac-0.5.0.svn4192/applications/generators/SVG/Makefile    2012-10-31 04:21:04.182859948 +0800
5
+@@ -35,7 +35,7 @@
6
+ all: $(PROG)
7
+ 
8
+ SVGGen$(EXE): $(OBJS) 
9
+-  $(CC) $(LDFLAGS) -o $@ $(OBJS) $(XML2_LIBS) $(EXTRALIBS) -L../../../bin/gcc -L../../../extra_lib/lib/gcc -lgpac -lz
10
++  $(CC) $(LDFLAGS) -o $@ $(OBJS) $(XML2_LIBS) $(EXTRALIBS) -L../../../bin/gcc -L../../../extra_lib/lib/gcc -lgpac -lz -lxml2
11
+ 
12
+ 
13
+ %.o: %.c
14
gpac-0.5.0-enable_V4Studio.patch Added
104
 
1
@@ -0,0 +1,102 @@
2
+diff -urN gpac-0.5.0.svn4192.orig/applications/Makefile gpac-0.5.0.svn4192/applications/Makefile
3
+--- gpac-0.5.0.svn4192.orig/applications/Makefile  2012-11-01 07:44:25.050487961 +0800
4
++++ gpac-0.5.0.svn4192/applications/Makefile   2012-11-01 07:45:17.704267823 +0800
5
+@@ -17,15 +17,15 @@
6
+ INSTDIRS=mp4client
7
+ ifeq ($(CONFIG_XUL),no)
8
+ else
9
+-#INSTDIRS+=osmozilla
10
+-#APPDIRS+=osmozilla
11
++INSTDIRS+=osmozilla
12
++APPDIRS+=osmozilla
13
+ endif
14
+ 
15
+ #disable due to version incompatibilities
16
+ ifeq ($(USE_WXWIDGETS), yes)
17
+-#APPDIRS+=osmo4_wx
18
+-#V4STUDIODIR=V4Studio
19
+-#INSTDIRS+=osmo4_wx
20
++APPDIRS+=osmo4_wx
21
++V4STUDIODIR=V4Studio
22
++INSTDIRS+=osmo4_wx
23
+ endif
24
+ 
25
+ ALLDIRS=$(APPDIRS)
26
+diff -urN gpac-0.5.0.svn4192.orig/applications/osmo4_wx/Makefile gpac-0.5.0.svn4192/applications/osmo4_wx/Makefile
27
+--- gpac-0.5.0.svn4192.orig/applications/osmo4_wx/Makefile 2012-11-01 07:44:25.011488147 +0800
28
++++ gpac-0.5.0.svn4192/applications/osmo4_wx/Makefile  2012-11-01 08:07:33.914532090 +0800
29
+@@ -46,7 +46,7 @@
30
+ all: $(PROG)
31
+ 
32
+ Osmo4$(EXE): $(OBJS)
33
+-  $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS)
34
++  $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lm $(WX_LFLAGS) $(LINKFLAGS)
35
+ 
36
+ clean: 
37
+   rm -f $(OBJS) ../../bin/gcc/$(PROG)
38
+diff -urN gpac-0.5.0.svn4192.orig/applications/osmozilla/osmo_npapi.cpp gpac-0.5.0.svn4192/applications/osmozilla/osmo_npapi.cpp
39
+--- gpac-0.5.0.svn4192.orig/applications/osmozilla/osmo_npapi.cpp  2012-11-01 07:44:25.049487966 +0800
40
++++ gpac-0.5.0.svn4192/applications/osmozilla/osmo_npapi.cpp   2012-11-01 07:46:04.823168413 +0800
41
+@@ -373,10 +373,10 @@
42
+   /* explicit plugin call */ \
43
+   "application/x-gpac::GPAC plugin;" \
44
+ 
45
+-char * NP_GetMIMEDescription(void)
46
++/*char * NP_GetMIMEDescription(void)
47
+ {
48
+   return (char *) GPAC_PLUGIN_MIMETYPES;
49
+-}
50
++}*/
51
+ 
52
+ 
53
+ NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
54
+diff -urN gpac-0.5.0.svn4192.orig/src/terminal/object_browser.c gpac-0.5.0.svn4192/src/terminal/object_browser.c
55
+--- gpac-0.5.0.svn4192.orig/src/terminal/object_browser.c  2012-11-01 07:44:25.105487684 +0800
56
++++ gpac-0.5.0.svn4192/src/terminal/object_browser.c   2012-11-01 07:47:37.788217060 +0800
57
+@@ -103,6 +103,7 @@
58
+ }
59
+ 
60
+ /*select given object when stream selection is available*/
61
++GF_EXPORT
62
+ void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm)
63
+ {
64
+   if (!term || !odm) return;
65
+diff -urN gpac-0.5.0.svn4192.orig/src/terminal/terminal.c gpac-0.5.0.svn4192/src/terminal/terminal.c
66
+--- gpac-0.5.0.svn4192.orig/src/terminal/terminal.c    2012-11-01 07:44:25.105487684 +0800
67
++++ gpac-0.5.0.svn4192/src/terminal/terminal.c 2012-11-01 07:47:11.843174648 +0800
68
+@@ -1868,6 +1868,7 @@
69
+   return 0;
70
+ }
71
+ 
72
++GF_EXPORT
73
+ const char *gf_term_get_text_selection(GF_Terminal *term, Bool probe_only)
74
+ {
75
+   Bool has_text;
76
+@@ -1878,7 +1879,7 @@
77
+   return gf_sc_get_selected_text(term->compositor);
78
+ }
79
+ 
80
+-
81
++GF_EXPORT
82
+ GF_Err gf_term_paste_text(GF_Terminal *term, const char *txt, Bool probe_only)
83
+ {
84
+   if (!term) return GF_BAD_PARAM;
85
+diff -urN gpac-0.5.0.svn4192.orig/src/utils/os_divers.c gpac-0.5.0.svn4192/src/utils/os_divers.c
86
+--- gpac-0.5.0.svn4192.orig/src/utils/os_divers.c  2012-11-01 07:44:25.063487899 +0800
87
++++ gpac-0.5.0.svn4192/src/utils/os_divers.c   2012-11-01 07:49:08.178526744 +0800
88
+@@ -315,6 +315,7 @@
89
+ #endif
90
+ }
91
+ 
92
++GF_EXPORT
93
+ void gf_rand_init(Bool Reset)
94
+ {
95
+   if (Reset) {
96
+@@ -328,6 +329,7 @@
97
+   }
98
+ }
99
+ 
100
++GF_EXPORT
101
+ u32 gf_rand()
102
+ {
103
+   return rand();
104
gpac-0.5.0-smjs_call_prop_stub.patch Added
14
 
1
@@ -0,0 +1,12 @@
2
+diff -urN gpac-0.5.0.svn4192.orig/include/gpac/internal/smjs_api.h gpac-0.5.0.svn4192/include/gpac/internal/smjs_api.h
3
+--- gpac-0.5.0.svn4192.orig/include/gpac/internal/smjs_api.h   2012-10-29 21:29:06.010776296 +0800
4
++++ gpac-0.5.0.svn4192/include/gpac/internal/smjs_api.h    2012-10-29 21:29:28.617532944 +0800
5
+@@ -47,7 +47,7 @@
6
+   JSObject *_proto;
7
+ } GF_JSClass;
8
+ 
9
+-
10
++#define USE_FFDEV_16
11
+ 
12
+ /*new APIs*/
13
+ #if (JS_VERSION>=185)
14
gpac-0.5.0-x264-export.patch Added
32
 
1
@@ -0,0 +1,30 @@
2
+diff -urN gpac-0.5.0.svn4192.orig/src/isomedia/avc_ext.c gpac-0.5.0.svn4192/src/isomedia/avc_ext.c
3
+--- gpac-0.5.0.svn4192.orig/src/isomedia/avc_ext.c 2012-11-01 07:44:25.104487689 +0800
4
++++ gpac-0.5.0.svn4192/src/isomedia/avc_ext.c  2012-11-01 17:46:04.064318199 +0800
5
+@@ -191,6 +191,7 @@
6
+ 
7
+ 
8
+ #ifndef GPAC_DISABLE_ISOM_WRITE
9
++GF_EXPORT
10
+ GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
11
+ {
12
+   GF_TrackBox *trak;
13
+diff -urN gpac-0.5.0.svn4192.orig/src/isomedia/isom_write.c gpac-0.5.0.svn4192/src/isomedia/isom_write.c
14
+--- gpac-0.5.0.svn4192.orig/src/isomedia/isom_write.c  2012-11-01 07:44:25.102487699 +0800
15
++++ gpac-0.5.0.svn4192/src/isomedia/isom_write.c   2012-11-01 17:45:30.020931257 +0800
16
+@@ -1141,6 +1141,7 @@
17
+   return Track_SetStreamDescriptor(trak, StreamDescriptionIndex, entry->dataReferenceIndex, esd, NULL);
18
+ }
19
+ 
20
++GF_EXPORT
21
+ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height)
22
+ {
23
+   GF_Err e;
24
+@@ -1188,6 +1189,7 @@
25
+   }
26
+ }
27
+ 
28
++GF_EXPORT
29
+ GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
30
+ {
31
+   GF_Err e;
32
gpac-a52dec.patch Deleted
22
 
1
@@ -1,20 +0,0 @@
2
-diff -Naur gpac-org/modules/ac3_in/liba52_dec.c gpac/modules/ac3_in/liba52_dec.c
3
---- gpac-org/modules/ac3_in/liba52_dec.c   2008-11-28 16:13:58.000000000 +0100
4
-+++ gpac/modules/ac3_in/liba52_dec.c   2009-11-22 18:17:18.000000000 +0100
5
-@@ -34,7 +34,6 @@
6
- #define uint8_t u8
7
- #endif
8
- 
9
--#include <a52dec/mm_accel.h>
10
- #include <a52dec/a52.h>
11
- 
12
- 
13
-@@ -63,7 +62,7 @@
14
-   GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("A52 Attaching stream %d\n", esd->ESID));
15
- 
16
-   if (ctx->codec) a52_free(ctx->codec);
17
--  ctx->codec = a52_init(MM_ACCEL_DJBFFT);
18
-+  ctx->codec = a52_init(A52_ACCEL_DJBFFT);
19
-   if (!ctx->codec) {
20
-       GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("A52 Error initializing decoder\n"));
21
-       return GF_IO_ERR;
22
gpac-bufferoverflow.patch Deleted
14
 
1
@@ -1,12 +0,0 @@
2
-diff -Naur gpac-org/src/isomedia/box_code_base.c gpac/src/isomedia/box_code_base.c
3
---- gpac-org/src/isomedia/box_code_base.c  2008-10-31 14:42:56.000000000 +0100
4
-+++ gpac/src/isomedia/box_code_base.c  2009-10-19 15:09:52.000000000 +0200
5
-@@ -109,7 +109,7 @@
6
-   
7
-   tmp = (GF_ChapterListBox *) malloc(sizeof(GF_ChapterListBox));
8
-   if (tmp == NULL) return NULL;
9
--  memset(tmp, 0, sizeof(GF_CopyrightBox));
10
-+  memset(tmp, 0, sizeof(GF_ChapterListBox));
11
-   tmp->list = gf_list_new();
12
-   gf_isom_full_box_init((GF_Box *)tmp);
13
-   tmp->type = GF_ISOM_BOX_TYPE_CHPL;
14
26104-610.zip Deleted
26104-b00.zip Added
26204-600.zip Deleted
26204-b00.zip Added
gpac-0.4.5.tar.bz2 Deleted
gpac-0.5.0.svn4192.tar.bz2 Added
Refresh

No build results available

Refresh

No rpmlint results available

Mentioned Issues (1)

sf#%s
Request History
Marguerite Su's avatar

marguerite created request over 11 years ago

[Final]update to 0.5.0. fix a lot of things. can be used by x264 now.


pbleser's avatar

pbleser accepted request over 12 years ago

ok