Bug#448791: mplayer: FTBFS on GNU/kFreeBSD

[Petr Salinger]

Package: mplayer
Severity: important
Version: 1.0~rc2-4
Tags: patch
User: [EMAIL PROTECTED]
Usertags: kfreebsd


Hi,

the current version fails to build on GNU/kFreeBSD.

Please find attached patch to fix that.
It also enables runtime cpudetection in debian/rules.

It would also be nice if you can ask upstream
to include changes for configure and stream/tvi_bsdbt848.c.

Thanks in advance

                        Petr
diff -u mplayer-1.0~rc2/debian/rules mplayer-1.0~rc2/debian/rules
--- mplayer-1.0~rc2/debian/rules
+++ mplayer-1.0~rc2/debian/rules
@@ -95,9 +95,11 @@
 endif
 ifeq ($(arch),kfreebsd-i386)
   with_real_and_xanim = true
+  DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
 endif
 ifeq ($(arch),kfreebsd-amd64)
   with_real_and_xanim = true
+  DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
 endif
 ifeq ($(arch),powerpc)
   with_real_and_xanim = true
only in patch2:
unchanged:
--- mplayer-1.0~rc2.orig/stream/tvi_bsdbt848.c
+++ mplayer-1.0~rc2/stream/tvi_bsdbt848.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/filio.h>
only in patch2:
unchanged:
--- mplayer-1.0~rc2.orig/configure
+++ mplayer-1.0~rc2/configure
@@ -6728,6 +6728,7 @@
             "dev/ic/bt8xx.h" ; do
     cat > $TMPC <<EOF
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <$file>
 int main(void) {
  ioctl(0, TVTUNER_GETFREQ, 0);