Fix 64 bit runtime error (plugin dir)

[Version] Release 0.9.245
[Profile] Common
[Issue Type] Bug Fix

Change-Id: I1f4177a581f4f1fcaa375c1867211d76dd1f9f3c

diff --git a/configure.ac b/configure.ac
index df9dd47..902764c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,15 @@ AC_ARG_ENABLE(focus, AC_HELP_STRING([--enable-focus], [enable focus feature]),
  ],[USE_FOCUS=no])
 AM_CONDITIONAL([USE_FOCUS], [test "x$USE_FOCUS" = "xyes"])
 
+AC_ARG_WITH(plugindir, AS_HELP_STRING([--with-plugindir=<path>],[sound-server plugin dir]))
+if test -z "$with_plugindir" ; then
+PLUGIN_DIR=/usr/lib/soundplugins/
+else
+PLUGIN_DIR=$with_plugindir
+fi
+AC_SUBST(PLUGIN_DIR)
+AC_DEFINE_UNQUOTED(PLUGIN_DIR,"$PLUGIN_DIR", [sound-server plugin dir])
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h memory.h stdlib.h string.h sys/time.h unistd.h errno.h sys/types.h sys/stat.h])

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index f7329af..ef2bb5b 100644 (file)
--- a/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@ -1,6 +1,6 @@
 Name:       libmm-sound
 Summary:    MMSound Package contains client lib and sound_server binary
-Version:    0.9.244
+Version:    0.9.245
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -87,6 +87,7 @@ MMSound utility package - contians mm_sound_testsuite, sound_check for sound sys
 %configure \
 %if 0%{?tizen_audio_feature_ogg_enable}
        --enable-ogg \
+       --with-plugindir=%{_libdir}/soundplugins/ \
 %endif
 %ifarch %{arm}
        --prefix=/usr --enable-pulse --enable-focus --disable-security

diff --git a/server/mm_sound_server.c b/server/mm_sound_server.c
index e9ee571..6074ebe 100644 (file)
--- a/server/mm_sound_server.c
+++ b/server/mm_sound_server.c
@@ -60,8 +60,9 @@
 
 #include <glib.h>
 
+#include "../config.h" /* for PLUGIN_DIR */
+
 #define PLUGIN_ENV "MM_SOUND_PLUGIN_PATH"
-#define PLUGIN_DIR "/usr/lib/soundplugins/"
 #define PLUGIN_MAX 30
 
 #define HIBERNATION_SOUND_CHECK_PATH   "/tmp/hibernation/sound_ready"

diff --git a/server/plugin/keytone/Makefile.am b/server/plugin/keytone/Makefile.am
index a98b5cc..0ca73b8 100644 (file)
--- a/server/plugin/keytone/Makefile.am
+++ b/server/plugin/keytone/Makefile.am
@@ -26,5 +26,5 @@ endif
 
 install-exec-hook:
        mkdir -p $(DESTDIR)$(libdir)/soundplugins
-       ln -sf /usr/lib/libsoundpluginkeytone.so $(DESTDIR)$(libdir)/soundplugins/libsoundpluginkeytone.so
+       ln -sf ../libsoundpluginkeytone.so $(DESTDIR)$(libdir)/soundplugins/libsoundpluginkeytone.so
 

diff --git a/server/plugin/ogg/Makefile.am b/server/plugin/ogg/Makefile.am
index d3a1f14..f478fac 100644 (file)
--- a/server/plugin/ogg/Makefile.am
+++ b/server/plugin/ogg/Makefile.am
@@ -21,4 +21,4 @@ libsoundplugintremoloogg_la_LIBADD = $(MMCOMMON_LIBS) \
 
 install-exec-hook:
        mkdir -p $(DESTDIR)$(libdir)/soundplugins
-       ln -sf /usr/lib/libsoundplugintremoloogg.so $(DESTDIR)$(libdir)/soundplugins/libsoundplugintremoloogg.so
+       ln -sf ../libsoundplugintremoloogg.so $(DESTDIR)$(libdir)/soundplugins/libsoundplugintremoloogg.so

diff --git a/server/plugin/tone/Makefile.am b/server/plugin/tone/Makefile.am
index 6e7d138..b3ce3b0 100644 (file)
--- a/server/plugin/tone/Makefile.am
+++ b/server/plugin/tone/Makefile.am
@@ -18,5 +18,5 @@ libsoundplugintone_la_LIBADD  = \
 
 install-exec-hook:
        mkdir -p $(DESTDIR)$(libdir)/soundplugins
-       ln -sf /usr/lib/libsoundplugintone.so $(DESTDIR)$(libdir)/soundplugins/libsoundplugintone.so
+       ln -sf ../libsoundplugintone.so $(DESTDIR)$(libdir)/soundplugins/libsoundplugintone.so
 

diff --git a/server/plugin/wav/Makefile.am b/server/plugin/wav/Makefile.am
index 0bb8989..435778b 100644 (file)
--- a/server/plugin/wav/Makefile.am
+++ b/server/plugin/wav/Makefile.am
@@ -17,5 +17,5 @@ libsoundpluginwave_la_LIBADD  = $(MMCOMMON_LIBS) \
 
 install-exec-hook:
        mkdir -p $(DESTDIR)$(libdir)/soundplugins
-       ln -sf /usr/lib/libsoundpluginwave.so $(DESTDIR)$(libdir)/soundplugins/libsoundpluginwave.so
+       ln -sf ../libsoundpluginwave.so $(DESTDIR)$(libdir)/soundplugins/libsoundpluginwave.so