Author: baby-guest
Date: 2007-08-02 15:59:25 +0000 (Thu, 02 Aug 2007)
New Revision: 3530
Modified:
packages/trunk/fenix-plugins/debian/Makefile.plugins
packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch
packages/trunk/fenix-plugins/debian/patches/series
Log:
Added mixer
Modified: packages/trunk/fenix-plugins/debian/Makefile.plugins
===================================================================
--- packages/trunk/fenix-plugins/debian/Makefile.plugins 2007-08-02
15:50:11 UTC (rev 3529)
+++ packages/trunk/fenix-plugins/debian/Makefile.plugins 2007-08-02
15:59:25 UTC (rev 3530)
@@ -1,5 +1,5 @@
all: plugins/agua.so plugins/fgfx.so plugins/fire.so plugins/image.so \
- plugins/net.so plugins/ttf.so plugins/mpeg.so plugins/exec.so
+ plugins/net.so plugins/ttf.so plugins/mpeg.so plugins/mixer.so
plugins/exec.so
distclean:
for i in */; do [ ! -f "$$i/Makefile" ] || $(MAKE) -C "$$i" distclean
|| exit 1 ; done
@@ -52,6 +52,10 @@
make -C mpeg-1.0
cp mpeg-1.0/.libs/libmpeg.so "$@"
+plugins/mixer.so: plugins mixer-1.0/configure mixer-1.0/config.status
+ make -C mixer-1.0
+ cp mixer-1.0/.libs/libmixer.so "$@"
+
plugins/ttf.so: plugins ttf-1.0/configure ttf-1.0/config.status
make -C ttf-1.0
cp ttf-1.0/.libs/libttf.so "$@"
Modified: packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch 2007-08-02
15:50:11 UTC (rev 3529)
+++ packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch 2007-08-02
15:59:25 UTC (rev 3530)
@@ -1,15 +1,29 @@
+diff -ruN fenix-plugins-0.0.20070801.orig/mixer-1.0/Makefile.am
fenix-plugins-0.0.20070801/mixer-1.0/Makefile.am
+--- fenix-plugins-0.0.20070801.orig/mixer-1.0/Makefile.am 2007-07-31
18:46:56.000000000 +0000
++++ fenix-plugins-0.0.20070801/mixer-1.0/Makefile.am 2007-08-02
15:52:52.000000000 +0000
+@@ -7,7 +7,7 @@
+ libmixer_la_SOURCES = mixer.c wav.c
+ libmixer_la_CFLAGS = $(SDL_CFLAGS) $(VORBIS_CFLAGS) -I/include $(OGG_CFLAGS)
+ libmixer_la_LDFLAGS = -s -module -no-undefined -avoid-version -export-symbols
fenixdll.sym
+-libmixer_la_LIBADD = $(LIBADD_DL) -L/lib -ldumb -ldmogg $(SDL_LIBS)
$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS)
++libmixer_la_LIBADD = $(LIBADD_DL) -L/lib -ldumb $(SDL_LIBS)
$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS)
+
+ ## Make sure these will be cleaned even when they're not built by
+ ## default.
diff -ruN fenix-plugins-0.0.20070801.orig/mixer-1.0/mixer.c
fenix-plugins-0.0.20070801/mixer-1.0/mixer.c
---- fenix-plugins-0.0.20070801.orig/mixer-1.0/mixer.c 2007-08-02
15:45:31.000000000 +0000
-+++ fenix-plugins-0.0.20070801/mixer-1.0/mixer.c 2007-08-02
15:45:43.000000000 +0000
-@@ -30,7 +30,6 @@
+--- fenix-plugins-0.0.20070801.orig/mixer-1.0/mixer.c 2007-07-31
18:46:56.000000000 +0000
++++ fenix-plugins-0.0.20070801/mixer-1.0/mixer.c 2007-08-02
15:52:26.000000000 +0000
+@@ -29,8 +29,7 @@
+ * DESCRIPTION : Sound Mixer DLL
*/
- #include <dumb.h>
--#include <dumbogg.h>
+-#include "dumb.h"
+-#include "dumbogg.h"
++#include <dumb.h>
#include "wav.h"
- #include <fenix/fxdll.h>
-@@ -167,7 +166,7 @@
+ #include <fxdll.h>
+@@ -163,7 +162,7 @@
@@ -19,9 +33,9 @@
return file_read (f, ptr, n);
diff -ruN fenix-plugins-0.0.20070801.orig/mixer-1.0/wav.c
fenix-plugins-0.0.20070801/mixer-1.0/wav.c
---- fenix-plugins-0.0.20070801.orig/mixer-1.0/wav.c 2007-08-02
15:45:31.000000000 +0000
-+++ fenix-plugins-0.0.20070801/mixer-1.0/wav.c 2007-08-02 15:45:43.000000000
+0000
-@@ -98,7 +93,7 @@
+--- fenix-plugins-0.0.20070801.orig/mixer-1.0/wav.c 2007-07-31
18:46:56.000000000 +0000
++++ fenix-plugins-0.0.20070801/mixer-1.0/wav.c 2007-08-02 15:51:49.000000000
+0000
+@@ -93,7 +93,7 @@
unsigned long data_size;
@@ -30,7 +44,7 @@
-@@ -107,14 +102,14 @@
+@@ -102,14 +102,14 @@
file_getnc_mixer(&size,4,fp);
//SIZE
@@ -47,7 +61,7 @@
file_getnc_mixer(&chunkSize,4,fp);
-@@ -126,7 +121,7 @@
+@@ -121,7 +121,7 @@
file_getnc_mixer(&wBitsPerSample,2,fp);
//bits per sample
Modified: packages/trunk/fenix-plugins/debian/patches/series
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/series 2007-08-02 15:50:11 UTC
(rev 3529)
+++ packages/trunk/fenix-plugins/debian/patches/series 2007-08-02 15:59:25 UTC
(rev 3530)
@@ -1,4 +1,5 @@
include.patch
fire_random.patch
+mixer_fix.patch
fxdll_version.patch
fenixdll_sym.patch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
