Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

5 files changed, 0 insertions, 254 deletions

diff --git a/snes9x/snes9x-sdl-qpe-1.39/compile.patch b/snes9x/snes9x-sdl-qpe-1.39/compile.patch
deleted file mode 100644
index 57ff0c409a..0000000000
--- a/snes9x/snes9x-sdl-qpe-1.39/compile.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- snes9x-sdl-1.39/unix/svga.cpp~compile	2003-10-28 10:08:18.000000000 +0100
-+++ snes9x-sdl-1.39/unix/svga.cpp	2004-01-19 21:29:07.000000000 +0100
-@@ -48,7 +48,7 @@
- #include <stdlib.h>
- #include <signal.h>
- 
--#include "sdl.h"
-+#include <SDL.h>
- 
- #include "snes9x.h"
- #include "memmap.h"
---- snes9x-sdl-1.39/unix/unix.cpp~compile	2003-10-28 22:09:02.000000000 +0100
-+++ snes9x-sdl-1.39/unix/unix.cpp	2004-01-19 21:29:07.000000000 +0100
-@@ -50,7 +50,7 @@
- #include <sys/types.h>
- #include <ctype.h>
- #include <dirent.h>
--#include <sdl.h>
-+#include <SDL.h>
- #include "keydef.h"
- 
- #undef USE_THREADS
---- /dev/null	1970-01-01 01:00:00.000000000 +0100
-+++ snes9x-sdl-1.39/unzip/unzipP.h	2004-01-19 21:29:07.000000000 +0100
-@@ -0,0 +1,124 @@
-+#ifndef _UNZIPP_H_
-+#define _UNZIPP_H_
-+
-+#include "unzip.h"
-+
-+#ifndef local
-+#define local static
-+#endif
-+/* compile with -Dlocal if your debugger can't find static symbols */
-+
-+
-+
-+#if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES) && \
-+                      !defined(CASESENSITIVITYDEFAULT_NO)
-+#define CASESENSITIVITYDEFAULT_NO
-+#endif
-+
-+
-+#ifndef UNZ_BUFSIZE
-+#define UNZ_BUFSIZE (16384)
-+#endif
-+
-+#ifndef UNZ_MAXFILENAMEINZIP
-+#define UNZ_MAXFILENAMEINZIP (256)
-+#endif
-+
-+#ifndef ALLOC
-+#define ALLOC(size) (malloc(size))
-+#endif
-+#ifndef TRYFREE
-+#define TRYFREE(p) {if (p) free(p);}
-+#endif
-+
-+#define SIZECENTRALDIRITEM (0x2e)
-+#define SIZEZIPLOCALHEADER (0x1e)
-+
-+
-+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-+
-+#ifndef SEEK_CUR
-+#define SEEK_CUR    1
-+#endif
-+
-+#ifndef SEEK_END
-+#define SEEK_END    2
-+#endif
-+
-+#ifndef SEEK_SET
-+#define SEEK_SET    0
-+#endif
-+
-+/* unz_file_info_interntal contain internal info about a file in zipfile */
-+typedef struct unz_file_info_internal_s
-+{
-+    uLong           offset_curfile;	/* relative offset of local header 4
-+					 * bytes */
-+}               unz_file_info_internal;
-+
-+
-+/*
-+ * file_in_zip_read_info_s contain internal information about a file in
-+ * zipfile, when reading and decompress it
-+ */
-+typedef struct
-+{
-+    char           *read_buffer;/* internal buffer for compressed data */
-+    z_stream        stream;	/* zLib stream structure for inflate */
-+
-+    uLong           pos_in_zipfile;	/* position in byte on the zipfile,
-+					 * for fseek */
-+    uLong           stream_initialised;	/* flag set if stream structure is
-+					 * initialised */
-+
-+    uLong           offset_local_extrafield;	/* offset of the local extra
-+						 * field */
-+    uInt            size_local_extrafield;	/* size of the local extra
-+						 * field */
-+    uLong           pos_local_extrafield;	/* position in the local
-+						 * extra field in read */
-+
-+    uLong           crc32;	/* crc32 of all data uncompressed */
-+    uLong           crc32_wait;	/* crc32 we must obtain after decompress all */
-+    uLong           rest_read_compressed;	/* number of byte to be
-+						 * decompressed */
-+    uLong           rest_read_uncompressed;	/* number of byte to be
-+						 * obtained after decomp */
-+    FILE           *file;	/* io structore of the zipfile */
-+    uLong           compression_method;	/* compression method (0==store) */
-+    uLong           byte_before_the_zipfile;	/* byte before the zipfile,
-+						 * (>0 for sfx) */
-+}               file_in_zip_read_info_s;
-+
-+
-+/*
-+ * unz_s contain internal information about the zipfile
-+ */
-+typedef struct
-+{
-+    FILE           *file;	/* io structore of the zipfile */
-+    unz_global_info gi;		/* public global information */
-+    uLong           byte_before_the_zipfile;	/* byte before the zipfile,
-+						 * (>0 for sfx) */
-+    uLong           num_file;	/* number of the current file in the zipfile */
-+    uLong           pos_in_central_dir;	/* pos of the current file in the
-+					 * central dir */
-+    uLong           current_file_ok;	/* flag about the usability of the
-+					 * current file */
-+    uLong           central_pos;/* position of the beginning of the central
-+				 * dir */
-+
-+    uLong           size_central_dir;	/* size of the central directory  */
-+    uLong           offset_central_dir;	/* offset of start of central
-+					 * directory with respect to the
-+					 * starting disk number */
-+
-+    unz_file_info   cur_file_info;	/* public info about the current file
-+					 * in zip */
-+    unz_file_info_internal cur_file_info_internal;	/* private info about it */
-+    file_in_zip_read_info_s *pfile_in_zip_read;	/* structure about the
-+						 * current file if we are
-+						 * decompressing it */
-+}               unz_s;
-+
-+#endif
---- snes9x-sdl-1.39/Makefile~compile	2003-10-28 16:49:50.000000000 +0100
-+++ snes9x-sdl-1.39/Makefile	2004-01-19 21:31:53.000000000 +0100
-@@ -53,12 +53,12 @@
- 
- ifdef THREAD_SOUND
- CPUDEFINES += -DUSE_THREADS
--EXTRALIBS += -lpthread -L/usr/local/lib -lcygipc
-+EXTRALIBS += -lpthread -lcygipc
- endif
- 
- ifdef GLIDE
- GLIDEOBJS = unix/glide.o
--GLIDEDEFINES = -DUSE_GLIDE -I/usr/include/glide
-+GLIDEDEFINES = -DUSE_GLIDE
- GLIDELIBS = -lglide2x
- GLIDEDEPENDS=use_glide
- GLIDENO_DEPENDS=no_glide
-@@ -82,14 +82,12 @@
- CC = gcc
- NASM = nasm
- 
--INCLUDES=-I/usr/local/include
-+INCLUDES=
- 
- OPTIMISE= -D_ZAURUS -Os -ffast-math -fstrict-aliasing -fomit-frame-pointer -mcpu=strongarm1100 -mtune=strongarm1100
- CCFLAGS = $(OPTIMISE) \
---I/opt/Qtopia/include/SDL \
- -I. \
- -Iunzip \
---Isdl \
- -D__linux \
- -DZLIB \
- -DVAR_CYCLES \
-@@ -114,7 +112,7 @@
- 
- .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj
- 
--LDLIBS = -L/opt/Qtopia/sharp/lib
-+LDLIBS=
- 
- ifdef GLIDE
- all: offsets gsnes9x
-@@ -146,7 +144,7 @@
- 	$(RM) $(OPENGLNO_DEPENDS)
- 
- snes9x: $(OBJECTS) 
--	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(EXTRALIBS) -L/opt/QtPalmtop/lib/ -lSDL -lSDLmain $(LDLIBS) -lqpe -lqte -lpthread
-+	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(EXTRALIBS) $(LDLIBS) -lqpe -lqte -lpthread
- 
- gsnes9x: $(OBJECTS) unix/x11.o unix/glide.o
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/x11.o unix/glide.o $(LDLIBS) $(GLIDELIBS) -lXext -lX11 -lXxf86dga -lXxf86vm $(EXTRALIBS) -lz -lm
diff --git a/snes9x/snes9x-sdl-qpe_1.39.bb b/snes9x/snes9x-sdl-qpe_1.39.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/snes9x/snes9x-sdl-qpe_1.39.bb
+++ /dev/null
diff --git a/snes9x/snes9x/makefile.patch b/snes9x/snes9x/makefile.patch
deleted file mode 100644
index dc9986453c..0000000000
--- a/snes9x/snes9x/makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- snes9x-1.43-dev-src/snes9x/Makefile.in.old	2004-10-02 17:34:58.000000000 +0100
-+++ snes9x-1.43-dev-src/snes9x/Makefile.in	2004-10-02 17:42:25.000000000 +0100
-@@ -142,7 +142,7 @@
- #INCLUDES = -I../zlib @XINCLUDES@
- INCLUDES = @XINCLUDES@
- 
--OPTIMISE = @OPTIMIZE@
-+OPTIMISE = $(filter-out @OPTIMIZE@,-pedantic)
- 
- #OPTIMISE=-g -fno-exceptions
- 
-@@ -165,7 +165,7 @@
- $(KREEDDEFINES) \
- $(SDD1DEFINES) \
- $(JOYDEFINES) \
---DNO_INLINE_SET_GET @SYSDEFINES@
-+-DNO_INLINE_SET_GET @SYSDEFINES@ $(OECFLAGS)
- 
- #-DOLD_COLOUR_BLENDING
- #-DSOUND
-@@ -204,15 +204,15 @@
- #ggisnes9x
- #xf86snes9x
- 
--offsets: offsets.o
--	$(CCC) $(INCLUDES) -o $@ offsets.o
-+offsets: offsets.cpp
-+	$(BUILD_CXX) $(INCLUDES) -o $@ $<
- 	./offsets >i386/offsets.h
- 
- #../zlib/libz.a:
- #	cd ../zlib && sh ./configure && make
- 
- snes9x: $(OBJECTS) unix/x11.o $(AIDOOBJS) $(GUIOBJS)
--	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(GUILIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lm
-+	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(GUIOBJS) $(OELDFLAGS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(GUILIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lm
- 
- ssnes9x: $(OBJECTS) unix/svga.o 
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl $(EXTRALIBS) -lm
diff --git a/snes9x/snes9x/private.patch b/snes9x/snes9x/private.patch
deleted file mode 100644
index 83808f4c54..0000000000
--- a/snes9x/snes9x/private.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- unix/x11.cpp.old	2004-10-03 21:27:10.000000000 +0100
-+++ unix/x11.cpp	2004-10-03 21:29:02.000000000 +0100
-@@ -154,6 +154,7 @@
- #if defined (__cplusplus) || defined (c_plusplus)
- #define private c_private
- #include <X11/extensions/xf86vmode.h>
-+#undef private
- #endif
- 
- #define ALL_DEVICE_EVENTS 0
diff --git a/snes9x/snes9x_1.43-WIP1.bb b/snes9x/snes9x_1.43-WIP1.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/snes9x/snes9x_1.43-WIP1.bb
+++ /dev/null