Attachment 160375 Details for Bug 202404 – v4l fix

[patch] v4l fix

mplayer2.v4lfix.diff (text/plain), 2.33 KB, created by Jan Beich on 2015-08-26 12:36:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-08-26 12:36:34 UTC

Size: 2.33 KB

patch

obsolete

>--- configure~
>+++ configure
>@@ -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>
>--- libvo/vo_v4l2.c~
>+++ libvo/vo_v4l2.c
>@@ -33,9 +33,7 @@
> #include <unistd.h>
> #include <stdlib.h>
> #include <inttypes.h>
>-#include <linux/types.h>
> #include <linux/videodev2.h>
>-#include <linux/ioctl.h>
> 
> #include "mp_msg.h"
> #include "subopt-helper.h"
>--- stream/stream_pvr.c~
>+++ stream/stream_pvr.c
>@@ -37,7 +37,6 @@
> #include <fcntl.h>
> #include <inttypes.h>
> #include <poll.h>
>-#include <linux/types.h>
> #include <linux/videodev2.h>
> 
> #include "mp_msg.h"
>--- stream/stream_radio.c~
>+++ stream/stream_radio.c
>@@ -40,17 +40,12 @@
> #ifdef IOCTL_BT848_H_NAME
> #include IOCTL_BT848_H_NAME
> #endif
>-
>-#else /* CONFIG_RADIO_BSDBT848 */
>-
>-#include <linux/types.h>
>+#endif
> 
> #ifdef CONFIG_RADIO_V4L2
> #include <linux/videodev2.h>
> #endif
> 
>-#endif // !IOCTL_BT848_H_NAME
>-
> 
> #include "stream.h"
> #include "libmpdemux/demuxer.h"

Actions: View | Diff

Attachments on bug 202404: 159969 | 159970 | 159998 | 160285 | 160300 | 160301 | 160366 | 160375 | 160377 | 160401 | 160430 | 160445 | 160503