From 08d71327eda89a9d338197a0f3222411cfdcb61c Mon Sep 17 00:00:00 2001
From: filux <smartadminpl@gmail.com>
Date: Tue, 30 Jun 2015 19:21:17 +0200
Subject: [PATCH] collecting also vlc's plugins

---
 data/glest_game                               |  2 +-
 mk/linux/makedeps_folder.sh                   | 20 +++++++++++++++----
 .../mojosetup/megaglest-installer/make.sh     | 14 -------------
 mk/linux/start_megaglest                      |  3 +++
 mk/macosx/build-mg.sh                         | 11 ++++++++++
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/data/glest_game b/data/glest_game
index 33ce71e2..27ff0347 160000
--- a/data/glest_game
+++ b/data/glest_game
@@ -1 +1 @@
-Subproject commit 33ce71e245cece77f2815b007622302c3171c90a
+Subproject commit 27ff0347ed20d53bfd2a1629821da437409afc65
diff --git a/mk/linux/makedeps_folder.sh b/mk/linux/makedeps_folder.sh
index 81ddc0d5..9e9e27a3 100755
--- a/mk/linux/makedeps_folder.sh
+++ b/mk/linux/makedeps_folder.sh
@@ -22,9 +22,9 @@ sync_support_libs(){
 	local _cp="/bin/cp"
 	#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
 	local skip_deps=""
-	local keep_deps="libcurl libgnu libgcrypt libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc" 
+	local keep_deps="libcurl libgnu libgcrypt libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc"
 	
-	local scan_via_skiplist=1 
+	local scan_via_skiplist=1
 
 	if [ -n "$skip_deps" ]; then
 		scan_via_skiplist=1
@@ -86,8 +86,7 @@ sync_support_libs(){
 }
  
 usage(){
-	echo "Syntax : $0 megaglest
-	echo "Example: $0 megaglest
+	echo "Error: Wrong syntax. Example: $0 megaglest"
 	exit 1
 }
  
@@ -101,3 +100,16 @@ for f in $file
 do
 	sync_support_libs "${BASE}" "${f}"
 done
+
+# copy vlc's plugins if libvlc was copied
+if [ "$(find $BASE -type f -name "libvlc.*")" != "" ]; then
+	LIBVLC_DIR_CHECK="$( ldd "$1" | grep "libvlc\." | sort -u | awk '{print $3}' | head -1 )"
+	if [ "$LIBVLC_DIR_CHECK" != "" ]; then
+		LIBVLC_DIR="$(dirname "$LIBVLC_DIR_CHECK")"
+		if [ -d "$LIBVLC_DIR/vlc/plugins" ]; then
+			mkdir -p "$BASE/vlc"
+			echo "Including plugins directory for VLC from = [$LIBVLC_DIR/vlc]"
+			cp -f -r "$LIBVLC_DIR/vlc/plugins" "$BASE/vlc/"
+		fi
+	fi
+fi
diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh
index 2164cc38..279b034f 100755
--- a/mk/linux/mojosetup/megaglest-installer/make.sh
+++ b/mk/linux/mojosetup/megaglest-installer/make.sh
@@ -256,20 +256,6 @@ if [ $REPACKONLY -eq 0 ]; then
 	$copyGlestDeptsCmd
 	if [ -e "${INSTALL_ROOTDIR}makedeps_folder.sh" ]; then rm -f "${INSTALL_ROOTDIR}makedeps_folder.sh"; fi
 
-	# If this part -V- is required then should be moved to 'makedeps_folder.sh' script
-	#cd "$CURRENTDIR"
-	#cd data
-	#LIBVLC_DIR_CHECK=$( ldd megaglest | grep "libvlc\." | sort -u | awk '{print $3}' )
-	#if [ "$LIBVLC_DIR_CHECK" != '' ]; then
-	#	LIBVLC_DIR=$( dirname $LIBVLC_DIR_CHECK )
-	#fi
-	
-	#echo LibVLC installed in [$LIBVLC_DIR] copying to lib/
-	#if [ "$LIBVLC_DIR" != '' ]; then
-	#	cp -r $LIBVLC_DIR/vlc lib/
-	#	#exit 1
-	#fi
-
 	cd ..
 fi
 
diff --git a/mk/linux/start_megaglest b/mk/linux/start_megaglest
index e4995f27..3d0bcecf 100755
--- a/mk/linux/start_megaglest
+++ b/mk/linux/start_megaglest
@@ -270,6 +270,9 @@ fi
 if [ "$OperatingMode" = "--game" ]; then
     if [ -d "$GAMEDIR/$LIBDIR" ]; then
 	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${GAMEDIR}/${LIBDIR}"
+	if [ -d "$GAMEDIR/$LIBDIR/vlc" ]; then
+		export VLC_PLUGIN_PATH="${GAMEDIR}/${LIBDIR}/vlc"
+	fi
     fi
     $GAMEDIR/megaglest $@
     ExitStatus="$?"
diff --git a/mk/macosx/build-mg.sh b/mk/macosx/build-mg.sh
index 2a795b5b..b2f34e41 100755
--- a/mk/macosx/build-mg.sh
+++ b/mk/macosx/build-mg.sh
@@ -88,6 +88,17 @@ $list_of_libs2" | sed '/:$/d' | sed '/^$/d' | sort -u )"
 		for dyn_lib in $list_of_libs; do
 		    cp "$dyn_lib" "lib/"
 		done
+		
+		if [ "$(find lib -type f -name "libvlc.*")" != "" ]; then
+			LIBVLC_DIR_CHECK="$( echo "$list_of_checked_libs" | tr ' ' '\n' | grep "libvlc\." | sort -u | head -1 )"
+			if [ "$LIBVLC_DIR_CHECK" != "" ]; then
+				LIBVLC_DIR="$(cd "$(dirname "$LIBVLC_DIR_CHECK")"; pwd)"
+				if [ -d "$LIBVLC_DIR/vlc/plugins" ]; then
+					mkdir -p "lib/vlc"
+					cp -f -r "$LIBVLC_DIR/vlc/plugins" "lib/vlc/"
+				fi
+			fi
+		fi
 	else
 		echo 'Error: Please run first at least once build-mg.sh script to be ready for prepare directory with dynamic libraries.'
 		# strange method but required for cpack/.dmg