mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
esound: Upgrade to 0.2.41
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
Martin Jansa
parent
6c735319a4
commit
75347a2024
|
|
@ -0,0 +1,26 @@
|
|||
From a860fe0796c43e35eac9783140fcb563cab9f55a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 8 Jun 2017 23:09:51 -0700
|
||||
Subject: [PATCH 1/3] audio_alsa09.c: alsa drain fix
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
audio_alsa09.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/audio_alsa09.c b/audio_alsa09.c
|
||||
index 534e3db..d9450e6 100644
|
||||
--- a/audio_alsa09.c
|
||||
+++ b/audio_alsa09.c
|
||||
@@ -506,7 +506,7 @@ void esd_audio_flush(void)
|
||||
}
|
||||
|
||||
if (alsa_playback_handle != NULL)
|
||||
- snd_pcm_drain( alsa_playback_handle );
|
||||
+ snd_pcm_drop( alsa_playback_handle );
|
||||
|
||||
if (alsadbg)
|
||||
print_state();
|
||||
--
|
||||
2.13.1
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 218e0702d6ce4d2cb20d5d108daa16afca2b7c41 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
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 <schnitzeltony@googlemail.com>
|
||||
---
|
||||
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
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From 1fbee6e96384f340b816e221fe1c2f3ff0b487bf Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 8 Jun 2017 23:11:31 -0700
|
||||
Subject: [PATCH 2/3] Undefine open64 and fopen64
|
||||
|
||||
Since the signatures do not match with libc
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
esddsp.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/esddsp.c b/esddsp.c
|
||||
index d3c6ea9..17b5949 100644
|
||||
--- a/esddsp.c
|
||||
+++ b/esddsp.c
|
||||
@@ -290,6 +290,7 @@ open (const char *pathname, int flags, ...)
|
||||
return open_wrapper(func, pathname, flags, mode);
|
||||
}
|
||||
|
||||
+#undef open64
|
||||
int
|
||||
open64 (const char *pathname, int flags, ...)
|
||||
{
|
||||
@@ -374,6 +375,7 @@ fopen (const char *path, const char *mode)
|
||||
return fopen_wrapper(func, path, mode);
|
||||
}
|
||||
|
||||
+#undef fopen64
|
||||
FILE *
|
||||
fopen64 (const char *path, const char *mode)
|
||||
{
|
||||
--
|
||||
2.13.1
|
||||
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
From 979a02d9ec9c28686021cd2b49ca55d2195c9dce Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 8 Jun 2017 23:12:36 -0700
|
||||
Subject: [PATCH 3/3] Use -I=<path> in configure
|
||||
|
||||
This helps to use proper sysroot in
|
||||
cross build environment
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5645dce..d374cda 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -208,7 +208,7 @@ if test "x$enable_local_sound" = "xyes"; then
|
||||
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h)
|
||||
# mme_api.h directly includes other files from the mme subdir
|
||||
xCPPFLAGS="$CPPFLAGS"
|
||||
- CPPFLAGS="$CPPFLAGS -I/usr/include/mme"
|
||||
+ CPPFLAGS="$CPPFLAGS -I=/usr/include/mme"
|
||||
AC_CHECK_HEADERS(mme/mme_api.h)
|
||||
CPPFLAGS="$xCPPFLAGS"
|
||||
AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
|
||||
@@ -269,7 +269,7 @@ if test "x$enable_local_sound" = "xyes"; then
|
||||
osf*)
|
||||
found_sound=yes
|
||||
AC_DEFINE(DRIVER_OSF, 1, [Defined if OSF backend is enabled])
|
||||
- CPPFLAGS="$CPPFLAGS -I/usr/include/mme"
|
||||
+ CPPFLAGS="$CPPFLAGS -I=/usr/include/mme"
|
||||
SOUND_LIBS=-lmme
|
||||
esac
|
||||
fi
|
||||
--
|
||||
2.13.1
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- /tmp/configure.ac 2008-06-02 16:46:55.640793306 +0200
|
||||
+++ esound-0.2.36/configure.ac 2008-06-02 16:47:26.030793494 +0200
|
||||
@@ -29,6 +29,7 @@
|
||||
AC_SUBST(pkgdocdir)
|
||||
|
||||
AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
AC_PROG_CPP
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
AM_PROG_LIBTOOL
|
||||
Binary file not shown.
|
|
@ -1,38 +0,0 @@
|
|||
SUMMARY = "Enlightened Sound Daemon"
|
||||
SECTION = "gpe/base"
|
||||
LICENSE = "LGPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
|
||||
DEPENDS = "audiofile"
|
||||
|
||||
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 \
|
||||
file://0001-replace-missing-AM_PATH_AUDIOFILE-by-PKG_CHECK_MODUL.patch \
|
||||
"
|
||||
|
||||
SRC_URI[archive.md5sum] = "3facb5aa0115cc1c31771b9ad454ae76"
|
||||
SRC_URI[archive.sha256sum] = "68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--disable-alsa \
|
||||
--disable-arts \
|
||||
--disable-artstest \
|
||||
"
|
||||
|
||||
CFLAGS += "-lm"
|
||||
|
||||
do_configure_prepend() {
|
||||
sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' ${S}/configure.ac
|
||||
}
|
||||
|
||||
PACKAGES =+ "esddsp esd esd-utils"
|
||||
|
||||
FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
|
||||
FILES_esd = "${bindir}/esd"
|
||||
FILES_esd-utils = "${bindir}/*"
|
||||
37
meta-oe/recipes-multimedia/esound/esound_0.2.41.bb
Normal file
37
meta-oe/recipes-multimedia/esound/esound_0.2.41.bb
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
SUMMARY = "Enlightened Sound Daemon"
|
||||
SECTION = "gpe/base"
|
||||
LICENSE = "LGPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
|
||||
DEPENDS = "audiofile"
|
||||
|
||||
inherit gnome
|
||||
|
||||
SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/${P}.tar.bz2;name=archive \
|
||||
file://no-docs.patch \
|
||||
file://0001-audio_alsa09.c-alsa-drain-fix.patch \
|
||||
file://0002-Undefine-open64-and-fopen64.patch \
|
||||
file://0003-Use-I-path-in-configure.patch \
|
||||
"
|
||||
SRC_URI[archive.md5sum] = "8d9aad3d94d15e0d59ba9dc0ea990c6c"
|
||||
SRC_URI[archive.sha256sum] = "5eb5dd29a64b3462a29a5b20652aba7aa926742cef43577bf0796b787ca34911"
|
||||
|
||||
EXTRA_OECONF += " \
|
||||
--disable-arts \
|
||||
--disable-artstest \
|
||||
"
|
||||
EXTRA_OECONF_remove = "--disable-schemas-install"
|
||||
|
||||
CFLAGS += "-lm"
|
||||
|
||||
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
|
||||
PACKAGECONFIG[libwrap] = "--with-libwrap,--without-libwrap,tcp-wrappers,"
|
||||
PACKAGECONFIG[alsa] = "--enable-alsa --disable-oss,--disable-alsa,alsa-lib,"
|
||||
|
||||
PACKAGECONFIG ??= "libwrap alsa \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
|
||||
"
|
||||
PACKAGES =+ "esddsp esd esd-utils"
|
||||
|
||||
FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
|
||||
FILES_esd = "${bindir}/esd"
|
||||
FILES_esd-utils = "${bindir}/*"
|
||||
Loading…
Reference in New Issue
Block a user