diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /esound/esound-gpe | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'esound/esound-gpe')
| -rw-r--r-- | esound/esound-gpe/audiofile-please.patch | 40 | ||||
| -rw-r--r-- | esound/esound-gpe/configure.patch | 20 |
2 files changed, 0 insertions, 60 deletions
diff --git a/esound/esound-gpe/audiofile-please.patch b/esound/esound-gpe/audiofile-please.patch deleted file mode 100644 index 0bfb629040..0000000000 --- a/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/esound/esound-gpe/configure.patch b/esound/esound-gpe/configure.patch deleted file mode 100644 index c6c33df11c..0000000000 --- a/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]) |