Request 310 (accepted)

Overview

Request 310 (accepted)

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

Created by marguerite over 10 years ago
In state accepted

Submit gpac

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

gpac.changes Changed

@@ -1,4 +1,50 @@
 -------------------------------------------------------------------
+Wed Oct 31 23:50:15 UTC 2012 - i@margueirte.su
+
+- fix Tumbleweed builds.
+- adjust enable_V4Studio.patch.
+  * do not use static lib for linking.
+
+-------------------------------------------------------------------
+Thu Oct  4 06:42:47 UTC 2012 - i@marguerite.su
+
+- update to 0.5.0
+  * MPEG-DASH and HLS support (players and MP4Box)
+  * MPEG-U Widgets and UPnP support in the player
+  * Stereo and multiview display support
+  * Better AVC and SVC support including OpenSVC decoder integration
+  * More live tools: RTP, MPEG-TS, T-DMB support, scene encoders (BIFS and RME/DIMS)
+  * iOS and Android support
+  * and many other good things
+- svn4192 fixes sf#3574796:
+  * Osmozilla: change switch_up type from int to long, since xulrunner 15 doesn't support int type directly.
+  * change bogus uuid in Osmozilla.
+  * fix mozjs15 depreciated JS_ConstructObject to JS_New.
+- enable_V4Studio patch
+  * upstream masked Osmo4_wx and osmozilla. I enabled them and fix linker errors.
+- smjs_call_prop_stub.patch
+  * fix openSUSE xulrunner version.
+- SVGGen_abuild.patch
+  * fix applications/generators/SVG linker errors.
+- 64bit-portability.patch
+  * fix OBS errors and warnings.
+- enable build udptsseg, a HTTP streaming tool.
+- spec clean.
+  * remove _with_amr. we're already in PMBS.
+  * correct BuildRequires package names and remove unneeded Requires.
+  * remove dos2unix fixes
+  * remove 64bit adjustments. we use upstream options.
+  * remove libpng-1.4.0 fix. no longer need.
+  * remove SONAME. upstream did that.
+  * remove openjpeg fix. 
+  * remove unneeded configure options.
+  * remove < 1140 conditionals.
+  * use new ffmpeg. upstream code change.
+  * add IDL regeneration for newer xulrunner.
+  * enable osmozilla for all openSUSE versions. although few need it.
+- TODO: enable hbbtvplayer builds.
+
+-------------------------------------------------------------------
 Fri Dec 16 20:38:01 UTC 2011 - pascal.bleser@opensuse.org
 
 - fix build on recent openSUSE versions, failure was introduced by missing OPENJPEG_VERSION
@@ -82,4 +128,3 @@
 Fri Dec  8 00:00:00 UTC 2006 - toni@links2linux.de
 
 - initial build 0.4.3-cvs20061114
-

gpac.spec Changed

@@ -1,61 +1,89 @@
-# vim: set ts=4 sw=4 et:
-# Copyright (c) 2006-2010 oc2pus
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments to packman@links2linux.de
+# spec file for package gpac
+#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+%define soname		2
 
-%define _with_amr	1
-%define soname		0
+# workaround for Tumbleweed. Because we can't detect it directly.
+%if 0%{?suse_version} >= 1210
+%define xulrunner_version %(rpm -q --qf '%%{VERSION}' xulrunner-devel | sed 's|\\..*$||')
+%else
+%define xulrunner192_version %(rpm -q --qf '%%{VERSION}' mozilla-xulrunner192-devel | sed 's|\\..*$||')
+%endif
 
 Name:           gpac
-Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
-Version:        0.4.5
+Version:        0.5.0.svn4192
 Release:        1.pm.1
+License:        LGPL-2.1+
+Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
+Group:          Productivity/Multimedia/Video/Editors and Convertors
 Source:         gpac-%{version}.tar.bz2
-%if "%{_with_amr}" == "1"
-Source1:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-610.zip
-Source2:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-600.zip
-%endif
+Source1:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-b00.zip
+Source2:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip
+Url:            http://gpac.sourceforge.net
 Source90:       %{name}-rpmlintrc
-Patch0:         %{name}-bufferoverflow.patch
-Patch1:         %{name}-a52dec.patch
-%if %suse_version > 1140
-Patch2:         buildfix-for-factory.diff
-%endif
-URL:            http://gpac.sourceforge.net/
-License:        GNU Lesser General Public License version 2.1 or later (LGPLv2.1 or later)
-Group:          Productivity/Multimedia/Video/Editors and Convertors
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+#PATCH-FIX-openSUSE i@marguerite.su - openSUSE only fix for sf#3574796
+Patch0:         gpac-0.5.0-smjs_call_prop_stub.patch
+#PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
+Patch1:		gpac-0.5.0-enable_V4Studio.patch
+#PATCH-FIX-UPSTREAM i@marguerite.su - fix SVGGen ldflags
+Patch2:		gpac-0.5.0-SVGGen_abuild.patch
+#PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
+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
+BuildRequires:  DirectFB-devel
+BuildRequires:  ImageMagick
+BuildRequires:  Mesa-devel
 BuildRequires:  alsa-devel
 BuildRequires:  dos2unix
 BuildRequires:  doxygen
-BuildRequires:  freetype2-devel
+BuildRequires:	fdupes
 BuildRequires:  freeglut-devel
+BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
-BuildRequires:  ImageMagick
+%if 0%{?suse_version} == 1140
+BuildRequires:  mozilla-js192
+%endif
+%if 0%{?suse_version} > 1140
+BuildRequires:  js-devel
+%endif
 BuildRequires:  liba52-devel
-#BuildRequires:	libamrnb-devel
-#BuildRequires:	libamrwb-devel
-BuildRequires:  libfaad2-devel
-BuildRequires:  libffmpeg_oldabi-devel
+BuildRequires:  libfaad-devel
+BuildRequires:  libffmpeg-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  libjs-devel
 BuildRequires:  libmad-devel
 BuildRequires:  libogg-devel
-BuildRequires:  pkgconfig(libopenjpeg)
 BuildRequires:  libpng-devel
-BuildRequires:  librsvg2-devel >= 2.5.0
+BuildRequires:  libpulse-devel
+BuildRequires:  librsvg-devel >= 2.5.0
 BuildRequires:  libtheora-devel
 BuildRequires:  libvorbis-devel
-BuildRequires:  libxml2-devel
 BuildRequires:  libxvidcore-devel
-BuildRequires:  Mesa-devel
-%if %suse_version >= 1140
+BuildRequires:  pkgconfig(libopenjpeg)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} == 1140
 BuildRequires:  mozilla-xulrunner192-devel
 %endif
-BuildRequires:  openssl-devel
-BuildRequires:  SDL-devel
+%if 0%{?suse_version} > 1140
+BuildRequires:  xulrunner-devel
+%endif
+BuildRequires:  libSDL-devel
+BuildRequires:  libopenssl-devel
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 %if 0%{?suse_version} >= 1140
@@ -104,41 +132,9 @@
 Summary:        Development files for gpac
 Group:          Development/Languages/C and C++
 Requires:       libgpac%{soname} = %{version}
-Requires:       freetype2-devel
-Requires:       freeglut-devel
-Requires:       ImageMagick
-Requires:       liba52-devel
-#Requires:	libamrnb-devel
-#Requires:	libamrwb-devel
-Requires:       libfaad2-devel
-Requires:       libffmpeg_oldabi-devel
-Requires:       libjpeg-devel
-Requires:       libjs-devel libjs1
-Requires:       libmad-devel
-Requires:       libopenjpeg-devel
-Requires:       libogg-devel
-Requires:       libpng-devel
-Requires:       libtheora-devel
-Requires:       libvorbis-devel
-Requires:       libxml2-devel
-Requires:       libxvidcore-devel
-Requires:       Mesa-devel
-%if %suse_version <= 1110
-Requires:       mozilla-xulrunner190-devel
-%else
-Requires:       mozilla-xulrunner191-devel
-%endif
-Requires:       openssl-devel
-Requires:       SDL-devel
-%if 0%{?suse_version} >= 1140
-Requires:       wxWidgets-wxcontainer-devel
-%else
-Requires:       wxGTK-devel
-%endif
-Requires:       zlib-devel
 # old name
-Provides:       gpac-devel = 0.4.4
-Obsoletes:      gpac-devel < 0.4.4
+Provides:       gpac-devel = %{version}
+Obsoletes:      gpac-devel < %{version}
 
 %description -n libgpac-devel
 Development files for gpac.
@@ -170,7 +166,6 @@
 * applications benefiting from MPEG-7 and MPEG-21 advances: meta-data,
   encryption, watermarking, rights management
 
-%if %suse_version <= 1030
 %package browser-plugin
 Summary:        Osmozilla is a GPAC plugin for Mozilla-based browsers
 Group:          Productivity/Networking/Web/Utilities
@@ -178,141 +173,111 @@
 
 %description browser-plugin
 Osmozilla is a GPAC plugin for Mozilla-based browsers.
-%endif
 
 %prep
-%setup -q -n %{name}
+%setup -q
+%if 0%{?suse_version} >= 1210
+%if 0%{?xulrunner_version} >= 16
+%patch0 -p1
+%endif
+%else
 %patch0 -p1
+%endif
 %patch1 -p1
-%if %suse_version > 1140
 %patch2 -p1
-%endif
-
-dos2unix     configure
-%__chmod 755 configure
-dos2unix     AUTHORS BUGS Changelog COPYING README TODO
-%__chmod 644 AUTHORS BUGS Changelog COPYING README TODO
-dos2unix     doc/CODING_STYLE doc/ipmpx_syntax.bt
-%__chmod 644 doc/CODING_STYLE doc/ipmpx_syntax.bt
-
-# 64bit adjustments ...
-%__perl -p -i -e 's/lGLU/lGLU\ \-L\/usr\/X11R6\/%{_lib}/g' \
-    configure
-%__perl -p -i -e 's,\$prefix/lib/gpac,\$prefix/%{_lib}/gpac,' \
-    configure
-%__perl -p -i -e 's,\$$prefix$/lib,\$(prefix)/%{_lib},' \
-    Makefile
-%__perl -p -i -e 's/Wall/w/g' `find -name \
-    Makefile`
-
-# libpng-1.4.0 needs this
-%__sed -i -e 's|png_infopp_NULL|NULL|g' \
-    src/media_tools/img.c
-
-# define SONAME number from the first number of gpac version
-%__sed -i -e 's|EXTRALIBS+=$(GPAC_SH_FLAGS)|EXTRALIBS+=$(GPAC_SH_FLAGS)\nLDFLAGS+="-Wl,-soname,libgpac.so.%{soname}"|' \
-    src/Makefile
+%patch3 -p1
+%patch4 -p1
 
 # unpack amr files
-%if "%{_with_amr}" == "1"
-%__install -dm 755 modules/amr_float_dec/amr_nb_ft
+install -dm 755 modules/amr_float_dec/amr_nb_ft
 pushd modules/amr_float_dec/amr_nb_ft
-    %__unzip -q %{SOURCE1}
-    %__unzip -qj 26104-610_ANSI_C_source_code.zip
+    unzip -q %{SOURCE1}
+    unzip -qj 26104-b00_ANSI_C_source_code.zip
 popd
 
-%__install -dm 755 modules/amr_float_dec/amr_wb_ft
+install -dm 755 modules/amr_float_dec/amr_wb_ft
 pushd modules/amr_float_dec/amr_wb_ft
-    %__unzip -q %{SOURCE2}
-    %__unzip -qj 26204-600_ANSI-C_source_code.zip
+    unzip -q %{SOURCE2}
+    unzip -qj 26204-b00_ANSI-C_source_code.zip
 popd
-%endif
-
-# new ffmpeg-API ...
-%__sed -i -e 's|ffd->ctx->bits_per_sample|ffd->ctx->bits_per_coded_sample|g' \
-    modules/ffmpeg_in/ffmpeg_decode.c
-%__sed -i -e 's|CODEC_ID_MP3LAME|CODEC_ID_MP3|g' \
-    modules/ffmpeg_in/ffmpeg_decode.c
-%__sed -i -e 's|dec->bits_per_sample|dec->bits_per_coded_sample|g' \
-    modules/ffmpeg_in/ffmpeg_demux.c
-%__sed -i -e 's|avcodec_decode_audio|avcodec_decode_audio2|g' \
-    modules/ffmpeg_in/ffmpeg_decode.c
-%__sed -i -e 's|ffd->ctx->height->codec->height|ffd->ctx->height|g' \
-    modules/ffmpeg_in/ffmpeg_decode.c
-
-# use system openjpeg
-%__sed -i -e 's|openjpeg.h|openjpeg/openjpeg.h|' \
-    configure modules/img_in/jp2_dec.c
 
 # Fix encoding warnings
-%__cp -p Changelog Changelog.origine
+cp -p Changelog Changelog.origine
 iconv -f ISO-8859-1 -t UTF8 Changelog.origine > Changelog
 touch -r Changelog.origine Changelog
-%__rm -rf Changelog.origine
+rm -rf Changelog.origine
 
-%__cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine
+cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine
 iconv -f ISO-8859-1 -t UTF8 doc/ipmpx_syntax.bt.origine > doc/ipmpx_syntax.bt
 touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt
-%__rm -rf doc/ipmpx_syntax.bt.origine
+rm -rf doc/ipmpx_syntax.bt.origine
 
 %build
+%if 0%{?suse_version} > 1140
+# regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
+pushd applications/osmozilla
+    chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
+    chmod 666 nsIOsmozilla.h
+    chmod 666 nsIOsmozilla.idl
+
+    %define _IDL_DIR `pkg-config --variable=idldir libxul`
+    %define _SDK_DIR `pkg-config --variable=sdkdir libxul`
+
+    %{_SDK_DIR}/sdk/bin/header.py \
+   	-I%{_IDL_DIR} \
+        -o nsIOsmozilla.h \
+   	nsIOsmozilla.idl
+        %{_SDK_DIR}/sdk/bin/typelib.py \
+   	-I%{_IDL_DIR} \
+       -o nsIOsmozilla.xpt \
+   	nsIOsmozilla.idl
+
+    cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
+popd
+%else
 # regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
 pushd applications/osmozilla
-    %__chmod 666 nsIOsmozilla.xpt_linux; %__rm nsIOsmozilla.xpt_linux
-    %__chmod 666 nsIOsmozilla.h
-    %__chmod 666 nsIOsmozilla.idl
+    chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
+    chmod 666 nsIOsmozilla.h
+    chmod 666 nsIOsmozilla.idl
 
     %define _IDL_DIR `pkg-config --variable=idldir libxul`
     %define _INC_DIR `pkg-config --variable=includedir libxul`
     %define _LIB_DIR `pkg-config --variable=libdir libxul`
-    
+
     %{_LIB_DIR}/xpidl \
-    	-m header \
-    	-I%{_IDL_DIR} \
-    	-I%{_INC_DIR}/xpcom/idl \
-    	nsIOsmozilla.idl
+        -m header \
+        -I%{_IDL_DIR} \
+        -I%{_INC_DIR}/xpcom/idl \
+        nsIOsmozilla.idl
     %{_LIB_DIR}/xpidl \
-    	-m typelib \
-    	-I%{_IDL_DIR} \
-    	-I%{_INC_DIR}/xpcom/idl \
-    	nsIOsmozilla.idl
+        -m typelib \
+        -I%{_IDL_DIR} \
+        -I%{_INC_DIR}/xpcom/idl \
+        nsIOsmozilla.idl
     %{_LIB_DIR}/xpt_link \
-    	nposmozilla.xpt nsIOsmozilla.xpt
-    
-    %__cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
-popd
+        nposmozilla.xpt nsIOsmozilla.xpt
 
-# for some reason, OPENJPEG_VERSION is not defined, so pass it directly
-OPENJPEG_VERSION="$(rpm -q --qf='%{version}' openjpeg-devel)"
+    cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
+popd
+%endif
 
 # configure the beast
 ./configure \
     --prefix=%{_prefix} \
-    --mandir=%{_mandir} \
-    --X11-libs=/usr/X11R6/%{_lib} \
-%if "%{_with_amr}" == "1"
-    --enable-amr \
+%ifarch x86_64
+    --libdir=lib64 \
 %endif
-    --enable-oss-audio \
-    --xulsdk-path=`pkg-config --variable=includedir libxul` \
-    --mozdir=%{_libdir}/browser-plugins \
-    --use-openjpeg=system \
-    --use-ogg=system \
-    --use-vorbis=system \
-    --use-theora=system \
-    --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\\\""
+    --mandir=%{_mandir} \
+    --xulsdk-path=`pkg-config --variable=sdkdir libxul` \
+    --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 ...)
-%__make all
-%__make sggen
-
-%if %suse_version <= 1030
-# mozilla-xulrunner191 has no npupp.h ...
-
-# make browser-plugin
-%__make -C applications/osmozilla \
-    XUL_CFLAGS="`pkg-config --define-variable=includetype=unstable --cflags libxul` `pkg-config --cflags nspr`"
-%endif
+# fix I: File is compiled without RPM_OPT_FLAGS gpac doesn't respect any flags at all
+make all CFLAG="%{optflags}"
+make sggen 
+make -C applications/generators/SVG
+make -C applications/udptsseg
 
 # create dev-docs
 pushd doc
@@ -321,50 +286,45 @@
 popd
 
 %install
-%__install -dm 755 %{buildroot}%{_bindir}
+%make_install 
 
-%makeinstall \
-    INSTFLAGS=""
-%__make install-lib \
+# header files
+make install-lib \
     DESTDIR=%{buildroot}
 
-%if %suse_version <= 1030
 # browser-plugin
-#%__make -C applications/osmozilla install \
-#	XUL_CFLAGS="`pkg-config --cflags libxul nspr`"
-%__install -dm 755 %{buildroot}%{_libdir}/browser-plugins
-%__install -m 644 bin/gcc/nposmozilla.so \
+install -dm 755 %{buildroot}%{_libdir}/browser-plugins
+install -m 755 bin/gcc/nposmozilla.so \
     %{buildroot}%{_libdir}/browser-plugins
-%__install -m 644 bin/gcc/nposmozilla.xpt \
+install -m 755 bin/gcc/nposmozilla.xpt \
     %{buildroot}%{_libdir}/browser-plugins
-%endif
 
-# install generated sggen binaries
-for i in MPEG4 X3D; do
-    %__install -m 755 applications/generators/$i/${i}Gen \
+# generated sggen binaries
+for i in MPEG4 SVG X3D; do
+    install -m 755 applications/generators/$i/${i}Gen \
     	%{buildroot}%{_bindir}
 done
-%__install -m 755 bin/gcc/mp4* \
+install -m 755 bin/gcc/mp4* \
     %{buildroot}%{_bindir}
 
-# create links for so-name
-%__mv %{buildroot}%{_libdir}/libgpac-%{version}.so \
-    %{buildroot}%{_libdir}/libgpac.so.%{version}
-ln -sf libgpac.so.%{version} \
-    %{buildroot}%{_libdir}/libgpac.so.0
-ln -sf libgpac.so.0 \
-    %{buildroot}%{_libdir}/libgpac.so
+# Osmo4
+install -m 755 bin/gcc/Osmo4 \
+    %{buildroot}%{_bindir}
+
+# udptsseg
+install -m 755 bin/gcc/udptsseg \
+    %{buildroot}%{_bindir}
 
 # icon
-%__install -dm 755 %{buildroot}%{_datadir}/pixmaps
+install -dm 755 %{buildroot}%{_datadir}/pixmaps
 convert -size 48x48 applications/osmo4_wx/osmo4.xpm \
     Osmo4.png
-%__install -m 644 Osmo4.png \
+install -m 644 Osmo4.png \
     %{buildroot}%{_datadir}/pixmaps
 
 # menu-entry
-%__install -dm 755 %{buildroot}%{_datadir}/applications
-%__cat > Osmo4.desktop << EOF
+install -dm 755 %{buildroot}%{_datadir}/applications
+cat > Osmo4.desktop << EOF
 Desktop Entry
 Comment=MPEG-4 Media player based on gpac
 Name=Osmo4
@@ -372,16 +332,14 @@
 Type=Application
 Exec=Osmo4
 Icon=Osmo4
-#Encoding=UTF-8
 Terminal=false
-#Categories=AudioVideo;Player;
 EOF
 %suse_update_desktop_file -i Osmo4 AudioVideo Player
 
-%__rm %{buildroot}%{_libdir}/*.a
+# static lib
+rm -rf %{buildroot}%{_libdir}/*.a
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+%fdupes %{buildroot}
 
 %post -n libgpac%{soname} -p /sbin/ldconfig
 
@@ -395,12 +353,11 @@
 %{_bindir}/MP4Client
 %{_bindir}/MPEG4Gen
 %{_bindir}/X3DGen
+%{_bindir}/SVGGen
 %{_bindir}/mp42ts
-%{_bindir}/mp4_streamer
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_bindir}/udptsseg
+%{_libdir}/%{name}/
+%{_datadir}/%{name}/
 %{_mandir}/man1/*
 
 %files -n libgpac%{soname}
@@ -412,21 +369,17 @@
 %defattr(-,root,root)
 %doc doc/CODING_STYLE doc/ipmpx_syntax.bt
 %doc doc/html/*
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/*
+%{_includedir}/%{name}/
 %{_libdir}/*.so
 
 %files -n Osmo4
 %defattr(-,root,root)
-#%doc doc/osmo4*
 %{_bindir}/Osmo4
 %{_datadir}/pixmaps/Osmo4.png
 %{_datadir}/applications/Osmo4.desktop
 
-%if %suse_version <= 1030
 %files browser-plugin
 %defattr(-,root,root)
 %{_libdir}/browser-plugins/nposmozilla.*
-%endif
 
 %changelog

buildfix-for-factory.diff Deleted

gpac-0.4.5-shared_amr.patch Deleted

@@ -1,141 +0,0 @@
-diff -up gpac/modules/amr_dec/amr_dec.c.amr gpac/modules/amr_dec/amr_dec.c
---- gpac/modules/amr_dec/amr_dec.c.amr	2008-02-17 23:43:55.000000000 +0100
-+++ gpac/modules/amr_dec/amr_dec.c	2008-02-17 23:44:20.000000000 +0100
-@@ -29,8 +29,8 @@
- #include <gpac/modules/service.h>
- #include <gpac/constants.h>
- 
--#include "amr_nb/sp_dec.h"
--#include "amr_nb/d_homing.h"
-+#include <amrnb/sp_dec.h>
-+#include <amrnb/d_homing.h>
- 
- 
- /*default size in CU of composition memory for audio*/
-diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile
---- gpac/modules/amr_dec/Makefile.amr	2008-02-17 23:39:25.000000000 +0100
-+++ gpac/modules/amr_dec/Makefile	2008-02-17 23:43:23.000000000 +0100
-@@ -17,30 +17,30 @@ LDFLAGS+=-pg
- endif
- 
- #common obj
--OBJS=amr_in.o amr_dec.o \
--	./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
--	./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 \
--	./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 \
--	./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 \
--	./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
--	./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
--	./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
--	./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 \
--	./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
--	./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
--	./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 \
--	./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 \
--	./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
--	./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
--	./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
--	./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
--	./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 \
--	./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 \
--	./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 \
--	./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
--	./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
--	./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
--	./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
-+OBJS=amr_in.o amr_dec.o
-+#	./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
-+#	./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 \
-+#	./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 \
-+#	./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 \
-+#	./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
-+#	./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
-+#	./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
-+#	./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 \
-+#	./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
-+#	./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
-+#	./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 \
-+#	./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 \
-+#	./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
-+#	./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
-+#	./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
-+#	./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
-+#	./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 \
-+#	./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 \
-+#	./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 \
-+#	./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
-+#	./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
-+#	./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
-+#	./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
- 
- 
- SRCS := $(OBJS:.o=.c) 
-@@ -55,12 +55,14 @@ OBJSPIC=$(OBJS:.o=.opic)
- else
- OBJSPIC=$(OBJS)
- endif
-+AMR_NB_LIBS=-lamrnb
-+AMR_WB_LIBS=-lamrwb
- 
- all: $(LIB)
- 
- 
- $(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-diff -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Makefile
---- gpac/modules/amr_float_dec/Makefile.amr	2008-02-17 23:26:57.000000000 +0100
-+++ gpac/modules/amr_float_dec/Makefile	2008-02-17 23:35:00.000000000 +0100
-@@ -21,16 +21,18 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o
- #AMR NB obj
- CFLAGS+=-DGPAC_HAS_AMR_FT
- ifeq ($(CONFIG_AMR_NB_FT), yes)
--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
-+#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
-+AMR_NB_LIBS=-lamrnb
- endif
- 
- 
- #AMR WB obj
- CFLAGS+=-DGPAC_HAS_AMR_FT_WB
- ifeq ($(CONFIG_AMR_WB_FT), yes)
--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 \
--	./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 \
--	./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 
-+#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 \
-+#	./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 \
-+#	./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 
-+AMR_WB_LIBS=-lamrwb
- endif
- 
- 
-@@ -51,7 +53,7 @@ all: $(LIB)
- 
- 
- $(LIB): $(OBJSPIC)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-diff -up gpac/modules/amr_float_dec/amr_float_dec.c.amr gpac/modules/amr_float_dec/amr_float_dec.c
---- gpac/modules/amr_float_dec/amr_float_dec.c.amr	2006-12-13 16:12:05.000000000 +0100
-+++ gpac/modules/amr_float_dec/amr_float_dec.c	2008-02-17 23:38:03.000000000 +0100
-@@ -31,12 +31,12 @@
- 
- #ifdef GPAC_HAS_AMR_FT
- /*AMR NB*/
--#include "amr_nb_ft/interf_dec.h"
-+#include "amrnb/interf_dec.h"
- #endif
- 
- #ifdef GPAC_HAS_AMR_FT_WB
- /*AMR WB*/
--#include "amr_wb_ft/dec_if.h"
-+#include "amrwb/dec_if.h"
- #endif
- 
- /*default size in CU of composition memory for audio*/

gpac-0.5.0-64bit-portability.patch Added

@@ -0,0 +1,22 @@
+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_name50);
++u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
++void generate_laser_tables_da(GF_List *atts);
+ 
+ 
+ #endif // _SVGGEN_H_

gpac-0.5.0-SVGGen_abuild.patch Added

gpac-0.5.0-enable_V4Studio.patch Added

@@ -0,0 +1,102 @@
+diff -urN gpac-0.5.0.svn4192.orig/applications/Makefile gpac-0.5.0.svn4192/applications/Makefile
+--- gpac-0.5.0.svn4192.orig/applications/Makefile	2012-11-01 07:44:25.050487961 +0800
++++ gpac-0.5.0.svn4192/applications/Makefile	2012-11-01 07:45:17.704267823 +0800
+@@ -17,15 +17,15 @@
+ INSTDIRS=mp4client
+ ifeq ($(CONFIG_XUL),no)
+ else
+-#INSTDIRS+=osmozilla
+-#APPDIRS+=osmozilla
++INSTDIRS+=osmozilla
++APPDIRS+=osmozilla
+ endif
+ 
+ #disable due to version incompatibilities
+ ifeq ($(USE_WXWIDGETS), yes)
+-#APPDIRS+=osmo4_wx
+-#V4STUDIODIR=V4Studio
+-#INSTDIRS+=osmo4_wx
++APPDIRS+=osmo4_wx
++V4STUDIODIR=V4Studio
++INSTDIRS+=osmo4_wx
+ endif
+ 
+ ALLDIRS=$(APPDIRS)
+diff -urN gpac-0.5.0.svn4192.orig/applications/osmo4_wx/Makefile gpac-0.5.0.svn4192/applications/osmo4_wx/Makefile
+--- gpac-0.5.0.svn4192.orig/applications/osmo4_wx/Makefile	2012-11-01 07:44:25.011488147 +0800
++++ gpac-0.5.0.svn4192/applications/osmo4_wx/Makefile	2012-11-01 08:07:33.914532090 +0800
+@@ -46,7 +46,7 @@
+ all: $(PROG)
+ 
+ Osmo4$(EXE): $(OBJS)
+-	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS)
++	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lm $(WX_LFLAGS) $(LINKFLAGS)
+ 
+ clean: 
+ 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
+diff -urN gpac-0.5.0.svn4192.orig/applications/osmozilla/osmo_npapi.cpp gpac-0.5.0.svn4192/applications/osmozilla/osmo_npapi.cpp
+--- gpac-0.5.0.svn4192.orig/applications/osmozilla/osmo_npapi.cpp	2012-11-01 07:44:25.049487966 +0800
++++ gpac-0.5.0.svn4192/applications/osmozilla/osmo_npapi.cpp	2012-11-01 07:46:04.823168413 +0800
+@@ -373,10 +373,10 @@
+ 	/* explicit plugin call */ \
+ 	"application/x-gpac::GPAC plugin;" \
+ 
+-char * NP_GetMIMEDescription(void)
++/*char * NP_GetMIMEDescription(void)
+ {
+ 	return (char *) GPAC_PLUGIN_MIMETYPES;
+-}
++}*/
+ 
+ 
+ NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
+diff -urN gpac-0.5.0.svn4192.orig/src/terminal/object_browser.c gpac-0.5.0.svn4192/src/terminal/object_browser.c
+--- gpac-0.5.0.svn4192.orig/src/terminal/object_browser.c	2012-11-01 07:44:25.105487684 +0800
++++ gpac-0.5.0.svn4192/src/terminal/object_browser.c	2012-11-01 07:47:37.788217060 +0800
+@@ -103,6 +103,7 @@
+ }
+ 
+ /*select given object when stream selection is available*/
++GF_EXPORT
+ void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm)
+ {
+ 	if (!term || !odm) return;
+diff -urN gpac-0.5.0.svn4192.orig/src/terminal/terminal.c gpac-0.5.0.svn4192/src/terminal/terminal.c
+--- gpac-0.5.0.svn4192.orig/src/terminal/terminal.c	2012-11-01 07:44:25.105487684 +0800
++++ gpac-0.5.0.svn4192/src/terminal/terminal.c	2012-11-01 07:47:11.843174648 +0800
+@@ -1868,6 +1868,7 @@
+ 	return 0;
+ }
+ 
++GF_EXPORT
+ const char *gf_term_get_text_selection(GF_Terminal *term, Bool probe_only)
+ {
+ 	Bool has_text;
+@@ -1878,7 +1879,7 @@
+ 	return gf_sc_get_selected_text(term->compositor);
+ }
+ 
+-
++GF_EXPORT
+ GF_Err gf_term_paste_text(GF_Terminal *term, const char *txt, Bool probe_only)
+ {
+ 	if (!term) return GF_BAD_PARAM;
+diff -urN gpac-0.5.0.svn4192.orig/src/utils/os_divers.c gpac-0.5.0.svn4192/src/utils/os_divers.c
+--- gpac-0.5.0.svn4192.orig/src/utils/os_divers.c	2012-11-01 07:44:25.063487899 +0800
++++ gpac-0.5.0.svn4192/src/utils/os_divers.c	2012-11-01 07:49:08.178526744 +0800
+@@ -315,6 +315,7 @@
+ #endif
+ }
+ 
++GF_EXPORT
+ void gf_rand_init(Bool Reset)
+ {
+ 	if (Reset) {
+@@ -328,6 +329,7 @@
+ 	}
+ }
+ 
++GF_EXPORT
+ u32 gf_rand()
+ {
+ 	return rand();

gpac-0.5.0-smjs_call_prop_stub.patch Added

gpac-0.5.0-x264-export.patch Added

@@ -0,0 +1,30 @@
+diff -urN gpac-0.5.0.svn4192.orig/src/isomedia/avc_ext.c gpac-0.5.0.svn4192/src/isomedia/avc_ext.c
+--- gpac-0.5.0.svn4192.orig/src/isomedia/avc_ext.c	2012-11-01 07:44:25.104487689 +0800
++++ gpac-0.5.0.svn4192/src/isomedia/avc_ext.c	2012-11-01 17:46:04.064318199 +0800
+@@ -191,6 +191,7 @@
+ 
+ 
+ #ifndef GPAC_DISABLE_ISOM_WRITE
++GF_EXPORT
+ GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
+ {
+ 	GF_TrackBox *trak;
+diff -urN gpac-0.5.0.svn4192.orig/src/isomedia/isom_write.c gpac-0.5.0.svn4192/src/isomedia/isom_write.c
+--- gpac-0.5.0.svn4192.orig/src/isomedia/isom_write.c	2012-11-01 07:44:25.102487699 +0800
++++ gpac-0.5.0.svn4192/src/isomedia/isom_write.c	2012-11-01 17:45:30.020931257 +0800
+@@ -1141,6 +1141,7 @@
+ 	return Track_SetStreamDescriptor(trak, StreamDescriptionIndex, entry->dataReferenceIndex, esd, NULL);
+ }
+ 
++GF_EXPORT
+ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height)
+ {
+ 	GF_Err e;
+@@ -1188,6 +1189,7 @@
+ 	}
+ }
+ 
++GF_EXPORT
+ GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
+ {
+ 	GF_Err e;