[Gnash-commit] [SCM] Gnash branch, master, updated. 5d3a8197de3806a18806fdf3bcaa97cf61382b1a

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  5d3a8197de3806a18806fdf3bcaa97cf61382b1a (commit)
       via  7b412a6b67b00feb0167720bdfebd24079a4b03d (commit)
      from  39ee7fe331e57f188a831b1624e6078f4e1c8ba9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=5d3a8197de3806a18806fdf3bcaa97cf61382b1a


commit 5d3a8197de3806a18806fdf3bcaa97cf61382b1a
Merge: 7b412a6 39ee7fe
Author: Rob Savoye <address@hidden>
Date:   Thu Nov 18 18:58:44 2010 -0700

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=7b412a6b67b00feb0167720bdfebd24079a4b03d


commit 7b412a6b67b00feb0167720bdfebd24079a4b03d
Author: Rob Savoye <address@hidden>
Date:   Thu Nov 18 18:58:12 2010 -0700

    build Gnash under tlib, which uses RPM spec files to cross build for the 
ARM.

diff --git a/packaging/ltib/gnash.spec b/packaging/ltib/gnash.spec
new file mode 100644
index 0000000..aae0e29
--- /dev/null
+++ b/packaging/ltib/gnash.spec
@@ -0,0 +1,347 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Name:           gnash
+# This next field gets edited by "make gnash.spec" when building an rpm
+Version:        0.8.9dev
+Release:        0
+Epoch:                 1
+# This next field gets edited by "make gnash.spec" when building an rpm
+Distribution:  fc13
+Summary:        GNU SWF player
+
+Group:          Applications/Multimedia
+Vendor:                Gnash Project
+Packager:      Rob Savoye <address@hidden>
+License:        GPLv3
+URL:            http://www.gnu.org/software/gnash/
+Source:         gnash-0.8.9dev.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}
+
+# bitmap libraries for loading images
+#BuildRequires:  libpng-devel libjpeg-devel giflib-devel
+# these are needed for the python gtk widget
+#BuildRequires:  pygtk2-devel python-devel
+#BuildRequires:  gtk2-devel freetype-devel fontconfig-devel
+#BuildRequires:  openssl-devel curl-devel boost-devel
+#BuildRequires:  gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
+# these are for the kde4 support
+#BuildRequires:  kdelibs-devel >= 4.0, kdebase-devel >= 4.0, qt-devel >= 4.0
+# these are needed for the various renderers, which now all get built
+#BuildRequires:  libXt-devel agg-devel gtkglext-devel libstdc++
+
+# The default Gnash package only includes the GTK parts, the rest
+# is in gnash-common.
+Requires:  gtkglext gtk2 pygtk2 python
+Requires:  gnash-common
+
+Requires:   boost-date-time boost-thread boost-program-options
+
+# BuildRequires:  scrollkeeper
+
+#Requires(post): scrollkeeper
+#Requires(postun): scrollkeeper
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+#Requires(post): /sbin/install-info
+#Requires(preun): /sbin/install-info
+
+%description
+Gnash is a GNU SWF movie player that supports many SWF v7 features,
+with growing support for swf v8, v9, and v10.
+
+%package common
+Summary:   Web-client SWF player plugin 
+Group:     Applications/Multimedia
+# Installation requirements
+Requires:  libpng libjpeg giflib
+Requires:  boost agg 
+Requires:  freetype fontconfig libstdc++
+Requires:  gstreamer >= 0.10, gstreamer-plugins-base >= 0.10
+Requires:  openssl curl
+# libX11 libExt libXv
+
+%description common
+Common files Shared between Gnash and Klash, Gnash/Klash is a GNU SWF movie
+player that supports many SWF v7 features, with growing support for
+swf v8, v9, and v10.
+
+%package klash4
+Summary:   Konqueror SWF player plugin for KDE 4
+Group:     Applications/Multimedia
+Requires:  gnash-common
+Requires:  kdelibs >= 4, kdebase >= 4, qt >= 4, gnash
+
+%description klash4
+The gnash (klash) SWF player plugin for Konqueror in KDE4.
+
+%package plugin
+Summary:   Web-client SWF player plugin 
+Group:     Applications/Internet
+Requires:  gnash, gnash-common
+
+%description plugin
+The gnash SWF player plugin for firefox or mozilla.
+
+%package devel
+Summary:   Gnash header files
+Group:     Applications/Multimedia
+Requires:  gnash-common
+
+%description devel
+Gnash header files can be used to write external Gnash extensions.
+
+%package widget
+Summary:   Gnash widgets for Gtk and Python
+Group:     Applications/Multimedia
+Requires:  gnash, gnash-common
+
+%description widget
+The Gnash widgets can be used to embed Gnash into any Gtk or Python-Gtk
+application.
+
+%package fileio-extension
+Summary:   Fileio extension for Gnash
+Group:     Applications/Multimedia
+Requires:  gnash-common
+
+%description fileio-extension
+This extension allows SWF files being played within Gnash to have direct access
+to the file system. The API is similar to the C library one.
+
+%package lirc-extension
+Summary:   LIRC extension for Gnash
+Group:     Applications/Multimedia
+Requires:  gnash-common
+
+%description lirc-extension
+This extension allows SWF files being played within Gnash to have direct access
+to a LIRC based remote control device. The API is similar to the standard
+LIRC one.
+
+%prep
+%setup -q
+
+%build
+
+# Build rpms for an ARM based processor
+%ifarch arm
+RPM_TARGET=%{_target}
+%endif
+
+CROSS_OPTS="--host=arm-linux 
--with-sysroot=/opt/L2.6.31_09.12.01_SDK/ltib/rootfs/usr"
+# these are actually the default values, but this way they get added
+# to the build so they appear in "gnash --version".
+GUI="--enable-gui=fb"  # could be kde3, kde4, aqua, sdl
+SOUND="--enable-media=none"
+OTHER="--disable-jemalloc"
+RENDERER="--enable-renderer=agg"               # could be opengl or cairo
+OPTIONAL=""
+
+# we disable the testsuites by default, as when building packages we
+# should have already been running the testsuites as part of the 
+# normal build & test development cycle.
+
+# The default options for the configure aren't suitable for
+# cross configuring, so we force them to be what we know is correct.
+# uncommenting these will produce huge volumes of debug info from the
+# shell, but sometimes that's what you need to do.
+# export CONFIG_SHELL="sh -x"
+# sh -x ./configure \
+sh ./configure \
+       $CROSS_OPTS \
+       $SOUND $GUI \
+       $RENDERER \
+       $OTHER \
+       $OPTIONAL \
+        --prefix=/usr \
+       --mandir=%{_prefix}/share/man \
+       --infodir=%{_prefix}/share/info \
+       --disable-dependency-tracking \
+       --disable-testsuite \
+       --disable-rpath
+
+make $MAKEFLAGS dumpconfig all
+
+# When testing the spec file, try setting MAKEFLAGS to
+# "CXXFLAGS-O0 -j4" to speed up getting results. Note *don't*
+# do that for release builds, as the performance will suffer.
+
+%install
+strip gui/.libs/*-gnash
+strip utilities/.libs/g* utilities/.libs/soldumper utilities/.libs/flvdumper
+rm -rf $RPM_BUILD_ROOT
+make $MAKEFLAGS install DESTDIR=$RPM_BUILD_ROOT LDFLAGS="-Wl,--build-id"
+make $MAKEFLAGS install-plugins DESTDIR=$RPM_BUILD_ROOT 
LDFLAGS="-Wl,--build-id"
+rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.*a
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post 
+/sbin/ldconfig
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
+%postun
+/sbin/ldconfig
+%if !%{cross_compile}
+scrollkeeper-update -q || :
+%endif
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/gtk-gnash
+%{_datadir}/man/man1/gtk-gnash.1.gz
+
+%files common
+%defattr(-,root,root,-)
+%dump
+%doc README AUTHORS COPYING NEWS 
+%{_bindir}/gnash
+%{_datadir}/man/man1/gnash.1.gz
+%{_bindir}/gprocessor
+%{_bindir}/soldumper
+%{_bindir}/flvdumper
+%{_bindir}/findmicrophones
+%{_bindir}/findwebcams
+#%{_bindir}/dumpshm
+%{_bindir}/rtmpget
+%{_libdir}/gnash/*.so*
+%{_prefix}/share/gnash/GnashG.png
+%{_prefix}/share/gnash/gnash_128_96.ico
+%{_datadir}/man/man1/gprocessor.1.gz
+%{_datadir}/man/man1/soldumper.1.gz
+%{_datadir}/man/man1/flvdumper.1.gz
+%{_datadir}/man/man1/findmicrophones.1.gz
+%{_datadir}/man/man1/findwebcams.1.gz
+%{_datadir}/man/man1/rtmpget.1.gz
+%{_datadir}/locale/*/LC_MESSAGES/gnash.mo
+%if !%{cross_compile}
+#%{_prefix}/share/info/*.info*
+%{_prefix}/share/doc/gnash/*.html
+%{_prefix}/share/doc/gnash/images/*.png
+%{_prefix}/etc/gnashrc
+%{_prefix}/etc/gnashpluginrc
+# %{_infodir}/*.info*
+#%doc doc/C/gnash*.html 
+#%doc doc/C/images/*.png
+#%doc doc/C/images/*.txt
+# %doc %{_prefix}/share/gnash/doc/gnash/C/images
+# %doc %{_prefix}/share/gnash/doc/gnash/C/*.xml
+%endif
+
+%files plugin
+%defattr(-,root,root,-)
+%{_libdir}/mozilla/plugins/libgnashplugin.so
+
+%files devel
+%{_prefix}/include/gnash/*.h*
+%{_prefix}/include/gnash/vm/*.h
+%{_prefix}/include/gnash/asobj/*.h
+%{_prefix}/include/gnash/parser/*.h
+%{_prefix}/lib/pkgconfig/gnash.pc
+
+%files widget
+%{_prefix}/include/gnash/*.h
+%{_prefix}/lib/python*/site-packages/gtk-2.0/gnash.*
+
+%files klash4
+%defattr(-,root,root,-)
+%{_bindir}/kde4-gnash
+%{_datadir}/man/man1/kde4-gnash.1.gz
+%{_libdir}/kde4/libklashpart.*
+%{_prefix}/share/kde4/apps/klash/klashpartui.rc
+%{_prefix}/share/kde4/apps/klash/pluginsinfo
+%{_prefix}/share/kde4/services/klash_part.desktop
+
+%files fileio-extension
+%{_libdir}/gnash/plugins/fileio.so
+
+%files lirc-extension
+%{_libdir}/gnash/plugins/lirc.so
+
+%changelog
+* Sat Mar 27 2010 Rob Savoye <address@hidden> - %{version}-%{release}
+- add gnash-common package for non GUI files so as not to contaminate
+  the gtk or kde packages. 
+
+* Sat Sep 07 2009 Rob Savoye <address@hidden> - %{version}-%{release}
+- add kde4 support for klash.
+
+* Sat Jun 13 2009 Rob Savoye <address@hidden> - trunk
+- Add support for packaging the gtk & python widget
+
+* Sat Feb 13 2009 Rob Savoye <address@hidden> - trunk
+- Split off klash into it's own spec file.
+
+* Sat Oct 24 2008 Rob Savoye <address@hidden> - trunk
+- Adjust dependencies for current bzr trunk
+
+* Sat Feb  16 2008 Rob Savoye <address@hidden> - %{version}-%{release}
+- Adjust dependencies for current cvs HEAD
+
+* Sat Mar  6 2007 Rob Savoye <address@hidden> - %{version}-%{release}
+- merge in patch from John @ Redhat.
+
+* Tue Mar 06 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070306-1
+- update to new snapshot
+
+* Thu Feb 28 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070226-3
+- require xulrunner instead of webclient
+
+* Wed Feb 28 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070226-2
+- don't delete requires .so files
+
+* Mon Feb 26 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070226-1
+- cvs snapshot built for olpc
+
+* Sat Nov  7 2006 Rob Savoye <address@hidden> - 0.7.2-2
+- update for 0.7.2 release.
+
+* Sat Nov  6 2006 Patrice Dumas <address@hidden> 0.7.2-1
+- update for 0.7.2 release.
+
+* Thu Oct 05 2006 Christian Iseli <address@hidden> 0.7.1-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Sun Sep 24 2006 Patrice Dumas <address@hidden> 0.7.1-8
+- plugin requires %%{_libdir}/mozilla/plugins. Fix (incompletly and 
+  temporarily, but there is no better solution yet) #207613
+
+* Sun Aug 27 2006 Patrice Dumas <address@hidden> - 0.7.1-7
+- add defattr for klash
+- add warnings in the description about stability
+
+* Mon Aug 21 2006 Patrice Dumas <address@hidden> - 0.7.1-6
+- remove superfluous buildrequires autoconf
+- rename last patch to gnash-plugin-tempfile-dir.patch
+- add README.fedora to plugin to explain tmpdirs
+
+* Wed Aug 16 2006 Jens Petersen <address@hidden> - 0.7.1-5
+- source qt.sh and configure --with-qtdir (Dominik Mierzejewski)
+- add plugin-tempfile-dir.patch for plugin to use a safe tempdir
+
+* Fri Jul 28 2006 Jens Petersen <address@hidden> - 0.7.1-4
+- buildrequire autotools (Michael Knox)
+
+* Fri Jun  2 2006 Patrice Dumas <address@hidden> - 0.7.1-3
+- add gnash-continue_on_info_install_error.patch to avoid
+- buildrequire libXmu-devel
+
+* Wed May 17 2006 Jens Petersen <address@hidden> - 0.7.1-2
+- configure with --disable-rpath
+- buildrequire docbook2X
+- remove devel files
+
+* Sun May  7 2006 Jens Petersen <address@hidden> - 0.7.1-1
+- update to 0.7.1 alpha release
+
+* Sat Apr  22 2006 Rob Savoye <address@hidden> - 0.7-1
+- install the info file. Various tweaks for my system based on
+Patrice's latest patch,
+
+* Fri Feb  3 2006 Patrice Dumas <address@hidden> - 0.7-0
+- initial packaging
+

-----------------------------------------------------------------------

Summary of changes:
 packaging/{redhat => ltib}/gnash.spec |  171 +++++---------------------------
 1 files changed, 27 insertions(+), 144 deletions(-)
 copy packaging/{redhat => ltib}/gnash.spec (67%)


hooks/post-receive
-- 
Gnash