rpms/ffmpeg/F-14 ffmpeg-celt.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 ffmpeg.spec, 1.37, 1.38 sources, 1.20, 1.21
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22034
Modified Files:
.cvsignore ffmpeg.spec sources
Added Files:
ffmpeg-celt.patch
Log Message:
* Fri Aug 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.7.3
- update to 0.7.3
- build PIC objects on PPC (bug #1457)
- restore mistakenly dropped qt-faststart tool
- enable CELT decoding via libcelt
- support AMR WB encoding via libvo-amrwbenc (optional)
- enable FreeType support
- fix build with old celt
- Changelog seems to be missing from the tarball, don't include it for now
ffmpeg-celt.patch:
libcelt_dec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE ffmpeg-celt.patch ---
diff -up ffmpeg-0.7.3/libavcodec/libcelt_dec.c.celt ffmpeg-0.7.3/libavcodec/libcelt_dec.c
--- ffmpeg-0.7.3/libavcodec/libcelt_dec.c.celt 2011-08-10 14:15:51.000000000 +0200
+++ ffmpeg-0.7.3/libavcodec/libcelt_dec.c 2011-08-12 02:31:20.000000000 +0200
@@ -52,7 +52,7 @@ static int ff_celt_error_to_averror(int
static int ff_celt_bitstream_version_hack(CELTMode *mode)
{
CELTHeader header = { .version_id = 0 };
- celt_header_init(&header, mode, 960, 2);
+ celt_header_init(&header, mode, 2);
return header.version_id;
}
@@ -68,7 +68,7 @@ static av_cold int libcelt_dec_init(AVCo
celt->mode = celt_mode_create(c->sample_rate, c->frame_size, &err);
if (!celt->mode)
return ff_celt_error_to_averror(err);
- celt->dec = celt_decoder_create_custom(celt->mode, c->channels, &err);
+ celt->dec = celt_decoder_create(celt->mode, c->channels, &err);
if (!celt->dec) {
celt_mode_destroy(celt->mode);
return ff_celt_error_to_averror(err);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 5 May 2011 21:46:21 -0000 1.19
+++ .cvsignore 14 Aug 2011 11:36:13 -0000 1.20
@@ -1 +1 @@
-ffmpeg-0.6.3.tar.bz2
+ffmpeg-0.7.3.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/ffmpeg.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ffmpeg.spec 5 May 2011 21:46:21 -0000 1.37
+++ ffmpeg.spec 14 Aug 2011 11:36:13 -0000 1.38
@@ -4,7 +4,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.6.3
+Version: 0.7.3
Release: 1%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -13,13 +13,16 @@
%endif
Group: Applications/Multimedia
URL: http://ffmpeg.org/
-Source0: ffmpeg-%{version}.tar.bz2
+Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2
Source1: ffmpeg-snapshot.sh
+Patch0: ffmpeg-celt.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel
+BuildRequires: celt-devel
BuildRequires: dirac-devel
%{?_with_faac:BuildRequires: faac-devel}
+BuildRequires: freetype-devel
BuildRequires: gsm-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
@@ -29,14 +32,14 @@
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
BuildRequires: libvpx-devel >= 0.9.1
-%{?_with_amr:BuildRequires: opencore-amr-devel}
+%{?_with_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-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: x264-devel >= 0.0.0-0.30
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
@@ -84,11 +87,13 @@
--arch=%{_target_cpu} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
--extra-version=rpmfusion \\\
- %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\
+ %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
+ --enable-libcelt \\\
--enable-libdc1394 \\\
--enable-libdirac \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
+ --enable-libfreetype \\\
--enable-libgsm \\\
--enable-libmp3lame \\\
--enable-libopenjpeg \\\
@@ -112,13 +117,10 @@
%prep
-%setup -q -n ffmpeg-%{version}
+%setup -q
+%patch0 -p1 -b .celt
%build
-%ifarch ppc ppc64
-# compile with -mlongcall on ppc/ppc64 (rf804)
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
-%endif
mkdir generic
pushd generic
%{ff_configure}\
@@ -137,10 +139,12 @@
%ifarch ppc
--cpu=g3 \
--enable-runtime-cpudetect \
+ --enable-pic \
%endif
%ifarch ppc64
--cpu=g5 \
--enable-runtime-cpudetect \
+ --enable-pic \
%endif
%ifarch sparc sparc64
--disable-vis \
@@ -150,6 +154,8 @@
make %{?_smp_mflags}
popd
+gcc -o qt-faststart $RPM_OPT_FLAGS tools/qt-faststart.c
+
%if 0%{!?ffmpegsuffix:1}
mkdir simd
pushd simd
@@ -171,8 +177,8 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
-#install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
popd
+install -pm755 qt-faststart $RPM_BUILD_ROOT%{_bindir}
%if 0%{!?ffmpegsuffix:1}
pushd simd
%ifarch sparc sparc64
@@ -192,12 +198,13 @@
%if 0%{!?ffmpegsuffix:1}
%files
%defattr(-,root,root,-)
-%doc COPYING.* CREDITS Changelog README doc/ffserver.conf
+%doc COPYING.* CREDITS README doc/ffserver.conf
+#doc Changelog
%{_bindir}/ffmpeg
%{_bindir}/ffplay
%{_bindir}/ffprobe
%{_bindir}/ffserver
-#{_bindir}/qt-faststart
+%{_bindir}/qt-faststart
%{_mandir}/man1/ffmpeg.1*
%{_mandir}/man1/ffplay.1*
%{_mandir}/man1/ffprobe.1*
@@ -228,6 +235,16 @@
%changelog
+* Fri Aug 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.7.3
+- update to 0.7.3
+- build PIC objects on PPC (bug #1457)
+- restore mistakenly dropped qt-faststart tool
+- enable CELT decoding via libcelt
+- support AMR WB encoding via libvo-amrwbenc (optional)
+- enable FreeType support
+- fix build with old celt
+- Changelog seems to be missing from the tarball, don't include it for now
+
* Wed May 04 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.3-1
- Update to 0.6.3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 5 May 2011 21:46:21 -0000 1.20
+++ sources 14 Aug 2011 11:36:13 -0000 1.21
@@ -1 +1 @@
-cdf4ad9b2a4d195b5ca874494bc7b0b0 ffmpeg-0.6.3.tar.bz2
+c9e455dc8f555028d551556798347abf ffmpeg-0.7.3.tar.bz2
12 years, 9 months
rpms/x264/F-14 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 x264-nover.patch, 1.3, 1.4 x264-snapshot.sh, 1.1, 1.2 x264.spec, 1.22, 1.23 x264-nostrip.patch, 1.1, NONE x264-shared.patch, 1.2, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21167
Modified Files:
.cvsignore sources x264-nover.patch x264-snapshot.sh x264.spec
Removed Files:
x264-nostrip.patch x264-shared.patch
Log Message:
* Fri Aug 12 2011 Dominik Mierzejewski <rpm(a)greysector.net> - 0.0.0-0.30.20110620
- Update to 20110620 stable branch (ABI 115)
- Convert x264-snapshot to git (based on ffmpeg script).
- New Build Conditionals --with ffmpegsource libavformat
- Remove shared and strip patches - undeeded anymore
- Remove uneeded convertion of AUTHORS
- fix snapshot script to include version.h properly
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 6 Jul 2010 17:36:13 -0000 1.14
+++ .cvsignore 14 Aug 2011 11:30:07 -0000 1.15
@@ -1 +1 @@
-x264-20100706.tar.bz2
+x264-stable-20110620.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 10 Jan 2011 21:56:26 -0000 1.15
+++ sources 14 Aug 2011 11:30:07 -0000 1.16
@@ -1 +1 @@
-f34cfcf47656cb6bfe7052a113b0db8d x264-20110110.tar.bz2
+b048113f0148b2325fd35b9cd4d32674 x264-stable-20110620.tar.bz2
x264-nover.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: x264-nover.patch
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/x264-nover.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- x264-nover.patch 19 Jun 2010 22:17:30 -0000 1.3
+++ x264-nover.patch 14 Aug 2011 11:30:07 -0000 1.4
@@ -1,9 +1,9 @@
-diff -up x264-20100620/configure.nover x264-20100620/configure
---- x264-20100620/configure.nover 2010-06-20 00:07:41.000000000 +0200
-+++ x264-20100620/configure 2010-06-20 00:11:53.000000000 +0200
-@@ -689,7 +689,7 @@ if [ "$shared" = "yes" ]; then
- echo 'default: $(SONAME)' >> config.mak
- fi
+diff -up x264-stable-20110620/configure.nover x264-stable-20110620/configure
+--- x264-stable-20110620/configure.nover 2011-08-12 02:04:14.000000000 +0200
++++ x264-stable-20110620/configure 2011-08-12 02:07:28.000000000 +0200
+@@ -1038,7 +1038,7 @@ fi
+ echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak
+ echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak
-./version.sh >> config.h
+cat version.h >> config.h
Index: x264-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/x264-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264-snapshot.sh 3 Aug 2008 17:53:20 -0000 1.1
+++ x264-snapshot.sh 14 Aug 2011 11:30:07 -0000 1.2
@@ -12,13 +12,18 @@
unset CDPATH
pwd=$(pwd)
-git=$(date +%Y%m%d)
+date=20110620
+package=x264
+branch=stable
+commit=2809cb6ce63817a58c5639642fe05bc50747e126
pushd "$tmp"
-git clone git://git.videolan.org/x264.git x264-$git
-pushd x264-$git
-./version.sh .
-find . -type d -name .git -print0 | xargs -0r rm -rf
-popd
-tar jcf "$pwd"/x264-$git.tar.bz2 x264-$git
+git clone git://git.videolan.org/${package}.git -b ${branch}
+cd ${package}
+git checkout ${commit}
+git checkout -b rpmfusion
+./version.sh > version.h
+git add version.h
+git commit -m "generated version.h" version.h
+git archive --prefix="${package}-${branch}-${date}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-${branch}-${date}.tar.bz2
popd >/dev/null
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/x264.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- x264.spec 10 Jan 2011 21:56:26 -0000 1.22
+++ x264.spec 14 Aug 2011 11:30:07 -0000 1.23
@@ -1,22 +1,21 @@
-%global snapshot 20110110
+%global snapshot 20110620
+%global branch stable
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.29.%{snapshot}%{?dist}
+Release: 0.30.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
-Source0: %{name}-%{snapshot}.tar.bz2
+Source0: %{name}-%{branch}-%{snapshot}.tar.bz2
Source1: x264-snapshot.sh
# don't remove config.h and don't re-run version.sh
Patch0: x264-nover.patch
-# link with shared libx264
-Patch1: x264-shared.patch
-# don't strip if configured with --enable-debug
-Patch2: x264-nostrip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
%{!?_without_gpac:BuildRequires: gpac-devel-static}
+%{?_with_libavformat:BuildRequires: ffmpeg-devel}
+%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
%{?_with_visualize:BuildRequires: libX11-devel}
%ifarch x86_64 i686
BuildRequires: yasm
@@ -57,19 +56,17 @@
--includedir=%{_includedir} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
%{?_with_visualize:--enable-visualize} \\\
+ %{!?_with_libavformat:--disable-lavf} \\\
+ %{!?_with_ffmpegsource:--disable-ffms} \\\
--enable-debug \\\
--enable-shared \\\
+ --system-libx264 \\\
--enable-pic
%prep
-%setup -q -n %{name}-%{snapshot}
+%setup -q -n %{name}-%{branch}-%{snapshot}
%patch0 -p1 -b .nover
-%patch1 -p1 -b .shared
-%patch2 -p1 -b .nostrip
-# AUTHORS file is in iso-8859-1
-iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
-mv -f AUTHORS.utf8 AUTHORS
%ifarch i686
mkdir simd
cp -a `ls -1|grep -v simd` simd/
@@ -104,6 +101,10 @@
popd
%endif
+#Fix timestamp on x264 generated headers
+touch -r version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h
+
+
%clean
%{__rm} -rf %{buildroot}
@@ -121,9 +122,7 @@
%{_libdir}/libx264.so.*
%ifarch i686
%{_libdir}/sse2/libx264.so.*
-%exclude %{_libdir}/sse2/libx264.a
%endif
-%exclude %{_libdir}/libx264.a
%files devel
%defattr(644, root, root, 0755)
@@ -137,6 +136,14 @@
%endif
%changelog
+* Fri Aug 12 2011 Dominik Mierzejewski <rpm(a)greysector.net> - 0.0.0-0.30.20110620
+- Update to 20110620 stable branch (ABI 115)
+- Convert x264-snapshot to git (based on ffmpeg script).
+- New Build Conditionals --with ffmpegsource libavformat
+- Remove shared and strip patches - undeeded anymore
+- Remove uneeded convertion of AUTHORS
+- fix snapshot script to include version.h properly
+
* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110110
- 20110110 snapshot (ABI bump)
--- x264-nostrip.patch DELETED ---
--- x264-shared.patch DELETED ---
12 years, 9 months
rpms/motion/F-15 motion.spec,1.9,1.10 sources,1.6,1.7
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2541
Modified Files:
motion.spec sources
Log Message:
Fix log file rotation and add compression
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-15/motion.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- motion.spec 10 Aug 2011 14:57:08 -0000 1.9
+++ motion.spec 12 Aug 2011 06:12:09 -0000 1.10
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV531%{?dist}
+Release: trunkREV532%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -38,7 +38,7 @@
mv %{buildroot}%{_sysconfdir}/%{name}/motion-dist.conf %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We move the logrotate configuration
mkdir %{buildroot}%{_sysconfdir}/logrotate.d
-mv %{_builddir}/%{name}-%{version}/motion.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/motion.logrotate
+mv %{_builddir}/%{name}-%{version}/motion.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/motion
#We change the PID file path to match the one in the startup script
sed -i 's|/var/run/motion/motion.pid|/var/run/motion.pid|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We remove SQL directives in the configuration file, as we don't use them
@@ -88,13 +88,16 @@
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread2.conf
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread3.conf
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread4.conf
-%attr(0644,root,root) %{_sysconfdir}/logrotate.d/motion.logrotate
+%attr(0644,root,root) %{_sysconfdir}/logrotate.d/motion
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/motion.conf
%attr(0755,root,root) %{_bindir}/motion
%attr(0644,root,root) %{_mandir}/man1/motion.1*
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Mon Aug 10 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-trunkREV532
+- Fix log rotation and also add compression to it
+
* Mon Aug 10 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.2.20110810trunkREV531
- Corrects rpmfusion bugs 1878, 1879 and 1880
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/F-15/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 10 Aug 2011 14:57:08 -0000 1.6
+++ sources 12 Aug 2011 06:12:09 -0000 1.7
@@ -1 +1 @@
-9aa28d7016027c8ecedc57cdeafd731f motion-3.3.0.tar.gz
+31d91149e3a89b9e66d44a109ccdf50c motion-3.3.0.tar.gz
12 years, 9 months
rpms/motion/devel motion.spec,1.9,1.10 sources,1.6,1.7
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1660
Modified Files:
motion.spec sources
Log Message:
Fix log file rotation and add compression
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- motion.spec 10 Aug 2011 14:32:04 -0000 1.9
+++ motion.spec 12 Aug 2011 06:11:12 -0000 1.10
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV531%{?dist}
+Release: trunkREV532%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -38,7 +38,7 @@
mv %{buildroot}%{_sysconfdir}/%{name}/motion-dist.conf %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We move the logrotate configuration
mkdir %{buildroot}%{_sysconfdir}/logrotate.d
-mv %{_builddir}/%{name}-%{version}/motion.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/motion.logrotate
+mv %{_builddir}/%{name}-%{version}/motion.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/motion
#We change the PID file path to match the one in the startup script
sed -i 's|/var/run/motion/motion.pid|/var/run/motion.pid|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We remove SQL directives in the configuration file, as we don't use them
@@ -88,13 +88,16 @@
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread2.conf
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread3.conf
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread4.conf
-%attr(0644,root,root) %{_sysconfdir}/logrotate.d/motion.logrotate
+%attr(0644,root,root) %{_sysconfdir}/logrotate.d/motion
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/motion.conf
%attr(0755,root,root) %{_bindir}/motion
%attr(0644,root,root) %{_mandir}/man1/motion.1*
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Mon Aug 10 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-trunkREV532
+- Fix log rotation and also add compression to it
+
* Mon Aug 10 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.2.20110810trunkREV531
- Corrects rpmfusion bugs 1878, 1879 and 1880
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 10 Aug 2011 14:32:04 -0000 1.6
+++ sources 12 Aug 2011 06:11:12 -0000 1.7
@@ -1 +1 @@
-9aa28d7016027c8ecedc57cdeafd731f motion-3.3.0.tar.gz
+31d91149e3a89b9e66d44a109ccdf50c motion-3.3.0.tar.gz
12 years, 9 months
rpms/motion/F-15 motion.spec,1.8,1.9 sources,1.5,1.6
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8351/F-15
Modified Files:
motion.spec sources
Log Message:
Corrects rpmfusion bugs 1878, 1879 and 1880
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-15/motion.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- motion.spec 8 Jun 2011 17:54:53 -0000 1.8
+++ motion.spec 10 Aug 2011 14:57:08 -0000 1.9
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV528%{?dist}
+Release: trunkREV531%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -36,6 +36,9 @@
make install DESTDIR=%{buildroot}
#We rename the configuration file
mv %{buildroot}%{_sysconfdir}/%{name}/motion-dist.conf %{buildroot}%{_sysconfdir}/%{name}/motion.conf
+#We move the logrotate configuration
+mkdir %{buildroot}%{_sysconfdir}/logrotate.d
+mv %{_builddir}/%{name}-%{version}/motion.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/motion.logrotate
#We change the PID file path to match the one in the startup script
sed -i 's|/var/run/motion/motion.pid|/var/run/motion.pid|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We remove SQL directives in the configuration file, as we don't use them
@@ -45,7 +48,7 @@
sed -i 's|sql_log_timelapse|; sql_log_timelapse|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|sql_query|; sql_query|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We set the log file and target directory - logging is for 3.3 branch
-sed -i 's|;logfile|logfile /var/log/motion.log|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
+sed -i 's|;logfile /tmp/motion.log|logfile /var/log/motion.log|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We install our startup script
install -D -m 0755 motion.init-Fedora %{buildroot}%{_initrddir}/%{name}
@@ -85,12 +88,16 @@
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread2.conf
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread3.conf
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread4.conf
+%attr(0644,root,root) %{_sysconfdir}/logrotate.d/motion.logrotate
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/motion.conf
%attr(0755,root,root) %{_bindir}/motion
%attr(0644,root,root) %{_mandir}/man1/motion.1*
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Mon Aug 10 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.2.20110810trunkREV531
+- Corrects rpmfusion bugs 1878, 1879 and 1880
+
* Thu May 31 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.1.20110531trunkREV528
- Early 3.3 version taken from SVN to work with 2.6.38+ kernels
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/F-15/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 8 Jun 2011 17:54:53 -0000 1.5
+++ sources 10 Aug 2011 14:57:08 -0000 1.6
@@ -1 +1 @@
-c6abce3290a5ac255c241f8f27334b17 motion-3.3.0.tar.gz
+9aa28d7016027c8ecedc57cdeafd731f motion-3.3.0.tar.gz
12 years, 9 months
rpms/motion/devel motion.spec,1.8,1.9 sources,1.5,1.6
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26891/devel
Modified Files:
motion.spec sources
Log Message:
Corrects rpmfusion bugs 1878, 1879 and 1880
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- motion.spec 8 Jun 2011 17:50:53 -0000 1.8
+++ motion.spec 10 Aug 2011 14:32:04 -0000 1.9
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV528%{?dist}
+Release: trunkREV531%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -36,6 +36,9 @@
make install DESTDIR=%{buildroot}
#We rename the configuration file
mv %{buildroot}%{_sysconfdir}/%{name}/motion-dist.conf %{buildroot}%{_sysconfdir}/%{name}/motion.conf
+#We move the logrotate configuration
+mkdir %{buildroot}%{_sysconfdir}/logrotate.d
+mv %{_builddir}/%{name}-%{version}/motion.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/motion.logrotate
#We change the PID file path to match the one in the startup script
sed -i 's|/var/run/motion/motion.pid|/var/run/motion.pid|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We remove SQL directives in the configuration file, as we don't use them
@@ -45,7 +48,7 @@
sed -i 's|sql_log_timelapse|; sql_log_timelapse|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|sql_query|; sql_query|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We set the log file and target directory - logging is for 3.3 branch
-sed -i 's|;logfile|logfile /var/log/motion.log|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
+sed -i 's|;logfile /tmp/motion.log|logfile /var/log/motion.log|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We install our startup script
install -D -m 0755 motion.init-Fedora %{buildroot}%{_initrddir}/%{name}
@@ -85,12 +88,16 @@
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread2.conf
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread3.conf
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/thread4.conf
+%attr(0644,root,root) %{_sysconfdir}/logrotate.d/motion.logrotate
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/motion.conf
%attr(0755,root,root) %{_bindir}/motion
%attr(0644,root,root) %{_mandir}/man1/motion.1*
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Mon Aug 10 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.2.20110810trunkREV531
+- Corrects rpmfusion bugs 1878, 1879 and 1880
+
* Thu May 31 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.1.20110531trunkREV528
- Early 3.3 version taken from SVN to work with 2.6.38+ kernels
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 8 Jun 2011 17:50:53 -0000 1.5
+++ sources 10 Aug 2011 14:32:04 -0000 1.6
@@ -1 +1 @@
-c6abce3290a5ac255c241f8f27334b17 motion-3.3.0.tar.gz
+9aa28d7016027c8ecedc57cdeafd731f motion-3.3.0.tar.gz
12 years, 9 months
rpms/avidemux/devel avidemux.spec,1.52,1.53
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23943
Modified Files:
avidemux.spec
Log Message:
* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
- Moved UI specific libraries and plugins to their respective sub-package to
prevent unneeded dependencies from being installed.
- Obsoleted plugins sub-package and combined with libs sub-package.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- avidemux.spec 8 Aug 2011 17:42:26 -0000 1.52
+++ avidemux.spec 9 Aug 2011 18:21:43 -0000 1.53
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -323,9 +323,9 @@
%changelog
-* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-3
-- Moved UI specific libraries and plugins to their respective sub-package to prevent
- unneeded dependencies from being installed.
+* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
+- Moved UI specific libraries and plugins to their respective sub-package to
+ prevent unneeded dependencies from being installed.
- Obsoleted plugins sub-package and combined with libs sub-package.
* Fri Jul 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-2
12 years, 9 months
rpms/libva-freeworld/F-15 .cvsignore, 1.5, 1.6 libva-freeworld.spec, 1.7, 1.8 sources, 1.5, 1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libva-freeworld/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9910/F-15
Modified Files:
.cvsignore libva-freeworld.spec sources
Log Message:
Update to 1.0.14
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libva-freeworld/F-15/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 8 Jun 2011 21:40:22 -0000 1.5
+++ .cvsignore 8 Aug 2011 21:37:15 -0000 1.6
@@ -1 +1 @@
-libva-1.0.13.tar.bz2
+libva-1.0.14.tar.bz2
Index: libva-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/libva-freeworld/F-15/libva-freeworld.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libva-freeworld.spec 11 Jun 2011 07:57:56 -0000 1.7
+++ libva-freeworld.spec 8 Aug 2011 21:37:15 -0000 1.8
@@ -1,6 +1,6 @@
Name: libva-freeworld
-Version: 1.0.13
-Release: 2%{?dist}
+Version: 1.0.14
+Release: 1%{?dist}
Summary: Video Acceleration (VA) API for Linux
Group: System Environment/Libraries
License: MIT
@@ -11,7 +11,7 @@
BuildRequires: libudev-devel
BuildRequires: libXext-devel
BuildRequires: libXfixes-devel
-BuildRequires: libdrm-devel >= 2.4.24
+BuildRequires: libdrm-devel >= 2.4.23
BuildRequires: libpciaccess-devel
BuildRequires: mesa-libGL-devel
# owns the %{_libdir}/dri directory
@@ -58,6 +58,9 @@
%changelog
+* Sun Aug 07 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.14-1
+- Update to 1.0.14
+
* Sat Jun 11 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.13-2
- Fix typo when building --with full
- Requires at least the same libva version.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libva-freeworld/F-15/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 8 Jun 2011 21:40:23 -0000 1.5
+++ sources 8 Aug 2011 21:37:15 -0000 1.6
@@ -1 +1 @@
-221207c386129e02fc05827147af7aa6 libva-1.0.13.tar.bz2
+9a7eba239bffa3b40d7a49e3bb4fb6fb libva-1.0.14.tar.bz2
12 years, 9 months
rpms/avidemux/F-15 avidemux-2.5.5-x264_i_to_b_open_gop.patch, NONE, 1.1 avidemux.spec, 1.54, 1.55
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28476
Modified Files:
avidemux.spec
Added Files:
avidemux-2.5.5-x264_i_to_b_open_gop.patch
Log Message:
* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
- Moved UI specific libraries and plugins to their respective sub-package to
prevent unneeded dependencies from being installed.
- Obsoleted plugins sub-package and combined with libs sub-package.
avidemux-2.5.5-x264_i_to_b_open_gop.patch:
encoder.cpp | 4 +++-
x264Options.cpp | 14 +++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
--- NEW FILE avidemux-2.5.5-x264_i_to_b_open_gop.patch ---
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2010-10-03 11:54:51.000000000 -0500
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-07-15 10:58:18.970492678 -0500
@@ -488,8 +488,10 @@
printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
-#if X264_BUILD > 101
+#if X264_BUILD > 101 && X264_BUILD < 115
printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
+#elif X264_BUILD > 114
+ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
#endif
printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
#if X264_BUILD > 88
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2010-12-31 15:23:09.000000000 -0600
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-07-15 11:00:32.108021056 -0500
@@ -417,7 +417,7 @@
_param.b_cabac = cabac;
}
-#if X264_BUILD > 101
+#if X264_BUILD > 101 && X264_BUILD < 115
unsigned int x264Options::getOpenGopMode(void)
{
return _param.i_open_gop;
@@ -428,6 +428,18 @@
if (openGopMode < 3)
_param.i_open_gop = openGopMode;
}
+
+#elif X264_BUILD > 114
+unsigned int x264Options::getOpenGopMode(void)
+{
+ return _param.b_open_gop;
+}
+
+void x264Options::setOpenGopMode(unsigned int openGopMode)
+{
+ if (openGopMode < 3)
+ _param.b_open_gop = openGopMode;
+}
#endif
unsigned int x264Options::getInterlaced(void)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-15/avidemux.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- avidemux.spec 8 Aug 2011 18:55:21 -0000 1.54
+++ avidemux.spec 8 Aug 2011 19:01:17 -0000 1.55
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -323,7 +323,7 @@
%changelog
-* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-3
+* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
- Moved UI specific libraries and plugins to their respective sub-package to
prevent unneeded dependencies from being installed.
- Obsoleted plugins sub-package and combined with libs sub-package.
12 years, 9 months
rpms/avidemux/F-14 avidemux-2.5.5-x264_i_to_b_open_gop.patch, NONE, 1.1 avidemux.spec, 1.45, 1.46
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28309
Modified Files:
avidemux.spec
Added Files:
avidemux-2.5.5-x264_i_to_b_open_gop.patch
Log Message:
* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
- Moved UI specific libraries and plugins to their respective sub-package to
prevent unneeded dependencies from being installed.
- Obsoleted plugins sub-package and combined with libs sub-package.
avidemux-2.5.5-x264_i_to_b_open_gop.patch:
encoder.cpp | 4 +++-
x264Options.cpp | 14 +++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
--- NEW FILE avidemux-2.5.5-x264_i_to_b_open_gop.patch ---
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2010-10-03 11:54:51.000000000 -0500
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-07-15 10:58:18.970492678 -0500
@@ -488,8 +488,10 @@
printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
-#if X264_BUILD > 101
+#if X264_BUILD > 101 && X264_BUILD < 115
printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
+#elif X264_BUILD > 114
+ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
#endif
printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
#if X264_BUILD > 88
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2010-12-31 15:23:09.000000000 -0600
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-07-15 11:00:32.108021056 -0500
@@ -417,7 +417,7 @@
_param.b_cabac = cabac;
}
-#if X264_BUILD > 101
+#if X264_BUILD > 101 && X264_BUILD < 115
unsigned int x264Options::getOpenGopMode(void)
{
return _param.i_open_gop;
@@ -428,6 +428,18 @@
if (openGopMode < 3)
_param.i_open_gop = openGopMode;
}
+
+#elif X264_BUILD > 114
+unsigned int x264Options::getOpenGopMode(void)
+{
+ return _param.b_open_gop;
+}
+
+void x264Options::setOpenGopMode(unsigned int openGopMode)
+{
+ if (openGopMode < 3)
+ _param.b_open_gop = openGopMode;
+}
#endif
unsigned int x264Options::getInterlaced(void)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/avidemux.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- avidemux.spec 8 Aug 2011 18:56:36 -0000 1.45
+++ avidemux.spec 8 Aug 2011 18:59:59 -0000 1.46
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -323,7 +323,7 @@
%changelog
-* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-3
+* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
- Moved UI specific libraries and plugins to their respective sub-package to
prevent unneeded dependencies from being installed.
- Obsoleted plugins sub-package and combined with libs sub-package.
12 years, 9 months