[zoneminder] Update to 1.24.3 and try to build without v4l1

Jason ティビツ tibbs at fedoraproject.org
Tue Jan 25 22:56:56 UTC 2011 

commit cba1166e6b11f94d5410fcd7ca23f6e5fdfdd806
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Tue Jan 25 16:55:13 2011 -0600

    Update to 1.24.3 and try to build without v4l1
    
    Note that this won't build, but it's no worse than before this work.

 zoneminder-1.22.3-installfix.patch                 |   15 --
 zoneminder-1.24.2-dbinstall.patch                  |  143 --------------------
 zoneminder-1.24.2-gcc44.patch                      |   23 ---
 zoneminder-1.24.3-dbinstall.patch                  |   67 +++++++++
 zoneminder-1.24.3-gcc44.patch                      |   26 ++++
 zoneminder-1.24.3-installfix.patch                 |   18 +++
 ...fmpeg.patch => zoneminder-1.24.3-noffmpeg.patch |   17 ++-
 ...level.patch => zoneminder-1.24.3-runlevel.patch |   19 ++--
 zoneminder-1.24.3-v4l2.patch                       |   12 ++
 zoneminder.spec                                    |   23 ++-
 10 files changed, 159 insertions(+), 204 deletions(-)
---
diff --git a/zoneminder-1.24.3-dbinstall.patch b/zoneminder-1.24.3-dbinstall.patch
new file mode 100644
index 0000000..1981005
--- /dev/null
+++ b/zoneminder-1.24.3-dbinstall.patch
@@ -0,0 +1,67 @@
+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
+ AC_CONFIG_SRCDIR(src/zm.h)
+ AM_CONFIG_HEADER(config.h)
+ 
+-PATH_BUILD=`pwd`
+-AC_SUBST(PATH_BUILD)
+ TIME_BUILD=`date +'%s'`
+ AC_SUBST(TIME_BUILD)
+ 
+@@ -347,6 +345,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+ 
+ AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
+ AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
++AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
++AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
+ AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
+ 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
+@@ -1,7 +1,16 @@
+ AUTOMAKE_OPTIONS = gnu
+ 
++zmdbdatadir = $(pkgdatadir)/db
++
+ EXTRA_DIST = \
+ 	zm_create.sql.in \
++	$(dbupgrade_scripts)
++
++dist_zmdbdata_DATA = \
++	zm_create.sql \
++	$(dbupgrade_scripts)
++
++dbupgrade_scripts = \
+ 	zm_update-0.0.1.sql \
+ 	zm_update-0.9.7.sql \
+ 	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
+@@ -403,7 +403,7 @@ if ( $version )
+                 $command .= " -p".$db_pass;
+             }
+         }
+-        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
++        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql";
+ 
+         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
+@@ -12,8 +12,8 @@
+ # Current version of ZoneMinder
+ ZM_VERSION=@VERSION@
+ 
+-# Path to build directory, used mostly for finding DB upgrade scripts
+-ZM_PATH_BUILD=@PATH_BUILD@
++# Path to installed data directory, used mostly for finding DB upgrade scripts
++ZM_PATH_DATA=@PKGDATADIR@
+ 
+ # Build time, used to record when to trigger various checks
+ ZM_TIME_BUILD=@TIME_BUILD@
diff --git a/zoneminder-1.24.3-gcc44.patch b/zoneminder-1.24.3-gcc44.patch
new file mode 100644
index 0000000..c1d39bd
--- /dev/null
+++ b/zoneminder-1.24.3-gcc44.patch
@@ -0,0 +1,26 @@
+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
+@@ -20,8 +20,8 @@
+ //#include "zm_debug.h"
+ #include "zm_utils.h"
+ 
+-#include <stdio.h>
+-#include <stdarg.h>
++#include <cstdio>
++#include <cstdarg>
+ 
+ const std::string stringtf( const char *format, ... )
+ {
diff --git a/zoneminder-1.24.3-installfix.patch b/zoneminder-1.24.3-installfix.patch
new file mode 100644
index 0000000..32e0dac
--- /dev/null
+++ b/zoneminder-1.24.3-installfix.patch
@@ -0,0 +1,18 @@
+diff -up ./Makefile.am.installfix ./Makefile.am
+--- ./Makefile.am.installfix	2011-01-06 13:07:00.000000000 -0600
++++ ./Makefile.am	2011-01-23 17:38:32.408147528 -0600
+@@ -20,10 +20,10 @@ EXTRA_DIST = \
+ # Yes, you are correct. This is a HACK!
+ install-data-hook:
+ 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
+-	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR) )
+-	( if ! test -e $(ZM_TMPDIR); then mkdir -p $(ZM_TMPDIR); fi; chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR) )
+-	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR) )
++	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR) )
++	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -p $(DESTDIR)$(ZM_TMPDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR) )
++	( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_LOGDIR); chmod u+w $(DESTDIR)$(ZM_LOGDIR) )
+ 
+ uninstall-hook:
+ 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
+-	@-( rm -rf $(ZM_RUNDIR) $(ZM_TMPDIR) $(ZM_LOGDIR) )
++	@-( rm -rf $(DESTDIR)$(ZM_RUNDIR) $(DESTDIR)$(ZM_TMPDIR) $(DESTDIR)$(ZM_LOGDIR) )
diff --git a/zoneminder-1.24.2-noffmpeg.patch b/zoneminder-1.24.3-noffmpeg.patch
similarity index 52%
rename from zoneminder-1.24.2-noffmpeg.patch
rename to zoneminder-1.24.3-noffmpeg.patch
index c8e81d6..0a4419a 100644
--- a/zoneminder-1.24.2-noffmpeg.patch
+++ b/zoneminder-1.24.3-noffmpeg.patch
@@ -1,16 +1,21 @@
---- configure.ac.noffmpeg	2009-07-20 00:24:37.000000000 -0500
-+++ configure.ac	2009-07-20 00:25:51.000000000 -0500
-@@ -244,10 +244,10 @@
- AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+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_
  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))
 -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),[-lavcodec -lavutil])
+-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(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),[-lavcodec -lavutil])
++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))
 +dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
  AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
  AC_CHECK_LIB(z,compress,,)
diff --git a/zoneminder-1.24.1-runlevel.patch b/zoneminder-1.24.3-runlevel.patch
similarity index 66%
rename from zoneminder-1.24.1-runlevel.patch
rename to zoneminder-1.24.3-runlevel.patch
index 7e356ba..f2dd107 100644
--- a/zoneminder-1.24.1-runlevel.patch
+++ b/zoneminder-1.24.3-runlevel.patch
@@ -1,10 +1,11 @@
---- scripts/zm.in.runlevel	2009-03-15 00:24:49.000000000 +0000
-+++ scripts/zm.in	2009-03-15 00:28:20.000000000 +0000
+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
 @@ -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-1.24.3-v4l2.patch b/zoneminder-1.24.3-v4l2.patch
new file mode 100644
index 0000000..543ace5
--- /dev/null
+++ b/zoneminder-1.24.3-v4l2.patch
@@ -0,0 +1,12 @@
+diff -up ./configure.ac.v4l2 ./configure.ac
+--- ./configure.ac.v4l2	2011-01-24 12:49:16.092209967 -0600
++++ ./configure.ac	2011-01-24 12:58:58.823207570 -0600
+@@ -282,7 +282,7 @@ AC_CHECK_LIB(z,compress,,)
+ AC_FUNC_ALLOCA
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([fcntl.h limits.h memory.h netdb.h netinet/in.h stddef.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h values.h])
+-AC_CHECK_HEADERS(linux/videodev.h,,AC_MSG_ERROR(zm requires Video4Linux to be installed),)
++AC_CHECK_HEADERS(linux/videodev.h,,AC_MSG_WARN(zm requires Video4Linux to be installed for V4L1 support),)
+ AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_V4L2,"1"),AC_MSG_WARN(zm requires Video4Linux2 to be installed for V4L2 support),)
+ AC_CHECK_HEADERS(jpeglib.h,,AC_MSG_ERROR(zm requires libjpeg headers to be installed),)
+ AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)
diff --git a/zoneminder.spec b/zoneminder.spec
index ccd6657..a9d9e14 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -4,8 +4,8 @@
 %define zmgid_final apache
 
 Name:       zoneminder
-Version:    1.24.2
-Release:    6%{?dist}
+Version:    1.24.3
+Release:    1%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -19,12 +19,13 @@ Source3:    redalert.wav
 Source4:    README.Fedora
 Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
 Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
-Patch1:     zoneminder-1.24.2-dbinstall.patch
-Patch2:     zoneminder-1.24.1-runlevel.patch
-Patch3:     zoneminder-1.24.2-noffmpeg.patch
+Patch1:     zoneminder-1.24.3-dbinstall.patch
+Patch2:     zoneminder-1.24.3-runlevel.patch
+Patch3:     zoneminder-1.24.3-noffmpeg.patch
 Patch4:     zoneminder-1.24.1-perldep.patch
-Patch10:    zoneminder-1.22.3-installfix.patch
-Patch11:    zoneminder-1.24.2-gcc44.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
@@ -32,7 +33,7 @@ BuildRequires:  perl(Archive::Tar) perl(Archive::Zip)
 BuildRequires:  perl(Date::Manip) perl(DBD::mysql)
 BuildRequires:  perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
 BuildRequires:  perl(MIME::Entity) perl(MIME::Lite)
-BuildRequires:  perl(PHP::Serialization)
+BuildRequires:  perl(PHP::Serialization) perl(Sys::Mmap)
 
 Requires:   httpd php php-mysql cambozola
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -72,6 +73,7 @@ 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
@@ -207,6 +209,11 @@ fi
 
 
 %changelog
+* Tue Jan 25 2011 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.24.3-1
+- Update to latest upstream version.
+- Rebase patches.
+- Initial incomplete attempt to disable v4l1 support.
+
 * Fri Jan 21 2011 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.24.2-6
 - Unbundle cambozola; instead link to the separately pacakged copy.
 - Remove BuildRoot:, %%clean and buildroot cleaning in %%install.

More information about the scm-commits mailing list