[Gnash-commit] [SCM] Gnash branch, master, updated. be5e9eb1e2afcb0ac827bc6b5779b6144766ddcc

[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  be5e9eb1e2afcb0ac827bc6b5779b6144766ddcc (commit)
       via  297deaaba8a7a2721a862164df3e517dde5fdc98 (commit)
       via  06907b931859501ae1daf193d1c1576aecda1124 (commit)
       via  f6e82a4a8d2f1dffe75ad483c7afdc65110bb78f (commit)
       via  e62d6b9025f38c55bba9dc01ed87883068d7cc68 (commit)
      from  dd2f2fc87bfa8291c18eaa1774196072d020a489 (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=be5e9eb1e2afcb0ac827bc6b5779b6144766ddcc


commit be5e9eb1e2afcb0ac827bc6b5779b6144766ddcc
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 1 17:53:59 2010 -0700

    add OPENGL_CFLAGS to CPPFLAGS for OpenBSD

diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 9428602..b36160c 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -36,6 +36,7 @@ libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
        $(GLIB_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(CURL_CFLAGS) \
+       $(OPENGL_CFLAGS) \
        $(Z_CFLAGS) \
        $(JPEG_CFLAGS) \
        $(BOOST_CFLAGS) \

http://git.savannah.gnu.org/cgit//commit/?id=297deaaba8a7a2721a862164df3e517dde5fdc98


commit 297deaaba8a7a2721a862164df3e517dde5fdc98
Merge: 06907b9 dd2f2fc
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 1 15:49:07 2010 -0700

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


http://git.savannah.gnu.org/cgit//commit/?id=06907b931859501ae1daf193d1c1576aecda1124


commit 06907b931859501ae1daf193d1c1576aecda1124
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 1 15:49:02 2010 -0700

    don't try to call any libltdl routines if we're not building the extensions

diff --git a/libbase/sharedlib.cpp b/libbase/sharedlib.cpp
index 1fd7e2d..9fc4627 100644
--- a/libbase/sharedlib.cpp
+++ b/libbase/sharedlib.cpp
@@ -73,11 +73,14 @@ SharedLib::SharedLib(const std::string& filespec, const 
std::string& envvar)
     scoped_lock lock(_libMutex);
     
     // Initialize libtool's dynamic library loader
+#ifdef HAVE_LTDL
     int errors = lt_dlinit ();
     if (errors) {
         log_error (_("Couldn't initialize ltdl: %s"), lt_dlerror());
     }
-    
+#else
+# warning "libltdl not enabled in build".
+#endif    
     std::string pluginsdir;
     char *env = std::getenv (envvar.c_str());
     if (env) {
@@ -95,7 +98,11 @@ SharedLib::~SharedLib()
 bool
 SharedLib::closeLib()
 {
+#ifdef HAVE_LTDL
     return lt_dlclose(_dlhandle);
+#else
+    return true;
+#endif
 }
 
 bool
@@ -111,6 +118,8 @@ SharedLib::openLib (const std::string& filespec)
     scoped_lock lock(_libMutex);
 
     log_debug ("Trying to open shared library \"%s\"", filespec);
+
+#ifdef HAVE_LTDL
     _dlhandle = lt_dlopenext (filespec.c_str());
     
     if (_dlhandle == NULL) {
@@ -120,6 +129,7 @@ SharedLib::openLib (const std::string& filespec)
 
     // Make this module unloadable
     lt_dlmakeresident(_dlhandle);
+#endif
     
     log_debug (_("Opened dynamic library \"%s\""), filespec);
 
@@ -136,6 +146,7 @@ SharedLib::getInitEntry (const std::string& symbol)
     
     scoped_lock lock(_libMutex);
 
+#ifdef HAVE_LTDL
     run  = lt_dlsym (_dlhandle, symbol.c_str());
     
     if (run == NULL) {
@@ -144,6 +155,7 @@ SharedLib::getInitEntry (const std::string& symbol)
     } else {
         log_debug (_("Found symbol %s @ %p"), symbol, (void *)run);
     }
+#endif
     
     return (initentry*)(run);
 }
@@ -157,7 +169,9 @@ SharedLib::getDllSymbol(const std::string& symbol)
     
     scoped_lock lock(_libMutex);
 
+#ifdef HAVE_LTDL
     run  = lt_dlsym (_dlhandle, symbol.c_str());
+#endif
     
     /* 
     Realistically, we should never get a valid pointer with a value of 0

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


commit f6e82a4a8d2f1dffe75ad483c7afdc65110bb78f
Author: Rob Savoye <address@hidden>
Date:   Tue Nov 30 17:04:30 2010 -0700

    remove packages for stuff we don't need on ltib.

diff --git a/packaging/ltib/gnash.spec b/packaging/ltib/gnash.spec
index aae0e29..8f9639f 100644
--- a/packaging/ltib/gnash.spec
+++ b/packaging/ltib/gnash.spec
@@ -1,4 +1,4 @@
-%define pfx /opt/freescale/rootfs/%{_target_cpu}
+%define pfx /opt/L2.6.31_09.12.01_SDK/ltib/rootfs
 
 Name:           gnash
 # This next field gets edited by "make gnash.spec" when building an rpm
@@ -65,23 +65,6 @@ 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
@@ -90,44 +73,11 @@ 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".
@@ -158,8 +108,8 @@ sh ./configure \
        --infodir=%{_prefix}/share/info \
        --disable-dependency-tracking \
        --disable-testsuite \
-       --disable-rpath
-
+       --disable-rpath \
+        --enable-sound=none
 make $MAKEFLAGS dumpconfig all
 
 # When testing the spec file, try setting MAKEFLAGS to
@@ -192,8 +142,8 @@ scrollkeeper-update -q || :
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/gtk-gnash
-%{_datadir}/man/man1/gtk-gnash.1.gz
+%{_bindir}/fb-gnash
+# %{_datadir}/man/man1/gtk-gnash.1.gz
 
 %files common
 %defattr(-,root,root,-)
@@ -232,10 +182,6 @@ scrollkeeper-update -q || :
 # %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
@@ -243,26 +189,10 @@ scrollkeeper-update -q || :
 %{_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 Nov 30 2010 Rob Savoye <address@hidden> - %{version}-%{release}
+- Drop most of the packages for ltib builds.
+
 * 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=e62d6b9025f38c55bba9dc01ed87883068d7cc68


commit e62d6b9025f38c55bba9dc01ed87883068d7cc68
Author: Rob Savoye <address@hidden>
Date:   Tue Nov 30 16:01:12 2010 -0700

    move libltdl tests below --enable-extensions test, and don't enable libltdl 
unless extensions are enabled. By defaullt no extensions are build, so by 
default, libltdl will not be built or used.

diff --git a/configure.ac b/configure.ac
index ace02c5..7d4e4c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,40 +282,12 @@ dnl   $CXXFLAGS="$CXXFLAGS -march=${with_cpu}"
    cross_compiling=yes
 fi
 
-AC_MSG_CHECKING([For the version of libtool])
-if test -d ${srcdir}/libltdl/libltdl; then
-  ltver=2.x
-else
-  ltver=1.x
-fi
-ltmajor=`echo $ltver | cut -d '.' -f 1`
-AC_MSG_RESULT([$ltver])
-AM_CONDITIONAL(LIBLTDL2, [test $ltmajor -eq 2])
-AM_CONDITIONAL(LIBLTDL1, [test $ltmajor -eq 1])
-if test $ltmajor -eq 1; then
-  AC_LIBLTDL_CONVENIENCE
-  AC_LIBTOOL_DLOPEN
-  if test x"${windows}" = x"yes"; then
-    dnl The following macro may be empty; the colon is necessary
-    dnl in this case to avoid an empty if statement (which is a syntax error).
-    AC_LIBTOOL_WIN32_DLL
-    :
-  fi
-  AC_DISABLE_STATIC
-else
-  LT_INIT([dlopen win32-dll disable-static])
-  LTDL_INIT([convenience recursive])
-fi
 AC_PROG_LIBTOOL
 
-AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
-AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
-
 AC_C_BIGENDIAN
 AC_C_CONST
 AC_C_INLINE
 AC_SUBST([LIBTOOL_DEPS])
-AC_LIB_LTDL
 
 AM_CONDITIONAL(ENABLE_SHARED, [test x"${enable_shared}" = xyes])
 AM_CONDITIONAL(ENABLE_STATIC, [test x"${enable_shared}" = xno])
@@ -786,7 +758,6 @@ AC_ARG_ENABLE(sound,
    fi]
 )
 
-
 dnl --------------------------------------------------------
 dnl  Media handler selection
 dnl --------------------------------------------------------
@@ -1264,6 +1235,7 @@ ext_lirc=no
 ext_dbus=no
 ext_all=no
 ext_launcher=no
+nextensions=0
 AC_ARG_ENABLE(extensions,
   AC_HELP_STRING([--enable-extensions=], [Specify which extensions to build]),
   if test -n ${enableval}; then
@@ -1361,6 +1333,38 @@ AM_CONDITIONAL(BUILD_EXTENSIONS, [ test -n 
"$extensions_list"])
 
 GNASH_PKG_CLASSFILE
 
+ltmajor=0
+if test "${nextensions}" -gt 0; then
+  AC_MSG_CHECKING([For the version of libtool])
+  if test -d ${srcdir}/libltdl/libltdl; then
+    ltver=2.x
+  else
+    ltver=1.x
+  fi
+  ltmajor=`echo $ltver | cut -d '.' -f 1`
+  AC_MSG_RESULT([$ltver])
+  if test $ltmajor -eq 1; then
+    AC_LIBLTDL_CONVENIENCE
+    AC_LIBTOOL_DLOPEN
+    if test x"${windows}" = x"yes"; then
+      dnl The following macro may be empty; the colon is necessary
+      dnl in this case to avoid an empty if statement (which is a syntax 
error).
+      AC_LIBTOOL_WIN32_DLL
+      :
+    fi
+    AC_DISABLE_STATIC
+  else
+    LT_INIT([dlopen win32-dll disable-static])
+    LTDL_INIT([convenience recursive])
+  fi
+  AC_LIB_LTDL
+fi
+
+AM_CONDITIONAL(LIBLTDL2, [test $ltmajor -eq 2])
+AM_CONDITIONAL(LIBLTDL1, [test $ltmajor -eq 1])
+AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
+AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
+
 dnl --------------------------------------------------------
 dnl SOL dir
 dnl --------------------------------------------------------

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

Summary of changes:
 configure.ac              |   62 +++++++++++++++++---------------
 libbase/Makefile.am       |    1 +
 libbase/sharedlib.cpp     |   16 ++++++++-
 packaging/ltib/gnash.spec |   86 ++++----------------------------------------
 4 files changed, 57 insertions(+), 108 deletions(-)


hooks/post-receive
-- 
Gnash