diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /esound | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'esound')
| -rw-r--r-- | esound/esound-gpe/audiofile-please.patch | 40 | ||||
| -rw-r--r-- | esound/esound-gpe/configure.patch | 20 |
2 files changed, 60 insertions, 0 deletions
diff --git a/esound/esound-gpe/audiofile-please.patch b/esound/esound-gpe/audiofile-please.patch index e69de29bb2..0bfb629040 100644 --- a/esound/esound-gpe/audiofile-please.patch +++ b/esound/esound-gpe/audiofile-please.patch @@ -0,0 +1,40 @@ +--- 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 index e69de29bb2..c6c33df11c 100644 --- a/esound/esound-gpe/configure.patch +++ b/esound/esound-gpe/configure.patch @@ -0,0 +1,20 @@ +--- 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]) |