diff options
Diffstat (limited to 'meta/recipes-multimedia/mpg123')
| -rw-r--r-- | meta/recipes-multimedia/mpg123/mpg123/sdl2.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-multimedia/mpg123/mpg123_1.32.6.bb (renamed from meta/recipes-multimedia/mpg123/mpg123_1.25.13.bb) | 20 |
2 files changed, 12 insertions, 22 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 @@ -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.burton@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.32.6.bb index 125574fcfc..f7786e8588 100644 --- a/meta/recipes-multimedia/mpg123/mpg123_1.25.13.bb +++ b/meta/recipes-multimedia/mpg123/mpg123_1.32.6.bb @@ -6,13 +6,13 @@ HOMEPAGE = "http://mpg123.de/" BUGTRACKER = "http://sourceforge.net/p/mpg123/bugs/" SECTION = "multimedia" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169" -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] = "ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6" + +UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar" inherit autotools pkgconfig @@ -35,11 +35,15 @@ PACKAGECONFIG[sdl] = ",,libsdl2" AUDIOMODS += "${@bb.utils.filter('PACKAGECONFIG', 'alsa esd jack openal portaudio sdl', d)}" AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" +CACHED_CONFIGUREVARS:libc-musl = "ac_cv_sys_file_offset_bits=no" + EXTRA_OECONF = " \ --enable-shared \ + --enable-largefile \ --with-audio='${AUDIOMODS}' \ ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \ ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \ + ${@bb.utils.contains('TARGET_FPU', 'soft', '--with-cpu=generic_nofpu', '', d)} \ " # Fails to build with thumb-1 (qemuarm) #| {standard input}: Assembler messages: @@ -47,5 +51,5 @@ EXTRA_OECONF = " \ #| {standard input}:48: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r5,r5,lsr#24' #... #| make[3]: *** [equalizer.lo] Error 1 -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" |