From 6d3da810947c5b4725f6a83e87fad9df2f2eee28 Mon Sep 17 00:00:00 2001 From: Ioan-Adrian Ratiu Date: Fri, 23 Feb 2018 19:13:12 +0200 Subject: 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 Signed-off-by: Armin Kuster --- ...error-line-and-live-without-file-type-det.patch | 10 +++--- .../recipes-multimedia/sox/sox_14.4.0.bb | 42 ---------------------- .../recipes-multimedia/sox/sox_14.4.2.bb | 39 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 47 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb create mode 100644 meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb (limited to 'meta-multimedia') 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 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 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.0.bb deleted file mode 100644 index 3eb1856e06..0000000000 --- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \ -It converts audio files among various standard audio file formats \ -and can apply different effects and filters to the audio data." -HOMEPAGE = "http://sox.sourceforge.net" -SECTION = "audio" - -DEPENDS = "libpng ffmpeg libsndfile1 libvorbis" - -# 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 \ -" -PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio," -PACKAGECONFIG[alsa] = "--with-alsa=dyn,--with-alsa=no,alsa-lib," -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[magic] = "--with-magic,--without-magic,file," -PACKAGECONFIG[mad] = "--with-mad,--without-mad,libmad," -PACKAGECONFIG[id3tag] = "--with-id3tag,--without-id3tag,libid3tag," -PACKAGECONFIG[lame] = "--with-lame,--without-lame,lame," -PACKAGECONFIG[ao] = "--with-ao,--without-ao,libao," - -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ - file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24" - -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" - diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb new file mode 100644 index 0000000000..d1ed08a892 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb @@ -0,0 +1,39 @@ +DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \ +It converts audio files among various standard audio file formats \ +and can apply different effects and filters to the audio data." +HOMEPAGE = "http://sox.sourceforge.net" +SECTION = "audio" + +DEPENDS = "libpng ffmpeg libsndfile1" + +# While this item does not require it, it depends on ffmpeg which does +LICENSE_FLAGS = "commercial" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \ + magic \ +" +PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio," +PACKAGECONFIG[alsa] = "--with-alsa=dyn,--with-alsa=no,alsa-lib," +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," +PACKAGECONFIG[lame] = "--with-lame,--without-lame,lame," +PACKAGECONFIG[ao] = "--with-ao,--without-ao,libao," + +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ + file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24" + +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] = "d04fba2d9245e661f245de0577f48a33" +SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c" + +inherit autotools pkgconfig -- cgit 1.2.3-korg