From ae7b55a4f9db27c0117666d8f3c32fbd9dc5eb31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Mon, 19 Mar 2012 20:54:12 +0200
Subject: [PATCH] vlc: assume UTF-8 and drop dependency on libvlccore

---
 bin/Makefile.am |  4 ++--
 bin/cachegen.c  |  8 +-------
 bin/vlc.c       | 21 +--------------------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 20021954c5..45b5464834 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -33,7 +33,7 @@ vlc_wrapper_SOURCES = rootwrap.c
 vlc_wrapper_LDADD = $(SOCKET_LIBS)
 
 vlc_LDFLAGS = $(LDFLAGS_vlc)
-vlc_LDADD = ../lib/libvlc.la ../src/libvlccore.la $(LIBS_vlc)
+vlc_LDADD = ../lib/libvlc.la $(LIBS_vlc)
 
 vlc_static_SOURCES = $(vlc_SOURCES)
 vlc_static_CFLAGS = $(AM_CFLAGS) \
@@ -63,7 +63,7 @@ vlc_cache_gen_SOURCES = cachegen.c
 vlc_cache_gen_LDADD = \
 	$(GNUGETOPT_LIBS) \
 	../compat/libcompat.la \
-	../lib/libvlc.la ../src/libvlccore.la
+	../lib/libvlc.la
 if HAVE_WIN32
 vlc_cache_gen_LDADD += vlc_win32_rc.$(OBJEXT)
 vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
diff --git a/bin/cachegen.c b/bin/cachegen.c
index 1772b3dab3..383b05e878 100644
--- a/bin/cachegen.c
+++ b/bin/cachegen.c
@@ -45,10 +45,6 @@ static void usage (const char *path)
             path);
 }
 
-/* Explicit HACK */
-extern void LocaleFree (const char *);
-extern char *FromLocale (const char *);
-
 int main (int argc, char *argv[])
 {
     static const struct option opts[] =
@@ -81,8 +77,7 @@ int main (int argc, char *argv[])
 
     for (int i = optind; i < argc; i++)
     {
-        /* Note that FromLocale() can be used before libvlc is initialized */
-        const char *path = FromLocale (argv[i]);
+        const char *path = argv[i];
 
         if (setenv ("VLC_PLUGIN_PATH", path, 1))
             abort ();
@@ -101,7 +96,6 @@ int main (int argc, char *argv[])
             libvlc_release (vlc);
         if (vlc == NULL)
             fprintf (stderr, "No plugins in %s\n", path);
-        LocaleFree (path);
         if (vlc == NULL)
             return 1;
     }
diff --git a/bin/vlc.c b/bin/vlc.c
index 057266b128..5757f9c09c 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -50,9 +50,6 @@
 #endif
 
 
-/* Explicit HACK */
-extern void LocaleFree (const char *);
-extern char *FromLocale (const char *);
 extern void vlc_enable_override (void);
 
 static bool signal_ignored (int signum)
@@ -173,28 +170,14 @@ int main( int i_argc, const char *ppsz_argv[] )
     /* Block all these signals */
     pthread_sigmask (SIG_SETMASK, &set, NULL);
 
-    /* Note that FromLocale() can be used before libvlc is initialized */
     const char *argv[i_argc + 3];
     int argc = 0;
 
     argv[argc++] = "--no-ignore-config";
     argv[argc++] = "--media-library";
 #ifdef TOP_SRCDIR
-    argv[argc++] = FromLocale ("--data-path="TOP_SRCDIR"/share");
+    argv[argc++] = "--data-path="TOP_SRCDIR"/share";
 #endif
-
-    int i = 1;
-#ifdef __APPLE__
-    /* When VLC.app is run by double clicking in Mac OS X, the 2nd arg
-     * is the PSN - process serial number (a unique PID-ish thingie)
-     * still ok for real Darwin & when run from command line
-     * for example -psn_0_9306113 */
-    if(i_argc >= 2 && !strncmp( ppsz_argv[1] , "-psn" , 4 ))
-        i = 2;
-#endif
-    for (; i < i_argc; i++)
-        if ((argv[argc++] = FromLocale (ppsz_argv[i])) == NULL)
-            return 1; // BOOM!
     argv[argc] = NULL;
 
     vlc_enable_override ();
@@ -249,8 +232,6 @@ int main( int i_argc, const char *ppsz_argv[] )
 out:
     if (vlc != NULL)
         libvlc_release (vlc);
-    for (int i = 2; i < argc; i++)
-        LocaleFree (argv[i]);
 
     return 0;
 }