mesa: Changes to 'debian-experimental'
configs/debian-default | 1
debian/changelog | 7
debian/control | 9 -
debian/patches/04_cleanup-osmesa-configs.patch | 190 +++++++++++++++++++++++++
debian/patches/05_static-nonpic.patch | 60 +++++++
debian/patches/series | 2
6 files changed, 265 insertions(+), 4 deletions(-)
New commits:
commit 0bce6a189938b37489269c2a375274613f799c50
Author: Thierry Reding <thierry@gilfi.de>
Date: Mon Jan 8 11:43:25 2007 +0100
Compile with -O2 optimization instead of -O3 which might lead to problems.
diff --git a/configs/debian-default b/configs/debian-default
index 3412bb3..d13e551 100644
--- a/configs/debian-default
+++ b/configs/debian-default
@@ -2,6 +2,7 @@ # Define Debian-specific defaults.
CONFIG_NAME = debian-default
+OPT_FLAGS = -O2 -g
CFLAGS += -fno-strict-aliasing
SRC_DIRS = mesa
commit e71d6dbd9ccb0ab6e0a5131569cbfc293304840f
Author: Thierry Reding <thierry@gilfi.de>
Date: Mon Jan 8 11:41:02 2007 +0100
Make debugging symbol packages depend on the corresponding binary package and
put them into the libdevel section.
diff --git a/debian/changelog b/debian/changelog
index c26edbd..7d10f0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,13 @@ mesa (6.5.2-1) experimental; urgency=low
* Add patch 04_cleanup-osmesa-configs that makes the OSMesa configurations
behave as expected.
* Add patch 05_static-nonpic to build static libraries without -fPIC.
+ * Make debugging symbol packages depend on the corresponding binary package
+ and put them into the libdevel section.
[ Julien Cristau ]
* Drop obsolete depends on xlibs.
- -- Thierry Reding <thierry@gilfi.de> Mon, 8 Jan 2007 07:12:08 +0100
+ -- Thierry Reding <thierry@gilfi.de> Mon, 8 Jan 2007 11:37:11 +0100
mesa (6.5.2~rc3-0.1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index ddb6364..64c64de 100644
--- a/debian/control
+++ b/debian/control
@@ -28,9 +28,10 @@ Description: A free implementation of th
On Linux, this library is also known as libGL or libGL.so.1.
Package: libgl1-mesa-swx11-dbg
-Section: libs
+Section: libdevel
Priority: extra
Architecture: any
+Depends: libgl1-mesa-swx11 (= ${binary:Version})
Conflicts: libgl1-mesa-swrast-dbg
Provides: libgl1-mesa-swrast-dbg
Replaces: libgl1-mesa-swrast-dbg
@@ -115,9 +116,10 @@ Description: A free implementation of th
libgl1-mesa-swx11 package.
Package: libgl1-mesa-glx-dbg
-Section: libs
+Section: libdevel
Priority: extra
Architecture: any
+Depends: libgl1-mesa-glx (= ${binary:Version})
Description: A free implementation of the OpenGL API -- GLX runtime -- debugging symbols
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
@@ -171,9 +173,10 @@ Description: A free implementation of th
libgl1-mesa-swx11 package.
Package: libgl1-mesa-dri-dbg
-Section: libs
+Section: libdevel
Priority: extra
Architecture: any
+Depends: libgl1-mesa-dri (= ${binary:Version})
Description: A free implementation of the OpenGL API -- DRI modules -- debugging symbols
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
commit 132ecd19f3790e728390054c98a39d412e00e171
Author: Thierry Reding <thierry@gilfi.de>
Date: Mon Jan 8 10:07:08 2007 +0100
Do not build any linux*-static configuration with -fPIC.
diff --git a/debian/patches/05_static-nonpic.patch b/debian/patches/05_static-nonpic.patch
index e2df6e8..a6b7f40 100644
--- a/debian/patches/05_static-nonpic.patch
+++ b/debian/patches/05_static-nonpic.patch
@@ -1,3 +1,27 @@
+diff --git a/configs/linux-alpha-static b/configs/linux-alpha-static
+index 2a30af9..eb6a08a 100644
+--- a/configs/linux-alpha-static
++++ b/configs/linux-alpha-static
+@@ -11,6 +11,7 @@ CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM
+ CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE
+ GLUT_CFLAGS = -fexceptions
+ MKLIB_OPTIONS = -static
++PIC_FLAGS =
+
+
+ # Library names (actual file names)
+diff --git a/configs/linux-ppc-static b/configs/linux-ppc-static
+index d0e1688..3f3dc55 100644
+--- a/configs/linux-ppc-static
++++ b/configs/linux-ppc-static
+@@ -5,6 +5,7 @@ include $(TOP)/configs/linux-ppc
+ CONFIG_NAME = linux-ppc-static
+
+ MKLIB_OPTIONS = -static
++PIC_FLAGS =
+
+ # Library names (actual file names)
+ GL_LIB_NAME = libGL.a
diff --git a/configs/linux-static b/configs/linux-static
index 85141ea..1592668 100644
--- a/configs/linux-static
@@ -10,3 +34,27 @@ index 85141ea..1592668 100644
# Library names (actual file names)
GL_LIB_NAME = libGL.a
+diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static
+index 0257430..2d0b664 100644
+--- a/configs/linux-x86-64-static
++++ b/configs/linux-x86-64-static
+@@ -5,6 +5,7 @@ include $(TOP)/configs/linux-x86-64
+ CONFIG_NAME = linux-x86-64-static
+
+ MKLIB_OPTIONS = -static
++PIC_FLAGS =
+
+ # Library names (actual file names)
+ GL_LIB_NAME = libGL.a
+diff --git a/configs/linux-x86-static b/configs/linux-x86-static
+index 9915987..e6a3696 100644
+--- a/configs/linux-x86-static
++++ b/configs/linux-x86-static
+@@ -5,6 +5,7 @@ include $(TOP)/configs/linux-x86
+ CONFIG_NAME = linux-x86-static
+
+ MKLIB_OPTIONS = -static
++PIC_FLAGS =
+
+ # Library names (actual file names)
+ GL_LIB_NAME = libGL.a
commit a404143f4c3d555efd478ff434d36964a6b8572a
Author: Thierry Reding <thierry@gilfi.de>
Date: Mon Jan 8 08:35:42 2007 +0100
Add patches 04_cleanup-osmesa-configs and 05_static-nonpic.
04_cleanup-osmesa-configs makes the OSMesa configurations behave as expected.
That is respect the OPT_FLAGS, PIC_FLAGS, ARCH_FLAGS and DEFINES variables.
The patch also makes the files more consistent by inheriting from more general
configurations.
05_static-nonpic fixes the linux-static configuration to not use -fPIC for
compiling code because it would violate Debian policy.
diff --git a/debian/changelog b/debian/changelog
index 42d955d..c26edbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,14 @@ mesa (6.5.2-1) experimental; urgency=low
* Set the Debian X Strike Force as maintainer.
* Add myself to uploaders.
* Build the i915tex DRI module on the i386 and amd64 architectures.
+ * Add patch 04_cleanup-osmesa-configs that makes the OSMesa configurations
+ behave as expected.
+ * Add patch 05_static-nonpic to build static libraries without -fPIC.
[ Julien Cristau ]
* Drop obsolete depends on xlibs.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Fri, 5 Jan 2007 15:44:16 +0100
+ -- Thierry Reding <thierry@gilfi.de> Mon, 8 Jan 2007 07:12:08 +0100
mesa (6.5.2~rc3-0.1) experimental; urgency=low
diff --git a/debian/patches/04_cleanup-osmesa-configs.patch b/debian/patches/04_cleanup-osmesa-configs.patch
new file mode 100644
index 0000000..6164e91
--- /dev/null
+++ b/debian/patches/04_cleanup-osmesa-configs.patch
@@ -0,0 +1,190 @@
+diff --git a/configs/linux-osmesa b/configs/linux-osmesa
+index cc1fbbd..aabab59 100644
+--- a/configs/linux-osmesa
++++ b/configs/linux-osmesa
+@@ -9,8 +9,18 @@ CONFIG_NAME = linux-osmesa
+ # Compiler and flags
+ CC = gcc
+ CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
+-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
++
++OPT_FLAGS ?=
++PIC_FLAGS = -fPIC
++
++DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
++ -D_BSD_SOURCE -D_GNU_SOURCE \
++ -DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
++
++CFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
++ $(ASM_FLAGS) -ffast-math
++
++CXXFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+
+
+ # Directories
+@@ -23,3 +33,4 @@ PROGRAM_DIRS = osdemos
+ OSMESA_LIB_DEPS = -lm -lpthread
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+ APP_LIB_DEPS = -lOSMesa -lGLU
++
+diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static
+index 465f83c..eb3575f 100644
+--- a/configs/linux-osmesa-static
++++ b/configs/linux-osmesa-static
+@@ -8,7 +8,8 @@ CONFIG_NAME = linux-osmesa-static
+
+ # Compiler and flags
+ MKLIB_OPTIONS = -static
++PIC_FLAGS =
+
+ # Library names
+-OSMESA_LIB_NAME = libOSMesa.a
++OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+
+diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16
+index 1fb0186..2a06254 100644
+--- a/configs/linux-osmesa16
++++ b/configs/linux-osmesa16
+@@ -1,28 +1,17 @@
+ # Configuration for 16 bits/channel OSMesa library on Linux
+
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa
+
+ CONFIG_NAME = linux-osmesa16
+
+-# Compiler and flags
+-CC = gcc
+-CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+-
++DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=32
+
+ # Library names
+ OSMESA_LIB = OSMesa16
+-OSMESA_LIB_NAME = libOSMesa16.so
+-
+
+ # Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+ PROGRAM_DIRS =
+
+-
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+-APP_LIB_DEPS = -lOSMesa16
++APP_LIB_DEPS = -l$(OSMESA_LIB)
++
+diff --git a/configs/linux-osmesa16-static b/configs/linux-osmesa16-static
+index 6645504..894cf82 100644
+--- a/configs/linux-osmesa16-static
++++ b/configs/linux-osmesa16-static
+@@ -1,28 +1,13 @@
+ # Configuration for 16 bits/channel OSMesa library on Linux
+
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa16
+
+ CONFIG_NAME = linux-osmesa16-static
+
+ # Compiler and flags
+-CC = gcc
+-CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+ MKLIB_OPTIONS = -static
+-
++PIC_FLAGS =
+
+ # Library names
+-OSMESA_LIB = OSMesa16
+-OSMESA_LIB_NAME = libOSMesa16.a
+-
+-
+-# Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+-PROGRAM_DIRS =
+-
++OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+
+-# Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-APP_LIB_DEPS = -lOSMesa16
+diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32
+index a1e5a35..5a703f6 100644
+--- a/configs/linux-osmesa32
++++ b/configs/linux-osmesa32
+@@ -1,28 +1,18 @@
+ # Configuration for 32 bits/channel OSMesa library on Linux
+
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa
+
+ CONFIG_NAME = linux-osmesa32
+
+ # Compiler and flags
+-CC = gcc
+-CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+-
++DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+
+ # Library names
+ OSMESA_LIB = OSMesa32
+-OSMESA_LIB_NAME = libOSMesa32.so
+-
+
+ # Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+ PROGRAM_DIRS =
+
+-
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+-APP_LIB_DEPS = -lOSMesa32
++APP_LIB_DEPS = -l$(OSMESA_LIB)
++
+diff --git a/configs/linux-osmesa32-static b/configs/linux-osmesa32-static
+index 6db8bc0..ecbb72e 100644
+--- a/configs/linux-osmesa32-static
++++ b/configs/linux-osmesa32-static
+@@ -1,28 +1,13 @@
+ # Configuration for 32 bits/channel OSMesa library on Linux
+
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa32
+
+ CONFIG_NAME = linux-osmesa32-static
+
+ # Compiler and flags
+-CC = gcc
+-CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+ MKLIB_OPTIONS = -static
+-
++PIC_FLAGS =
+
+ # Library names
+-OSMESA_LIB = OSMesa32
+-OSMESA_LIB_NAME = libOSMesa32.a
+-
+-
+-# Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+-PROGRAM_DIRS =
+-
++OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+
+-# Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-APP_LIB_DEPS = -lOSMesa32
diff --git a/debian/patches/05_static-nonpic.patch b/debian/patches/05_static-nonpic.patch
new file mode 100644
index 0000000..e2df6e8
--- /dev/null
+++ b/debian/patches/05_static-nonpic.patch
@@ -0,0 +1,12 @@
+diff --git a/configs/linux-static b/configs/linux-static
+index 85141ea..1592668 100644
+--- a/configs/linux-static
++++ b/configs/linux-static
+@@ -5,6 +5,7 @@ include $(TOP)/configs/linux
+ CONFIG_NAME = linux-static
+
+ MKLIB_OPTIONS = -static
++PIC_FLAGS =
+
+ # Library names (actual file names)
+ GL_LIB_NAME = libGL.a
diff --git a/debian/patches/series b/debian/patches/series
index b370d51..280a2f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
01_fix-makefile.patch
02_use-ieee-fp-on-s390-and-m68k.patch
03_optional-progs-and-install.patch
+04_cleanup-osmesa-configs.patch
+05_static-nonpic.patch
Reply to: