summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-05-01 14:18:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-02 09:56:19 +0100
commit2fc30ac2a8f198edd6a6d447455ba38bba5d07ea (patch)
treea0ad57f513724f54c0e9bc3f21c61ee04f865f81
parent2b4f6052db130b341da04f5e706098810323958e (diff)
downloadpoky-2fc30ac2a8f198edd6a6d447455ba38bba5d07ea.tar.gz
mpg123: port to use libsdl2
libsdl 1.2 is dead upstream, so change mpg123 to use libsdl2. Luckily the APIs that mpg123 use haven't changed, so this is just a matter of changing the pkg-config name. (From OE-Core rev: 1aa947a60b0eb31c367b1e9818218ee74d388eea) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/mpg123/mpg123/sdl2.patch14
-rw-r--r--meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb5
2 files changed, 17 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/mpg123/mpg123/sdl2.patch b/meta/recipes-multimedia/mpg123/mpg123/sdl2.patch
new file mode 100644
index 0000000000..9dc9b923df
--- /dev/null
+++ b/meta/recipes-multimedia/mpg123/mpg123/sdl2.patch
@@ -0,0 +1,14 @@
1Use libsdl2 instead of libsdl 1.2, which is dead upstream.
2
3Luckily the API that mpg123 use didn't change so this is a trivial change.
4
5Upstream-Status: Submitted [https://sourceforge.net/p/mpg123/bugs/268/]
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8diff --git a/configure.ac b/configure.ac
9index 6216d4f..b8d3344 100644
10--- a/configure.ac
11+++ b/configure.ac
12@@ -1694 +1694 @@ do
13- PKG_CHECK_MODULES(SDL, sdl, output_modules="$output_modules sdl" HAVE_SDL="yes", HAVE_SDL="no" check_failed=yes)
14+ PKG_CHECK_MODULES(SDL, sdl2, output_modules="$output_modules sdl" HAVE_SDL="yes", HAVE_SDL="no" check_failed=yes)
diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb b/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb
index ff2b7d893b..dfb10bb1cd 100644
--- a/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb
+++ b/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb
@@ -9,7 +9,8 @@ SECTION = "multimedia"
9LICENSE = "LGPLv2.1" 9LICENSE = "LGPLv2.1"
10LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" 10LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3"
11 11
12SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" 12SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2 \
13 file://sdl2.patch"
13SRC_URI[md5sum] = "ea32caa61d41d8be797f0b04a1b43ad9" 14SRC_URI[md5sum] = "ea32caa61d41d8be797f0b04a1b43ad9"
14SRC_URI[sha256sum] = "6c1337aee2e4bf993299851c70b7db11faec785303cfca3a5c3eb5f329ba7023" 15SRC_URI[sha256sum] = "6c1337aee2e4bf993299851c70b7db11faec785303cfca3a5c3eb5f329ba7023"
15 16
@@ -27,7 +28,7 @@ PACKAGECONFIG[jack] = ",,jack"
27PACKAGECONFIG[openal] = ",,openal-soft" 28PACKAGECONFIG[openal] = ",,openal-soft"
28PACKAGECONFIG[portaudio] = ",,portaudio-v19" 29PACKAGECONFIG[portaudio] = ",,portaudio-v19"
29PACKAGECONFIG[pulseaudio] = "--with-default-audio=pulse,,pulseaudio" 30PACKAGECONFIG[pulseaudio] = "--with-default-audio=pulse,,pulseaudio"
30PACKAGECONFIG[sdl] = ",,libsdl" 31PACKAGECONFIG[sdl] = ",,libsdl2"
31 32
32# Following are possible sound output modules: 33# Following are possible sound output modules:
33# alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi 34# alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi