rpms/motion/F-10 motion-initscript,1.1,1.2
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31731
Modified Files:
motion-initscript
Log Message:
* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
- Drop patch for ffmpeg 0.5 compatibility
- Drop ffmpeg detection patch
- Moved default output directory to /var/motion
- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
- Fix fd leaks in external pipe
- Avoid possible stack smashing in v4l_open_vidpipe()
- Fix segfault for new libjpeg v7
Index: motion-initscript
===================================================================
RCS file: /cvs/free/rpms/motion/F-10/motion-initscript,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- motion-initscript 19 Mar 2009 19:07:46 -0000 1.1
+++ motion-initscript 11 Aug 2009 19:26:21 -0000 1.2
@@ -32,13 +32,27 @@
[ -x $exec ] || exit 5
[ -f $config ] || exit 6
echo -n $"Starting $prog: "
- daemon $motion 2> /dev/null
+ # We try to determine which architecture we have so we can
+ # load libv4l to support more USB cameras. x86_64 and ppc64
+ # are both supported by rpmfusion.
+ case $(uname -i) in
+ "x86_64" )
+ #We load libv4l for 64 Bit x86 architectures
+ LD_PRELOAD=/usr/lib64/libv4l/v4l2convert.so daemon $motion 2> /dev/null ;;
+ "ppc64" )
+ #We load libv4l for 64 Bit PPC architectures
+ LD_PRELOAD=/usr/lib64/libv4l/v4l2convert.so daemon $motion 2> /dev/null ;;
+ * )
+ #Default case, we load libv4l for all 32 Bit architectures
+ LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so daemon $motion 2> /dev/null ;;
+ esac
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
return $retval
}
+
stop() {
echo -n $"Stopping $prog: "
killproc $motion
15 years, 3 months
rpms/motion/F-11 .cvsignore, 1.3, 1.4 motion-initscript, 1.1, 1.2 sources, 1.3, 1.4
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31697
Modified Files:
.cvsignore motion-initscript sources
Log Message:
* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
- Drop patch for ffmpeg 0.5 compatibility
- Drop ffmpeg detection patch
- Moved default output directory to /var/motion
- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
- Fix fd leaks in external pipe
- Avoid possible stack smashing in v4l_open_vidpipe()
- Fix segfault for new libjpeg v7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/motion/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 11 Aug 2009 18:54:30 -0000 1.3
+++ .cvsignore 11 Aug 2009 19:26:17 -0000 1.4
@@ -1 +1 @@
-motion-initscript
+motion-3.2.11.1.tar.gz
Index: motion-initscript
===================================================================
RCS file: /cvs/free/rpms/motion/F-11/motion-initscript,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- motion-initscript 25 Mar 2009 21:43:14 -0000 1.1
+++ motion-initscript 11 Aug 2009 19:26:17 -0000 1.2
@@ -32,13 +32,27 @@
[ -x $exec ] || exit 5
[ -f $config ] || exit 6
echo -n $"Starting $prog: "
- daemon $motion 2> /dev/null
+ # We try to determine which architecture we have so we can
+ # load libv4l to support more USB cameras. x86_64 and ppc64
+ # are both supported by rpmfusion.
+ case $(uname -i) in
+ "x86_64" )
+ #We load libv4l for 64 Bit x86 architectures
+ LD_PRELOAD=/usr/lib64/libv4l/v4l2convert.so daemon $motion 2> /dev/null ;;
+ "ppc64" )
+ #We load libv4l for 64 Bit PPC architectures
+ LD_PRELOAD=/usr/lib64/libv4l/v4l2convert.so daemon $motion 2> /dev/null ;;
+ * )
+ #Default case, we load libv4l for all 32 Bit architectures
+ LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so daemon $motion 2> /dev/null ;;
+ esac
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
return $retval
}
+
stop() {
echo -n $"Stopping $prog: "
killproc $motion
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 11 Aug 2009 18:54:30 -0000 1.3
+++ sources 11 Aug 2009 19:26:17 -0000 1.4
@@ -1 +1 @@
-713c964e6348314eaed7db7937b36c2a motion-initscript
+4e729f129d8f9b9abaed5121c3cd0037 motion-3.2.11.1.tar.gz
15 years, 3 months
rpms/libmimic/devel libmimic.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/libmimic/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29739/devel
Modified Files:
.cvsignore sources
Added Files:
libmimic.spec
Log Message:
intial import of libmimic
--- NEW FILE libmimic.spec ---
Name: libmimic
Version: 1.0.4
Release: 3%{?dist}
Summary: Encoding/decoding library for Mimic V2.x
Group: System Environment/Libraries
License: LGPLv2+
URL: http://farsight.sourceforge.net/
Source0: http://downloads.sourceforge.net/farsight/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen glib2-devel
%description
libmimic is an open source video encoding/decoding library for Mimic V2.x-
encoded content (fourCC: ML20), which is the encoding used by MSN Messenger
for webcam conversations.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, pkgconfig
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q
%build
%configure --disable-static
make %{?_smp_mflags} libmimic_la_LIBADD="-lglib-2.0 -lm"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%doc doc/api/html
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libmimic.pc
%changelog
* Fri Aug 7 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.0.4-3
- Actually link to glib-2.0 not the ancient glib (issue
caused by the undefined-non-weak-symbol fix) (rf487)
* Thu Aug 6 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.0.4-2
- Fix undefined-non-weak-symbol in libmimic.so.0 (rf487)
* Sun Mar 29 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.0.4-1
- First version of the RPM Fusion package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libmimic/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 8 Aug 2009 17:07:49 -0000 1.1
+++ .cvsignore 11 Aug 2009 19:05:36 -0000 1.2
@@ -0,0 +1 @@
+libmimic-1.0.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libmimic/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 8 Aug 2009 17:07:49 -0000 1.1
+++ sources 11 Aug 2009 19:05:36 -0000 1.2
@@ -0,0 +1 @@
+94f0dbb1d3c253201553a4069555fb84 libmimic-1.0.4.tar.gz
15 years, 3 months
rpms/opencore-amr/devel opencore-amr.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/opencore-amr/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29837/devel
Modified Files:
.cvsignore sources
Added Files:
opencore-amr.spec
Log Message:
initial import of opencore-amr
--- NEW FILE opencore-amr.spec ---
Name: opencore-amr
Version: 0.1.1
Release: 1%{?dist}
Summary: OpenCORE Adaptive Multi Rate Narrowband and Wideband speech lib
Group: System Environment/Libraries
License: ASL 2.0
URL: http://sourceforge.net/projects/opencore-amr/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband
and Wideband speech codec.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q -n %{name}
# hack hack hack
if [ "%{_lib}" = "lib64" ]; then
sed -i -e 's|/lib/|/lib64/|g' -e 's|/lib$|/lib64|g' */Makefile
fi
%build
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -x c -std=c99 -fPIC"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
# we don't want the static libraries
rm $RPM_BUILD_ROOT%{_libdir}/libopencore-amr??.a
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc opencore/ChangeLog opencore/NOTICE opencore/README
%{_libdir}/libopencore-amr??.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/opencore-amr??
%{_libdir}/libopencore-amr??.so
%changelog
* Thu Jul 30 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.1.1-1
- First version of the RPM Fusion package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/opencore-amr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 8 Aug 2009 17:08:38 -0000 1.1
+++ .cvsignore 11 Aug 2009 19:05:23 -0000 1.2
@@ -0,0 +1 @@
+opencore-amr-0.1.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/opencore-amr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 8 Aug 2009 17:08:38 -0000 1.1
+++ sources 11 Aug 2009 19:05:24 -0000 1.2
@@ -0,0 +1 @@
+d2e18436202fc14e03e5a254f8eb1df4 opencore-amr-0.1.1.tar.gz
15 years, 3 months
rpms/motion/F-11 .cvsignore, 1.2, 1.3 motion.spec, 1.3, 1.4 sources, 1.2, 1.3 ffmpeg-0.5.patch, 1.1, NONE ffmpeg-detection.patch, 1.1, NONE
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28677
Modified Files:
.cvsignore motion.spec sources
Removed Files:
ffmpeg-0.5.patch ffmpeg-detection.patch
Log Message:
* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
- Drop patch for ffmpeg 0.5 compatibility
- Drop ffmpeg detection patch
- Moved default output directory to /var/motion
- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
- Fix fd leaks in external pipe
- Avoid possible stack smashing in v4l_open_vidpipe()
- Fix segfault for new libjpeg v7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/motion/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Mar 2009 21:43:14 -0000 1.2
+++ .cvsignore 11 Aug 2009 18:54:30 -0000 1.3
@@ -1 +1 @@
-motion-3.2.11.tar.gz
+motion-initscript
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-11/motion.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- motion.spec 5 Apr 2009 10:22:13 -0000 1.3
+++ motion.spec 11 Aug 2009 18:54:30 -0000 1.4
@@ -1,6 +1,6 @@
Name: motion
-Version: 3.2.11
-Release: 5%{?dist}
+Version: 3.2.11.1
+Release: 1%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -8,11 +8,11 @@
URL: http://motion.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: motion-initscript
-Patch0: ffmpeg-detection.patch
-Patch1: ffmpeg-0.5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel
+#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
+Requires: libv4l
Requires(post): chkconfig
Requires(preun): chkconfig initscripts
Requires(postun): initscripts
@@ -27,13 +27,9 @@
%prep
%setup -q
-#ffmpeg detection patch in version 3.2.11. This is an upstream patch.
-%patch0 -p0
-#ffmpeg 0.5 patch for rawhide/F11
-%patch1 -p0
%build
-%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
+%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
#We convert 2 files to UTF-8, otherwise rpmlint complains
iconv -f iso8859-1 -t utf-8 CREDITS > CREDITS.conv && mv -f CREDITS.conv CREDITS
iconv -f iso8859-1 -t utf-8 CHANGELOG > CHANGELOG.conv && mv -f CHANGELOG.conv CHANGELOG
@@ -52,6 +48,11 @@
sed -i 's|sql_log_mpeg|; sql_log_mpeg|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
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|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
+#We install our startup script - for future 3.3
+#install -D -m 0755 motion.init-RH %{buildroot}%{_initrddir}/%{name}
#We install our startup script
install -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
@@ -96,7 +97,17 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
-* Sun Apr 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
+* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
+- Drop patch for ffmpeg 0.5 compatibility
+- Drop ffmpeg detection patch
+- Moved default output directory to /var/motion
+- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
+- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
+- Fix fd leaks in external pipe
+- Avoid possible stack smashing in v4l_open_vidpipe()
+- Fix segfault for new libjpeg v7
+
+* Sun Jun 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
- Patch and rebuild for ffmpeg 0.5
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.11-4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Mar 2009 21:43:14 -0000 1.2
+++ sources 11 Aug 2009 18:54:30 -0000 1.3
@@ -1 +1 @@
-3a26c00f3250eacf6fa93c7a7e0249d9 motion-3.2.11.tar.gz
+713c964e6348314eaed7db7937b36c2a motion-initscript
--- ffmpeg-0.5.patch DELETED ---
--- ffmpeg-detection.patch DELETED ---
15 years, 3 months
rpms/motion/F-10 .cvsignore, 1.2, 1.3 motion.spec, 1.1, 1.2 sources, 1.2, 1.3 ffmpeg-detection.patch, 1.1, NONE
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28648
Modified Files:
.cvsignore motion.spec sources
Removed Files:
ffmpeg-detection.patch
Log Message:
* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
- Drop patch for ffmpeg 0.5 compatibility
- Drop ffmpeg detection patch
- Moved default output directory to /var/motion
- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
- Fix fd leaks in external pipe
- Avoid possible stack smashing in v4l_open_vidpipe()
- Fix segfault for new libjpeg v7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/motion/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Mar 2009 19:07:46 -0000 1.2
+++ .cvsignore 11 Aug 2009 18:54:22 -0000 1.3
@@ -1 +1 @@
-motion-3.2.11.tar.gz
+motion-3.2.11.1.tar.gz
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-10/motion.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- motion.spec 19 Mar 2009 19:07:46 -0000 1.1
+++ motion.spec 11 Aug 2009 18:54:22 -0000 1.2
@@ -1,6 +1,6 @@
Name: motion
-Version: 3.2.11
-Release: 3%{?dist}
+Version: 3.2.11.1
+Release: 1%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -8,11 +8,11 @@
URL: http://motion.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: motion-initscript
-Patch0: ffmpeg-detection.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel
-#Requires: ffmpeg
+#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
+Requires: libv4l
Requires(post): chkconfig
Requires(preun): chkconfig initscripts
Requires(postun): initscripts
@@ -27,11 +27,9 @@
%prep
%setup -q
-#ffmpeg detection patch in version 3.2.11. This is an upstream patch.
-%patch0 -p0
%build
-%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
+%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
#We convert 2 files to UTF-8, otherwise rpmlint complains
iconv -f iso8859-1 -t utf-8 CREDITS > CREDITS.conv && mv -f CREDITS.conv CREDITS
iconv -f iso8859-1 -t utf-8 CHANGELOG > CHANGELOG.conv && mv -f CHANGELOG.conv CHANGELOG
@@ -50,6 +48,11 @@
sed -i 's|sql_log_mpeg|; sql_log_mpeg|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
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|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
+#We install our startup script - for future 3.3
+#install -D -m 0755 motion.init-RH %{buildroot}%{_initrddir}/%{name}
#We install our startup script
install -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
@@ -94,6 +97,22 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
+- Drop patch for ffmpeg 0.5 compatibility
+- Drop ffmpeg detection patch
+- Moved default output directory to /var/motion
+- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
+- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
+- Fix fd leaks in external pipe
+- Avoid possible stack smashing in v4l_open_vidpipe()
+- Fix segfault for new libjpeg v7
+
+* Sun Jun 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
+- Patch and rebuild for ffmpeg 0.5
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.11-4
+- rebuild for new F11 features
+
* Wed Mar 18 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-3
- Even more corrected init script thanks to Stewart Adam
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Mar 2009 19:07:46 -0000 1.2
+++ sources 11 Aug 2009 18:54:22 -0000 1.3
@@ -1 +1 @@
-3a26c00f3250eacf6fa93c7a7e0249d9 motion-3.2.11.tar.gz
+4e729f129d8f9b9abaed5121c3cd0037 motion-3.2.11.1.tar.gz
--- ffmpeg-detection.patch DELETED ---
15 years, 3 months
rpms/motion/devel .cvsignore, 1.2, 1.3 motion.spec, 1.3, 1.4 sources, 1.2, 1.3 ffmpeg-0.5.patch, 1.1, NONE ffmpeg-detection.patch, 1.1, NONE
by Steven Moix
Author: moixs
Update of /cvs/free/rpms/motion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28614
Modified Files:
.cvsignore motion.spec sources
Removed Files:
ffmpeg-0.5.patch ffmpeg-detection.patch
Log Message:
* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
- Drop patch for ffmpeg 0.5 compatibility
- Drop ffmpeg detection patch
- Moved default output directory to /var/motion
- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
- Fix fd leaks in external pipe
- Avoid possible stack smashing in v4l_open_vidpipe()
- Fix segfault for new libjpeg v7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/motion/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Mar 2009 21:43:14 -0000 1.2
+++ .cvsignore 11 Aug 2009 18:54:16 -0000 1.3
@@ -1 +1 @@
-motion-3.2.11.tar.gz
+motion-3.2.11.1.tar.gz
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- motion.spec 5 Apr 2009 10:22:13 -0000 1.3
+++ motion.spec 11 Aug 2009 18:54:16 -0000 1.4
@@ -1,6 +1,6 @@
Name: motion
-Version: 3.2.11
-Release: 5%{?dist}
+Version: 3.2.11.1
+Release: 1%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -8,11 +8,11 @@
URL: http://motion.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: motion-initscript
-Patch0: ffmpeg-detection.patch
-Patch1: ffmpeg-0.5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel
+#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
+Requires: libv4l
Requires(post): chkconfig
Requires(preun): chkconfig initscripts
Requires(postun): initscripts
@@ -27,13 +27,9 @@
%prep
%setup -q
-#ffmpeg detection patch in version 3.2.11. This is an upstream patch.
-%patch0 -p0
-#ffmpeg 0.5 patch for rawhide/F11
-%patch1 -p0
%build
-%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
+%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
#We convert 2 files to UTF-8, otherwise rpmlint complains
iconv -f iso8859-1 -t utf-8 CREDITS > CREDITS.conv && mv -f CREDITS.conv CREDITS
iconv -f iso8859-1 -t utf-8 CHANGELOG > CHANGELOG.conv && mv -f CHANGELOG.conv CHANGELOG
@@ -52,6 +48,11 @@
sed -i 's|sql_log_mpeg|; sql_log_mpeg|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
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|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
+#We install our startup script - for future 3.3
+#install -D -m 0755 motion.init-RH %{buildroot}%{_initrddir}/%{name}
#We install our startup script
install -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
@@ -96,7 +97,17 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
-* Sun Apr 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
+* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
+- Drop patch for ffmpeg 0.5 compatibility
+- Drop ffmpeg detection patch
+- Moved default output directory to /var/motion
+- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
+- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
+- Fix fd leaks in external pipe
+- Avoid possible stack smashing in v4l_open_vidpipe()
+- Fix segfault for new libjpeg v7
+
+* Sun Jun 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
- Patch and rebuild for ffmpeg 0.5
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.11-4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Mar 2009 21:43:14 -0000 1.2
+++ sources 11 Aug 2009 18:54:16 -0000 1.3
@@ -1 +1 @@
-3a26c00f3250eacf6fa93c7a7e0249d9 motion-3.2.11.tar.gz
+4e729f129d8f9b9abaed5121c3cd0037 motion-3.2.11.1.tar.gz
--- ffmpeg-0.5.patch DELETED ---
--- ffmpeg-detection.patch DELETED ---
15 years, 3 months
rpms/smplayer/F-11 .cvsignore, 1.8, 1.9 smplayer.spec, 1.10, 1.11 sources, 1.8, 1.9 smplayer-0.6.7-fix-translations.patch, 1.1, NONE
by Sebastian Vahl
Author: svahl
Update of /cvs/free/rpms/smplayer/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16130/F-11
Modified Files:
.cvsignore smplayer.spec sources
Removed Files:
smplayer-0.6.7-fix-translations.patch
Log Message:
0.6.8 for f10,f11
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 29 Mar 2009 14:47:07 -0000 1.8
+++ .cvsignore 11 Aug 2009 08:33:36 -0000 1.9
@@ -1 +1 @@
-smplayer-0.6.7.tar.bz2
+smplayer-0.6.8.tar.bz2
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-11/smplayer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smplayer.spec 29 Mar 2009 14:47:07 -0000 1.10
+++ smplayer.spec 11 Aug 2009 08:33:36 -0000 1.11
@@ -8,7 +8,7 @@
%endif
Name: smplayer
-Version: 0.6.7
+Version: 0.6.8
Release: 1%{?dist}
Summary: A graphical frontend for mplayer
@@ -22,7 +22,6 @@
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
Source1: smplayer_enqueue_kde4.desktop
Source2: smplayer_enqueue_kde3.desktop
-Patch0: smplayer-0.6.7-fix-translations.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -40,7 +39,6 @@
%prep
%setup -qn %{name}-%{version}
-%patch0 -p1 -b .fix-translations
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
@@ -123,6 +121,9 @@
%endif
%changelog
+* Sun Jul 28 2009 Sebastian Vahl <fedora(a)deadbabylon.de> - 0.6.8-1
+- new upstream version: 0.6.8
+
* Sun Mar 29 2009 Sebastian Vahl <fedora(a)deadbabylon.de> - 0.6.7-1
- new upstream version: 0.6.7
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 29 Mar 2009 14:47:07 -0000 1.8
+++ sources 11 Aug 2009 08:33:36 -0000 1.9
@@ -1 +1 @@
-306b99374ad89cee93f1ad6fa94dea71 smplayer-0.6.7.tar.bz2
+4465e060e6c1a254dcd9c8c4608e69eb smplayer-0.6.8.tar.bz2
--- smplayer-0.6.7-fix-translations.patch DELETED ---
15 years, 3 months
rpms/smplayer/F-10 .cvsignore, 1.8, 1.9 smplayer.spec, 1.9, 1.10 sources, 1.8, 1.9 smplayer-0.6.7-fix-translations.patch, 1.1, NONE
by Sebastian Vahl
Author: svahl
Update of /cvs/free/rpms/smplayer/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16130/F-10
Modified Files:
.cvsignore smplayer.spec sources
Removed Files:
smplayer-0.6.7-fix-translations.patch
Log Message:
0.6.8 for f10,f11
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 9 Apr 2009 21:55:00 -0000 1.8
+++ .cvsignore 11 Aug 2009 08:33:35 -0000 1.9
@@ -1 +1 @@
-smplayer-0.6.7.tar.bz2
+smplayer-0.6.8.tar.bz2
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-10/smplayer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- smplayer.spec 9 Apr 2009 21:55:00 -0000 1.9
+++ smplayer.spec 11 Aug 2009 08:33:35 -0000 1.10
@@ -8,7 +8,7 @@
%endif
Name: smplayer
-Version: 0.6.7
+Version: 0.6.8
Release: 1%{?dist}
Summary: A graphical frontend for mplayer
@@ -22,7 +22,6 @@
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
Source1: smplayer_enqueue_kde4.desktop
Source2: smplayer_enqueue_kde3.desktop
-Patch0: smplayer-0.6.7-fix-translations.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -40,7 +39,6 @@
%prep
%setup -qn %{name}-%{version}
-%patch0 -p1 -b .fix-translations
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
@@ -123,6 +121,9 @@
%endif
%changelog
+* Sun Jul 28 2009 Sebastian Vahl <fedora(a)deadbabylon.de> - 0.6.8-1
+- new upstream version: 0.6.8
+
* Sun Mar 29 2009 Sebastian Vahl <fedora(a)deadbabylon.de> - 0.6.7-1
- new upstream version: 0.6.7
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 9 Apr 2009 21:55:00 -0000 1.8
+++ sources 11 Aug 2009 08:33:35 -0000 1.9
@@ -1 +1 @@
-306b99374ad89cee93f1ad6fa94dea71 smplayer-0.6.7.tar.bz2
+4465e060e6c1a254dcd9c8c4608e69eb smplayer-0.6.8.tar.bz2
--- smplayer-0.6.7-fix-translations.patch DELETED ---
15 years, 3 months
rpms/smplayer/devel smplayer-0.6.7-fix-translations.patch,1.1,NONE
by Sebastian Vahl
Author: svahl
Update of /cvs/free/rpms/smplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16130/devel
Removed Files:
smplayer-0.6.7-fix-translations.patch
Log Message:
0.6.8 for f10,f11
--- smplayer-0.6.7-fix-translations.patch DELETED ---
15 years, 3 months