esound 0.2.36 clean up, add no-docs patch

7 files changed, 19 insertions, 137 deletions

diff --git a/packages/esound/esound-gpe/audiofile-please.patch b/packages/esound/esound-gpe/audiofile-please.patch
deleted file mode 100644
index 0bfb629040..0000000000
--- a/packages/esound/esound-gpe/audiofile-please.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- esound/esd.h~	2002-07-19 13:36:44.000000000 +0100
-+++ esound/esd.h	2004-05-16 11:04:29.000000000 +0100
-@@ -1,6 +1,8 @@
- #ifndef ESD_H
- #define ESD_H
- 
-+#define SUPPORT_AUDIOFILE
-+
- #ifdef SUPPORT_AUDIOFILE
- #include <audiofile.h>
- #endif
---- esound/Makefile.am~	2002-07-19 13:36:44.000000000 +0100
-+++ esound/Makefile.am	2004-05-16 10:56:35.000000000 +0100
-@@ -26,8 +26,8 @@
- lib_LTLIBRARIES = libesd.la $(libesddsp_la)
- 
- libesd_la_LDFLAGS = -version-info $(ESD_VERSION_INFO)
--#libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS)
--libesd_la_LIBADD = $(SOUND_LIBS)
-+libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS)
-+#libesd_la_LIBADD = $(SOUND_LIBS)
- 
- libesd_la_SOURCES = \
- 	esdlib.c	\
-@@ -36,6 +36,7 @@
- 	audio.c		\
- 	genrand.c	\
- 	genrand.h	\
-+	esdfile.c	\
- 	util.c
- 
- # one of these gets included by audio.c
-@@ -79,7 +80,6 @@
- 	proto.c		\
- 	samples.c	\
- 	$(getopt_src)   \
--	util.c		\
- 	esd-server.h
- 
- esdcat_SOURCES = \
diff --git a/packages/esound/esound-gpe/configure.patch b/packages/esound/esound-gpe/configure.patch
deleted file mode 100644
index c6c33df11c..0000000000
--- a/packages/esound/esound-gpe/configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- esound/configure.in~	2002-07-19 13:14:01.000000000 +0100
-+++ esound/configure.in	2004-05-16 10:51:48.000000000 +0100
-@@ -352,17 +352,5 @@
- esound.spec
- esound.pc
- esddsp
--docs/Makefile
--docs/esd.1
--docs/esdcat.1
--docs/esd-config.1
--docs/esdctl.1
--docs/esddsp.1
--docs/esdfilt.1
--docs/esdloop.1
--docs/esdmon.1
--docs/esdplay.1
--docs/esdrec.1
--docs/esdsample.1
- ])
- dnl , [case "$CONFIG_FILES" in *esd-config*) chmod +x esd-config;; esac])
diff --git a/packages/esound/esound_0.2.36.bb b/packages/esound/esound_0.2.36.bb
index 1cf99ac90a..4797843acf 100644
--- a/packages/esound/esound_0.2.36.bb
+++ b/packages/esound/esound_0.2.36.bb
@@ -1,19 +1,19 @@
-DESCRIPTION = "Enlightened Sound Daemon - GPE version"
+DESCRIPTION = "Enlightened Sound Daemon"
 SECTION = "gpe/base"
 LICENSE = "GPL"
 DEPENDS = "audiofile"
-
-PR = "r1"
+PR = "r2"
 
 inherit gnome binconfig
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2 \
+           file://no-docs.patch;patch=1"
 
 EXTRA_OECONF = " \
-                --disable-alsa \
-		--disable-arts \
-		--disable-artstest \
-		"
+    --disable-alsa \
+    --disable-arts \
+    --disable-artstest \
+"
 do_configure_prepend() {
 	sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' configure.ac
 }
diff --git a/packages/esound/esound-gpe/.mtn2git_empty b/packages/esound/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/esound/esound-gpe/.mtn2git_empty
+++ b/packages/esound/files/.mtn2git_empty
diff --git a/packages/esound/files/no-docs.patch b/packages/esound/files/no-docs.patch
new file mode 100644
index 0000000000..fc69f1a038
--- /dev/null
+++ b/packages/esound/files/no-docs.patch
@@ -0,0 +1,11 @@
+Index: esound-0.2.36/Makefile.am
+===================================================================
+--- esound-0.2.36.orig/Makefile.am
++++ esound-0.2.36/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS = docs
++SUBDIRS = 
+ 
+ ACLOCAL_FLAGS = -I m4
+ 
diff --git a/packages/esound/old/esound-gpe_20020817.bb b/packages/esound/old/esound-gpe_20020817.bb
deleted file mode 100644
index a698211f7d..0000000000
--- a/packages/esound/old/esound-gpe_20020817.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Enlightened Sound Daemon - GPE version"
-SECTION = "gpe/base"
-LICENSE = "GPL"
-DEPENDS = "audiofile"
-PR = "r5"
-PROVIDES += "esound"
-RPROVIDES += "esound"
-
-SRCDATE := "${PV}"
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base/;module=esound;date=20061119 \
-	   file://audiofile-please.patch;patch=1 \
-	   file://configure.patch;patch=1"
-
-S = "${WORKDIR}/esound"
-
-inherit autotools binconfig pkgconfig
-
-EXTRA_OECONF = "--disable-alsa"
-
-SOV = "0.2.28"
-PV = "${SOV}+cvs${SRCDATE}"
-
-
-do_stage () {
-	install -m 0644 esd.h ${STAGING_INCDIR}/esd.h
-	oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR}
-	install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la
-	install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal
-}
-
-PACKAGES =+ "esddsp esd esd-utils"
-
-FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
-FILES_esd = "${bindir}/esd"
-FILES_esd-utils = "${bindir}/*"
diff --git a/packages/esound/old/esound-gpe_20070109.bb b/packages/esound/old/esound-gpe_20070109.bb
deleted file mode 100644
index 850def76a0..0000000000
--- a/packages/esound/old/esound-gpe_20070109.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Enlightened Sound Daemon - GPE version"
-SECTION = "gpe/base"
-LICENSE = "GPL"
-DEPENDS = "audiofile"
-PR = "r0"
-PROVIDES += "esound"
-RPROVIDES += "esound"
-
-SRCDATE = "${PV}"
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/;module=extra/esound;rev=8935 \
-	   file://audiofile-please.patch;patch=1 \
-	   file://configure.patch;patch=1"
-
-S = "${WORKDIR}/esound"
-
-inherit autotools binconfig pkgconfig
-
-EXTRA_OECONF = "--disable-alsa"
-
-SOV = "0.2.28"
-PV = "${SOV}+cvs${SRCDATE}"
-
-do_stage () {
-	install -m 0644 esd.h ${STAGING_INCDIR}/esd.h
-	oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR}
-	install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la
-	install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal
-}
-
-PACKAGES =+ "esddsp esd esd-utils"
-
-FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
-FILES_esd = "${bindir}/esd"
-FILES_esd-utils = "${bindir}/*"