Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (6a2aa0e0db680333b3ea6c3447093a4fb3fbf1e9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (6a2aa0e0db680333b3ea6c3447093a4fb3fbf1e9)
  • Date: Tue, 15 Dec 2009 14:37:08 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

video/mplayerplug-in/HISTORY | 4 +++
video/mplayerplug-in/PRE_BUILD | 3 +-
video/mplayerplug-in/gcc44.patch | 48
+++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 1 deletion(-)

New commits:
commit 6a2aa0e0db680333b3ea6c3447093a4fb3fbf1e9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

mplayerplug-in: fix compilation with newer gcc and glibc #15258

diff --git a/video/mplayerplug-in/HISTORY b/video/mplayerplug-in/HISTORY
index d6b5c3e..9df4b90 100644
--- a/video/mplayerplug-in/HISTORY
+++ b/video/mplayerplug-in/HISTORY
@@ -1,3 +1,7 @@
+2009-12-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gcc44.patch: added to fix compilation with newer gcc and glibc
#15258
+ * PRE_BUILD: apply the patch from gentoo
+
2008-10-08 George Sherwood <gsherwood AT sourcemage.org>
* INSTALL: check for xulrunner and install in its plugins
directory.
diff --git a/video/mplayerplug-in/PRE_BUILD b/video/mplayerplug-in/PRE_BUILD
index 5417934..b1b3257 100755
--- a/video/mplayerplug-in/PRE_BUILD
+++ b/video/mplayerplug-in/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/mplayerplugin.patch
+patch -p0 < $SCRIPT_DIRECTORY/mplayerplugin.patch &&
+patch -p1 < $SPELL_DIRECTORY/gcc44.patch
diff --git a/video/mplayerplug-in/gcc44.patch
b/video/mplayerplug-in/gcc44.patch
new file mode 100644
index 0000000..54a1a79
--- /dev/null
+++ b/video/mplayerplug-in/gcc44.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/show_bug.cgi?id=271843
+
+--- mplayerplug-in-3.55-orig/Source/plugin-list.cpp
++++ mplayerplug-in-3.55/Source/plugin-list.cpp
+@@ -132,9 +132,9 @@ void insert_area(Node * parent, char *ta
+
+ void find_area_tags(const char *smilbuffer, Node * parent)
+ {
+- char *startarea;
+- char *endvideo;
+- char *start;
++ const char *startarea;
++ const char *endvideo;
++ const char *start;
+
+ int tagtime = 0;
+ char tagtarget[128];
+--- mplayerplug-in-3.55-orig/Source/plugin-setup.h
++++ mplayerplug-in-3.55/Source/plugin-setup.h
+@@ -174,7 +174,7 @@ char *getURLHostname(char *url);
+ char *getURLFilename(const char *url);
+ int isMms(char *url, int nomediacache);
+ void mmsToHttp(char *dest, char *src);
+-int sendCommand(nsPluginInstance * instance, char *command);
++int sendCommand(nsPluginInstance * instance, const char *command);
+ int URLcmp(const char *url1, const char *url2);
+ extern void remove_quotes(char *url);
+ void killmplayer(nsPluginInstance * instance);
+--- mplayerplug-in-3.55-orig/Source/plugin-support.cpp
++++ mplayerplug-in-3.55/Source/plugin-support.cpp
+@@ -109,7 +109,7 @@ char *getURLFilename(const char *url)
+ {
+
+ char *filename;
+- char *tmp;
++ const char *tmp;
+ int len;
+
+ if (DEBUG > 1)
+@@ -454,7 +454,7 @@ void remove_quotes(char *url)
+ // in cleanup routines (like destroyCB and shut), when we know that
+ // the player thread is not running, it is safe to call without locking
+
+-int sendCommand(nsPluginInstance * instance, char *command)
++int sendCommand(nsPluginInstance * instance, const char *command)
+ {
+ int retval;
+ char buffer[1024];



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (6a2aa0e0db680333b3ea6c3447093a4fb3fbf1e9), Jaka Kranjc, 12/15/2009

Archive powered by MHonArc 2.6.24.

Top of Page