Package: mpg123
Severity: important
Version: 0.60-2
Tags: patch
Hi,
the current version fails to build on GNU/kFreeBSD.
It needs changes to configure.ac/configure and also
to debian packaging.
Please apply attached patch and regenerate configure.
It would also be nice if you can ask upstream
to include changes to configure.ac.
Thanks in advance
Petr
diff -u mpg123-0.60/configure.ac mpg123-0.60/configure.ac
--- mpg123-0.60/configure.ac
+++ mpg123-0.60/configure.ac
@@ -205,19 +205,19 @@
arm-*-linux*)
cpu_type="generic_nofpu"
;;
- i386-*-linux*)
+ i386-*-linux*|i386-*-kfreebsd*-gnu)
cpu_type="i386_fpu"
;;
- i486-*-linux*)
+ i486-*-linux*|i486-*-kfreebsd*-gnu)
cpu_type="i486"
;;
- i586-*-linux*)
+ i586-*-linux*|i586-*-kfreebsd*-gnu)
cpu_type="i586"
;;
- i686-*-linux*)
+ i686-*-linux*|i686-*-kfreebsd*-gnu)
cpu_type="mmx"
;;
- *-*-linux*)
+ *-*-linux*|*-*-kfreebsd*-gnu)
cpu_type="generic_fpu"
;;
*-apple-darwin*)
diff -u mpg123-0.60/debian/control mpg123-0.60/debian/control
--- mpg123-0.60/debian/control
+++ mpg123-0.60/debian/control
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Daniel Kobras <[EMAIL PROTECTED]>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>> 5), autotools-dev, pkg-config, libesd0-dev [i386
alpha powerpc], libaudio-dev [i386], libasound2-dev
+Build-Depends: debhelper (>> 5), autotools-dev, pkg-config, libesd0-dev [i386
kfreebsd-i386 alpha powerpc], libaudio-dev [i386 kfreebsd-i386], libasound2-dev
[!kfreebsd-i386 !kfreebsd-amd64]
Package: mpg123
-Architecture: i386 alpha powerpc m68k arm sparc hppa
+Architecture: i386 kfreebsd-i386 alpha powerpc m68k arm sparc hppa
Depends: ${shlibs:Depends}, oss-compat
Provides: mp3-decoder
Description: MPEG layer 1/2/3 audio player
@@ -22,7 +22,7 @@
want this version.
Package: mpg123-oss-i486
-Architecture: i386
+Architecture: i386 kfreebsd-i386
Depends: ${shlibs:Depends}, oss-compat
Provides: mpg123, mp3-decoder
Conflicts: mpg123 (<< 0.59r-2)
@@ -39,7 +39,7 @@
CPUs.
Package: mpg123-oss-3dnow
-Architecture: i386
+Architecture: i386 kfreebsd-i386
Depends: ${shlibs:Depends}, oss-compat
Provides: mpg123, mp3-decoder
Conflicts: mpg123 (<< 0.59r-2)
@@ -56,7 +56,7 @@
CPUs.
Package: mpg123-esd
-Architecture: i386 alpha powerpc
+Architecture: i386 kfreebsd-i386 alpha powerpc
Depends: ${shlibs:Depends}
Provides: mpg123, mp3-decoder
Conflicts: mpg123 (<< 0.59r-2)
@@ -72,7 +72,7 @@
This version uses the Enlightened Sound Daemon (esound) for sound output.
Package: mpg123-nas
-Architecture: i386
+Architecture: i386 kfreebsd-i386
Depends: ${shlibs:Depends}
Provides: mpg123, mp3-decoder
Conflicts: mpg123 (<< 0.59r-2)
diff -u mpg123-0.60/debian/rules mpg123-0.60/debian/rules
--- mpg123-0.60/debian/rules
+++ mpg123-0.60/debian/rules
@@ -3,6 +3,7 @@
PACKAGE:=mpg123
ARCH:=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH_OS:=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
ARCH_i486:=
ARCH_alpha:=-alpha
@@ -13,7 +14,10 @@
ARCH_hppa:=-hppa
TARGETS_i486:=mpg123-oss mpg123-esd mpg123-nas \
- mpg123-oss-i486 mpg123-oss-3dnow mpg123-alsa
+ mpg123-oss-i486 mpg123-oss-3dnow
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+TARGETS_i486 += mpg123-alsa
+endif
TARGETS_alpha:=mpg123-oss mpg123-esd
TARGETS_powerpc:=mpg123-oss mpg123-esd
TARGETS_m68k:=mpg123-oss
