rpms/openafs-kmod/F-18 openafs-kmod.spec,1.24,1.25
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2466
Modified Files:
openafs-kmod.spec
Log Message:
* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.1
- Rebuilt for Fedora 18 Beta kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-18/openafs-kmod.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openafs-kmod.spec 6 Oct 2012 19:50:45 -0000 1.24
+++ openafs-kmod.spec 25 Nov 2012 20:00:18 -0000 1.25
@@ -1,5 +1,5 @@
# (un)define the next line to either build for the newest or all current kernels
-%define buildforkernels newest
+%define buildforkernels current
# Define the OpenAFS sysname
%ifarch %{ix86}
@@ -21,7 +21,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.1
-Release: 4%{?dist}
+Release: 4%{?dist}.1
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -147,6 +147,9 @@
%changelog
+* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.1
+- Rebuilt for Fedora 18 Beta kernel
+
* Sat Oct 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-4
- Rebuild for F-18 Beta. Debugging is now disabled in F-18 kernels.
11 years, 5 months
rpms/ndiswrapper-kmod/F-18 ndiswrapper-kmod.spec,1.55,1.56
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2368
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.58-0.1rc1.1
- Rebuilt for Fedora 18 Beta kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-18/ndiswrapper-kmod.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ndiswrapper-kmod.spec 7 Oct 2012 15:00:07 -0000 1.55
+++ ndiswrapper-kmod.spec 25 Nov 2012 20:00:12 -0000 1.56
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.58
-Release: 0.1%{?pre}%{?dist}
+Release: 0.1%{?pre}%{?dist}.1
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -75,6 +75,9 @@
%changelog
+* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.58-0.1rc1.1
+- Rebuilt for Fedora 18 Beta kernel
+
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-1.1
- Rebuild for UsrMove
11 years, 5 months
rpms/xorg-x11-drv-nvidia/F-16 xorg-x11-drv-nvidia.spec,1.86,1.87
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10549
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
sync with F-17
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- xorg-x11-drv-nvidia.spec 21 Nov 2012 23:21:50 -0000 1.86
+++ xorg-x11-drv-nvidia.spec 25 Nov 2012 13:12:23 -0000 1.87
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 304.64
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -261,6 +261,11 @@
install -pm 0644 %{SOURCE99} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
}
+#Workaround for self made xorg.conf using a Files section.
+%if 0%{?fedora} < 18
+ln -fs ../../nvidia/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/nvidia-%{version}
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -336,6 +341,9 @@
%dir %{nvidiaxorgdir}
%{nvidiaxorgdir}/*.so*
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%if 0%{?fedora} < 18
+%{_libdir}/xorg/modules/nvidia-%{version}
+%endif
#/no_multilib
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
@@ -369,6 +377,9 @@
%changelog
+* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-3
+- Add workaround for incorrect Files section - rfbz#2580
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-1
- Update to 304.64
- Move nvidia xorg libraries to _libdir/nvidia/xorg - rfbz#2264
11 years, 5 months
rpms/xorg-x11-drv-nvidia/F-18 xorg-x11-drv-nvidia.spec,1.91,1.92
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8102/F-18
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Workaround for rfbz#2580
Revert gfxpayload=text vs vga=normal
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- xorg-x11-drv-nvidia.spec 24 Nov 2012 17:17:45 -0000 1.91
+++ xorg-x11-drv-nvidia.spec 25 Nov 2012 12:08:05 -0000 1.92
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 304.64
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -261,6 +261,11 @@
install -pm 0644 %{SOURCE99} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
}
+#Workaround for self made xorg.conf using a Files section.
+%if 0%{?fedora} < 18
+ln -fs ../../nvidia/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/nvidia-%{version}
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -277,7 +282,7 @@
for kernel in ${KERNELS} ; do
/sbin/grubby $ISGRUB1 \
--update-kernel=${kernel} \
- --args='nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off gfxpayload=text' \
+ --args='nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off vga=normal' \
&>/dev/null
done
fi
@@ -300,7 +305,7 @@
for kernel in ${KERNELS} ; do
/sbin/grubby $ISGRUB1 \
--update-kernel=${kernel} \
- --remove-args='nouveau.modeset=0 rdblacklist=nouveau rd.driver.blacklist=nouveau nomodeset video=vesa:off gfxpayload=text' &>/dev/null
+ --remove-args='nouveau.modeset=0 rdblacklist=nouveau rd.driver.blacklist=nouveau nomodeset video=vesa:off' &>/dev/null
done
fi
#Backup and disable previously used xorg.conf
@@ -336,6 +341,9 @@
%dir %{nvidiaxorgdir}
%{nvidiaxorgdir}/*.so*
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%if 0%{?fedora} < 18
+%{_libdir}/xorg/modules/nvidia-%{version}
+%endif
#/no_multilib
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
@@ -369,8 +377,8 @@
%changelog
-* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-2
-- Use grub2 gfxpayload=text instead of deprecated vga option
+* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-3
+- Add workaround for incorrect Files section - rfbz#2580
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-1
- Update to 304.64
11 years, 5 months
rpms/xorg-x11-drv-nvidia/F-17 xorg-x11-drv-nvidia.spec,1.88,1.89
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8102/F-17
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Workaround for rfbz#2580
Revert gfxpayload=text vs vga=normal
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- xorg-x11-drv-nvidia.spec 21 Nov 2012 23:21:50 -0000 1.88
+++ xorg-x11-drv-nvidia.spec 25 Nov 2012 12:08:06 -0000 1.89
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 304.64
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -261,6 +261,11 @@
install -pm 0644 %{SOURCE99} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
}
+#Workaround for self made xorg.conf using a Files section.
+%if 0%{?fedora} < 18
+ln -fs ../../nvidia/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/nvidia-%{version}
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -336,6 +341,9 @@
%dir %{nvidiaxorgdir}
%{nvidiaxorgdir}/*.so*
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%if 0%{?fedora} < 18
+%{_libdir}/xorg/modules/nvidia-%{version}
+%endif
#/no_multilib
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
@@ -369,6 +377,9 @@
%changelog
+* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-3
+- Add workaround for incorrect Files section - rfbz#2580
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-1
- Update to 304.64
- Move nvidia xorg libraries to _libdir/nvidia/xorg - rfbz#2264
11 years, 5 months
rpms/acoustid-fingerprinter/devel .cvsignore, 1.2, 1.3 acoustid-fingerprinter.spec, 1.7, 1.8 sources, 1.2, 1.3
by Ismael Olea
Author: olea
Update of /cvs/free/rpms/acoustid-fingerprinter/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11341
Modified Files:
.cvsignore acoustid-fingerprinter.spec sources
Log Message:
updating to 0.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/acoustid-fingerprinter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Jan 2012 10:00:06 -0000 1.2
+++ .cvsignore 24 Nov 2012 19:23:12 -0000 1.3
@@ -1 +1 @@
-acoustid-fingerprinter-0.5.1.tar.gz
+acoustid-fingerprinter-0.6.tar.gz
Index: acoustid-fingerprinter.spec
===================================================================
RCS file: /cvs/free/rpms/acoustid-fingerprinter/devel/acoustid-fingerprinter.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- acoustid-fingerprinter.spec 24 Nov 2012 14:53:49 -0000 1.7
+++ acoustid-fingerprinter.spec 24 Nov 2012 19:23:12 -0000 1.8
@@ -1,6 +1,6 @@
Name: acoustid-fingerprinter
-Version: 0.5.1
-Release: 7%{?dist}
+Version: 0.6
+Release: 1%{?dist}
Summary: Music AcoustID fingerprinting application
Group: System Environment/Libraries
@@ -72,6 +72,9 @@
%changelog
+* Sat Nov 24 2012 Ismael Olea <ismael(a)olea.org> - 0.6-1
+- Update to 0.6
+
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.1-7
- Rebuilt for FFmpeg 1.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/acoustid-fingerprinter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jan 2012 10:00:06 -0000 1.2
+++ sources 24 Nov 2012 19:23:12 -0000 1.3
@@ -1 +1 @@
-12f89892168b1774a48944b85edf13f0 acoustid-fingerprinter-0.5.1.tar.gz
+14e2e797ea09474a8862d200234f5e6b acoustid-fingerprinter-0.6.tar.gz
11 years, 5 months
rpms/acoustid-fingerprinter/F-18 .cvsignore, 1.2, 1.3 acoustid-fingerprinter.spec, 1.7, 1.8 sources, 1.2, 1.3
by Ismael Olea
Author: olea
Update of /cvs/free/rpms/acoustid-fingerprinter/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11137
Modified Files:
.cvsignore acoustid-fingerprinter.spec sources
Log Message:
updating to 0.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/acoustid-fingerprinter/F-18/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Jan 2012 10:00:06 -0000 1.2
+++ .cvsignore 24 Nov 2012 19:20:04 -0000 1.3
@@ -1 +1 @@
-acoustid-fingerprinter-0.5.1.tar.gz
+acoustid-fingerprinter-0.6.tar.gz
Index: acoustid-fingerprinter.spec
===================================================================
RCS file: /cvs/free/rpms/acoustid-fingerprinter/F-18/acoustid-fingerprinter.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- acoustid-fingerprinter.spec 24 Nov 2012 14:53:57 -0000 1.7
+++ acoustid-fingerprinter.spec 24 Nov 2012 19:20:05 -0000 1.8
@@ -1,6 +1,6 @@
Name: acoustid-fingerprinter
-Version: 0.5.1
-Release: 7%{?dist}
+Version: 0.6
+Release: 1%{?dist}
Summary: Music AcoustID fingerprinting application
Group: System Environment/Libraries
@@ -72,6 +72,9 @@
%changelog
+* Sat Nov 24 2012 Ismael Olea <ismael(a)olea.org> - 0.6-1
+- Update to 0.6
+
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.1-7
- Rebuilt for FFmpeg 1.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/acoustid-fingerprinter/F-18/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jan 2012 10:00:06 -0000 1.2
+++ sources 24 Nov 2012 19:20:05 -0000 1.3
@@ -1 +1 @@
-12f89892168b1774a48944b85edf13f0 acoustid-fingerprinter-0.5.1.tar.gz
+14e2e797ea09474a8862d200234f5e6b acoustid-fingerprinter-0.6.tar.gz
11 years, 5 months
rpms/xorg-x11-drv-nvidia/F-18 xorg-x11-drv-nvidia.spec,1.90,1.91
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4040
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Use gfxpayload=text instead of the deprecated vga option
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- xorg-x11-drv-nvidia.spec 9 Nov 2012 09:53:37 -0000 1.90
+++ xorg-x11-drv-nvidia.spec 24 Nov 2012 17:17:45 -0000 1.91
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 304.64
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -277,7 +277,7 @@
for kernel in ${KERNELS} ; do
/sbin/grubby $ISGRUB1 \
--update-kernel=${kernel} \
- --args='nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off vga=normal' \
+ --args='nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off gfxpayload=text' \
&>/dev/null
done
fi
@@ -300,7 +300,7 @@
for kernel in ${KERNELS} ; do
/sbin/grubby $ISGRUB1 \
--update-kernel=${kernel} \
- --remove-args='nouveau.modeset=0 rdblacklist=nouveau rd.driver.blacklist=nouveau nomodeset video=vesa:off' &>/dev/null
+ --remove-args='nouveau.modeset=0 rdblacklist=nouveau rd.driver.blacklist=nouveau nomodeset video=vesa:off gfxpayload=text' &>/dev/null
done
fi
#Backup and disable previously used xorg.conf
@@ -369,6 +369,9 @@
%changelog
+* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-2
+- Use grub2 gfxpayload=text instead of deprecated vga option
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-1
- Update to 304.64
- Move nvidia xorg libraries to _libdir/nvidia/xorg - rfbz#2264
11 years, 5 months
rpms/vlc/devel vlc-backport-dvb58.patch, NONE, 1.1 vlc.spec, 1.165, 1.166
by 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(a)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}%{...
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(a)gmail.com> - 2.0.4-3
+- Fix build with kernel-3.7
+
* Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-2
- Rebuilt for x264
11 years, 5 months
rpms/xmms2-freeworld/F-18 xmms2-ffmpeg.patch,1.2,1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xmms2-freeworld/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25403
Added Files:
xmms2-ffmpeg.patch
Log Message:
Add missing patch
xmms2-ffmpeg.patch:
avcodec.c | 4 ++--
avcodec_compat.h | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
Index: xmms2-ffmpeg.patch
===================================================================
RCS file: xmms2-ffmpeg.patch
diff -N xmms2-ffmpeg.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xmms2-ffmpeg.patch 24 Nov 2012 15:48:37 -0000 1.3
@@ -0,0 +1,46 @@
+diff -rupN xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec.c xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
+--- xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec.c 2011-10-20 15:26:08.000000000 -0400
++++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c 2012-11-01 21:36:57.426070895 -0400
+@@ -200,7 +200,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ }
+ }
+
+- data->codecctx = avcodec_alloc_context ();
++ data->codecctx = avcodec_alloc_context3 (codec);
+ data->codecctx->sample_rate = data->samplerate;
+ data->codecctx->channels = data->channels;
+ data->codecctx->bit_rate = data->bitrate;
+@@ -211,7 +211,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ data->codecctx->codec_id = codec->id;
+ data->codecctx->codec_type = codec->type;
+
+- if (avcodec_open (data->codecctx, codec) < 0) {
++ if (avcodec_open2 (data->codecctx, codec, NULL) < 0) {
+ XMMS_DBG ("Opening decoder '%s' failed", codec->name);
+ goto err;
+ } else {
+diff -rupN xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec_compat.h xmms2-0.8DrO_o/src/plugins/avcodec/avcodec_compat.h
+--- xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec_compat.h 2011-10-20 15:26:08.000000000 -0400
++++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec_compat.h 2012-11-01 21:35:50.276405569 -0400
+@@ -65,3 +65,21 @@ typedef struct AVPacket {
+ # define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
+ #endif
+
++/* Calling avcodec_init is not necessary after 53.04 (ffmpeg 0.9) */
++#if LIBAVCODEC_VERSION_INT >= 0x350400
++# define avcodec_init()
++#endif
++
++/* Map avcodec_alloc_context3 into the deprecated version
++ * avcodec_alloc_context in versions earlier than 53.04 (ffmpeg 0.9) */
++#if LIBAVCODEC_VERSION_INT < 0x350400
++# define avcodec_alloc_context3(codec) \
++ avcodec_alloc_context()
++#endif
++
++/* Map avcodec_open2 into the deprecated version
++ * avcodec_open in versions earlier than 53.04 (ffmpeg 0.9) */
++#if LIBAVCODEC_VERSION_INT < 0x350400
++# define avcodec_open2(avctx, codec, options) \
++ avcodec_open(avctx, codec)
++#endif
11 years, 5 months