Here is really the patch. Sorry.
Regards,
--
Sam.
diff -puriN libsdl1.2-1.2.7+1.2.8cvs20041007.orig/debian/changelog
libsdl1.2-1.2.7+1.2.8cvs20041007-x/debian/changelog
--- libsdl1.2-1.2.7+1.2.8cvs20041007.orig/debian/changelog 2005-07-14
01:17:37.000000000 +0200
+++ libsdl1.2-1.2.7+1.2.8cvs20041007-x/debian/changelog 2005-07-13
22:03:09.000000000 +0200
@@ -1,3 +1,24 @@
+libsdl1.2 (1.2.7+1.2.8cvs20041007-5.1) unstable; urgency=low
+
+ * Non-maintainer upload (libslang2 transition, Xorg transition).
+ * debian/control:
+ + Build-depend on libaa1-dev instead of aalib1-dev (Closes: #315561,
+ Closes: #317578).
+ + No longer build-depend on slang1-dev because aalib1-dev now depends on
+ libslang2-dev. As a result, the package builds fine with the UTF-8
+ version of slang (Closes: #304998).
+ + Build-depend on dpkg (>= 1.13.2) because debian/rules's use of
+ DEB_BUILD_ARCH_OS.
+ + Make libsdl1.2-dev depend on libglu1-xorg-dev.
+ * debian/patches/debian/patches/006_gcc4_build.diff:
+ + Patch courtesy of Sebastien Bacher to fix gcc-4 build (Closes: #308590).
+ * debian/rules:
+ + Cause the build rule to fail when a compilation error occurs.
+ + Use DEB_BUILD_ARCH_OS instead of DEB_BUILD_GNU_SYSTEM so that the ALSA
+ version is built on Linux (Closes: #314866).
+
+ -- Sam Hocevar (Debian packages) <[EMAIL PROTECTED]> Wed, 13 Jul 2005
19:33:46 +0200
+
libsdl1.2 (1.2.7+1.2.8cvs20041007-5) unstable; urgency=high
* Hopefully makes Sarge, as it includes a bug fix
diff -puriN libsdl1.2-1.2.7+1.2.8cvs20041007.orig/debian/control
libsdl1.2-1.2.7+1.2.8cvs20041007-x/debian/control
--- libsdl1.2-1.2.7+1.2.8cvs20041007.orig/debian/control 2005-07-14
01:17:37.000000000 +0200
+++ libsdl1.2-1.2.7+1.2.8cvs20041007-x/debian/control 2005-07-14
01:17:03.000000000 +0200
@@ -4,7 +4,7 @@ Section: libs
Maintainer: Debian SDL maintainers <[EMAIL PROTECTED]>
Uploaders: Matthew Danish <[EMAIL PROTECTED]>, Zephaniah E. Hull <[EMAIL
PROTECTED]>, Lawrence Williams <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>> 3.0.0), dbs, aalib1-dev, slang1-dev, xlibs-dev,
libaudiofile-dev, libesd0-dev, xlibmesa-dev | libgl-dev, libsvga1-dev [i386],
libarts1-dev, libartsc0-dev, libasound2-dev [alpha arm hppa i386 ia64 m68k mips
mipsel powerpc s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64 amd64 ppc64],
type-handling (>= 0.2.1), libaudio-dev, automake1.7
+Build-Depends: dpkg (>= 1.13.2), debhelper (>> 3.0.0), dbs, libaa1-dev,
xlibs-dev, libaudiofile-dev, libesd0-dev, xlibmesa-dev | libgl-dev,
libsvga1-dev [i386], libarts1-dev, libartsc0-dev, libasound2-dev [i386 ia64
alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb
sh4 sh4eb sparc ppc64], type-handling (>= 0.2.1), libaudio-dev, automake1.7
Package: libsdl1.2debian
Architecture: any
@@ -106,7 +106,7 @@ Description: Simple DirectMedia Layer (w
Package: libsdl1.2-dev
Architecture: any
Section: libdevel
-Depends: libsdl1.2debian (= ${Source-Version}), libxt-dev | xlibs-dev (>>
4.1.0), libxext-dev | xlibs-dev (>> 4.1.0), xlibmesa-glu-dev | libglu-dev,
${libsvga1-dev}, libasound2-dev, aalib1-dev, libaudio-dev, libartsc0-dev,
libesd0-dev
+Depends: libsdl1.2debian (= ${Source-Version}), libxt-dev | xlibs-dev (>>
4.1.0), libxext-dev | xlibs-dev (>> 4.1.0), libglu1-xorg-dev, ${libsvga1-dev},
libasound2-dev, libaa1-dev, libaudio-dev, libartsc0-dev, libesd0-dev
Replaces: libsdl-dev, libsdl0.11-dev, libsdl1.0-dev, libsdl1.1-dev
Conflicts: xlibs-pic (<< 4.1.0-10), libsdl-dev, libsdl0.11-dev, libsdl0.11,
libsdl1.0-dev, libsdl1.1-dev
Provides: libsdl-dev
diff -puriN libsdl1.2-1.2.7+1.2.8cvs20041007.orig/debian/control.in
libsdl1.2-1.2.7+1.2.8cvs20041007-x/debian/control.in
--- libsdl1.2-1.2.7+1.2.8cvs20041007.orig/debian/control.in 2005-07-14
01:17:37.000000000 +0200
+++ libsdl1.2-1.2.7+1.2.8cvs20041007-x/debian/control.in 2005-07-13
21:01:17.000000000 +0200
@@ -4,7 +4,7 @@ Section: libs
Maintainer: Debian SDL maintainers <[EMAIL PROTECTED]>
Uploaders: Matthew Danish <[EMAIL PROTECTED]>, Zephaniah E. Hull <[EMAIL
PROTECTED]>, Lawrence Williams <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>> 3.0.0), dbs, aalib1-dev, slang1-dev, xlibs-dev,
libaudiofile-dev, libesd0-dev, xlibmesa-dev | libgl-dev, libsvga1-dev [i386],
libarts1-dev, libartsc0-dev, libasound2-dev [EMAIL PROTECTED]@ ppc64],
type-handling (>= 0.2.1), libaudio-dev, automake1.7
+Build-Depends: dpkg (>= 1.13.2), debhelper (>> 3.0.0), dbs, libaa1-dev,
xlibs-dev, libaudiofile-dev, libesd0-dev, xlibmesa-dev | libgl-dev,
libsvga1-dev [i386], libarts1-dev, libartsc0-dev, libasound2-dev [EMAIL
PROTECTED]@ ppc64], type-handling (>= 0.2.1), libaudio-dev, automake1.7
Package: libsdl1.2debian
Architecture: any
@@ -106,7 +106,7 @@ Description: Simple DirectMedia Layer (w
Package: libsdl1.2-dev
Architecture: any
Section: libdevel
-Depends: libsdl1.2debian (= ${Source-Version}), libxt-dev | xlibs-dev (>>
4.1.0), libxext-dev | xlibs-dev (>> 4.1.0), xlibmesa-glu-dev | libglu-dev,
[EMAIL PROTECTED]@, aalib1-dev, libaudio-dev, libartsc0-dev, libesd0-dev
+Depends: libsdl1.2debian (= ${Source-Version}), libxt-dev | xlibs-dev (>>
4.1.0), libxext-dev | xlibs-dev (>> 4.1.0), libglu1-xorg-dev, [EMAIL
PROTECTED]@, libaa1-dev, libaudio-dev, libartsc0-dev, libesd0-dev
Replaces: libsdl-dev, libsdl0.11-dev, libsdl1.0-dev, libsdl1.1-dev
Conflicts: xlibs-pic (<< 4.1.0-10), libsdl-dev, libsdl0.11-dev, libsdl0.11,
libsdl1.0-dev, libsdl1.1-dev
Provides: libsdl-dev
diff -puriN
libsdl1.2-1.2.7+1.2.8cvs20041007.orig/debian/patches/006_gcc4_build.diff
libsdl1.2-1.2.7+1.2.8cvs20041007-x/debian/patches/006_gcc4_build.diff
--- libsdl1.2-1.2.7+1.2.8cvs20041007.orig/debian/patches/006_gcc4_build.diff
1970-01-01 01:00:00.000000000 +0100
+++ libsdl1.2-1.2.7+1.2.8cvs20041007-x/debian/patches/006_gcc4_build.diff
2005-07-13 20:07:14.000000000 +0200
@@ -0,0 +1,135 @@
+--- SDL-1.2.8/src/hermes/HeadMMX.h.gcc4 2001-04-26 12:45:45.000000000
-0400
++++ SDL-1.2.8/src/hermes/HeadMMX.h 2005-04-14 07:00:01.390719842 -0400
+@@ -50,21 +50,19 @@
+ extern "C" {
+ #endif
+
+- void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias
("_ConvertMMX")));
+-#if 0
+- void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias
("_ClearMMX_32")));
+- void ClearMMX_24(HermesClearInterface *) __attribute__ ((alias
("_ClearMMX_24")));
+- void ClearMMX_16(HermesClearInterface *) __attribute__ ((alias
("_ClearMMX_16")));
+- void ClearMMX_8(HermesClearInterface *) __attribute__ ((alias
("_ClearMMX_8")));
+-
+- void ConvertMMXp32_16RGB555() __attribute__ ((alias
("_ConvertMMXp32_16RGB555")));
+-#endif
+-
+- void ConvertMMXpII32_24RGB888() __attribute__ ((alias
("_ConvertMMXpII32_24RGB888")));
+- void ConvertMMXpII32_16RGB565() __attribute__ ((alias
("_ConvertMMXpII32_16RGB565")));
+- void ConvertMMXpII32_16BGR565() __attribute__ ((alias
("_ConvertMMXpII32_16BGR565")));
+- void ConvertMMXpII32_16RGB555() __attribute__ ((alias
("_ConvertMMXpII32_16RGB555")));
+- void ConvertMMXpII32_16BGR555() __attribute__ ((alias
("_ConvertMMXpII32_16BGR555")));
++ extern void _ConvertMMX(HermesConverterInterface *);
++ extern void _ConvertMMXpII32_24RGB888();
++ extern void _ConvertMMXpII32_16RGB565();
++ extern void _ConvertMMXpII32_16BGR565();
++ extern void _ConvertMMXpII32_16RGB555();
++ extern void _ConvertMMXpII32_16BGR555();
++
++ #define ConvertMMX _ConvertMMX
++ #define ConvertMMXpII32_24RGB888 _ConvertMMXpII32_24RGB888
++ #define ConvertMMXpII32_16RGB565 _ConvertMMXpII32_16RGB565
++ #define ConvertMMXpII32_16BGR565 _ConvertMMXpII32_16BGR565
++ #define ConvertMMXpII32_16RGB555 _ConvertMMXpII32_16RGB555
++ #define ConvertMMXpII32_16BGR555 _ConvertMMXpII32_16BGR555
+
+ #ifdef __cplusplus
+ }
+--- SDL-1.2.8/src/hermes/HeadX86.h.gcc4 2002-06-08 13:45:39.000000000
-0400
++++ SDL-1.2.8/src/hermes/HeadX86.h 2005-04-14 07:04:00.579143961 -0400
+@@ -79,56 +79,47 @@
+ extern "C" {
+ #endif
+
+- int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU")));
++ extern int _Hermes_X86_CPU();
+
+- void ConvertX86(HermesConverterInterface *) __attribute__ ((alias
("_ConvertX86")));
++ extern void _ConvertX86(HermesConverterInterface *);
++
++ extern void _ConvertX86p32_32BGR888();
++ extern void _ConvertX86p32_32RGBA888();
++ extern void _ConvertX86p32_32BGRA888();
++ extern void _ConvertX86p32_24RGB888();
++ extern void _ConvertX86p32_24BGR888();
++ extern void _ConvertX86p32_16RGB565();
++ extern void _ConvertX86p32_16BGR565();
++ extern void _ConvertX86p32_16RGB555();
++ extern void _ConvertX86p32_16BGR555();
++ extern void _ConvertX86p32_8RGB332();
++
++ extern void _ConvertX86p16_16BGR565();
++ extern void _ConvertX86p16_16RGB555();
++ extern void _ConvertX86p16_16BGR555();
++ extern void _ConvertX86p16_8RGB332();
++
++
++ #define Hermes_X86_CPU _Hermes_X86_CPU
++
++ #define ConvertX86 _ConvertX86
++
++ #define ConvertX86p32_32BGR888 _ConvertX86p32_32BGR888
++ #define ConvertX86p32_32RGBA888 _ConvertX86p32_32RGBA888
++ #define ConvertX86p32_32BGRA888 _ConvertX86p32_32BGRA888
++ #define ConvertX86p32_24RGB888 _ConvertX86p32_24RGB888
++ #define ConvertX86p32_24BGR888 _ConvertX86p32_24BGR888
++ #define ConvertX86p32_16RGB565 _ConvertX86p32_16RGB565
++ #define ConvertX86p32_16BGR565 _ConvertX86p32_16BGR565
++ #define ConvertX86p32_16RGB555 _ConvertX86p32_16RGB555
++ #define ConvertX86p32_16BGR555 _ConvertX86p32_16BGR555
++ #define ConvertX86p32_8RGB332 _ConvertX86p32_8RGB332
++
++ #define ConvertX86p16_16BGR565 _ConvertX86p16_16BGR565
++ #define ConvertX86p16_16RGB555 _ConvertX86p16_16RGB555
++ #define ConvertX86p16_16BGR555 _ConvertX86p16_16BGR555
++ #define ConvertX86p16_8RGB332 _ConvertX86p16_8RGB332
+
+-#if 0
+- void ClearX86_32(HermesClearInterface *) __attribute__ ((alias
("_ClearX86_32")));
+- void ClearX86_24(HermesClearInterface *) __attribute__ ((alias
("_ClearX86_24")));
+- void ClearX86_16(HermesClearInterface *) __attribute__ ((alias
("_ClearX86_16")));
+- void ClearX86_8(HermesClearInterface *) __attribute__ ((alias
("_ClearX86_8")));
+-#endif
+-
+- void ConvertX86p32_32BGR888() __attribute__ ((alias
("_ConvertX86p32_32BGR888")));
+- void ConvertX86p32_32RGBA888() __attribute__ ((alias
("_ConvertX86p32_32RGBA888")));
+- void ConvertX86p32_32BGRA888() __attribute__ ((alias
("_ConvertX86p32_32BGRA888")));
+- void ConvertX86p32_24RGB888() __attribute__ ((alias
("_ConvertX86p32_24RGB888")));
+- void ConvertX86p32_24BGR888() __attribute__ ((alias
("_ConvertX86p32_24BGR888")));
+- void ConvertX86p32_16RGB565() __attribute__ ((alias
("_ConvertX86p32_16RGB565")));
+- void ConvertX86p32_16BGR565() __attribute__ ((alias
("_ConvertX86p32_16BGR565")));
+- void ConvertX86p32_16RGB555() __attribute__ ((alias
("_ConvertX86p32_16RGB555")));
+- void ConvertX86p32_16BGR555() __attribute__ ((alias
("_ConvertX86p32_16BGR555")));
+- void ConvertX86p32_8RGB332() __attribute__ ((alias
("_ConvertX86p32_8RGB332")));
+-
+-#if 0
+- void ConvertX86p16_32RGB888() __attribute__ ((alias
("_ConvertX86p16_32RGB888")));
+- void ConvertX86p16_32BGR888() __attribute__ ((alias
("_ConvertX86p16_32BGR888")));
+- void ConvertX86p16_32RGBA888() __attribute__ ((alias
("_ConvertX86p16_32RGBA888")));
+- void ConvertX86p16_32BGRA888() __attribute__ ((alias
("_ConvertX86p16_32BGRA888")));
+- void ConvertX86p16_24RGB888() __attribute__ ((alias
("_ConvertX86p16_24RGB888")));
+- void ConvertX86p16_24BGR888() __attribute__ ((alias
("_ConvertX86p16_24BGR888")));
+-#endif
+- void ConvertX86p16_16BGR565() __attribute__ ((alias
("_ConvertX86p16_16BGR565")));
+- void ConvertX86p16_16RGB555() __attribute__ ((alias
("_ConvertX86p16_16RGB555")));
+- void ConvertX86p16_16BGR555() __attribute__ ((alias
("_ConvertX86p16_16BGR555")));
+- void ConvertX86p16_8RGB332() __attribute__ ((alias
("_ConvertX86p16_8RGB332")));
+-
+-#if 0
+- void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte")));
+- void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte")));
+- void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte")));
+- void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte")));
+-
+- void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32")));
+- void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
+- void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
+-
+- extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias
("_ConvertX86p16_32RGB888_LUT_X86")));
+- extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias
("_ConvertX86p16_32BGR888_LUT_X86")));
+- extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias
("_ConvertX86p16_32RGBA888_LUT_X86")));
+- extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias
("_ConvertX86p16_32BGRA888_LUT_X86")));
+-#endif
+
+ #ifdef __cplusplus
+ }
diff -puriN libsdl1.2-1.2.7+1.2.8cvs20041007.orig/debian/rules
libsdl1.2-1.2.7+1.2.8cvs20041007-x/debian/rules
--- libsdl1.2-1.2.7+1.2.8cvs20041007.orig/debian/rules 2005-07-14
01:17:37.000000000 +0200
+++ libsdl1.2-1.2.7+1.2.8cvs20041007-x/debian/rules 2005-07-13
21:02:39.000000000 +0200
@@ -11,7 +11,7 @@ export SHLIBVER=(>> 1.2.7+1.2.8)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
export DEB_HOST_GNU_TYPE
export DEB_BUILD_GNU_TYPE
@@ -32,7 +32,7 @@ MAKEFILE_INS:=$(shell find $(BUILD_DIR)
SOUNDS=arts esd oss nas
-ifeq ($(DEB_BUILD_GNU_SYSTEM),linux)
+ifeq ($(DEB_BUILD_ARCH_OS),linux)
SOUNDS += alsa
libasound = , libasound2-dev
no_libasound =
@@ -88,7 +88,7 @@ $(STAMP_DIR)/build: $(STAMP_DIR)/configu
dh_testdir
for sound in all $(SOUNDS); do \
- $(MAKE) -C $(PWD)/$(SOURCE_DIR)/$$sound; \
+ $(MAKE) -C $(PWD)/$(SOURCE_DIR)/$$sound || exit 1; \
done
touch $(STAMP_DIR)/build
