From 4e183c66e98860fb75fb08c931025f63ebf75867 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Fri, 20 Oct 2006 19:41:00 +0000 Subject: Add comments to patches and enable the previously disabled patches. --- debian/patches/00_create-libdir.patch | 6 ++++++ debian/patches/01_fix-makefile.patch | 3 +++ debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch | 4 ++++ debian/patches/03_handle-sync-and-dont-unlock-display.patch | 5 +++++ debian/patches/series | 2 ++ 5 files changed, 20 insertions(+) (limited to 'debian') diff --git a/debian/patches/00_create-libdir.patch b/debian/patches/00_create-libdir.patch index 99f02f7bdc1..cc59325ac74 100644 --- a/debian/patches/00_create-libdir.patch +++ b/debian/patches/00_create-libdir.patch @@ -1,3 +1,9 @@ +Patch that allows the Mesa makefile to create a LIB_DIR that is more than one +level below TOP. + +This patch by Thierry Reding. +Not submitted to Mesa. + --- a/src/Makefile +++ b/src/Makefile @@ -29,7 +29,7 @@ diff --git a/debian/patches/01_fix-makefile.patch b/debian/patches/01_fix-makefile.patch index e3cd732aa73..f599d8438e1 100644 --- a/debian/patches/01_fix-makefile.patch +++ b/debian/patches/01_fix-makefile.patch @@ -4,6 +4,9 @@ OSMesa in a separate package. Fix Mesa makefile to install the libGL and libOSMesa libraries when they exist, not only depending on configuration. +This patch by Thierry Reding. +Hunk #2 submitted to Mesa and applied (post 6.5.1). + --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -107,7 +107,7 @@ diff --git a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch index 3a06acd0ffe..d219de8f267 100644 --- a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch +++ b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch @@ -1,3 +1,7 @@ +Patch that fixes Debian bug #349437. + +This patch by David Nusinow. + --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -146,8 +146,9 @@ diff --git a/debian/patches/03_handle-sync-and-dont-unlock-display.patch b/debian/patches/03_handle-sync-and-dont-unlock-display.patch index c9089ef86ed..d29769e4330 100644 --- a/debian/patches/03_handle-sync-and-dont-unlock-display.patch +++ b/debian/patches/03_handle-sync-and-dont-unlock-display.patch @@ -1,3 +1,8 @@ +Patch that fixes Debian bug #391681. + +This patch by Josh Triplett. +Submitted to Mesa and applied (post 6.5.1). + --- a/src/glx/x11/glxext.c +++ b/src/glx/x11/glxext.c @@ -1016,11 +1016,11 @@ diff --git a/debian/patches/series b/debian/patches/series index 9616a12dfdc..31078561786 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ 00_create-libdir.patch 01_fix-makefile.patch +02_use-ieee-fp-on-s390-and-m68k.patch +03_handle-sync-and-dont-unlock-display.patch -- cgit v1.2.3