- up to 14.4.0

Changed files:
    sox-ffmpeg.patch -> 1.4
    sox.spec -> 1.76

diff --git a/sox-ffmpeg.patch b/sox-ffmpeg.patch
deleted file mode 100644 (file)
index 6b9d026..0000000
--- a/sox-ffmpeg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: sox-14.3.2/src/ffmpeg.c
-===================================================================
---- sox-14.3.2.orig/src/ffmpeg.c
-+++ sox-14.3.2/src/ffmpeg.c
-@@ -91,7 +91,7 @@ static int stream_component_open(priv_t
- 
-   if (!codec || avcodec_open(enc, codec) < 0)
-     return -1;
--  if (enc->codec_type != CODEC_TYPE_AUDIO) {
-+  if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
-     lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
-     return -1;
-   }
-@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
-   /* Find audio stream (FIXME: allow different stream to be selected) */
-   for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
-     AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
--    if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
-+    if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
-       ffmpeg->audio_index = i;
-       break;
-     }
-@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo
- 
-   c = st->codec;
-   c->codec_id = codec_id;
--  c->codec_type = CODEC_TYPE_AUDIO;
-+  c->codec_type = AVMEDIA_TYPE_AUDIO;
- 
-   /* put sample parameters */
-   c->bit_rate = 256000;  /* FIXME: allow specification */
-@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t
-       av_init_packet(&pkt);
-       pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
-       pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       pkt.stream_index = ffmpeg->audio_st->index;
-       pkt.data = ffmpeg->audio_buf_aligned;

diff --git a/sox.spec b/sox.spec
index 1313f50fe7854a19f6f3db623c83ef0d97e04b01..b6547878ab8fb9ba40b9c4c1d709692ccab9a963 100644 (file)
--- a/sox.spec
+++ b/sox.spec
@@ -15,15 +15,14 @@ Summary(ru.UTF-8):  Утилита общего назначения для ра
 Summary(tr.UTF-8):     Genel amaçlı ses dosyası çevirme aracı
 Summary(uk.UTF-8):     Утиліта загального призначення для роботи із звуковими файлами
 Name:          sox
-Version:       14.3.2
-Release:       5
+Version:       14.4.0
+Release:       1
 License:       GPL v2+ (sox), LGPL v2+ (libsox)
 Group:         Applications/Sound
 Source0:       http://downloads.sourceforge.net/sox/%{name}-%{version}.tar.gz
-# Source0-md5: e9d35cf3b0f8878596e0b7c49f9e8302
+# Source0-md5: b0c15cff7a4ba0ec17fdc74e6a1f9cf1
 Patch0:                %{name}-system-lpc10.patch
 Patch1:                %{name}-dyn.patch
-Patch2:                %{name}-ffmpeg.patch
 URL:           http://sox.sourceforge.net/
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
 BuildRequires: autoconf >= 2.50
@@ -176,7 +175,6 @@ bibliotekę libmad, a do kodowania - LAME.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -226,7 +224,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/soxi
 %attr(755,root,root) %{_bindir}/soxplay
 %attr(755,root,root) %{_libdir}/libsox.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsox.so.1
+%attr(755,root,root) %ghost %{_libdir}/libsox.so.2
 %dir %{_libdir}/sox
 %if %{with alsa}
 # R: alsa-lib
@@ -269,7 +267,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsox.so
 %{_includedir}/sox.h
-%{_includedir}/soxstdint.h
 %{_pkgconfigdir}/sox.pc
 %{_mandir}/man3/libsox.3*