[SCM] smplayer/master: Improve mplayer2 auto-detection

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 412017abbc49124dd2d69783afa319212eb79bec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 29 23:16:37 2013 +0100

    Improve mplayer2 auto-detection
    
    Closes: #699864.

diff --git a/debian/changelog b/debian/changelog
index a3acec0..1c30a9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ smplayer (0.8.4-1) UNRELEASED; urgency=low
 
   * Imported Upstream version 0.8.4
   * Testing confirms that this version works with both, mplayer and
-    mplayer2, closes: #640889, #641909, #643781, #678315
+    mplayer2, closes: #640889, #641909, #643781, #678315.
+  * Improve mplayer2 auto-detection, closes: #699864.
 
  -- Reinhard Tartler <siretart at tauware.de>  Fri, 29 Mar 2013 20:44:46 +0100
 
diff --git a/debian/patches/01-add-mplayer2-detection.patch b/debian/patches/01-add-mplayer2-detection.patch
new file mode 100644
index 0000000..6991801
--- /dev/null
+++ b/debian/patches/01-add-mplayer2-detection.patch
@@ -0,0 +1,25 @@
+Author: Reinhard Tartler <siretart at tauware.de>
+Description: Detect that the binary is actually mplayer2
+Bug-Debian: http://bugs.debian.org/699864
+
+smplayer can handle mplayer2 if it detects its presence. Upstream's
+solution to rename mplayer to mplayer2 is not acceptable for
+Debian. Since executing the mplayer program to parse its version
+identification output is too heavy-weight, this change introduces a
+dpkg-specific, but light-weight check.
+
+--- a/src/core.cpp
++++ b/src/core.cpp
+@@ -1419,9 +1419,10 @@ void Core::startMplayer( QString file, d
+         mplayer_bin = fi.absoluteFilePath();
+ 	}
+ 
+-	if (fi.baseName().toLower() == "mplayer2") {
++	// debian/ubuntu specific check if we are using mplayer2
++	if ((fi.baseName().toLower() == "mplayer2") || !access("/usr/share/doc/mplayer2/copyright", F_OK)) {
++		qDebug("Core::startMplayer: this seems mplayer2");
+ 		if (!pref->mplayer_is_mplayer2) {
+-			qDebug("Core::startMplayer: this seems mplayer2");
+ 			pref->mplayer_is_mplayer2 = true;
+ 		}
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fc7f32a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-add-mplayer2-detection.patch

-- 
smplayer packaging