Bug#636605: Please add multiarch support to libsdl

2011-12-14 Thread Felix Geyer 
tags 636605 pending
thanks

I have converted libsdl1.2 to multiarch in the new packaging git repository:
http://anonscm.debian.org/gitweb/?p=pkg-sdl/packages/libsdl1.2.git;a=commit;h=1478f5b606907e406faae95bc19edd1d3164fbf6

However I left the -dev package as it is since we don't seem to have a
proper way to handle *-config binaries and my guess is that many of the
build-dependencies are not multi-arch: same anyway.




-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636605: Please add multiarch support to libsdl

2011-12-04 Thread Felix Geyer 
On 04.12.2011 22:26, Vagrant Cascadian wrote:
> i went to look at multi-archifying this package, and lo and behold, there's a 
> standing patch... so i tested it. still seems to apply and build with 
> 1.2.14-6.4... and far as i can tell, works.
>
> are there other outstanding issues that still need to be resolved?

Yes, there are a few packages that reference libsdl1.2's .la file.
Converting libsdl1.2 for multiarch means changing the location of the
.la file so those packages should be fixed first.

I have already attached patches to the bug reports:
http://bugs.debian.org/633185
http://bugs.debian.org/633328
http://bugs.debian.org/633230

sdl-stretch is maintained by pkg-sdl and fixed in the git repository:
http://bugs.debian.org/633367

Felix



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636605: Please add multiarch support to libsdl

2011-12-04 Thread Vagrant Cascadian 
i went to look at multi-archifying this package, and lo and behold, there's a 
standing patch... so i tested it. still seems to apply and build with 
1.2.14-6.4... and far as i can tell, works.

are there other outstanding issues that still need to be resolved?

live well,
  vagrant



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636605: Please add multiarch support to libsdl

2011-08-07 Thread Riku Voipio 
On Sat, Aug 06, 2011 at 09:30:32AM +0200, Sven Joachim wrote:
> On 2011-08-05 11:31 +0200, Riku Voipio wrote:
> 
> > On Thu, Aug 04, 2011 at 04:47:06PM +0200, Sven Joachim wrote:
> >> > last is needed to support crosscompiling (so that /usr/bin/sdl-config is 
> >> > same on all archs,
> >> > allowing Multi-Arch: same setting for the -dev package).
> >> 
> >> There is a little problem with the latter, namely…
> >
> >> …it requires dpkg-dev (1.16.0 or later due to DEB_HOST_MULTIARCH) for
> >> dpkg-architecture.
> >
> > Easily fixed on the attached patch.
> 
> It seems you forgot to actually attach the patch.

lets try attaching again...
 
> I'm not sure that having libfoo-dev packages depend on dpkg-dev is
> desirable, although this currently seems to be the only way to retrieve
> the multiarch path.  Since there are many foo-config scripts in the
> archive, maybe this should be discussed with a broader audience,
> i.e. debian-devel?  

Mmm.. what would exactly be the question for debian-devel? Also, my in
experience posting to d-d rarely results useful responses. 

> See also http://bugs.debian.org/636352.

That is a bit different, I can understand that not everyone wants dpkg-dev
to build initramfs-tools. But for -dev packages dpkg-dev is most likely already
installed via build-essential. The only ones who would get an extra package 
install
are those who want to build sdl apps without debian packaging.

Riku

diff -u libsdl1.2-1.2.14/debian/control libsdl1.2-1.2.14/debian/control
--- libsdl1.2-1.2.14/debian/control
+++ libsdl1.2-1.2.14/debian/control
@@ -4,8 +4,8 @@
 Maintainer: Debian SDL packages maintainers 
 Uploaders: Barry deFreese 
 Standards-Version: 3.8.4
-Build-Depends: dpkg (>= 1.13.2),
-   debhelper (>= 5.0),
+Build-Depends: dpkg-dev (>= 1.16.0),
+   debhelper (>= 8.1.3),
quilt,
nasm [any-i386],
libx11-dev, 
@@ -27,7 +27,9 @@
 
 Package: libsdl1.2debian
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Replaces: libsdl1.2debian-all,
   libsdl1.2debian-alsa,
   libsdl1.2debian-esd,
@@ -65,6 +67,7 @@
  This version of SDL is compiled with directfb graphics and no sound.
 
 Package: libsdl1.2-dev
+Multi-Arch: same
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
@@ -77,7 +80,8 @@
  libcaca-dev,
  libusbhid-dev [kfreebsd-any],
  libxt-dev,
- libxext-dev
+ libxext-dev,
+ dpkg-dev (>= 1.16.0)
 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 -u libsdl1.2-1.2.14/debian/libsdl1.2debian.install libsdl1.2-1.2.14/debian/libsdl1.2debian.install
--- libsdl1.2-1.2.14/debian/libsdl1.2debian.install
+++ libsdl1.2-1.2.14/debian/libsdl1.2debian.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff -u libsdl1.2-1.2.14/debian/rules libsdl1.2-1.2.14/debian/rules
--- libsdl1.2-1.2.14/debian/rules
+++ libsdl1.2-1.2.14/debian/rules
@@ -19,11 +19,13 @@
 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_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export DEB_HOST_GNU_TYPE
 export DEB_BUILD_GNU_TYPE
 
-confflags = --prefix=/usr
+confflags = --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) 
+
 confflags += --disable-rpath --enable-sdl-dlopen --disable-loadso \
 	 --disable-video-ggi --disable-video-svga --disable-video-aalib \
 	 --disable-nas --disable-esd --disable-arts \
@@ -126,7 +128,10 @@
 	dh_installman -plibsdl1.2-dev debian/sdl-config.1
 	dh_installchangelogs
 	dh_install --sourcedir=debian/tmp
-	sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl1.2-dev/usr/lib/libSDL.la
+	sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl1.2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libSDL.la
+	mkdir -p  debian/libsdl1.2-dev/usr/bin debian/libsdl1.2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/sdl/
+	mv debian/tmp/usr/bin/sdl-config debian/libsdl1.2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/sdl/sdl-config
+	cp -a debian/sdl-config debian/libsdl1.2-dev/usr/bin/
 	dh_install --sourcedir=builddir/udeb/ -plibsdl1.2debian-udeb build/.libs/*.so.* usr/lib/;
 	rm -rf debian/libsdl1.2debian/usr/include
 	dh_strip
diff -u libsdl1.2-1.2.14/debian/libsdl1.2-dev.install libsdl1.2-1.2.14/debian/libsdl1.2-dev.install
--- libsdl1.2-1.2.14/debian/libsdl1.2-dev.install
+++ libsdl1.2-1.2.14/debian/libsdl1.2-dev.install
@@ -1,7 +1,6 @@
 usr/include/SDL
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/*.la
-usr/lib/pkgconfig
-usr/bin/sdl-config
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/*.la
+usr/lib/*/pkgconfig
 usr/share/aclocal/*
only in patch2:
unchanged:
--- libsdl1.2-1.2.14.orig

Bug#636605: Please add multiarch support to libsdl

2011-08-06 Thread Sven Joachim 
On 2011-08-05 11:31 +0200, Riku Voipio wrote:

> On Thu, Aug 04, 2011 at 04:47:06PM +0200, Sven Joachim wrote:
>> > last is needed to support crosscompiling (so that /usr/bin/sdl-config is 
>> > same on all archs,
>> > allowing Multi-Arch: same setting for the -dev package).
>> 
>> There is a little problem with the latter, namely…
>
>> …it requires dpkg-dev (1.16.0 or later due to DEB_HOST_MULTIARCH) for
>> dpkg-architecture.
>
> Easily fixed on the attached patch.

It seems you forgot to actually attach the patch.

I'm not sure that having libfoo-dev packages depend on dpkg-dev is
desirable, although this currently seems to be the only way to retrieve
the multiarch path.  Since there are many foo-config scripts in the
archive, maybe this should be discussed with a broader audience,
i.e. debian-devel?  See also http://bugs.debian.org/636352.

Cheers,
   Sven



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636605: Please add multiarch support to libsdl

2011-08-05 Thread Riku Voipio 
On Thu, Aug 04, 2011 at 04:47:06PM +0200, Sven Joachim wrote:
> > last is needed to support crosscompiling (so that /usr/bin/sdl-config is 
> > same on all archs,
> > allowing Multi-Arch: same setting for the -dev package).
> 
> There is a little problem with the latter, namely…

> …it requires dpkg-dev (1.16.0 or later due to DEB_HOST_MULTIARCH) for
> dpkg-architecture.

Easily fixed on the attached patch.

Other changes in the new patch, dpkg build-dep replaced with dpkg-dev >= 1.16.0
since DEB_HOST_MULTIARCH is used in rules as well. Missing Pre-Depends: added 
so that
multiarch-support is predepended when needed.

Riku



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636605: Please add multiarch support to libsdl

2011-08-04 Thread Sven Joachim 
On 2011-08-04 16:27 +0200, Riku Voipio wrote:

> The following patch adds multiarch support for libsdl1.2. It requires the 
> following changes:
>
> - debian/control changes (Multi-Arch: same and debhelper reqirement update)
> - move libs to /usr/lib/$DEB_HOST_MULTIARCH/
> - install a /usr/bin/sdl-config wrapper that calls 
> /usr/lib/$DEB_HOST_MULTIARCH/sdl-config
>
> last is needed to support crosscompiling (so that /usr/bin/sdl-config is same 
> on all archs,
> allowing Multi-Arch: same setting for the -dev package).

There is a little problem with the latter, namely…

> @@ -0,0 +1,5 @@
> +#!/bin/sh
> +# Generic multiarch wrapper for sdl-config
> +# Copyright (c) 2011 Riku Voipio 
> +
> +/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/sdl/sdl-config "$@"

…it requires dpkg-dev (1.16.0 or later due to DEB_HOST_MULTIARCH) for
dpkg-architecture.

Cheers,
   Sven



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636605: Please add multiarch support to libsdl

2011-08-04 Thread Riku Voipio 
Package: libsdl1.2debian
Version: 1.2.14-6.4
Severity: wishlist
User: debian-d...@lists.debian.org
Usertags: multiarch
Tags: patch

The following patch adds multiarch support for libsdl1.2. It requires the 
following changes:

- debian/control changes (Multi-Arch: same and debhelper reqirement update)
- move libs to /usr/lib/$DEB_HOST_MULTIARCH/
- install a /usr/bin/sdl-config wrapper that calls 
/usr/lib/$DEB_HOST_MULTIARCH/sdl-config

last is needed to support crosscompiling (so that /usr/bin/sdl-config is same 
on all archs,
allowing Multi-Arch: same setting for the -dev package).

See the following page for details:

http://wiki.debian.org/Multiarch/Implementation
 
diff -u libsdl1.2-1.2.14/debian/control libsdl1.2-1.2.14/debian/control
--- libsdl1.2-1.2.14/debian/control
+++ libsdl1.2-1.2.14/debian/control
@@ -5,7 +5,7 @@
 Uploaders: Barry deFreese 
 Standards-Version: 3.8.4
 Build-Depends: dpkg (>= 1.13.2),
-   debhelper (>= 5.0),
+   debhelper (>= 8.1.3),
quilt,
nasm [any-i386],
libx11-dev, 
@@ -27,6 +27,7 @@
 
 Package: libsdl1.2debian
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libsdl1.2debian-all,
   libsdl1.2debian-alsa,
@@ -65,6 +66,7 @@
  This version of SDL is compiled with directfb graphics and no sound.
 
 Package: libsdl1.2-dev
+Multi-Arch: same
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
diff -u libsdl1.2-1.2.14/debian/libsdl1.2debian.install libsdl1.2-1.2.14/debian/libsdl1.2debian.install
--- libsdl1.2-1.2.14/debian/libsdl1.2debian.install
+++ libsdl1.2-1.2.14/debian/libsdl1.2debian.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff -u libsdl1.2-1.2.14/debian/rules libsdl1.2-1.2.14/debian/rules
--- libsdl1.2-1.2.14/debian/rules
+++ libsdl1.2-1.2.14/debian/rules
@@ -19,11 +19,13 @@
 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_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export DEB_HOST_GNU_TYPE
 export DEB_BUILD_GNU_TYPE
 
-confflags = --prefix=/usr
+confflags = --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) 
+
 confflags += --disable-rpath --enable-sdl-dlopen --disable-loadso \
 	 --disable-video-ggi --disable-video-svga --disable-video-aalib \
 	 --disable-nas --disable-esd --disable-arts \
@@ -126,7 +128,10 @@
 	dh_installman -plibsdl1.2-dev debian/sdl-config.1
 	dh_installchangelogs
 	dh_install --sourcedir=debian/tmp
-	sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl1.2-dev/usr/lib/libSDL.la
+	sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl1.2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libSDL.la
+	mkdir -p  debian/libsdl1.2-dev/usr/bin debian/libsdl1.2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/sdl/
+	mv debian/tmp/usr/bin/sdl-config debian/libsdl1.2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/sdl/sdl-config
+	cp -a debian/sdl-config debian/libsdl1.2-dev/usr/bin/
 	dh_install --sourcedir=builddir/udeb/ -plibsdl1.2debian-udeb build/.libs/*.so.* usr/lib/;
 	rm -rf debian/libsdl1.2debian/usr/include
 	dh_strip
diff -u libsdl1.2-1.2.14/debian/libsdl1.2-dev.install libsdl1.2-1.2.14/debian/libsdl1.2-dev.install
--- libsdl1.2-1.2.14/debian/libsdl1.2-dev.install
+++ libsdl1.2-1.2.14/debian/libsdl1.2-dev.install
@@ -1,7 +1,6 @@
 usr/include/SDL
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/*.la
-usr/lib/pkgconfig
-usr/bin/sdl-config
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/*.la
+usr/lib/*/pkgconfig
 usr/share/aclocal/*
only in patch2:
unchanged:
--- libsdl1.2-1.2.14.orig/debian/sdl-config
+++ libsdl1.2-1.2.14/debian/sdl-config
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Generic multiarch wrapper for sdl-config
+# Copyright (c) 2011 Riku Voipio 
+
+/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/sdl/sdl-config "$@"