Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/mlt/files: mlt-0.3.0-sox1420.patch
Date: Sun, 23 Nov 2008 12:36:53
Message-Id: E1L4ECp-0005Ww-Hr@stork.gentoo.org
1 aballier 08/11/23 12:36:51
2
3 Modified: mlt-0.3.0-sox1420.patch
4 Log:
5 use upstream patch for sox 14.2.0 compatibility, remove unused version
6 (Portage version: 2.2_rc15/cvs/Linux 2.6.27.5 x86_64)
7
8 Revision Changes Path
9 1.2 media-libs/mlt/files/mlt-0.3.0-sox1420.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mlt/files/mlt-0.3.0-sox1420.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mlt/files/mlt-0.3.0-sox1420.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mlt/files/mlt-0.3.0-sox1420.patch?r1=1.1&r2=1.2
14
15 Index: mlt-0.3.0-sox1420.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-libs/mlt/files/mlt-0.3.0-sox1420.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- mlt-0.3.0-sox1420.patch 10 Nov 2008 12:09:10 -0000 1.1
22 +++ mlt-0.3.0-sox1420.patch 23 Nov 2008 12:36:51 -0000 1.2
23 @@ -1,19 +1,33 @@
24 -Index: mlt-0.3.0/src/modules/sox/filter_sox.c
25 +Index: src/modules/sox/filter_sox.c
26 ===================================================================
27 ---- mlt-0.3.0.orig/src/modules/sox/filter_sox.c
28 -+++ mlt-0.3.0/src/modules/sox/filter_sox.c
29 -@@ -33,9 +33,13 @@
30 +--- src/modules/sox/filter_sox.c (revision 1238)
31 ++++ src/modules/sox/filter_sox.c (revision 1239)
32 +@@ -35,17 +35,21 @@
33 # define ST_SUCCESS SOX_SUCCESS
34 # define st_sample_t sox_sample_t
35 # define eff_t sox_effect_t*
36 -# define st_size_t sox_size_t
37 # define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE
38 # define ST_LIB_VERSION SOX_LIB_VERSION
39 -+#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0))
40 -+# define st_size_t size_t
41 -+#else
42 -+# define st_size_t sox_size_t
43 -+#endif
44 ++# if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0))
45 ++# define st_size_t size_t
46 ++# else
47 ++# define st_size_t sox_size_t
48 ++# endif
49 # define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips)
50 - #if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
51 - # define ST_SSIZE_MIN SOX_SAMPLE_MIN
52 +-#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
53 +-# define ST_SSIZE_MIN SOX_SAMPLE_MIN
54 ++# if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
55 ++# define ST_SSIZE_MIN SOX_SAMPLE_MIN
56 ++# else
57 ++# define ST_SSIZE_MIN SOX_SSIZE_MIN
58 ++# endif
59 ++# define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips)
60 + #else
61 +-# define ST_SSIZE_MIN SOX_SSIZE_MIN
62 +-#endif
63 +-# define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips)
64 +-#else
65 + # include <st.h>
66 + #endif
67 +