r3518 - in packages/trunk/fenix-plugins: . debian debian/patches
Miriam Ruiz
baby-guest at alioth.debian.org
Thu Aug 2 07:35:28 UTC 2007
Author: baby-guest
Date: 2007-08-02 07:35:27 +0000 (Thu, 02 Aug 2007)
New Revision: 3518
Added:
packages/trunk/fenix-plugins/debian/
packages/trunk/fenix-plugins/debian/Makefile.plugins
packages/trunk/fenix-plugins/debian/README.Debian
packages/trunk/fenix-plugins/debian/changelog
packages/trunk/fenix-plugins/debian/compat
packages/trunk/fenix-plugins/debian/control
packages/trunk/fenix-plugins/debian/copyright
packages/trunk/fenix-plugins/debian/install
packages/trunk/fenix-plugins/debian/patches/
packages/trunk/fenix-plugins/debian/patches/fenixdll_sym.patch
packages/trunk/fenix-plugins/debian/patches/fire_random.patch
packages/trunk/fenix-plugins/debian/patches/fxdll_version.patch
packages/trunk/fenix-plugins/debian/patches/include.patch
packages/trunk/fenix-plugins/debian/patches/series
packages/trunk/fenix-plugins/debian/rules
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: packages/trunk/fenix-plugins/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/trunk/fenix-plugins/debian/Makefile.plugins
===================================================================
--- packages/trunk/fenix-plugins/debian/Makefile.plugins (rev 0)
+++ packages/trunk/fenix-plugins/debian/Makefile.plugins 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,71 @@
+all: plugins/agua.so plugins/fgfx.so plugins/fire.so plugins/image.so \
+ plugins/ttf.so plugins/exec.so
+
+distclean:
+ for i in */; do [ ! -f "$$i/Makefile" ] || $(MAKE) -C "$$i" distclean || exit 1 ; done
+ rm -f plugins/*
+
+clean:
+ for i in */; do [ ! -f "$$i/Makefile" ] || $(MAKE) -C "$$i" clean || exit 1 ; done
+
+%/configure: %/configure.ac
+ cd `echo $@ | sed -e "s|/configure||"` && \
+ autoreconf --force --verbose
+ touch "$@"
+
+%/config.status: %/configure
+ cd `echo $@ | sed -e "s|/config.status||"` && \
+ ./configure CFLAGS="$(CFLAGS)" \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --with-ft-prefix=/usr/include
+ touch "$@"
+
+plugins:
+ mkdir -p plugins
+
+plugins/agua.so: plugins agua-1.0/configure agua-1.0/config.status
+ 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
+ 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
+ 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
+ make -C image-1.0
+ cp image-1.0/.libs/libimage.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 "$@"
+
+plugins/exec.so: plugins exec-0.4a/configure exec-0.4a/config.status
+ make -C exec-0.4a
+ cp exec-0.4a/.libs/libexec.so "$@"
+
+check:
+ @for i in plugins/*.so; do \
+ if objdump -T "$$i" | grep "RegisterFunctions" >/dev/null ; then \
+ echo \"$$i\" has the dynamic symbol \"RegisterFunctions\" \[OK\] ; \
+ else \
+ echo \"$$i\" does not have the dynamic symbol \"RegisterFunctions\" \[ERROR\] ; \
+ exit 1 ; \
+ fi \
+ done
+
+ @for i in plugins/*.so; do \
+ if objdump -T "$$i" | grep "PluginVersion" >/dev/null ; then \
+ echo \"$$i\" has the dynamic symbol \"PluginVersion\" \[OK\] ; \
+ else \
+ echo \"$$i\" does not have the dynamic symbol \"PluginVersion\" \[ERROR\] ; \
+ exit 1 ; \
+ fi \
+ done
Added: packages/trunk/fenix-plugins/debian/README.Debian
===================================================================
--- packages/trunk/fenix-plugins/debian/README.Debian (rev 0)
+++ packages/trunk/fenix-plugins/debian/README.Debian 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,6 @@
+fenix-plugins for Debian
+------------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Wed, 01 Aug 2007 20:05:56 +0000
Added: packages/trunk/fenix-plugins/debian/changelog
===================================================================
--- packages/trunk/fenix-plugins/debian/changelog (rev 0)
+++ packages/trunk/fenix-plugins/debian/changelog 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,6 @@
+fenix-plugins (0.0.20070801-1) unstable; urgency=low
+
+ * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Wed, 01 Aug 2007 20:05:56 +0000
+
Added: packages/trunk/fenix-plugins/debian/compat
===================================================================
--- packages/trunk/fenix-plugins/debian/compat (rev 0)
+++ packages/trunk/fenix-plugins/debian/compat 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1 @@
+5
Added: packages/trunk/fenix-plugins/debian/control
===================================================================
--- packages/trunk/fenix-plugins/debian/control (rev 0)
+++ packages/trunk/fenix-plugins/debian/control 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,16 @@
+Source: fenix-plugins
+Section: devel
+Priority: extra
+Maintainer: Miriam Ruiz <little_miry at yahoo.es>
+Build-Depends: debhelper (>= 5), quilt,
+ autotools-dev, autoconf, automake1.10 | automake1.9,
+ libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev,
+ libsmpeg-dev, libvorbis-dev, libfreetype6-dev,
+ fenix, fenix-dev
+Standards-Version: 3.7.2
+
+Package: fenix-plugins
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
Added: packages/trunk/fenix-plugins/debian/copyright
===================================================================
--- packages/trunk/fenix-plugins/debian/copyright (rev 0)
+++ packages/trunk/fenix-plugins/debian/copyright 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,67 @@
+This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
+Wed, 01 Aug 2007 20:05:56 +0000.
+
+Most of the plugins were downloaded from http://sourceforge.net/project/showfiles.php?group_id=2714
+
+Upstream Authors:
+
+ Fenix Team <fenix at divsite.net>
+
+Copyright:
+
+ Copyright (c) 1999 Jose Luis Cebrian Pague
+ Copyright (c) 2002 Fenix Team
+
+License:
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this software; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+
+Plugin "exec" was obtained via email from Pablo Navarro "panreyes" <contacto at pixjuegos.com>
+
+Upstream Authors:
+
+ Pablo Navarro "panreyes" <contacto at pixjuegos.com>
+
+Copyright:
+
+ Copyright (c) 2004 Alvaro Vilanova Vidal
+ Copyright (c) 2007 Pablo Navarro
+
+License:
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+
+The Debian packaging and patches are (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
+are licensed under the GPL, see above.
Added: packages/trunk/fenix-plugins/debian/install
===================================================================
--- packages/trunk/fenix-plugins/debian/install (rev 0)
+++ packages/trunk/fenix-plugins/debian/install 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1 @@
+plugins/*.so usr/lib/fenix/plugins/
Added: packages/trunk/fenix-plugins/debian/patches/fenixdll_sym.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/fenixdll_sym.patch (rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/fenixdll_sym.patch 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,66 @@
+diff -ruN fenix-plugins.orig/agua-1.0/fenixdll.sym fenix-plugins/agua-1.0/fenixdll.sym
+--- fenix-plugins.orig/agua-1.0/fenixdll.sym 2007-02-22 05:46:50.000000000 +0000
++++ fenix-plugins/agua-1.0/fenixdll.sym 2007-08-01 19:48:36.258086303 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
+diff -ruN fenix-plugins.orig/exec-0.4a/fenixdll.sym fenix-plugins/exec-0.4a/fenixdll.sym
+--- fenix-plugins.orig/exec-0.4a/fenixdll.sym 2007-07-31 22:34:14.000000000 +0000
++++ fenix-plugins/exec-0.4a/fenixdll.sym 2007-08-01 19:48:35.018008803 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
+diff -ruN fenix-plugins.orig/fgfx-1.0/fenixdll.sym fenix-plugins/fgfx-1.0/fenixdll.sym
+--- fenix-plugins.orig/fgfx-1.0/fenixdll.sym 2007-02-22 05:46:50.000000000 +0000
++++ fenix-plugins/fgfx-1.0/fenixdll.sym 2007-08-01 19:48:37.922190303 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
+diff -ruN fenix-plugins.orig/fire-1.0/fenixdll.sym fenix-plugins/fire-1.0/fenixdll.sym
+--- fenix-plugins.orig/fire-1.0/fenixdll.sym 2007-02-22 05:46:50.000000000 +0000
++++ fenix-plugins/fire-1.0/fenixdll.sym 2007-08-01 19:48:39.606295553 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
+diff -ruN fenix-plugins.orig/image-1.0/fenixdll.sym fenix-plugins/image-1.0/fenixdll.sym
+--- fenix-plugins.orig/image-1.0/fenixdll.sym 2007-02-22 05:46:50.000000000 +0000
++++ fenix-plugins/image-1.0/fenixdll.sym 2007-08-01 19:48:41.510414553 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
+diff -ruN fenix-plugins.orig/mixer-1.0/fenixdll.sym fenix-plugins/mixer-1.0/fenixdll.sym
+--- fenix-plugins.orig/mixer-1.0/fenixdll.sym 2007-02-22 05:46:50.000000000 +0000
++++ fenix-plugins/mixer-1.0/fenixdll.sym 2007-08-01 19:48:45.770680803 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
+diff -ruN fenix-plugins.orig/mpeg-1.0/fenixdll.sym fenix-plugins/mpeg-1.0/fenixdll.sym
+--- fenix-plugins.orig/mpeg-1.0/fenixdll.sym 2007-02-22 05:46:50.000000000 +0000
++++ fenix-plugins/mpeg-1.0/fenixdll.sym 2007-08-01 19:48:48.022821553 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
+diff -ruN fenix-plugins.orig/net-1.0/fenixdll.sym fenix-plugins/net-1.0/fenixdll.sym
+--- fenix-plugins.orig/net-1.0/fenixdll.sym 2007-02-22 05:46:50.000000000 +0000
++++ fenix-plugins/net-1.0/fenixdll.sym 2007-08-01 19:48:50.362967803 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
+diff -ruN fenix-plugins.orig/tcpsock-1.0/fenixdll.sym fenix-plugins/tcpsock-1.0/fenixdll.sym
+--- fenix-plugins.orig/tcpsock-1.0/fenixdll.sym 2007-02-22 05:46:50.000000000 +0000
++++ fenix-plugins/tcpsock-1.0/fenixdll.sym 2007-08-01 19:48:53.871187053 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
+diff -ruN fenix-plugins.orig/tcpsock-2.0/fenixdll.sym fenix-plugins/tcpsock-2.0/fenixdll.sym
+--- fenix-plugins.orig/tcpsock-2.0/fenixdll.sym 2007-02-22 05:46:50.000000000 +0000
++++ fenix-plugins/tcpsock-2.0/fenixdll.sym 2007-08-01 19:49:59.815308303 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
+diff -ruN fenix-plugins.orig/ttf-1.0/fenixdll.sym fenix-plugins/ttf-1.0/fenixdll.sym
+--- fenix-plugins.orig/ttf-1.0/fenixdll.sym 2007-02-22 05:46:50.000000000 +0000
++++ fenix-plugins/ttf-1.0/fenixdll.sym 2007-08-01 19:48:32.881875303 +0000
+@@ -1 +1,2 @@
++PluginVersion
+ RegisterFunctions
Added: packages/trunk/fenix-plugins/debian/patches/fire_random.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/fire_random.patch (rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/fire_random.patch 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,20 @@
+--- 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++)
Added: packages/trunk/fenix-plugins/debian/patches/fxdll_version.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/fxdll_version.patch (rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/fxdll_version.patch 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,177 @@
+diff -ruN fenix-plugins.orig/agua-1.0/agua.c fenix-plugins/agua-1.0/agua.c
+--- fenix-plugins.orig/agua-1.0/agua.c 2007-08-01 20:01:23.622043553 +0000
++++ fenix-plugins/agua-1.0/agua.c 2007-08-01 19:57:47.536539053 +0000
+@@ -4,6 +4,11 @@
+ #include <stdio.h>
+ #include <memory.h>
+
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
++
+ static int altura = 40;
+ static char *agua = NULL;
+ static int altura_agua = 0;
+diff -ruN fenix-plugins.orig/exec-0.4a/exec.c fenix-plugins/exec-0.4a/exec.c
+--- fenix-plugins.orig/exec-0.4a/exec.c 2007-08-01 20:01:23.626043803 +0000
++++ fenix-plugins/exec-0.4a/exec.c 2007-08-01 19:58:02.425469553 +0000
+@@ -25,6 +25,11 @@
+
+ #include <fenix/fxdll.h>
+
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
++
+ //------------------------------------------------------------------------------
+ // FUNCTION: ShellEx
+ // VER: 1.0
+diff -ruN fenix-plugins.orig/fgfx-1.0/fgfx.c fenix-plugins/fgfx-1.0/fgfx.c
+--- fenix-plugins.orig/fgfx-1.0/fgfx.c 2007-08-01 20:01:23.626043803 +0000
++++ fenix-plugins/fgfx-1.0/fgfx.c 2007-08-01 19:58:15.418281553 +0000
+@@ -2,6 +2,10 @@
+ #include <stdlib.h>
+ #include <SDL/SDL.h>
+
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
+
+ /*#include <string.h>// for log
+ char logfile = 0;
+diff -ruN fenix-plugins.orig/fire-1.0/fire.c fenix-plugins/fire-1.0/fire.c
+--- fenix-plugins.orig/fire-1.0/fire.c 2007-08-01 20:01:23.626043803 +0000
++++ fenix-plugins/fire-1.0/fire.c 2007-08-01 19:58:27.771053553 +0000
+@@ -3,6 +3,11 @@
+ #include <fenix/fxdll.h>
+ #include <string.h>
+ #include <SDL/SDL.h>
++
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
+
+ typedef struct{
+ Uint16 FireX, FireY, Pos_X, Pos_Y, StartP, FuelP, SpaceP, FuelY;
+diff -ruN fenix-plugins.orig/image-1.0/image.c fenix-plugins/image-1.0/image.c
+--- fenix-plugins.orig/image-1.0/image.c 2007-08-01 20:01:23.626043803 +0000
++++ fenix-plugins/image-1.0/image.c 2007-08-01 19:58:44.136076303 +0000
+@@ -42,6 +42,11 @@
+
+ #include <SDL/SDL_image.h>
+
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
++
+ static int sdlf_seek (SDL_RWops * context, int offset, int whence);
+ static int sdlf_read (SDL_RWops * context, void * ptr, int size, int count);
+ static int sdlf_write (SDL_RWops * context, const void * ptr, int size, int count);
+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-08-01 20:01:23.630044053 +0000
++++ fenix-plugins/mixer-1.0/mixer.c 2007-08-01 19:58:55.820806553 +0000
+@@ -35,6 +35,10 @@
+
+ #include <fenix/fxdll.h>
+
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
+
+ SDL_AudioSpec spec;
+
+diff -ruN fenix-plugins.orig/mixer-1.0/wav.c fenix-plugins/mixer-1.0/wav.c
+--- fenix-plugins.orig/mixer-1.0/wav.c 2007-08-01 20:01:23.630044053 +0000
++++ fenix-plugins/mixer-1.0/wav.c 2007-08-01 19:59:04.365340553 +0000
+@@ -7,6 +7,11 @@
+ #include <fenix/fxdll.h>
+ #include "mixer.h"
+
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
++
+ typedef struct WAV_SIGNAL WAV_SIGNAL;
+ typedef struct WAV_SAMPINFO WAV_SAMPINFO;
+
+diff -ruN fenix-plugins.orig/mpeg-1.0/mpeg.c fenix-plugins/mpeg-1.0/mpeg.c
+--- fenix-plugins.orig/mpeg-1.0/mpeg.c 2007-08-01 20:01:23.630044053 +0000
++++ fenix-plugins/mpeg-1.0/mpeg.c 2007-08-01 19:59:37.247395553 +0000
+@@ -14,6 +14,10 @@
+ #include <smpeg.h>
+ #include <SDL/SDL.h>
+
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
+
+ typedef struct
+ {
+diff -ruN fenix-plugins.orig/net-1.0/net.c fenix-plugins/net-1.0/net.c
+--- fenix-plugins.orig/net-1.0/net.c 2007-08-01 20:01:23.630044053 +0000
++++ fenix-plugins/net-1.0/net.c 2007-08-01 19:59:48.912124553 +0000
+@@ -1,6 +1,11 @@
+ #include <fenix/fxdll.h>
+ #include <stdlib.h>
+ #include <SDL/SDL_net.h>
++
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
+
+ #define MAX_TCP_CON 32
+ #define MAX_UDP_SOCKETS 32
+diff -ruN fenix-plugins.orig/tcpsock-1.0/tcpsock.c fenix-plugins/tcpsock-1.0/tcpsock.c
+--- fenix-plugins.orig/tcpsock-1.0/tcpsock.c 2007-08-01 20:01:23.634044303 +0000
++++ fenix-plugins/tcpsock-1.0/tcpsock.c 2007-08-01 19:59:58.060696303 +0000
+@@ -1,6 +1,11 @@
+ #include <fenix/fxdll.h>
+ #include <winsock.h>
+ #pragma pack
++
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
+
+ typedef struct {
+ long tv_sec;
+diff -ruN fenix-plugins.orig/tcpsock-2.0/tcpsock.c fenix-plugins/tcpsock-2.0/tcpsock.c
+--- fenix-plugins.orig/tcpsock-2.0/tcpsock.c 2007-08-01 20:01:23.634044303 +0000
++++ fenix-plugins/tcpsock-2.0/tcpsock.c 2007-08-01 20:00:17.653920803 +0000
+@@ -3,6 +3,11 @@
+ #include <winsock.h>
+ #endif
+ #pragma pack()
++
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
+
+ fd_set socketset[32];
+
+diff -ruN fenix-plugins.orig/ttf-1.0/ttf.c fenix-plugins/ttf-1.0/ttf.c
+--- fenix-plugins.orig/ttf-1.0/ttf.c 2007-08-01 20:01:23.634044303 +0000
++++ fenix-plugins/ttf-1.0/ttf.c 2007-08-01 20:00:30.370715553 +0000
+@@ -43,6 +43,11 @@
+ #include <stdio.h>
+ #include <memory.h>
+
++/* PluginVersion is used to identify the plugin structures against which
++ * we're linking to prevent potential mismatches and segmentation faults
++ */
++unsigned int PluginVersion = FXDLL_VERSION;
++
+ /*
+ * FUNCTION : gr_load_ttf
+ *
Added: packages/trunk/fenix-plugins/debian/patches/include.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/include.patch (rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/include.patch 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,170 @@
+diff -ruN fenix-plugins.orig/agua-1.0/agua.c fenix-plugins/agua-1.0/agua.c
+--- fenix-plugins.orig/agua-1.0/agua.c 2007-07-31 18:43:45.000000000 +0000
++++ fenix-plugins/agua-1.0/agua.c 2007-08-01 20:03:26.761739303 +0000
+@@ -1,4 +1,4 @@
+-#include <fxdll.h>
++#include <fenix/fxdll.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include <stdio.h>
+diff -ruN fenix-plugins.orig/exec-0.4a/exec.c fenix-plugins/exec-0.4a/exec.c
+--- fenix-plugins.orig/exec-0.4a/exec.c 2007-07-31 22:34:22.000000000 +0000
++++ fenix-plugins/exec-0.4a/exec.c 2007-08-01 20:03:27.589791053 +0000
+@@ -23,7 +23,7 @@
+ // LAST UPDATE: 04/07/2007
+ //------------------------------------------------------------------------------
+
+-#include <fxdll.h>
++#include <fenix/fxdll.h>
+
+ //------------------------------------------------------------------------------
+ // FUNCTION: ShellEx
+diff -ruN fenix-plugins.orig/fgfx-1.0/fgfx.c fenix-plugins/fgfx-1.0/fgfx.c
+--- fenix-plugins.orig/fgfx-1.0/fgfx.c 2007-07-31 18:45:26.000000000 +0000
++++ fenix-plugins/fgfx-1.0/fgfx.c 2007-08-01 20:03:27.593791303 +0000
+@@ -1,6 +1,6 @@
+-#include "fxdll.h"
++#include <fenix/fxdll.h>
+ #include <stdlib.h>
+-#include <SDL.h>
++#include <SDL/SDL.h>
+
+
+ /*#include <string.h>// for log
+diff -ruN fenix-plugins.orig/fire-1.0/fire.c fenix-plugins/fire-1.0/fire.c
+--- fenix-plugins.orig/fire-1.0/fire.c 2007-07-31 18:46:14.000000000 +0000
++++ fenix-plugins/fire-1.0/fire.c 2007-08-01 20:03:27.593791303 +0000
+@@ -1,8 +1,8 @@
+ #include <stdlib.h>
+ #include <time.h>
+-#include <fxdll.h>
++#include <fenix/fxdll.h>
+ #include <string.h>
+-#include "SDL.h"
++#include <SDL/SDL.h>
+
+ typedef struct{
+ Uint16 FireX, FireY, Pos_X, Pos_Y, StartP, FuelP, SpaceP, FuelY;
+diff -ruN fenix-plugins.orig/image-1.0/image.c fenix-plugins/image-1.0/image.c
+--- fenix-plugins.orig/image-1.0/image.c 2007-07-31 18:44:29.000000000 +0000
++++ fenix-plugins/image-1.0/image.c 2007-08-01 20:03:27.593791303 +0000
+@@ -34,13 +34,13 @@
+ #include <winbase.h>
+ #endif
+
+-#include <fxdll.h>
++#include <fenix/fxdll.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include <stdio.h>
+ #include <memory.h>
+
+-#include <SDL_image.h>
++#include <SDL/SDL_image.h>
+
+ static int sdlf_seek (SDL_RWops * context, int offset, int whence);
+ static int sdlf_read (SDL_RWops * context, void * ptr, int size, int count);
+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,11 @@
+ * DESCRIPTION : Sound Mixer DLL
+ */
+
+-#include "dumb.h"
+-#include "dumbogg.h"
++#include <dumb.h>
++#include <dumbogg.h>
+ #include "wav.h"
+
+-#include <fxdll.h>
++#include <fenix/fxdll.h>
+
+
+ SDL_AudioSpec spec;
+diff -ruN fenix-plugins.orig/mixer-1.0/wav.c fenix-plugins/mixer-1.0/wav.c
+--- fenix-plugins.orig/mixer-1.0/wav.c 2007-07-31 18:46:56.000000000 +0000
++++ fenix-plugins/mixer-1.0/wav.c 2007-08-01 20:03:27.597791553 +0000
+@@ -1,10 +1,10 @@
+
+ #include <stdlib.h>
+ #include <string.h>
+-#include "codec.h"
+-#include "vorbisfile.h"
+-#include "dumb.h"
+-#include <fxdll.h>
++#include <codec.h>
++#include <vorbisfile.h>
++#include <dumb.h>
++#include <fenix/fxdll.h>
+ #include "mixer.h"
+
+ typedef struct WAV_SIGNAL WAV_SIGNAL;
+diff -ruN fenix-plugins.orig/mpeg-1.0/mpeg.c fenix-plugins/mpeg-1.0/mpeg.c
+--- fenix-plugins.orig/mpeg-1.0/mpeg.c 2007-07-31 18:47:42.000000000 +0000
++++ fenix-plugins/mpeg-1.0/mpeg.c 2007-08-01 20:03:57.559664053 +0000
+@@ -4,7 +4,7 @@
+ #pragma comment (lib, "SDL")
+ */
+
+-#include <fxdll.h>
++#include <fenix/fxdll.h>
+ #undef current_time
+
+ #include <stdlib.h>
+@@ -12,7 +12,7 @@
+ #include <stdio.h>
+ #include <memory.h>
+ #include <smpeg.h>
+-#include "SDL.h"
++#include <SDL/SDL.h>
+
+
+ typedef struct
+diff -ruN fenix-plugins.orig/net-1.0/net.c fenix-plugins/net-1.0/net.c
+--- fenix-plugins.orig/net-1.0/net.c 2007-07-31 18:48:40.000000000 +0000
++++ fenix-plugins/net-1.0/net.c 2007-08-01 20:03:27.597791553 +0000
+@@ -1,6 +1,6 @@
+-#include <fxdll.h>
++#include <fenix/fxdll.h>
+ #include <stdlib.h>
+-#include "SDL_net.h"
++#include <SDL/SDL_net.h>
+
+ #define MAX_TCP_CON 32
+ #define MAX_UDP_SOCKETS 32
+diff -ruN fenix-plugins.orig/tcpsock-1.0/tcpsock.c fenix-plugins/tcpsock-1.0/tcpsock.c
+--- fenix-plugins.orig/tcpsock-1.0/tcpsock.c 2007-07-31 18:50:33.000000000 +0000
++++ fenix-plugins/tcpsock-1.0/tcpsock.c 2007-08-01 20:03:27.601791803 +0000
+@@ -1,5 +1,5 @@
+-#include "fxdll.h"
+-#include "winsock.h"
++#include <fenix/fxdll.h>
++#include <winsock.h>
+ #pragma pack
+
+ typedef struct {
+diff -ruN fenix-plugins.orig/tcpsock-2.0/tcpsock.c fenix-plugins/tcpsock-2.0/tcpsock.c
+--- fenix-plugins.orig/tcpsock-2.0/tcpsock.c 2007-07-31 18:52:02.000000000 +0000
++++ fenix-plugins/tcpsock-2.0/tcpsock.c 2007-08-01 20:03:27.601791803 +0000
+@@ -1,6 +1,6 @@
+-#include "fxdll.h"
++#include <fenix/fxdll.h>
+ #ifdef WIN32
+-#include "winsock.h"
++#include <winsock.h>
+ #endif
+ #pragma pack()
+
+diff -ruN fenix-plugins.orig/ttf-1.0/ttf.c fenix-plugins/ttf-1.0/ttf.c
+--- fenix-plugins.orig/ttf-1.0/ttf.c 2007-07-31 18:49:30.000000000 +0000
++++ fenix-plugins/ttf-1.0/ttf.c 2007-08-01 20:03:27.601791803 +0000
+@@ -37,7 +37,7 @@
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+
+-#include <fxdll.h>
++#include <fenix/fxdll.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include <stdio.h>
Added: packages/trunk/fenix-plugins/debian/patches/series
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/series (rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/series 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,4 @@
+include.patch
+fire_random.patch
+fxdll_version.patch
+fenixdll_sym.patch
Added: packages/trunk/fenix-plugins/debian/rules
===================================================================
--- packages/trunk/fenix-plugins/debian/rules (rev 0)
+++ packages/trunk/fenix-plugins/debian/rules 2007-08-02 07:35:27 UTC (rev 3518)
@@ -0,0 +1,81 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+patch:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
+unpatch:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt pop -a -f || test $$? = 2
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ $(MAKE) -f /usr/share/quilt/quilt.make patch
+ 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" ; \
+ fi \
+ done
+ touch $@
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) -f debian/Makefile.plugins
+ $(MAKE) -f debian/Makefile.plugins check
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ $(MAKE) -f debian/Makefile.plugins distclean
+ rm -f */aclocal.m4 */configure */Makefile.in
+ rm -f */config.guess */config.sub */config.status */config.log
+ $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ dh_install
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: packages/trunk/fenix-plugins/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-games-commits
mailing list