audiofile: update to 0.3.6
PATCH 1/2 audiofile: update to 0.3.6
License checksum changed by altering address of FSF
Signed-off-by Andreas Müller <[email protected]>
--- .../audiofile/audiofile_0.2.7.bb | 15 ----- .../audiofile/audiofile_0.3.6.bb | 22 +++++++ .../files/0001-fix-negative-shift-constants.patch | 77 ++++++++++++++++++++++ .../audiofile/files/0002-fix-build-on-gcc6.patch | 75 +++++++++++++++++++++ .../audiofile/files/0003-fix-CVE-2015-7747.patch | 35 ++++++++++ 5 files changed, 209 insertions(+), 15 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/audiofile/audiofile_0.2.7.bb create mode 100644 meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb create mode 100644 meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch create mode 100644 meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch create mode 100644 meta-oe/recipes-multimedia/audiofile/files/0003-fix-CVE-2015-7747.patch
meta-oe/recipes-multimedia/audiofile/audiofile_0.2.7.bb deleted +0 -15
@@ -1,15 +0,0 @@ -DESCRIPTION = "The Audio File Library provides a uniform and elegant \ -API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \ -WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \ -Research, Amiga IFF/8SVX, and NIST SPHERE." -HOMEPAGE = "http://www.68k.org/~michael/audiofile/" -SECTION = "libs" -LICENSE = "LGPLv2 & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" - -SRC_URI = "${GNOME_MIRROR}/audiofile/0.2/${BP}.tar.gz" -SRC_URI[md5sum] = "a39be317a7b1971b408805dc5e371862" -SRC_URI[sha256sum] = "a61c4036c2600a645843f16bec4be166093a9df5f15b02c85291213aa9cf15a2" - -inherit autotools lib_package binconfig
meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb new file +22 -0
@@ -0,0 +1,22 @@ +DESCRIPTION = "The Audio File Library provides a uniform and elegant \ +API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \ +WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \ +Research, Amiga IFF/8SVX, and NIST SPHERE." +HOMEPAGE = "http://www.68k.org/~michael/audiofile/" +SECTION = "libs" +LICENSE = "LGPLv2 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = " \ + ${GNOME_MIRROR}/audiofile/0.3/${BP}.tar.xz \ + file://0001-fix-negative-shift-constants.patch \ + file://0002-fix-build-on-gcc6.patch \ + file://0003-fix-CVE-2015-7747.patch \ +" +SRC_URI[md5sum] = "235dde14742317328f0109e9866a8008" +SRC_URI[sha256sum] = "ea2449ad3f201ec590d811db9da6d02ffc5e87a677d06b92ab15363d8cb59782" + +inherit autotools lib_package binconfig + +DEPENDS = "asciidoc-native libogg flac"
meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch new file +77 -0
77 lines not on this page · raw message
meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch new file +75 -0
75 lines not on this page · raw message
meta-oe/recipes-multimedia/audiofile/files/0003-fix-CVE-2015-7747.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 746c38105ce4fa1b609995d3386ea6b8b1f2f7bd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +Date: Fri, 16 Dec 2016 12:50:51 +0100 +Subject: [PATCH 3/3] fix CVE-2015-7747 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Stolen from [1] + +[1] http://pkgs.fedoraproject.org/cgit/rpms/audiofile.git/tree/audiofile-0.3.6-CVE-2015-7747.patch + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <[email protected]> +--- + libaudiofile/modules/ModuleState.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libaudiofile/modules/ModuleState.cpp b/libaudiofile/modules/ModuleState.cpp +index f76c495..0c29d7a 100644 +--- a/libaudiofile/modules/ModuleState.cpp ++++ b/libaudiofile/modules/ModuleState.cpp +@@ -402,7 +402,7 @@ status ModuleState::arrange(AFfilehandle file, Track *track) + addModule(new Transform(outfc, in.pcm, out.pcm)); + + if (in.channelCount != out.channelCount) +- addModule(new ApplyChannelMatrix(infc, isReading, ++ addModule(new ApplyChannelMatrix(outfc, isReading, + in.channelCount, out.channelCount, + in.pcm.minClip, in.pcm.maxClip, + track->channelMatrix)); +-- +2.7.4 +
Signature · 1 line
2.7.4
PATCH 2/2 esound: fix build after update of audiofile
Signed-off-by Andreas Müller <[email protected]>
--- ...sing-AM_PATH_AUDIOFILE-by-PKG_CHECK_MODUL.patch | 31 ++++++++++++++++++++++ meta-oe/recipes-multimedia/esound/esound_0.2.36.bb | 11 +++++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-multimedia/esound/esound/0001-replace-missing-AM_PATH_AUDIOFILE-by-PKG_CHECK_MODUL.patch
meta-oe/recipes-multimedia/esound/esound/0001-replace-missing-AM_PATH_AUDIOFILE-by-PKG_CHECK_MODUL.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 218e0702d6ce4d2cb20d5d108daa16afca2b7c41 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +Date: Fri, 16 Dec 2016 13:22:51 +0100 +Subject: [PATCH] replace missing AM_PATH_AUDIOFILE by PKG_CHECK_MODULES( +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstrem-Status: Pending + +Signed-off-by: Andreas Müller <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 486c492..dccfd1b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -353,7 +353,7 @@ echo "---------------------------------------------------------------------" + echo "--- Checking for the audiofile library. NOTE: This library is now" + echo "--- REQUIRED from proper compilation of the esound package." + +-AM_PATH_AUDIOFILE(0.1.5, [ ++PKG_CHECK_MODULES(AUDIOFILE, audiofile, [ + + build_esdplay=true + echo "--- libaudiofile found. Building esound with audiofile support" +-- +2.7.4 +
meta-oe/recipes-multimedia/esound/esound_0.2.36.bb +7 -4
@@ -8,10 +8,13 @@ inherit gnome binconfig PR = "r1" -SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2;name=archive \ - file://esound_0.2.36-1ubuntu5.diff.gz \ - file://no-docs.patch \ - file://configure-fix.patch" +SRC_URI = " \ + ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2;name=archive \ + file://esound_0.2.36-1ubuntu5.diff.gz \ + file://no-docs.patch \ + file://configure-fix.patch \ + file://0001-replace-missing-AM_PATH_AUDIOFILE-by-PKG_CHECK_MODUL.patch \ +" SRC_URI[archive.md5sum] = "3facb5aa0115cc1c31771b9ad454ae76" SRC_URI[archive.sha256sum] = "68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76"
Signature · 1 line
2.7.4