patch-pacpl 8.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219
  1. $OpenBSD: patch-pacpl,v 1.6 2013/04/27 11:39:47 sthen Exp $
  2. --- pacpl.orig Fri Mar 20 02:19:03 2009
  3. +++ pacpl Sat Apr 27 12:34:15 2013
  4. @@ -130,8 +130,8 @@ my %config = (
  5. );
  6. # location of configuration file
  7. -my $conf_path = "/etc/pacpl";
  8. -my $po_dir = "/usr/share/pacpl/locale";
  9. +my $conf_path = "${SYSCONFDIR}/pacpl";
  10. +my $po_dir = "${PREFIX}/share/pacpl/locale";
  11. my $mod_dir = "$conf_path/modules";
  12. my $conf_file;
  13. @@ -143,7 +143,6 @@ load_lang();
  14. my @conf_locations = (
  15. "$ENV{HOME}/.pacplrc", # Local
  16. "$conf_path/pacpl.conf", # Global
  17. - "$ENV{PWD}/pacpl.conf", # Current Directory
  18. );
  19. # try to load conf file from one of the above locations
  20. @@ -203,7 +202,8 @@ sub load_codecs {
  21. # load po file and store in %lang hash
  22. sub load_lang {
  23. - my $po = "$po_dir/$ENV{LANG}.po";
  24. + my $po = "";
  25. + $po = "$po_dir/$ENV{LANG}.po" if ($ENV{'LANG'});
  26. $po =~ s/\.UTF-8//i if $po =~ /UTF-8/i;
  27. $po =~ s/\.utf8//i if $po =~ /utf8/i;
  28. $po =~ s/_\w+// if not -e $po;
  29. @@ -708,8 +708,8 @@ my $opts;
  30. flac => {
  31. - DEFAULT_ENCODER => "flac",
  32. - DEFAULT_DECODER => "flac",
  33. + DEFAULT_ENCODER => "ffmpeg",
  34. + DEFAULT_DECODER => "ffmpeg",
  35. ENCODER => {
  36. flac => {
  37. @@ -908,8 +908,8 @@ my $opts;
  38. aac => {
  39. - DEFAULT_ENCODER => "faac",
  40. - DEFAULT_DECODER => "faad",
  41. + DEFAULT_ENCODER => "ffmpeg",
  42. + DEFAULT_DECODER => "ffmpeg",
  43. ENCODER => {
  44. faac => {
  45. @@ -927,7 +927,7 @@ my $opts;
  46. ESTR => sub {
  47. $opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
  48. $opts = '' if $defopts == 0;
  49. - "$eopts -y -i %i $opts %o"
  50. + "$eopts -y -i %i $opts -strict experimental %o"
  51. },
  52. PROMPT => {
  53. @@ -941,7 +941,7 @@ my $opts;
  54. DECODER => {
  55. faad => {
  56. NAME => "faad",
  57. - DSTR => sub { "$dopts -o %i %o" },
  58. + DSTR => sub { "$dopts -o %o %i" },
  59. },
  60. ffmpeg => {
  61. @@ -964,8 +964,8 @@ my $opts;
  62. mp4 => {
  63. - DEFAULT_ENCODER => "faac",
  64. - DEFAULT_DECODER => "faad",
  65. + DEFAULT_ENCODER => "ffmpeg",
  66. + DEFAULT_DECODER => "ffmpeg",
  67. ENCODER => {
  68. @@ -984,7 +984,7 @@ my $opts;
  69. ESTR => sub {
  70. $opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
  71. $opts = '' if $defopts == 0;
  72. - "$eopts -y -i %i $opts %o"
  73. + "$eopts -y -i %i $opts -strict experimental %o"
  74. },
  75. PROMPT => {
  76. @@ -1022,8 +1022,8 @@ my $opts;
  77. m4a => {
  78. - DEFAULT_ENCODER => "faac",
  79. - DEFAULT_DECODER => "faad",
  80. + DEFAULT_ENCODER => "ffmpeg",
  81. + DEFAULT_DECODER => "ffmpeg",
  82. ENCODER => {
  83. @@ -1042,7 +1042,7 @@ my $opts;
  84. ESTR => sub {
  85. $opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
  86. $opts = '' if $defopts == 0;
  87. - "$eopts -y -i %i $opts %o"
  88. + "$eopts -y -i %i $opts -strict experimental %o"
  89. },
  90. PROMPT => {
  91. @@ -1084,7 +1084,7 @@ my $opts;
  92. m4b => {
  93. DEFAULT_ENCODER => "faac",
  94. - DEFAULT_DECODER => "faad",
  95. + DEFAULT_DECODER => "mplayer",
  96. ENCODER => {
  97. @@ -1124,13 +1124,13 @@ my $opts;
  98. mpc => {
  99. - DEFAULT_ENCODER => "mppenc",
  100. - DEFAULT_DECODER => "mppdec",
  101. + DEFAULT_ENCODER => "mpcenc",
  102. + DEFAULT_DECODER => "mpcdec",
  103. ENCODER => {
  104. - mppenc => {
  105. - NAME => "mppenc",
  106. + mpcenc => {
  107. + NAME => "mpcenc",
  108. ESTR => sub {
  109. $opts = "--$mpcqual" if $defopts == 1;
  110. $opts = '' if $defopts == 0;
  111. @@ -1142,8 +1142,8 @@ my $opts;
  112. DECODER => {
  113. - mppdec => {
  114. - NAME => "mppdec",
  115. + mpcdec => {
  116. + NAME => "mpcdec",
  117. DSTR => sub { "$dopts %i %o" },
  118. },
  119. @@ -1166,13 +1166,13 @@ my $opts;
  120. mpp => {
  121. - DEFAULT_ENCODER => "mppenc",
  122. - DEFAULT_DECODER => "mppdec",
  123. + DEFAULT_ENCODER => "mpcenc",
  124. + DEFAULT_DECODER => "mpcdec",
  125. ENCODER => {
  126. - mppenc => {
  127. - NAME => "mppenc",
  128. + mpcenc => {
  129. + NAME => "mpcenc",
  130. ESTR => sub {
  131. $opts = "--$mpcqual" if $defopts == 1;
  132. $opts = '' if $defopts == 0;
  133. @@ -1184,8 +1184,8 @@ my $opts;
  134. DECODER => {
  135. - mppdec => {
  136. - NAME => "mppdec",
  137. + mpcdec => {
  138. + NAME => "mpcdec",
  139. DSTR => sub { "$dopts %i %o" },
  140. },
  141. @@ -1401,7 +1401,7 @@ my $opts;
  142. wv => {
  143. DEFAULT_ENCODER => "wavpack",
  144. - DEFAULT_DECODER => "wvunpack",
  145. + DEFAULT_DECODER => "ffmpeg",
  146. ENCODER => {
  147. wavpack => {
  148. @@ -2050,7 +2050,7 @@ sub format_tags {
  149. $tag_name{track} = 0 if not $tag_name{track};
  150. $tag_name{year} = 0 if not $tag_name{year};
  151. - return "-title \"$tag_name{title}\" -track \"$tag_name{track}\" -author \"$tag_name{artist}\" -album \"$tag_name{album}\" -comment \"$tag_name{comment}\" -year \"$tag_name{year}\" -genre \"$tag_name{genre}\"";
  152. + return "-metadata title=\"$tag_name{title}\" -metadata track=\"$tag_name{track}\" -metadata author=\"$tag_name{artist}\" -metadata album=\"$tag_name{album}\" -metadata comment=\"$tag_name{comment}\" -metadata year=\"$tag_name{year}\" -metadata genre=\"$tag_name{genre}\"";
  153. } else {
  154. @@ -2878,7 +2878,7 @@ to turn off default encoder options use --defopts 0. t
  155. more control when using the --eopts command.
  156. defopts is set to 1 by default. you can also toggle this option in
  157. -/etc/pacpl/pacpl.conf.
  158. +${SYSCONFDIR}/pacpl/pacpl.conf.
  159. B<--eopts> I<options>
  160. @@ -3217,9 +3217,9 @@ show cddb information for current disc.
  161. =item B<sox>(1) B<ffmpeg>(1) B<lame>(1) B<oggenc>(1) B<oggdec>(1)
  162. -=item B<flac>(1) B<shorten>(1) B<faac>(1) B<faad>(1) B<mppenc>(1)
  163. +=item B<flac>(1) B<shorten>(1) B<faac>(1) B<faad>(1) B<mpcenc>(1)
  164. -=item B<mppdec>(1) B<mplayer>(1) B<speexenc>(1) B<speexdec>(1)
  165. +=item B<mpcdec>(1) B<mplayer>(1) B<speexenc>(1) B<speexdec>(1)
  166. =item B<sndfile-convert>(1) B<normalize>(1) B<cdparanoia>(1)