rpms/SDL_mixer/devel SDL_mixer-1.2.7-bad-code.patch, NONE, 1.1 SDL_mixer-1.2.7-fix-path-timidity.patch, NONE, 1.1 SDL_mixer-1.2.7-volume.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 SDL_mixer.spec, 1.13, 1.14 sources, 1.3, 1.4 SDL_mixer-1.0.6-redhat.patch, 1.1, NONE SDL_mixer-1.2.5-bad_code.patch, 1.1, NONE SDL_mixer-1.2.6-64bit.patch, 1.1, NONE SDL_mixer-1.2.6-libmikmod.patch, 1.1, NONE
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Fri Aug 25 23:25:01 UTC 2006
- Previous message (by thread): rpms/perl-Module-Install/devel .cvsignore, 1.3, 1.4 perl-Module-Install.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message (by thread): rpms/SDL_net/devel .cvsignore, 1.2, 1.3 SDL_net.spec, 1.5, 1.6 sources, 1.2, 1.3 SDL_net-137525.patch, 1.1, NONE SDL_net-ppc64.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bpepple
Update of /cvs/extras/rpms/SDL_mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32454
Modified Files:
.cvsignore SDL_mixer.spec sources
Added Files:
SDL_mixer-1.2.7-bad-code.patch
SDL_mixer-1.2.7-fix-path-timidity.patch
SDL_mixer-1.2.7-volume.patch
Removed Files:
SDL_mixer-1.0.6-redhat.patch SDL_mixer-1.2.5-bad_code.patch
SDL_mixer-1.2.6-64bit.patch SDL_mixer-1.2.6-libmikmod.patch
Log Message:
* Fri Aug 25 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2.7-1
- Update to 1.2.7.
- Update bad-code & timidity patches.
- Simplify description & summary for devel package.
- Use disable-static configure flag.
- Drop 64bit patch, fixed upstream.
- Drop libmikmod.patch, fixed upstream.
- Add patch to allow control volume w/playmus. Bug #203210.
SDL_mixer-1.2.7-bad-code.patch:
--- NEW FILE SDL_mixer-1.2.7-bad-code.patch ---
diff -ur SDL_mixer-1.2.7.OLD/effect_position.c SDL_mixer-1.2.7/effect_position.c
--- SDL_mixer-1.2.7.OLD/effect_position.c 2006-05-01 03:25:57.000000000 -0400
+++ SDL_mixer-1.2.7/effect_position.c 2006-08-25 15:48:45.000000000 -0400
@@ -373,16 +373,17 @@
for (i = 0; i < len; i += sizeof (Uint32)) {
#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
- *(p++) = (d[l[(*p & 0xFF000000) >> 24]] << 24) |
- (d[r[(*p & 0x00FF0000) >> 16]] << 16) |
- (d[l[(*p & 0x0000FF00) >> 8]] << 8) |
- (d[r[(*p & 0x000000FF) ]] ) ;
+ *p = (d[l[(*p & 0xFF000000) >> 24]] << 24) |
+ (d[r[(*p & 0x00FF0000) >> 16]] << 16) |
+ (d[l[(*p & 0x0000FF00) >> 8]] << 8) |
+ (d[r[(*p & 0x000000FF) ]] ) ;
#else
- *(p++) = (d[r[(*p & 0xFF000000) >> 24]] << 24) |
- (d[l[(*p & 0x00FF0000) >> 16]] << 16) |
- (d[r[(*p & 0x0000FF00) >> 8]] << 8) |
- (d[l[(*p & 0x000000FF) ]] ) ;
+ *p = (d[r[(*p & 0xFF000000) >> 24]] << 24) |
+ (d[l[(*p & 0x00FF0000) >> 16]] << 16) |
+ (d[r[(*p & 0x0000FF00) >> 8]] << 8) |
+ (d[l[(*p & 0x000000FF) ]] ) ;
#endif
+ p++;
}
}
@@ -563,16 +564,17 @@
for (i = 0; i < len; i += sizeof (Uint32)) {
#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
- *(p++) = (d[l[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) |
- (d[r[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) |
- (d[l[((Sint16)(Sint8)((*p & 0x0000FF00) >> 8))+128]] << 8) |
- (d[r[((Sint16)(Sint8)((*p & 0x000000FF) ))+128]] ) ;
+ *p = (d[l[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) |
+ (d[r[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) |
+ (d[l[((Sint16)(Sint8)((*p & 0x0000FF00) >> 8))+128]] << 8) |
+ (d[r[((Sint16)(Sint8)((*p & 0x000000FF) ))+128]] ) ;
#else
- *(p++) = (d[r[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) |
- (d[l[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) |
- (d[r[((Sint16)(Sint8)((*p & 0x0000FF00) >> 8))+128]] << 8) |
- (d[l[((Sint16)(Sint8)((*p & 0x000000FF) ))+128]] ) ;
+ *p = (d[r[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) |
+ (d[l[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) |
+ (d[r[((Sint16)(Sint8)((*p & 0x0000FF00) >> 8))+128]] << 8) |
+ (d[l[((Sint16)(Sint8)((*p & 0x000000FF) ))+128]] ) ;
#endif
+ p++;
}
SDL_mixer-1.2.7-fix-path-timidity.patch:
--- NEW FILE SDL_mixer-1.2.7-fix-path-timidity.patch ---
--- SDL_mixer-1.2.7/timidity/config.h.timidity 2006-05-01 09:25:52.000000000 +0200
+++ SDL_mixer-1.2.7/timidity/config.h 2006-05-18 10:38:39.000000000 +0200
@@ -176,7 +176,7 @@
#if defined(__WIN32__) || defined(__OS2__)
#define DEFAULT_PATH "\\TIMIDITY"
#else
-#define DEFAULT_PATH "/usr/local/lib/timidity"
+#define DEFAULT_PATH "/usr/share/timidity"
#endif
/* These affect general volume */
SDL_mixer-1.2.7-volume.patch:
--- NEW FILE SDL_mixer-1.2.7-volume.patch ---
diff -ur SDL_mixer-1.2.7.OLD/playmus.c SDL_mixer-1.2.7/playmus.c
--- SDL_mixer-1.2.7.OLD/playmus.c 2006-05-14 17:08:06.000000000 -0400
+++ SDL_mixer-1.2.7/playmus.c 2006-08-25 15:38:22.000000000 -0400
@@ -65,7 +65,7 @@
{
char buf[10];
- printf("Available commands: (p)ause (r)esume (h)alt > ");
+ printf("Available commands: (p)ause (r)esume (h)alt volume(v#) > ");
fflush(stdin);
scanf("%s",buf);
switch(buf[0]){
@@ -78,6 +78,9 @@
case 'h': case 'H':
Mix_HaltMusic();
break;
+ case 'v': case 'V':
+ Mix_VolumeMusic(atoi(buf+1));
+ break;
}
printf("Music playing: %s Paused: %s\n", Mix_PlayingMusic() ? "yes" : "no",
Mix_PausedMusic() ? "yes" : "no");
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 19 Jun 2005 16:24:33 -0000 1.3
+++ .cvsignore 25 Aug 2006 23:25:01 -0000 1.4
@@ -1 +1 @@
-SDL_mixer-1.2.6.tar.gz
+SDL_mixer-1.2.7.tar.gz
Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/devel/SDL_mixer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SDL_mixer.spec 23 Apr 2006 15:53:19 -0000 1.13
+++ SDL_mixer.spec 25 Aug 2006 23:25:01 -0000 1.14
@@ -1,19 +1,17 @@
Name: SDL_mixer
-Version: 1.2.6
-Release: 8%{?dist}
+Version: 1.2.7
+Release: 1%{?dist}
Summary: Simple DirectMedia Layer - Sample Mixer Library
Group: System Environment/Libraries
License: LGPL
URL: http://www.libsdl.org/projects/SDL_mixer/
Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
-Patch1: %{name}-1.0.6-redhat.patch
-Patch2: %{name}-1.2.6-libmikmod.patch
-Patch4: %{name}-1.2.5-bad_code.patch
-Patch5: %{name}-1.2.6-64bit.patch
+Patch1: %{name}-%{version}-bad-code.patch
+Patch2: %{name}-%{version}-volume.patch
+Patch3: %{name}-%{version}-fix-path-timidity.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Prefix: %{_prefix}
BuildRequires: SDL-devel >= 1.2.4-1
BuildRequires: libvorbis-devel
BuildRequires: mikmod-devel >= 3.1.6-26
@@ -22,48 +20,40 @@
%description
-A simple multi-channel audio mixer for SDL.
-It supports 4 channels of 16 bit stereo audio, plus a single channel
-of music, mixed by the popular MikMod MOD, Timidity MIDI and Ogg Vorbis
-libraries.
+A simple multi-channel audio mixer for SDL. It supports 4 channels of
+16 bit stereo audio, plus a single channel of music, mixed by the popular
+MikMod MOD, Timidity MIDI and Ogg Vorbis libraries.
%package devel
-Summary: Libraries, includes and more to develop SDL applications using the SDL mixer
+Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: SDL-devel >= 1.2.4-1
%description devel
-Development files for SDL_mixer, a simple multi-channel audio mixer for SDL.
-It supports 4 channels of 16 bit stereo audio, plus a single channel
-of music, mixed by the popular MikMod MOD, Timidity MIDI and Ogg Vorbis
-libraries.
-
-You need SDL_mixer-devel if you want to compile an application using SDL_mixer.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
%prep
%setup -q
-%patch1 -p1 -b .redhat
-%patch2 -p1 -b .libmikmod
-%patch4 -p1 -b .bad_code
-%patch5 -p1 -b .64bit
+%patch1 -p1 -b .bad_code
+%patch2 -p1 -b .volume
+%patch3 -p1 -b .timidity
%build
-%configure --disable-dependency-tracking
+%configure --disable-dependency-tracking --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall
-/usr/bin/install -d $RPM_BUILD_ROOT/usr/bin
-./libtool --mode=install /usr/bin/install -c playmus $RPM_BUILD_ROOT/usr/bin
-./libtool --mode=install /usr/bin/install -c playwave $RPM_BUILD_ROOT/usr/bin
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%makeinstall install-bin
+
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%clean
@@ -77,7 +67,7 @@
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc README CHANGES COPYING
%{_bindir}/playmus
%{_bindir}/playwave
@@ -85,13 +75,21 @@
%files devel
-%defattr(-,root,root)
-%{_libdir}/lib*.a
+%defattr(-,root,root,-)
%{_libdir}/lib*.so
%{_includedir}/SDL
%changelog
+* Fri Aug 25 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2.7-1
+- Update to 1.2.7.
+- Update bad-code & timidity patches.
+- Simplify description & summary for devel package.
+- Use disable-static configure flag.
+- Drop 64bit patch, fixed upstream.
+- Drop libmikmod.patch, fixed upstream.
+- Add patch to allow control volume w/playmus. Bug #203210.
+
* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-8
- Add patch to fix sound on x86_64. Bug #175672.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 19 Jun 2005 16:24:33 -0000 1.3
+++ sources 25 Aug 2006 23:25:01 -0000 1.4
@@ -1 +1 @@
-2b8beffad9179d80e598c22c80efb135 SDL_mixer-1.2.6.tar.gz
+7959b89c8f8f1564ca90968f6c88fa1e SDL_mixer-1.2.7.tar.gz
--- SDL_mixer-1.0.6-redhat.patch DELETED ---
--- SDL_mixer-1.2.5-bad_code.patch DELETED ---
--- SDL_mixer-1.2.6-64bit.patch DELETED ---
--- SDL_mixer-1.2.6-libmikmod.patch DELETED ---
- Previous message (by thread): rpms/perl-Module-Install/devel .cvsignore, 1.3, 1.4 perl-Module-Install.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message (by thread): rpms/SDL_net/devel .cvsignore, 1.2, 1.3 SDL_net.spec, 1.5, 1.6 sources, 1.2, 1.3 SDL_net-137525.patch, 1.1, NONE SDL_net-ppc64.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list