--- Begin Message ---
Source: libsdl1.2
Source-Version: 1.2.14-6.1
Severity: normal
Tags: patch
Hi!
Here are several fixes to the build infrastructure, I'm attaching only
three patches because several of the changes touch the same lines, so
this avoids ordering and conflict resolution from your side, if you'd
prefer me to split each logical change into different patches, please
say so, and I'll resubmit.
Here's a description of each fix/change:
* Build-Depends:
- Remove libarts1-dev only libartsc0-dev seems to be needed, this
also matches the dependency from the -dev package.
- Change nasm arches from i386 kfreebsd-i386 to any-i386
- Change libasound2-dev arches from !kfreebsd-i386 !kfreebsd-amd64
!hurd-i386 to linux-any.
- Change libusbhid-dev arches from kfreebsd-i386 kfreebsd-amd64 to
kfreebsd-any.
- Line-wrapped the field, so that changes are easier to see in the
future.
* Use DEB_HOST_ARCH* variables instead of DEB_BUILD_ARCH* (HOST is
the target system, BUILD is the building one). This will fix
cross-compilation support (although I've not tested if there's
anything else to fix for that).
* Fix configure flags:
- Update --enable-dlopen to --enable-sdl-dlopen (although it's yes
by default).
- Remove inexistent --enable-dependency-tracking option.
- Refactor --disable-video-ggi into confflags.
- Add --enable-nas-shared=no to be consistent with the other audio
plugins.
- Add --enable-x11-shared=no, the reason for this one is that this way
we get proper dependencies, which otherwise we lack. The fact the
the -all package is getting an libx11 dependency at all is actually
a bug in the aalib package, which once fixed will imply libsdl does
not depend on libx11 at all.
- Add a new flavour_conffflags variable with all video plugins
disabled except for x11, which will match with the description
of the packages. And use the flag on the flavour configure calls.
- Add a print line stating the current flavour being configured and
its configure flags, to ease tracking what's going on.
I've not removed the inexistent --enable-debug option because the code
handling noop should probably set the correct CFLAGS then, which I've
not had time to implement and test.
thanks,
guillem
>From 3401e3adac731ec5449a46c8750e693635c9cf0f Mon Sep 17 00:00:00 2001
From: Guillem Jover <[email protected]>
Date: Mon, 21 Feb 2011 05:22:22 +0100
Subject: [PATCH 1/3] Fix Build-Depends
---
debian/control | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/debian/control b/debian/control
index 984d137..9bd622a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,12 @@ Section: libs
Maintainer: Debian SDL packages maintainers <[email protected]>
Uploaders: Sam Hocevar (Debian packages) <[email protected]>, Aurelien Jarno <[email protected]>, Josselin Mouette <[email protected]>, Barry deFreese <[email protected]>
Standards-Version: 3.8.4
-Build-Depends: dpkg (>= 1.13.2), debhelper (>= 5.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x11proto-core-dev, libaudiofile-dev, libesd0-dev, libpulse-dev, libgl1-mesa-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libcaca-dev, libdirectfb-dev (>= 1.0) [!hurd-i386], libusbhid-dev [kfreebsd-i386 kfreebsd-amd64], libglu1-mesa-dev
+Build-Depends: dpkg (>= 1.13.2), debhelper (>= 5.0), quilt, nasm [any-i386],
+ libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x11proto-core-dev,
+ libaudiofile-dev, libesd0-dev, libpulse-dev, libgl1-mesa-dev,
+ libsvga1-dev [amd64 i386], libartsc0-dev, libasound2-dev [linux-any],
+ libaudio-dev, libcaca-dev, libdirectfb-dev (>= 1.0) [!hurd-i386],
+ libusbhid-dev [kfreebsd-any], libglu1-mesa-dev
Vcs-Svn: svn://svn.debian.org/pkg-sdl/unstable/libsdl.2
Vcs-Browser: http://svn.debian.org/wsvn/pkg-sdl/unstable/libsdl1.2/
Homepage: http://www.libsdl.org/
--
1.7.4.1
>From 1854e262f9ba2aae37d1dd7bdf8615acdd427d66 Mon Sep 17 00:00:00 2001
From: Guillem Jover <[email protected]>
Date: Mon, 21 Feb 2011 05:23:02 +0100
Subject: [PATCH 2/3] Fix dpkg-architecture variables
---
debian/rules | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/rules b/debian/rules
index e30753d..99483f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,11 +14,11 @@ endif
export SHLIBVER=(>= 1.2.10-1)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
export DEB_HOST_GNU_TYPE
export DEB_BUILD_GNU_TYPE
@@ -57,24 +57,24 @@ else
endif
# Only build SVGA support on linux-x86 and linux-amd64
-ifneq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386))
+ifneq (,$(findstring $(DEB_HOST_ARCH),amd64 i386))
all_confflags += --enable-video-svga
else
all_confflags += --disable-video-svga
endif
# Only use NASM routines on x86 CPUs
-ifeq ($(DEB_BUILD_ARCH_CPU),i386)
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
confflags += --enable-nasm
endif
# Don't use PlayStation 3 Cell driver on powerpc
-ifeq ($(DEB_BUILD_ARCH_CPU),powerpc)
+ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
confflags += --enable-video-ps3=no \
--disable-altivec
endif
# Only build ALSA support on Linux targets
-ifeq ($(DEB_BUILD_ARCH_OS),linux)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
FLAVOURS += alsa
no_libasound =
else
--
1.7.4.1
>From 9804172760620a7db8d51da395b084215c5dbd69 Mon Sep 17 00:00:00 2001
From: Guillem Jover <[email protected]>
Date: Mon, 21 Feb 2011 05:23:33 +0100
Subject: [PATCH 3/3] Fix configure flags
---
debian/rules | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/debian/rules b/debian/rules
index 99483f3..c96c578 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,14 +24,17 @@ export DEB_HOST_GNU_TYPE
export DEB_BUILD_GNU_TYPE
confflags = --prefix=/usr
-confflags += --disable-rpath --enable-dlopen \
- --enable-dependency-tracking \
+confflags += --disable-rpath --enable-sdl-dlopen \
+ --disable-video-ggi \
--enable-arts-shared=no --enable-alsa-shared=no \
- --enable-esd-shared=no --enable-pulseaudio-shared=no
-all_confflags = --disable-video-ggi \
- --enable-video-aalib --enable-video-directfb \
+ --enable-esd-shared=no --enable-pulseaudio-shared=no \
+ --enable-nas-shared=no --enable-x11-shared=no
+flavour_conffflags = --enable-video-x11 \
+ --disable-video-directfb --disable-video-svga \
+ --disable-video-aalib --disable-video-caca
+all_confflags = --enable-video-directfb --enable-video-aalib \
--enable-video-caca
-udeb_confflags = --enable-video-directfb --disable-video-ggi \
+udeb_confflags = --enable-video-directfb \
--disable-video-svga --disable-video-x11 \
--disable-video-aalib --disable-dga --disable-video-photon \
--disable-video-fbcon --disable-video-ps2gs \
@@ -92,7 +95,7 @@ configure-stamp:
elif ( [ "$$dir" = "udeb" ] ); then \
SWITCHES="$(udeb_confflags)"; \
else \
- SWITCHES=""; \
+ SWITCHES="$(flavour_conffflags)"; \
for switch in $(FLAVOURS); do \
if ( [ "$$dir" = "$$switch" ] ); then \
SWITCHES="$$SWITCHES --enable-$$switch"; \
@@ -102,6 +105,7 @@ configure-stamp:
done; \
fi; \
mkdir -p builddir/$$dir; \
+ echo "Configuring flavour $$dir with flags: $$SWITCHES"; \
(cd builddir/$$dir; ../../configure $(confflags) $$SWITCHES); \
done
touch configure-stamp
--
1.7.4.1
--- End Message ---
