Drop a patch merged upstream.
Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
---
meta/recipes-multimedia/mpg123/mpg123/sdl2.patch | 14 --------------
.../mpg123/{mpg123_1.25.13.bb => mpg123_1.26.1.bb} | 6 ++----
2 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 meta/recipes-multimedia/mpg123/mpg123/sdl2.patch
rename meta/recipes-multimedia/mpg123/{mpg123_1.25.13.bb => mpg123_1.26.1.bb}
(90%)
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 @@
-Use libsdl2 instead of libsdl 1.2, which is dead upstream.
-
-Luckily the API that mpg123 use didn't change so this is a trivial change.
-
-Upstream-Status: Submitted [https://sourceforge.net/p/mpg123/bugs/268/]
-Signed-off-by: Ross Burton <ross.bur...@intel.com>
-
-diff --git a/configure.ac b/configure.ac
-index 6216d4f..b8d3344 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1694 +1694 @@ do
-- PKG_CHECK_MODULES(SDL, sdl,
output_modules="$output_modules sdl" HAVE_SDL="yes", HAVE_SDL="no"
check_failed=yes)
-+ 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
similarity index 90%
rename from meta/recipes-multimedia/mpg123/mpg123_1.25.13.bb
rename to 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"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3"
-SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2 \
- file://sdl2.patch"
-SRC_URI[md5sum] = "294a6c30546504ec3d0deac2b2ea22be"
-SRC_URI[sha256sum] =
"90306848359c793fd43b9906e52201df18775742dc3c81c06ab67a806509890a"
+SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2";
+SRC_URI[sha256sum] =
"74d6629ab7f3dd9a588b0931528ba7ecfa989a2cad6bf53ffeef9de31b0fe032"
UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar"
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#139326):
https://lists.openembedded.org/g/openembedded-core/message/139326
Mute This Topic: https://lists.openembedded.org/mt/74747462/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
