rpms/libmikmod/devel libmikmod-3.1.11-a.diff, NONE, 1.1 libmikmod-64bit.patch, NONE, 1.1 libmikmod-esd.patch, NONE, 1.1 libmikmod-rpath.patch, NONE, 1.1 libmikmod-strip-lib.patch, NONE, 1.1 libmikmod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Wed Oct 24 07:52:53 UTC 2007
Author: jnovy
Update of /cvs/extras/rpms/libmikmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9198/devel
Modified Files:
.cvsignore sources
Added Files:
libmikmod-3.1.11-a.diff libmikmod-64bit.patch
libmikmod-esd.patch libmikmod-rpath.patch
libmikmod-strip-lib.patch libmikmod.spec
Log Message:
inital commit
libmikmod-3.1.11-a.diff:
--- NEW FILE libmikmod-3.1.11-a.diff ---
diff --recursive --unified libmikmod-3.1.11/NEWS libmikmod-3.1.11-a/NEWS
--- libmikmod-3.1.11/NEWS 2004-01-21 12:43:52.000000000 -0500
+++ libmikmod-3.1.11-a/NEWS 2004-06-04 08:24:26.000000000 -0400
@@ -1,3 +1,17 @@
+Summary of changes between libmikmod 3.1.11 and libmikmod 3.1.11-a
+========================================================================
+libmikmod-3.1.11-a was released on 05/03/2004
+
+Most of my work and attention goes on the 3.2.x series, but I still receive
+occasional bug reports and patchs for the 3.1.11 version. There are not enough
+changes to make a full release, but many people may find this patch useful.
+
+BUGFIXES
+- libmikmod playback now works correcly on amd64 (type size problem)
+- fixed warning issued by automake >= 1.8
+- config.sub and config.guess updated
+
+
Summary of changes between libmikmod 3.1.10 and libmikmod 3.1.11 (Thiers):
==========================================================================
diff --recursive --unified libmikmod-3.1.11/include/mikmod.h.in libmikmod-3.1.11-a/include/mikmod.h.in
--- libmikmod-3.1.11/include/mikmod.h.in 2004-01-21 12:43:53.000000000 -0500
+++ libmikmod-3.1.11-a/include/mikmod.h.in 2004-06-04 08:24:26.000000000 -0400
@@ -20,7 +20,7 @@
/*==============================================================================
- $Id: mikmod.h.in,v 1.1.1.1 2004/01/21 01:36:35 raph Exp $
+ $Id: mikmod.h.in,v 1.2 2004/06/01 16:43:45 raph Exp $
MikMod sound library include file
@@ -85,7 +85,7 @@
@DOES_NOT_HAVE_SIGNED@
-#if defined(__arch64__) || defined(__alpha)
+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
/* 64 bit architectures */
typedef signed char SBYTE; /* 1 byte, signed */
diff --recursive --unified libmikmod-3.1.11/libmikmod.m4 libmikmod-3.1.11-a/libmikmod.m4
--- libmikmod-3.1.11/libmikmod.m4 2004-01-21 12:43:53.000000000 -0500
+++ libmikmod-3.1.11-a/libmikmod.m4 2004-06-04 08:24:26.000000000 -0400
@@ -8,7 +8,7 @@
dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and
dnl LIBMIKMOD_LDADD
dnl
-AC_DEFUN(AM_PATH_LIBMIKMOD,
+AC_DEFUN([AM_PATH_LIBMIKMOD],
[dnl
dnl Get the cflags and libraries from the libmikmod-config script
dnl
libmikmod-64bit.patch:
--- NEW FILE libmikmod-64bit.patch ---
--- libmikmod-3.1.11/include/mikmod_internals.h.64bit 2004-08-04 05:08:06.604109384 +0200
+++ libmikmod-3.1.11/include/mikmod_internals.h 2004-08-04 05:09:56.700372208 +0200
@@ -50,7 +50,8 @@
/*========== More type definitions */
/* SLONGLONG: 64bit, signed */
-#if defined (__arch64__) || defined(__alpha)
+#include <stdint.h>
+#if __WORDSIZE == 64
typedef long SLONGLONG;
#define NATIVE_64BIT_INT
#elif defined(__WATCOMC__)
--- libmikmod-3.1.11/include/mikmod.h.in.64bit 2004-08-04 05:07:56.092707360 +0200
+++ libmikmod-3.1.11/include/mikmod.h.in 2004-08-04 05:09:06.217046840 +0200
@@ -85,7 +85,8 @@
@DOES_NOT_HAVE_SIGNED@
-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
+#include <stdint.h>
+#if __WORDSIZE == 64
/* 64 bit architectures */
typedef signed char SBYTE; /* 1 byte, signed */
libmikmod-esd.patch:
--- NEW FILE libmikmod-esd.patch ---
--- libmikmod-3.1.11/drivers/drv_esd.c.esd 2004-08-04 05:04:58.990630968 +0200
+++ libmikmod-3.1.11/drivers/drv_esd.c 2004-08-04 05:05:32.940469808 +0200
@@ -127,20 +127,19 @@
/* I hope to have this function integrated into libesd someday...*/
static ssize_t esd_writebuf(int fd,const void *buffer,size_t count)
{
- ssize_t start=0;
+ ssize_t res;
- while (start<count) {
- ssize_t res;
+ res=write(fd,(char*)buffer,count);
+ if (res<0)
+ switch (errno) {
+ case EAGAIN:
+ return 0;
+ case EPIPE:
+ /* connection lost */
+ return -1-res;
+ }
- res=write(fd,(char*)buffer+start,count-start);
- if (res<0) {
- /* connection lost */
- if (errno==EPIPE)
- return -1-start;
- } else
- start+=res;
- }
- return start;
+ return res;
}
static void ESD_CommandLine(CHAR *cmdline)
@@ -193,6 +192,7 @@
_mm_errno=MMERR_OPENING_AUDIO;
return 1;
}
+ fcntl(sndfd, F_SETFL, fcntl(sndfd, F_GETFL) | O_NONBLOCK);
} else {
_mm_errno=MMERR_OUT_OF_MEMORY;
return 1;
@@ -234,19 +234,22 @@
#endif
}
-static void ESD_Update_internal(int count)
+static void ESD_Update(void)
{
static time_t losttime;
+ int done;
if (sndfd>=0) {
- if (esd_writebuf(sndfd,audiobuffer,count)<0) {
+ done=esd_writebuf(sndfd,audiobuffer,ESD_BUF_SIZE);
+ if (done<0) {
/* if we lost our connection with esd, clean up and work as the
nosound driver until we can reconnect */
esd_closestream(sndfd);
sndfd=-1;
signal(SIGPIPE,SIG_DFL);
losttime=time(NULL);
- }
+ } else
+ VC_WriteBytes(audiobuffer,done);
} else {
/* an alarm would be better, but then the library user could not use
alarm(2) himself... */
@@ -255,31 +258,32 @@
/* Attempt to reconnect every 5 seconds */
if (!(SETENV))
if ((sndfd=esd_playstream(format,md_mixfreq,espeaker,"libmikmod"))>=0) {
- VC_SilenceBytes(audiobuffer,ESD_BUF_SIZE);
- esd_writebuf(sndfd,audiobuffer,ESD_BUF_SIZE);
+ fcntl(sndfd, F_SETFL, fcntl(sndfd, F_GETFL) | O_NONBLOCK);
+ done=esd_writebuf(sndfd,audiobuffer,ESD_BUF_SIZE);
+ if(done>0)
+ VC_SilenceBytes(audiobuffer,done);
}
}
}
}
-static void ESD_Update(void)
-{
- ESD_Update_internal(VC_WriteBytes(audiobuffer,ESD_BUF_SIZE));
-}
-
static void ESD_Pause(void)
{
- ESD_Update_internal(VC_SilenceBytes(audiobuffer,ESD_BUF_SIZE));
+ VC_SilenceBytes(audiobuffer,ESD_BUF_SIZE);
}
static BOOL ESD_PlayStart(void)
{
+ int done;
+
if (sndfd<0)
- if (!(SETENV))
+ if (!(SETENV)) {
if ((sndfd=esd_playstream(format,md_mixfreq,espeaker,"libmikmod"))<0) {
_mm_errno=MMERR_OPENING_AUDIO;
return 1;
}
+ fcntl(sndfd, F_SETFL, fcntl(sndfd, F_GETFL) | O_NONBLOCK);
+ }
/* since the default behaviour of SIGPIPE on most Unices is to kill the
program, we'll prefer handle EPIPE ourselves should the esd die - recent
esdlib use a do-nothing handler, which prevents us from receiving EPIPE,
@@ -287,18 +291,20 @@
signal(SIGPIPE,SIG_IGN);
/* silence buffers */
- VC_SilenceBytes(audiobuffer,ESD_BUF_SIZE);
- esd_writebuf(sndfd,audiobuffer,ESD_BUF_SIZE);
+ done=esd_writebuf(sndfd,audiobuffer,ESD_BUF_SIZE);
+ VC_SilenceBytes(audiobuffer,done);
return VC_PlayStart();
}
static void ESD_PlayStop(void)
{
+ int done;
+
if (sndfd>=0) {
/* silence buffers */
- VC_SilenceBytes(audiobuffer,ESD_BUF_SIZE);
- esd_writebuf(sndfd,audiobuffer,ESD_BUF_SIZE);
+ done=esd_writebuf(sndfd,audiobuffer,ESD_BUF_SIZE);
+ VC_SilenceBytes(audiobuffer,done);
signal(SIGPIPE,SIG_DFL);
}
libmikmod-rpath.patch:
--- NEW FILE libmikmod-rpath.patch ---
diff -up mikmod-3.2.2-beta1/libmikmod-3.1.11/libmikmod/Makefile.in.rpath mikmod-3.2.2-beta1/libmikmod-3.1.11/libmikmod/Makefile.in
--- libmikmod-3.1.11/libmikmod/Makefile.in.rpath 2007-09-19 09:46:49.000000000 +0200
+++ libmikmod-3.1.11/libmikmod/Makefile.in 2007-09-19 09:51:45.000000000 +0200
@@ -30,20 +30,20 @@ MKINSTALLDIRS=${top_srcdir}/mkinstalldir
DEFS=@DEFS@
CFLAGS=@CFLAGS@ -Dunix
-COMPILE=$(LIBTOOL) --silent --mode=compile $(CC) $(DEFS) $(CFLAGS) -I$(top_srcdir)/include -I$(top_builddir) -I$(top_builddir)/include -DMIKMOD_H=$(top_srcdir)/include/mikmod.h
+COMPILE=$(CC) $(DEFS) $(CFLAGS) -I$(top_srcdir)/include -I$(top_builddir) -I$(top_builddir)/include -DMIKMOD_H=$(top_srcdir)/include/mikmod.h -fPIC
-LIB = libmikmod.la
+LIB = libmikmod.a
OBJ = $(LIBOBJS) $(DLOBJS) \
- drv_AF.lo drv_aix.lo drv_alsa.lo drv_esd.lo drv_hp.lo drv_nos.lo \
- drv_oss.lo drv_pipe.lo drv_raw.lo drv_sam9407.lo drv_sgi.lo \
- drv_stdout.lo drv_sun.lo drv_ultra.lo drv_wav.lo \
- load_669.lo load_amf.lo load_dsm.lo load_far.lo load_gdm.lo load_it.lo \
- load_imf.lo load_m15.lo load_med.lo load_mod.lo load_mtm.lo load_okt.lo \
- load_s3m.lo load_stm.lo load_stx.lo load_ult.lo load_uni.lo load_xm.lo \
- mmalloc.lo mmerror.lo mmio.lo \
- mdriver.lo mdreg.lo mdulaw.lo mloader.lo mlreg.lo mlutil.lo mplayer.lo \
- munitrk.lo mwav.lo npertab.lo sloader.lo virtch.lo virtch2.lo \
- virtch_common.lo
+ drv_AF.o drv_aix.o drv_alsa.o drv_esd.o drv_hp.o drv_nos.o \
+ drv_oss.o drv_pipe.o drv_raw.o drv_sam9407.o drv_sgi.o \
+ drv_stdout.o drv_sun.o drv_ultra.o drv_wav.o \
+ load_669.o load_amf.o load_dsm.o load_far.o load_gdm.o load_it.o \
+ load_imf.o load_m15.o load_med.o load_mod.o load_mtm.o load_okt.o \
+ load_s3m.o load_stm.o load_stx.o load_ult.o load_uni.o load_xm.o \
+ mmalloc.o mmerror.o mmio.o \
+ mdriver.o mdreg.o mdulaw.o mloader.o mlreg.o mlutil.o mplayer.o \
+ munitrk.o mwav.o npertab.o sloader.o virtch.o virtch2.o \
+ virtch_common.o
DIST_FILES = $(top_srcdir)/libmikmod/Makefile.in
@@ -51,7 +51,10 @@ all: $(LIB)
install: $(LIB)
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(LIB) $(DESTDIR)$(libdir)
+ $(INSTALL) -m 755 $(LIB) $(DESTDIR)$(libdir)
+ $(INSTALL) -m 755 libmikmod.so.2.0.4 $(DESTDIR)$(libdir)
+ cp -d libmikmod.so.2 $(DESTDIR)$(libdir)
+ cp -d libmikmod.so $(DESTDIR)$(libdir)
uninstall: $(LIB)
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIB)
@@ -72,171 +75,174 @@ distclean: clean
rm -f Makefile
$(LIB): $(OBJ)
- $(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
+ $(AR) rcs $@ $(OBJ)
+ $(CC) -shared -Wl,-soname,libmikmod.so.2 -o libmikmod.so.2.0.4 $(OBJ)
+ ln -s libmikmod.so.2.0.4 libmikmod.so.2
+ ln -s libmikmod.so.2.0.4 libmikmod.so
-dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \
+dl_hpux.o: $(top_srcdir)/dlapi/dl_hpux.c \
$(top_srcdir)/dlapi/dlfcn.h
$(COMPILE) -c $(top_srcdir)/dlapi/dl_hpux.c
-drv_AF.lo: $(top_srcdir)/drivers/drv_AF.c \
+drv_AF.o: $(top_srcdir)/drivers/drv_AF.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_AF.c
-drv_aix.lo: $(top_srcdir)/drivers/drv_aix.c \
+drv_aix.o: $(top_srcdir)/drivers/drv_aix.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_aix.c
-drv_alsa.lo: $(top_srcdir)/drivers/drv_alsa.c \
+drv_alsa.o: $(top_srcdir)/drivers/drv_alsa.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_alsa.c
-drv_esd.lo: $(top_srcdir)/drivers/drv_esd.c \
+drv_esd.o: $(top_srcdir)/drivers/drv_esd.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_esd.c
-drv_hp.lo: $(top_srcdir)/drivers/drv_hp.c \
+drv_hp.o: $(top_srcdir)/drivers/drv_hp.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_hp.c
-drv_nos.lo: $(top_srcdir)/drivers/drv_nos.c \
+drv_nos.o: $(top_srcdir)/drivers/drv_nos.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_nos.c
-drv_pipe.lo: $(top_srcdir)/drivers/drv_pipe.c \
+drv_pipe.o: $(top_srcdir)/drivers/drv_pipe.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_pipe.c
-drv_oss.lo: $(top_srcdir)/drivers/drv_oss.c \
+drv_oss.o: $(top_srcdir)/drivers/drv_oss.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_oss.c
-drv_raw.lo: $(top_srcdir)/drivers/drv_raw.c \
+drv_raw.o: $(top_srcdir)/drivers/drv_raw.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_raw.c
-drv_sam9407.lo: $(top_srcdir)/drivers/drv_sam9407.c \
+drv_sam9407.o: $(top_srcdir)/drivers/drv_sam9407.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_sam9407.c
-drv_sgi.lo: $(top_srcdir)/drivers/drv_sgi.c \
+drv_sgi.o: $(top_srcdir)/drivers/drv_sgi.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_sgi.c
-drv_stdout.lo: $(top_srcdir)/drivers/drv_stdout.c \
+drv_stdout.o: $(top_srcdir)/drivers/drv_stdout.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_stdout.c
-drv_sun.lo: $(top_srcdir)/drivers/drv_sun.c \
+drv_sun.o: $(top_srcdir)/drivers/drv_sun.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_sun.c
-drv_ultra.lo: $(top_srcdir)/drivers/drv_ultra.c \
+drv_ultra.o: $(top_srcdir)/drivers/drv_ultra.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_ultra.c
-drv_wav.lo: $(top_srcdir)/drivers/drv_wav.c \
+drv_wav.o: $(top_srcdir)/drivers/drv_wav.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/drivers/drv_wav.c
-load_669.lo: $(top_srcdir)/loaders/load_669.c \
+load_669.o: $(top_srcdir)/loaders/load_669.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_669.c
-load_amf.lo: $(top_srcdir)/loaders/load_amf.c \
+load_amf.o: $(top_srcdir)/loaders/load_amf.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_amf.c
-load_dsm.lo: $(top_srcdir)/loaders/load_dsm.c \
+load_dsm.o: $(top_srcdir)/loaders/load_dsm.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_dsm.c
-load_far.lo: $(top_srcdir)/loaders/load_far.c \
+load_far.o: $(top_srcdir)/loaders/load_far.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_far.c
-load_gdm.lo: $(top_srcdir)/loaders/load_gdm.c \
+load_gdm.o: $(top_srcdir)/loaders/load_gdm.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_gdm.c
-load_it.lo: $(top_srcdir)/loaders/load_it.c \
+load_it.o: $(top_srcdir)/loaders/load_it.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_it.c
-load_imf.lo: $(top_srcdir)/loaders/load_imf.c \
+load_imf.o: $(top_srcdir)/loaders/load_imf.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_imf.c
-load_m15.lo: $(top_srcdir)/loaders/load_m15.c \
+load_m15.o: $(top_srcdir)/loaders/load_m15.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_m15.c
-load_med.lo: $(top_srcdir)/loaders/load_med.c \
+load_med.o: $(top_srcdir)/loaders/load_med.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_med.c
-load_mod.lo: $(top_srcdir)/loaders/load_mod.c \
+load_mod.o: $(top_srcdir)/loaders/load_mod.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_mod.c
-load_mtm.lo: $(top_srcdir)/loaders/load_mtm.c \
+load_mtm.o: $(top_srcdir)/loaders/load_mtm.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_mtm.c
-load_okt.lo: $(top_srcdir)/loaders/load_okt.c \
+load_okt.o: $(top_srcdir)/loaders/load_okt.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_okt.c
-load_s3m.lo: $(top_srcdir)/loaders/load_s3m.c \
+load_s3m.o: $(top_srcdir)/loaders/load_s3m.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_s3m.c
-load_stm.lo: $(top_srcdir)/loaders/load_stm.c \
+load_stm.o: $(top_srcdir)/loaders/load_stm.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_stm.c
-load_stx.lo: $(top_srcdir)/loaders/load_stx.c \
+load_stx.o: $(top_srcdir)/loaders/load_stx.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_stx.c
-load_ult.lo: $(top_srcdir)/loaders/load_ult.c \
+load_ult.o: $(top_srcdir)/loaders/load_ult.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_ult.c
-load_uni.lo: $(top_srcdir)/loaders/load_uni.c \
+load_uni.o: $(top_srcdir)/loaders/load_uni.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_uni.c
-load_xm.lo: $(top_srcdir)/loaders/load_xm.c \
+load_xm.o: $(top_srcdir)/loaders/load_xm.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/loaders/load_xm.c
-mmalloc.lo: $(top_srcdir)/mmio/mmalloc.c \
+mmalloc.o: $(top_srcdir)/mmio/mmalloc.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/mmio/mmalloc.c
-mmerror.lo: $(top_srcdir)/mmio/mmerror.c \
+mmerror.o: $(top_srcdir)/mmio/mmerror.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/mmio/mmerror.c
-mmio.lo: $(top_srcdir)/mmio/mmio.c \
+mmio.o: $(top_srcdir)/mmio/mmio.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/mmio/mmio.c
-mdriver.lo: $(top_srcdir)/playercode/mdriver.c \
+mdriver.o: $(top_srcdir)/playercode/mdriver.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/mdriver.c
-mdreg.lo: $(top_srcdir)/playercode/mdreg.c \
+mdreg.o: $(top_srcdir)/playercode/mdreg.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/mdreg.c
-mdulaw.lo: $(top_srcdir)/playercode/mdulaw.c \
+mdulaw.o: $(top_srcdir)/playercode/mdulaw.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/mdulaw.c
-mloader.lo: $(top_srcdir)/playercode/mloader.c \
+mloader.o: $(top_srcdir)/playercode/mloader.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/mloader.c
-mlreg.lo: $(top_srcdir)/playercode/mlreg.c \
+mlreg.o: $(top_srcdir)/playercode/mlreg.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/mlreg.c
-mlutil.lo: $(top_srcdir)/playercode/mlutil.c \
+mlutil.o: $(top_srcdir)/playercode/mlutil.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/mlutil.c
-mplayer.lo: $(top_srcdir)/playercode/mplayer.c \
+mplayer.o: $(top_srcdir)/playercode/mplayer.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/mplayer.c
-munitrk.lo: $(top_srcdir)/playercode/munitrk.c \
+munitrk.o: $(top_srcdir)/playercode/munitrk.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/munitrk.c
-mwav.lo: $(top_srcdir)/playercode/mwav.c \
+mwav.o: $(top_srcdir)/playercode/mwav.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/mwav.c
-npertab.lo: $(top_srcdir)/playercode/npertab.c \
+npertab.o: $(top_srcdir)/playercode/npertab.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/npertab.c
-sloader.lo: $(top_srcdir)/playercode/sloader.c \
+sloader.o: $(top_srcdir)/playercode/sloader.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/sloader.c
-virtch.lo: $(top_srcdir)/playercode/virtch.c $(top_srcdir)/playercode/virtch_common.c \
+virtch.o: $(top_srcdir)/playercode/virtch.c $(top_srcdir)/playercode/virtch_common.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/virtch.c
-virtch2.lo: $(top_srcdir)/playercode/virtch2.c $(top_srcdir)/playercode/virtch_common.c \
+virtch2.o: $(top_srcdir)/playercode/virtch2.c $(top_srcdir)/playercode/virtch_common.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/virtch2.c
-virtch_common.lo: $(top_srcdir)/playercode/virtch_common.c \
+virtch_common.o: $(top_srcdir)/playercode/virtch_common.c \
$(top_builddir)/include/mikmod.h $(top_srcdir)/include/mikmod_internals.h
$(COMPILE) -c $(top_srcdir)/playercode/virtch_common.c
-strcasecmp.lo: $(top_srcdir)/posix/strcasecmp.c
+strcasecmp.o: $(top_srcdir)/posix/strcasecmp.c
$(COMPILE) -c $(top_srcdir)/posix/strcasecmp.c
-strdup.lo: $(top_srcdir)/posix/strdup.c
+strdup.o: $(top_srcdir)/posix/strdup.c
$(COMPILE) -c $(top_srcdir)/posix/strdup.c
-strstr.lo: $(top_srcdir)/posix/strstr.c
+strstr.o: $(top_srcdir)/posix/strstr.c
$(COMPILE) -c $(top_srcdir)/posix/strstr.c
libmikmod-strip-lib.patch:
--- NEW FILE libmikmod-strip-lib.patch ---
--- libmikmod-3.1.11/libmikmod/Makefile.in.old 2004-01-21 18:43:52.000000000 +0100
+++ libmikmod-3.1.11/libmikmod/Makefile.in 2004-12-22 11:44:28.143658832 +0100
@@ -51,7 +51,7 @@
install: $(LIB)
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
- $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(LIB) $(DESTDIR)$(libdir)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(LIB) $(DESTDIR)$(libdir)
uninstall: $(LIB)
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIB)
--- NEW FILE libmikmod.spec ---
Summary: A MOD music file player library
Name: libmikmod
Version: 3.1.11
Release: 2%{?dist}
License: GPLv2 and LGPLv2+
Group: Applications/Multimedia
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: esound-devel
URL: http://mikmod.raphnet.net/
Source0: http://mikmod.raphnet.net/files/libmikmod-%{version}.tar.gz
# patch has been updated to ship only fuctional stuff
Patch0: http://mikmod.raphnet.net/files/libmikmod-%{version}-a.diff
Patch1: libmikmod-esd.patch
Patch2: libmikmod-64bit.patch
Patch3: libmikmod-strip-lib.patch
Patch4: libmikmod-rpath.patch
%description
libmikmod is a library used by the mikmod MOD music file player for
UNIX-like systems. Supported file formats include MOD, STM, S3M, MTM,
XM, ULT and IT.
%package devel
Group: Development/Libraries
Summary: Header files and documentation for compiling mikmod applications
Requires: %{name} = %{version}-%{release}
%description devel
This package includes the header files you will need to compile
applications for mikmod.
%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .esd
%patch2 -p1 -b .64bit
%patch3 -p1 -b .lib-strip
%patch4 -p1 -b .rpath
%build
%configure
make %{?_smp_flags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
rm -f $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT%{_libdir}/*.a
find $RPM_BUILD_ROOT | grep "\\.la$" | xargs rm -f
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%post devel
[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/mikmod.info %{_infodir}/dir || :
%postun -p /sbin/ldconfig
%postun devel
if [ $1 = 0 ] ; then
[ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/mikmod.info %{_infodir}/dir || :
fi
%files
%defattr(-, root, root)
%doc AUTHORS COPYING.LIB COPYING.LESSER NEWS README TODO
%{_libdir}/*.so.*
%files devel
%defattr(-, root, root)
%{_bindir}/*-config
%{_libdir}/*.so
%{_datadir}/aclocal/*
%{_includedir}/*
%{_infodir}/mikmod*
%{_mandir}/man1/libmikmod-config*
%changelog
* Tue Oct 23 2007 Jindrich Novy <jnovy at redhat.com> 3.1.11-2
- update description
- add smp_flags to make
- don't ship static library
- update upstream patch, drop texinfo dependency (thanks to Stepan Kasal)
* Wed Oct 18 2007 Jindrich Novy <jnovy at redhat.com> 3.1.11-1
- package libmikmod
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmikmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Oct 2007 17:53:09 -0000 1.1
+++ .cvsignore 24 Oct 2007 07:52:21 -0000 1.2
@@ -0,0 +1 @@
+libmikmod-3.1.11.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmikmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Oct 2007 17:53:09 -0000 1.1
+++ sources 24 Oct 2007 07:52:21 -0000 1.2
@@ -0,0 +1 @@
+705106da305e8de191549f1e7393185c libmikmod-3.1.11.tar.gz
More information about the fedora-extras-commits
mailing list