[zoneminder] Update to 1.24.3 snapshot.
Jason ティビツ
tibbs at fedoraproject.org
Fri Mar 25 05:19:52 UTC 2011
commit 8185da404196745ea41c2ab83afee889ca9a9726
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date: Fri Mar 25 00:19:27 2011 -0500
Update to 1.24.3 snapshot.
.gitignore | 1 +
sources | 2 +-
zoneminder-1.24.3-dbinstall.patch | 22 +++++++++++++---------
zoneminder-1.24.3-gcc44.patch | 12 ------------
zoneminder-1.24.3-noffmpeg.patch | 13 +++++++------
zoneminder-1.24.3-runlevel.patch | 16 ++++++++--------
zoneminder-svn-checkout.sh | 10 ++++++++++
zoneminder.spec | 21 +++++++++++++++------
8 files changed, 55 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 35c4418..a8b8dbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ jscalendar-1.0.zip
mootools-1.2.3-core-yc.js
ZoneMinder-1.24.2.tar.gz
/ZoneMinder-1.24.3.tar.gz
+/zoneminder-20110324svn.tar.xz
diff --git a/sources b/sources
index 86e965e..8c2ce91 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
10f2160fe68294013efcd1473cd36f72 jscalendar-1.0.zip
2107736d116f31767cadb15902c6c7fd mootools-1.2.3-core-yc.js
-d66068db4496329883d21d843bcbd567 ZoneMinder-1.24.3.tar.gz
+d0161a6d909e38ea3f858c7c606ecf84 zoneminder-20110324svn.tar.xz
diff --git a/zoneminder-1.24.3-dbinstall.patch b/zoneminder-1.24.3-dbinstall.patch
index 1981005..75180a0 100644
--- a/zoneminder-1.24.3-dbinstall.patch
+++ b/zoneminder-1.24.3-dbinstall.patch
@@ -1,7 +1,11 @@
diff -up ./configure.ac.dbinstall ./configure.ac
---- ./configure.ac.dbinstall 2011-01-20 12:29:50.000000000 -0600
-+++ ./configure.ac 2011-01-24 12:36:27.744207538 -0600
-@@ -4,8 +4,6 @@ AM_INIT_AUTOMAKE
+--- ./configure.ac.dbinstall 2011-02-15 15:59:06.000000000 -0600
++++ ./configure.ac 2011-03-24 22:50:36.615225107 -0500
+@@ -1,11 +1,9 @@
+ AC_PREREQ(2.59)
+-AC_INIT(zm,1.24.3,support at zoneminder.com,ZoneMinder,http://www.zoneminder.com/downloads.html)
++AC_INIT(zm,1.24.3,support at zoneminder.com,zoneminder,http://www.zoneminder.com/downloads.html)
+ AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR(src/zm.h)
AM_CONFIG_HEADER(config.h)
@@ -10,7 +14,7 @@ diff -up ./configure.ac.dbinstall ./configure.ac
TIME_BUILD=`date +'%s'`
AC_SUBST(TIME_BUILD)
-@@ -347,6 +345,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+@@ -354,6 +352,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
@@ -20,8 +24,8 @@ diff -up ./configure.ac.dbinstall ./configure.ac
AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
---- ./db/Makefile.am.dbinstall 2009-09-28 09:19:56.000000000 -0500
-+++ ./db/Makefile.am 2011-01-24 11:40:24.311956165 -0600
+--- ./db/Makefile.am.dbinstall 2009-10-14 04:42:46.000000000 -0500
++++ ./db/Makefile.am 2011-03-24 22:50:14.173912137 -0500
@@ -1,7 +1,16 @@
AUTOMAKE_OPTIONS = gnu
@@ -41,7 +45,7 @@ diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
zm_update-0.9.8.sql \
diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in
--- ./scripts/zmupdate.pl.in.dbinstall 2011-01-17 12:21:37.000000000 -0600
-+++ ./scripts/zmupdate.pl.in 2011-01-24 11:40:24.311956165 -0600
++++ ./scripts/zmupdate.pl.in 2011-03-24 22:50:14.174912107 -0500
@@ -403,7 +403,7 @@ if ( $version )
$command .= " -p".$db_pass;
}
@@ -52,8 +56,8 @@ diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in
print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
my $output = qx($command);
diff -up ./zm.conf.in.dbinstall ./zm.conf.in
---- ./zm.conf.in.dbinstall 2008-07-25 04:48:17.000000000 -0500
-+++ ./zm.conf.in 2011-01-24 11:40:24.313004813 -0600
+--- ./zm.conf.in.dbinstall 2008-07-25 04:48:16.000000000 -0500
++++ ./zm.conf.in 2011-03-24 22:50:14.175912077 -0500
@@ -12,8 +12,8 @@
# Current version of ZoneMinder
ZM_VERSION=@VERSION@
diff --git a/zoneminder-1.24.3-gcc44.patch b/zoneminder-1.24.3-gcc44.patch
index c1d39bd..a021c47 100644
--- a/zoneminder-1.24.3-gcc44.patch
+++ b/zoneminder-1.24.3-gcc44.patch
@@ -1,15 +1,3 @@
-diff -up ./src/Makefile.am.gcc44 ./src/Makefile.am
---- ./src/Makefile.am.gcc44 2011-01-06 12:09:40.000000000 -0600
-+++ ./src/Makefile.am 2011-01-23 23:23:07.697087069 -0600
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = gnu
-
- AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
--AM_CXXFLAGS = -frepo
-+#AM_CXXFLAGS = -frepo
-
- CLEANFILES = *.rpo
-
diff -up ./src/zm_utils.cpp.gcc44 ./src/zm_utils.cpp
--- ./src/zm_utils.cpp.gcc44 2009-11-24 05:41:16.000000000 -0600
+++ ./src/zm_utils.cpp 2011-01-23 23:24:34.117082494 -0600
diff --git a/zoneminder-1.24.3-noffmpeg.patch b/zoneminder-1.24.3-noffmpeg.patch
index 0a4419a..7b89060 100644
--- a/zoneminder-1.24.3-noffmpeg.patch
+++ b/zoneminder-1.24.3-noffmpeg.patch
@@ -1,18 +1,19 @@
diff -up ./configure.ac.noffmpeg ./configure.ac
---- ./configure.ac.noffmpeg 2011-01-23 16:44:11.000000000 -0600
-+++ ./configure.ac 2011-01-23 16:51:13.288146918 -0600
-@@ -269,12 +269,12 @@ AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_
+--- ./configure.ac.noffmpeg 2011-03-24 21:41:02.000000000 -0500
++++ ./configure.ac 2011-03-24 21:42:40.497276440 -0500
+@@ -269,13 +269,13 @@ AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_
fi
AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
AC_CHECK_LIB(x264,x264_predict_16x16_init)
-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
--AC_CHECK_LIB(avcore,av_image_copy,,AC_MSG_WARN(libavcore.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+ # Don't bother to warn about this one
+-AC_CHECK_LIB(avcore,av_image_copy,,)
-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
-AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
-+dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
-+dnl AC_CHECK_LIB(avcore,av_image_copy,,AC_MSG_WARN(libavcore.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(avcore,av_image_copy,,)
+dnl AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
diff --git a/zoneminder-1.24.3-runlevel.patch b/zoneminder-1.24.3-runlevel.patch
index f2dd107..de7b49b 100644
--- a/zoneminder-1.24.3-runlevel.patch
+++ b/zoneminder-1.24.3-runlevel.patch
@@ -1,11 +1,11 @@
diff -up ./scripts/zm.in.runlevel ./scripts/zm.in
--- ./scripts/zm.in.runlevel 2010-11-28 15:22:05.000000000 -0600
-+++ ./scripts/zm.in 2011-01-23 16:43:51.927147491 -0600
++++ ./scripts/zm.in 2011-03-24 21:39:01.973010160 -0500
@@ -1,6 +1,6 @@
- #!/bin/sh
- # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
--# chkconfig: 2345 99 00
-+# chkconfig: - 99 00
- # processname: zmpkg.pl
-
- # Source function library.
+ #!/bin/sh
+ # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
+-# chkconfig: 2345 99 00
++# chkconfig: - 99 00
+ # processname: zmpkg.pl
+
+ # Source function library.
diff --git a/zoneminder-svn-checkout.sh b/zoneminder-svn-checkout.sh
new file mode 100755
index 0000000..e30ff4a
--- /dev/null
+++ b/zoneminder-svn-checkout.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+DATE=$(date +%Y%m%d)
+
+set -x
+
+rm -rf zm
+svn export http://svn.zoneminder.com/svn/zm/trunk zm
+tar cJf zoneminder-${DATE}svn.tar.xz zm
+
+rm -rf zm
diff --git a/zoneminder.spec b/zoneminder.spec
index 3e39bed..c42db7c 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -1,3 +1,6 @@
+%define svndate 20110324
+%define svnrev 3310
+
%define zmuid $(id -un)
%define zmgid $(id -gn)
%define zmuid_final apache
@@ -5,7 +8,7 @@
Name: zoneminder
Version: 1.24.3
-Release: 3%{?dist}
+Release: 4.%{svndate}svn%{svnrev}%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/
@@ -13,7 +16,8 @@ Group: System Environment/Daemons
License: GPLv2+ and LGPLv2+ and MIT
URL: http://www.zoneminder.com/
-Source: http://www.zoneminder.com/fileadmin/downloads/ZoneMinder-%{version}.tar.gz
+#Source: http://www.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
+Source0: zoneminder-%{svndate}svn.tar.xz
Source2: zoneminder.conf
Source3: redalert.wav
Source4: README.Fedora
@@ -25,7 +29,6 @@ Patch3: zoneminder-1.24.3-noffmpeg.patch
Patch4: zoneminder-1.24.1-perldep.patch
Patch10: zoneminder-1.24.3-installfix.patch
Patch11: zoneminder-1.24.3-gcc44.patch
-Patch12: zoneminder-1.24.3-v4l2.patch
BuildRequires: automake gnutls-devel
BuildRequires: mysql-devel pcre-devel libjpeg-devel
@@ -57,10 +60,10 @@ too much degradation of performance.
%prep
-%setup -q -n ZoneMinder-%{version}
+%setup -q -n zm
# Unpack jscalendar and move some files around
-%setup -q -D -T -a 5 -n ZoneMinder-%{version}
+%setup -q -D -T -a 5 -n zm
mkdir jscalendar-doc
pushd jscalendar-1.0
mv *html *php doc/* README ../jscalendar-doc
@@ -73,7 +76,6 @@ popd
%patch4 -p0 -b .perldep
%patch10 -p0 -b .installfix
%patch11 -p0 -b .gcc44
-%patch12 -p0 -b .v4l2
cp %{SOURCE4} README.Fedora
cat <<EOF >> db/zm_create.sql.in
@@ -105,6 +107,7 @@ OPTS=""
--with-cgidir=%{_libexecdir}/%{name}/cgi-bin \
--with-webuser=%{zmuid} \
--with-webgroup=%{zmgid} \
+ --enable-mmap=yes \
--disable-debug \
$OPTS
make %{?_smp_mflags}
@@ -183,6 +186,7 @@ fi
%{_bindir}/zmfilter.pl
%attr(4755,root,root) %{_bindir}/zmfix
%{_bindir}/zmpkg.pl
+%{_bindir}/zmstreamer
%{_bindir}/zmtrack.pl
%{_bindir}/zmtrigger.pl
%{_bindir}/zmu
@@ -209,6 +213,11 @@ fi
%changelog
+* Thu Mar 24 2011 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.24.3-4.20110324svn3310
+- Update to latest 1.24.3 subversion. Turns out that what upstream was calling
+ 1.24.3 is really just an occasionally updated devel snapshot.
+- Rebase various patches.
+
* Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 1.24.3-3
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
More information about the scm-commits
mailing list