From 60d9a98c91d549cb8bbbc252d40b1a39f55a4095 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Sun, 31 Dec 2017 22:25:20 +0100
Subject: [PATCH] MPlayer: mime support (#2008)

---
 .../mplayer/additional-files/mplayer.rdef.in  | 10 ++++++++++
 media-video/mplayer/mplayer-1.3.0.recipe      | 20 +++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/media-video/mplayer/additional-files/mplayer.rdef.in b/media-video/mplayer/additional-files/mplayer.rdef.in
index eb8a70f0c..82b9a7792 100644
--- a/media-video/mplayer/additional-files/mplayer.rdef.in
+++ b/media-video/mplayer/additional-files/mplayer.rdef.in
@@ -13,6 +13,16 @@ resource app_version {
 
 resource app_signature "application/x-vnd.mplayer";
 
+resource file_types message {
+	"types" = "application/ogg",
+	"types" = "application/x-ogg",
+	"types" = "application/x-asf",
+	"types" = "application/x-shockwave-flash",
+	"types" = "application/vnd.rn-realmedia-vbr",
+	"types" = "audio",
+	"types" = "video"
+};
+
 resource vector_icon {
 	$"6E636966040307A7E605000332237405FF1B0206B760B655B545B688B87432CE"
 	$"B1B7B5B7F9BEF9CEB1B7B5CFE6C2C0CFE6C2C0D01DC4B5CC7DC6A3CE97C671C7"
diff --git a/media-video/mplayer/mplayer-1.3.0.recipe b/media-video/mplayer/mplayer-1.3.0.recipe
index bc7f49b0a..95a130bbc 100644
--- a/media-video/mplayer/mplayer-1.3.0.recipe
+++ b/media-video/mplayer/mplayer-1.3.0.recipe
@@ -22,7 +22,7 @@ DVD subtitles (SPU streams, VOBsub and Closed Captions) are supported as well."
 HOMEPAGE="http://www.mplayerhq.hu/"
 COPYRIGHT="2001-2016 The MPlayer Team"
 LICENSE="GNU LGPL v2.1"
-REVISION="5"
+REVISION="6"
 SOURCE_URI="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$portVersion.tar.xz"
 CHECKSUM_SHA256="3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843"
 SOURCE_DIR="MPlayer-$portVersion"
@@ -32,10 +32,18 @@ ADDITIONAL_FILES="mplayer.rdef.in"
 ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	mplayer$secondaryArchSuffix = $portVersion
-	cmd:mencoder
-	cmd:mplayer
+	cmd:mencoder$commandSuffix
+	cmd:mplayer$commandSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -166,6 +174,7 @@ BUILD()
 	libtoolize --force --copy --install
 	configure \
 		--prefix=$prefix \
+		--bindir=$commandBinDir \
 		--datadir=$dataDir \
 		--confdir=$settingsDir/mplayer \
 		--mandir=$manDir \
@@ -194,5 +203,8 @@ INSTALL()
 		-e "s|@MINOR@|$MINOR|" \
 		$portDir/additional-files/mplayer.rdef.in > mplayer.rdef
 
-	addResourcesToBinaries mplayer.rdef $prefix/bin/mplayer
+	addResourcesToBinaries mplayer.rdef $commandBinDir/mplayer
+
+	mimeset -f $commandBinDir/mplayer
+
 }