[arch-commits] Commit in mplayer/repos (testing-i686 testing-i686/ivtv_2.6.24.patch)

[Paul Mattal]

    Date: Wednesday, June 25, 2008 @ 22:02:12
  Author: paul
Revision: 3622

Merged revisions 3617-3621 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/mplayer/trunk

........
  r3621 | paul | 2008-06-25 22:01:25 -0400 (Wed, 25 Jun 2008) | 2 lines
  
  committed missing patch
........

Added:
  mplayer/repos/testing-i686/ivtv_2.6.24.patch
    (from rev 3621, mplayer/trunk/ivtv_2.6.24.patch)
Modified:
  mplayer/repos/testing-i686/	(properties)

-------------------+
 ivtv_2.6.24.patch |   33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)


Property changes on: mplayer/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /mplayer/trunk:1-3616
   + /mplayer/trunk:1-3621

Copied: mplayer/repos/testing-i686/ivtv_2.6.24.patch (from rev 3621, mplayer/trunk/ivtv_2.6.24.patch)
===================================================================
--- testing-i686/ivtv_2.6.24.patch	                        (rev 0)
+++ testing-i686/ivtv_2.6.24.patch	2008-06-26 02:02:12 UTC (rev 3622)
@@ -0,0 +1,33 @@
+Patch to account for linux-2.6.24.x including ivtv, but MPlayer won't
+build against it.  See this link for more information and the origin
+of the patch:
+http://archives.free.net.ph/message/20080201.201454.1047775e.en.html
+Thanks to Robby Workman for pointing me to this one.
+
+diff -Nur MPlayer-1.0rc2.orig/configure MPlayer-1.0rc2/configure
+---  MPlayer-1.0rc2.orig/configure	2007-10-07 21:49:33.000000000 +0200
++++  MPlayer-1.0rc2/configure	2008-03-10 10:27:29.000000000 +0100
+@@ -4920,7 +4920,7 @@
+ echores "$_dxr3"
+ 
+ 
+-echocheck "IVTV TV-Out"
++echocheck "IVTV TV-Out (pre linux-2.6.24)"
+ if test "$_ivtv" = auto ; then
+   cat > $TMPC << EOF
+ #include <stdlib.h>
+@@ -4928,7 +4928,13 @@
+ #include <linux/types.h>
+ #include <linux/videodev2.h>
+ #include <linux/ivtv.h>
+-int main(void) { return 0; }
++#include <sys/ioctl.h>
++int main(void) { 
++struct ivtv_cfg_stop_decode sd;
++struct ivtv_cfg_start_decode sd1;
++ioctl (0, IVTV_IOC_START_DECODE, &sd1);
++ioctl (0, IVTV_IOC_STOP_DECODE, &sd);
++return 0; }
+ EOF
+   _ivtv=no
+   cc_check && _ivtv=yes