rpms/gecko-mediaplayer/F-8 .cvsignore, 1.3, 1.4 gecko-mediaplayer.spec, 1.4, 1.5 sources, 1.3, 1.4
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26506
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Log Message:
* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
- Updated to 0.8.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Aug 2008 08:46:07 -0000 1.3
+++ .cvsignore 29 Sep 2008 16:37:06 -0000 1.4
@@ -1 +1 @@
-gecko-mediaplayer-0.7.0.tar.gz
+gecko-mediaplayer-0.8.0.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-8/gecko-mediaplayer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gecko-mediaplayer.spec 17 Aug 2008 08:46:07 -0000 1.4
+++ gecko-mediaplayer.spec 29 Sep 2008 16:37:06 -0000 1.5
@@ -1,5 +1,5 @@
Name: gecko-mediaplayer
-Version: 0.7.0
+Version: 0.8.0
Release: 1.1%{?dist}
Summary: Gnome MPlayer browser plugin
@@ -95,6 +95,9 @@
%changelog
+* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
+- Updated to 0.8.0
+
* Sun Aug 17 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.7.0-1.1
- Updated to 0.7.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Aug 2008 08:46:07 -0000 1.3
+++ sources 29 Sep 2008 16:37:06 -0000 1.4
@@ -1 +1 @@
-813073c93ff61c002d7ef13a66640f88 gecko-mediaplayer-0.7.0.tar.gz
+bd46f98eac274a8572a61afce7fcd8d4 gecko-mediaplayer-0.8.0.tar.gz
16 years
rpms/gecko-mediaplayer/devel .cvsignore, 1.3, 1.4 gecko-mediaplayer.spec, 1.4, 1.5 sources, 1.3, 1.4
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26404
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Log Message:
* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
- Updated to 0.8.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Aug 2008 08:45:09 -0000 1.3
+++ .cvsignore 29 Sep 2008 16:36:57 -0000 1.4
@@ -1 +1 @@
-gecko-mediaplayer-0.7.0.tar.gz
+gecko-mediaplayer-0.8.0.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/gecko-mediaplayer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gecko-mediaplayer.spec 17 Aug 2008 08:45:09 -0000 1.4
+++ gecko-mediaplayer.spec 29 Sep 2008 16:36:57 -0000 1.5
@@ -1,5 +1,5 @@
Name: gecko-mediaplayer
-Version: 0.7.0
+Version: 0.8.0
Release: 1.1%{?dist}
Summary: Gnome MPlayer browser plugin
@@ -95,6 +95,9 @@
%changelog
+* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
+- Updated to 0.8.0
+
* Sun Aug 17 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.7.0-1.1
- Updated to 0.7.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Aug 2008 08:45:09 -0000 1.3
+++ sources 29 Sep 2008 16:36:57 -0000 1.4
@@ -1 +1 @@
-813073c93ff61c002d7ef13a66640f88 gecko-mediaplayer-0.7.0.tar.gz
+bd46f98eac274a8572a61afce7fcd8d4 gecko-mediaplayer-0.8.0.tar.gz
16 years
rpms/gecko-mediaplayer/F-9 .cvsignore, 1.3, 1.4 gecko-mediaplayer.spec, 1.4, 1.5 sources, 1.3, 1.4
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26296
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Log Message:
* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
- Updated to 0.8.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Aug 2008 08:38:43 -0000 1.3
+++ .cvsignore 29 Sep 2008 16:36:48 -0000 1.4
@@ -1 +1 @@
-gecko-mediaplayer-0.7.0.tar.gz
+gecko-mediaplayer-0.8.0.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-9/gecko-mediaplayer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gecko-mediaplayer.spec 17 Aug 2008 08:38:43 -0000 1.4
+++ gecko-mediaplayer.spec 29 Sep 2008 16:36:48 -0000 1.5
@@ -1,5 +1,5 @@
Name: gecko-mediaplayer
-Version: 0.7.0
+Version: 0.8.0
Release: 1.1%{?dist}
Summary: Gnome MPlayer browser plugin
@@ -95,6 +95,9 @@
%changelog
+* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
+- Updated to 0.8.0
+
* Sun Aug 17 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.7.0-1.1
- Updated to 0.7.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Aug 2008 08:38:43 -0000 1.3
+++ sources 29 Sep 2008 16:36:48 -0000 1.4
@@ -1 +1 @@
-813073c93ff61c002d7ef13a66640f88 gecko-mediaplayer-0.7.0.tar.gz
+bd46f98eac274a8572a61afce7fcd8d4 gecko-mediaplayer-0.8.0.tar.gz
16 years
rpms/gnome-mplayer/F-8 .cvsignore, 1.3, 1.4 gnome-mplayer.spec, 1.4, 1.5 sources, 1.3, 1.4
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26150
Modified Files:
.cvsignore gnome-mplayer.spec sources
Log Message:
* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
- Updated to 0.8.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Aug 2008 08:51:52 -0000 1.3
+++ .cvsignore 29 Sep 2008 16:35:04 -0000 1.4
@@ -1 +1 @@
-gnome-mplayer-0.7.0.tar.gz
+gnome-mplayer-0.8.0.tar.gz
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-8/gnome-mplayer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-mplayer.spec 6 Sep 2008 21:41:33 -0000 1.4
+++ gnome-mplayer.spec 29 Sep 2008 16:35:04 -0000 1.5
@@ -1,6 +1,6 @@
Name: gnome-mplayer
-Version: 0.7.0
-Release: 2.1%{?dist}
+Version: 0.8.0
+Release: 1.1%{?dist}
Summary: A simple MPlayer GUI
Group: Applications/Multimedia
@@ -96,6 +96,9 @@
%changelog
+* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
+- Updated to 0.8.0
+
* Sat Sep 6 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.7.0-2.1
- Added alsa-lib-devel to BuildRequires (livna bug #2084)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Aug 2008 08:51:52 -0000 1.3
+++ sources 29 Sep 2008 16:35:04 -0000 1.4
@@ -1 +1 @@
-6620bde9eb888c4e4784f5078f64bdaa gnome-mplayer-0.7.0.tar.gz
+a431750fe518f4dba882318b680e8e0f gnome-mplayer-0.8.0.tar.gz
16 years
rpms/gnome-mplayer/devel .cvsignore, 1.3, 1.4 gnome-mplayer.spec, 1.4, 1.5 sources, 1.3, 1.4
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26048
Modified Files:
.cvsignore gnome-mplayer.spec sources
Log Message:
* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
- Updated to 0.8.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Aug 2008 08:51:17 -0000 1.3
+++ .cvsignore 29 Sep 2008 16:34:55 -0000 1.4
@@ -1 +1 @@
-gnome-mplayer-0.7.0.tar.gz
+gnome-mplayer-0.8.0.tar.gz
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-mplayer.spec 6 Sep 2008 21:41:22 -0000 1.4
+++ gnome-mplayer.spec 29 Sep 2008 16:34:55 -0000 1.5
@@ -1,6 +1,6 @@
Name: gnome-mplayer
-Version: 0.7.0
-Release: 2.1%{?dist}
+Version: 0.8.0
+Release: 1.1%{?dist}
Summary: A simple MPlayer GUI
Group: Applications/Multimedia
@@ -96,6 +96,9 @@
%changelog
+* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
+- Updated to 0.8.0
+
* Sat Sep 6 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.7.0-2.1
- Added alsa-lib-devel to BuildRequires (livna bug #2084)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Aug 2008 08:51:17 -0000 1.3
+++ sources 29 Sep 2008 16:34:55 -0000 1.4
@@ -1 +1 @@
-6620bde9eb888c4e4784f5078f64bdaa gnome-mplayer-0.7.0.tar.gz
+a431750fe518f4dba882318b680e8e0f gnome-mplayer-0.8.0.tar.gz
16 years
rpms/gnome-mplayer/F-9 .cvsignore, 1.3, 1.4 gnome-mplayer.spec, 1.4, 1.5 sources, 1.3, 1.4
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25939
Modified Files:
.cvsignore gnome-mplayer.spec sources
Log Message:
* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
- Updated to 0.8.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Aug 2008 08:50:32 -0000 1.3
+++ .cvsignore 29 Sep 2008 16:34:37 -0000 1.4
@@ -1 +1 @@
-gnome-mplayer-0.7.0.tar.gz
+gnome-mplayer-0.8.0.tar.gz
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-9/gnome-mplayer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-mplayer.spec 6 Sep 2008 21:41:10 -0000 1.4
+++ gnome-mplayer.spec 29 Sep 2008 16:34:37 -0000 1.5
@@ -1,6 +1,6 @@
Name: gnome-mplayer
-Version: 0.7.0
-Release: 2.1%{?dist}
+Version: 0.8.0
+Release: 1.1%{?dist}
Summary: A simple MPlayer GUI
Group: Applications/Multimedia
@@ -96,6 +96,9 @@
%changelog
+* Mon Sep 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.0-1.1
+- Updated to 0.8.0
+
* Sat Sep 6 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.7.0-2.1
- Added alsa-lib-devel to BuildRequires (livna bug #2084)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Aug 2008 08:50:32 -0000 1.3
+++ sources 29 Sep 2008 16:34:37 -0000 1.4
@@ -1 +1 @@
-6620bde9eb888c4e4784f5078f64bdaa gnome-mplayer-0.7.0.tar.gz
+a431750fe518f4dba882318b680e8e0f gnome-mplayer-0.8.0.tar.gz
16 years
rpms/vlc/devel vlc-0.9.3-libv4l2.patch,1.1,1.2 vlc.spec,1.7,1.8
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15581
Modified Files:
vlc-0.9.3-libv4l2.patch vlc.spec
Log Message:
- Prevent the needs to re-run autotools
vlc-0.9.3-libv4l2.patch:
Index: vlc-0.9.3-libv4l2.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc-0.9.3-libv4l2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-0.9.3-libv4l2.patch 29 Sep 2008 08:30:12 -0000 1.1
+++ vlc-0.9.3-libv4l2.patch 29 Sep 2008 13:14:03 -0000 1.2
@@ -9,6 +9,23 @@
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
AC_CHECK_HEADERS(linux/videodev2.h, [
VLC_ADD_PLUGIN([v4l2])
+diff -up vlc-0.9.3/configure.libv4l2 vlc-0.9.3/configure
+--- vlc-0.9.3/configure.libv4l2 2008-09-29 15:00:35.000000000 +0200
++++ vlc-0.9.3/configure 2008-09-29 15:00:51.000000000 +0200
+@@ -45416,6 +45416,12 @@ _ACEOF
+
+ fi
+
++
++ for element in v4l2; do
++ eval "LDFLAGS_${element}="'"'"-lv4l2 "'$'"{LDFLAGS_${element}} "'"'
++ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
++ done
++
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
+
+ for ac_header in linux/videodev2.h
+
diff -up vlc-0.9.3/modules/access/v4l2/v4l2.c.libv4l2 vlc-0.9.3/modules/access/v4l2/v4l2.c
--- vlc-0.9.3/modules/access/v4l2/v4l2.c.libv4l2 2008-09-18 23:03:35.000000000 +0200
+++ vlc-0.9.3/modules/access/v4l2/v4l2.c 2008-09-27 19:45:58.000000000 +0200
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vlc.spec 29 Sep 2008 08:30:12 -0000 1.7
+++ vlc.spec 29 Sep 2008 13:14:03 -0000 1.8
@@ -20,7 +20,7 @@
%else
Version: 0.9.3
%define _version %{version}
-%define release_tag 2
+%define release_tag 3
%endif
Release: %{release_tag}%{?dist}
License: GPLv2+
@@ -91,7 +91,9 @@
BuildRequires: libtheora-devel
BuildRequires: libtiff-devel
BuildRequires: libupnp-devel
+%if 0%{?fedora} > 8
BuildRequires: libv4l-devel
+%endif
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: lirc-devel
@@ -248,6 +250,8 @@
%patch1 -p1 -b .pulse_default
%if 0%{?fedora} > 8
%patch2 -p1 -b .libv4l2
+touch -r configure.ac.libv4l2 configure.ac
+touch -r configure.libv4l2 configure
%endif
@@ -505,6 +509,9 @@
%changelog
+* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.9.3-3
+- Prevent the needs to re-run autotools
+
* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.9.3-2
- Add libv4l2 patch from Hans de Goede
16 years
rpms/vlc/devel vlc-0.9.3-libv4l2.patch,NONE,1.1 vlc.spec,1.6,1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22569
Modified Files:
vlc.spec
Added Files:
vlc-0.9.3-libv4l2.patch
Log Message:
- Add libv4l2 patch from Hans de Goede
vlc-0.9.3-libv4l2.patch:
--- NEW FILE vlc-0.9.3-libv4l2.patch ---
diff -up vlc-0.9.3/configure.ac.libv4l2 vlc-0.9.3/configure.ac
--- vlc-0.9.3/configure.ac.libv4l2 2008-09-25 20:23:10.000000000 +0200
+++ vlc-0.9.3/configure.ac 2008-09-27 19:43:30.000000000 +0200
@@ -2421,6 +2421,7 @@ then
AC_DEFINE(HAVE_ALSA, 1, Define if ALSA is present.)
fi
+ VLC_ADD_LDFLAGS([v4l2],[-lv4l2])
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
AC_CHECK_HEADERS(linux/videodev2.h, [
VLC_ADD_PLUGIN([v4l2])
diff -up vlc-0.9.3/modules/access/v4l2/v4l2.c.libv4l2 vlc-0.9.3/modules/access/v4l2/v4l2.c
--- vlc-0.9.3/modules/access/v4l2/v4l2.c.libv4l2 2008-09-18 23:03:35.000000000 +0200
+++ vlc-0.9.3/modules/access/v4l2/v4l2.c 2008-09-27 19:45:58.000000000 +0200
@@ -67,6 +67,8 @@
#include <poll.h>
+#include <libv4l2.h>
+
/*****************************************************************************
* Module descriptior
*****************************************************************************/
@@ -1108,11 +1110,11 @@ static void DemuxClose( vlc_object_t *p_
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = ( p_sys->io == IO_METHOD_USERPTR ) ?
V4L2_MEMORY_USERPTR : V4L2_MEMORY_MMAP;
- ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ); /* ignore result */
+ v4l2_ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ); /* ignore result */
}
buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if( ioctl( p_sys->i_fd_video, VIDIOC_STREAMOFF, &buf_type ) < 0 ) {
+ if( v4l2_ioctl( p_sys->i_fd_video, VIDIOC_STREAMOFF, &buf_type ) < 0 ) {
msg_Err( p_this, "VIDIOC_STREAMOFF failed" );
}
@@ -1131,7 +1133,7 @@ static void DemuxClose( vlc_object_t *p_
case IO_METHOD_MMAP:
for( i = 0; i < p_sys->i_nbuffers; ++i )
{
- if( munmap( p_sys->p_buffers[i].start, p_sys->p_buffers[i].length ) )
+ if( v4l2_munmap( p_sys->p_buffers[i].start, p_sys->p_buffers[i].length ) )
{
msg_Err( p_this, "munmap failed" );
}
@@ -1155,7 +1157,7 @@ static void CommonClose( vlc_object_t *p
{
(void)p_this;
/* Close */
- if( p_sys->i_fd_video >= 0 ) close( p_sys->i_fd_video );
+ if( p_sys->i_fd_video >= 0 ) v4l2_close( p_sys->i_fd_video );
#ifdef HAVE_ALSA
if( p_sys->p_alsa_pcm )
{
@@ -1350,7 +1352,7 @@ static ssize_t AccessRead( access_t * p_
return -1;
}
- i_ret = read( p_sys->i_fd_video, p_buffer, i_len );
+ i_ret = v4l2_read( p_sys->i_fd_video, p_buffer, i_len );
if( i_ret == 0 )
{
p_access->info.b_eof = true;
@@ -1419,7 +1421,7 @@ static block_t* GrabVideo( demux_t *p_de
switch( p_sys->io )
{
case IO_METHOD_READ:
- i_ret = read( p_sys->i_fd_video, p_sys->p_buffers[0].start, p_sys->p_buffers[0].length );
+ i_ret = v4l2_read( p_sys->i_fd_video, p_sys->p_buffers[0].start, p_sys->p_buffers[0].length );
if( i_ret == -1 )
{
switch( errno )
@@ -1446,7 +1448,7 @@ static block_t* GrabVideo( demux_t *p_de
buf.memory = V4L2_MEMORY_MMAP;
/* Wait for next frame */
- if (ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ) < 0 )
+ if (v4l2_ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ) < 0 )
{
switch( errno )
{
@@ -1470,7 +1472,7 @@ static block_t* GrabVideo( demux_t *p_de
if( !p_block ) return 0;
/* Unlock */
- if( ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 )
+ if( v4l2_ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 )
{
msg_Err (p_demux, "Failed to unlock (VIDIOC_QBUF)");
return 0;
@@ -1484,7 +1486,7 @@ static block_t* GrabVideo( demux_t *p_de
buf.memory = V4L2_MEMORY_USERPTR;
/* Wait for next frame */
- if (ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ) < 0 )
+ if (v4l2_ioctl( p_sys->i_fd_video, VIDIOC_DQBUF, &buf ) < 0 )
{
switch( errno )
{
@@ -1517,7 +1519,7 @@ static block_t* GrabVideo( demux_t *p_de
if( !p_block ) return 0;
/* Unlock */
- if( ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 )
+ if( v4l2_ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 )
{
msg_Err (p_demux, "Failed to unlock (VIDIOC_QBUF)");
return 0;
@@ -1705,7 +1707,7 @@ static int InitMmap( demux_t *p_demux, i
req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
req.memory = V4L2_MEMORY_MMAP;
- if( ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 )
{
msg_Err( p_demux, "device does not support mmap i/o" );
goto open_failed;
@@ -1733,7 +1735,7 @@ static int InitMmap( demux_t *p_demux, i
buf.memory = V4L2_MEMORY_MMAP;
buf.index = p_sys->i_nbuffers;
- if( ioctl( i_fd, VIDIOC_QUERYBUF, &buf ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYBUF, &buf ) < 0 )
{
msg_Err( p_demux, "VIDIOC_QUERYBUF" );
goto open_failed;
@@ -1741,7 +1743,7 @@ static int InitMmap( demux_t *p_demux, i
p_sys->p_buffers[p_sys->i_nbuffers].length = buf.length;
p_sys->p_buffers[p_sys->i_nbuffers].start =
- mmap( NULL, buf.length, PROT_READ | PROT_WRITE, MAP_SHARED, i_fd, buf.m.offset );
+ v4l2_mmap( NULL, buf.length, PROT_READ | PROT_WRITE, MAP_SHARED, i_fd, buf.m.offset );
if( p_sys->p_buffers[p_sys->i_nbuffers].start == MAP_FAILED )
{
@@ -1774,7 +1776,7 @@ static int InitUserP( demux_t *p_demux,
req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
req.memory = V4L2_MEMORY_USERPTR;
- if( ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 )
{
msg_Err( p_demux, "device does not support user pointer i/o" );
return VLC_EGENERIC;
@@ -1830,6 +1832,7 @@ static int OpenVideoDev( vlc_object_t *p
enum v4l2_buf_type buf_type;
char *psz_device = p_sys->psz_vdev;
es_format_t es_fmt;
+ int libv4l2_fd;
if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
{
@@ -1837,6 +1840,16 @@ static int OpenVideoDev( vlc_object_t *p
goto open_failed;
}
+ /* Note the v4l2_xxx functions are designed so that if they get passed an
+ unknown fd, the will behave exactly as their regular xxx counterparts,
+ so if v4l2_fd_open fails, we continue as normal (missing the libv4l2
+ custom cam format to normal formats conversion). Chances are big we will
+ still fail then though, as normally v4l2_fd_open only fails if the
+ device is not a v4l2 device. */
+ libv4l2_fd = v4l2_fd_open(i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION);
+ if (libv4l2_fd != -1)
+ i_fd = libv4l2_fd;
+
/* Tune the tuner */
if( p_sys->i_frequency >= 0 )
{
@@ -1850,7 +1863,7 @@ static int OpenVideoDev( vlc_object_t *p
frequency.tuner = p_sys->i_cur_tuner;
frequency.type = p_sys->p_tuners[p_sys->i_cur_tuner].type;
frequency.frequency = p_sys->i_frequency / 62.5;
- if( ioctl( i_fd, VIDIOC_S_FREQUENCY, &frequency ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_S_FREQUENCY, &frequency ) < 0 )
{
msg_Err( p_obj, "cannot set tuner frequency (%m)" );
goto open_failed;
@@ -1870,7 +1883,7 @@ static int OpenVideoDev( vlc_object_t *p
memset( &tuner, 0, sizeof( tuner ) );
tuner.index = p_sys->i_cur_tuner;
tuner.audmode = p_sys->i_audio_mode;
- if( ioctl( i_fd, VIDIOC_S_TUNER, &tuner ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_S_TUNER, &tuner ) < 0 )
{
msg_Err( p_obj, "cannot set tuner audio mode (%m)" );
goto open_failed;
@@ -1882,7 +1895,7 @@ static int OpenVideoDev( vlc_object_t *p
if( p_sys->i_selected_standard_id != V4L2_STD_UNKNOWN )
{
- if( ioctl( i_fd, VIDIOC_S_STD, &p_sys->i_selected_standard_id ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_S_STD, &p_sys->i_selected_standard_id ) < 0 )
{
msg_Err( p_obj, "cannot set standard (%m)" );
goto open_failed;
@@ -1898,7 +1911,7 @@ static int OpenVideoDev( vlc_object_t *p
p_sys->i_selected_input = 0;
}
- if( ioctl( i_fd, VIDIOC_S_INPUT, &p_sys->i_selected_input ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_S_INPUT, &p_sys->i_selected_input ) < 0 )
{
msg_Err( p_obj, "cannot set input (%m)" );
goto open_failed;
@@ -1915,7 +1928,7 @@ static int OpenVideoDev( vlc_object_t *p
p_sys->i_selected_audio_input = 0;
}
- if( ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_selected_audio_input] ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_selected_audio_input] ) < 0 )
{
msg_Err( p_obj, "cannot set audio input (%m)" );
goto open_failed;
@@ -1964,11 +1977,11 @@ static int OpenVideoDev( vlc_object_t *p
/* Reset Cropping */
memset( &cropcap, 0, sizeof(cropcap) );
cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if( ioctl( i_fd, VIDIOC_CROPCAP, &cropcap ) >= 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_CROPCAP, &cropcap ) >= 0 )
{
crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
crop.c = cropcap.defrect; /* reset to default */
- if( ioctl( i_fd, VIDIOC_S_CROP, &crop ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_S_CROP, &crop ) < 0 )
{
switch( errno )
{
@@ -1988,7 +2001,7 @@ static int OpenVideoDev( vlc_object_t *p
if( p_sys->i_width <= 0 || p_sys->i_height <= 0 )
{
- if( ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 )
{
msg_Err( p_demux, "Cannot get default width and height." );
goto open_failed;
@@ -2031,7 +2044,7 @@ static int OpenVideoDev( vlc_object_t *p
}
}
/* Try and set user chroma */
- if( !IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) || ( fmt.fmt.pix.pixelformat && ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 ) )
+ if( !IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat ) || ( fmt.fmt.pix.pixelformat && v4l2_ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 ) )
{
msg_Warn( p_demux, "Driver is unable to use specified chroma %s. Trying defaults.", p_sys->psz_requested_chroma );
fmt.fmt.pix.pixelformat = 0;
@@ -2047,7 +2060,7 @@ static int OpenVideoDev( vlc_object_t *p
{
fmt.fmt.pix.pixelformat = p_chroma_fallbacks[i];
if( IsPixelFormatSupported( p_demux, fmt.fmt.pix.pixelformat )
- && ioctl( i_fd, VIDIOC_S_FMT, &fmt ) >= 0 )
+ && v4l2_ioctl( i_fd, VIDIOC_S_FMT, &fmt ) >= 0 )
break;
}
if( i == ARRAY_SIZE( p_chroma_fallbacks ) )
@@ -2092,7 +2105,7 @@ static int OpenVideoDev( vlc_object_t *p
frmival.pixel_format = fmt.fmt.pix.pixelformat;
frmival.width = p_sys->i_width;
frmival.height = p_sys->i_height;
- if( ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 )
{
char psz_fourcc[5];
memset( &psz_fourcc, 0, sizeof( psz_fourcc ) );
@@ -2108,7 +2121,7 @@ static int OpenVideoDev( vlc_object_t *p
frmival.discrete.numerator,
frmival.discrete.denominator );
frmival.index++;
- } while( ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 );
+ } while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival ) >= 0 );
break;
case V4L2_FRMIVAL_TYPE_STEPWISE:
msg_Dbg( p_demux, " supported frame intervals: %d/%d to "
@@ -2175,7 +2188,7 @@ static int OpenVideoDev( vlc_object_t *p
buf.memory = V4L2_MEMORY_MMAP;
buf.index = i;
- if( ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 )
{
msg_Err( p_demux, "VIDIOC_QBUF failed" );
goto open_failed;
@@ -2183,7 +2196,7 @@ static int OpenVideoDev( vlc_object_t *p
}
buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if( ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 )
{
msg_Err( p_demux, "VIDIOC_STREAMON failed" );
goto open_failed;
@@ -2203,7 +2216,7 @@ static int OpenVideoDev( vlc_object_t *p
buf.m.userptr = (unsigned long)p_sys->p_buffers[i].start;
buf.length = p_sys->p_buffers[i].length;
- if( ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QBUF, &buf ) < 0 )
{
msg_Err( p_demux, "VIDIOC_QBUF failed" );
goto open_failed;
@@ -2211,7 +2224,7 @@ static int OpenVideoDev( vlc_object_t *p
}
buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if( ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_STREAMON, &buf_type ) < 0 )
{
msg_Err( p_demux, "VIDIOC_STREAMON failed" );
goto open_failed;
@@ -2229,7 +2242,7 @@ static int OpenVideoDev( vlc_object_t *p
return i_fd;
open_failed:
- if( i_fd >= 0 ) close( i_fd );
+ if( i_fd >= 0 ) v4l2_close( i_fd );
return -1;
}
@@ -2548,6 +2561,7 @@ static bool ProbeVideoDev( vlc_object_t
int i_standard;
int i_fd;
+ int libv4l2_fd;
if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
{
@@ -2555,9 +2569,19 @@ static bool ProbeVideoDev( vlc_object_t
goto open_failed;
}
+ /* Note the v4l2_xxx functions are designed so that if they get passed an
+ unknown fd, the will behave exactly as their regular xxx counterparts,
+ so if v4l2_fd_open fails, we continue as normal (missing the libv4l2
+ custom cam format to normal formats conversion). Chances are big we will
+ still fail then though, as normally v4l2_fd_open only fails if the
+ device is not a v4l2 device. */
+ libv4l2_fd = v4l2_fd_open(i_fd, V4L2_ENABLE_ENUM_FMT_EMULATION);
+ if (libv4l2_fd != -1)
+ i_fd = libv4l2_fd;
+
/* Get device capabilites */
- if( ioctl( i_fd, VIDIOC_QUERYCAP, &p_sys->dev_cap ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCAP, &p_sys->dev_cap ) < 0 )
{
msg_Err( p_obj, "cannot get video capabilities (%m)" );
goto open_failed;
@@ -2593,7 +2617,7 @@ static bool ProbeVideoDev( vlc_object_t
{
struct v4l2_input t_input;
t_input.index = 0;
- while( ioctl( i_fd, VIDIOC_ENUMINPUT, &t_input ) >= 0 )
+ while( v4l2_ioctl( i_fd, VIDIOC_ENUMINPUT, &t_input ) >= 0 )
{
p_sys->i_input++;
t_input.index = p_sys->i_input;
@@ -2606,7 +2630,7 @@ static bool ProbeVideoDev( vlc_object_t
{
p_sys->p_inputs[i_index].index = i_index;
- if( ioctl( i_fd, VIDIOC_ENUMINPUT, &p_sys->p_inputs[i_index] ) )
+ if( v4l2_ioctl( i_fd, VIDIOC_ENUMINPUT, &p_sys->p_inputs[i_index] ) )
{
msg_Err( p_obj, "cannot get video input characteristics (%m)" );
goto open_failed;
@@ -2627,7 +2651,7 @@ static bool ProbeVideoDev( vlc_object_t
{
struct v4l2_standard t_standards;
t_standards.index = 0;
- while( ioctl( i_fd, VIDIOC_ENUMSTD, &t_standards ) >=0 )
+ while( v4l2_ioctl( i_fd, VIDIOC_ENUMSTD, &t_standards ) >=0 )
{
p_sys->i_standard++;
t_standards.index = p_sys->i_standard;
@@ -2640,7 +2664,7 @@ static bool ProbeVideoDev( vlc_object_t
{
p_sys->p_standards[i_standard].index = i_standard;
- if( ioctl( i_fd, VIDIOC_ENUMSTD, &p_sys->p_standards[i_standard] ) )
+ if( v4l2_ioctl( i_fd, VIDIOC_ENUMSTD, &p_sys->p_standards[i_standard] ) )
{
msg_Err( p_obj, "cannot get video input standards (%m)" );
goto open_failed;
@@ -2662,9 +2686,9 @@ static bool ProbeVideoDev( vlc_object_t
if( p_sys->dev_cap.capabilities & V4L2_CAP_AUDIO )
{
while( p_sys->i_audio < 32 &&
- ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_audio] ) >= 0 )
+ v4l2_ioctl( i_fd, VIDIOC_S_AUDIO, &p_sys->p_audios[p_sys->i_audio] ) >= 0 )
{
- if( ioctl( i_fd, VIDIOC_G_AUDIO, &p_sys->p_audios[ p_sys->i_audio] ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_G_AUDIO, &p_sys->p_audios[ p_sys->i_audio] ) < 0 )
{
msg_Err( p_obj, "cannot get audio input characteristics (%m)" );
goto open_failed;
@@ -2690,7 +2714,7 @@ static bool ProbeVideoDev( vlc_object_t
{
struct v4l2_tuner tuner;
memset( &tuner, 0, sizeof(tuner) );
- while( ioctl( i_fd, VIDIOC_G_TUNER, &tuner ) >= 0 )
+ while( v4l2_ioctl( i_fd, VIDIOC_G_TUNER, &tuner ) >= 0 )
{
p_sys->i_tuner++;
memset( &tuner, 0, sizeof(tuner) );
@@ -2704,7 +2728,7 @@ static bool ProbeVideoDev( vlc_object_t
{
p_sys->p_tuners[i_index].index = i_index;
- if( ioctl( i_fd, VIDIOC_G_TUNER, &p_sys->p_tuners[i_index] ) )
+ if( v4l2_ioctl( i_fd, VIDIOC_G_TUNER, &p_sys->p_tuners[i_index] ) )
{
msg_Err( p_obj, "cannot get tuner characteristics (%m)" );
goto open_failed;
@@ -2727,7 +2751,7 @@ static bool ProbeVideoDev( vlc_object_t
struct v4l2_frequency frequency;
memset( &frequency, 0, sizeof( frequency ) );
- if( ioctl( i_fd, VIDIOC_G_FREQUENCY, &frequency ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_G_FREQUENCY, &frequency ) < 0 )
{
msg_Err( p_obj, "cannot get tuner frequency (%m)" );
goto open_failed;
@@ -2752,7 +2776,7 @@ static bool ProbeVideoDev( vlc_object_t
codec.index = i_index;
codec.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- while( ioctl( i_fd, VIDIOC_ENUM_FMT, &codec ) >= 0 )
+ while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FMT, &codec ) >= 0 )
{
i_index++;
codec.index = i_index;
@@ -2767,7 +2791,7 @@ static bool ProbeVideoDev( vlc_object_t
p_sys->p_codecs[i_index].index = i_index;
p_sys->p_codecs[i_index].type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if( ioctl( i_fd, VIDIOC_ENUM_FMT, &p_sys->p_codecs[i_index] ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_ENUM_FMT, &p_sys->p_codecs[i_index] ) < 0 )
{
msg_Err( p_obj, "cannot get codec description (%m)" );
goto open_failed;
@@ -2800,7 +2824,7 @@ static bool ProbeVideoDev( vlc_object_t
struct v4l2_frmsizeenum frmsize;
frmsize.index = 0;
frmsize.pixel_format = p_sys->p_codecs[i_index].pixelformat;
- if( ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) < 0 )
{
/* Not all devices support this ioctl */
msg_Warn( p_obj, "Unable to query for frame sizes" );
@@ -2816,7 +2840,7 @@ static bool ProbeVideoDev( vlc_object_t
" device supports size %dx%d",
frmsize.discrete.width, frmsize.discrete.height );
frmsize.index++;
- } while( ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) >= 0 );
+ } while( v4l2_ioctl( i_fd, VIDIOC_ENUM_FRAMESIZES, &frmsize ) >= 0 );
break;
case V4L2_FRMSIZE_TYPE_STEPWISE:
msg_Dbg( p_obj,
@@ -2848,12 +2872,12 @@ static bool ProbeVideoDev( vlc_object_t
}
- if( i_fd >= 0 ) close( i_fd );
+ if( i_fd >= 0 ) v4l2_close( i_fd );
return true;
open_failed:
- if( i_fd >= 0 ) close( i_fd );
+ if( i_fd >= 0 ) v4l2_close( i_fd );
return false;
}
@@ -3019,7 +3043,7 @@ static void ControlListPrint( vlc_object
{
querymenu.index = i_mid;
querymenu.id = queryctrl.id;
- if( ioctl( i_fd, VIDIOC_QUERYMENU, &querymenu ) >= 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYMENU, &querymenu ) >= 0 )
{
msg_Dbg( p_obj, " %d: %s",
querymenu.index, querymenu.name );
@@ -3056,7 +3080,7 @@ static void ControlListPrint( vlc_object
queryctrl.default_value );
memset( &control, 0, sizeof( control ) );
control.id = queryctrl.id;
- if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0 )
{
msg_Dbg( p_obj, " current value: %d", control.value );
}
@@ -3153,13 +3177,13 @@ static int ControlList( vlc_object_t *p_
var_AddCallback( p_obj, "controls-reset", AccessControlResetCallback, NULL );
queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
{
msg_Dbg( p_obj, "Extended control API supported by v4l2 driver" );
/* List extended controls */
queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
- while( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
+ while( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
{
if( queryctrl.type == V4L2_CTRL_TYPE_CTRL_CLASS )
{
@@ -3197,7 +3221,7 @@ static int ControlList( vlc_object_t *p_
i_cid ++ )
{
queryctrl.id = i_cid;
- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
{
if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
continue;
@@ -3213,7 +3237,7 @@ static int ControlList( vlc_object_t *p_
i_cid ++ )
{
queryctrl.id = i_cid;
- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
{
if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
continue;
@@ -3312,11 +3336,11 @@ static int ControlReset( vlc_object_t *p
memset( &queryctrl, 0, sizeof( queryctrl ) );
queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
{
/* Extended control API supported */
queryctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
- while( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
+ while( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
{
if( queryctrl.type == V4L2_CTRL_TYPE_CTRL_CLASS
|| V4L2_CTRL_ID2CLASS( queryctrl.id ) == V4L2_CTRL_CLASS_MPEG )
@@ -3327,7 +3351,7 @@ static int ControlReset( vlc_object_t *p
struct v4l2_control control;
memset( &control, 0, sizeof( control ) );
control.id = queryctrl.id;
- if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0
+ if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0
&& queryctrl.default_value != control.value )
{
int i;
@@ -3350,14 +3374,14 @@ static int ControlReset( vlc_object_t *p
i_cid ++ )
{
queryctrl.id = i_cid;
- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
{
struct v4l2_control control;
if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
continue;
memset( &control, 0, sizeof( control ) );
control.id = queryctrl.id;
- if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0
+ if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0
&& queryctrl.default_value != control.value )
{
int i;
@@ -3377,14 +3401,14 @@ static int ControlReset( vlc_object_t *p
i_cid ++ )
{
queryctrl.id = i_cid;
- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) >= 0 )
{
struct v4l2_control control;
if( queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
continue;
memset( &control, 0, sizeof( control ) );
control.id = queryctrl.id;
- if( ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0
+ if( v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control ) >= 0
&& queryctrl.default_value != control.value )
{
name2var( queryctrl.name );
@@ -3417,7 +3441,7 @@ static int Control( vlc_object_t *p_obj,
queryctrl.id = i_cid;
- if( ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) < 0
+ if( v4l2_ioctl( i_fd, VIDIOC_QUERYCTRL, &queryctrl ) < 0
|| queryctrl.flags & V4L2_CTRL_FLAG_DISABLED )
{
msg_Dbg( p_obj, "%s (%x) control is not supported.", psz_name, i_cid );
@@ -3438,20 +3462,20 @@ static int Control( vlc_object_t *p_obj,
if( i_value >= 0 )
{
ext_control.value = i_value;
- if( ioctl( i_fd, VIDIOC_S_EXT_CTRLS, &ext_controls ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_S_EXT_CTRLS, &ext_controls ) < 0 )
{
control.value = i_value;
- if( ioctl( i_fd, VIDIOC_S_CTRL, &control ) < 0 )
+ if( v4l2_ioctl( i_fd, VIDIOC_S_CTRL, &control ) < 0 )
{
msg_Err( p_obj, "unable to set %s (%x) to %d (%m)",
psz_name, i_cid, i_value );
return VLC_EGENERIC;
}
- i_ret = ioctl( i_fd, VIDIOC_G_CTRL, &control );
+ i_ret = v4l2_ioctl( i_fd, VIDIOC_G_CTRL, &control );
}
else
{
- i_ret = ioctl( i_fd, VIDIOC_G_EXT_CTRLS, &ext_controls );
+ i_ret = v4l2_ioctl( i_fd, VIDIOC_G_EXT_CTRLS, &ext_controls );
control.value = ext_control.value;
}
}
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vlc.spec 26 Sep 2008 16:22:27 -0000 1.6
+++ vlc.spec 29 Sep 2008 08:30:12 -0000 1.7
@@ -20,7 +20,7 @@
%else
Version: 0.9.3
%define _version %{version}
-%define release_tag 1
+%define release_tag 2
%endif
Release: %{release_tag}%{?dist}
License: GPLv2+
@@ -36,6 +36,7 @@
%endif
Patch0: vlc-trunk-default_font.patch
Patch1: vlc-0.9.2-pulse_default.patch
+Patch2: vlc-0.9.3-libv4l2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -90,6 +91,7 @@
BuildRequires: libtheora-devel
BuildRequires: libtiff-devel
BuildRequires: libupnp-devel
+BuildRequires: libv4l-devel
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: lirc-devel
@@ -244,6 +246,9 @@
%endif
%patch0 -p1 -b .default_font
%patch1 -p1 -b .pulse_default
+%if 0%{?fedora} > 8
+%patch2 -p1 -b .libv4l2
+%endif
@@ -500,6 +505,9 @@
%changelog
+* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.9.3-2
+- Add libv4l2 patch from Hans de Goede
+
* Fri Sep 26 2008 kwizart < kwizart at gmail.com > - 0.9.3-1
- Update to 0.9.3 (final)
- Few others move from core to main
16 years
rpms/ogre-cg/F-8 ogre-1.4.9-cg.patch, NONE, 1.1 ogre-cg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Alexey Torkhov
Author: atorkhov
Update of /cvs/nonfree/rpms/ogre-cg/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21725
Modified Files:
.cvsignore sources
Added Files:
ogre-1.4.9-cg.patch ogre-cg.spec
Log Message:
Backport to F-8.
ogre-1.4.9-cg.patch:
--- NEW FILE ogre-1.4.9-cg.patch ---
diff -ur ogre/acinclude.m4 ogre.new/acinclude.m4
--- ogre/acinclude.m4 2007-09-09 23:53:55.000000000 +0400
+++ ogre.new/acinclude.m4 2008-09-28 00:06:23.000000000 +0400
@@ -305,19 +305,7 @@
[build_exr=$enableval],
[build_exr=no])
-if test "x$build_exr" = "xyes" ; then
- PKG_CHECK_MODULES(OPENEXR, OpenEXR, [build_exr=yes], [build_exr=no])
-
- if test "x$build_exr" = "xyes" ; then
- AC_CONFIG_FILES([ PlugIns/EXRCodec/Makefile \
- PlugIns/EXRCodec/src/Makefile \
- PlugIns/EXRCodec/include/Makefile])
- AC_SUBST(OPENEXR_CFLAGS)
- AC_SUBST(OPENEXR_LIBS)
-
- fi
-
-fi
+build_exr="no"
AM_CONDITIONAL(BUILD_EXRPLUGIN, test x$build_exr = xyes)
@@ -446,19 +434,7 @@
AC_DEFUN([OGRE_CHECK_CEGUI], [
PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.5.0,
[build_cegui_sample=true], [build_cegui_sample=false])
- if test x$build_cegui_sample = xtrue; then
- AC_CONFIG_FILES([Samples/Common/CEGUIRenderer/Makefile \
- Samples/Common/CEGUIRenderer/CEGUI-OGRE.pc
- Samples/Common/CEGUIRenderer/src/Makefile \
- Samples/Common/CEGUIRenderer/include/Makefile \
- Samples/Gui/Makefile \
- Samples/Gui/src/Makefile])
- AC_SUBST(CEGUI_CFLAGS)
- AC_SUBST(CEGUI_LIBS)
- AC_MSG_RESULT([CEGUI available, Gui and FacialAnimation samples will be built])
- else
- AC_MSG_RESULT([CEGUI not available, Gui and FacialAnimation samples will not be built])
- fi
+ build_cegui_sample="false"
AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
])
diff -ur ogre/configure.in ogre.new/configure.in
--- ogre/configure.in 2008-06-16 14:29:36.000000000 +0400
+++ ogre.new/configure.in 2008-09-28 00:07:40.000000000 +0400
@@ -78,9 +78,13 @@
AC_SUBST(ZZIPLIB_CFLAGS)
AC_SUBST(ZZIPLIB_LIBS)
+PKG_CHECK_MODULES(OGRE, OGRE)
+CXXFLAGS="$CXXFLAGS $OGRE_CFLAGS"
+LDFLAGS="$LDFLAGS $OGRE_LIBS"
+
dnl Get the GL and Platform libs for target build
OGRE_GET_PLATFORM
-OGRE_GET_GLSUPPORT
+dnl OGRE_GET_GLSUPPORT
dnl Find the optional components we should build
OGRE_CHECK_GUI
@@ -88,7 +92,9 @@
OGRE_CHECK_THREADING
OGRE_CHECK_FREEIMAGE
OGRE_CHECK_DEVIL
+AC_LANG_PUSH(C++)
OGRE_CHECK_CG
+AC_LANG_POP
OGRE_CHECK_OPENEXR
OGRE_CHECK_DX9
OGRE_CHECK_SSE
@@ -120,135 +126,10 @@
dnl Create the makefiles
AC_CONFIG_FILES([Makefile \
- OgreMain/Makefile \
- OgreMain/src/Makefile \
- OgreMain/include/Makefile \
- OgreMain/include/GLX/Makefile \
- OgreMain/include/gtk/Makefile \
PlugIns/Makefile \
- PlugIns/BSPSceneManager/Makefile \
- PlugIns/BSPSceneManager/src/Makefile \
- PlugIns/BSPSceneManager/include/Makefile \
PlugIns/CgProgramManager/Makefile \
PlugIns/CgProgramManager/src/Makefile \
- PlugIns/CgProgramManager/include/Makefile \
- PlugIns/OctreeSceneManager/Makefile \
- PlugIns/OctreeSceneManager/src/Makefile \
- PlugIns/OctreeSceneManager/include/Makefile \
- PlugIns/ParticleFX/Makefile \
- PlugIns/ParticleFX/src/Makefile \
- PlugIns/ParticleFX/include/Makefile \
- RenderSystems/Makefile \
- RenderSystems/GL/Makefile \
- RenderSystems/GL/src/Makefile \
- RenderSystems/GL/include/Makefile \
- RenderSystems/GL/src/atifs/Makefile \
- RenderSystems/GL/src/atifs/include/Makefile \
- RenderSystems/GL/src/atifs/src/Makefile \
- RenderSystems/GL/src/GLSL/Makefile \
- RenderSystems/GL/src/GLSL/include/Makefile \
- RenderSystems/GL/src/GLSL/src/Makefile \
- RenderSystems/GL/src/nvparse/Makefile \
- RenderSystems/Direct3D9/Makefile \
- RenderSystems/Direct3D9/src/Makefile \
- RenderSystems/Direct3D9/include/Makefile \
- Samples/Makefile \
- Samples/Common/Makefile \
- Samples/Common/include/Makefile \
- Samples/Common/bin/Makefile \
- Samples/BezierPatch/Makefile \
- Samples/BezierPatch/src/Makefile \
- Samples/BezierPatch/include/Makefile \
- Samples/CameraTrack/Makefile \
- Samples/CameraTrack/src/Makefile \
- Samples/CelShading/Makefile \
- Samples/CelShading/src/Makefile \
- Samples/Compositor/Makefile \
- Samples/Compositor/src/Makefile \
- Samples/Compositor/include/Makefile \
- Samples/CubeMapping/Makefile \
- Samples/CubeMapping/src/Makefile \
- Samples/CubeMapping/include/Makefile \
- Samples/DeferredShading/Makefile \
- Samples/DeferredShading/src/Makefile \
- Samples/DeferredShading/include/Makefile \
- Samples/Dot3Bump/Makefile \
- Samples/Dot3Bump/src/Makefile \
- Samples/EnvMapping/Makefile \
- Samples/EnvMapping/src/Makefile \
- Samples/EnvMapping/include/Makefile \
- Samples/FacialAnimation/Makefile \
- Samples/FacialAnimation/src/Makefile \
- Samples/Fresnel/Makefile \
- Samples/Fresnel/src/Makefile \
- Samples/Grass/Makefile \
- Samples/Grass/src/Makefile \
- Samples/Transpacency/Makefile \
- Samples/Transpacency/src/Makefile \
- Samples/Transpacency/include/Makefile \
- Samples/Lighting/Makefile \
- Samples/Lighting/src/Makefile \
- Samples/Lighting/include/Makefile \
- Samples/OceanDemo/Makefile \
- Samples/OceanDemo/src/Makefile \
- Samples/OceanDemo/include/Makefile \
- Samples/ParticleFX/Makefile \
- Samples/ParticleFX/src/Makefile \
- Samples/ParticleFX/include/Makefile \
- Samples/RenderToTexture/Makefile \
- Samples/RenderToTexture/src/Makefile \
- Samples/TextureFX/Makefile \
- Samples/TextureFX/src/Makefile \
- Samples/TextureFX/include/Makefile \
- Samples/Shadows/Makefile \
- Samples/Shadows/src/Makefile \
- Samples/SkyBox/Makefile \
- Samples/SkyBox/src/Makefile \
- Samples/SkyBox/include/Makefile \
- Samples/SkyDome/Makefile \
- Samples/SkyDome/src/Makefile \
- Samples/SkyDome/include/Makefile \
- Samples/SkyPlane/Makefile \
- Samples/SkyPlane/src/Makefile \
- Samples/SkyPlane/include/Makefile \
- Samples/Smoke/Makefile \
- Samples/Smoke/src/Makefile \
- Samples/Smoke/include/Makefile \
- Samples/BSP/Makefile \
- Samples/BSP/src/Makefile \
- Samples/SkeletalAnimation/Makefile \
- Samples/SkeletalAnimation/src/Makefile \
- Samples/SkeletalAnimation/include/Makefile \
- Samples/Terrain/Makefile \
- Samples/Terrain/src/Makefile \
- Samples/Terrain/include/Makefile \
- Samples/Water/Makefile \
- Samples/Water/src/Makefile \
- Samples/Water/include/Makefile \
- Samples/DynTex/Makefile \
- Samples/DynTex/src/Makefile \
- Samples/DynTex/include/Makefile \
- Samples/VolumeTex/Makefile \
- Samples/VolumeTex/src/Makefile \
- Samples/VolumeTex/include/Makefile \
- Samples/Instancing/Makefile \
- Samples/Instancing/src/Makefile \
- Samples/Instancing/include/Makefile \
- Tests/Makefile \
- Tests/src/Makefile \
- Tools/Makefile \
- Tools/MaterialUpgrader/Makefile \
- Tools/MaterialUpgrader/src/Makefile \
- Tools/MaterialUpgrader/include/Makefile \
- Tools/MeshUpgrader/Makefile \
- Tools/MeshUpgrader/src/Makefile \
- Tools/XMLConverter/Makefile \
- Tools/XMLConverter/src/Makefile \
- Tools/XMLConverter/include/Makefile \
- Tools/LightwaveConverter/Makefile \
- Tools/LightwaveConverter/src/Makefile \
- Tools/LightwaveConverter/include/Makefile \
- OGRE.pc
+ PlugIns/CgProgramManager/include/Makefile
])
AC_OUTPUT
diff -ur ogre/Makefile.am ogre.new/Makefile.am
--- ogre/Makefile.am 2007-01-07 00:18:24.000000000 +0300
+++ ogre.new/Makefile.am 2008-09-28 00:06:23.000000000 +0400
@@ -1,6 +1,3 @@
-SUBDIRS = OgreMain PlugIns RenderSystems Samples Tools Tests
+SUBDIRS = PlugIns
ACLOCAL_AMFLAGS = -I Scripts/m4
AUTOMAKE_OPTIONS = foreign
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = OGRE.pc
diff -ur ogre/PlugIns/Makefile.am ogre.new/PlugIns/Makefile.am
--- ogre/PlugIns/Makefile.am 2004-12-29 01:19:52.000000000 +0300
+++ ogre.new/PlugIns/Makefile.am 2008-09-28 00:06:23.000000000 +0400
@@ -1,9 +1,5 @@
-SUBDIRS = BSPSceneManager ParticleFX OctreeSceneManager
+SUBDIRS =
if BUILD_CGPLUGIN
SUBDIRS += CgProgramManager
endif
-
-if BUILD_EXRPLUGIN
-SUBDIRS += EXRCodec
-endif
--- NEW FILE ogre-cg.spec ---
Name: ogre-cg
Version: 1.4.6
Release: 2%{?dist}
Summary: Object-Oriented Graphics Rendering Engine
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.ogre3d.org/
# This is http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
# stripped all except CgProgramManager plugin and core files needed to build it
Source0: ogre-%{version}-cg.tar.bz2
# Patch striping everything except CgProgramManager from compilation
Patch0: ogre-1.4.9-cg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zziplib-devel libXaw-devel libXrandr-devel libXxf86vm-devel
BuildRequires: autoconf automake libtool
# We are building only plugin, so we need main lib
BuildRequires: ogre-devel
# Cg package
BuildRequires: Cg
ExclusiveArch: i386 x86_64
Requires: ogre = %{version}
%description
This package contains the OGRE CgProgramManager plugin.
%prep
%setup -q -n ogrenew
%patch0 -p1
# Rebuilding autotools-generated files
autoreconf -v -f -i
%build
%configure --enable-cg --disable-devil --disable-freeimage --disable-openexr
# Don't use rpath!
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/OGRE/*.la
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING
%{_libdir}/OGRE/*.so
%changelog
* Sun Sep 18 2008 Alexey Torkhov <atorkhov(a)gmail.com> 1.4.6-2
- Packaged OGRE 1.4.6 Cg plugin basing on Fedora package by Hans de Goede.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ogre-cg/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 28 Sep 2008 09:31:48 -0000 1.1
+++ .cvsignore 28 Sep 2008 20:06:10 -0000 1.2
@@ -0,0 +1 @@
+ogre-1.4.6-cg.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ogre-cg/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 28 Sep 2008 09:31:48 -0000 1.1
+++ sources 28 Sep 2008 20:06:10 -0000 1.2
@@ -0,0 +1 @@
+8b90c5dab7dcc35703f85d3828705b95 ogre-1.4.6-cg.tar.bz2
16 years
rpms/ogre-cg/F-9 ogre-cg.spec,1.1,1.2
by Alexey Torkhov
Author: atorkhov
Update of /cvs/nonfree/rpms/ogre-cg/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21581
Modified Files:
ogre-cg.spec
Log Message:
Fixing.
Index: ogre-cg.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ogre-cg/F-9/ogre-cg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogre-cg.spec 28 Sep 2008 19:56:02 -0000 1.1
+++ ogre-cg.spec 28 Sep 2008 20:04:24 -0000 1.2
@@ -27,7 +27,7 @@
%prep
-%setup -q -n ogre
+%setup -q -n ogrenew
%patch0 -p1
# Rebuilding autotools-generated files
16 years