tags 739461 + pending thanks Dear maintainer,
I've prepared an NMU for zoneminder (versioned as 1.26.5-3.1) and uploaded it to DELAYED/5 (experimental). Please feel free to tell me if I should delay it longer. Regards.
diff -Nru zoneminder-1.26.5/debian/changelog zoneminder-1.26.5/debian/changelog --- zoneminder-1.26.5/debian/changelog 2014-02-04 02:03:47.000000000 +0000 +++ zoneminder-1.26.5/debian/changelog 2014-03-19 00:31:24.000000000 +0000 @@ -1,3 +1,10 @@ +zoneminder (1.26.5-3.1) experimental; urgency=low + + * Non-maintainer upload. + * Add libav10.patch and compile against libav10 (Closes: #739461) + + -- Reinhard Tartler <siret...@tauware.de> Wed, 19 Mar 2014 00:31:22 +0000 + zoneminder (1.26.5-3) unstable; urgency=low diff -Nru zoneminder-1.26.5/debian/control zoneminder-1.26.5/debian/control --- zoneminder-1.26.5/debian/control 2014-01-21 02:38:08.000000000 +0000 +++ zoneminder-1.26.5/debian/control 2014-03-19 00:27:29.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Peter Howard <p...@northern-ridge.com.au> Uploaders: Vagrant Cascadian <vagr...@debian.org> DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libphp-serialization-perl, libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libsys-mmap-perl, dh-autoreconf, libavdevice-dev, libgnutls-openssl-dev +Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libphp-serialization-perl, libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg-dev, libpcre3-dev, libavcodec-dev (>= 6:10~), libavformat-dev (>= 6:10~), libswscale-dev (>= 6:10~), libavutil-dev (>= 6:10~), libv4l-dev (>= 0.8.3), libbz2-dev, libsys-mmap-perl, dh-autoreconf, libavdevice-dev (>= 6:10~), libgnutls-openssl-dev Standards-Version: 3.9.3 Homepage: http://www.zoneminder.com/ Vcs-Hg: http://hg.debian.org/hg/collab-maint/zoneminder diff -Nru zoneminder-1.26.5/debian/patches/libav10.patch zoneminder-1.26.5/debian/patches/libav10.patch --- zoneminder-1.26.5/debian/patches/libav10.patch 1970-01-01 00:00:00.000000000 +0000 +++ zoneminder-1.26.5/debian/patches/libav10.patch 2014-03-19 00:25:41.000000000 +0000 @@ -0,0 +1,186 @@ +From 296aa2517b788a18b8d84a73c0d878ddfb48ec67 Mon Sep 17 00:00:00 2001 +From: Anton Khirnov <an...@khirnov.net> +Date: Wed, 5 Feb 2014 10:13:27 +0100 +Subject: [PATCH] Support building with new libavcodec versions. +Origin: https://github.com/elenril/ZoneMinder/commit/296aa2517b788a18b8d84a73c0d878ddfb48ec67 + +CODEC_ID_* has been replaced with AV_CODEC_ID_* upstream. +--- + src/zm_ffmpeg.h | 23 ++++++++++++-- + src/zm_mpeg.cpp | 2 +- + src/zm_remote_camera_rtsp.cpp | 2 +- + src/zm_rtp_source.cpp | 6 ++-- + src/zm_sdp.cpp | 66 ++++++++++++++++++++--------------------- + 5 files changed, 59 insertions(+), 40 deletions(-) + +--- a/src/zm_ffmpeg.h ++++ b/src/zm_ffmpeg.h +@@ -126,8 +126,27 @@ protected: + unsigned int default_height; + }; + #endif // HAVE_LIBSWSCALE && HAVE_LIBAVUTIL +- +- ++ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0) ++#define AV_CODEC_ID_NONE CODEC_ID_NONE ++#define AV_CODEC_ID_PCM_MULAW CODEC_ID_PCM_MULAW ++#define AV_CODEC_ID_PCM_ALAW CODEC_ID_PCM_ALAW ++#define AV_CODEC_ID_PCM_S16BE CODEC_ID_PCM_S16BE ++#define AV_CODEC_ID_QCELP CODEC_ID_QCELP ++#define AV_CODEC_ID_MP2 CODEC_ID_MP2 ++#define AV_CODEC_ID_MP3 CODEC_ID_MP3 ++#define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG ++#define AV_CODEC_ID_H261 CODEC_ID_H261 ++#define AV_CODEC_ID_MPEG1VIDEO CODEC_ID_MPEG1VIDEO ++#define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO ++#define AV_CODEC_ID_MPEG2TS CODEC_ID_MPEG2TS ++#define AV_CODEC_ID_H263 CODEC_ID_H263 ++#define AV_CODEC_ID_H264 CODEC_ID_H264 ++#define AV_CODEC_ID_MPEG4 CODEC_ID_MPEG4 ++#define AV_CODEC_ID_AAC CODEC_ID_AAC ++#define AV_CODEC_ID_AMR_NB CODEC_ID_AMR_NB ++#endif ++ + #endif // ( HAVE_LIBAVUTIL_AVUTIL_H || HAVE_LIBAVCODEC_AVCODEC_H || HAVE_LIBAVFORMAT_AVFORMAT_H || HAVE_LIBAVDEVICE_AVDEVICE_H ) + + #endif // ZM_FFMPEG_H +--- a/src/zm_mpeg.cpp ++++ b/src/zm_mpeg.cpp +@@ -133,7 +133,7 @@ void VideoStream::SetupCodec( int colour + /* add the video streams using the default format codecs + and initialize the codecs */ + ost = NULL; +- if (of->video_codec != CODEC_ID_NONE) ++ if (of->video_codec != AV_CODEC_ID_NONE) + { + #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0) + ost = av_new_stream(ofc, 0); +--- a/src/zm_remote_camera_rtsp.cpp ++++ b/src/zm_remote_camera_rtsp.cpp +@@ -261,7 +261,7 @@ int RemoteCameraRtsp::Capture( Image &im + if ( !buffer.size() ) + return( -1 ); + +- if(mCodecContext->codec_id == CODEC_ID_H264) ++ if(mCodecContext->codec_id == AV_CODEC_ID_H264) + { + // SPS and PPS frames should be saved and appended to IDR frames + int nalType = (buffer.head()[3] & 0x1f); +--- a/src/zm_rtp_source.cpp ++++ b/src/zm_rtp_source.cpp +@@ -69,7 +69,7 @@ RtpSource::RtpSource( int id, const std: + mLastSrTimeNtp = tvZero(); + mLastSrTimeRtp = 0; + +- if(mCodecId != CODEC_ID_H264 && mCodecId != CODEC_ID_MPEG4) ++ if(mCodecId != AV_CODEC_ID_H264 && mCodecId != AV_CODEC_ID_MPEG4) + Warning( "The device is using a codec that may not be supported. Do not be surprised if things don't work." ); + } + +@@ -265,7 +265,7 @@ bool RtpSource::handlePacket( const unsi + rtpHeader = (RtpDataHeader *)packet; + int rtpHeaderSize = 12 + rtpHeader->cc * 4; + // No need to check for nal type as non fragmented packets already have 001 start sequence appended +- bool h264FragmentEnd = (mCodecId == CODEC_ID_H264) && (packet[rtpHeaderSize+1] & 0x40); ++ bool h264FragmentEnd = (mCodecId == AV_CODEC_ID_H264) && (packet[rtpHeaderSize+1] & 0x40); + bool thisM = rtpHeader->m || h264FragmentEnd; + + if ( updateSeq( ntohs(rtpHeader->seqN) ) ) +@@ -276,7 +276,7 @@ bool RtpSource::handlePacket( const unsi + { + int extraHeader = 0; + +- if( mCodecId == CODEC_ID_H264 ) ++ if( mCodecId == AV_CODEC_ID_H264 ) + { + int nalType = (packet[rtpHeaderSize] & 0x1f); + +--- a/src/zm_sdp.cpp ++++ b/src/zm_sdp.cpp +@@ -25,44 +25,44 @@ + + #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1) + SessionDescriptor::StaticPayloadDesc SessionDescriptor::smStaticPayloads[] = { +- { 0, "PCMU", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_MULAW, 8000, 1 }, +- { 3, "GSM", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, +- { 4, "G723", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, +- { 5, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, +- { 6, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 16000, 1 }, +- { 7, "LPC", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, +- { 8, "PCMA", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_ALAW, 8000, 1 }, +- { 9, "G722", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, +- { 10, "L16", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 2 }, +- { 11, "L16", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 1 }, +- { 12, "QCELP", AVMEDIA_TYPE_AUDIO, CODEC_ID_QCELP, 8000, 1 }, +- { 13, "CN", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, +- { 14, "MPA", AVMEDIA_TYPE_AUDIO, CODEC_ID_MP2, -1, -1 }, +- { 14, "MPA", AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3, -1, -1 }, +- { 15, "G728", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, +- { 16, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 11025, 1 }, +- { 17, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 22050, 1 }, +- { 18, "G729", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, +- { 25, "CelB", AVMEDIA_TYPE_VIDEO, CODEC_ID_NONE, 90000, -1 }, +- { 26, "JPEG", AVMEDIA_TYPE_VIDEO, CODEC_ID_MJPEG, 90000, -1 }, +- { 28, "nv", AVMEDIA_TYPE_VIDEO, CODEC_ID_NONE, 90000, -1 }, +- { 31, "H261", AVMEDIA_TYPE_VIDEO, CODEC_ID_H261, 90000, -1 }, +- { 32, "MPV", AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG1VIDEO, 90000, -1 }, +- { 32, "MPV", AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO, 90000, -1 }, +- { 33, "MP2T", AVMEDIA_TYPE_DATA, CODEC_ID_MPEG2TS, 90000, -1 }, +- { 34, "H263", AVMEDIA_TYPE_VIDEO, CODEC_ID_H263, 90000, -1 }, +- { -1, "", AVMEDIA_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1 } ++ { 0, "PCMU", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_MULAW, 8000, 1 }, ++ { 3, "GSM", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1 }, ++ { 4, "G723", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1 }, ++ { 5, "DVI4", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1 }, ++ { 6, "DVI4", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 16000, 1 }, ++ { 7, "LPC", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1 }, ++ { 8, "PCMA", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_ALAW, 8000, 1 }, ++ { 9, "G722", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1 }, ++ { 10, "L16", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_S16BE, 44100, 2 }, ++ { 11, "L16", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_S16BE, 44100, 1 }, ++ { 12, "QCELP", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_QCELP, 8000, 1 }, ++ { 13, "CN", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1 }, ++ { 14, "MPA", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_MP2, -1, -1 }, ++ { 14, "MPA", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_MP3, -1, -1 }, ++ { 15, "G728", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1 }, ++ { 16, "DVI4", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 11025, 1 }, ++ { 17, "DVI4", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 22050, 1 }, ++ { 18, "G729", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1 }, ++ { 25, "CelB", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_NONE, 90000, -1 }, ++ { 26, "JPEG", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MJPEG, 90000, -1 }, ++ { 28, "nv", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_NONE, 90000, -1 }, ++ { 31, "H261", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H261, 90000, -1 }, ++ { 32, "MPV", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG1VIDEO, 90000, -1 }, ++ { 32, "MPV", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG2VIDEO, 90000, -1 }, ++ { 33, "MP2T", AVMEDIA_TYPE_DATA, AV_CODEC_ID_MPEG2TS, 90000, -1 }, ++ { 34, "H263", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H263, 90000, -1 }, ++ { -1, "", AVMEDIA_TYPE_UNKNOWN, AV_CODEC_ID_NONE, -1, -1 } + }; + + SessionDescriptor::DynamicPayloadDesc SessionDescriptor::smDynamicPayloads[] = { +- { "MP4V-ES", AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4 }, +- { "mpeg4-generic", AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC }, +- { "H264", AVMEDIA_TYPE_VIDEO, CODEC_ID_H264 }, +- { "AMR", AVMEDIA_TYPE_AUDIO, CODEC_ID_AMR_NB } ++ { "MP4V-ES", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 }, ++ { "mpeg4-generic", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC }, ++ { "H264", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, ++ { "AMR", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AMR_NB } + }; + #else + SessionDescriptor::StaticPayloadDesc SessionDescriptor::smStaticPayloads[] = { +- { 0, "PCMU", CODEC_TYPE_AUDIO, CODEC_ID_PCM_MULAW, 8000, 1 }, ++ { 0, "PCMU", CODEC_TYPE_AUDIO, CODEC_ID_PCM_MULAW, 8001, 1 }, + { 3, "GSM", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, + { 4, "G723", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, + { 5, "DVI4", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1 }, +@@ -415,7 +415,7 @@ AVFormatContext *SessionDescriptor::gene + stream->codec->width = mediaDesc->getWidth(); + if ( mediaDesc->getHeight() ) + stream->codec->height = mediaDesc->getHeight(); +- if ( stream->codec->codec_id == CODEC_ID_H264 && mediaDesc->getSprops().size()) ++ if ( stream->codec->codec_id == AV_CODEC_ID_H264 && mediaDesc->getSprops().size()) + { + uint8_t start_sequence[]= { 0, 0, 1 }; + stream->codec->extradata_size= 0; diff -Nru zoneminder-1.26.5/debian/patches/series zoneminder-1.26.5/debian/patches/series --- zoneminder-1.26.5/debian/patches/series 2014-01-22 22:56:11.000000000 +0000 +++ zoneminder-1.26.5/debian/patches/series 2014-03-19 00:23:26.000000000 +0000 @@ -5,3 +5,4 @@ do_not_check_for_updates_by_default libav_path non_x86_guards +libav10.patch
