diff options
author | Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | 2018-02-23 19:13:12 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-01 16:12:56 -0800 |
commit | 6d3da810947c5b4725f6a83e87fad9df2f2eee28 (patch) | |
tree | e70fbe3da3a240b2964af91bf49d230fa110e5ff /meta-multimedia/recipes-multimedia | |
parent | ac7cb1d69d63eefb49abc884d7db872d7b809e02 (diff) | |
download | meta-openembedded-contrib-6d3da810947c5b4725f6a83e87fad9df2f2eee28.tar.gz |
sox: bump 14.4.0 -> 14.4.2
The big feature in the new version is opus codec support.
Make the old vorbis codec optional via packageconfig.
Remove sox-native because it's broken and nothing uses it.
Refresh musl build-fix patch.
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia')
-rw-r--r-- | meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch | 10 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb (renamed from meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb) | 15 |
2 files changed, 11 insertions, 14 deletions
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch index 605863a221..4f02a66fcc 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch +++ b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch @@ -1,4 +1,4 @@ -From c2aed28e3e14329ad0a8c4371fdcce9934013f21 Mon Sep 17 00:00:00 2001 +From d0313be5fb947df399a4db24a5f9244510d2ce87 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 12 Jul 2017 16:36:06 -0700 Subject: [PATCH] remove the #error line and live without file-type detection @@ -12,17 +12,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 deletion(-) diff --git a/src/formats.c b/src/formats.c -index 7e231ca..b13f0d5 100644 +index 724a4cda..f683a922 100644 --- a/src/formats.c +++ b/src/formats.c -@@ -416,7 +416,6 @@ static void UNUSED rewind_pipe(FILE * fp) +@@ -422,7 +422,6 @@ static void UNUSED rewind_pipe(FILE * fp) /* To fix this #error, either simply remove the #error line and live without * file-type detection with pipes, or add support for your compiler in the - * lines above. Test with cat monkey.au | ./sox --info - */ + * lines above. Test with cat monkey.wav | ./sox --info - */ - #error FIX NEEDED HERE #define NO_REWIND_PIPE (void)fp; #endif -- -2.13.2 +2.16.2 diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb index 3eb1856e06..d1ed08a892 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb @@ -4,13 +4,11 @@ and can apply different effects and filters to the audio data." HOMEPAGE = "http://sox.sourceforge.net" SECTION = "audio" -DEPENDS = "libpng ffmpeg libsndfile1 libvorbis" +DEPENDS = "libpng ffmpeg libsndfile1" # While this item does not require it, it depends on ffmpeg which does LICENSE_FLAGS = "commercial" -PR = "r2" - PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \ magic \ " @@ -20,6 +18,8 @@ PACKAGECONFIG[wavpack] = "--with-wavpack=dyn,--with-wavpack=no,wavpack," PACKAGECONFIG[flac] = "--with-flac=dyn,--with-flac=no,flac," PACKAGECONFIG[amrwb] = "--with-amrwb=dyn,--with-amrwb=no,opencore-amr," PACKAGECONFIG[amrnb] = "--with-amrnb=dyn,--with-amrnb=no,opencore-amr," +PACKAGECONFIG[oggvorbis] = "--with-oggvorbis=dyn,--with-oggvorbis=no,libvorbis" +PACKAGECONFIG[opus] = "--with-opus=dyn,--with-opus=no,opusfile" PACKAGECONFIG[magic] = "--with-magic,--without-magic,file," PACKAGECONFIG[mad] = "--with-mad,--without-mad,libmad," PACKAGECONFIG[id3tag] = "--with-id3tag,--without-id3tag,libid3tag," @@ -33,10 +33,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ file://0001-remove-the-error-line-and-live-without-file-type-det.patch \ " -SRC_URI[md5sum] = "b0c15cff7a4ba0ec17fdc74e6a1f9cf1" -SRC_URI[sha256sum] = "3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3" - -inherit autotools - -BBCLASSEXTEND = "native" +SRC_URI[md5sum] = "d04fba2d9245e661f245de0577f48a33" +SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c" +inherit autotools pkgconfig |