rpms/openafs-kmod/devel openafs-kmod.spec,1.1,1.2 sources,1.2,1.3
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22616
Modified Files:
openafs-kmod.spec sources
Log Message:
* Tue Jan 11 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
- Build 1.4.14
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openafs-kmod.spec 11 Jun 2010 16:56:05 -0000 1.1
+++ openafs-kmod.spec 11 Jan 2011 18:40:20 -0000 1.2
@@ -22,15 +22,15 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.4.12.1
-Release: 2%{?dist}.0
+Version: 1.4.14
+Release: 1%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
License: IBM
URL: http://www.openafs.org
-Source0: http://www.openafs.org/dl/openafs/1.4.12/%{kmod_name}-%{version}-src.tar.bz2
+Source0: http://www.openafs.org/dl/openafs/%{version}/%{kmod_name}-%{version}-src....
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -102,6 +102,9 @@
%changelog
+* Tue Jan 11 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
+- Build 1.4.14
+
* Fri Jun 11 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-2
- Build in devel branch for rawhide
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 Jun 2010 16:56:05 -0000 1.2
+++ sources 11 Jan 2011 18:40:20 -0000 1.3
@@ -1 +1 @@
-c45a8ca3b4605e9dac25ff435c60d512 openafs-1.4.12.1-src.tar.bz2
+e26d2e894999a18a47a9cf8bbfbaadb2 openafs-1.4.14-src.tar.bz2
13 years, 3 months
rpms/openafs/devel openafs.spec,1.4,1.5 sources,1.3,1.4
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22189
Modified Files:
openafs.spec sources
Log Message:
* Tue Jan 11 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
- Build 1.4.14
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openafs.spec 4 Nov 2010 21:29:09 -0000 1.4
+++ openafs.spec 11 Jan 2011 18:35:19 -0000 1.5
@@ -12,13 +12,13 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.4.12.1
-Release: 5%{?dist}
+Version: 1.4.14
+Release: 1%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
-Source0: http://www.openafs.org/dl/openafs/1.4.12/%{name}-%{version}-src.tar.bz2
-Source1: http://www.openafs.org/dl/openafs/1.4.12/openafs-%{version}-doc.tar.bz2
+Source0: http://www.openafs.org/dl/openafs/%{version}/%{name}-%{version}-src.tar.bz2
+Source1: http://www.openafs.org/dl/openafs/%{version}/openafs-%{version}-doc.tar.bz2
Source11: CellServDB
Source12: cacheinfo
Source13: openafs.init
@@ -298,6 +298,9 @@
%changelog
+* Tue Jan 11 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
+- Build 1.4.14
+
* Thu Nov 04 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-5
- RHEL 6 doesn't have a "redhat-release" package and the afs.conf
script that generates the sysnames needed correcting as it references
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 30 Jun 2010 18:31:08 -0000 1.3
+++ sources 11 Jan 2011 18:35:19 -0000 1.4
@@ -1,2 +1,2 @@
-23041583f982796da3965979537a4ef1 openafs-1.4.12.1-doc.tar.bz2
-c45a8ca3b4605e9dac25ff435c60d512 openafs-1.4.12.1-src.tar.bz2
+4d1502afa76de966dbc16f80a51e8c6a openafs-1.4.14-doc.tar.bz2
+e26d2e894999a18a47a9cf8bbfbaadb2 openafs-1.4.14-src.tar.bz2
13 years, 3 months
rpms/openafs-kmod/F-14 .cvsignore, 1.1, 1.2 openafs-kmod.spec, 1.8, 1.9 sources, 1.2, 1.3
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20836
Modified Files:
.cvsignore openafs-kmod.spec sources
Log Message:
* Tue Jan 11 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
- Build 1.4.14
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-14/openafs-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openafs-kmod.spec 24 Dec 2010 17:38:08 -0000 1.8
+++ openafs-kmod.spec 11 Jan 2011 18:17:12 -0000 1.9
@@ -22,8 +22,8 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.4.12.1
-Release: 2%{?dist}.7
+Version: 1.4.14
+Release: 1%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -102,6 +102,9 @@
%changelog
+* Tue Jan 11 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
+- Build 1.4.14
+
* Fri Dec 24 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.4.12.1-2.7
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-14/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 Jun 2010 16:56:05 -0000 1.2
+++ sources 11 Jan 2011 18:17:12 -0000 1.3
@@ -1 +1 @@
-c45a8ca3b4605e9dac25ff435c60d512 openafs-1.4.12.1-src.tar.bz2
+e26d2e894999a18a47a9cf8bbfbaadb2 openafs-1.4.14-src.tar.bz2
13 years, 3 months
rpms/openafs-kmod/F-13 openafs-kmod.spec,1.16,1.17 sources,1.2,1.3
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20782
Modified Files:
openafs-kmod.spec sources
Log Message:
* Tue Jan 11 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
- Build 1.4.14
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-13/openafs-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openafs-kmod.spec 17 Dec 2010 09:06:13 -0000 1.16
+++ openafs-kmod.spec 11 Jan 2011 18:16:41 -0000 1.17
@@ -22,8 +22,8 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.4.12.1
-Release: 1%{?dist}.14
+Version: 1.4.14
+Release: 1%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -102,6 +102,9 @@
%changelog
+* Tue Jan 11 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
+- Build 1.4.14
+
* Fri Dec 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.4.12.1-1.14
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 27 May 2010 19:57:18 -0000 1.2
+++ sources 11 Jan 2011 18:16:41 -0000 1.3
@@ -1 +1 @@
-c45a8ca3b4605e9dac25ff435c60d512 openafs-1.4.12.1-src.tar.bz2
+e26d2e894999a18a47a9cf8bbfbaadb2 openafs-1.4.14-src.tar.bz2
13 years, 3 months
rpms/VirtualBox-OSE-kmod/devel VirtualBox-OSE-3.2.10-linux-2.6.37.patch, NONE, 1.1 VirtualBox-OSE-kmod.spec, 1.45, 1.46
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv547
Modified Files:
VirtualBox-OSE-kmod.spec
Added Files:
VirtualBox-OSE-3.2.10-linux-2.6.37.patch
Log Message:
Fix build with 2.6.37
VirtualBox-OSE-3.2.10-linux-2.6.37.patch:
vboxvideo_drm.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE VirtualBox-OSE-3.2.10-linux-2.6.37.patch ---
svn log -c33754 http://www.virtualbox.org/svn/vbox/trunk
------------------------------------------------------------------------
r33754 | vboxsync | 2010-11-04 09:56:02 +0100 (Thu, 04 Nov 2010) | 2 lines
Additions/linux/drm: Linux 2.6.37 fix
------------------------------------------------------------------------
svn diff -c33754 http://www.virtualbox.org/svn/vbox/trunk
Index: src/VBox/Additions/linux/drm/vboxvideo_drm.c
===================================================================
--- src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 33753)
+++ src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 33754)
@@ -78,8 +78,11 @@
/* .driver_features = DRIVER_USE_MTRR, */
.load = vboxvideo_driver_load,
.reclaim_buffers = drm_core_reclaim_buffers,
+ /* As of Linux 2.65.37, always the internal functions are used. */
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 37)
.get_map_ofs = drm_core_get_map_ofs,
.get_reg_ofs = drm_core_get_reg_ofs,
+#endif
.fops = {
.owner = THIS_MODULE,
.open = drm_open,
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/devel/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- VirtualBox-OSE-kmod.spec 16 Nov 2010 08:25:59 -0000 1.45
+++ VirtualBox-OSE-kmod.spec 11 Jan 2011 08:38:53 -0000 1.46
@@ -19,7 +19,7 @@
Name: VirtualBox-OSE-kmod
Version: 3.2.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -27,6 +27,7 @@
URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: VirtualBox-OSE-kmod-1.6.4-kernel-variants.txt
+Patch0: VirtualBox-OSE-3.2.10-linux-2.6.37.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-OSE-kmodsrc = %{version}%{?prereltag}, xz
@@ -50,6 +51,7 @@
%prep
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
+%{__patch} %{?_default_patch_flags} %{name}-%{version}/vboxvideo/vboxvideo_drm.c <%{PATCH0}
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
@@ -98,6 +100,9 @@
%changelog
+* Tue Jan 11 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.10-2
+- Fix build with 2.6.37
+
* Tue Nov 16 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.10-1
- New release
13 years, 3 months
rpms/openafs/F-13 openafs.spec,1.4,1.5 sources,1.3,1.4
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31156
Modified Files:
openafs.spec sources
Log Message:
* Mon Jan 10 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
- Build 1.4.14
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/openafs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openafs.spec 15 Jul 2010 17:04:37 -0000 1.4
+++ openafs.spec 11 Jan 2011 03:26:58 -0000 1.5
@@ -12,8 +12,8 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.4.12.1
-Release: 4%{?dist}
+Version: 1.4.14
+Release: 1%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -298,6 +298,9 @@
%changelog
+* Mon Jan 10 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
+- Build 1.4.14
+
* Thu Jul 15 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-4
- RPMFusion Bug #1333
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Jun 2010 21:19:22 -0000 1.3
+++ sources 11 Jan 2011 03:26:58 -0000 1.4
@@ -1,2 +1,2 @@
-23041583f982796da3965979537a4ef1 openafs-1.4.12.1-doc.tar.bz2
-c45a8ca3b4605e9dac25ff435c60d512 openafs-1.4.12.1-src.tar.bz2
+4d1502afa76de966dbc16f80a51e8c6a openafs-1.4.14-doc.tar.bz2
+e26d2e894999a18a47a9cf8bbfbaadb2 openafs-1.4.14-src.tar.bz2
13 years, 3 months
rpms/openafs/F-14 .cvsignore, 1.1, 1.2 openafs.spec, 1.4, 1.5 sources, 1.3, 1.4
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29063
Modified Files:
.cvsignore openafs.spec sources
Log Message:
* Mon Jan 10 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
- Build 1.4.14
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/F-14/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Nov 2009 14:00:07 -0000 1.1
+++ .cvsignore 10 Jan 2011 23:52:18 -0000 1.2
@@ -0,0 +1,2 @@
+openafs-1.4.14-doc.tar.bz2
+openafs-1.4.14-src.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-14/openafs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openafs.spec 4 Nov 2010 21:28:02 -0000 1.4
+++ openafs.spec 10 Jan 2011 23:52:18 -0000 1.5
@@ -12,8 +12,8 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.4.12.1
-Release: 5%{?dist}
+Version: 1.4.14
+Release: 1%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -298,6 +298,9 @@
%changelog
+* Mon Jan 10 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.14-1
+- Build 1.4.14
+
* Thu Nov 04 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-5
- RHEL 6 doesn't have a "redhat-release" package and the afs.conf
script that generates the sysnames needed correcting as it references
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-14/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 30 Jun 2010 18:31:08 -0000 1.3
+++ sources 10 Jan 2011 23:52:18 -0000 1.4
@@ -1,2 +1,2 @@
-23041583f982796da3965979537a4ef1 openafs-1.4.12.1-doc.tar.bz2
-c45a8ca3b4605e9dac25ff435c60d512 openafs-1.4.12.1-src.tar.bz2
+4d1502afa76de966dbc16f80a51e8c6a openafs-1.4.14-doc.tar.bz2
+e26d2e894999a18a47a9cf8bbfbaadb2 openafs-1.4.14-src.tar.bz2
13 years, 3 months
rpms/x264/F-14 sources,1.14,1.15 x264.spec,1.21,1.22
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7063
Modified Files:
sources x264.spec
Log Message:
* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110110
- 20110110 snapshot (ABI bump)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 6 Jul 2010 17:36:13 -0000 1.14
+++ sources 10 Jan 2011 21:56:26 -0000 1.15
@@ -1 +1 @@
-ea9eae8863f2a8c4728f39f666ae7c7a x264-20100706.tar.bz2
+f34cfcf47656cb6bfe7052a113b0db8d x264-20110110.tar.bz2
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/x264.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- x264.spec 6 Jul 2010 17:36:13 -0000 1.21
+++ x264.spec 10 Jan 2011 21:56:26 -0000 1.22
@@ -1,10 +1,9 @@
-%global snapshot 20100706
-%global git d058f37
+%global snapshot 20110110
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.28.%{snapshot}git%{git}%{?dist}
+Release: 0.29.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -57,9 +56,7 @@
--bindir=%{_bindir} \\\
--includedir=%{_includedir} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
- %{!?_without_gpac:--enable-mp4-output} \\\
%{?_with_visualize:--enable-visualize} \\\
- --enable-pthread \\\
--enable-debug \\\
--enable-shared \\\
--enable-pic
@@ -132,6 +129,7 @@
%defattr(644, root, root, 0755)
%doc doc/*
%{_includedir}/x264.h
+%{_includedir}/x264_config.h
%{_libdir}/libx264.so
%{_libdir}/pkgconfig/%{name}.pc
%ifarch i686
@@ -139,6 +137,9 @@
%endif
%changelog
+* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110110
+- 20110110 snapshot (ABI bump)
+
* Tue Jul 06 2010 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.28.20100706gitd058f37
- 20100706 snapshot (ABI bump)
- drop old Obsoletes:
13 years, 3 months
rpms/ffmpeg/F-14 ffmpeg-snapshot.sh, 1.6, 1.7 ffmpeg.spec, 1.34, 1.35 sources, 1.17, 1.18
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6104
Modified Files:
ffmpeg-snapshot.sh ffmpeg.spec sources
Log Message:
* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.1-1.20110110svn
- 20110110 snapshot
- bump version to post-0.6.1 to allow stable 0.6.1 update in older branches
- drop --with amr->opencore_amr indirection
- add qt-faststart tool (bug #1259)
Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/ffmpeg-snapshot.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ffmpeg-snapshot.sh 16 Jan 2010 17:20:07 -0000 1.6
+++ ffmpeg-snapshot.sh 10 Jan 2011 21:43:56 -0000 1.7
@@ -22,9 +22,6 @@
pushd libswscale
svn update -r $svn libswscale
popd
-./version.sh . version.h
-find . -type d -name .svn -print0 | xargs -0r rm -rf
-sed -i -e '/^\.PHONY: version\.h$/d' Makefile
cd ..
tar jcf "$pwd"/ffmpeg-$date.tar.bz2 ffmpeg-$date
cd - >/dev/null
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/ffmpeg.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ffmpeg.spec 21 Jul 2010 17:03:57 -0000 1.34
+++ ffmpeg.spec 10 Jan 2011 21:43:56 -0000 1.35
@@ -1,15 +1,12 @@
# TODO: add make test to %%check section
-%global svn 20100704
-%{?_with_amr:
-%global _with_opencore_amr 1
-}
+%global svn 20110110
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.6
-Release: 4.%{svn}svn%{?dist}
-%if 0%{?_with_opencore_amr:1}
+Version: 0.6.1
+Release: 1.%{svn}svn%{?dist}
+%if 0%{?_with_amr:1}
License: GPLv3+
%else
License: GPLv2+
@@ -32,11 +29,12 @@
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
BuildRequires: libvpx-devel >= 0.9.1
-%{?_with_opencore_amr:BuildRequires: opencore-amr-devel}
+%{?_with_amr:BuildRequires: opencore-amr-devel}
BuildRequires: openjpeg-devel
BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
BuildRequires: speex-devel
+BuildRequires: subversion
BuildRequires: texi2html
BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: xvidcore-devel
@@ -86,7 +84,7 @@
--arch=%{_target_cpu} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
--extra-version=rpmfusion \\\
- %{?_with_opencore_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\
+ %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\
--enable-bzlib \\\
--enable-libdc1394 \\\
--enable-libdirac \\\
@@ -104,7 +102,6 @@
--enable-libxvid \\\
--enable-x11grab \\\
--enable-avfilter \\\
- --enable-avfilter-lavf \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
@@ -152,6 +149,7 @@
make %{?_smp_mflags}
make documentation
+make alltools
popd
%if 0%{!?ffmpegsuffix:1}
@@ -175,6 +173,7 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
+install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
popd
%if 0%{!?ffmpegsuffix:1}
pushd simd
@@ -200,6 +199,7 @@
%{_bindir}/ffplay
%{_bindir}/ffprobe
%{_bindir}/ffserver
+%{_bindir}/qt-faststart
%{_mandir}/man1/ffmpeg.1*
%{_mandir}/man1/ffplay.1*
%{_mandir}/man1/ffprobe.1*
@@ -230,6 +230,12 @@
%changelog
+* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.1-1.20110110svn
+- 20110110 snapshot
+- bump version to post-0.6.1 to allow stable 0.6.1 update in older branches
+- drop --with amr->opencore_amr indirection
+- add qt-faststart tool (bug #1259)
+
* Wed Jul 21 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6-4.20100704svn
- Enable libva
- Restore compatibility --with amr
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 4 Jul 2010 22:19:26 -0000 1.17
+++ sources 10 Jan 2011 21:43:56 -0000 1.18
@@ -1 +1 @@
-9e4119c9252be7e4528c7fb702228701 ffmpeg-20100704.tar.bz2
+fccd69057e331c2541bb024b1e92e864 ffmpeg-20110110.tar.bz2
13 years, 3 months
rpms/xvidcore/F-13 xvidcore-noexec-stack.patch, 1.1, 1.2 xvidcore.spec, 1.6, 1.7
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/xvidcore/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv507
Modified Files:
xvidcore-noexec-stack.patch xvidcore.spec
Log Message:
* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-2
- fix noexec stack issue on i686 (bug #1560)
- drop non-standard CFLAGS addition
xvidcore-noexec-stack.patch:
build/generic/configure | 2 +-
build/generic/configure.in | 2 +-
src/bitstream/x86_asm/cbp_mmx.asm | 6 +-----
src/bitstream/x86_asm/cbp_sse2.asm | 6 +-----
src/dct/x86_asm/fdct_mmx_ffmpeg.asm | 5 +----
src/dct/x86_asm/fdct_mmx_skal.asm | 5 +----
src/dct/x86_asm/fdct_sse2_skal.asm | 5 +----
src/dct/x86_asm/idct_3dne.asm | 6 +-----
src/dct/x86_asm/idct_mmx.asm | 6 +-----
src/dct/x86_asm/idct_sse2_dmitry.asm | 6 +-----
src/image/x86_asm/colorspace_rgb_mmx.asm | 6 +-----
src/image/x86_asm/colorspace_yuv_mmx.asm | 5 +----
src/image/x86_asm/colorspace_yuyv_mmx.asm | 5 +----
src/image/x86_asm/deintl_sse.asm | 5 +----
src/image/x86_asm/gmc_mmx.asm | 5 +----
src/image/x86_asm/interpolate8x8_3dn.asm | 6 +-----
src/image/x86_asm/interpolate8x8_3dne.asm | 6 +-----
src/image/x86_asm/interpolate8x8_mmx.asm | 6 +-----
src/image/x86_asm/interpolate8x8_xmm.asm | 6 +-----
src/image/x86_asm/postprocessing_mmx.asm | 5 +----
src/image/x86_asm/postprocessing_sse2.asm | 5 +----
src/image/x86_asm/qpel_mmx.asm | 5 +----
src/image/x86_asm/reduced_mmx.asm | 6 +-----
src/motion/x86_asm/sad_3dn.asm | 6 +-----
src/motion/x86_asm/sad_3dne.asm | 6 +-----
src/motion/x86_asm/sad_mmx.asm | 6 +-----
src/motion/x86_asm/sad_sse2.asm | 6 +-----
src/motion/x86_asm/sad_xmm.asm | 6 +-----
src/nasm.inc | 9 +++++++++
src/plugins/x86_asm/plugin_ssim-a.asm | 4 +---
src/quant/x86_asm/quantize_h263_3dne.asm | 5 +----
src/quant/x86_asm/quantize_h263_mmx.asm | 6 +-----
src/quant/x86_asm/quantize_mpeg_mmx.asm | 6 +-----
src/quant/x86_asm/quantize_mpeg_xmm.asm | 6 +-----
src/utils/x86_asm/cpuid.asm | 5 +----
src/utils/x86_asm/interlacing_mmx.asm | 6 +-----
src/utils/x86_asm/mem_transfer_3dne.asm | 6 +-----
src/utils/x86_asm/mem_transfer_mmx.asm | 6 +-----
38 files changed, 46 insertions(+), 163 deletions(-)
Index: xvidcore-noexec-stack.patch
===================================================================
RCS file: /cvs/free/rpms/xvidcore/F-13/xvidcore-noexec-stack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xvidcore-noexec-stack.patch 12 Dec 2010 02:34:36 -0000 1.1
+++ xvidcore-noexec-stack.patch 10 Jan 2011 20:18:37 -0000 1.2
@@ -1,3 +1,27 @@
+diff -up xvidcore/build/generic/configure.in.noexec xvidcore/build/generic/configure.in
+--- xvidcore/build/generic/configure.in.noexec 2010-12-31 11:53:22.000000000 +0100
++++ xvidcore/build/generic/configure.in 2011-01-10 20:13:36.000000000 +0100
+@@ -271,7 +271,7 @@ case "$target_os" in
+ AC_MSG_RESULT([ok])
+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
+- SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm"
++ SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld,-z,noexecstack -lc -lm"
+ SPECIFIC_CFLAGS="-fPIC"
+ ;;
+ *bsd*|irix*)
+diff -up xvidcore/build/generic/configure.noexec xvidcore/build/generic/configure
+--- xvidcore/build/generic/configure.noexec 2010-12-31 11:53:22.000000000 +0100
++++ xvidcore/build/generic/configure 2011-01-10 20:13:49.000000000 +0100
+@@ -3851,7 +3851,7 @@ case "$target_os" in
+ echo "${ECHO_T}ok" >&6
+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
+- SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm"
++ SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld,-z,noexecstack -lc -lm"
+ SPECIFIC_CFLAGS="-fPIC"
+ ;;
+ *bsd*|irix*)
diff -up xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_mmx.asm
--- xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm 2010-12-12 03:21:50.000000000 +0100
Index: xvidcore.spec
===================================================================
RCS file: /cvs/free/rpms/xvidcore/F-13/xvidcore.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xvidcore.spec 12 Dec 2010 02:34:36 -0000 1.6
+++ xvidcore.spec 10 Jan 2011 20:18:37 -0000 1.7
@@ -1,6 +1,6 @@
Name: xvidcore
Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MPEG-4 Simple and Advanced Simple Profile codec
Group: System Environment/Libraries
@@ -44,7 +44,6 @@
%build
cd build/generic
-export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
%configure
make %{?_smp_mflags}
cd -
@@ -83,6 +82,10 @@
%changelog
+* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-2
+- fix noexec stack issue on i686 (bug #1560)
+- drop non-standard CFLAGS addition
+
* Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1
- 1.2.2
- rebase noexec-stack patch
13 years, 3 months