rpms/modplugtools/devel 0002-Fix-format-string-related-issues.patch, NONE, 1.1 0003-Usage-message-help-h-fixes.patch, NONE, 1.1 import.log, NONE, 1.1 modplugtools-0.5.0-libmodplug087.patch, NONE, 1.1 modplugtools-0.5.0-modplugplay-aoss.patch, NONE, 1.1 modplugtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ville Skyttä
scop at fedoraproject.org
Wed Jun 23 15:08:18 UTC 2010
Author: scop
Update of /cvs/pkgs/rpms/modplugtools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29899/devel
Modified Files:
.cvsignore sources
Added Files:
0002-Fix-format-string-related-issues.patch
0003-Usage-message-help-h-fixes.patch import.log
modplugtools-0.5.0-libmodplug087.patch
modplugtools-0.5.0-modplugplay-aoss.patch modplugtools.spec
Log Message:
Initial import (#600835).
0002-Fix-format-string-related-issues.patch:
mp123/modplug123.c | 9 ++++-----
mpplay/modplugplay.c | 7 +++----
2 files changed, 7 insertions(+), 9 deletions(-)
--- NEW FILE 0002-Fix-format-string-related-issues.patch ---
>From b99b42bb1ddf9966920924c675e8cdcae9fb0ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Mon, 21 Jun 2010 09:38:37 +0300
Subject: [PATCH 2/3] Fix format string related issues.
---
modplug-tools/mp123/modplug123.c | 9 ++++-----
modplug-tools/mpplay/modplugplay.c | 6 +++---
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/modplug-tools/mp123/modplug123.c b/modplug-tools/mp123/modplug123.c
index 7acf930..8c8d411 100644
--- a/modplug-tools/mp123/modplug123.c
+++ b/modplug-tools/mp123/modplug123.c
@@ -94,7 +94,6 @@ command line option handling
static struct termios stored_settings;
int audio_fd, mixer_fd;
unsigned char audio_buffer[BUF_SIZE];
-char order[3];
typedef struct {
int x, y;
@@ -317,7 +316,7 @@ for (song=1; song<argc; song++) {
d = getFileData(argv[song], &size);
if (d == NULL) continue;
- printf(" [%d]\n",size);
+ printf(" [%ld]\n",size);
// Note: All "Basic Settings" must be set before ModPlug_Load.
settings.mResamplingMode = MODPLUG_RESAMPLE_FIR; /* RESAMP */
@@ -356,8 +355,8 @@ for (song=1; song<argc; song++) {
set_keypress();
strcpy(songname, ModPlug_GetName(f2));
if (strlen(songname)==0) strcpy(songname,argv[song]);
- sprintf(status,"[1Gplaying %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s) \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,format.rate,format.channels,settings.mBits,order);
- if (loop) sprintf(status,"[1Glooping %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s) \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,format.rate,format.channels,settings.mBits,order);
+ sprintf(status,"[1Gplaying %s (%%d.%%d/%d\") (%%d/%%d/%%d) \b\b\b\b",songname,ModPlug_GetLength(f2)/1000);
+ if (loop) sprintf(status,"[1Glooping %s (%%d.%%d/%d\") (%%d/%%d/%%d) \b\b\b\b",songname,ModPlug_GetLength(f2)/1000);
gettimeofday(&tvstart,NULL);
tvptotal.tv_sec=tvptotal.tv_usec=0;
@@ -375,7 +374,7 @@ for (song=1; song<argc; song++) {
}
/*printf("%d %d\n",mlen,len);*/
}
- printf(status,tv.tv_sec-tvstart.tv_sec-tvptotal.tv_sec,tv.tv_usec/100000,format.rate,format.channels,settings.mBits,order/*,rev,revdly,sur,surdly,bas,basrng*/);
+ printf(status,tv.tv_sec-tvstart.tv_sec-tvptotal.tv_sec,tv.tv_usec/100000,format.rate,format.channels,settings.mBits/*,rev,revdly,sur,surdly,bas,basrng*/);
fflush(stdout);
if ((mlen==0) && (loop==1)) {
diff --git a/modplug-tools/mpplay/modplugplay.c b/modplug-tools/mpplay/modplugplay.c
index c8b2ae1..e776f02 100644
--- a/modplug-tools/mpplay/modplugplay.c
+++ b/modplug-tools/mpplay/modplugplay.c
@@ -390,7 +390,7 @@ for (song=1; song<argc; song++) {
d = getFileData(argv[song], &size);
if (d == NULL) continue;
- printf(" [%d]\n",size);
+ printf(" [%ld]\n",size);
if (ioctl(audio_fd,SNDCTL_DSP_SETFMT, &format) == -1) {
perror("SND_CTL_DSP_SETFMT");
@@ -443,8 +443,8 @@ for (song=1; song<argc; song++) {
set_keypress();
strcpy(songname, ModPlug_GetName(f2));
if (strlen(songname)==0) strcpy(songname,argv[song]);
- sprintf(status,"[1Gplaying %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s) \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,speed,channels,settings.mBits,order);
- if (loop) sprintf(status,"[1Glooping %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s) \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,speed,channels,settings.mBits,order);
+ sprintf(status,"[1Gplaying %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s) \b\b\b\b",songname,ModPlug_GetLength(f2)/1000);
+ if (loop) sprintf(status,"[1Glooping %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s) \b\b\b\b",songname,ModPlug_GetLength(f2)/1000);
gettimeofday(&tvstart,NULL);
tvptotal.tv_sec=tvptotal.tv_usec=0;
--
1.7.0.1
0003-Usage-message-help-h-fixes.patch:
mp123/modplug123.c | 16 ++++++++--------
mpplay/modplugplay.c | 17 ++++++++---------
2 files changed, 16 insertions(+), 17 deletions(-)
--- NEW FILE 0003-Usage-message-help-h-fixes.patch ---
>From 5fbe6bba280fffd12bca1ddac97142e682f80571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Mon, 21 Jun 2010 09:41:53 +0300
Subject: [PATCH 3/3] Usage message/--help/-h fixes.
Fixes exit status, gets rid of spurious "too few arguments" and fixes
program name in output.
---
modplug-tools/mp123/modplug123.c | 16 ++++++++--------
modplug-tools/mpplay/modplugplay.c | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/modplug-tools/mp123/modplug123.c b/modplug-tools/mp123/modplug123.c
index 8c8d411..ffa10bb 100644
--- a/modplug-tools/mp123/modplug123.c
+++ b/modplug-tools/mp123/modplug123.c
@@ -163,13 +163,14 @@ void versioninfo()
printf("Version %s compiled on %s at %s.\n",VERSION,__DATE__,__TIME__);
}
-void help(char *s)
+void help(char *s, int exitcode)
{
printf("Copyright (C) 2003 Gürkan Sengün\n");
printf("Version %s compiled on %s at %s.\n",VERSION,__DATE__,__TIME__);
printf("\n");
- printf("%s: too few arguments\n",s);
- printf("Usage: modplugplay" /*[OPTIONS]*/" [FILES]\n");
+ if (exitcode!=0)
+ printf("%s: too few arguments\n",s);
+ printf("Usage: %s" /*[OPTIONS]*/" [FILES]\n",s);
printf("\n");
printf(" -v/--version print version info\n");
@@ -181,7 +182,7 @@ void help(char *s)
printf(" -i use stdin for file input\n");
printf(" -q be quiet\n");
*/
- exit(1);
+ exit(exitcode);
}
char *getFileData(char *filename, long *size)
@@ -265,7 +266,7 @@ int main(int argc, char* argv[])
pollfds.events = POLLIN; /* Wait for input */
if (argc==1) {
- help(argv[0]);
+ help(argv[0],1);
}
if (!get_term_size(STDIN_FILENO,&terminal)) {
@@ -280,7 +281,7 @@ for (song=1; song<argc; song++) {
if (argv[song][0] == '-') {
if (!songsplayed && strstr(argv[song],"-h")) {
printf("\n");
- help(argv[0]);
+ help(argv[0],0);
} else if (!songsplayed && strstr(argv[song],"-v")) {
versioninfo();
exit(0);
@@ -290,8 +291,7 @@ for (song=1; song<argc; song++) {
}
if (argv[song][1] == '-') { // not a song
if (strstr(argv[song],"--help")) {
- help(argv[0]);
- exit(0);
+ help(argv[0],0);
} else if (strstr(argv[song],"--version")) {
versioninfo();
exit(0);
diff --git a/modplug-tools/mpplay/modplugplay.c b/modplug-tools/mpplay/modplugplay.c
index e776f02..9e9e5ef 100644
--- a/modplug-tools/mpplay/modplugplay.c
+++ b/modplug-tools/mpplay/modplugplay.c
@@ -164,13 +164,14 @@ void versioninfo()
printf("Version %s compiled on %s at %s.\n",VERSION,__DATE__,__TIME__);
}
-void help(char *s)
+void help(char *s, int exitcode)
{
printf("Copyright (C) 2003 Gürkan Sengün\n");
printf("Version %s compiled on %s at %s.\n",VERSION,__DATE__,__TIME__);
printf("\n");
- printf("%s: too few arguments\n",s);
- printf("Usage: modplugplay" /*[OPTIONS]*/" [FILES]\n");
+ if (exitcode!=0)
+ printf("%s: too few arguments\n",s);
+ printf("Usage: %s" /*[OPTIONS]*/" [FILES]\n",s);
printf("\n");
printf(" -v/--version print version info\n");
@@ -182,7 +183,7 @@ void help(char *s)
printf(" -i use stdin for file input\n");
printf(" -q be quiet\n");
*/
- exit(1);
+ exit(exitcode);
}
int get_byteorder()
@@ -332,7 +333,7 @@ int main(int argc, char* argv[])
pollfds.events = POLLIN; /* Wait for input */
if (argc==1) {
- help(argv[0]);
+ help(argv[0],1);
}
if (!get_term_size(STDIN_FILENO,&terminal)) {
@@ -347,7 +348,7 @@ for (song=1; song<argc; song++) {
if (argv[song][0] == '-') {
if (!songsplayed && strstr(argv[song],"-h")) {
printf("\n");
- help(argv[0]);
+ help(argv[0],0);
} else if (!songsplayed && strstr(argv[song],"-v")) {
versioninfo();
exit(0);
@@ -357,8 +358,7 @@ for (song=1; song<argc; song++) {
}
if (argv[song][1] == '-') { // not a song
if (strstr(argv[song],"--help")) {
- help(argv[0]);
- exit(0);
+ help(argv[0],0);
} else if (strstr(argv[song],"--version")) {
versioninfo();
exit(0);
--
1.7.0.1
--- NEW FILE import.log ---
modplugtools-0_5_0-2_fc13:HEAD:modplugtools-0.5.0-2.fc13.src.rpm:1277305678
modplugtools-0.5.0-libmodplug087.patch:
modplug123.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE modplugtools-0.5.0-libmodplug087.patch ---
diff -up modplugtools-0.5.0/mp123/modplug123.c~ modplugtools-0.5.0/mp123/modplug123.c
--- modplugtools-0.5.0/mp123/modplug123.c~ 2010-04-11 10:29:58.000000000 +0300
+++ modplugtools-0.5.0/mp123/modplug123.c 2010-06-05 23:26:40.353051833 +0300
@@ -324,8 +324,10 @@ for (song=1; song<argc; song++) {
settings.mChannels = 2;
settings.mBits = 16;
settings.mFrequency = 44100;
+#if 0
settings.mStereoSeparation = 128;
settings.mMaxMixChannels = 256;
+#endif
/* insert more setting changes here */
ModPlug_SetSettings(&settings);
modplugtools-0.5.0-modplugplay-aoss.patch:
Makefile.am | 2 +-
Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE modplugtools-0.5.0-modplugplay-aoss.patch ---
diff -up modplugtools-0.5.0/mpplay/Makefile.am~ modplugtools-0.5.0/mpplay/Makefile.am
--- modplugtools-0.5.0/mpplay/Makefile.am~ 2010-04-11 11:23:52.000000000 +0300
+++ modplugtools-0.5.0/mpplay/Makefile.am 2010-06-05 23:32:55.259052522 +0300
@@ -4,5 +4,5 @@ INCLUDES = \
$(LIBMODPLUG_CFLAGS)
modplugplay_SOURCES = modplugplay.c
-modplugplay_LDADD = $(LIBMODPLUG_LIBS)
+modplugplay_LDADD = $(LIBMODPLUG_LIBS) -laoss
diff -up modplugtools-0.5.0/mpplay/Makefile.in~ modplugtools-0.5.0/mpplay/Makefile.in
--- modplugtools-0.5.0/mpplay/Makefile.in~ 2010-04-11 11:33:49.000000000 +0300
+++ modplugtools-0.5.0/mpplay/Makefile.in 2010-06-05 23:33:10.520052700 +0300
@@ -109,7 +109,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBMODPLUG_CFLAGS = @LIBMODPLUG_CFLAGS@
-LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@ -laoss
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
--- NEW FILE modplugtools.spec ---
Name: modplugtools
Version: 0.5.0
Release: 2%{?dist}
Summary: Command line mod music players
Group: Applications/Multimedia
License: GPLv3
URL: http://modplug-xmms.sourceforge.net/
Source0: http://download.sourceforge.net/modplug-xmms/%{name}-%{version}.tar.gz
# Make modplug123 work with libmodplug < 0.8.8 (not for upstream)
Patch0: %{name}-0.5.0-libmodplug087.patch
# Make modplugplay more likely to work out of the box (not for upstream)
Patch1: %{name}-0.5.0-modplugplay-aoss.patch
# http://sf.net/tracker/?func=detail&aid=3019146&group_id=1275&atid=301275
Patch2: 0002-Fix-format-string-related-issues.patch
# http://sf.net/tracker/?func=detail&aid=3019148&group_id=1275&atid=301275
Patch3: 0003-Usage-message-help-h-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libmodplug-devel
BuildRequires: libao-devel >= 0.8.0
BuildRequires: alsa-oss-devel
Obsoletes: modplugplay < 2.06
Provides: modplugplay = 1:%{version}-%{release}
%description
%{summary}.
%prep
%setup -q
if ! pkg-config --atleast-version 0.8.8 libmodplug ; then
%patch0 -p1
fi
%patch1 -p1
%patch2 -p2
%patch3 -p2
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/modplug123
%{_bindir}/modplugplay
%changelog
* Mon Jun 21 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.5.0-2
- Patch to fix --help related issues (#600835).
- Patch to fix format string issues (#600835).
- License: GPLv3 (per the AUTHORS file) (#600835).
* Sat May 8 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.5.0-1
- First build.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/modplugtools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 23 Jun 2010 01:57:02 -0000 1.1
+++ .cvsignore 23 Jun 2010 15:08:17 -0000 1.2
@@ -0,0 +1 @@
+modplugtools-0.5.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/modplugtools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 23 Jun 2010 01:57:02 -0000 1.1
+++ sources 23 Jun 2010 15:08:18 -0000 1.2
@@ -0,0 +1 @@
+d41699c9a2a662f2191200ddef5678b0 modplugtools-0.5.0.tar.gz
More information about the scm-commits
mailing list