10:19 a.m.
Author: kvolny
Update of /cvs/free/rpms/mp3gain/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3994
Modified Files:
.cvsignore mp3gain.spec sources
Added Files:
mp3gain-cflags-1.5.2.patch mp3gain-tempfile-1.5.2.patch
Removed Files:
mp3gain-cflags.patch mp3gain-exit.patch
mp3gain-tempfile-default.patch
Log Message:
* Tue Oct 04 2011 Karel Volný <kvolny(a)redhat.com> - 1.5.2-1
- Version bump.
- Updated the tempfile and cflags patches.
- Removed the exit patch (applied upstream).
mp3gain-cflags-1.5.2.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mp3gain-cflags-1.5.2.patch ---
--- Makefile~ 2010-08-04 22:55:39.000000000 +0200
+++ Makefile 2011-10-04 17:05:06.364205963 +0200
@@ -6,7 +6,7 @@
CC?= gcc
-CFLAGS+= -Wall -DHAVE_MEMCPY
+CFLAGS+= ${RPM_OPT_FLAGS} -DHAVE_MEMCPY
# all known MS Windows OS define the ComSpec environment variable
ifdef ComSpec
mp3gain-tempfile-1.5.2.patch:
mp3gain.c | 42 ++++++++++++++++++++++++++++--------------
1 file changed, 28 insertions(+), 14 deletions(-)
--- NEW FILE mp3gain-tempfile-1.5.2.patch ---
--- mp3gain.c~ 2010-05-19 05:48:34.000000000 +0200
+++ mp3gain.c 2011-10-04 16:57:33.654259207 +0200
@@ -43,7 +43,11 @@
* out there will have come up with superior versions already...
*
* So have fun dissecting.
- */
+ */
+
+/* stf: make -t the default
+ * -T restores old behaviour
+ */
#include <stdio.h>
#include <stdlib.h>
@@ -128,8 +132,8 @@
unsigned char buffer[BUFFERSIZE];
int writeself = 0;
-int QuietMode = 0;
-int UsingTemp = 0;
+int QuietMode = 0;
+int UsingTemp = 1;
int NowWriting = 0;
double lastfreq = -1.0;
@@ -760,7 +764,8 @@
fclose(inf);
inf = NULL;
passError(MP3GAIN_UNSPECIFED_ERROR, 3,
- "\nCan't open ", outfilename, " for temp
writing\n");
+ "\nCan't open ", outfilename, " for temp
writing\n");
+ NowWriting = 0;
return M3G_ERR_CANT_MAKE_TMP;
}
@@ -774,7 +779,8 @@
if (UsingTemp && (outf != NULL))
fclose(outf);
passError( MP3GAIN_UNSPECIFED_ERROR, 3,
- "\nCan't open ", filename, " for modifying\n");
+ "\nCan't open ", filename, " for modifying\n");
+ NowWriting = 0;
return M3G_ERR_CANT_MODIFY_FILE;
}
else {
@@ -975,7 +981,8 @@
passError(MP3GAIN_CANCELLED,3,"Cancelled processing.\n", filename, " is
probably corrupted now.");
}
if (saveTime)
- fileTime(filename, setStoredTime);
+ fileTime(filename, setStoredTime);
+ NowWriting = 0;
return;
}
#endif
@@ -1044,8 +1051,9 @@
if (outlength != inlength) {
deleteFile(outfilename);
passError( MP3GAIN_UNSPECIFED_ERROR, 3,
- "Not enough temp space on disk to modify ", filename,
- "\nEither free some space, or do not use \"temp file\"
option\n");
+ "Not enough temp space on disk to modify ", filename,
+ "\nEither free some space, or switch off \"temp file\" option with
-T\n");
+ NowWriting = 0;
return M3G_ERR_NOT_ENOUGH_TMP_SPACE;
}
else {
@@ -1053,7 +1061,8 @@
if (deleteFile(filename)) {
deleteFile(outfilename); //try to delete tmp file
passError( MP3GAIN_UNSPECIFED_ERROR, 3,
- "Can't open ", filename, " for
modifying\n");
+ "Can't open ", filename, " for
modifying\n");
+ NowWriting = 0;
return M3G_ERR_CANT_MODIFY_FILE;
}
if (moveFile(outfilename, filename)) {
@@ -1061,7 +1070,8 @@
"Problem re-naming ", outfilename, " to ",
filename,
"\nThe mp3 was correctly modified, but you will need to re-name
",
outfilename, " to ", filename,
- " yourself.\n");
+ " yourself.\n");
+ NowWriting = 0;
return M3G_ERR_RENAME_TMP;
};
if (saveTime)
@@ -1327,11 +1337,12 @@
fprintf(stderr,"\t%cd <n> - modify suggested dB gain by floating-point
n\n",SWITCH_CHAR);
fprintf(stderr,"\t%cc - ignore clipping warning when applying
gain\n",SWITCH_CHAR);
fprintf(stderr,"\t%co - output is a database-friendly tab-delimited
list\n",SWITCH_CHAR);
- fprintf(stderr,"\t%ct - writes modified data to temp file, then deletes
original\n",SWITCH_CHAR);
- fprintf(stderr,"\t instead of modifying bytes in original file\n");
+ fprintf(stderr,"\t%ct - mp3gain writes modified mp3 to temp file, then deletes
original \n",SWITCH_CHAR);
+ fprintf(stderr,"\t instead of modifying bytes in original file
(default)\n");
#ifdef AACGAIN
fprintf(stderr,"\t A temp file is always used for AAC files.\n");
#endif
+ fprintf(stderr,"\t%cT - mp3gain directly modifies mp3 file (opposite of
%ct)\n",SWITCH_CHAR,SWITCH_CHAR);
fprintf(stderr,"\t%cq - Quiet mode: no status messages\n",SWITCH_CHAR);
fprintf(stderr,"\t%cp - Preserve original file timestamp\n",SWITCH_CHAR);
fprintf(stderr,"\t%cx - Only find max. amplitude of file\n",SWITCH_CHAR);
@@ -1674,9 +1685,12 @@
break;
- case 't':
- case 'T':
+ case 't':
UsingTemp = !0;
+ break;
+
+ case 'T':
+ UsingTemp = 0;
break;
case 'u':
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mp3gain/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Aug 2008 19:09:54 -0000 1.2
+++ .cvsignore 24 Oct 2011 10:19:58 -0000 1.3
@@ -1,2 +1,2 @@
-mp3gain-1_4_6-src.zip
+mp3gain-1_5_2_r2-src.zip
mp3gain.1.gz
Index: mp3gain.spec
===================================================================
RCS file: /cvs/free/rpms/mp3gain/devel/mp3gain.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mp3gain.spec 29 Mar 2009 13:47:59 -0000 1.2
+++ mp3gain.spec 24 Oct 2011 10:19:58 -0000 1.3
@@ -1,19 +1,18 @@
-%define tarball_version 1_4_6
+%define tarball_version 1_5_2_r2
Name: mp3gain
-Version: 1.4.6
-Release: 6%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
Summary: Lossless MP3 volume adjustment tool
Group: Applications/Multimedia
License: LGPL
URL: http://mp3gain.sourceforge.net
-Source0: http://osdn.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{tarball_vers...
+Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-...
Source1: %{name}.1.gz
Source2: README.method
-Patch0: %{name}-tempfile-default.patch
-Patch1: %{name}-exit.patch
-Patch2: %{name}-cflags.patch
+Patch0: %{name}-tempfile-1.5.2.patch
+Patch2: %{name}-cflags-1.5.2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,9 +28,8 @@
%prep
%setup -q -c %{name}-%{tarball_version}
-%patch0 -p1 -b .tempfile
-%patch1 -p1 -b .exit
-%patch2 -p1 -b .cflags
+%patch0 -p0 -b .tempfile
+%patch2 -p0 -b .cflags
install -p -m 644 %{SOURCE2} .
%{__sed} -i 's/\r//' lgpl.txt
@@ -58,6 +56,11 @@
%changelog
+* Tue Oct 04 2011 Karel Volný <kvolny(a)redhat.com> - 1.5.2-1
+- Version bump.
+- Updated the tempfile and cflags patches.
+- Removed the exit patch (applied upstream).
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.4.6-6
- rebuild for new F11 features
@@ -75,4 +78,3 @@
* Mon Nov 20 2006 Brian Pepple <bpepple(a)fedoraproject.org> - 1.4.6-1
- Initial Livna spec.
-
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mp3gain/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Aug 2008 19:09:54 -0000 1.2
+++ sources 24 Oct 2011 10:19:58 -0000 1.3
@@ -1,2 +1,2 @@
-4327167375dce5bce97625729a95fdb9 mp3gain-1_4_6-src.zip
+b8e429f3225cc298c5d13d31afd050b6 mp3gain-1_5_2_r2-src.zip
be6cfa62f64a2f4c2818de9b93411525 mp3gain.1.gz
--- mp3gain-cflags.patch DELETED ---
--- mp3gain-exit.patch DELETED ---
--- mp3gain-tempfile-default.patch DELETED ---