summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorGravatar Benjamin Barenblat <bbaren@mit.edu>2015-01-20 17:04:19 -0500
committerGravatar Benjamin Barenblat <bbaren@mit.edu>2015-01-20 17:04:19 -0500
commitfa2a6beeb689fce28fe1813cc63e4fca7b9a7be9 (patch)
tree7d68b65eb356e801498770ac1997cc6a3bc962bb /debian/patches
parente4000a2b41099c4cc83da269004e24fa0928b6db (diff)
Enable converter plugin
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/converter-free-presets.diff79
-rw-r--r--debian/patches/converter-install-share.diff27
-rw-r--r--debian/patches/series2
3 files changed, 108 insertions, 0 deletions
diff --git a/debian/patches/converter-free-presets.diff b/debian/patches/converter-free-presets.diff
new file mode 100644
index 00000000..d087c1b3
--- /dev/null
+++ b/debian/patches/converter-free-presets.diff
@@ -0,0 +1,79 @@
+From: Benjamin Barenblat <bbaren@mit.edu>
+Description: Remove references to non-free software in converter plugin
+ This patch adjusts the converter plugin's presets to only refer to codecs for
+ which free encoders are available. It also adjusts the presets to use the
+ Debian-preferred avconv instead of ffmpeg.
+Forwarded: no
+Last-Updated: 2015-01-20
+--- a/plugins/converter/presets/AAC_(Nero_FAAC).txt
++++ /dev/null
+@@ -1,10 +0,0 @@
+-title AAC (Nero FAAC)
+-ext mp4
+-encoder faac -w -o %o -
+-method 0
+-id3v2_version 0
+-tag_id3v2 0
+-tag_id3v1 0
+-tag_apev2 0
+-tag_flac 0
+-tag_oggvorbis 0
+--- /dev/null
++++ b/plugins/converter/presets/AAC.txt
+@@ -0,0 +1,10 @@
++title AAC
++ext mp4
++encoder avconv -i %i -codec:a aac -strict experimental %o
++method 1
++id3v2_version 0
++tag_id3v2 0
++tag_id3v1 0
++tag_apev2 0
++tag_flac 0
++tag_oggvorbis 0
+--- a/plugins/converter/presets/ALAC.txt
++++ b/plugins/converter/presets/ALAC.txt
+@@ -1,6 +1,6 @@
+ title ALAC
+ ext m4a
+-encoder ffmpeg -i %i -acodec alac %o
++encoder avconv -i %i -codec:a alac %o
+ method 1
+ id3v2_version 0
+ tag_id3v2 0
+--- a/plugins/converter/presets/TTA.txt
++++ /dev/null
+@@ -1,10 +0,0 @@
+-title TTA
+-ext tta
+-encoder ttaenc -e -o %o %i
+-method 1
+-id3v2_version 1
+-tag_id3v2 1
+-tag_id3v1 0
+-tag_apev2 0
+-tag_flac 0
+-tag_oggvorbis 0
+--- a/plugins/converter/Makefile.am
++++ b/plugins/converter/Makefile.am
+@@ -14,7 +14,8 @@ endif
+
+ convdatadir = $(libdir)/deadbeef/convpresets
+ convdata_DATA = \
+- presets/AAC_(Nero_FAAC).txt\
++ presets/AAC.txt\
++ presets/ALAC.txt\
+ presets/FLAC_(compression_level_5).txt\
+ presets/MP3_CBR_320_Kbps_(Lame).txt\
+ presets/MP3_VBR_192Kbps_(Lame).txt\
+@@ -23,9 +24,7 @@ convdata_DATA = \
+ presets/Ogg_FLAC.txt\
+ presets/Ogg_Vorbis_(-q_5).txt\
+ presets/Opus.txt\
+- presets/TTA.txt\
+- presets/WavPack.txt\
+- presets/ALAC.txt
++ presets/WavPack.txt
+
+ EXTRA_DIST = $(convdata_DATA) converter.glade
+
diff --git a/debian/patches/converter-install-share.diff b/debian/patches/converter-install-share.diff
new file mode 100644
index 00000000..37f383ff
--- /dev/null
+++ b/debian/patches/converter-install-share.diff
@@ -0,0 +1,27 @@
+From: Benjamin Barenblat <bbaren@mit.edu>
+Description: Place converter plugin presets in /usr/share/deadbeef
+ These are architecture-independent files, so they ought to go in /usr/share.
+Forwarded: no
+Last-Updated: 2015-01-20
+--- a/plugins/converter/Makefile.am
++++ b/plugins/converter/Makefile.am
+@@ -12,7 +12,7 @@ pkglib_LTLIBRARIES = converter.la conver
+ endif
+ endif
+
+-convdatadir = $(libdir)/deadbeef/convpresets
++convdatadir = $(prefix)/share/deadbeef/convpresets
+ convdata_DATA = \
+ presets/AAC.txt\
+ presets/ALAC.txt\
+--- a/plugins/converter/converter.c
++++ b/plugins/converter/converter.c
+@@ -470,7 +470,7 @@ load_encoder_presets (void) {
+ }
+
+ char syspath[PATH_MAX];
+- if (snprintf (syspath, sizeof (syspath), "%s/convpresets", deadbeef->get_plugin_dir ()) < 0) {
++ if (snprintf (syspath, sizeof (syspath), "%s/share/deadbeef/convpresets", deadbeef->get_prefix ()) < 0) {
+ return -1;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 870bc28d..3cce6dff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@ gtkui-grammar-allows-setting.diff
gtkui-grammar-allows-setting-2.diff
desktop-keywords.diff
debian-copying.diff
+converter-free-presets.diff
+converter-install-share.diff