| @@ -1,28 +1,30 @@ | | | @@ -1,28 +1,30 @@ |
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 | |
| | | 3 | mplayer > dev/null 2>&1 returns 768, drain it to echo |
2 | | | 4 | |
3 | Don't care if mp3lame is supported in mencoder. LAVC can be used just as well. | | 5 | Don'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"; |
26 | | | 28 | |
27 | print "Everything looks good here...\n"; | | 29 | print "Everything looks good here...\n"; |
28 | | | 30 | |