rpms/vlc/devel vlc-backport-dvb58.patch, NONE, 1.1 vlc.spec, 1.165, 1.166

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3533/devel

Modified Files:
	vlc.spec 
Added Files:
	vlc-backport-dvb58.patch 
Log Message:
Rebuilt for kernel 3.7


vlc-backport-dvb58.patch:
 linux.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE vlc-backport-dvb58.patch ---
commit a1f6bd08356a7ab76655a54362511db6e54646c9
Author: Rémi Denis-Courmont <remi at remlab.net>
Date:   Sat Nov 24 17:49:43 2012 +0200

    dtv: fix compilation with Linux 3.7 / DVB >= 5.8 (fixes #7763)
    
    (cherry picked from commit cd1e58d9d37bc97bd4981faaa075e9d13c75bc3b)
    
    Conflicts:
    	modules/access/dtv/linux.c

diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c
index b349365..bf4215c 100644
--- a/modules/access/dtv/linux.c
+++ b/modules/access/dtv/linux.c
@@ -917,7 +917,12 @@ int dvb_set_isdbs (dvb_device_t *d, uint64_t freq_Hz, uint16_t ts_id)
         return -1;
     return dvb_set_props (d, 5, DTV_CLEAR, 0, DTV_DELIVERY_SYSTEM, SYS_ISDBS,
                           DTV_FREQUENCY, freq,
-                          DTV_ISDBS_TS_ID, (uint32_t)ts_id);
+#if DVBv5(8)
+                          DTV_STREAM_ID,
+#else
+                          DTV_ISDBS_TS_ID,
+#endif
+                          (uint32_t)ts_id);
 #else
 # warning ISDB-S needs Linux DVB version 5.1 or later.
     msg_Err (d->obj, "ISDB-S support not compiled-in");


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- vlc.spec	23 Nov 2012 08:17:23 -0000	1.165
+++ vlc.spec	24 Nov 2012 17:12:45 -0000	1.166
@@ -31,13 +31,14 @@
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
 Version:	2.0.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
 Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz
 Patch0:         vlc-2.0.2-xcb_discard.patch
 Patch1:		vlc-2.0.4-cache.patch
+Patch2:		vlc-backport-dvb58.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -228,6 +229,7 @@
 }
 %endif
 %patch1 -p1 -b .vlc_cache
+%patch2 -p1
 
 %{?_with_bootstrap:
 rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -293,7 +295,7 @@
 %endif
 
 
-%if 1
+%if 0
 # remove rpath from libtool
 sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -514,6 +516,9 @@
 
 
 %changelog
+* Sat Nov 24 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.0.4-3
+- Fix build with kernel-3.7
+
 * Fri Nov 23 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.0.4-2
 - Rebuilt for x264