--- configure.orig	2013-07-09 16:33:11 UTC
+++ configure
@@ -2676,7 +2676,7 @@ echocheck "pthread"
 if linux ; then
   THREAD_CFLAGS=-D_REENTRANT
 elif freebsd || netbsd || openbsd || bsdos ; then
-  THREAD_CFLAGS=-D_THREAD_SAFE
+  THREAD_CFLAGS=
 fi
 if test "$_pthreads" = auto ; then
 cat > $TMPC << EOF
@@ -2693,7 +2693,7 @@ int main(void) {
 EOF
 _pthreads=no
 if ! hpux ; then
-  for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
+  for _ld_tmp in "-lpthread" "-pthread" ; do
     # for crosscompilation, we cannot execute the program, be happy if we can link statically
     cc_check $THREAD_CFLAGS $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
   done
@@ -3961,11 +3961,7 @@ if test "$_v4l2" = auto ; then
   cat > $TMPC << EOF
 #include <sys/time.h>
 #include <linux/videodev2.h>
-#include <linux/version.h>
 int main(void) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-#error kernel headers too old, need 2.6.22
-#endif
   struct v4l2_ext_controls ctrls;
   ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG;
   return 0;
@@ -4940,7 +4936,7 @@ echores "$_tv_dshow"
 echocheck "Video 4 Linux 2 TV interface"
 if test "$_tv_v4l2" = auto ; then
   _tv_v4l2=no
-  if test "$_tv" = yes && linux ; then
+  if test "$_tv" = yes ; then
     header_check_broken sys/time.h linux/videodev2.h && _tv_v4l2=yes
   elif test "$_tv" = yes && test "$sys_videoio_h" = "yes" ; then
     _tv_v4l2=yes
@@ -4983,7 +4979,7 @@ echores "$_radio_capture"
 echocheck "Video 4 Linux 2 Radio interface"
 if test "$_radio_v4l2" = auto ; then
   _radio_v4l2=no
-  if test "$_radio" = yes && linux ; then
+  if test "$_radio" = yes ; then
     header_check linux/videodev2.h && _radio_v4l2=yes
   fi
 fi
@@ -5000,6 +4996,7 @@ echocheck "*BSD BrookTree 848 Radio inte
    _radio_bsdbt848=no
     cat > $TMPC <<EOF
 #include <sys/types.h>
+#include <sys/ioctl.h>
 $def_ioctl_bt848_h_name
 #ifdef IOCTL_BT848_H_NAME
 #include IOCTL_BT848_H_NAME
@@ -5024,7 +5021,7 @@ fi
 echocheck "Video 4 Linux 2 MPEG PVR interface"
 if test "$_pvr" = auto ; then
  _pvr=no
- if test "$_tv_v4l2" = yes && linux ; then
+ if test "$_tv_v4l2" = yes ; then
   cat > $TMPC <<EOF
 #include <sys/time.h>
 #include <linux/videodev2.h>
@@ -5296,7 +5293,7 @@ RST2MAN = $_rst2man
 EXESUF      = $_exesuf
 EXESUFS_ALL = .exe
 
-ARCH = $arch
+MPLAYER_ARCH = $arch
 $(mak_enable "$arch_all"    "$arch"    ARCH)
 $(mak_enable "$subarch_all" "$subarch" ARCH)
 $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)