diff options
-rw-r--r-- | meta/recipes-multimedia/mpg123/mpg123/sdl2.patch | 14 | ||||
-rw-r--r-- | meta/recipes-multimedia/mpg123/mpg123_1.26.1.bb (renamed from meta/recipes-multimedia/mpg123/mpg123_1.25.13.bb) | 6 |
2 files changed, 2 insertions, 18 deletions
diff --git a/meta/recipes-multimedia/mpg123/mpg123/sdl2.patch b/meta/recipes-multimedia/mpg123/mpg123/sdl2.patch deleted file mode 100644 index 9dc9b923df..0000000000 --- a/meta/recipes-multimedia/mpg123/mpg123/sdl2.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Use libsdl2 instead of libsdl 1.2, which is dead upstream. | ||
2 | |||
3 | Luckily the API that mpg123 use didn't change so this is a trivial change. | ||
4 | |||
5 | Upstream-Status: Submitted [https://sourceforge.net/p/mpg123/bugs/268/] | ||
6 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
7 | |||
8 | diff --git a/configure.ac b/configure.ac | ||
9 | index 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.13.bb b/meta/recipes-multimedia/mpg123/mpg123_1.26.1.bb index 6c7b6fa8c3..affbac4919 100644 --- a/meta/recipes-multimedia/mpg123/mpg123_1.25.13.bb +++ b/meta/recipes-multimedia/mpg123/mpg123_1.26.1.bb | |||
@@ -9,10 +9,8 @@ SECTION = "multimedia" | |||
9 | LICENSE = "LGPLv2.1" | 9 | LICENSE = "LGPLv2.1" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" |
11 | 11 | ||
12 | SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2 \ | 12 | SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" |
13 | file://sdl2.patch" | 13 | SRC_URI[sha256sum] = "74d6629ab7f3dd9a588b0931528ba7ecfa989a2cad6bf53ffeef9de31b0fe032" |
14 | SRC_URI[md5sum] = "294a6c30546504ec3d0deac2b2ea22be" | ||
15 | SRC_URI[sha256sum] = "90306848359c793fd43b9906e52201df18775742dc3c81c06ab67a806509890a" | ||
16 | 14 | ||
17 | UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar" | 15 | UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar" |
18 | 16 | ||