Added some patch from erm67 to solve problems with newer mplayer-versions, Bug #150217.

Package-Manager: portage-2.1.2_rc1-r4

2 files changed, 38 insertions, 0 deletions

diff --git a/media-plugins/vdr-vdrrip/files/digest-vdr-vdrrip-0.3.0-r5 b/media-plugins/vdr-vdrrip/files/digest-vdr-vdrrip-0.3.0-r5
new file mode 100644
index 000000000000..a8ba5765ee75
--- /dev/null
+++ b/media-plugins/vdr-vdrrip/files/digest-vdr-vdrrip-0.3.0-r5
@@ -0,0 +1,6 @@
+MD5 3c5363fd3017458b566e3503ccfaea2c queuehandler-fixed-0.3.0.sh 25777
+RMD160 4e8928b884205556e9d2bbe1b29c9b0ad4029b88 queuehandler-fixed-0.3.0.sh 25777
+SHA256 b6c9729de47ce0ebafdfa8ae8dc2022adc292718d37f79d8569f13d865b25d5f queuehandler-fixed-0.3.0.sh 25777
+MD5 7ba3581d26b3ffc2ebfc400f95bf72fd vdr-vdrrip-0.3.0.tgz 94937
+RMD160 9a3d418e715e3fbcf5d010a21c671b13fd269b99 vdr-vdrrip-0.3.0.tgz 94937
+SHA256 9fda896cacbb78b2139ae6baa53f08a992768a78d0dce33b836b0c2ae797702b vdr-vdrrip-0.3.0.tgz 94937
diff --git a/media-plugins/vdr-vdrrip/files/vdr-vdrrip-0.3.0-mplayercmd2.diff b/media-plugins/vdr-vdrrip/files/vdr-vdrrip-0.3.0-mplayercmd2.diff
new file mode 100644
index 000000000000..92dd656a1711
--- /dev/null
+++ b/media-plugins/vdr-vdrrip/files/vdr-vdrrip-0.3.0-mplayercmd2.diff
@@ -0,0 +1,32 @@
+diff -r -u vdrrip-0.3.0.org/movie.c vdrrip-0.3.0/movie.c
+--- vdrrip-0.3.0.org/movie.c	2006-11-06 00:06:29.000000000 +0100
++++ vdrrip-0.3.0/movie.c	2006-11-06 00:04:35.000000000 +0100
+@@ -21,8 +21,8 @@
+ 
+ #define SAVEFILE "save.vdrrip"
+ 
+-#define IDENTCMD "%s \'%s\'%s -identify -frames 0 2>/dev/null | sed -e \'s/[`\\!$\"]/\\&/g\'"
+-#define CROPCMD "%s \'%s\'%s -vo null -ao null -really-quiet -ss %i -frames %i -vop cropdetect 2>/dev/null | grep \"crop=\" | sed \"s/.*crop\\(.*\\)).*/\\1/\" | sort | uniq -c | sort -r"
++#define IDENTCMD "%s \'%s\'%s -identify -vo null -ao null -frames 1 2>/dev/null | sed -e \'s/[`\\!$\"]/\\&/g\'"
++#define CROPCMD "%s \'%s\'%s -vo null -ao null -quiet -ss %i -frames %i -vop cropdetect 2>/dev/null | grep \"crop=\" | sed \"s/.*crop\\(.*\\)).*/\\1/\" | sort | uniq -c | sort -r"
+ #define AUDIOCMD "%s \'%s/001.vdr\' -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep AUDIO"
+ #define AUDIOCMDDVD "%s %s -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep AUDIO"
+ #define MENCCMD "%s %s help 2>/dev/null"
+@@ -515,11 +515,12 @@
+     } else {Fps = -1;}
+     FREE(s);
+ 
+-    s = strcol(strgrep("ID_VIDEO_ASPECT", p), "=", 2);
+-    if (s) {
+-      Aspect = atof(s);
+-    } else {Aspect = -1;}
+-
++    Aspect = -1;
++    while(s = strcol(strgrep("ID_VIDEO_ASPECT", p), "=", 2)){
++       Aspect = atof(s);
++       if (Aspect != 0) break;
++    }   
++    if (Aspect == 0) {Aspect = 1.333333;}
+     CalcAspect = Aspect;
+ 
+     pclose(p);