[Gnash-commit] gnash ChangeLog configure.ac plugin/Makefile.am...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/08/23 20:28:20

Modified files:
        .              : ChangeLog configure.ac 
        plugin         : Makefile.am plugin.cpp plugin.h 

Log message:
        * configure.ac, plugin/Makefile.am: For OpenBSD, omit some linker
          options to successfully build the plugin.
        * plugin/plugin{.cpp, h}: Cleanup: Remove threading code, because it's
          broken and generally useless.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.689&r2=1.690
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.h?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.689
retrieving revision 1.690
diff -u -b -r1.689 -r1.690
--- ChangeLog   23 Aug 2006 15:55:48 -0000      1.689
+++ ChangeLog   23 Aug 2006 20:28:20 -0000      1.690
@@ -1,3 +1,10 @@
+2006-08-23 Bastiaan Jacques <address@hidden>
+
+       * configure.ac, plugin/Makefile.am: For OpenBSD, omit some linker
+       options to successfully build the plugin.
+       * plugin/plugin{.cpp, h}: Cleanup: Remove threading code, because it's
+       broken and generally useless.
+
 2006-08-23 Vitaly Alexeev <address@hidden>
        
        * server\sprite_instance.cpp: action_list.size() may be changed due to 
actions

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- configure.ac        6 Aug 2006 23:08:08 -0000       1.101
+++ configure.ac        23 Aug 2006 20:28:20 -0000      1.102
@@ -41,6 +41,12 @@
 
 AC_CANONICAL_TARGET
 
+dnl openbsd without version number
+openbsd_os=`echo $target_os | cut -c 1-7`
+
+AM_CONDITIONAL(PLUGIN_LINK_UNDEFINED, test x$openbsd_os = xopenbsd)
+
+
 dnl These are required by automake
 AM_INIT_AUTOMAKE(gnash, 0.7.1)
 AM_MAINTAINER_MODE

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- plugin/Makefile.am  2 Aug 2006 01:22:59 -0000       1.30
+++ plugin/Makefile.am  23 Aug 2006 20:28:20 -0000      1.31
@@ -144,7 +144,12 @@
 #      $(X_LIBS)\
 #      $(X_EXTRA_LIBS)
 
-libgnashplugin_la_LDFLAGS = -module -avoid-version -no-undefined -L$(plugindir)
+if PLUGIN_LINK_UNDEFINED
+       libgnashplugin_la_LDFLAGS = -avoid-version -L$(plugindir)
+else
+       libgnashplugin_la_LDFLAGS = -module -avoid-version -no-undefined 
-L$(plugindir)
+endif
+
 
 # For now the plugin has to be installed in the root plugin
 # directory for Firefox. For some reason if the same file is
@@ -154,9 +159,11 @@
        test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) 
"$(DESTDIR)$(plugindir)"
 #      cp .libs/libgnashplugin.so $(DESTDIR)$(plugindir)/libgnashplugin.so
        $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) 
$(plugin_LTLIBRARIES) "$(DESTDIR)$(plugindir)/$(plugin_LTLIBRARIES)"
+if PLUGIN_LINK_UNDEFINED
+       mv $(DESTDIR)$(plugindir)/libgnashplugin.so.0.0 
$(DESTDIR)$(plugindir)/libgnashplugin.so
+endif
        $(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a
 
-
 # install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 #      if test -d $(HOME)/.firefox ; then \
 #         $(mkinstalldirs) $(HOME)/.firefox/plugins; \

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- plugin/plugin.cpp   10 Aug 2006 18:49:44 -0000      1.39
+++ plugin/plugin.cpp   23 Aug 2006 20:28:20 -0000      1.40
@@ -87,11 +87,6 @@
 
 NPBool      plugInitialized = FALSE;
 
-#ifndef USE_FORK
-PRLock      *playerMutex = NULL;
-PRCondVar   *playerCond = NULL;
-#endif
-
 static bool  waitforgdb = false;
 
 void
@@ -131,25 +126,6 @@
     PRBool supportsXEmbed = PR_TRUE;
     NPNToolkitType toolkit;
 
-#ifndef USE_FORK
-    // This mutex is only used with the condition variable.
-    playerMutex = PR_NewLock();
-    if (playerMutex) {
-       dbglogfile << "Allocated new X11 Mutex" << endl;
-    } else {
-       dbglogfile << "ERROR: Couldn't allocate new Player Mutex!" << endl;
-    }
-
-    // This is used to signal the player when it should start playing
-    // a movie.
-    playerCond = PR_NewCondVar(playerMutex);
-    if (playerCond) {
-       dbglogfile << "Allocated new condition variable" << endl;
-    } else {
-       dbglogfile << "ERROR: Couldn't allocate new Condition Variable!" << 
endl;
-    }    
-#endif // end of USE_FORK
-
     dbglogfile.setVerbosity(2);
 
     // Make sure that the browser supports functionality we need
@@ -195,20 +171,6 @@
        return;
     }
 
-#ifndef USE_FORK
-    if (playerMutex) {
-       PR_DestroyLock(playerMutex);
-       playerMutex = NULL;
-       dbglogfile << "Destroyed Player Mutex" << endl;
-    }
-
-    if (playerCond) {
-       PR_DestroyCondVar(playerCond);
-       playerCond = NULL;
-       dbglogfile << "Destroyed Player condition variable" << endl;
-    }
-#endif // end of USE_FORK
-
     plugInitialized = FALSE;
 }
 
@@ -284,9 +246,6 @@
     _instance(aInstance),
     _window(0),
     _childpid(0)
-#ifndef USE_FORK
-   ,_thread(NULL)
-#endif
 {
 }
 
@@ -335,23 +294,6 @@
 void
 nsPluginInstance::shut()
 {
-#ifndef USE_FORK
-    if (_thread) {
-       dbglogfile << "Waiting for the thread to terminate..." << endl;
-#if 0
-       PRStatus rv = PR_SetThreadPrivate(_thread_key, (void *)"stop");
-
-       PR_Interrupt(_thread);
-       if (PR_PENDING_INTERRUPT_ERROR == PR_GetError()) {
-           dbglogfile << "ERROR: Couldn't interupt thread!" << endl;
-       }
-#endif // 0
-
-       PR_JoinThread(_thread);
-       _thread = NULL;
-    }
-
-#endif // !USE_FORK
     if (_childpid) {
        kill(_childpid, SIGINT);
     }
@@ -532,7 +474,7 @@
 nsPluginInstance::DestroyStream(NPStream * /* stream */, NPError /* reason */)
 {
     WriteStatus("Finished downloading Flash movie " + _swf_file +
-                ". Starting playback...");
+                ". Playing...");
 
 #if 0
     nsPluginInstance *arg = (nsPluginInstance *)this;
@@ -541,9 +483,12 @@
 #endif
 
     if (_streamfd != -1) {
-        close(_streamfd);
+        if (close(_streamfd) == -1) {
+            perror(strerror(errno));
+        } else {
         _streamfd = -1;
     }
+    }
 
     if (waitforgdb) {
        log_msg("Attach GDB to PID %d to debug!", getpid());
@@ -555,17 +500,8 @@
        }
     }
 
-#ifndef USE_FORK
-    _thread = PR_CreateThread(PR_USER_THREAD, playerThread, this,
-                             PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
-                             PR_JOINABLE_THREAD, 0);
-#else
     _childpid = startProc(_swf_file.c_str(), _window);
-#endif // !USE_FORK
 
-#if 0
-     WriteStatus("Started thread for Flash movie " + _swf_file;);
-#endif // 0
     return NPERR_NO_ERROR;
 }
 

Index: plugin/plugin.h
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- plugin/plugin.h     10 Aug 2006 18:49:44 -0000      1.15
+++ plugin/plugin.h     23 Aug 2006 20:28:20 -0000      1.16
@@ -105,9 +105,6 @@
     std::map<std::string, std::string> _options;
     int                                _streamfd;
     pid_t                              _childpid;
-#ifndef USE_FORK
-    PRThread*                          _thread;
-#endif
 };
 
 // end of __PLUGIN_H__