Merge pull request #21 from AlwinEsch/Leia-change

Addon depends update and cleanup

.gitignore

@@ -1,23 +1,42 @@
 # build artifacts
 build/
+audioencoder.*/addon.xml
+
+# Debian build files
 debian/changelog
 debian/files
-audioencoder.lame/addon.xml
-debian/kodi-audioencoder-lame-dbg.debhelper.log
-debian/kodi-audioencoder-lame-dbg.substvars
-debian/kodi-audioencoder-lame-dbg/
-debian/kodi-audioencoder-lame.debhelper.log
-debian/kodi-audioencoder-lame.postinst.debhelper
-debian/kodi-audioencoder-lame.postrm.debhelper
-debian/kodi-audioencoder-lame.substvars
-debian/kodi-audioencoder-lame/
+debian/*.log
+debian/*.substvars
+debian/.debhelper/
 debian/tmp/
+debian/kodi-audioencoder-*/
 obj-x86_64-linux-gnu/
 
+# commonly used editors
+# vim
+*.swp
+
+# Eclipse
+*.project
+*.cproject
+.classpath
+*.sublime-*
+.settings/
+
+# KDevelop 4
+*.kdev4
+
+# gedit
+*~
+
+# CLion
+/.idea
+
 # clion
 .idea/
 
-# Eclipse/CDT
-.cproject
-.project
-.settings/
+# to prevent add after a "git format-patch VALUE" and "git add ." call
+/*.patch
+
+# to prevent add if project code opened by Visual Studio over CMake file
+.vs/

audioencoder.lame/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="audioencoder.lame"
-  version="2.0.1"
+  version="2.0.2"
   name="Lame MP3 Audio Encoder"
   provider-name="spiff">
   <requires>@ADDON_DEPENDS@</requires>
@@ -10,7 +10,7 @@
     extension=".mp3"
     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
   <extension point="xbmc.addon.metadata">
-    <summary lang="en">Lame MP3 Audio Encoder</summary>
+    <summary lang="en">LAME is a high quality MPEG Audio Layer III (MP3)</summary>
     <description lang="en">It use LAME, the high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.</description>
     <platform>@PLATFORM@</platform>
   </extension>

audioencoder.lame/resources/language/English/strings.po → audioencoder.lame/resources/language/resource.language.en_gb/strings.po

@@ -17,25 +17,33 @@ msgid "Preset"
 msgstr ""
 
 msgctxt "#30001"
-msgid "Medium"
+msgid "Enables some preconfigured settings"
 msgstr ""
 
 msgctxt "#30002"
-msgid "Standard"
+msgid "Medium"
 msgstr ""
 
 msgctxt "#30003"
-msgid "Extreme"
+msgid "Standard"
 msgstr ""
 
 msgctxt "#30004"
-msgid "Constant bitrate"
+msgid "Extreme"
 msgstr ""
 
 msgctxt "#30005"
-msgid "Bitrate"
+msgid "Constant bitrate"
 msgstr ""
 
 msgctxt "#30006"
+msgid "Bitrate"
+msgstr ""
+
+msgctxt "#30007"
+msgid "The bitrate to be used"
+msgstr ""
+
+msgctxt "#30008"
 msgid "{0:d} kHz"
 msgstr ""

audioencoder.lame/resources/settings.xml

@@ -2,19 +2,19 @@
   <section id="addon" label="-1" help="-1">
     <category id="main" label="128" help="-1">
       <group id="1" label="-1">
-        <setting id="preset" type="integer" label="30000" help="-1">
+        <setting id="preset" type="integer" label="30000" help="30001">
           <default>0</default>
           <constraints>
             <options>
-              <option label="30001">0</option>
-              <option label="30002">1</option>
-              <option label="30003">2</option>
-              <option label="30004">3</option>
+              <option label="30002">0</option>
+              <option label="30003">1</option>
+              <option label="30004">2</option>
+              <option label="30005">3</option>
             </options>
           </constraints>
           <control type="spinner" format="string" />
         </setting>
-        <setting id="bitrate" type="integer" label="30005" help="0">
+        <setting id="bitrate" type="integer" label="30006" help="30007">
           <default>192</default>
           <dependencies>
             <dependency type="visible" setting="preset" operator="is">3</dependency>
@@ -25,7 +25,7 @@
             <maximum>320</maximum>
           </constraints>
           <control type="list" format="string">
-            <formatlabel>30006</formatlabel>
+            <formatlabel>30008</formatlabel>
           </control>
         </setting>
       </group>

depends/common/lame/01-field-width-fix.patch

@@ -6,7 +6,7 @@ Applied-Upstream: commit:1.282
 
 --- a/frontend/parse.c
 +++ b/frontend/parse.c
-@@ -372,11 +372,11 @@
+@@ -402,11 +402,11 @@ lame_version_print(FILE * const fp)
      const char *b = get_lame_os_bitness();
      const char *v = get_lame_version();
      const char *u = get_lame_url();

depends/common/lame/03-privacy-breach.patch → depends/common/lame/02-privacy-breach.patch

@@ -2,8 +2,8 @@ Description: Fix privacy-breach lintian error
 Author: Sebastian Ramacher <sramacher@debian.org>
 Last-Update: 2014-08-30
 
---- lame-3.99.5+repack1.orig/doc/html/about.html
-+++ lame-3.99.5+repack1/doc/html/about.html
+--- a/doc/html/about.html
++++ b/doc/html/about.html
 @@ -116,9 +116,9 @@ MPEG2 sample rates are 16Khz, 22.05Khz a
  </div>
  <div id="footer">
@@ -17,8 +17,8 @@ Last-Update: 2014-08-30
 
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
---- lame-3.99.5+repack1.orig/doc/html/abr.html
-+++ lame-3.99.5+repack1/doc/html/abr.html
+--- a/doc/html/abr.html
++++ b/doc/html/abr.html
 @@ -90,9 +90,9 @@ than that of CBR for the target bitrate.
  </div>
  <div id="footer">
@@ -39,8 +39,8 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/cbr.html
-+++ lame-3.99.5+repack1/doc/html/cbr.html
+--- a/doc/html/cbr.html
++++ b/doc/html/cbr.html
 @@ -82,9 +82,9 @@ without scanning and partially decoding
  </div>
  <div id="footer">
@@ -61,8 +61,8 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/contact.html
-+++ lame-3.99.5+repack1/doc/html/contact.html
+--- a/doc/html/contact.html
++++ b/doc/html/contact.html
 @@ -104,9 +104,9 @@
  </div>
  <div id="footer">
@@ -83,8 +83,8 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/contributors.html
-+++ lame-3.99.5+repack1/doc/html/contributors.html
+--- a/doc/html/contributors.html
++++ b/doc/html/contributors.html
 @@ -169,9 +169,9 @@
  </div>
  <div id="footer">
@@ -105,9 +105,9 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/detailed.html
-+++ lame-3.99.5+repack1/doc/html/detailed.html
-@@ -1259,9 +1259,9 @@ so using it shouldn't cause harm.
+--- a/doc/html/detailed.html
++++ b/doc/html/detailed.html
+@@ -1286,9 +1286,9 @@ so using this switch shouldn't cause har
  </div>
  <div id="footer">
 
@@ -120,9 +120,9 @@ Last-Update: 2014-08-30
 
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
---- lame-3.99.5+repack1.orig/doc/html/history.html
-+++ lame-3.99.5+repack1/doc/html/history.html
-@@ -3450,8 +3450,7 @@ the exe. Thanks to <b>Lars Magne Ingebri
+--- a/doc/html/history.html
++++ b/doc/html/history.html
+@@ -3522,8 +3522,7 @@ the exe. Thanks to <b>Lars Magne Ingebri
  <center>
  <p>
    <a href="http://validator.w3.org/check?uri=referer">
@@ -132,8 +132,8 @@ Last-Update: 2014-08-30
    </a>
  </p>
  </center>
---- lame-3.99.5+repack1.orig/doc/html/index.html
-+++ lame-3.99.5+repack1/doc/html/index.html
+--- a/doc/html/index.html
++++ b/doc/html/index.html
 @@ -51,9 +51,9 @@
  </div>
  <div id="footer">
@@ -147,8 +147,8 @@ Last-Update: 2014-08-30
 
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
---- lame-3.99.5+repack1.orig/doc/html/introduction.html
-+++ lame-3.99.5+repack1/doc/html/introduction.html
+--- a/doc/html/introduction.html
++++ b/doc/html/introduction.html
 @@ -163,9 +163,9 @@ transparency all of the time. This is th
  </div>
  <div id="footer">
@@ -162,9 +162,9 @@ Last-Update: 2014-08-30
 
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
---- lame-3.99.5+repack1.orig/doc/html/links.html
-+++ lame-3.99.5+repack1/doc/html/links.html
-@@ -914,9 +914,9 @@ tests:</i></a></h3>
+--- a/doc/html/links.html
++++ b/doc/html/links.html
+@@ -951,9 +951,9 @@ tests:</i></a></h3>
  </div>
  <div id="footer">
 
@@ -177,15 +177,15 @@ Last-Update: 2014-08-30
 
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
-@@ -933,4 +933,4 @@ href="http://www.brightercreative.co.uk"
+@@ -970,4 +970,4 @@ href="http://www.brightercreative.co.uk"
  </div>
 
  </body>
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/list.html
-+++ lame-3.99.5+repack1/doc/html/list.html
+--- a/doc/html/list.html
++++ b/doc/html/list.html
 @@ -47,9 +47,9 @@
  </div>
  <div id="footer">
@@ -206,8 +206,8 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/ms_stereo.html
-+++ lame-3.99.5+repack1/doc/html/ms_stereo.html
+--- a/doc/html/ms_stereo.html
++++ b/doc/html/ms_stereo.html
 @@ -104,9 +104,9 @@ href="http://en.wikipedia.org/wiki/Joint
  </div>
  <div id="footer">
@@ -228,9 +228,9 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/usage.html
-+++ lame-3.99.5+repack1/doc/html/usage.html
-@@ -116,9 +116,9 @@ sounds transparent. Use lossless codecs
+--- a/doc/html/usage.html
++++ b/doc/html/usage.html
+@@ -118,9 +118,9 @@ sounds transparent. Use lossless codecs
  </div>
  <div id="footer">
 
@@ -243,8 +243,8 @@ Last-Update: 2014-08-30
 
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
---- lame-3.99.5+repack1.orig/doc/html/vbr.html
-+++ lame-3.99.5+repack1/doc/html/vbr.html
+--- a/doc/html/vbr.html
++++ b/doc/html/vbr.html
 @@ -61,9 +61,9 @@ file size is quite unpredictable, and ca
  </div>
  <div id="footer">