[mupen64plus] 75/262: Change default search path in the source instead of the configuration template

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit d352034b9d04d47b2eb516c05014bfd58b82f9de
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sat Jun 13 12:27:38 2009 +0200

    Change default search path in the source instead of the configuration template
---
 debian/changelog                           |  8 ++++++++
 debian/patches/102-plugin-searchpath.patch | 31 ++++++++++++++++--------------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b0d802..9f68ea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus (1.5+dfsg1-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Update 102-plugin-searchpath.patch, change default search path in the
+      source instead of the configuration template
+
+ -- Sven Eckelmann <sven.eckelmann at gmx.de>  Sat, 13 Jun 2009 12:25:28 +0200
+
 mupen64plus (1.5+dfsg1-2) unstable; urgency=low
 
   [ Sven Eckelmann ]
diff --git a/debian/patches/102-plugin-searchpath.patch b/debian/patches/102-plugin-searchpath.patch
index 492359e..2066889 100644
--- a/debian/patches/102-plugin-searchpath.patch
+++ b/debian/patches/102-plugin-searchpath.patch
@@ -1,4 +1,4 @@
-From a108cb433cd1bfe99cd547d9c0140dea72822814 Mon Sep 17 00:00:00 2001
+From 16f3acaa60b0abb641e1097ffc919439be5dc63a Mon Sep 17 00:00:00 2001
 From: Sven Eckelmann <sven.eckelmann at gmx.de>
 Date: Mon, 1 Jun 2009 15:46:01 +0200
 Subject: [PATCH] Use /usr/lib/mupen64plus as plugin searchpath
@@ -6,20 +6,23 @@ Subject: [PATCH] Use /usr/lib/mupen64plus as plugin searchpath
 
 Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
 ---
- config/mupen64plus.conf |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ main/main.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
 
-diff --git a/config/mupen64plus.conf b/config/mupen64plus.conf
-index b133268..999bfe1 100644
---- a/config/mupen64plus.conf
-+++ b/config/mupen64plus.conf
-@@ -1,5 +1,5 @@
- [Default]
--PluginDirectory = 
-+PluginDirectory = /usr/lib/mupen64plus/
- Gfx Plugin = ricevideo.so
- Audio Plugin = jttl_audio.so
- Input Plugin = blight_input.so
+diff --git a/main/main.c b/main/main.c
+index e355091..d57bafd 100644
+--- a/main/main.c
++++ b/main/main.c
+@@ -1476,8 +1476,7 @@ int main(int argc, char *argv[])
+     // if it's not set in the config file, use the /plugins/ sub-folder of the installation directory
+     if (strlen(dirpath) < 2)
+     {
+-        strncpy(dirpath, l_InstallDir, PATH_MAX);
+-        strncat(dirpath, "plugins/", PATH_MAX - strlen(dirpath));
++        strncpy(dirpath, "/usr/lib/mupen64plus/", PATH_MAX);
+         dirpath[PATH_MAX-1] = '\0';
+     }
+     // scan the plugin directory and set the config dir for the plugins
 -- 
 1.6.3.1
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git