mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
alsa-lib:
- remove unneeded patches
This commit is contained in:
parent
399e6bbce6
commit
3eeb769010
@ -1,24 +0,0 @@
|
||||
diff -ur alsa.old/src/Makefile.in alsa.dev/src/Makefile.in
|
||||
--- alsa.old/src/Makefile.in 2006-04-19 09:50:27.000000000 +0200
|
||||
+++ alsa.dev/src/Makefile.in 2006-10-14 17:16:10.000000000 +0200
|
||||
@@ -360,7 +360,7 @@
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
libasound.la: $(libasound_la_OBJECTS) $(libasound_la_DEPENDENCIES)
|
||||
- $(LINK) -rpath $(libdir) $(libasound_la_LDFLAGS) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
|
||||
+ $(LINK) -rpath $(DESTDIR)$(libdir) $(libasound_la_LDFLAGS) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
diff -ur alsa.old/src/pcm/scopes/Makefile.in alsa.dev/src/pcm/scopes/Makefile.in
|
||||
--- alsa.old/src/pcm/scopes/Makefile.in 2006-04-19 09:50:38.000000000 +0200
|
||||
+++ alsa.dev/src/pcm/scopes/Makefile.in 2006-10-14 17:16:38.000000000 +0200
|
||||
@@ -317,7 +317,7 @@
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
scope-level.la: $(scope_level_la_OBJECTS) $(scope_level_la_DEPENDENCIES)
|
||||
- $(LINK) -rpath $(pkglibdir) $(scope_level_la_LDFLAGS) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
|
||||
+ $(LINK) -rpath $(DESTDIR)$(pkglibdir) $(scope_level_la_LDFLAGS) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
@ -1,37 +0,0 @@
|
||||
diff -Nur alsa-lib-1.0.11rc1.orig/src/userfile.c alsa-lib-1.0.11rc1/src/userfile.c
|
||||
--- alsa-lib-1.0.11rc1.orig/src/userfile.c 2005-12-05 16:27:28.000000000 +0200
|
||||
+++ alsa-lib-1.0.11rc1/src/userfile.c 2005-12-17 16:47:45.000000000 +0200
|
||||
@@ -61,11 +61,31 @@
|
||||
}
|
||||
|
||||
#else /* !HAVE_WORDEXP_H */
|
||||
+#include <glob.h>
|
||||
+#include <assert.h>
|
||||
+
|
||||
/* just copy the string - would be nicer to expand by ourselves, though... */
|
||||
int snd_user_file(const char *file, char **result)
|
||||
{
|
||||
- *result = strdup(file);
|
||||
- if (! *result)
|
||||
+ glob_t globbuf;
|
||||
+ int err;
|
||||
+
|
||||
+ assert(file && result);
|
||||
+ err = glob(file, 0, NULL, &globbuf);
|
||||
+ switch (err) {
|
||||
+ case GLOB_NOSPACE:
|
||||
+ return -ENOMEM;
|
||||
+ case 0:
|
||||
+ if (globbuf.gl_pathc == 1)
|
||||
+ break;
|
||||
+ /* Fall through */
|
||||
+ default:
|
||||
+ globfree(&globbuf);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+ *result = strdup(globbuf.gl_pathv[0]);
|
||||
+ globfree(&globbuf);
|
||||
+ if (*result == NULL)
|
||||
return -ENOMEM;
|
||||
return 0;
|
||||
}
|
@ -1,19 +0,0 @@
|
||||
diff -Naur alsa-lib-1.0.4.orig/include/error.h alsa-lib-1.0.4/include/error.h
|
||||
--- alsa-lib-1.0.4.orig/include/error.h 2004-04-27 00:16:40.000000000 +0200
|
||||
+++ alsa-lib-1.0.4/include/error.h 2004-04-27 00:19:31.000000000 +0200
|
||||
@@ -61,11 +61,11 @@
|
||||
extern int snd_lib_error_set_handler(snd_lib_error_handler_t handler);
|
||||
|
||||
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 95)
|
||||
-#define SNDERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__) /**< Shows a sound error message. */
|
||||
-#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__) /**< Shows a system error message (related to \c errno). */
|
||||
+#define SNDERR(...)
|
||||
+#define SYSERR(...)
|
||||
#else
|
||||
-#define SNDERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args) /**< Shows a sound error message. */
|
||||
-#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args) /**< Shows a system error message (related to \c errno). */
|
||||
+#define SNDERR(args...)
|
||||
+#define SYSERR(args...)
|
||||
#endif
|
||||
|
||||
/** \} */
|
Loading…
x
Reference in New Issue
Block a user