summaryrefslogtreecommitdiff
path: root/graphics/clanlib/patches
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/clanlib/patches')
-rw-r--r--graphics/clanlib/patches/patch-aa22
-rw-r--r--graphics/clanlib/patches/patch-ab30
-rw-r--r--graphics/clanlib/patches/patch-ac120
-rw-r--r--graphics/clanlib/patches/patch-ad29
-rw-r--r--graphics/clanlib/patches/patch-ae39
-rw-r--r--graphics/clanlib/patches/patch-af27
-rw-r--r--graphics/clanlib/patches/patch-ag27
-rw-r--r--graphics/clanlib/patches/patch-ah106
-rw-r--r--graphics/clanlib/patches/patch-ai20
-rw-r--r--graphics/clanlib/patches/patch-aj23
-rw-r--r--graphics/clanlib/patches/patch-ak39
11 files changed, 0 insertions, 482 deletions
diff --git a/graphics/clanlib/patches/patch-aa b/graphics/clanlib/patches/patch-aa
deleted file mode 100644
index 601ddb98ac8..00000000000
--- a/graphics/clanlib/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/08/29 22:41:16 jlam Exp $
-
---- Makefile.conf.in.orig Sun Apr 9 08:17:58 2000
-+++ Makefile.conf.in
-@@ -13,7 +13,7 @@
- BIN_PREFIX = @bindir@
- TARGET_PREFIX = @libdir@/ClanLib
-
--INCLUDE_DIRS = -I Sources @x_includes@
-+INCLUDE_DIRS = -I Sources @CPPFLAGS@ @x_includes@
-
- COMP_OPTIONS = -Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS @DEFS@ @comp_mode@
-
-@@ -21,7 +21,7 @@
-
- OBJF_NONDYN = @objf_nondyn@
-
--LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX)
-+LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX) @LDFLAGS@
-
- Libs/Intermediate/%.o : %.cpp
- @echo "Compiling $<"
diff --git a/graphics/clanlib/patches/patch-ab b/graphics/clanlib/patches/patch-ab
deleted file mode 100644
index 4511555a608..00000000000
--- a/graphics/clanlib/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/12/15 03:24:18 garbled Exp $
---- Sources/Core/Input/X11/joystick_linux.h.orig Thu Jul 8 11:36:50 1999
-+++ Sources/Core/Input/X11/joystick_linux.h Thu Jul 8 11:41:55 1999
-@@ -21,13 +21,16 @@
- #define header_joystick_linux
-
- // TODO: ifdef this out if it isn't a linux system.
--
--#include <linux/version.h>
--
- #ifndef KERNEL_VERSION
- #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
- #endif
-
-+#ifdef __NetBSD__
-+#define LINUX_VERSION_CODE KERNEL_VERSION(1,0,0)
-+#else
-+
-+#include <linux/version.h>
-+
- #ifndef LINUX_VERSION_CODE
- #error "You need to use at least 2.0 Linux kernel."
- #endif
-@@ -109,5 +112,5 @@
- };
-
- #endif
--
-+#endif
- #endif
diff --git a/graphics/clanlib/patches/patch-ac b/graphics/clanlib/patches/patch-ac
deleted file mode 100644
index 2144fbb6a21..00000000000
--- a/graphics/clanlib/patches/patch-ac
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2001/05/11 14:12:10 dmcmahill Exp $
-
-
-add an operator overload for CL_String << long so this can build
-on 64-bit systems.
-
---- Sources/API/Core/System/clanstring.h.orig Tue May 9 17:09:32 2000
-+++ Sources/API/Core/System/clanstring.h Thu May 10 17:57:14 2001
-@@ -26,4 +26,6 @@
- #ifndef WIN32
- #include <cctype>
-+#include <stdio.h>
-+#include <sys/param.h>
- #endif
-
-@@ -69,4 +71,36 @@
- }
- }
-+
-+void ltoa(long num, char *str, const int number_format)
-+{
-+ long num1 = num;
-+ int num_chars = 0;
-+
-+ while (num1>0)
-+ {
-+ num_chars++;
-+ num1 /= number_format;
-+ }
-+
-+ if (num_chars == 0) num_chars = 1;
-+
-+ str[num_chars] = 0; // Null-terminate the str
-+
-+ for (int pos = num_chars-1; pos>=0; pos--)
-+ {
-+ int cur_char = num % number_format;
-+
-+ if (cur_char < 10) // Insert number
-+ {
-+ str[pos] = cur_char + '0';
-+ }
-+ else // Insert letter
-+ {
-+ str[pos] = cur_char-10 + 'A';
-+ }
-+
-+ num /= number_format;
-+ }
-+}
- #else
- #pragma warning( disable : 4244 )
-@@ -97,4 +131,26 @@
- return text;
- }
-+
-+ char *long_to_string(const char *prefix, const long number)
-+ {
-+ char buf[20];
-+ ltoa(number, buf, 10);
-+
-+ int len=0;
-+ if (prefix!=NULL) len=strlen(prefix);
-+
-+ char *text=new char[len+strlen(buf)+1];
-+ if (prefix!=NULL)
-+ {
-+ strcpy(text, prefix);
-+ strcat(text, buf);
-+ }
-+ else
-+ {
-+ strcpy(text, buf);
-+ }
-+
-+ return text;
-+ }
-
- char *float_to_string(const char *prefix, const float _float_number)
-@@ -102,7 +158,10 @@
- char buf[25];
- buf[0]=0;
-+ int precision=4;
-
-+#if (defined(BSD) && BSD >= 199306)
-+ snprintf(buf, sizeof buf, "%.*f", precision, (double)_float_number);
-+#else
- int decimal, sign;
-- int precision=4;
- char temp;
-
-@@ -135,4 +194,5 @@
-
- copy_strings:
-+#endif
- int len=0;
- if (prefix!=NULL) len=strlen(prefix);
-@@ -434,4 +494,22 @@
- {
- char *new_string=int_to_string(str, number);
-+ if (str!=NULL) delete str;
-+ str=new_string;
-+
-+ return *this;
-+ }
-+
-+ CL_String &operator<< (const unsigned long number)
-+ {
-+ char *new_string=long_to_string(str, number);
-+ if (str!=NULL) delete str;
-+ str=new_string;
-+
-+ return *this;
-+ }
-+
-+ CL_String &operator<< (const long number)
-+ {
-+ char *new_string=long_to_string(str, number);
- if (str!=NULL) delete str;
- str=new_string;
diff --git a/graphics/clanlib/patches/patch-ad b/graphics/clanlib/patches/patch-ad
deleted file mode 100644
index 4ae7c439306..00000000000
--- a/graphics/clanlib/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2000/12/15 03:24:18 garbled Exp $
---- Sources/Core/System/Unix/init_linux.cpp.orig Thu Dec 14 18:25:57 2000
-+++ Sources/Core/System/Unix/init_linux.cpp Thu Dec 14 18:21:25 2000
-@@ -531,19 +531,20 @@
- {
- struct timeval tv;
- // select doesn't modify timeval if interrupted on non Linux systems
--#ifndef linux
-- int then, now, elapsed;
-- then = CL_System::get_time();
--#else
-+
-+#if defined(linux) || defined(__NetBSD__)
- tv.tv_sec = millis/ 1000;
- tv.tv_usec = (millis%1000)*1000;
-+#else
-+ int then, now, elapsed;
-+ then = CL_System::get_time();
- #endif
-
- int was_error;
- do
- {
- errno = 0;
--#ifndef linux
-+#if !defined(linux) && !defined(__NetBSD__)
- now = CL_System::get_time();
- elapsed = now - then;
- then = now;
diff --git a/graphics/clanlib/patches/patch-ae b/graphics/clanlib/patches/patch-ae
deleted file mode 100644
index 6e8fefb5cea..00000000000
--- a/graphics/clanlib/patches/patch-ae
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2000/12/15 03:24:18 garbled Exp $
---- Sources/Core/System/Unix/appconf.cpp.orig Thu Dec 14 18:33:18 2000
-+++ Sources/Core/System/Unix/appconf.cpp Thu Dec 14 18:37:38 2000
-@@ -59,7 +59,7 @@
- # include <windows.h>
- #endif // WIN32
-
--#ifdef __unix__
-+#if defined(__unix__) || defined(__NetBSD__)
- # include <sys/param.h>
- # include <sys/stat.h>
- # include <unistd.h>
-@@ -165,7 +165,7 @@
- #if APPCONF_CASE_SENSITIVE
- # define StrCmp(s1,s2) strcmp((s1),(s2))
- #else
--# ifdef __unix__
-+# if defined(__unix__) || defined(__NetBSD__)
- extern "C" int strcasecmp(const char *s1, const char *s2); // it's not ansi
- # define StrCmp(s1,s2) strcasecmp((s1),(s2))
- # else
-@@ -1326,7 +1326,7 @@
- // check if file has extension
- Bool bNoExt = strchr(m_szFileName, '.') == NULL;
-
--#ifdef __unix__
-+#if defined(__unix__) || defined(__NetBSD__)
- strcpy(s_szBuf, "/etc/");
- strcat(s_szBuf, m_szFileName);
- if ( bNoExt )
-@@ -1349,7 +1349,7 @@
- {
- static char s_szBuf[MAX_PATH];
-
--#ifdef __unix__
-+#if defined(__unix__) || defined(__NetBSD__)
- const char *szHome = getenv("HOME");
- if ( szHome == NULL ) {
- // we're homeless...
diff --git a/graphics/clanlib/patches/patch-af b/graphics/clanlib/patches/patch-af
deleted file mode 100644
index 92a8563e600..00000000000
--- a/graphics/clanlib/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.5 2001/12/05 04:56:21 jlam Exp $
---- Sources/Core/System/Unix/mutex_pthread.cpp.orig Thu Dec 14 18:45:06 2000
-+++ Sources/Core/System/Unix/mutex_pthread.cpp Thu Dec 14 18:45:11 2000
-@@ -21,7 +21,11 @@
- // suck:
- extern "C"
- {
-+#ifndef _PTH_PTHREAD_H_
- int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);
-+#else
-+ int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind);
-+#endif
- }
-
- CL_Mutex *CL_Mutex::create()
-@@ -33,7 +37,11 @@
- {
- pthread_mutexattr_t attr;
- pthread_mutexattr_init(&attr);
-+#ifndef _PTH_PTHREAD_H_
- pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-+#else
-+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+#endif
- pthread_mutex_init(&mutex, &attr);
- pthread_mutexattr_destroy(&attr);
-
diff --git a/graphics/clanlib/patches/patch-ag b/graphics/clanlib/patches/patch-ag
deleted file mode 100644
index b67d773c34c..00000000000
--- a/graphics/clanlib/patches/patch-ag
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2000/12/15 03:24:18 garbled Exp $
---- Sources/Core/Sound/ClanSound/oss.cpp.orig Thu Dec 14 18:47:17 2000
-+++ Sources/Core/Sound/ClanSound/oss.cpp Thu Dec 14 18:52:47 2000
-@@ -12,7 +12,11 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#ifdef __NetBSD__
-+#include <soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
- #include <iostream>
-
- #include <API/Core/System/error.h>
-@@ -29,7 +33,11 @@
-
- CL_CSOutput::CL_CSOutput()
- {
-+#ifdef __NetBSD__
-+ dev_dsp_fd = open("/dev/sound", O_WRONLY);
-+#else
- dev_dsp_fd = open("/dev/dsp", O_WRONLY);
-+#endif
- if (dev_dsp_fd == -1)
- {
- has_sound = false;
diff --git a/graphics/clanlib/patches/patch-ah b/graphics/clanlib/patches/patch-ah
deleted file mode 100644
index cc920283598..00000000000
--- a/graphics/clanlib/patches/patch-ah
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2001/08/23 15:55:26 jlam Exp $
-
---- Makefile.in.orig Sun Apr 9 14:17:58 2000
-+++ Makefile.in
-@@ -261,43 +261,43 @@
- @install -d $(BIN_PREFIX)
- @install -d $(LIB_PREFIX)
- @for i in `find Sources/API/* -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/* -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/* -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -c -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
- @echo "Libraries are being installed in $(LIB_PREFIX)."
-- @install Libs/libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
-+ @install -c Libs/libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
- @ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
- @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanCore.so
- @if [ -f Libs/libclanGL.so ]; then \
-- install Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGL.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanGL.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGL.so; \
- fi
- @if [ -f Libs/libclanMagick.so ]; then \
-- install Libs/libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMagick.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanMagick.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMagick.so; \
- fi
- @if [ -f Libs/libclanMPEG.so ]; then \
-- install Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMPEG.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMPEG.so; \
- fi
- @if [ -f Libs/libclanLua.so ]; then \
-- install Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanLua.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanLua.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanLua.so; \
- fi
- @if [ -f Libs/libclanGUI.so ]; then \
-- install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGUI.so; \
- fi
- @if [ -f Libs/libclanMikMod.so ]; then \
-- install Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMikMod.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMikMod.so; \
- fi
- @if [ -f Libs/libclanPNG.so ]; then \
-- install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
-+ install -c Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
- ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR); \
- ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanPNG.so; \
- fi
-@@ -306,10 +306,10 @@
- install -d $(TARGET_PREFIX); \
- all_targets_var="$(ALL_TARGETS)"; \
- for curtarget in $$all_targets_var; do \
-- install $$curtarget $(TARGET_PREFIX); \
-+ install -c $$curtarget $(TARGET_PREFIX); \
- done; \
- fi
-- @install clanlib-config $(BIN_PREFIX)
-+ @install -c clanlib-config $(BIN_PREFIX)
-
- @echo ""
- @echo "Installation complete, now run 'ldconfig' as root or point the"
-@@ -427,7 +427,7 @@
-
- Libs/libclanPNG.so: Libs/libclanCore.so $(OBJF_LIB_PNG)
- @echo "Building Libs/libclanPNG.so"
-- @$(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lpng
-+ @$(LINK_COMMAND) -Wl,-R$(LOCALBASE)/lib -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lpng
- @ln -s -f libclanPNG.so.$(D_VERSION_MINOR) Libs/libclanPNG.so.$(D_VERSION_MAJOR)
- @ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) Libs/libclanPNG.so
-
-@@ -437,7 +437,7 @@
-
- Libs/libclan-sound.so.$(D_VERSION_MINOR): $(OBJF_SOUND_CLANSOUND)
- @echo "Building sound target"
-- @$(LINK_COMMAND) -o Libs/libclan-sound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_CLANSOUND)
-+ @$(LINK_COMMAND) ${LIBOSSAUDIO} -o Libs/libclan-sound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_CLANSOUND)
-
- Libs/libclan-input-tty.so.$(D_VERSION_MINOR): $(OBJF_INPUT_TTY)
- @echo "Building tty input target"
-@@ -445,7 +445,7 @@
-
- Libs/libclan-display-x11.so.$(D_VERSION_MINOR): $(OBJF_DISP_X11)
- @echo "Building x11 target"
-- @$(LINK_COMMAND) -o Libs/libclan-display-x11.so.$(D_VERSION_MINOR) $(OBJF_DISP_X11) @x_libraries@
-+ @$(LINK_COMMAND) -Wl,-R$(X11BASE)/lib -o Libs/libclan-display-x11.so.$(D_VERSION_MINOR) $(OBJF_DISP_X11) @x_libraries@
-
- Libs/libclan-display-ptc.so.$(D_VERSION_MINOR): $(OBJF_DISP_PTC) Libs/libclan-display-x11.so.$(D_VERSION_MINOR)
- @echo "Building openptc target"
-@@ -456,7 +456,7 @@
- Libs/libclan-display-glx.so.$(D_VERSION_MINOR): $(OBJF_DISP_GLX) Libs/libclan-display-x11.so.$(D_VERSION_MINOR)
- @echo "Building glx target"
- @ln -s -f Libs/libclan-display-x11.so.$(D_VERSION_MINOR) .
-- @$(LINK_COMMAND) -L Libs -Wl,-rpath,$(TARGET_PREFIX) libclan-display-x11.so.$(D_VERSION_MINOR) -o Libs/libclan-display-glx.so.$(D_VERSION_MINOR) $(OBJF_DISP_GLX) @x_libraries@ -lGL -lGLU
-+ @$(LINK_COMMAND) -L Libs -Wl,-R$(X11BASE)/lib libclan-display-x11.so.$(D_VERSION_MINOR) -o Libs/libclan-display-glx.so.$(D_VERSION_MINOR) $(OBJF_DISP_GLX) @x_libraries@ -lGL -lGLU
- @rm -f libclan-display-x11.so.$(D_VERSION_MINOR)
-
- Libs/libclan-display-ggi.so.$(D_VERSION_MINOR): $(OBJF_DISP_GGI)
diff --git a/graphics/clanlib/patches/patch-ai b/graphics/clanlib/patches/patch-ai
deleted file mode 100644
index d95f699f8ae..00000000000
--- a/graphics/clanlib/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2003/06/10 00:22:33 jmc Exp $
---- configure.orig Tue May 9 14:46:48 2000
-+++ configure Fri Mar 23 08:37:24 2001
-@@ -2199,7 +2199,7 @@
-
-
-
--libs="-ldl -lz -lHermes -lpthread"
-+libs="-lz -lHermes -lpthread"
-
- objf_nondyn=""
- flag_tty=""
-@@ -2217,7 +2217,6 @@
- if test "$flag_tty" = "yes"; then objf_nondyn="\$(OBJF_INPUT_TTY) $objf_nondyn"; fi
- fi
-
--x_libraries="$x_libraries -lXxf86vm"
-
-
-
diff --git a/graphics/clanlib/patches/patch-aj b/graphics/clanlib/patches/patch-aj
deleted file mode 100644
index 56295c6c645..00000000000
--- a/graphics/clanlib/patches/patch-aj
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2001/01/01 07:51:10 toshii Exp $
-
---- Sources/Core/SurfaceProviders/provider_pcx.cpp.orig Sun Apr 9 21:18:02 2000
-+++ Sources/Core/SurfaceProviders/provider_pcx.cpp
-@@ -113,10 +113,14 @@
-
- datafile->seek(4, CL_InputSource::seek_set);
-
-- short xmin = datafile->read_short16();
-- short ymin = datafile->read_short16();
-- short xmax = datafile->read_short16();
-- short ymax = datafile->read_short16();
-+ short xmin = datafile->read_uchar8() |
-+ (datafile->read_char8() << 8);
-+ short ymin = datafile->read_uchar8() |
-+ (datafile->read_char8() << 8);
-+ short xmax = datafile->read_uchar8() |
-+ (datafile->read_char8() << 8);
-+ short ymax = datafile->read_uchar8() |
-+ (datafile->read_char8() << 8);
-
- pitch = xmax - xmin + 1;
- height = ymax - ymin + 1;
diff --git a/graphics/clanlib/patches/patch-ak b/graphics/clanlib/patches/patch-ak
deleted file mode 100644
index 096ec17b453..00000000000
--- a/graphics/clanlib/patches/patch-ak
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2001/04/02 20:16:42 wrstuden Exp $
---- Sources/Core/SurfaceProviders/provider_targa.cpp.orig Sat Mar 24 10:39:52 2001
-+++ Sources/Core/SurfaceProviders/provider_targa.cpp Sat Mar 24 10:46:53 2001
-@@ -151,8 +151,7 @@
- // read or skip the colormap (rgb-palette)
- if (colormaptype == 1)
- {
-- map_length = *((unsigned short *) &file[5]);
-- SWAP_IF_BIG(map_length);
-+ map_length = file[5] + 256 * file[6];
- unsigned char map_size = file[7]>>3;
-
- if (!read_colormap)
-@@ -194,13 +193,11 @@
- }
-
- // read pitch, height and bits-pr-pixel
-- pitch = *((unsigned short *) &file[12]);
-- SWAP_IF_BIG(pitch);
-+ pitch = file[12] + 256 * file[13];
- bounding_left = pitch;
- bounding_right = 0;
-
-- height = *((unsigned short *) &file[14]);
-- SWAP_IF_BIG(height);
-+ height = file[14] + 256 * file[15];
- bounding_top = height;
- bounding_bottom = 0;
-
-@@ -456,8 +453,7 @@
- }
- else
- {
-- entry = *((unsigned short *) &file[pos]);
-- SWAP_IF_BIG(entry);
-+ entry = file[pos] + 256 * file[pos + 1];
- pos += 2;
- }
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 20:57:15 +0000