rpms/zoneminder/devel zoneminder-1.24.1-noffmpeg.patch, NONE, 1.1 zoneminder-1.24.1-gcc44.patch, 1.2, 1.3 zoneminder.spec, 1.18, 1.19

[Martin Ebourne]

Author: mebourne

Update of /cvs/pkgs/rpms/zoneminder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24167

Modified Files:
	zoneminder-1.24.1-gcc44.patch zoneminder.spec 
Added Files:
	zoneminder-1.24.1-noffmpeg.patch 
Log Message:
* Sat Apr 11 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-2
- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
- Added noffmpeg patch to make building outside mock easier


zoneminder-1.24.1-noffmpeg.patch:

--- NEW FILE zoneminder-1.24.1-noffmpeg.patch ---
--- configure.ac.noffmpeg	2009-04-11 02:15:30.000000000 +0100
+++ configure.ac	2009-04-11 02:15:52.000000000 +0100
@@ -245,10 +245,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]))
 fi
 AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.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(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(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(swscale,sws_scale,,,-lswscale)
 AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
 
 # Checks for header files.

zoneminder-1.24.1-gcc44.patch:

Index: zoneminder-1.24.1-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder-1.24.1-gcc44.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zoneminder-1.24.1-gcc44.patch	7 Apr 2009 20:51:58 -0000	1.2
+++ zoneminder-1.24.1-gcc44.patch	11 Apr 2009 01:19:33 -0000	1.3
@@ -10,3 +10,14 @@
  
  const std::string stringtf( const char *format, ... )
  {
+--- src/Makefile.am.frepo	2009-04-11 02:08:57.000000000 +0100
++++ src/Makefile.am	2009-04-11 02:09:07.000000000 +0100
+@@ -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
+ 


Index: zoneminder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- zoneminder.spec	21 Mar 2009 21:57:57 -0000	1.18
+++ zoneminder.spec	11 Apr 2009 01:19:34 -0000	1.19
@@ -4,7 +4,7 @@
 %define zmgid_final apache
 
 Name: 		zoneminder
-Version: 	1.24.1
+Version: 	1.24.2
 Release: 	1%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
@@ -23,6 +23,7 @@
 Source6:    http://mootools.net/downloads/mootools-1.2-core-yc.js
 Patch1: 	zoneminder-1.24.1-dbinstall.patch
 Patch2:		zoneminder-1.24.1-runlevel.patch
+Patch3:		zoneminder-1.24.1-noffmpeg.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
 Patch11: 	zoneminder-1.24.1-gcc44.patch
 
@@ -67,6 +68,7 @@
 
 %patch1 -p0 -b .dbinstall
 %patch2 -p0 -b .runlevel
+%patch3 -p0 -b .noffmpeg
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
 gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
@@ -193,6 +195,10 @@
 
 
 %changelog
+* Sat Apr 11 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-2
+- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
+- Added noffmpeg patch to make building outside mock easier
+
 * Sat Mar 21 2009 Martin Ebourne <martin at zepler.org> - 1.24.1-1
 - Patch for gcc 4.4 compilation errors
 - Upgrade to 1.24.1