rpms/ffmpeg/F-15 .cvsignore, 1.29, 1.30 ffmpeg.spec, 1.52, 1.53 sources, 1.29, 1.30
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11172/F-15
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
Update to 0.7.12
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 1 Feb 2012 17:09:30 -0000 1.29
+++ .cvsignore 1 May 2012 18:09:55 -0000 1.30
@@ -1 +1 @@
-ffmpeg-0.7.11.tar.bz2
+ffmpeg-0.7.12.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/ffmpeg.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ffmpeg.spec 1 Feb 2012 17:09:30 -0000 1.52
+++ ffmpeg.spec 1 May 2012 18:09:56 -0000 1.53
@@ -6,7 +6,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.7.11
+Version: 0.7.12
Release: 1%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -250,6 +250,9 @@
%changelog
+* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.12-1
+- Update to 0.7.12
+
* Wed Feb 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.11-1
- Update to 0.7.11
- Rebuilt for libvpx
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 1 Feb 2012 17:09:30 -0000 1.29
+++ sources 1 May 2012 18:09:56 -0000 1.30
@@ -1 +1 @@
-fb3de74e8a92152698aba429435ab73c ffmpeg-0.7.11.tar.bz2
+b4e3653b2dd930cfa2a80722f8b03182 ffmpeg-0.7.12.tar.bz2
11 years, 12 months
rpms/ffmpeg/F-16 .cvsignore, 1.32, 1.33 ffmpeg.spec, 1.54, 1.55 sources, 1.32, 1.33
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10883/F-16
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
Update to 0.8.11
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-16/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 29 Feb 2012 15:13:41 -0000 1.32
+++ .cvsignore 1 May 2012 18:05:59 -0000 1.33
@@ -1 +1 @@
-ffmpeg-0.8.10.tar.bz2
+ffmpeg-0.8.11.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-16/ffmpeg.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ffmpeg.spec 29 Feb 2012 15:13:41 -0000 1.54
+++ ffmpeg.spec 1 May 2012 18:05:59 -0000 1.55
@@ -6,7 +6,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.8.10
+Version: 0.8.11
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -246,6 +246,9 @@
%changelog
+* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.11-1
+- Update to 0.8.11
+
* Wed Feb 29 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.8.10-1
- Updated to 0.8.10
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-16/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 29 Feb 2012 15:13:41 -0000 1.32
+++ sources 1 May 2012 18:05:59 -0000 1.33
@@ -1 +1 @@
-e64d6362df6a1aafb02e8458efd30d72 ffmpeg-0.8.10.tar.bz2
+7d7ac48d9da209371332f59213b6122d ffmpeg-0.8.11.tar.bz2
11 years, 12 months
rpms/ffmpeg2dirac/F-17 dead.package, NONE, 1.1 .cvsignore, 1.3, NONE ffmpeg2dirac-ffmpeg.patch, 1.1, NONE ffmpeg2dirac.spec, 1.7, NONE sources, 1.3, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg2dirac/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9969/F-17
Added Files:
dead.package
Removed Files:
.cvsignore ffmpeg2dirac-ffmpeg.patch ffmpeg2dirac.spec sources
Log Message:
Dead.package
--- NEW FILE dead.package ---
FTBFS - ffmpeg has dirac disabled, so it won't work.
prefer to use schroedinger
--- .cvsignore DELETED ---
--- ffmpeg2dirac-ffmpeg.patch DELETED ---
--- ffmpeg2dirac.spec DELETED ---
--- sources DELETED ---
11 years, 12 months
rpms/ffmpeg2dirac/devel dead.package, NONE, 1.1 .cvsignore, 1.3, NONE ffmpeg2dirac-ffmpeg.patch, 1.1, NONE ffmpeg2dirac.spec, 1.6, NONE sources, 1.3, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg2dirac/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9969/devel
Added Files:
dead.package
Removed Files:
.cvsignore ffmpeg2dirac-ffmpeg.patch ffmpeg2dirac.spec sources
Log Message:
Dead.package
--- NEW FILE dead.package ---
FTBFS - ffmpeg has dirac disabled, so it won't work.
prefer to use schroedinger
--- .cvsignore DELETED ---
--- ffmpeg2dirac-ffmpeg.patch DELETED ---
--- ffmpeg2dirac.spec DELETED ---
--- sources DELETED ---
11 years, 12 months
rpms/OpenEXR_Viewers-nonfree/F-17 openexr_viewers-1.0.2-gcc47.patch, NONE, 1.1 OpenEXR_Viewers-nonfree.spec, 1.15, 1.16
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9131/F-17
Modified Files:
OpenEXR_Viewers-nonfree.spec
Added Files:
openexr_viewers-1.0.2-gcc47.patch
Log Message:
Fix for gcc47
openexr_viewers-1.0.2-gcc47.patch:
main.cpp | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE openexr_viewers-1.0.2-gcc47.patch ---
diff -up openexr_viewers-1.0.2/playexr/main.cpp.gcc47 openexr_viewers-1.0.2/playexr/main.cpp
--- openexr_viewers-1.0.2/playexr/main.cpp.gcc47 2012-05-01 19:15:42.823535233 +0200
+++ openexr_viewers-1.0.2/playexr/main.cpp 2012-05-01 19:18:51.106274899 +0200
@@ -48,6 +48,7 @@
#include <vector>
#include <string>
#include <stdlib.h>
+#include <unistd.h>
#include <cstring>
using namespace std;
Index: OpenEXR_Viewers-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/F-17/OpenEXR_Viewers-nonfree.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- OpenEXR_Viewers-nonfree.spec 7 Mar 2012 23:12:30 -0000 1.15
+++ OpenEXR_Viewers-nonfree.spec 1 May 2012 17:21:23 -0000 1.16
@@ -12,7 +12,7 @@
Name: %{real_name}
Version: 1.0.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Viewers programs for OpenEXR
Group: Applications/Multimedia
@@ -24,6 +24,7 @@
Patch2: openexr_viewers-1.0.2-gccCg.patch
# fix dso (missing symbols) by explicitly linking -lGL too
Patch3: openexr_viewers-1.0.2-dso.patch
+Patch4: openexr_viewers-1.0.2-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool
@@ -75,6 +76,7 @@
%patch1 -p1 -b .gcc44
%patch2 -p1 -b .gccCg
%patch3 -p1 -b .ld
+%patch4 -p1 -b .gcc47
%if %{_lib} == lib64
sed -i -e 's|ACTUAL_PREFIX/lib/CTL|ACTUAL_PREFIX/lib64/CTL|' configure.ac
@@ -139,6 +141,9 @@
%endif
%changelog
+* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.2-10
+- Fix for gcc47
+
* Thu Mar 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.2-9
- Rebuilt for c++ ABI breakage
11 years, 12 months
rpms/OpenEXR_Viewers-nonfree/devel openexr_viewers-1.0.2-gcc47.patch, NONE, 1.1 OpenEXR_Viewers-nonfree.spec, 1.15, 1.16
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8948/devel
Modified Files:
OpenEXR_Viewers-nonfree.spec
Added Files:
openexr_viewers-1.0.2-gcc47.patch
Log Message:
Fix for gcc47
openexr_viewers-1.0.2-gcc47.patch:
main.cpp | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE openexr_viewers-1.0.2-gcc47.patch ---
diff -up openexr_viewers-1.0.2/playexr/main.cpp.gcc47 openexr_viewers-1.0.2/playexr/main.cpp
--- openexr_viewers-1.0.2/playexr/main.cpp.gcc47 2012-05-01 19:15:42.823535233 +0200
+++ openexr_viewers-1.0.2/playexr/main.cpp 2012-05-01 19:18:51.106274899 +0200
@@ -48,6 +48,7 @@
#include <vector>
#include <string>
#include <stdlib.h>
+#include <unistd.h>
#include <cstring>
using namespace std;
Index: OpenEXR_Viewers-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/OpenEXR_Viewers-nonfree.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- OpenEXR_Viewers-nonfree.spec 7 Mar 2012 23:15:59 -0000 1.15
+++ OpenEXR_Viewers-nonfree.spec 1 May 2012 17:21:01 -0000 1.16
@@ -12,7 +12,7 @@
Name: %{real_name}
Version: 1.0.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Viewers programs for OpenEXR
Group: Applications/Multimedia
@@ -24,6 +24,7 @@
Patch2: openexr_viewers-1.0.2-gccCg.patch
# fix dso (missing symbols) by explicitly linking -lGL too
Patch3: openexr_viewers-1.0.2-dso.patch
+Patch4: openexr_viewers-1.0.2-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool
@@ -75,6 +76,7 @@
%patch1 -p1 -b .gcc44
%patch2 -p1 -b .gccCg
%patch3 -p1 -b .ld
+%patch4 -p1 -b .gcc47
%if %{_lib} == lib64
sed -i -e 's|ACTUAL_PREFIX/lib/CTL|ACTUAL_PREFIX/lib64/CTL|' configure.ac
@@ -139,6 +141,9 @@
%endif
%changelog
+* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.2-10
+- Fix for gcc47
+
* Thu Mar 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.2-9
- Rebuilt for c++ ABI breakage
11 years, 12 months
rpms/lame/EL-6 .cvsignore,1.5,1.6 lame.spec,1.7,1.8 sources,1.5,1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/lame/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv898/EL-6
Modified Files:
.cvsignore lame.spec sources
Log Message:
Use a modern lame-3.99 for F-17 and EL-6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/lame/EL-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 6 Jul 2010 21:15:02 -0000 1.5
+++ .cvsignore 1 May 2012 13:01:25 -0000 1.6
@@ -1 +1 @@
-lame-3.98.4.tar.gz
+lame-3.99.5.tar.gz
Index: lame.spec
===================================================================
RCS file: /cvs/free/rpms/lame/EL-6/lame.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lame.spec 4 Jan 2012 22:15:10 -0000 1.7
+++ lame.spec 1 May 2012 13:01:25 -0000 1.8
@@ -1,6 +1,6 @@
Name: lame
-Version: 3.98.4
-Release: 2%{?dist}
+Version: 3.99.5
+Release: 1%{?dist}
Summary: Free MP3 audio compressor
Group: Applications/Multimedia
@@ -8,7 +8,6 @@
URL: http://lame.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/lame/%{name}-%{version}.tar.gz
Patch1: %{name}-noexecstack.patch
-Patch2: %{name}-pmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
@@ -52,8 +51,6 @@
%prep
%setup -q
%patch1 -p1 -b .noexec
-%patch2 -p1 -b .pmake
-iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp && touch -r ChangeLog ChangeLog.tmp && mv ChangeLog.tmp ChangeLog
%build
@@ -68,8 +65,7 @@
--enable-nasm \
%endif
--enable-mp3x \
- --enable-mp3rtp \
- --enable-decode-layer1
+ --enable-mp3rtp
make %{?_smp_mflags}
@@ -98,7 +94,7 @@
%files
%defattr (-,root,root,-)
-%doc README TODO USAGE doc/html/*.html doc/html/*.css
+%doc README TODO USAGE doc/html/*.html
%{_bindir}/lame
%{_bindir}/mp3rtp
%{_mandir}/man1/lame.1*
@@ -120,8 +116,11 @@
%{_bindir}/mp3x
%changelog
-* Wed Jan 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.98.4-2
-- Rebuilt for target i686
+* Tue Apr 17 2012 Matthias Saou <matthias(a)saou.eu> 3.99.5-1
+- Update to 3.99.5.
+
+* Sun Feb 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.99.4-1
+- Update to 3.99.4
* Tue Jul 06 2010 Dominik Mierzejewski <rpm at greysector.net> - 3.98.4-1
- update to 3.98.4
@@ -233,7 +232,7 @@
- Backed out Vorbis changes (bug 198, 223).
* Fri May 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.4
-- Fixed problems with Makefiles being removed from documentation upon
+- Fixed problems with Makefiles being removed from documentation upon
installation.
* Fri Apr 25 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.3
@@ -243,7 +242,7 @@
* Fri Apr 4 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.2
- Minor adjustments of optimisation flags and configure settings.
-- Killed some noise caused by a bad gtk macro.
+- Killed some noise caused by a bad gtk macro.
- Added epoch numbers to requires.
* Wed Apr 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lame/EL-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 6 Jul 2010 21:15:02 -0000 1.5
+++ sources 1 May 2012 13:01:25 -0000 1.6
@@ -1 +1 @@
-8e9866ad6b570c6c95c8cba48060473f lame-3.98.4.tar.gz
+84835b313d4a8b68f5349816d33e07ce lame-3.99.5.tar.gz
11 years, 12 months
rpms/lame/F-17 .cvsignore,1.5,1.6 lame.spec,1.5,1.6 sources,1.5,1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/lame/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv898/F-17
Modified Files:
.cvsignore lame.spec sources
Log Message:
Use a modern lame-3.99 for F-17 and EL-6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/lame/F-17/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 6 Jul 2010 21:15:02 -0000 1.5
+++ .cvsignore 1 May 2012 13:01:25 -0000 1.6
@@ -1 +1 @@
-lame-3.98.4.tar.gz
+lame-3.99.5.tar.gz
Index: lame.spec
===================================================================
RCS file: /cvs/free/rpms/lame/F-17/lame.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lame.spec 6 Jul 2010 21:15:02 -0000 1.5
+++ lame.spec 1 May 2012 13:01:25 -0000 1.6
@@ -1,5 +1,5 @@
Name: lame
-Version: 3.98.4
+Version: 3.99.5
Release: 1%{?dist}
Summary: Free MP3 audio compressor
@@ -8,7 +8,6 @@
URL: http://lame.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/lame/%{name}-%{version}.tar.gz
Patch1: %{name}-noexecstack.patch
-Patch2: %{name}-pmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
@@ -52,8 +51,6 @@
%prep
%setup -q
%patch1 -p1 -b .noexec
-%patch2 -p1 -b .pmake
-iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp && touch -r ChangeLog ChangeLog.tmp && mv ChangeLog.tmp ChangeLog
%build
@@ -68,8 +65,7 @@
--enable-nasm \
%endif
--enable-mp3x \
- --enable-mp3rtp \
- --enable-decode-layer1
+ --enable-mp3rtp
make %{?_smp_mflags}
@@ -98,7 +94,7 @@
%files
%defattr (-,root,root,-)
-%doc README TODO USAGE doc/html/*.html doc/html/*.css
+%doc README TODO USAGE doc/html/*.html
%{_bindir}/lame
%{_bindir}/mp3rtp
%{_mandir}/man1/lame.1*
@@ -120,6 +116,12 @@
%{_bindir}/mp3x
%changelog
+* Tue Apr 17 2012 Matthias Saou <matthias(a)saou.eu> 3.99.5-1
+- Update to 3.99.5.
+
+* Sun Feb 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.99.4-1
+- Update to 3.99.4
+
* Tue Jul 06 2010 Dominik Mierzejewski <rpm at greysector.net> - 3.98.4-1
- update to 3.98.4
- drop obsolete (build)requirements
@@ -230,7 +232,7 @@
- Backed out Vorbis changes (bug 198, 223).
* Fri May 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.4
-- Fixed problems with Makefiles being removed from documentation upon
+- Fixed problems with Makefiles being removed from documentation upon
installation.
* Fri Apr 25 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.3
@@ -240,7 +242,7 @@
* Fri Apr 4 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.2
- Minor adjustments of optimisation flags and configure settings.
-- Killed some noise caused by a bad gtk macro.
+- Killed some noise caused by a bad gtk macro.
- Added epoch numbers to requires.
* Wed Apr 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lame/F-17/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 6 Jul 2010 21:15:02 -0000 1.5
+++ sources 1 May 2012 13:01:25 -0000 1.6
@@ -1 +1 @@
-8e9866ad6b570c6c95c8cba48060473f lame-3.98.4.tar.gz
+84835b313d4a8b68f5349816d33e07ce lame-3.99.5.tar.gz
11 years, 12 months
rpms/ffmpeg/F-17 ffmpeg.spec,1.60,1.61
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv466/F-17
Modified Files:
ffmpeg.spec
Log Message:
Sync Fedora devel and EL
Introduce FFmpeg in EL6
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-17/ffmpeg.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ffmpeg.spec 11 Apr 2012 12:05:49 -0000 1.60
+++ ffmpeg.spec 1 May 2012 12:48:12 -0000 1.61
@@ -4,10 +4,15 @@
#global date 20110612
#global rel rc1
+%if 0%{?rhel}
+%global _without_vpx 1
+%global _without_celt 1
+%endif
+
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.10.2
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -38,18 +43,19 @@
#libcrystalhd is currently broken
%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
BuildRequires: libdc1394-devel
+Buildrequires: libmodplug-devel
BuildRequires: librtmp-devel
BuildRequires: libtheora-devel
BuildRequires: libv4l-devel
-BuildRequires: libva-devel >= 0.31.0
+%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
-BuildRequires: libvpx-devel >= 0.9.1
+%{?!_without_vpx:BuildRequires: libvpx-devel >= 0.9.1}
%ifarch %{ix86} x86_64
BuildRequires: libXvMC-devel
%endif
%{?_with_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
-%{?_with_openal:BuildRequires: openal-soft-devel}
+%{!?_without_openal:BuildRequires: openal-soft-devel}
%{?_with_opencv:BuildRequires: opencv-devel}
BuildRequires: openjpeg-devel
%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
@@ -85,7 +91,7 @@
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
@@ -99,8 +105,8 @@
../configure \\\
--prefix=%{_prefix} \\\
--bindir=%{_bindir} \\\
- --datadir=%{_datadir}/ffmpeg \\\
- --incdir=%{_includedir}/ffmpeg \\\
+ --datadir=%{_datadir}/%{name} \\\
+ --incdir=%{_includedir}/%{name} \\\
--libdir=%{_libdir} \\\
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
@@ -110,6 +116,7 @@
%{!?_with_crystalhd:--disable-crystalhd} \\\
%{?_with_frei0r:--enable-frei0r} \\\
--enable-gnutls \\\
+ --enable-libass \\\
%{!?_without_cdio:--enable-libcdio} \\\
%{!?_without_celt:--enable-libcelt} \\\
--enable-libdc1394 \\\
@@ -119,7 +126,7 @@
--enable-libfreetype \\\
--enable-libgsm \\\
--enable-libmp3lame \\\
- %{?_with_openal:--enable-openal} \\\
+ %{!?_without_openal:--enable-openal} \\\
%{?_with_opencv:--enable-libopencv} \\\
--enable-libopenjpeg \\\
%{!?_without_pulse:--enable-libpulse} \\\
@@ -129,7 +136,7 @@
--enable-libtheora \\\
--enable-libvorbis \\\
--enable-libv4l2 \\\
- --enable-libvpx \\\
+ %{!?_without_vpx:--enable-libvpx} \\\
%{!?_without_x264:--enable-libx264} \\\
--enable-libxvid \\\
--enable-x11grab \\\
@@ -271,6 +278,11 @@
%changelog
+* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.2-3
+- Sync with ffmpeg-compat and EL
+- Add BR libmodplug-devel
+- Enable libass openal-soft
+
* Tue Apr 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.2-2
- Explicitely disable neon unless armv7hnl
11 years, 12 months
rpms/ffmpeg/devel ffmpeg.spec,1.60,1.61
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv466/devel
Modified Files:
ffmpeg.spec
Log Message:
Sync Fedora devel and EL
Introduce FFmpeg in EL6
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ffmpeg.spec 11 Apr 2012 12:05:49 -0000 1.60
+++ ffmpeg.spec 1 May 2012 12:48:12 -0000 1.61
@@ -4,10 +4,15 @@
#global date 20110612
#global rel rc1
+%if 0%{?rhel}
+%global _without_vpx 1
+%global _without_celt 1
+%endif
+
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.10.2
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -38,18 +43,19 @@
#libcrystalhd is currently broken
%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
BuildRequires: libdc1394-devel
+Buildrequires: libmodplug-devel
BuildRequires: librtmp-devel
BuildRequires: libtheora-devel
BuildRequires: libv4l-devel
-BuildRequires: libva-devel >= 0.31.0
+%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
-BuildRequires: libvpx-devel >= 0.9.1
+%{?!_without_vpx:BuildRequires: libvpx-devel >= 0.9.1}
%ifarch %{ix86} x86_64
BuildRequires: libXvMC-devel
%endif
%{?_with_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
-%{?_with_openal:BuildRequires: openal-soft-devel}
+%{!?_without_openal:BuildRequires: openal-soft-devel}
%{?_with_opencv:BuildRequires: opencv-devel}
BuildRequires: openjpeg-devel
%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
@@ -85,7 +91,7 @@
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
@@ -99,8 +105,8 @@
../configure \\\
--prefix=%{_prefix} \\\
--bindir=%{_bindir} \\\
- --datadir=%{_datadir}/ffmpeg \\\
- --incdir=%{_includedir}/ffmpeg \\\
+ --datadir=%{_datadir}/%{name} \\\
+ --incdir=%{_includedir}/%{name} \\\
--libdir=%{_libdir} \\\
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
@@ -110,6 +116,7 @@
%{!?_with_crystalhd:--disable-crystalhd} \\\
%{?_with_frei0r:--enable-frei0r} \\\
--enable-gnutls \\\
+ --enable-libass \\\
%{!?_without_cdio:--enable-libcdio} \\\
%{!?_without_celt:--enable-libcelt} \\\
--enable-libdc1394 \\\
@@ -119,7 +126,7 @@
--enable-libfreetype \\\
--enable-libgsm \\\
--enable-libmp3lame \\\
- %{?_with_openal:--enable-openal} \\\
+ %{!?_without_openal:--enable-openal} \\\
%{?_with_opencv:--enable-libopencv} \\\
--enable-libopenjpeg \\\
%{!?_without_pulse:--enable-libpulse} \\\
@@ -129,7 +136,7 @@
--enable-libtheora \\\
--enable-libvorbis \\\
--enable-libv4l2 \\\
- --enable-libvpx \\\
+ %{!?_without_vpx:--enable-libvpx} \\\
%{!?_without_x264:--enable-libx264} \\\
--enable-libxvid \\\
--enable-x11grab \\\
@@ -271,6 +278,11 @@
%changelog
+* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.2-3
+- Sync with ffmpeg-compat and EL
+- Add BR libmodplug-devel
+- Enable libass openal-soft
+
* Tue Apr 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.2-2
- Explicitely disable neon unless armv7hnl
11 years, 12 months