Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8f58803772f9832b834015f4216c7a3e83446f1b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8f58803772f9832b834015f4216c7a3e83446f1b)
  • Date: Thu, 19 Mar 2015 02:14:57 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-soft/sox/DEPENDS | 5 -
audio-soft/sox/DETAILS | 4 -
audio-soft/sox/HISTORY | 5 +
audio-soft/sox/PRE_BUILD | 11 --
audio-soft/sox/ffmpeg-0.11-arch.patch | 129
----------------------------------
dev/null |binary
6 files changed, 8 insertions(+), 146 deletions(-)

New commits:
commit 8f58803772f9832b834015f4216c7a3e83446f1b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sox: => 14.4.2

diff --git a/audio-soft/sox/DEPENDS b/audio-soft/sox/DEPENDS
index 1307a05..6f80f52 100755
--- a/audio-soft/sox/DEPENDS
+++ b/audio-soft/sox/DEPENDS
@@ -33,11 +33,6 @@ optional_depends flac \
"--without-flac" \
"for FLAC usage" &&

-optional_depends LIBAVCODEC \
- "--with-ffmpeg" \
- "--without-ffmpeg" \
- "for ffmpeg usage" &&
-
optional_depends libmad \
"--with-mad" \
"--without-mad" \
diff --git a/audio-soft/sox/DETAILS b/audio-soft/sox/DETAILS
index c9df8b2..00941d6 100755
--- a/audio-soft/sox/DETAILS
+++ b/audio-soft/sox/DETAILS
@@ -1,9 +1,9 @@
SPELL=sox
- VERSION=14.4.1
+ VERSION=14.4.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://downloads.sourceforge.net/project/sox/sox/$VERSION/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
WEB_SITE=http://sox.sourceforge.net/
ENTERED=20010922
LICENSE[0]=LGPL
diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index c56965f..ca0e101 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,8 @@
+2015-03-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 14.4.2; gpg -> sha512
+ * DEPENDS: removed deprecated ffmpeg optional dependency
+ * PRE_BUILD: removed obsolete patching
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: add a define missing from current ffmpeg

diff --git a/audio-soft/sox/PRE_BUILD b/audio-soft/sox/PRE_BUILD
index 6784dae..555ee8b 100755
--- a/audio-soft/sox/PRE_BUILD
+++ b/audio-soft/sox/PRE_BUILD
@@ -3,13 +3,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch" &&
-
-if spell_ok ffmpeg && is_version_less 0.10 $(installed_version ffmpeg); then
- patch -p1 < "${SPELL_DIRECTORY}/ffmpeg-0.11-arch.patch"
-fi
-# New ffmpeg misses that define for some reason.
-echo "#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-#endif" >> src/ffmpeg.h
-
+patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch"
diff --git a/audio-soft/sox/ffmpeg-0.11-arch.patch
b/audio-soft/sox/ffmpeg-0.11-arch.patch
deleted file mode 100644
index acefce6..0000000
--- a/audio-soft/sox/ffmpeg-0.11-arch.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure
---- sox-14.4.0-orig/configure 2012-06-12 00:35:53.462360803 -0400
-+++ sox-14.4.0/configure 2012-06-12 00:36:08.572361294 -0400
-@@ -15781,9 +15781,9 @@
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file
in -lavformat" >&5
--$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
--if ${ac_cv_lib_avformat_av_open_input_file+:} false; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input
in -lavformat" >&5
-+$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; }
-+if ${ac_cv_lib_avformat_avformat_open_input+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -15797,27 +15797,27 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char av_open_input_file ();
-+char avformat_open_input ();
- int
- main ()
- {
--return av_open_input_file ();
-+return avformat_open_input ();
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_avformat_av_open_input_file=yes
-+ ac_cv_lib_avformat_avformat_open_input=yes
- else
-- ac_cv_lib_avformat_av_open_input_file=no
-+ ac_cv_lib_avformat_avformat_open_input=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_avformat_av_open_input_file" >&5
--$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; }
--if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_avformat_avformat_open_input" >&5
-+$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; }
-+if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then :
- for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c
---- sox-14.4.0-orig/src/ffmpeg.c 2012-06-12 00:35:53.459027469 -0400
-+++ sox-14.4.0/src/ffmpeg.c 2012-06-12 00:36:26.539028545 -0400
-@@ -93,7 +93,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- enc->error_resilience = 1;
- #else
-- enc->error_recognition = 1;
-+ enc->err_recognition = 1;
- #endif
-
- if (!codec || avcodec_open(enc, codec) < 0)
-@@ -157,7 +157,7 @@
- static int startread(sox_format_t * ft)
- {
- priv_t * ffmpeg = (priv_t *)ft->priv;
-- AVFormatParameters params;
-+ AVDictionary *params;
- int ret;
- int i;
-
-@@ -172,7 +172,7 @@
-
- /* Open file and get format */
- memset(&params, 0, sizeof(params));
-- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0,
&params)) < 0) {
-+ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL,
&params)) < 0) {
- lsx_fail("ffmpeg cannot open file for reading: %s (code %d)",
ft->filename, ret);
- return SOX_EOF;
- }
-@@ -231,7 +231,7 @@
- /* If input buffer empty, read more data */
- if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {
- if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&
-- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))
-+ (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error))
- break;
- ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg,
ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);
- ffmpeg->audio_buf_index = 0;
-@@ -373,13 +373,6 @@
- return SOX_EOF;
- }
-
-- /* set the output parameters (must be done even if no
-- parameters). */
-- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {
-- lsx_fail("ffmpeg invalid output format parameters");
-- return SOX_EOF;
-- }
--
- /* Next line for debugging */
- /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */
-
-@@ -391,14 +384,14 @@
-
- /* open the output file, if needed */
- if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
-- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {
-+ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {
- lsx_fail("ffmpeg could not open `%s'", ft->filename);
- return SOX_EOF;
- }
- }
-
- /* write the stream header, if any */
-- av_write_header(ffmpeg->ctxt);
-+ avformat_write_header(ffmpeg->ctxt, NULL);
-
- return SOX_SUCCESS;
- }
-@@ -478,7 +471,7 @@
- #if (LIBAVFORMAT_VERSION_INT < 0x340000)
- url_fclose(&ffmpeg->ctxt->pb);
- #else
-- url_fclose(ffmpeg->ctxt->pb);
-+ avio_close(ffmpeg->ctxt->pb);
- #endif
- }
diff --git a/audio-soft/sox/sox-14.4.1.tar.gz.sig
b/audio-soft/sox/sox-14.4.1.tar.gz.sig
deleted file mode 100644
index 78825a8..0000000
Binary files a/audio-soft/sox/sox-14.4.1.tar.gz.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8f58803772f9832b834015f4216c7a3e83446f1b), Vlad Glagolev, 03/19/2015

Archive powered by MHonArc 2.6.24.

Top of Page