This is an automated email from the git hooks/post-receive script. roam-guest pushed a commit to branch master in repository fenix-plugins.
commit c609b4d6ce1eaf7ddee7ed59b45e66843ca29d6c Author: Miriam Ruiz <[email protected]> Date: Fri Aug 3 19:47:50 2007 +0000 Remove unneeded patches --- debian/patches/agua_fix.patch | 11 --- debian/patches/include.patch | 174 ----------------------------------------- debian/patches/mixer_fix.patch | 106 ------------------------- debian/patches/series | 7 -- debian/patches/ttf_fix.patch | 26 ------ 5 files changed, 324 deletions(-) diff --git a/debian/patches/agua_fix.patch b/debian/patches/agua_fix.patch deleted file mode 100644 index fc8f4cc..0000000 --- a/debian/patches/agua_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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. diff --git a/debian/patches/include.patch b/debian/patches/include.patch deleted file mode 100644 index 8e4c4e6..0000000 --- a/debian/patches/include.patch +++ /dev/null @@ -1,174 +0,0 @@ -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,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> -+#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> diff --git a/debian/patches/mixer_fix.patch b/debian/patches/mixer_fix.patch deleted file mode 100644 index 8555654..0000000 --- a/debian/patches/mixer_fix.patch +++ /dev/null @@ -1,106 +0,0 @@ ---- 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) - 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. ---- 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 @@ - - - --int file_getnc_mixer (char *ptr, long n, void *f) { -+int file_getnc_mixer (void *ptr, long n, void *f) { - - - return file_read (f, ptr, n); -@@ -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; - - -- file_getnc_mixer(&id,4,fp); //RIFF -+ file_getnc_mixer(id,4,fp); //RIFF - - - -@@ -102,14 +102,14 @@ - - - file_getnc_mixer(&size,4,fp); //SIZE -- file_getnc_mixer(&id,4,fp); //WAVE -+ file_getnc_mixer(id,4,fp); //WAVE - - if ((id[0]=='W') && (id[1]=='A') && (id[2]=='V') && (id[3]=='E')) { - - - - //Es un wav, por lo tanto vamos a leerlo. -- file_getnc_mixer(&id,4,fp); //format -+ file_getnc_mixer(id,4,fp); //format - - file_getnc_mixer(&chunkSize,4,fp); - -@@ -121,7 +121,7 @@ - file_getnc_mixer(&wBitsPerSample,2,fp); //bits per sample - - -- file_getnc_mixer(&id,4,fp); //data -+ file_getnc_mixer(id,4,fp); //data - - - diff --git a/debian/patches/series b/debian/patches/series index 3bd520c..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +0,0 @@ -agua_fix.patch -fire_fix.patch -mixer_fix.patch -ttf_fix.patch -include.patch -fxdll_version.patch -fenixdll_sym.patch diff --git a/debian/patches/ttf_fix.patch b/debian/patches/ttf_fix.patch deleted file mode 100644 index e98b09e..0000000 --- a/debian/patches/ttf_fix.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix-plugins.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
