Request 314 (accepted)

Overview

Request 314 (accepted)

fix sles and < 1140 builds in Essentials

Created by marguerite over 11 years ago
In state accepted

Submit gpac

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

gpac.changes Changed

gpac.spec Changed

@@ -51,19 +51,22 @@
 BuildRequires:  alsa-devel
 BuildRequires:  dos2unix
 BuildRequires:  doxygen
-BuildRequires:	fdupes
+BuildRequires:	 fdupes
 BuildRequires:  freeglut-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
-%if 0%{?suse_version} == 1140
-BuildRequires:  mozilla-js192
-%endif
-%if 0%{?suse_version} > 1140
-BuildRequires:  js-devel
+%if 0%{?suse_version} >= 1140
+BuildRequires:  libSDL-devel
+%else
+BuildRequires:  SDL-devel
 %endif
 BuildRequires:  liba52-devel
 BuildRequires:  libfaad-devel
 BuildRequires:  libffmpeg-devel
+# fix for evergreen 11
+%if 0%{?suse_version} == 1110
+BuildRequires:  libidl
+%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmad-devel
 BuildRequires:  libogg-devel
@@ -73,17 +76,24 @@
 BuildRequires:  libtheora-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  libxvidcore-devel
-BuildRequires:  pkgconfig(libopenjpeg)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} == 1140
-BuildRequires:  mozilla-xulrunner192-devel
+BuildRequires:  mozilla-js192
 %endif
 %if 0%{?suse_version} > 1140
+BuildRequires:  js-devel
+%endif
+%if 0%{?suse_version} <= 1140
+%if ! 0%{?sles_version}
+BuildRequires:  mozilla-xulrunner192-devel
+%endif
+%else
 BuildRequires:  xulrunner-devel
 %endif
-BuildRequires:  libSDL-devel
 BuildRequires:  libopenssl-devel
+%if 0%{?suse_version} >= 1140
+BuildRequires:  pkgconfig(libopenjpeg)
+%endif
+BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 %if 0%{?suse_version} >= 1140
@@ -92,6 +102,7 @@
 BuildRequires:  wxGTK-devel
 %endif
 BuildRequires:  zlib-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 GPAC is a multimedia framework for MPEG-4, VRML/X3D and SVG/SMIL.
@@ -166,6 +177,7 @@
 * applications benefiting from MPEG-7 and MPEG-21 advances: meta-data,
   encryption, watermarking, rights management
 
+%if ! 0%{?sles_version}
 %package browser-plugin
 Summary:        Osmozilla is a GPAC plugin for Mozilla-based browsers
 Group:          Productivity/Networking/Web/Utilities
@@ -173,6 +185,7 @@
 
 %description browser-plugin
 Osmozilla is a GPAC plugin for Mozilla-based browsers.
+%endif
 
 %prep
 %setup -q
@@ -213,8 +226,8 @@
 rm -rf doc/ipmpx_syntax.bt.origine
 
 %build
-%if 0%{?suse_version} > 1140
 # regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
+%if 0%{?suse_version} > 1140
 pushd applications/osmozilla
     chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
     chmod 666 nsIOsmozilla.h
@@ -235,7 +248,7 @@
     cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
 popd
 %else
-# regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
+%if ! 0%{?sles_version}
 pushd applications/osmozilla
     chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
     chmod 666 nsIOsmozilla.h
@@ -261,6 +274,7 @@
     cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
 popd
 %endif
+%endif
 
 # configure the beast
 ./configure \
@@ -269,7 +283,9 @@
     --libdir=lib64 \
 %endif
     --mandir=%{_mandir} \
+%if ! 0%{?sles_version}
     --xulsdk-path=`pkg-config --variable=sdkdir libxul` \
+%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 ...)
@@ -293,11 +309,13 @@
     DESTDIR=%{buildroot}
 
 # browser-plugin
+%if ! 0%{?sles_version}
 install -dm 755 %{buildroot}%{_libdir}/browser-plugins
 install -m 755 bin/gcc/nposmozilla.so \
     %{buildroot}%{_libdir}/browser-plugins
 install -m 755 bin/gcc/nposmozilla.xpt \
     %{buildroot}%{_libdir}/browser-plugins
+%endif
 
 # generated sggen binaries
 for i in MPEG4 SVG X3D; do
@@ -378,8 +396,10 @@
 %{_datadir}/pixmaps/Osmo4.png
 %{_datadir}/applications/Osmo4.desktop
 
+%if ! 0%{?sles_version}
 %files browser-plugin
 %defattr(-,root,root)
 %{_libdir}/browser-plugins/nposmozilla.*
+%endif
 
-%changelog
+%changelog
\ No newline at end of file

gpac-0.5.0-64bit-portability.patch Changed

@@ -1,22 +1,33 @@
-Index: gpac/applications/generators/SVG/svggen.h
-===================================================================
---- gpac.old/applications/generators/SVG/svggen.h	(版本 4214)
-+++ gpac/applications/generators/SVG/svggen.h	(工作副本)
-@@ -190,6 +190,17 @@
- 
- FILE *BeginFile(u32 type);
- void EndFile(FILE *f, u32 type);
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
-+void generate_laser_tables(GF_List *svg_elements);
-+void generate_table(GF_List *elements);
-+void generateSVGCode_V1(GF_List *svg_elements);
-+void generateSVGCode_V2(GF_List *svg_elements);
-+void generateSVGCode_V3(GF_List *svg_elements);
-+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
-+void generate_laser_tables_da(GF_List *atts);
- 
- 
- #endif // _SVGGEN_H_
+diff -urN gpac-0.5.0.svn4192.orig/applications/generators/SVG/svggen.h gpac-0.5.0.svn4192/applications/generators/SVG/svggen.h
+--- gpac-0.5.0.svn4192.orig/applications/generators/SVG/svggen.h	2012-11-03 00:19:59.723621042 +0800
++++ gpac-0.5.0.svn4192/applications/generators/SVG/svggen.h	2012-11-05 08:53:01.166895888 +0800
+@@ -190,6 +190,16 @@
+ 
+ FILE *BeginFile(u32 type);
+ void EndFile(FILE *f, u32 type);
+-
++SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
++void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
++u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
++void generate_laser_tables(GF_List *svg_elements);
++void generate_table(GF_List *elements);
++void generateSVGCode_V1(GF_List *svg_elements);
++void generateSVGCode_V2(GF_List *svg_elements);
++void generateSVGCode_V3(GF_List *svg_elements);
++void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
++u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
++void generate_laser_tables_da(GF_List *atts);
+ 
+ #endif // _SVGGEN_H_
+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
+--- gpac-0.5.0.svn4192.orig/src/scene_manager/scene_manager.c	2012-11-03 00:19:59.746621159 +0800
++++ gpac-0.5.0.svn4192/src/scene_manager/scene_manager.c	2012-11-05 08:50:16.795465561 +0800
+@@ -29,7 +29,7 @@
+ #include <gpac/bifs.h>
+ #include <gpac/xml.h>
+ #include <gpac/internal/scenegraph_dev.h>
+-
++#include <gpac/network.h>
+ 
+ GF_EXPORT
+ GF_SceneManager *gf_sm_new(GF_SceneGraph *graph)

Build Results
RPM Lint

Refresh

Comments for request 314 0

Request History

marguerite created request over 11 years ago

fix sles and < 1140 builds in Essentials

mrdocs accepted request about 12 years ago

Thanks. Looks good to me!