rpms/mplayer/devel .cvsignore, 1.27, 1.28 mplayer-ffmpeg.patch, 1.6, 1.7 mplayer.spec, 1.55, 1.56 sources, 1.28, 1.29
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/mplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12581
Modified Files:
.cvsignore mplayer-ffmpeg.patch mplayer.spec sources
Log Message:
* Thu Jun 14 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-1
- Updated to 1.1
- Made %pre, %svn and %svnbuild defines optional
- Switched to .xz sources
- Updated the ffmpeg patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 29 Feb 2012 16:45:42 -0000 1.27
+++ .cvsignore 14 Jun 2012 22:34:06 -0000 1.28
@@ -1,2 +1,2 @@
Blue-1.8.tar.bz2
-mplayer-export-2012-02-05.tar.bz2
+MPlayer-1.1.tar.xz
mplayer-ffmpeg.patch:
Makefile | 2
configure | 4 -
ffmpeg/libavformat/internal.h | 32 +++++++++++++
ffmpeg/libavutil/x86_cpu.h | 98 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 133 insertions(+), 3 deletions(-)
Index: mplayer-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mplayer-ffmpeg.patch 11 Mar 2012 23:28:14 -0000 1.6
+++ mplayer-ffmpeg.patch 14 Jun 2012 22:34:06 -0000 1.7
@@ -1,16 +1,16 @@
-diff -up mplayer-export-2012-02-05/configure.ffmpeg mplayer-export-2012-02-05/configure
---- mplayer-export-2012-02-05/configure.ffmpeg 2012-03-12 00:18:05.000000000 +0100
-+++ mplayer-export-2012-02-05/configure 2012-03-12 00:18:05.000000000 +0100
-@@ -6718,7 +6718,7 @@ elif test "$ffmpeg_so" = auto ; then
- inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil)
- ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil)
+diff -up MPlayer-1.1/configure.ffmpeg MPlayer-1.1/configure
+--- MPlayer-1.1/configure.ffmpeg 2012-06-12 19:54:45.573647100 +0200
++++ MPlayer-1.1/configure 2012-06-12 19:55:00.444732663 +0200
+@@ -6755,7 +6755,7 @@ elif test "$ffmpeg_so" = auto ; then
+ inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil)
+ ld_tmp=$($_pkg_config --libs libswscale libavformat libavcodec libavutil)
header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp &&
- extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes
+ extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes && extra_cflags="$extra_cflags $inc_ffmpeg"
- elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil ; then
- extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
+ elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then
+ extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil"
ffmpeg_so=yes
-@@ -7407,7 +7407,7 @@ if test "$_gui" = yes ; then
+@@ -7464,7 +7464,7 @@ if test "$_gui" = yes ; then
# Required libraries
if test "$ffmpeg" != yes ||
@@ -19,9 +19,9 @@
die "The GUI requires libavcodec with PNG support (needs zlib)."
fi
test "$_freetype" = no && test "$_bitmap_font" = no &&
-diff -up mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h
---- mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h.ffmpeg 2012-03-12 00:20:43.000000000 +0100
-+++ mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h 2012-03-12 00:23:13.000000000 +0100
+diff -up MPlayer-1.1/ffmpeg/libavformat/internal.h.ffmpeg MPlayer-1.1/ffmpeg/libavformat/internal.h
+--- MPlayer-1.1/ffmpeg/libavformat/internal.h.ffmpeg 2012-06-12 19:54:45.578647128 +0200
++++ MPlayer-1.1/ffmpeg/libavformat/internal.h 2012-06-12 19:54:45.578647128 +0200
@@ -0,0 +1,32 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
@@ -55,9 +55,9 @@
+} AVCodecTag;
+
+#endif /* AVFORMAT_INTERNAL_H */
-diff -up mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h
---- mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2012-03-12 00:18:05.000000000 +0100
-+++ mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h 2012-03-12 00:18:05.000000000 +0100
+diff -up MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h.ffmpeg MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h
+--- MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2012-06-12 19:54:45.615647342 +0200
++++ MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h 2012-06-12 19:54:45.615647342 +0200
@@ -0,0 +1,98 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
@@ -157,10 +157,10 @@
+#endif
+
+#endif /* AVUTIL_X86_CPU_H */
-diff -up mplayer-export-2012-02-05/Makefile.ffmpeg mplayer-export-2012-02-05/Makefile
---- mplayer-export-2012-02-05/Makefile.ffmpeg 2012-03-12 00:18:05.000000000 +0100
-+++ mplayer-export-2012-02-05/Makefile 2012-03-12 00:18:05.000000000 +0100
-@@ -787,7 +787,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+diff -up MPlayer-1.1/Makefile.ffmpeg MPlayer-1.1/Makefile
+--- MPlayer-1.1/Makefile.ffmpeg 2012-06-12 19:54:45.573647100 +0200
++++ MPlayer-1.1/Makefile 2012-06-12 19:54:45.616647347 +0200
+@@ -788,7 +788,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mplayer.spec 13 Jun 2012 14:00:50 -0000 1.55
+++ mplayer.spec 14 Jun 2012 22:34:06 -0000 1.56
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20120205svn
-%define svn 1
-%define svnbuild 2012-02-05
+#define pre 20120205svn
+#define svn 1
+#define svnbuild 2012-02-05
%define faad2min 1:2.6.1
Name: mplayer
-Version: 1.0
-Release: 0.139.%{pre}%{?dist}
+Version: 1.1
+Release: 1%{?pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
%if 0%{!?_without_amr:1}
@@ -15,11 +15,11 @@
License: GPLv2+
%endif
URL: http://www.mplayerhq.hu/
-%if %{svn}
+%if 0%{?svn}
# run ./mplayer-snapshot.sh to get this
Source0: mplayer-export-%{svnbuild}.tar.bz2
%else
-Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre}.tar.bz2
+Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{?pre}.tar.xz
%endif
Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
Source10: mplayer-snapshot.sh
@@ -94,7 +94,7 @@
%{?_with_samba:BuildRequires: libsmbclient-devel}
%{?_with_svgalib:BuildRequires: svgalib-devel}
%{?_with_xmms:BuildRequires: xmms-devel}
-%if %{svn}
+%if 0%{?svn}
# for XML docs, SVN only
BuildRequires: docbook-dtds
BuildRequires: docbook-style-xsl
@@ -216,10 +216,11 @@
%prep
-%if %{svn}
+%if 0%{?svn}
%setup -q -n mplayer-export-%{svnbuild}
%else
-%setup -q -n MPlayer-%{version}%{pre}
+%setup -q -n MPlayer-%{version}%{?pre}
+rm -rf ffmpeg libdvdcss libdvdnav libdvdread4
%endif
%patch0 -p0 -b .gmplayer-subtitles
%patch2 -p1 -b .config
@@ -241,7 +242,7 @@
%{__make} V=1 %{?_smp_mflags}
-%if %{svn}
+%if 0%{?svn}
# build HTML documentation from XML files
%{__make} html-chunked
%endif
@@ -381,6 +382,12 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Thu Jun 14 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-1
+- Updated to 1.1
+- Made %%pre, %%svn and %%svnbuild defines optional
+- Switched to .xz sources
+- Updated the ffmpeg patch
+
* Wed Jun 13 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.139.20120205svn
- Restored the ability to disable subtitles in gmplayer (RPM Fusion bug #2373)
- Rebuilt for ffmpeg-0.10.4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 29 Feb 2012 16:45:42 -0000 1.28
+++ sources 14 Jun 2012 22:34:06 -0000 1.29
@@ -1,2 +1,2 @@
340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2
-3f7055dd51cc3f5e95a555dd655924ad mplayer-export-2012-02-05.tar.bz2
+ac7bf1cfedc1c5c24bfc83107eefb1d9 MPlayer-1.1.tar.xz
12 years, 5 months
rpms/buildsys-build-rpmfusion/F-16 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.59, 1.60 buildsys-build-rpmfusion.spec, 1.70, 1.71
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6913
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Thu Jun 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-43
- rebuild for kernel 3.4.2-1.fc16
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- buildsys-build-rpmfusion-kerneldevpkgs-current 5 Jun 2012 11:28:27 -0000 1.59
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 14 Jun 2012 20:49:20 -0000 1.60
@@ -1,3 +1,3 @@
-3.3.8-1.fc16
-3.3.8-1.fc16smp
-3.3.8-1.fc16PAE
+3.4.2-1.fc16
+3.4.2-1.fc16smp
+3.4.2-1.fc16PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- buildsys-build-rpmfusion.spec 5 Jun 2012 11:28:27 -0000 1.70
+++ buildsys-build-rpmfusion.spec 14 Jun 2012 20:49:20 -0000 1.71
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 16
-Release: 42
+Release: 43
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Thu Jun 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-43
+- rebuild for kernel 3.4.2-1.fc16
+
* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-42
- rebuild for kernel 3.3.8-1.fc16
12 years, 5 months
rpms/buildsys-build-rpmfusion/F-17 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.35, 1.36 buildsys-build-rpmfusion.spec, 1.48, 1.49
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6785
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Thu Jun 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-3
- rebuild for kernel 3.4.2-1.fc17
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- buildsys-build-rpmfusion-kerneldevpkgs-current 4 Jun 2012 07:50:52 -0000 1.35
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 14 Jun 2012 20:48:46 -0000 1.36
@@ -1,3 +1,3 @@
-3.4.0-1.fc17
-3.4.0-1.fc17smp
-3.4.0-1.fc17PAE
+3.4.2-1.fc17
+3.4.2-1.fc17smp
+3.4.2-1.fc17PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- buildsys-build-rpmfusion.spec 4 Jun 2012 07:50:52 -0000 1.48
+++ buildsys-build-rpmfusion.spec 14 Jun 2012 20:48:46 -0000 1.49
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 17
-Release: 2
+Release: 3
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Thu Jun 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-3
+- rebuild for kernel 3.4.2-1.fc17
+
* Mon Jun 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-2
- rebuild for kernel 3.4.0-1.fc17
12 years, 5 months
rpms/mlt/devel mlt.spec,1.24,1.25
by Remi Collet
Author: remi
Update of /cvs/free/rpms/mlt/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3898
Modified Files:
mlt.spec
Log Message:
fix (too large) filter
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/mlt.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mlt.spec 14 Jun 2012 19:48:51 -0000 1.24
+++ mlt.spec 14 Jun 2012 19:54:11 -0000 1.25
@@ -7,7 +7,7 @@
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
Version: 0.7.8
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.mltframework.org/twiki/bin/view/MLT/
@@ -34,7 +34,7 @@
BuildRequires: ruby-devel ruby
BuildRequires: SDL_image-devel
-%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/.*\\.so$
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
%description
@@ -191,6 +191,9 @@
%changelog
+* Thu Jun 14 2012 Remi Collet <remi(a)fedoraproject.org> 0.7.8-3
+- fix filter
+
* Thu Jun 14 2012 Remi Collet <remi(a)fedoraproject.org> 0.7.8-2
- update PHP requirement for PHP Guildelines
- add php extension configuration file
12 years, 5 months
rpms/mlt/devel mlt.spec,1.23,1.24
by Remi Collet
Author: remi
Update of /cvs/free/rpms/mlt/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3510
Modified Files:
mlt.spec
Log Message:
apply PHP Guildelines
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/mlt.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mlt.spec 8 May 2012 13:22:33 -0000 1.23
+++ mlt.spec 14 Jun 2012 19:48:51 -0000 1.24
@@ -2,14 +2,12 @@
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
%global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined")
-%global php_version %(php-config --version 2>/dev/null || echo 0)
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
Version: 0.7.8
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.mltframework.org/twiki/bin/view/MLT/
@@ -33,10 +31,12 @@
BuildRequires: sox-devel
BuildRequires: swig
BuildRequires: python-devel
-BuildRequires: php-devel
BuildRequires: ruby-devel ruby
BuildRequires: SDL_image-devel
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/.*\\.so$
+
+
%description
MLT is an open source multimedia framework, designed and developed for
television broadcasting.
@@ -65,7 +65,9 @@
Summary: Ruby package to work with MLT
%package php
-Requires: php
+BuildRequires: php-devel
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
Requires: %{name}%{?_isa} = %{version}-%{release}
Summary: PHP package to work with MLT
@@ -127,6 +129,11 @@
install -D -pm 0755 src/swig/ruby/mlt.so $RPM_BUILD_ROOT%{ruby_sitearch}/mlt.so
install -D -pm 0755 src/swig/python/_mlt.so $RPM_BUILD_ROOT%{python_sitearch}/_mlt.so
install -D -pm 0755 src/swig/php/mlt.so $RPM_BUILD_ROOT%{php_extdir}/mlt.so
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/mlt.ini << 'EOF'
+; Enable mlt extension module
+extension=mlt.so
+EOF
mv src/modules/motion_est/README README.motion_est
@@ -169,6 +176,7 @@
%files php
%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/php.d/mlt.ini
%{php_extdir}/mlt.so
%files devel
@@ -183,6 +191,11 @@
%changelog
+* Thu Jun 14 2012 Remi Collet <remi(a)fedoraproject.org> 0.7.8-2
+- update PHP requirement for PHP Guildelines
+- add php extension configuration file
+- filter php private shared so
+
* Tue May 08 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.8-1
- 0.7.8
12 years, 5 months
rpms/xtables-addons/F-16 xtables-addons.spec,1.12,1.13
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv410
Modified Files:
xtables-addons.spec
Log Message:
Fix back F-16
Index: xtables-addons.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-16/xtables-addons.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xtables-addons.spec 14 Jun 2012 09:28:34 -0000 1.12
+++ xtables-addons.spec 14 Jun 2012 18:56:32 -0000 1.13
@@ -85,7 +85,7 @@
%doc LICENSE README doc/* geoip
%attr(0755,root,root) %{_initddir}/*
%config(noreplace) %{_sysconfdir}/sysconfig/*
-%{_libdir}/xtables/*.so
+/%{_lib}/xtables/*.so
%{_libdir}/*.so.*
%{_sbindir}/iptaccount
%{_mandir}/man?/*
@@ -98,6 +98,7 @@
- Fix for UsrMove - rfbz#2360
- Fix Conflict with ipset - rfbz#2201
- Add Requires ipset >= 6.11 - rfbz#2226
+- Back to %%_lib for F-16
* Thu Apr 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.42-1
- Update to 1.42
12 years, 5 months
rpms/gstreamer-ffmpeg/EL-6 .cvsignore, 1.12, 1.13 gstreamer-ffmpeg.spec, 1.20, 1.21 sources, 1.12, 1.13
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gstreamer-ffmpeg/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32570/EL-6
Modified Files:
.cvsignore gstreamer-ffmpeg.spec sources
Log Message:
Branch for EL-6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/EL-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 29 Jan 2012 21:15:47 -0000 1.12
+++ .cvsignore 14 Jun 2012 18:51:27 -0000 1.13
@@ -1 +1 @@
-gst-ffmpeg-0.10.13.tar.bz2
+gst-ffmpeg-0.10.11.tar.bz2
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/EL-6/gstreamer-ffmpeg.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gstreamer-ffmpeg.spec 28 Feb 2012 11:26:22 -0000 1.20
+++ gstreamer-ffmpeg.spec 14 Jun 2012 18:51:27 -0000 1.21
@@ -1,5 +1,5 @@
Name: gstreamer-ffmpeg
-Version: 0.10.13
+Version: 0.10.11
Release: 2%{?dist}
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
@@ -10,7 +10,7 @@
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
BuildRequires: gstreamer-devel >= 0.10.0
BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires: ffmpeg-devel >= 0.8.8
+BuildRequires: ffmpeg-compat-devel >= 0.6.0
BuildRequires: orc-devel bzip2-devel
%description
@@ -30,6 +30,7 @@
%build
+export PKG_CONFIG_LIBDIR="%{_libdir}/ffmpeg-compat/pkgconfig"
%configure --disable-dependency-tracking --disable-static \
--with-package-name="gst-plugins-ffmpeg rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/" \
@@ -50,18 +51,9 @@
%changelog
-* Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.13-2
-- Rebuilt for x264/FFmpeg
-
-* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-1
-- New upstream release 0.10.13 (rf#2118, rf#2069)
-
-* Sun Sep 4 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.12-1
-- New upstream release 0.10.12
-- Rebuild for ffmpeg-0.8
-
-* Thu Apr 21 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.11-2
-- Rebuild for proper package kit magic provides (rhbz#695730, rf#1707)
+* Thu Jun 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.11-2
+- Branch for EL-6
+- Switch to ffmpeg-compat
* Sat Jul 17 2010 Hans de Goede <j.w.r.degoede(a)gmail.com> 0.10.11-1
- New upstream release 0.10.11
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/EL-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 29 Jan 2012 21:15:47 -0000 1.12
+++ sources 14 Jun 2012 18:51:27 -0000 1.13
@@ -1 +1 @@
-7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2
+0d23197ba7ac06ea34fa66d38469ebe5 gst-ffmpeg-0.10.11.tar.bz2
12 years, 5 months
rpms/ffmpeg/devel .cvsignore, 1.35, 1.36 ffmpeg.spec, 1.63, 1.64 sources, 1.35, 1.36
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27548
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Thu Jun 14 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.11.1-1
- Updated to 0.11.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 13 Jun 2012 12:46:36 -0000 1.35
+++ .cvsignore 14 Jun 2012 17:21:18 -0000 1.36
@@ -1 +1 @@
-ffmpeg-0.10.4.tar.bz2
+ffmpeg-0.11.1.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ffmpeg.spec 13 Jun 2012 12:46:37 -0000 1.63
+++ ffmpeg.spec 14 Jun 2012 17:21:18 -0000 1.64
@@ -11,7 +11,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.10.4
+Version: 0.11.1
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -278,6 +278,9 @@
%changelog
+* Thu Jun 14 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.11.1-1
+- Updated to 0.11.1
+
* Wed Jun 13 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.10.4-1
- Updated to 0.10.4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 13 Jun 2012 12:46:37 -0000 1.35
+++ sources 14 Jun 2012 17:21:18 -0000 1.36
@@ -1 +1 @@
-25740dd23f6d65439f908ec212da10d7 ffmpeg-0.10.4.tar.bz2
+ff8cb914f657e164dd60ea1008b555a8 ffmpeg-0.11.1.tar.bz2
12 years, 5 months
rpms/xtables-addons/F-17 ipset.init,1.2,1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31730/F-17
Modified Files:
ipset.init
Log Message:
Fix message
Index: ipset.init
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/F-17/ipset.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ipset.init 14 Jun 2012 09:28:33 -0000 1.2
+++ ipset.init 14 Jun 2012 09:32:15 -0000 1.3
@@ -26,7 +26,7 @@
VAR_SUBSYS_IPSET=/var/lock/subsys/$IPSET
if [ ! -x /usr/sbin/$IPSET ]; then
- echo -n $"${IPSET}: /sbin/$IPSET does not exist."; warning; echo
+ echo -n $"${IPSET}: /usr/sbin/$IPSET does not exist."; warning; echo
exit 5
fi
12 years, 5 months
rpms/xtables-addons/devel ipset.init,1.2,1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31730/devel
Modified Files:
ipset.init
Log Message:
Fix message
Index: ipset.init
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/ipset.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ipset.init 14 Jun 2012 09:28:33 -0000 1.2
+++ ipset.init 14 Jun 2012 09:32:14 -0000 1.3
@@ -26,7 +26,7 @@
VAR_SUBSYS_IPSET=/var/lock/subsys/$IPSET
if [ ! -x /usr/sbin/$IPSET ]; then
- echo -n $"${IPSET}: /sbin/$IPSET does not exist."; warning; echo
+ echo -n $"${IPSET}: /usr/sbin/$IPSET does not exist."; warning; echo
exit 5
fi
12 years, 5 months