[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1210-gbe3bdc0

[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  be3bdc04b66c4abac6ed66ac0a2df315ca0f0218 (commit)
       via  30590ba6053b887a7fcbdd6b5644eb29b2b23f0e (commit)
      from  729b33c15ca5cbc5e0a6e6485527011448f02f5e (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=be3bdc04b66c4abac6ed66ac0a2df315ca0f0218


commit be3bdc04b66c4abac6ed66ac0a2df315ca0f0218
Author: Rob Savoye <address@hidden>
Date:   Fri Oct 14 15:45:22 2011 -0600

    tweaks for the OLPC XO 1.75, which doesn't distribute kde or qt

diff --git a/packaging/redhat/gnash.spec b/packaging/redhat/gnash.spec
index 1fa043c..d6d7cb4 100644
--- a/packaging/redhat/gnash.spec
+++ b/packaging/redhat/gnash.spec
@@ -4,7 +4,7 @@ Version:        0.8.10dev
 Release:        0
 Epoch:                 1
 # This next field gets edited by "make gnash.spec" when building an rpm
-Distribution:  fc13
+Distribution:  fc14
 Summary:        GNU SWF player
 
 Group:          Applications/Multimedia
@@ -15,7 +15,10 @@ URL:            http://www.gnu.org/software/gnash/
 Source0:        
http://www.getgnash.org/packages/snapshots/fedora/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}
 
-BuildRequires:  redhat-lsb mysql-devel
+%if %{_target_cpu} != "armv7l"
+BuildRequires:  redhat-lsb
+%endif
+BuildRequires:  mysql-devel
 # bitmap libraries for loading images
 BuildRequires:  libpng-devel libjpeg-devel giflib-devel
 # these are needed for the python gtk widget
@@ -23,8 +26,11 @@ 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
+# these are for the kde4 support, which isn't supported by the OLPC XO 1.75.
+# which is armv7l based.
+%if %{_target_cpu} != "armv7l"
 BuildRequires:  kdelibs-devel >= 4.0, kdebase-devel >= 4.0, qt-devel >= 4.0
+%endif
 # these are needed for the various renderers, which now all get built
 BuildRequires:  libXt-devel agg-devel libstdc++
 
@@ -69,6 +75,7 @@ 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.
 
+%if %{_target_cpu} != "armv7l"
 %package klash4
 Summary:   Konqueror SWF player plugin for KDE 4
 Group:     Applications/Multimedia
@@ -78,6 +85,8 @@ Requires:  kdelibs >= 4, kdebase >= 4, qt >= 4, gnash
 %description klash4
 The gnash (klash) SWF player plugin for Konqueror in KDE4.
 
+%endif
+
 %package plugin
 Summary:   Web-client SWF player plugin 
 Group:     Applications/Internet
@@ -209,6 +218,13 @@ RPM_TARGET=%{_target}
   SOUND="--enable-media=gst" 
 %endif
 
+%if %{_target_cpu} == "armv7l"
+  GUI="--enable-gui=gtk"
+  SOUND="--enable-media=gst"
+  RENDERER="--enable-renderer=agg,cairo"
+  OPTIONAL="--enable-python"
+%endif
+
 # 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.
@@ -305,6 +321,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+%if %{_target_cpu} != "armv7l"
 %post klash4
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
@@ -312,7 +329,7 @@ touch --no-create %{_datadir}/icons/hicolor
 %postun klash4
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
-
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -387,6 +404,7 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_prefix}/include/gnash/*.h
 %{_prefix}/lib*/python*/site-packages/gtk-2.0/gnash.*
 
+%if %{_target_cpu} != "armv7l"
 %files klash4
 %defattr(-,root,root,-)
 %{_bindir}/gnash-qt-launcher
@@ -401,6 +419,7 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_prefix}/share/kde4/services/klash_part.desktop
 %{_prefix}/share/applications/klash.desktop
 %{_prefix}/share/icons/hicolor/32x32/apps/klash.xpm
+%endif
 
 %files fileio-extension
 %defattr(-,root,root,-)
@@ -419,6 +438,9 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_libdir}/gnash/plugins/mysql.so
 
 %changelog
+* Fri Oct 14 2011 Rob Savoye <address@hidden> - %{version}-%{release}
+- Tweak for recent OLPC builds of fc14, which don't support kde.
+
 * 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. 

http://git.savannah.gnu.org/cgit//commit/?id=30590ba6053b887a7fcbdd6b5644eb29b2b23f0e


commit 30590ba6053b887a7fcbdd6b5644eb29b2b23f0e
Author: Rob Savoye <address@hidden>
Date:   Fri Oct 14 15:31:16 2011 -0600

    update from latest builds

diff --git a/packaging/ltib/gnash.spec b/packaging/ltib/gnash.spec
index 4371050..ea110a4 100644
--- a/packaging/ltib/gnash.spec
+++ b/packaging/ltib/gnash.spec
@@ -1,9 +1,12 @@
+#
+# This spec file is specific to the ltib build system
+#
 %define pfx /opt/freescale/rootfs/%{_target_cpu}
 
 Name:           gnash
-Version:        0.8.9dev
+Version:        20110912
 Release:        0
-Epoch:                 1
+Epoch:                 0
 Distribution:  ltib
 Summary:        GNU SWF player
 
@@ -12,10 +15,11 @@ Vendor:             Gnash Project
 Packager:      Rob Savoye <address@hidden>
 License:        GPLv3
 URL:            http://www.gnu.org/software/gnash/
-Source:         gnash-0.8.9dev.tar.gz
+Source:         gnash-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}
 
 # BuildRequires:  ffmpeg libpng libjpeg giflib boost agg curl freetype 
libstdc++ fontconfig
+Prefix:         /usr
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -23,75 +27,57 @@ Requires(postun): /sbin/ldconfig
 %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:  ffmpeg libpng libjpeg giflib boost curl freetype
 
-%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 devel
-Summary:   Gnash header files
-Group:     Applications/Multimedia
-Requires:  gnash-common
-
-%description devel
-Gnash header files can be used to write external Gnash extensions.
-
 %prep
 %setup -q
 
 %build
 
-CROSS_OPTS="--host=arm-none-linux=gnueabi 
--with-sysroot=/opt/L2.6.31_10.07.11_ER/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, qt4, aqua, sdl
-SOUND="--enable-media=ffmpeg"
-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.
+# Allow to change the sysroot path used by Gnash to find all headers and 
libraries
+# using a GNASH_SYSROOT environment variable
+if test x"${GNASH_SYSROOT}" = x; then
+  # If no default sysroot is specified, look for one that should be at this 
location
+  absroot=`cd ../../../rootfs/usr/ ; pwd`
+  echo "GNASH_SYSROOT not set in the users environment, using \"${absroot}\" 
for sysroot"
+  CROSS_OPTS="--host=arm-none-linux-gnueabi --with-sysroot=$absroot"
+else
+  CROSS_OPTS="--host=arm-none-linux-gnueabi --with-sysroot=${GNASH_SYSROOT}"
+fi
+
 # 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 \
-        --enable-sound=none
-make $MAKEFLAGS dumpconfig all
+        --disable-jemalloc \
+        --enable-gui=fb \
+       --disable-sound \
+        --enable-media=ffmpeg \
+        --enable-renderer=ovg \
+        --enable-device=egl,rawfb  \
+        CXXFLAGS='-g -O0'
+# Only uncomment this for debugging
+#        2>&1 | tee tmp/xxx
+
+make $MAKEFLAGS all -w
+make $MAKEFLAGS -C libdevice check -w
+make $MAKEFLAGS -C librender check -w
 
 # 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
+#strip gui/.libs/*-gnash
 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"
+make $MAKEFLAGS install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.*a
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -106,58 +92,21 @@ fi
 
 %postun
 /sbin/ldconfig
-%if !%{cross_compile}
-scrollkeeper-update -q || :
-%endif
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/fb-gnash
-# %{_datadir}/man/man1/gtk-gnash.1.gz
-
-%files common
 %defattr(-,root,root,-)
-%dump
+#%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 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
 
 %changelog
 * Sat Nov 30 2010 Rob Savoye <address@hidden> - %{version}-%{release}

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

Summary of changes:
 packaging/ltib/gnash.spec   |  119 ++++++++++++------------------------------
 packaging/redhat/gnash.spec |   30 +++++++++--
 2 files changed, 60 insertions(+), 89 deletions(-)


hooks/post-receive
-- 
Gnash