Author: baby-guest
Date: 2007-08-02 22:07:11 +0000 (Thu, 02 Aug 2007)
New Revision: 3532
Added:
packages/trunk/fenix-plugins/debian/patches/agua_fix.patch
packages/trunk/fenix-plugins/debian/patches/fire_fix.patch
packages/trunk/fenix-plugins/debian/patches/ttf_fix.patch
Removed:
packages/trunk/fenix-plugins/debian/patches/fire_random.patch
Modified:
packages/trunk/fenix-plugins/debian/Makefile.plugins
packages/trunk/fenix-plugins/debian/control
packages/trunk/fenix-plugins/debian/patches/include.patch
packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch
packages/trunk/fenix-plugins/debian/patches/series
packages/trunk/fenix-plugins/debian/rules
Log:
Added some plugins and fixed the build system
Modified: packages/trunk/fenix-plugins/debian/Makefile.plugins
===================================================================
--- packages/trunk/fenix-plugins/debian/Makefile.plugins 2007-08-02
16:01:44 UTC (rev 3531)
+++ packages/trunk/fenix-plugins/debian/Makefile.plugins 2007-08-02
22:07:11 UTC (rev 3532)
@@ -1,27 +1,35 @@
-all: plugins/agua.so plugins/fgfx.so plugins/fire.so plugins/image.so \
- plugins/net.so plugins/ttf.so plugins/mpeg.so plugins/mixer.so
plugins/exec.so
+FXC="fenix-fxc"
+FXI="fenix-fxi"
-distclean:
+all: plugins/ttf.so plugins/agua.so plugins/fgfx.so plugins/fire.so
plugins/image.so \
+ plugins/net.so plugins/mpeg.so plugins/mixer.so plugins/exec.so
+
+distclean: clean_tests
+ @printf "\n == CLEAN: $@ ==\n\n"
for i in */; do [ ! -f "$$i/Makefile" ] || $(MAKE) -C "$$i" distclean
|| exit 1 ; done
rm -f plugins/*
-clean:
+clean: clean_tests
+ @printf "\n == CLEAN: $@ ==\n\n"
for i in */; do [ ! -f "$$i/Makefile" ] || $(MAKE) -C "$$i" clean ||
exit 1 ; done
+clean_tests:
+ @printf "\n == CLEAN: $@ ==\n\n"
+ rm -f test_*.prg test_*.dcb
+
%/configure: %/configure.ac
+ @printf "\n == CONFIGURE: $@ ==\n\n"
cd `echo $@ | sed -e "s|/configure||"` && \
autoreconf --force --verbose
touch "$@"
%/config.status: %/configure
+ @printf "\n == CONFIGURE: $@ ==\n\n"
cd `echo $@ | sed -e "s|/config.status||"` && \
- ./configure CFLAGS="$(CFLAGS)" \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
+ ./configure CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
$(CONFFLAGS) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-ft-prefix=/usr/include \
--with-vorbis-includes=/usr/include/vorbis/
touch "$@"
@@ -29,42 +37,54 @@
mkdir -p plugins
plugins/agua.so: plugins agua-1.0/configure agua-1.0/config.status
+ @printf "\n == BUILD: $@ ==\n\n"
make -C agua-1.0
cp agua-1.0/.libs/libagua.so "$@"
plugins/fgfx.so: plugins fgfx-1.0/configure fgfx-1.0/config.status
+ @printf "\n == BUILD: $@ ==\n\n"
make -C fgfx-1.0
cp fgfx-1.0/.libs/libfgfx.so "$@"
plugins/fire.so: plugins fire-1.0/configure fire-1.0/config.status
+ @printf "\n == BUILD: $@ ==\n\n"
make -C fire-1.0
cp fire-1.0/.libs/libfire.so "$@"
plugins/image.so: plugins image-1.0/configure image-1.0/config.status
+ @printf "\n == BUILD: $@ ==\n\n"
make -C image-1.0
cp image-1.0/.libs/libimage.so "$@"
plugins/net.so: plugins net-1.0/configure net-1.0/config.status
+ @printf "\n == BUILD: $@ ==\n\n"
make -C net-1.0
cp net-1.0/.libs/libnet.so "$@"
plugins/mpeg.so: plugins mpeg-1.0/configure mpeg-1.0/config.status
+ @printf "\n == BUILD: $@ ==\n\n"
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
+ @printf "\n == BUILD: $@ ==\n\n"
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
+ @printf "\n == BUILD: $@ ==\n\n"
make -C ttf-1.0
cp ttf-1.0/.libs/libttf.so "$@"
plugins/exec.so: plugins exec-0.4a/configure exec-0.4a/config.status
+ @printf "\n == BUILD: $@ ==\n\n"
make -C exec-0.4a
cp exec-0.4a/.libs/libexec.so "$@"
-check:
+check: check_symbols test_load.dcb
+
+check_symbols:
+ @printf "\n == CHECK: $@ ==\n\n"
@for i in plugins/*.so; do \
if objdump -T "$$i" | grep "RegisterFunctions" >/dev/null ;
then \
echo \"$$i\" has the dynamic symbol
\"RegisterFunctions\" \[OK\] ; \
@@ -83,10 +103,39 @@
fi \
done
+.SUFFIXES: .prg .dcb
+
+.prg.dcb:
+ @printf "\n == CHECK: $@ ==\n\n"
+ $(FXC) $< -o $@
+
+test_load.prg:
+ echo "PROGRAM TestLoad;" > $@
+ for i in plugins/*.so; do \
+ echo "IMPORT \"`echo \"$$i\" | sed -e \"s/.so//\"`\"" >> $@ ; \
+ done
+ echo "GLOBAL" >> $@
+ echo "BEGIN" >> $@
+ echo "END" >> $@
+
update-config:
+ @printf "\n == CONFIGURE: $@ ==\n\n"
for i in */ ; do \
if [ -e "$$i/configure.ac" ]; then \
- cp -f /usr/share/misc/config.sub "$$i/config.sub" ; \
- cp -f /usr/share/misc/config.guess "$$i/config.guess" ;
\
+ echo "Copying config.sub and config.guess files in
\"$$i\"" ; \
+ test -e /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub
"$$i/config.sub" ; \
+ test -e /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess
"$$i/config.guess" ; \
fi \
done
+
+configure: update-config
+ @printf "\n == CONFIGURE: $@ ==\n\n"
+ for i in */ ; do \
+ if [ -e "$$i/configure.ac" ]; then \
+ printf "\n - Creating autotools files in \"$$i\" -\n\n"
; \
+ cd "$$i" && autoreconf --force --verbose || exit 1 ; \
+ cd - ; \
+ fi \
+ done
Modified: packages/trunk/fenix-plugins/debian/control
===================================================================
--- packages/trunk/fenix-plugins/debian/control 2007-08-02 16:01:44 UTC (rev
3531)
+++ packages/trunk/fenix-plugins/debian/control 2007-08-02 22:07:11 UTC (rev
3532)
@@ -4,7 +4,7 @@
Maintainer: Miriam Ruiz <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5), quilt,
autotools-dev, autoconf, automake1.10 | automake1.9,
- libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev,
+ zlib1g-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev,
libsmpeg-dev, libvorbis-dev, libfreetype6-dev, libdumb1-dev,
fenix, fenix-dev
Standards-Version: 3.7.2
Added: packages/trunk/fenix-plugins/debian/patches/agua_fix.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/agua_fix.patch
(rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/agua_fix.patch 2007-08-02
22:07:11 UTC (rev 3532)
@@ -0,0 +1,11 @@
+--- fenix-plugins-0.0.20070801.orig/agua-1.0/Makefile.am
++++ fenix-plugins-0.0.20070801/agua-1.0/Makefile.am
+@@ -7,7 +7,7 @@
+ libagua_la_SOURCES = agua.c
+ libagua_la_CFLAGS = $(SDL_CFLAGS)
+ libagua_la_LDFLAGS = -s -module -no-undefined -avoid-version -export-symbols
fenixdll.sym
+-libagua_la_LIBADD = $(LIBADD_DL) $(SDL_LIBS)
++libagua_la_LIBADD = -lm $(LIBADD_DL) $(SDL_LIBS)
+
+ ## Make sure these will be cleaned even when they're not built by
+ ## default.
Copied: packages/trunk/fenix-plugins/debian/patches/fire_fix.patch (from rev
3529, packages/trunk/fenix-plugins/debian/patches/fire_random.patch)
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/fire_fix.patch
(rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/fire_fix.patch 2007-08-02
22:07:11 UTC (rev 3532)
@@ -0,0 +1,20 @@
+--- fenix-plugins-0.0.20070801.orig/fire-1.0/fire.c
++++ fenix-plugins-0.0.20070801/fire-1.0/fire.c
+@@ -76,7 +76,7 @@
+ return gr ;
+ }
+
+-int random(int num1, int num2)
++static int priv_random(int num1, int num2)
+ {
+ return num1 + (int)(((double)(num2-num1+1) * rand()) / (RAND_MAX+1.0)) ;
+ }
+@@ -110,7 +110,7 @@
+
+ x=T->StartP;
+ while(x<T->FireX){
+- Sint16 F = T->FireS[(y*T->FireX)+x] +
random(T->IntPMin,T->IntPMax);
++ Sint16 F = T->FireS[(y*T->FireX)+x] +
priv_random(T->IntPMin,T->IntPMax);
+ if (F<0)F=0;
+ if (F>255)F=255;
+ for(i=x+T->FuelP;x<i && x<T->FireX;x++)
Deleted: packages/trunk/fenix-plugins/debian/patches/fire_random.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/fire_random.patch
2007-08-02 16:01:44 UTC (rev 3531)
+++ packages/trunk/fenix-plugins/debian/patches/fire_random.patch
2007-08-02 22:07:11 UTC (rev 3532)
@@ -1,20 +0,0 @@
---- fenix-plugins.orig/fire-1.0/fire.c 2007-07-31 20:15:07.472026649 +0000
-+++ fenix-plugins/fire-1.0/fire.c 2007-07-31 20:14:31.121754899 +0000
-@@ -76,7 +76,7 @@
- return gr ;
- }
-
--int random(int num1, int num2)
-+static int priv_random(int num1, int num2)
- {
- return num1 + (int)(((double)(num2-num1+1) * rand()) / (RAND_MAX+1.0)) ;
- }
-@@ -110,7 +110,7 @@
-
- x=T->StartP;
- while(x<T->FireX){
-- Sint16 F = T->FireS[(y*T->FireX)+x] +
random(T->IntPMin,T->IntPMax);
-+ Sint16 F = T->FireS[(y*T->FireX)+x] +
priv_random(T->IntPMin,T->IntPMax);
- if (F<0)F=0;
- if (F>255)F=255;
- for(i=x+T->FuelP;x<i && x<T->FireX;x++)
Modified: packages/trunk/fenix-plugins/debian/patches/include.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/include.patch 2007-08-02
16:01:44 UTC (rev 3531)
+++ packages/trunk/fenix-plugins/debian/patches/include.patch 2007-08-02
22:07:11 UTC (rev 3532)
@@ -67,13 +67,18 @@
diff -ruN fenix-plugins.orig/mixer-1.0/mixer.c fenix-plugins/mixer-1.0/mixer.c
--- fenix-plugins.orig/mixer-1.0/mixer.c 2007-07-31 18:46:56.000000000
+0000
+++ fenix-plugins/mixer-1.0/mixer.c 2007-08-01 20:03:27.597791553 +0000
-@@ -29,11 +29,10 @@
+@@ -29,11 +29,15 @@
* DESCRIPTION : Sound Mixer DLL
*/
-#include "dumb.h"
-#include "dumbogg.h"
+#include <dumb.h>
++
++#ifdef USE_DUMBOGG
++#include <dumbogg.h>
++#endif
++
#include "wav.h"
-#include <fxdll.h>
Modified: packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch 2007-08-02
16:01:44 UTC (rev 3531)
+++ packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch 2007-08-02
22:07:11 UTC (rev 3532)
@@ -1,6 +1,5 @@
-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
+--- fenix-plugins-0.0.20070801.orig/mixer-1.0/Makefile.am
++++ fenix-plugins-0.0.20070801/mixer-1.0/Makefile.am
@@ -7,7 +7,7 @@
libmixer_la_SOURCES = mixer.c wav.c
libmixer_la_CFLAGS = $(SDL_CFLAGS) $(VORBIS_CFLAGS) -I/include $(OGG_CFLAGS)
@@ -10,10 +9,9 @@
## 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-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
-@@ -163,7 +162,7 @@
+--- fenix-plugins-0.0.20070801.orig/mixer-1.0/mixer.c
++++ fenix-plugins-0.0.20070801/mixer-1.0/mixer.c
+@@ -163,7 +163,7 @@
@@ -22,9 +20,55 @@
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-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
+@@ -262,33 +262,22 @@
+ fn=string_get(params[0]);
+ string_discard(params[0]);
+
+- music_load->duh = dumb_load_wav(fn);
+- if (!music_load->duh) {
++ if ((music_load->duh = dumb_load_wav(fn))) goto music_loaded;
++ if ((music_load->duh = dumb_load_xm(fn))) goto music_loaded;
++ if ((music_load->duh = dumb_load_it(fn))) goto music_loaded;
++ if ((music_load->duh = dumb_load_mod(fn))) goto music_loaded;
++#ifdef USE_DUMBOGG
++ if ((music_load->duh = dumb_load_ogg(fn,0))) goto music_loaded;
++#endif
++ if ((music_load->duh = dumb_load_s3m(fn))) goto music_loaded;
+
+- music_load->duh = dumb_load_xm(fn);
+- if (!music_load->duh) {
+- music_load->duh = dumb_load_it(fn);
+-
+- if (!music_load->duh) {
+-
+- music_load->duh = dumb_load_mod(fn);
+- if (!music_load->duh) {
+-
+- music_load->duh =
dumb_load_ogg(fn,0);
+- if (!music_load->duh) {
+-
+- music_load->duh=
dumb_load_s3m(fn);
+-
+- if (!music_load->duh) {
+-
gr_con_printf ("Unable to open the file\n") ;
+- return
-1;
+- }
+- }
+- }
+- }
+- }
++ if (!music_load->duh) {
++ gr_con_printf ("Unable to open the file\n") ;
++ return -1;
+ }
+
++ music_loaded:
++
+ i=music_load->num;
+
+ music_load->next=malloc(sizeof(MMusic));
+--- fenix-plugins-0.0.20070801.orig/mixer-1.0/wav.c
++++ fenix-plugins-0.0.20070801/mixer-1.0/wav.c
@@ -93,7 +93,7 @@
unsigned long data_size;
Modified: packages/trunk/fenix-plugins/debian/patches/series
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/series 2007-08-02 16:01:44 UTC
(rev 3531)
+++ packages/trunk/fenix-plugins/debian/patches/series 2007-08-02 22:07:11 UTC
(rev 3532)
@@ -1,5 +1,7 @@
+agua_fix.patch
+fire_fix.patch
+mixer_fix.patch
+ttf_fix.patch
include.patch
-fire_random.patch
-mixer_fix.patch
fxdll_version.patch
fenixdll_sym.patch
Added: packages/trunk/fenix-plugins/debian/patches/ttf_fix.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/ttf_fix.patch
(rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/ttf_fix.patch 2007-08-02
22:07:11 UTC (rev 3532)
@@ -0,0 +1,26 @@
+--- fenix-plugins-0.0.20070801.orig/ttf-1.0/configure.ac
++++ fenix-plugins-0.0.20070801/ttf-1.0/configure.ac
+@@ -24,18 +24,16 @@
+
+ echo "You Machine: ${target_cpu} ${target_os}"
+
+-AC_ARG_WITH(fenix-prefix,[ --with-fenix-prefix=PFX Prefix where Fenix is
installed (optional)],
+- fenix_prefix="$withval", fenix_prefix="/opt/Fenix")
++AC_ARG_WITH(fenix-include,[ --with-fenix-include=DIR Directory where Fenix
headers are installed (optional)],
++ fenix_inc="$withval", fenix_inc="/usr/include/fenix")
+
+-AC_ARG_WITH(ft-prefix, [ --with-ft-prefix=PREFIX Prefix where FreeType is
installed (optional)],
+- ft_prefix="$withval", ft_prefix="")
+-
+-CFLAGS="$CFLAGS -I${fenix_prefix}/include -I${fenix_prefix}/fxi/inc
-I/usr/local/include -I${ft_prefix}/freetype2 -DUSE_FREETYPE2_STATIC"
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
++CFLAGS="$CFLAGS -I${fenix_inc} -DUSE_FREETYPE2_STATIC"
++LDFLAGS="$LDFLAGS"
+
+ # Check for SDL library
+ SDL_VERSION=1.2.0
+ AM_PATH_SDL($SDL_VERSION,:,AC_MSG_ERROR([*** SDL version $SDL_VERSION not
found!]))
++AC_CHECK_FT2
+
+ # Checks for libraries.
+ AC_CHECK_LIB(freetype, FT_Init_FreeType)
Modified: packages/trunk/fenix-plugins/debian/rules
===================================================================
--- packages/trunk/fenix-plugins/debian/rules 2007-08-02 16:01:44 UTC (rev
3531)
+++ packages/trunk/fenix-plugins/debian/rules 2007-08-02 22:07:11 UTC (rev
3532)
@@ -34,7 +34,9 @@
build: build-stamp
build-stamp: configure-stamp
dh_testdir
- $(MAKE) -f debian/Makefile.plugins
+ $(MAKE) -f debian/Makefile.plugins \
+ CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
+ CONFFLAGS="--host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE)"
$(MAKE) -f debian/Makefile.plugins check
touch $@
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
