Request 374 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 374 (accepted)

- svn4296 - includes fixes for compilation with Firefox 18
- disable while compiling with xulrunner 17.0.2
* subpackage Osmo4
* browser-client
* MP4client in main package

Created by jsjhb over 11 years ago
In state accepted

Submit gpac

Submit package home:jsjhb:branches:Essentials / gpac to package Essentials / gpac

gpac.changes Changed

gpac.spec Changed

@@ -24,8 +24,15 @@
 %define xulrunner192_version %(rpm -q --qf '%%{VERSION}' mozilla-xulrunner192-devel | sed 's|\\..*$||')
 %endif
 
+# obs@botter.cc - ugly hack to disable compilation with xulrunnner 17.0.2
+%if 0%{?xulrunner_version} == 17
+%define wo_applications 1
+%else
+%define wo_applications 0
+%endif
+
 Name:           gpac
-Version:        0.5.0.svn4192
+Version:        0.5.0.svn4296
 Release:        1.pm.1
 License:        LGPL-2.1+
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
@@ -45,6 +52,8 @@
 Patch3:		gpac-0.5.0-64bit-portability.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - export functions x264 needs
 Patch4:		gpac-0.5.0-x264-export.patch
+#PATCH-FIX-UPSTREAM obs@botter.cc - disable applications osmozilla, osmo4_wx
+Patch10:	gpac-0.5.0-disable-applications.patch
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
@@ -152,6 +161,7 @@
 
 Author:         Jean Le Feuvre <jeanlf@users.sourceforge.net>
 
+%if ! %{wo_applications}
 %package -n Osmo4
 Summary:        MPEG-4 Media player based on gpac
 Group:          Productivity/Multimedia/Video/Players
@@ -186,6 +196,7 @@
 %description browser-plugin
 Osmozilla is a GPAC plugin for Mozilla-based browsers.
 %endif
+%endif
 
 %prep
 %setup -q
@@ -200,6 +211,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%if %{wo_applications}
+%patch10 -p1
+%endif
 
 # unpack amr files
 install -dm 755 modules/amr_float_dec/amr_nb_ft
@@ -286,6 +300,9 @@
 %if ! 0%{?sles_version}
     --xulsdk-path=`pkg-config --variable=sdkdir libxul` \
 %endif
+%if %{wo_applications}
+    --disable-scenegraph \
+%endif
     --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC" 
 
 # make the beast (NO parallel build possible ...)
@@ -308,6 +325,7 @@
 make install-lib \
     DESTDIR=%{buildroot}
 
+%if ! %{wo_applications}
 # browser-plugin
 %if ! 0%{?sles_version}
 install -dm 755 %{buildroot}%{_libdir}/browser-plugins
@@ -316,6 +334,7 @@
 install -m 755 bin/gcc/nposmozilla.xpt \
     %{buildroot}%{_libdir}/browser-plugins
 %endif
+%endif
 
 # generated sggen binaries
 for i in MPEG4 SVG X3D; do
@@ -325,21 +344,24 @@
 install -m 755 bin/gcc/mp4* \
     %{buildroot}%{_bindir}
 
-# Osmo4
-install -m 755 bin/gcc/Osmo4 \
-    %{buildroot}%{_bindir}
-
 # udptsseg
 install -m 755 bin/gcc/udptsseg \
     %{buildroot}%{_bindir}
 
+%if ! %{wo_applications}
+# Osmo4
+install -m 755 bin/gcc/Osmo4 \
+    %{buildroot}%{_bindir}
+
 # icon
 install -dm 755 %{buildroot}%{_datadir}/pixmaps
 convert -size 48x48 applications/osmo4_wx/osmo4.xpm \
     Osmo4.png
 install -m 644 Osmo4.png \
     %{buildroot}%{_datadir}/pixmaps
+%endif
 
+%if ! %{wo_applications}
 # menu-entry
 install -dm 755 %{buildroot}%{_datadir}/applications
 cat > Osmo4.desktop << EOF
@@ -353,6 +375,7 @@
 Terminal=false
 EOF
 %suse_update_desktop_file -i Osmo4 AudioVideo Player
+%endif
 
 # static lib
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -368,7 +391,9 @@
 %doc AUTHORS BUGS Changelog COPYING README TODO
 %doc doc/configuration.html
 %{_bindir}/MP4Box
+%if ! %{wo_applications}
 %{_bindir}/MP4Client
+%endif
 %{_bindir}/MPEG4Gen
 %{_bindir}/X3DGen
 %{_bindir}/SVGGen
@@ -390,6 +415,7 @@
 %{_includedir}/%{name}/
 %{_libdir}/*.so
 
+%if ! %{wo_applications}
 %files -n Osmo4
 %defattr(-,root,root)
 %{_bindir}/Osmo4
@@ -401,5 +427,6 @@
 %defattr(-,root,root)
 %{_libdir}/browser-plugins/nposmozilla.*
 %endif
+%endif
 
-%changelog
\ No newline at end of file
+%changelog

gpac-0.5.0-64bit-portability.patch Changed

gpac-0.5.0-disable-applications.patch Added

gpac-0.5.0.svn4192.tar.bz2 -> gpac-0.5.0.svn4296.tar.bz2 Changed

Build Results
RPM Lint

Refresh

Comments for request 374 0

Request History

jsjhb created request over 11 years ago

- svn4296 - includes fixes for compilation with Firefox 18
- disable while compiling with xulrunner 17.0.2
* subpackage Osmo4
* browser-client
* MP4client in main package

mrdocs accepted request almost 12 years ago

Reviewed OK