tags 517569 +patch
thanks
The attatched patch fixes the issue reported in this bug report
The patch also contains a build system fix to make the package buildable
with the new autoconf.
I've also bumped the build-dep on libavformat-dev and set a
build-conflict on old versions of libswscale-dev since this patch will
break building with older versions of them.
I've also noticed that the build uses libswscale if it is present on the
system but libswscale is not in the packages build-deps. Generally it is
considered bad pratice in debian to have builds which produce different
output depending on the packages installed on the build system.
diff -urN zoneminder-1.23.3/debian/control zoneminder-1.23.3.new/debian/control
--- zoneminder-1.23.3/debian/control 2009-03-04 21:41:30.000000000 +0000
+++ zoneminder-1.23.3.new/debian/control 2009-03-04 22:23:30.000000000
+0000
@@ -2,7 +2,8 @@
Section: net
Priority: optional
Maintainer: Peter Howard <p...@northern-ridge.com.au>
-Build-Depends: debhelper (>= 5), autoconf, dpatch, libphp-serialization-perl,
libgnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev |
libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl,
libjpeg62-dev, libpcre3-dev, libavcodec-dev, libavformat-dev, libavutil-dev
+Build-Depends: debhelper (>= 5), autoconf, automake, dpatch,
libphp-serialization-perl, libgnutls-dev, libmysqlclient15-dev |
libmysqlclient14-dev | libmysqlclient-dev, libdbd-mysql-perl,
libdate-manip-perl, libwww-perl, libjpeg62-dev, libpcre3-dev, libavcodec-dev,
libavformat-dev (>= 3:0.svn20090204) , libavutil-dev
+Build-Conflicts: libswscale-dev (<< 3:0.svn20090204)
Standards-Version: 3.7.2
Package: zoneminder
diff -urN zoneminder-1.23.3/debian/patches/00list
zoneminder-1.23.3.new/debian/patches/00list
--- zoneminder-1.23.3/debian/patches/00list 2009-03-04 21:41:30.000000000
+0000
+++ zoneminder-1.23.3.new/debian/patches/00list 2009-03-04 21:49:45.000000000
+0000
@@ -2,3 +2,4 @@
02_upgrade_script_loc.dpatch
04_remove_bash_specific.dpatch
07_fix_ffmpeg_defaults.dpatch
+08_fix_ffmpeg_includes.dpatch
diff -urN zoneminder-1.23.3/debian/patches/08_fix_ffmpeg_includes.dpatch
zoneminder-1.23.3.new/debian/patches/08_fix_ffmpeg_includes.dpatch
--- zoneminder-1.23.3/debian/patches/08_fix_ffmpeg_includes.dpatch
1970-01-01 00:00:00.000000000 +0000
+++ zoneminder-1.23.3.new/debian/patches/08_fix_ffmpeg_includes.dpatch
2009-03-04 22:26:01.000000000 +0000
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_fix_ffmpeg_includes.dpatch by <plugw...@p10link.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch fixes ffmpeg includes to use lib* directories rather than
+## DP: ffmpeg directory
+
+...@dpatch@
+
+--- zoneminder-1.23.3/src/zm_mpeg.h 2008-02-25 09:49:52.000000000 +0000
++++ zoneminder-1.23.3.new/src/zm_mpeg.h 2009-03-04 21:38:26.000000000
+0000
+@@ -26,9 +26,9 @@
+
+ extern "C" {
+ #define __STDC_CONSTANT_MACROS
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ #if HAVE_LIBSWSCALE
+-#include <ffmpeg/swscale.h>
++#include <libswscale/swscale.h>
+ #endif // HAVE_LIBSWSCALE
+ }
+
diff -urN zoneminder-1.23.3/debian/rules zoneminder-1.23.3.new/debian/rules
--- zoneminder-1.23.3/debian/rules 2009-03-04 21:41:30.000000000 +0000
+++ zoneminder-1.23.3.new/debian/rules 2009-03-04 21:53:40.000000000 +0000
@@ -26,7 +26,8 @@
config.status: patch configure
dh_testdir
# Add here commands to configure the package.
- autoconf
+ # use autoreconf rather than just autoconf so build system is kept in
sync
+ autoreconf
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
--with-mysql=/usr --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr
--with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data
--enable-crashtrace=no
#perl zmconfig.pl -noi
