From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- games-arcade/sdb/Manifest | 6 - games-arcade/sdb/files/sdb-1.0.2-endian.patch | 275 ------------------------- games-arcade/sdb/files/sdb-1.0.2-gcc43.patch | 10 - games-arcade/sdb/files/sdb-1.0.2-ldflags.patch | 11 - games-arcade/sdb/metadata.xml | 8 - games-arcade/sdb/sdb-1.0.2-r1.ebuild | 49 ----- 6 files changed, 359 deletions(-) delete mode 100644 games-arcade/sdb/Manifest delete mode 100644 games-arcade/sdb/files/sdb-1.0.2-endian.patch delete mode 100644 games-arcade/sdb/files/sdb-1.0.2-gcc43.patch delete mode 100644 games-arcade/sdb/files/sdb-1.0.2-ldflags.patch delete mode 100644 games-arcade/sdb/metadata.xml delete mode 100644 games-arcade/sdb/sdb-1.0.2-r1.ebuild (limited to 'games-arcade/sdb') diff --git a/games-arcade/sdb/Manifest b/games-arcade/sdb/Manifest deleted file mode 100644 index 6e545909480f..000000000000 --- a/games-arcade/sdb/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX sdb-1.0.2-endian.patch 9118 BLAKE2B de2bbe81f5d1fcf571a5b8eedf97892ff6eaccaa7a0acb74427740f27fdfb8f517cc38c1ccdaee59480fb1e224f8c7a768355af50bfd1cb66fea338eea2133a0 SHA512 65b623d93e2369353cc2c900e38b8dfb56e6896cf34447305870c3c01a97770371ecff6c9586f7b758c64b1de4f85da3e0c79264587be325e226488545ea0754 -AUX sdb-1.0.2-gcc43.patch 173 BLAKE2B a00d2ea25dc4f90ddf02bac62c099c9b47089f16c123384e00495050a26bb30f06131892f496f93349a55574810e8c0e4406ea6ca6eda703d890e3c141115392 SHA512 663b0edd244f6fd50166f053f1631f9a2fe239f97ee16bf77a7b79d5afcf3503c5f2a55370b79b5413e91be6dca23d580cc1afc9875385a8ed04981e7dfc2552 -AUX sdb-1.0.2-ldflags.patch 322 BLAKE2B edfffa4f3821726f15729d93e6e52eec5c70ef87e716fa61a081e156d7ef55197dd064af6ad68397a0df0d5509a9d271f10c3c125dc63282e30916860c6e8d0e SHA512 45795b614ec967237a1d5a24075f7238e041a21b18a3e7a4f5608e4d5fc33734b05f80993aa54a044783a8a8b099e065db278ca5dfbda23704d848133b14dc2a -DIST sdb-1.0.2.tar.gz 10342311 BLAKE2B faedcd26a55df724514b4222f617146e4590861166c49e45768982aa4ea2bb427cca5ae1c3a622eac4ba5d2b1b65fe948792902703cdf2be9e09b8171968c5b3 SHA512 670d43717224d564bfecac44a3570167e19b7b4c50a21afab6903b0b0f2f6092a5551fd2cc63b659d2c2eadff5156c97876b96db3a10beabbbadc689b1d46efc -EBUILD sdb-1.0.2-r1.ebuild 1154 BLAKE2B 003f66329d1918d69c1726981fb22af69724066453be51dfdede9cb686d4d10b53a882accef74f8358b7ad4a8beae328fdf5ae488f46c096437a62fc6a517df4 SHA512 b1b13ddc7606536b4325d77f6960ff30d9a7dff7a788a0c1e2b11d65b0f61ea5c1362ce451ab12d351db2c254daeed1c8e77753e0ed89b83cb4077ab5510c949 -MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-arcade/sdb/files/sdb-1.0.2-endian.patch b/games-arcade/sdb/files/sdb-1.0.2-endian.patch deleted file mode 100644 index e7b33970274f..000000000000 --- a/games-arcade/sdb/files/sdb-1.0.2-endian.patch +++ /dev/null @@ -1,275 +0,0 @@ -diff -Naur sdb-1.0.2.orig/src/byteswap.h sdb-1.0.2/src/byteswap.h ---- sdb-1.0.2.orig/src/byteswap.h 1970-01-01 01:00:00.000000000 +0100 -+++ sdb-1.0.2/src/byteswap.h 2005-06-11 14:02:33.401905848 +0200 -@@ -0,0 +1,187 @@ -+/* $OpenBSD: endian.h,v 1.14 2004/01/11 19:17:31 brad Exp $ */ -+ -+/*- -+ * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * Generic definitions for little- and big-endian systems. Other endianesses -+ * has to be dealt with in the specific machine/endian.h file for that port. -+ * -+ * This file is meant to be included from a little- or big-endian port's -+ * machine/endian.h after setting BYTE_ORDER to either 1234 for little endian -+ * or 4321 for big.. -+ */ -+ -+#ifndef _BYTESWAP_H_ -+#define _BYTESWAP_H_ -+ -+#undef LITTLE_ENDIAN -+#define LITTLE_ENDIAN 1234 -+#undef BIG_ENDIAN -+#define BIG_ENDIAN 4321 -+#undef PDP_ENDIAN -+#define PDP_ENDIAN 3412 -+ -+#ifdef __GNUC__ -+ -+#define __swap16gen(x) __extension__({ \ -+ unsigned short __swap16gen_x = (x); \ -+ \ -+ (unsigned short)((__swap16gen_x & 0xff) << 8 | \ -+ (__swap16gen_x & 0xff00) >> 8); \ -+}) -+ -+#define __swap32gen(x) __extension__({ \ -+ unsigned int __swap32gen_x = (x); \ -+ \ -+ (unsigned int)((__swap32gen_x & 0xff) << 24 | \ -+ (__swap32gen_x & 0xff00) << 8 | \ -+ (__swap32gen_x & 0xff0000) >> 8 | \ -+ (__swap32gen_x & 0xff000000) >> 24); \ -+}) -+ -+#else /* __GNUC__ */ -+ -+/* Note that these macros evaluate their arguments several times. */ -+#define __swap16gen(x) \ -+ (unsigned short)(((unsigned short)(x) & 0xff) << 8 | ((unsigned short)(x) & 0xff00) >> 8) -+ -+#define __swap32gen(x) \ -+ (unsigned int)(((unsigned int)(x) & 0xff) << 24 | \ -+ ((unsigned int)(x) & 0xff00) << 8 | ((unsigned int)(x) & 0xff0000) >> 8 | \ -+ ((unsigned int)(x) & 0xff000000) >> 24) -+ -+#endif /* __GNUC__ */ -+ -+/* -+ * Define MD_SWAP if you provide swap{16,32}md functions/macros that are -+ * optimized for your architecture, These will be used for swap{16,32} -+ * unless the argument is a constant and we are using GCC, where we can -+ * take advantage of the CSE phase much better by using the generic version. -+ */ -+#ifdef MD_SWAP -+#if __GNUC__ -+ -+#define swap16(x) __extension__({ \ -+ unsigned short __swap16_x = (x); \ -+ \ -+ __builtin_constant_p(x) ? __swap16gen(__swap16_x) : \ -+ __swap16md(__swap16_x); \ -+}) -+ -+#define swap32(x) __extension__({ \ -+ unsigned int __swap32_x = (x); \ -+ \ -+ __builtin_constant_p(x) ? __swap32gen(__swap32_x) : \ -+ __swap32md(__swap32_x); \ -+}) -+ -+#endif /* __GNUC__ */ -+ -+#else /* MD_SWAP */ -+#define swap16 __swap16gen -+#define swap32 __swap32gen -+#endif /* MD_SWAP */ -+ -+#define swap16_multi(v, n) do { \ -+ size_t __swap16_multi_n = (n); \ -+ unsigned short *__swap16_multi_v = (v); \ -+ \ -+ while (__swap16_multi_n) { \ -+ *__swap16_multi_v = swap16(*__swap16_multi_v); \ -+ __swap16_multi_v++; \ -+ __swap16_multi_n--; \ -+ } \ -+} while (0) -+ -+#if BYTE_ORDER == LITTLE_ENDIAN -+ -+#define letohf(x) (x) -+ -+/* Can be overridden by machine/endian.h before inclusion of this file. */ -+#ifndef _QUAD_HIGHWORD -+#define _QUAD_HIGHWORD 1 -+#endif -+#ifndef _QUAD_LOWWORD -+#define _QUAD_LOWWORD 0 -+#endif -+ -+#define htobe16 swap16 -+#define htobe32 swap32 -+#define betoh16 swap16 -+#define betoh32 swap32 -+ -+#define htole16(x) (x) -+#define htole32(x) (x) -+#define letoh16(x) (x) -+#define letoh32(x) (x) -+ -+#endif /* BYTE_ORDER */ -+ -+#if BYTE_ORDER == BIG_ENDIAN -+ -+inline float letohf(float in) { -+ float retVal; -+ char* p = (char*)&retVal; -+ char* i = (char*)∈ -+ p[0] = i[3]; -+ p[1] = i[2]; -+ p[2] = i[1]; -+ p[3] = i[0]; -+ -+ return retVal; -+} -+ -+/* Can be overridden by machine/endian.h before inclusion of this file. */ -+#ifndef _QUAD_HIGHWORD -+#define _QUAD_HIGHWORD 0 -+#endif -+#ifndef _QUAD_LOWWORD -+#define _QUAD_LOWWORD 1 -+#endif -+ -+#define htole16 swap16 -+#define htole32 swap32 -+#define letoh16 swap16 -+#define letoh32 swap32 -+ -+#define htobe16(x) (x) -+#define htobe32(x) (x) -+#define betoh16(x) (x) -+#define betoh32(x) (x) -+ -+#endif /* BYTE_ORDER */ -+ -+#define htons htobe16 -+#define htonl htobe32 -+#define ntohs betoh16 -+#define ntohl betoh32 -+ -+#define NTOHL(x) (x) = ntohl((unsigned int)(x)) -+#define NTOHS(x) (x) = ntohs((unsigned short)(x)) -+#define HTONL(x) (x) = htonl((unsigned int)(x)) -+#define HTONS(x) (x) = htons((unsigned short)(x)) -+ -+#endif /* _SYS_ENDIAN_H_ */ -+ -diff -Naur sdb-1.0.2.orig/src/md2.cpp sdb-1.0.2/src/md2.cpp ---- sdb-1.0.2.orig/src/md2.cpp 2005-06-11 13:54:13.616884720 +0200 -+++ sdb-1.0.2/src/md2.cpp 2005-06-11 14:28:34.726548424 +0200 -@@ -27,6 +27,7 @@ - */ - - #include "sdb.h" -+#include "byteswap.h" - - void ModelObject::draw() - { -@@ -145,6 +146,23 @@ - errorMessage(8, "FLAGRANT SYSTEM ERROR", "Unable to load model %s", strFileName); - - fread(&m_Header, 1, sizeof(tMd2Header), m_FilePointer); -+ m_Header.magic = letoh32(m_Header.magic); -+ m_Header.version = letoh32(m_Header.version); -+ m_Header.skinWidth = letoh32(m_Header.skinWidth); -+ m_Header.skinHeight = letoh32(m_Header.skinHeight); -+ m_Header.frameSize = letoh32(m_Header.frameSize); -+ m_Header.numSkins = letoh32(m_Header.numSkins); -+ m_Header.numVertices = letoh32(m_Header.numVertices); -+ m_Header.numTexCoords = letoh32(m_Header.numTexCoords); -+ m_Header.numTriangles = letoh32(m_Header.numTriangles); -+ m_Header.numGlCommands = letoh32(m_Header.numGlCommands); -+ m_Header.numFrames = letoh32(m_Header.numFrames); -+ m_Header.offsetSkins = letoh32(m_Header.offsetSkins); -+ m_Header.offsetTexCoords = letoh32(m_Header.offsetTexCoords); -+ m_Header.offsetTriangles = letoh32(m_Header.offsetTriangles); -+ m_Header.offsetFrames = letoh32(m_Header.offsetFrames); -+ m_Header.offsetGlCommands = letoh32(m_Header.offsetGlCommands); -+ m_Header.offsetEnd = letoh32(m_Header.offsetEnd); - - if(m_Header.version != 8) - errorMessage(8, "FLAGRANT SYSTEM ERROR", "Invalid file format (version not 8) %s", strFileName); -@@ -197,12 +215,22 @@ - - // Read in all the texture coordinates in one fell swoop - fread(m_pTexCoords, sizeof(tMd2TexCoord), m_Header.numTexCoords, m_FilePointer); -+ for (int i=0; i < m_Header.numTexCoords; ++i) { -+ m_pTexCoords[i].u = letoh16(m_pTexCoords[i].u); -+ m_pTexCoords[i].v = letoh16(m_pTexCoords[i].v); -+ } - - // Move the file pointer to the triangles/face data offset - fseek(m_FilePointer, m_Header.offsetTriangles, SEEK_SET); - - // Read in the face data for each triangle (vertex and texCoord indices) - fread(m_pTriangles, sizeof(tMd2Face), m_Header.numTriangles, m_FilePointer); -+ for (int i=0; i < m_Header.numTriangles; ++i) { -+ for (int j=0; j < 3; ++j) { -+ m_pTriangles[i].vertexIndices[j] = letoh16(m_pTriangles[i].vertexIndices[j]); -+ m_pTriangles[i].textureIndices[j] = letoh16(m_pTriangles[i].textureIndices[j]); -+ } -+ } - - // Move the file pointer to the vertices (frames) - fseek(m_FilePointer, m_Header.offsetFrames, SEEK_SET); -@@ -213,6 +241,10 @@ - - // Read in the first frame of animation - fread(pFrame, 1, m_Header.frameSize, m_FilePointer); -+ for (int j=0; j < 3; ++j) { -+ pFrame->scale[j] = letohf(pFrame->scale[j]); -+ pFrame->translate[j] = letohf(pFrame->translate[j]); -+ } - - m_pFrames[i].pVertices = new tMd2Triangle [m_Header.numVertices]; - -diff -Naur sdb-1.0.2.orig/src/sdb.h sdb-1.0.2/src/sdb.h ---- sdb-1.0.2.orig/src/sdb.h 2005-06-11 13:54:13.610885632 +0200 -+++ sdb-1.0.2/src/sdb.h 2005-06-11 14:26:02.116748640 +0200 -@@ -57,11 +57,7 @@ - #include - #endif - --#if SDL_BYTEORDER == SDL_BIG_ENDIAN --#define MD2_SUFFIX ".md2b" --#else - #define MD2_SUFFIX ".md2" --#endif - - using namespace std; - diff --git a/games-arcade/sdb/files/sdb-1.0.2-gcc43.patch b/games-arcade/sdb/files/sdb-1.0.2-gcc43.patch deleted file mode 100644 index 731ce7df3b52..000000000000 --- a/games-arcade/sdb/files/sdb-1.0.2-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/sdb.h -+++ b/src/sdb.h -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #ifndef __APPLE__ - #include diff --git a/games-arcade/sdb/files/sdb-1.0.2-ldflags.patch b/games-arcade/sdb/files/sdb-1.0.2-ldflags.patch deleted file mode 100644 index 653fb814f4c0..000000000000 --- a/games-arcade/sdb/files/sdb-1.0.2-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Makefile.old 2010-09-21 10:30:41.000000000 +0200 -+++ b/src/Makefile 2010-09-21 10:30:58.000000000 +0200 -@@ -40,7 +40,7 @@ - rm -f $(OBJ) $(BIN) - - $(BIN): $(OBJ) -- $(CPP) $(LINKOBJ) -o $(BIN) $(LIBS) -+ $(CPP) $(LDFLAGS) $(LINKOBJ) -o $(BIN) $(LIBS) - - main.o: main.cpp - $(CPP) -c main.cpp -o main.o $(CXXFLAGS) diff --git a/games-arcade/sdb/metadata.xml b/games-arcade/sdb/metadata.xml deleted file mode 100644 index 78274e0fa550..000000000000 --- a/games-arcade/sdb/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - diff --git a/games-arcade/sdb/sdb-1.0.2-r1.ebuild b/games-arcade/sdb/sdb-1.0.2-r1.ebuild deleted file mode 100644 index 155c5d3a4e9c..000000000000 --- a/games-arcade/sdb/sdb-1.0.2-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="A 2D top-down action game; escape a facility full of walking death machines" -HOMEPAGE="http://sdb.gamecreation.org/" -SRC_URI="http://gcsociety.sp.cs.cmu.edu/~frenzy/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="virtual/opengl - media-libs/libsdl - media-libs/sdl-image[png] - media-libs/sdl-mixer" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i \ - -e "s:models/:/usr/share/${PN}/models/:" \ - -e "s:snd/:/usr/share/${PN}/snd/:" \ - -e "s:sprites/:/usr/share/${PN}/sprites/:" \ - -e "s:levels/:/usr/share/${PN}/levels/:" \ - src/sdb.h src/game.cpp || die "setting game paths" - eapply \ - "${FILESDIR}"/${P}-endian.patch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-ldflags.patch -} - -src_compile() { - emake \ - -C src \ - CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)" -} - -src_install() { - dobin src/sdb - insinto /usr/share/${PN} - doins -r levels models snd sprites - newicon sprites/barrel.png ${PN}.png - make_desktop_entry sdb "Shotgun Debugger" - einstalldocs -} -- cgit v1.2.3