[packages/Glide_V2] - rediffed patches, pass AR to remove 'l' option, which changed meaning
qboosh
qboosh at pld-linux.org
Mon Sep 26 20:38:59 CEST 2022
commit 4d7201fdd0c4f950a2a314da3977b61ae8e53e56
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Sep 26 20:39:24 2022 +0200
- rediffed patches, pass AR to remove 'l' option, which changed meaning
Glide_V2.spec | 1 +
glide-format.patch | 8 ++++----
glide-gcc4.patch | 24 ++++++++++++------------
glide-morearchs.patch | 16 ++++++++++------
4 files changed, 27 insertions(+), 22 deletions(-)
---
diff --git a/Glide_V2.spec b/Glide_V2.spec
index 99979af..0376acc 100644
--- a/Glide_V2.spec
+++ b/Glide_V2.spec
@@ -102,6 +102,7 @@ ln glide3x/README README.glide3x
# Make sure we build for Voodoo2
export FX_GLIDE_HW=cvg
%{__make} -j1 V2 \
+ AR="ar csr" \
CC="%{__cc}" \
CNODEBUG="%{rpmcflags} %{!?debug:-fomit-frame-pointer -funroll-loops} \
%{!?debug:-fexpensive-optimizations -ffast-math -DBIG_OPT}" \
diff --git a/glide-format.patch b/glide-format.patch
index 4b5e63a..be51bd0 100644
--- a/glide-format.patch
+++ b/glide-format.patch
@@ -9,9 +9,9 @@
} /* tlErrorMessage */
#else
---- GlideV2/glide3x/cvg/glide3/tests/tlib.c.orig 2000-04-20 23:26:36.000000000 +0200
-+++ GlideV2/glide3x/cvg/glide3/tests/tlib.c 2013-09-21 07:44:29.182138177 +0200
-@@ -1433,7 +1433,7 @@
+--- GlideV2/glide3x/cvg/glide3/tests/tlib.c.orig 2022-09-26 19:01:38.655859903 +0200
++++ GlideV2/glide3x/cvg/glide3/tests/tlib.c 2022-09-26 19:02:06.205710653 +0200
+@@ -1540,7 +1540,7 @@ char tlGetCH( void ) {
FxBool
tlErrorMessage( char *err) {
@@ -19,7 +19,7 @@
+ fputs(err, stderr);
} /* tlErrorMessage */
- #else
+ FxU32
--- GlideV2/swlibs/fxmisc/fximg.c.orig 2000-04-20 23:26:42.000000000 +0200
+++ GlideV2/swlibs/fxmisc/fximg.c 2013-09-21 08:00:09.335790777 +0200
@@ -1879,8 +1879,8 @@
diff --git a/glide-gcc4.patch b/glide-gcc4.patch
index c028e62..25e9c1f 100644
--- a/glide-gcc4.patch
+++ b/glide-gcc4.patch
@@ -1,6 +1,6 @@
---- GlideV2/glide2x.orig/cvg/glide/tests/display.c
-+++ GlideV2/glide2x/cvg/glide/tests/display.c
-@@ -65,6 +65,10 @@ static const char *sourceFormatString[]
+--- GlideV2/glide2x/cvg/glide/tests/display.c.orig 2000-04-20 23:26:36.000000000 +0200
++++ GlideV2/glide2x/cvg/glide/tests/display.c 2022-09-26 18:54:14.561599102 +0200
+@@ -67,6 +67,10 @@ static const char *sourceFormatString[]
"GR_LFB_SRC_FMT_ZA16 "
};
@@ -9,9 +9,9 @@
+ GrLfbSrcFmt_t format,
+ FxU32 *bpp );
- int main( int argc, char **argv)
- {
-@@ -91,11 +95,6 @@ int main( int argc, char **argv)
+ void main( int argc, char **argv) {
+ char match;
+@@ -92,11 +96,6 @@ void main( int argc, char **argv) {
static FxU32 imageWidth;
static FxU32 imageHeight;
@@ -23,9 +23,9 @@
srcfname[0] = 0;
dstfname[0] = 0;
---- GlideV2/glide2x.orig/cvg/glide/tests/test26.c
-+++ GlideV2/glide2x/cvg/glide/tests/test26.c
-@@ -57,6 +57,10 @@ static const char *sourceFormatString[]
+--- GlideV2/glide2x/cvg/glide/tests/test26.c.orig 2022-09-26 18:51:04.199297049 +0200
++++ GlideV2/glide2x/cvg/glide/tests/test26.c 2022-09-26 18:55:25.641214031 +0200
+@@ -59,6 +59,10 @@ static const char *sourceFormatString[]
"GR_LFB_SRC_FMT_ZA16 "
};
@@ -34,9 +34,9 @@
+ GrLfbSrcFmt_t format,
+ FxU32 *bpp );
- int main( int argc, char **argv) {
+ void main( int argc, char **argv) {
char match;
-@@ -80,11 +84,6 @@ int main( int argc, char **argv) {
+@@ -82,11 +86,6 @@ void main( int argc, char **argv) {
static FxU32 imageWidth;
static FxU32 imageHeight;
@@ -46,7 +46,7 @@
- FxU32 *bpp );
-
/* Process Command Line Arguments */
- while( (rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs )) ) {
+ while( rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs ) ) {
if ( rv == -1 ) {
--- GlideV2/glide3x.orig/cvg/glide3/tests/display.c
+++ GlideV2/glide3x/cvg/glide3/tests/display.c
diff --git a/glide-morearchs.patch b/glide-morearchs.patch
index 30ac936..ffdd6a5 100644
--- a/glide-morearchs.patch
+++ b/glide-morearchs.patch
@@ -1,6 +1,6 @@
---- GlideV2/glide2x/cvg/init/sst1init.h.orig 2013-09-21 07:41:42.484397830 +0200
-+++ GlideV2/glide2x/cvg/init/sst1init.h 2013-09-21 07:46:29.837739823 +0200
-@@ -163,4 +163,16 @@
+--- GlideV2/glide2x/cvg/init/sst1init.h.orig 2022-09-26 18:55:51.354408063 +0200
++++ GlideV2/glide2x/cvg/init/sst1init.h 2022-09-26 19:00:30.416229589 +0200
+@@ -163,6 +163,18 @@ p6Fence(void);
#elif defined (__GNUC__) && defined(__i386__)
# define P6FENCE asm("xchg %%eax,%0" : /*outputs*/ : "m" (p6FenceVar) : \
"eax");
@@ -17,6 +17,8 @@
+#elif defined(__sparc__)
+# define P6FENCE asm volatile("" ::: "memory");
#else
+ # error "P6 Fencing in-line assembler code needs to be added for this compiler"
+ #endif
--- GlideV2/glide2x/cvg/glide/src/cpudetect.c.orig 2000-04-20 23:26:36.000000000 +0200
+++ GlideV2/glide2x/cvg/glide/src/cpudetect.c 2013-09-21 08:28:32.804847399 +0200
@@ -34,14 +34,25 @@
@@ -55,9 +57,9 @@
-CFLAGS = -g $(GCFLAGS) $(LCFLAGS) $(VCFLAGS)
+CFLAGS = -g $(GCFLAGS) $(LCFLAGS) $(VCFLAGS) -fPIC
endif
---- GlideV2/glide3x/cvg/init/sst1init.h.orig 2013-09-21 07:41:42.484397830 +0200
-+++ GlideV2/glide3x/cvg/init/sst1init.h 2013-09-21 07:46:29.837739823 +0200
-@@ -163,4 +163,16 @@
+--- GlideV2/glide3x/cvg/init/sst1init.h.orig 2022-09-26 18:55:51.354408063 +0200
++++ GlideV2/glide3x/cvg/init/sst1init.h 2022-09-26 19:00:56.486088357 +0200
+@@ -163,6 +163,18 @@ p6Fence(void);
#elif defined (__GNUC__) && defined(__i386__)
# define P6FENCE asm("xchg %%eax,%0" : /*outputs*/ : "m" (p6FenceVar) : \
"eax");
@@ -74,6 +76,8 @@
+#elif defined(__sparc__)
+# define P6FENCE asm volatile("" ::: "memory");
#else
+ # error "P6 Fencing in-line assembler code needs to be added for this compiler"
+ #endif
--- GlideV2/glide3x/cvg/glide3/src/makefile.linux.orig 2000-04-20 23:26:39.000000000 +0200
+++ GlideV2/glide3x/cvg/glide3/src/makefile.linux 2013-09-21 14:30:15.403246286 +0200
@@ -144,7 +144,7 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Glide_V2.git/commitdiff/4d7201fdd0c4f950a2a314da3977b61ae8e53e56
More information about the pld-cvs-commit
mailing list