diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-11-23 12:36:51 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-11-23 12:36:51 +0000 |
| commit | 63b6a2fbdf169183deb9dd1eba533b624582bbdf (patch) | |
| tree | ea1543211d5f5a6d27b75ad8916766982b2826cf /media-libs/mlt/files | |
| parent | Webkit not keyworded, thus removing webkit use from PyQt. (diff) | |
| download | historical-63b6a2fbdf169183deb9dd1eba533b624582bbdf.tar.gz historical-63b6a2fbdf169183deb9dd1eba533b624582bbdf.tar.bz2 historical-63b6a2fbdf169183deb9dd1eba533b624582bbdf.zip | |
use upstream patch for sox 14.2.0 compatibility, remove unused version
Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27.5 x86_64
Diffstat (limited to 'media-libs/mlt/files')
| -rw-r--r-- | media-libs/mlt/files/mlt-0.3.0-sox1420.patch | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/media-libs/mlt/files/mlt-0.3.0-sox1420.patch b/media-libs/mlt/files/mlt-0.3.0-sox1420.patch index 3421ab2b82ef..3eed1c0c9662 100644 --- a/media-libs/mlt/files/mlt-0.3.0-sox1420.patch +++ b/media-libs/mlt/files/mlt-0.3.0-sox1420.patch @@ -1,19 +1,33 @@ -Index: mlt-0.3.0/src/modules/sox/filter_sox.c +Index: src/modules/sox/filter_sox.c =================================================================== ---- mlt-0.3.0.orig/src/modules/sox/filter_sox.c -+++ mlt-0.3.0/src/modules/sox/filter_sox.c -@@ -33,9 +33,13 @@ +--- src/modules/sox/filter_sox.c (revision 1238) ++++ src/modules/sox/filter_sox.c (revision 1239) +@@ -35,17 +35,21 @@ # define ST_SUCCESS SOX_SUCCESS # define st_sample_t sox_sample_t # define eff_t sox_effect_t* -# define st_size_t sox_size_t # define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE # define ST_LIB_VERSION SOX_LIB_VERSION -+#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0)) -+# define st_size_t size_t -+#else -+# define st_size_t sox_size_t -+#endif ++# if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0)) ++# define st_size_t size_t ++# else ++# define st_size_t sox_size_t ++# endif # define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips) - #if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0)) - # define ST_SSIZE_MIN SOX_SAMPLE_MIN +-#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0)) +-# define ST_SSIZE_MIN SOX_SAMPLE_MIN ++# if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0)) ++# define ST_SSIZE_MIN SOX_SAMPLE_MIN ++# else ++# define ST_SSIZE_MIN SOX_SSIZE_MIN ++# endif ++# define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips) + #else +-# define ST_SSIZE_MIN SOX_SSIZE_MIN +-#endif +-# define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips) +-#else + # include <st.h> + #endif + |