rpms/xine-lib-extras-freeworld/devel compat.c, NONE, 1.1 xine-lib-extras-freeworld.spec, 1.31, 1.32 xine-lib-1.1.18-dxr3_no_compat_c.patch, 1.2, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30563

Modified Files:
	xine-lib-extras-freeworld.spec 
Added Files:
	compat.c 
Removed Files:
	xine-lib-1.1.18-dxr3_no_compat_c.patch 
Log Message:
* Tue Mar 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18-3
- get missing/upstream compat.c



--- NEW FILE compat.c ---
/*
 * Copyright (C) 2010 the xine project
 *
 * This file is part of xine, a free video player.
 *
 * xine is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * xine is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
 */

/* For compatibility with em8300 < 0.18.0 */
int dxr3_compat_ioctl (int fd, int rq, void *arg)
{
  int ret = ioctl (fd, rq, arg);
  if (ret < 0 && errno == EINVAL || errno == ENOTTY)
    ret = ioctl (fd, rq & 0xFF, arg);
  return ret;
}


Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xine-lib-extras-freeworld.spec	1 Mar 2010 14:57:02 -0000	1.31
+++ xine-lib-extras-freeworld.spec	2 Mar 2010 15:28:04 -0000	1.32
@@ -11,18 +11,18 @@
 Name:           xine-lib-extras-freeworld
 Summary:        Extra codecs for the Xine multimedia library
 Version:        1.1.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
 Source0:        http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
+Source1:        http://downloads.sourceforge.net/xine/compat.c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: xine-lib-1.1.3-optflags.patch
 Patch6: xine-lib-1.1.1-deepbind-939.patch
 
 ## upstreamable patches
-Patch50: xine-lib-1.1.18-dxr3_no_compat_c.patch
 
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
@@ -67,14 +67,15 @@
 
 %prep
 %setup -q -n xine-lib-%{version}
+
+install -p -m644 %{SOURCE1} src/dxr3/compat.c
+
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch0 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # when compiling with external ffmpeg and internal libfaad #939.
 #patch6 -p1 -b .deepbind
 
-%patch50 -p1 -b .dxr3_no_compat_c
-
 # Avoid standard rpaths on lib64 archs:
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -190,6 +191,9 @@
 
 
 %changelog
+* Tue Mar 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18-3
+- get missing/upstream compat.c
+
 * Mon Mar 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18-2
 - better dxr3_no_compat_c.patch (s/compat.c/compat.h/)
 


--- xine-lib-1.1.18-dxr3_no_compat_c.patch DELETED ---