summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-07-03 23:56:24 +0300
committerKhem Raj <raj.khem@gmail.com>2019-07-10 09:24:33 -0700
commit6ab4819af9498255b22c6ed63fe55df64e78786c (patch)
tree853c31928ede3f4ab51576f4bafb244f63080315
parentd10c707dcab564eb0c5fd98d1c82822071525837 (diff)
downloadmeta-openembedded-6ab4819af9498255b22c6ed63fe55df64e78786c.tar.gz
esound: Remove this obsolete package
Users migrated to PulseAudio 10 years ago. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb2
-rw-r--r--meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch24
-rw-r--r--meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch33
-rw-r--r--meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch36
-rw-r--r--meta-oe/recipes-multimedia/esound/esound/no-docs.patch19
-rw-r--r--meta-oe/recipes-multimedia/esound/esound_0.2.41.bb37
6 files changed, 1 insertions, 150 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index d7e1b6e874..7bc0f19436 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -190,7 +190,7 @@ RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash"
190RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64el = "crash" 190RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64el = "crash"
191 191
192RDEPENDS_packagegroup-meta-oe-multimedia ="\ 192RDEPENDS_packagegroup-meta-oe-multimedia ="\
193 alsa-oss audiofile cdrkit esound id3lib \ 193 alsa-oss audiofile cdrkit id3lib \
194 a2jmidid jack libass libburn libcdio libcdio-paranoia \ 194 a2jmidid jack libass libburn libcdio libcdio-paranoia \
195 libdvdread libmms libmodplug libopus live555 \ 195 libdvdread libmms libmodplug libopus live555 \
196 mplayer-common opus-tools \ 196 mplayer-common opus-tools \
diff --git a/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch b/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch
deleted file mode 100644
index 130f3c2290..0000000000
--- a/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 945df2da87a412758ceab4ac5711abbb269a47c1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 8 Jun 2017 23:09:51 -0700
4Subject: [PATCH] audio_alsa09.c: alsa drain fix
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8---
9 audio_alsa09.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/audio_alsa09.c b/audio_alsa09.c
13index 534e3db..d9450e6 100644
14--- a/audio_alsa09.c
15+++ b/audio_alsa09.c
16@@ -506,7 +506,7 @@ void esd_audio_flush(void)
17 }
18
19 if (alsa_playback_handle != NULL)
20- snd_pcm_drain( alsa_playback_handle );
21+ snd_pcm_drop( alsa_playback_handle );
22
23 if (alsadbg)
24 print_state();
diff --git a/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch b/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch
deleted file mode 100644
index 10a6ba03ae..0000000000
--- a/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From e218d5a0a545ebb9623d62da5cfca478f9c90fce Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 8 Jun 2017 23:11:31 -0700
4Subject: [PATCH] Undefine open64 and fopen64
5
6Since the signatures do not match with libc
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10---
11 esddsp.c | 2 ++
12 1 file changed, 2 insertions(+)
13
14diff --git a/esddsp.c b/esddsp.c
15index d3c6ea9..17b5949 100644
16--- a/esddsp.c
17+++ b/esddsp.c
18@@ -290,6 +290,7 @@ open (const char *pathname, int flags, ...)
19 return open_wrapper(func, pathname, flags, mode);
20 }
21
22+#undef open64
23 int
24 open64 (const char *pathname, int flags, ...)
25 {
26@@ -374,6 +375,7 @@ fopen (const char *path, const char *mode)
27 return fopen_wrapper(func, path, mode);
28 }
29
30+#undef fopen64
31 FILE *
32 fopen64 (const char *path, const char *mode)
33 {
diff --git a/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch b/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch
deleted file mode 100644
index 83365b4e6f..0000000000
--- a/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 89c62db54716d514e639f9e1bfd3c1f7d82641dd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 8 Jun 2017 23:12:36 -0700
4Subject: [PATCH] Use -I=<path> in configure
5
6This helps to use proper sysroot in
7cross build environment
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11---
12 configure.ac | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 5645dce..d374cda 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -208,7 +208,7 @@ if test "x$enable_local_sound" = "xyes"; then
20 AC_CHECK_HEADERS(CoreAudio/CoreAudio.h)
21 # mme_api.h directly includes other files from the mme subdir
22 xCPPFLAGS="$CPPFLAGS"
23- CPPFLAGS="$CPPFLAGS -I/usr/include/mme"
24+ CPPFLAGS="$CPPFLAGS -I=/usr/include/mme"
25 AC_CHECK_HEADERS(mme/mme_api.h)
26 CPPFLAGS="$xCPPFLAGS"
27 AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
28@@ -269,7 +269,7 @@ if test "x$enable_local_sound" = "xyes"; then
29 osf*)
30 found_sound=yes
31 AC_DEFINE(DRIVER_OSF, 1, [Defined if OSF backend is enabled])
32- CPPFLAGS="$CPPFLAGS -I/usr/include/mme"
33+ CPPFLAGS="$CPPFLAGS -I=/usr/include/mme"
34 SOUND_LIBS=-lmme
35 esac
36 fi
diff --git a/meta-oe/recipes-multimedia/esound/esound/no-docs.patch b/meta-oe/recipes-multimedia/esound/esound/no-docs.patch
deleted file mode 100644
index 8a546e6db1..0000000000
--- a/meta-oe/recipes-multimedia/esound/esound/no-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1From bfcaa9bdc70440db96f10afc0c2a792870f75acb Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Fri, 3 Jun 2011 19:39:02 +0200
4
5---
6 Makefile.am | 2 +-
7 1 file changed, 1 insertion(+), 1 deletion(-)
8
9diff --git a/Makefile.am b/Makefile.am
10index 08c4c94..ede9d26 100644
11--- a/Makefile.am
12+++ b/Makefile.am
13@@ -1,5 +1,5 @@
14
15-SUBDIRS = docs
16+SUBDIRS =
17
18 ACLOCAL_AMFLAGS = -I m4
19
diff --git a/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb b/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb
deleted file mode 100644
index d703f23d91..0000000000
--- a/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb
+++ /dev/null
@@ -1,37 +0,0 @@
1SUMMARY = "Enlightened Sound Daemon"
2SECTION = "gpe/base"
3LICENSE = "LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
5DEPENDS = "audiofile"
6
7inherit gnome
8
9SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/${BP}.tar.bz2;name=archive \
10 file://no-docs.patch \
11 file://0001-audio_alsa09.c-alsa-drain-fix.patch \
12 file://0002-Undefine-open64-and-fopen64.patch \
13 file://0003-Use-I-path-in-configure.patch \
14 "
15SRC_URI[archive.md5sum] = "8d9aad3d94d15e0d59ba9dc0ea990c6c"
16SRC_URI[archive.sha256sum] = "5eb5dd29a64b3462a29a5b20652aba7aa926742cef43577bf0796b787ca34911"
17
18EXTRA_OECONF += " \
19 --disable-arts \
20 --disable-artstest \
21"
22EXTRA_OECONF_remove = "--disable-schemas-install"
23
24CFLAGS += "-lm"
25
26PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
27PACKAGECONFIG[libwrap] = "--with-libwrap,--without-libwrap,tcp-wrappers,"
28PACKAGECONFIG[alsa] = "--enable-alsa --disable-oss,--disable-alsa,alsa-lib,"
29
30PACKAGECONFIG ??= "libwrap alsa \
31 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
32"
33PACKAGES =+ "esddsp esd esd-utils"
34
35FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
36FILES_esd = "${bindir}/esd"
37FILES_esd-utils = "${bindir}/*"