Author: pebender
Date: Fri Mar 27 22:27:23 2009
New Revision: 4524
Modified:
trunk/gar-minimyth/script/xorg-7.3/Mesa/checksums
trunk/gar-minimyth/script/xorg-7.3/Mesa/files/Mesa-7.2-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/Mesa/checksums
trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.2-pkg_config.patch
Log:
- Removed cruft from patch.
Modified: trunk/gar-minimyth/script/xorg-7.3/Mesa/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/Mesa/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.3/Mesa/checksums Fri Mar 27 22:27:23
2009
@@ -2,7 +2,7 @@
42e3c6c6d156cd9dc545dbef72407354 download/MesaGLUT-7.2.tar.gz
10c762e39486df395838af1d7b57e69c download/MesaDemos-7.2.tar.gz
1a2f05fe6c7f9160260ad9298dd43830 download/Mesa-7.2-x8r8g8b8_fbconfig.patch
-dcd054163689e2092de934621501bbdd download/Mesa-7.2-pkg_config.patch
+8dac7dd01432a5ce88d74e3e60839585 download/Mesa-7.2-pkg_config.patch
448c672648563c41617ea8c4e9501a86 download/Mesa-7.2-gen_matypes.patch
676c751777e479e67dfa7b98216a375b download/Mesa-7.2.patch.gar
e749207a68341fcd930ab60756e28e67 download/Mesa-7.2-version.patch
Modified:
trunk/gar-minimyth/script/xorg-7.3/Mesa/files/Mesa-7.2-pkg_config.patch
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/Mesa/files/Mesa-7.2-pkg_config.patch
(original)
+++ trunk/gar-minimyth/script/xorg-7.3/Mesa/files/Mesa-7.2-pkg_config.patch
Fri Mar 27 22:27:23 2009
@@ -87,112 +87,6 @@
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-diff -Naur Mesa-7.2-old/k Mesa-7.2-new/k
---- Mesa-7.2-old/k 1969-12-31 16:00:00.000000000 -0800
-+++ Mesa-7.2-new/k 2009-01-15 20:55:54.000000000 -0800
-@@ -0,0 +1,102 @@
-+# Default/template configuration
-+
-+# This is included by other config files which may override some
-+# of these variables.
-+# Think of this as a base class from which configs are derived.
-+
-+
-+CONFIG_NAME = default
-+
-+# Version info
-+MESA_MAJOR=7
-+MESA_MINOR=1
-+MESA_TINY=0
-+MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
-+
-+# external projects. This should be useless now that we use libdrm.
-+DRM_SOURCE_PATH=$(TOP)/../drm
-+
-+# Compiler and flags
-+CC = cc
-+CXX = CC
-+CFLAGS = -O
-+CXXFLAGS = -O
-+LDFLAGS =
-+GLU_CFLAGS =
-+
-+# Misc tools and flags
-+SHELL = /bin/sh
-+MKLIB = $(SHELL) $(TOP)/bin/mklib
-+MKLIB_OPTIONS =
-+MKDEP = makedepend
-+MKDEP_OPTIONS = -fdepend
-+MAKE = make
-+INSTALL = $(SHELL) $(TOP)/bin/minstall
-+
-+# Tools for regenerating glapi (generally only needed by the developers)
-+PYTHON2 = python
-+PYTHON_FLAGS = -t -O -O
-+INDENT = indent
-+INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
-+
-+# Library names (base name)
-+GL_LIB = GL
-+GLU_LIB = GLU
-+GLUT_LIB = glut
-+GLW_LIB = GLw
-+OSMESA_LIB = OSMesa
-+
-+
-+# Library names (actual file names)
-+GL_LIB_NAME = lib$(GL_LIB).so
-+GLU_LIB_NAME = lib$(GLU_LIB).so
-+GLUT_LIB_NAME = lib$(GLUT_LIB).so
-+GLW_LIB_NAME = lib$(GLW_LIB).so
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
-+
-+# globs used to install the lib and all symlinks
-+GL_LIB_GLOB = $(GL_LIB_NAME)*
-+GLU_LIB_GLOB = $(GLU_LIB_NAME)*
-+GLUT_LIB_GLOB = $(GLUT_LIB_NAME)*
-+GLW_LIB_GLOB = $(GLW_LIB_NAME)*
-+OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)*
-+
-+# Optional assembly language optimization files for libGL
-+ASM_SOURCES =
-+
-+# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to
GLW_LIB_DEPS in
-+# order to build the Motif widget too)
-+GLW_SOURCES = GLwDrawA.c
-+MOTIF_CFLAGS = -I/usr/include/Motif1.2
-+
-+
-+# Directories to build
-+LIB_DIR = lib
-+SRC_DIRS = mesa glu glut/glx glw
-+GLU_DIRS = sgi
-+DRIVER_DIRS = x11 osmesa
-+# Which subdirs under $(TOP)/progs/ to enter:
-+PROGRAM_DIRS = demos redbook samples glsl xdemos
-+
-+
-+# Library dependencies
-+#EXTRA_LIB_PATH ?=
-+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB)
$(EXTRA_LIB_PATH) -lX11 -lXmu -lXi -lm
-+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt
-lX11
-+
-+# Program dependencies - specific GL/glut libraries added in Makefiles
-+APP_LIB_DEPS = -lm
-+
-+
-+# Installation directories (for make install)
-+INSTALL_DIR = /usr/local
-+INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
-+INSTALL_INC_DIR = $(INSTALL_DIR)/include
-+DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
-+
-+# Where libGL will look for DRI hardware drivers
-+DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
-+
diff -Naur Mesa-7.2-old/src/glut/directfb/Makefile
Mesa-7.2-new/src/glut/directfb/Makefile
--- Mesa-7.2-old/src/glut/directfb/Makefile 2008-08-25 07:46:42.000000000
-0700
+++ Mesa-7.2-new/src/glut/directfb/Makefile 2009-01-15 20:55:54.000000000
-0800
Modified: trunk/gar-minimyth/script/xorg-7.4/Mesa/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/Mesa/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.4/Mesa/checksums Fri Mar 27 22:27:23
2009
@@ -2,7 +2,7 @@
42e3c6c6d156cd9dc545dbef72407354 download/MesaGLUT-7.2.tar.gz
10c762e39486df395838af1d7b57e69c download/MesaDemos-7.2.tar.gz
1a2f05fe6c7f9160260ad9298dd43830 download/Mesa-7.2-x8r8g8b8_fbconfig.patch
-dcd054163689e2092de934621501bbdd download/Mesa-7.2-pkg_config.patch
+8dac7dd01432a5ce88d74e3e60839585 download/Mesa-7.2-pkg_config.patch
448c672648563c41617ea8c4e9501a86 download/Mesa-7.2-gen_matypes.patch
676c751777e479e67dfa7b98216a375b download/Mesa-7.2.patch.gar
e749207a68341fcd930ab60756e28e67 download/Mesa-7.2-version.patch
Modified:
trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.2-pkg_config.patch
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.2-pkg_config.patch
(original)
+++ trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.2-pkg_config.patch
Fri Mar 27 22:27:23 2009
@@ -87,112 +87,6 @@
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-diff -Naur Mesa-7.2-old/k Mesa-7.2-new/k
---- Mesa-7.2-old/k 1969-12-31 16:00:00.000000000 -0800
-+++ Mesa-7.2-new/k 2009-01-15 20:55:54.000000000 -0800
-@@ -0,0 +1,102 @@
-+# Default/template configuration
-+
-+# This is included by other config files which may override some
-+# of these variables.
-+# Think of this as a base class from which configs are derived.
-+
-+
-+CONFIG_NAME = default
-+
-+# Version info
-+MESA_MAJOR=7
-+MESA_MINOR=1
-+MESA_TINY=0
-+MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
-+
-+# external projects. This should be useless now that we use libdrm.
-+DRM_SOURCE_PATH=$(TOP)/../drm
-+
-+# Compiler and flags
-+CC = cc
-+CXX = CC
-+CFLAGS = -O
-+CXXFLAGS = -O
-+LDFLAGS =
-+GLU_CFLAGS =
-+
-+# Misc tools and flags
-+SHELL = /bin/sh
-+MKLIB = $(SHELL) $(TOP)/bin/mklib
-+MKLIB_OPTIONS =
-+MKDEP = makedepend
-+MKDEP_OPTIONS = -fdepend
-+MAKE = make
-+INSTALL = $(SHELL) $(TOP)/bin/minstall
-+
-+# Tools for regenerating glapi (generally only needed by the developers)
-+PYTHON2 = python
-+PYTHON_FLAGS = -t -O -O
-+INDENT = indent
-+INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
-+
-+# Library names (base name)
-+GL_LIB = GL
-+GLU_LIB = GLU
-+GLUT_LIB = glut
-+GLW_LIB = GLw
-+OSMESA_LIB = OSMesa
-+
-+
-+# Library names (actual file names)
-+GL_LIB_NAME = lib$(GL_LIB).so
-+GLU_LIB_NAME = lib$(GLU_LIB).so
-+GLUT_LIB_NAME = lib$(GLUT_LIB).so
-+GLW_LIB_NAME = lib$(GLW_LIB).so
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
-+
-+# globs used to install the lib and all symlinks
-+GL_LIB_GLOB = $(GL_LIB_NAME)*
-+GLU_LIB_GLOB = $(GLU_LIB_NAME)*
-+GLUT_LIB_GLOB = $(GLUT_LIB_NAME)*
-+GLW_LIB_GLOB = $(GLW_LIB_NAME)*
-+OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)*
-+
-+# Optional assembly language optimization files for libGL
-+ASM_SOURCES =
-+
-+# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to
GLW_LIB_DEPS in
-+# order to build the Motif widget too)
-+GLW_SOURCES = GLwDrawA.c
-+MOTIF_CFLAGS = -I/usr/include/Motif1.2
-+
-+
-+# Directories to build
-+LIB_DIR = lib
-+SRC_DIRS = mesa glu glut/glx glw
-+GLU_DIRS = sgi
-+DRIVER_DIRS = x11 osmesa
-+# Which subdirs under $(TOP)/progs/ to enter:
-+PROGRAM_DIRS = demos redbook samples glsl xdemos
-+
-+
-+# Library dependencies
-+#EXTRA_LIB_PATH ?=
-+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB)
$(EXTRA_LIB_PATH) -lX11 -lXmu -lXi -lm
-+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt
-lX11
-+
-+# Program dependencies - specific GL/glut libraries added in Makefiles
-+APP_LIB_DEPS = -lm
-+
-+
-+# Installation directories (for make install)
-+INSTALL_DIR = /usr/local
-+INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
-+INSTALL_INC_DIR = $(INSTALL_DIR)/include
-+DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
-+
-+# Where libGL will look for DRI hardware drivers
-+DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
-+
diff -Naur Mesa-7.2-old/src/glut/directfb/Makefile
Mesa-7.2-new/src/glut/directfb/Makefile
--- Mesa-7.2-old/src/glut/directfb/Makefile 2008-08-25 07:46:42.000000000
-0700
+++ Mesa-7.2-new/src/glut/directfb/Makefile 2009-01-15 20:55:54.000000000
-0800
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
