Mon Aug 3 11:11:20 2020 UTC ()
(multimedia/acidrip) make mlayer test pass by || echo


(mef)
diff -r1.5 -r1.6 pkgsrc/multimedia/acidrip/distinfo
diff -r1.1 -r1.2 pkgsrc/multimedia/acidrip/patches/patch-Makefile.PL
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/acidrip/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/acidrip/distinfo 2020/03/29 01:05:18 1.5
+++ pkgsrc/multimedia/acidrip/distinfo 2020/08/03 11:11:19 1.6
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.5 2020/03/29 01:05:18 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2020/08/03 11:11:19 mef Exp $
2 2
3SHA1 (acidrip-0.14.tar.gz) = 5873c835c0d52edc2c1a799e9751980b6c7cc4f1 3SHA1 (acidrip-0.14.tar.gz) = 5873c835c0d52edc2c1a799e9751980b6c7cc4f1
4RMD160 (acidrip-0.14.tar.gz) = 14d0f5969fdc5f0c6777e4bfdd38628d0c747608 4RMD160 (acidrip-0.14.tar.gz) = 14d0f5969fdc5f0c6777e4bfdd38628d0c747608
5SHA512 (acidrip-0.14.tar.gz) = 3ee0e329bd7e5eb4067d618fc79a49707084526d53e8c10cd9ec560828cf621e8d7263259cc8bc7944e6f9d7b7fd1fc5b8a42a8f37f18666f1974f240edb99a0 5SHA512 (acidrip-0.14.tar.gz) = 3ee0e329bd7e5eb4067d618fc79a49707084526d53e8c10cd9ec560828cf621e8d7263259cc8bc7944e6f9d7b7fd1fc5b8a42a8f37f18666f1974f240edb99a0
6Size (acidrip-0.14.tar.gz) = 92086 bytes 6Size (acidrip-0.14.tar.gz) = 92086 bytes
7SHA1 (patch-Makefile.PL) = 914aa3d1a8a7aa3ee2ad6b4b989e8afe17dd920c 7SHA1 (patch-Makefile.PL) = a240cd8713229511b4629e897d519383603a3ee2
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/acidrip/patches/patch-Makefile.PL (expand / switch to unified diff)

--- pkgsrc/multimedia/acidrip/patches/patch-Makefile.PL 2020/03/29 01:05:18 1.1
+++ pkgsrc/multimedia/acidrip/patches/patch-Makefile.PL 2020/08/03 11:11:20 1.2
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1$NetBSD: patch-Makefile.PL,v 1.1 2020/03/29 01:05:18 joerg Exp $ 1$NetBSD: patch-Makefile.PL,v 1.2 2020/08/03 11:11:20 mef Exp $
 2
 3mplayer > dev/null 2>&1 returns 768, drain it to echo
2 4
3Don't care if mp3lame is supported in mencoder. LAVC can be used just as well. 5Don't care if mp3lame is supported in mencoder. LAVC can be used just as well.
4 6
5--- Makefile.PL.orig 2020-03-29 00:27:46.399480924 +0000 7--- Makefile.PL.orig 2020-03-29 00:27:46.399480924 +0000
6+++ Makefile.PL 8+++ Makefile.PL
7@@ -59,19 +59,13 @@ print "test for MPlayer: "; die "Not Fou 9@@ -59,19 +59,13 @@ print "test for MPlayer: "; die "Not Fou
8 "AcidRip is based around the MPlayer video player. it has not been found on\n" . 10 "AcidRip is based around the MPlayer video player. it has not been found on\n" .
9 "your current path. Install it from http://mplayerhq/hu see INSTALL.html or\n" . 11 "your current path. Install it from http://mplayerhq/hu see INSTALL.html or\n" .
10 "INSTALL for installation instructions.\n" . 12 "INSTALL for installation instructions.\n" .
11- "***************\n\n" if ( system "mplayer 2&>1 > /dev/null" ); print "found\n"; 13- "***************\n\n" if ( system "mplayer 2&>1 > /dev/null" ); print "found\n";
12+ "***************\n\n" if ( system "mplayer > /dev/null 2>&1" ); print "found\n"; 14+ "***************\n\n" if ( system "mplayer > /dev/null 2>&1 || echo" ); print "found\n";
13  15
14 print "test for MEncoder: "; die "Not Found!\n\n***************\n" . 16 print "test for MEncoder: "; die "Not Found!\n\n***************\n" .
15 "AcidRip uses MEncoder, which is part of MPlayer video player package. This\n" . 17 "AcidRip uses MEncoder, which is part of MPlayer video player package. This\n" .
16 "was not found. Install it from http://mplayerhq/hu see INSTALL.html or\n" . 18 "was not found. Install it from http://mplayerhq/hu see INSTALL.html or\n" .
17 "INSTALL for installation instructions.\n" . 19 "INSTALL for installation instructions.\n" .
18- "***************\n\n" if ( system "mencoder -ovc help 2> /dev/null | grep MEncoder > /dev/null" ); print "found\n"; 20- "***************\n\n" if ( system "mencoder -ovc help 2> /dev/null | grep MEncoder > /dev/null" ); print "found\n";
19- 21-
20-print "test for MP3 support in mencoder: "; die "Not Found!\n\n***************\n" . 22-print "test for MP3 support in mencoder: "; die "Not Found!\n\n***************\n" .
21- "MEncoder was found, however it does not have MP3 support built into it.\n" . 23- "MEncoder was found, however it does not have MP3 support built into it.\n" .
22- "If you DO want MP3 support you'll need to recompile mplayer with mp3 support\n" . 24- "If you DO want MP3 support you'll need to recompile mplayer with mp3 support\n" .
23- "See INSTALL or INSTALL.html for more information\n" . 25- "See INSTALL or INSTALL.html for more information\n" .
24- "***************\n\n" if ( system "mencoder -oac help 2> /dev/null | grep mp3lame > /dev/null" ); print "found\n"; 26- "***************\n\n" if ( system "mencoder -oac help 2> /dev/null | grep mp3lame > /dev/null" ); print "found\n";
25+ "***************\n\n" if ( system "2> /dev/null mencoder -ovc help | grep MEncoder > /dev/null" ); print "found\n"; 27+ "***************\n\n" if ( system "2> /dev/null mencoder -ovc help | grep MEncoder > /dev/null" ); print "found\n";