mesa/mesa.patch.demos

Fri, 03 Aug 2012 20:11:53 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 03 Aug 2012 20:11:53 +0200
changeset 470
f8813e60f168
permissions
-rw-r--r--

Neutralize buggy code causing OpenPKG to have 'fatal problems' in
spite of correct installation, configuration, and operation. An
administrator suffering from this failure is even unable to
uninstall the flawed software.

     1 Index: progs/demos/Makefile
     2 diff -Nau progs/demos/Makefile.orig progs/demos/Makefile
     3 --- progs/demos/Makefile.orig	2008-08-25 16:46:41.000000000 +0200
     4 +++ progs/demos/Makefile	2008-11-26 21:42:37.000000000 +0100
     5 @@ -5,17 +5,17 @@
     7  INCDIR = $(TOP)/include
     9 -OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
    10 +OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(GLUT_LIB_DEPS)
    12 -OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
    13 +OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(GLUT_LIB_DEPS)
    15 -OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
    16 +OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(GLUT_LIB_DEPS)
    18  LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
    19  	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
    21  LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
    22 -	$(APP_LIB_DEPS)
    23 +	$(GLUT_LIB_DEPS)
    25  PROGS = \
    26  	arbfplight \
    27 @@ -125,14 +125,14 @@
    30  reflect: reflect.o showbuffer.o readtex.o
    31 -	$(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@
    32 +	$(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(OSMESA_LIBS) -o $@
    34  reflect.o: reflect.c showbuffer.h
    35  	$(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
    38  shadowtex: shadowtex.o showbuffer.o
    39 -	$(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
    40 +	$(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(OSMESA_LIBS) -o $@
    42  shadowtex.o: shadowtex.c showbuffer.h
    43  	$(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
    44 Index: progs/samples/Makefile
    45 diff -Nau progs/samples/Makefile.orig progs/samples/Makefile
    46 --- progs/samples/Makefile.orig	2008-08-25 16:46:42.000000000 +0200
    47 +++ progs/samples/Makefile	2008-11-26 21:46:18.000000000 +0100
    48 @@ -7,7 +7,7 @@
    50  LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
    52 -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
    53 +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(GLUT_LIB_DEPS)
    55  PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
    56  	font line logo nurb olympic overlay point prim quad select \
    57 @@ -28,6 +28,9 @@
    58  default: $(PROGS)
    61 +nurb: nurb.c
    62 +	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
    63 +
    64  sphere: sphere.o readtex.o
    65  	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) sphere.o readtex.o $(LIBS) -o $@
    67 Index: progs/xdemos/Makefile
    68 diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile
    69 --- progs/xdemos/Makefile.orig	2008-08-25 16:46:42.000000000 +0200
    70 +++ progs/xdemos/Makefile	2008-11-26 21:48:28.000000000 +0100
    71 @@ -8,7 +8,7 @@
    73  LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
    75 -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
    76 +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GLUT_LIB_DEPS)
    78  PROGS = \
    79  	corender \

mercurial