rpms/wildmidi/devel wildmidi-0.2.2-cfg-abs-path.patch, NONE, 1.1 wildmidi-0.2.2-opt.patch, NONE, 1.1 wildmidi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Jul 27 21:17:59 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/wildmidi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19108/devel
Modified Files:
.cvsignore sources
Added Files:
wildmidi-0.2.2-cfg-abs-path.patch wildmidi-0.2.2-opt.patch
wildmidi.spec
Log Message:
initial wildmidi import
wildmidi-0.2.2-cfg-abs-path.patch:
--- NEW FILE wildmidi-0.2.2-cfg-abs-path.patch ---
diff -up wildmidi-0.2.2/src/wildmidi_lib.c.abs wildmidi-0.2.2/src/wildmidi_lib.c
--- wildmidi-0.2.2/src/wildmidi_lib.c.abs 2004-01-28 19:13:46.000000000 +0100
+++ wildmidi-0.2.2/src/wildmidi_lib.c 2007-07-14 16:54:28.000000000 +0200
@@ -845,7 +845,7 @@ WM_LoadConfig (const char *config_file)
}
continue;
} else if (strncasecmp(line_buffer, "source ", 7) == 0) {
- if (config_dir != NULL) {
+ if (config_dir != NULL && line_buffer[7] != '/') {
new_config = malloc(strlen(config_dir) + strlen(&line_buffer[7]) + 1);
if (new_config == NULL) {
WM_ERROR(__FUNCTION__, __LINE__, WM_ERR_MEM, "to parse config", errno);
@@ -1013,7 +1013,7 @@ WM_LoadConfig (const char *config_file)
*chr_ptr = '\0';
}
if (strncasecmp(&line_buffer[(line_ptr + strlen(&line_buffer[line_ptr]) - 5)], ".pat", 4) != 0) {
- if (config_dir != NULL) {
+ if (config_dir != NULL && line_buffer[line_ptr] != '/') {
tmp_patch->filename = malloc(strlen(config_dir) + strlen(&line_buffer[line_ptr]) + 5);
if (tmp_patch->filename == NULL) {
WM_ERROR(__FUNCTION__, __LINE__, WM_ERR_MEM, NULL, 0);
@@ -1041,7 +1041,7 @@ WM_LoadConfig (const char *config_file)
}
strcat(tmp_patch->filename, ".pat");
} else {
- if (config_dir != NULL) {
+ if (config_dir != NULL && line_buffer[line_ptr] != '/') {
tmp_patch->filename = malloc(strlen(config_dir) + strlen(&line_buffer[line_ptr]) + 1);
if (tmp_patch->filename == NULL) {
WM_ERROR(__FUNCTION__, __LINE__, WM_ERR_MEM, NULL, 0);
wildmidi-0.2.2-opt.patch:
--- NEW FILE wildmidi-0.2.2-opt.patch ---
diff -up wildmidi-0.2.2/configure.ac.opt wildmidi-0.2.2/configure.ac
--- wildmidi-0.2.2/configure.ac.opt 2007-07-14 15:21:57.000000000 +0200
+++ wildmidi-0.2.2/configure.ac 2007-07-14 15:22:03.000000000 +0200
@@ -226,6 +226,8 @@ AC_ARG_WITH(arch,
)
case "$arch" in
+ no)
+ ;;
auto)
case "${host_cpu}" in
i?86)
diff -up wildmidi-0.2.2/configure.opt wildmidi-0.2.2/configure
--- wildmidi-0.2.2/configure.opt 2007-07-14 15:21:54.000000000 +0200
+++ wildmidi-0.2.2/configure 2007-07-14 15:22:52.000000000 +0200
@@ -19966,6 +19966,8 @@ else
fi;
case "$arch" in
+ no)
+ ;;
auto)
case "${host_cpu}" in
i?86)
--- NEW FILE wildmidi.spec ---
Name: wildmidi
Version: 0.2.2
Release: 1%{?dist}
Summary: Midi Wavetable Synth Lib
Group: System Environment/Libraries
License: GPL
URL: http://wildmidi.sourceforge.net/index.html
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: wildmidi-0.2.2-opt.patch
Patch1: wildmidi-0.2.2-cfg-abs-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
Requires: timidity++
%description
WildMidi is a software midi player which has a core softsynth library that can
be use with other applications. Originally conceived in December 2001 as a
stand alone player, it wasn't until September 2003, and several revisions
later, that the library came into existance. The library is designed to process
a midi file and stream out the stereo audio data through a buffer which an
external program can then process further.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -z .opt
%patch1 -p1 -z .abs
sed -i 's/\r//g' COPYING
# sigh stop autoxxx from rerunning because of our patches above.
touch aclocal.m4
touch configure
touch include/config.h.in
touch `find -name Makefile.in`
%build
%configure --disable-static --disable-werror --without-arch
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING README TODO
%{_bindir}/wildmidi
%{_libdir}/libWildMidi.so.0*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libWildMidi.so
%changelog
* Sat Jul 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.2-1
- Initial Fedora Extras version
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wildmidi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 27 Jul 2007 18:39:24 -0000 1.1
+++ .cvsignore 27 Jul 2007 21:17:26 -0000 1.2
@@ -0,0 +1 @@
+wildmidi-0.2.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wildmidi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 27 Jul 2007 18:39:24 -0000 1.1
+++ sources 27 Jul 2007 21:17:26 -0000 1.2
@@ -0,0 +1 @@
+c4e30f2d68ccc8e4571511832695f191 wildmidi-0.2.2.tar.gz
More information about the fedora-extras-commits
mailing list