diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-07 21:26:07 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-07 21:26:07 -0500 |
commit | 7d30edc38ea37004622ab28dc39a6ce7e210f44f (patch) | |
tree | 5b5202dc154510b7c273bc2a4d76f35fb9e905fe | |
parent | ff6fa124540d549a582aa5c80b08e4e883036868 (diff) | |
parent | 72f1e7d07e6ceb249c6d85e427cca22d7063e44d (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r-- | libre/linux-libre-kmod-alx/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 | ||||
-rwxr-xr-x | libre/linux-libre-lts/PKGBUILD | 8 | ||||
-rwxr-xr-x | libre/linux-libre-lts/linux-libre-lts.install | 2 | ||||
-rwxr-xr-x | libre/linux-libre/PKGBUILD | 8 | ||||
-rwxr-xr-x | libre/linux-libre/linux-libre.install | 2 | ||||
-rwxr-xr-x | libre/your-freedom/PKGBUILD | 2 | ||||
-rw-r--r-- | pcr/irssi-xmpp/PKGBUILD | 22 | ||||
-rw-r--r-- | pcr/libav-static/PKGBUILD | 120 | ||||
-rw-r--r-- | pcr/libav-static/avconv-static | 2 | ||||
-rw-r--r-- | pcr/libav-static/avplay-static | 2 | ||||
-rw-r--r-- | pcr/libav-static/avprobe-static | 2 | ||||
-rw-r--r-- | pcr/libav-static/avserver-static | 2 | ||||
-rw-r--r-- | pcr/libav-static/ffmpeg-libav-static | 2 | ||||
-rw-r--r-- | pcr/libav-static/qt-faststart-libav-static | 2 | ||||
-rw-r--r-- | pcr/zoneminder/PKGBUILD | 79 | ||||
-rw-r--r-- | pcr/zoneminder/patch-ffmpeg-0.11.patch | 60 |
17 files changed, 205 insertions, 118 deletions
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 294c5afbf..68dfccc79 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.6.5 +_kernver=3.6.6 _kernrel=1 pkgname=('linux-libre-kmod-alx') _pkgver=2012-10-03 pkgver=20121003 -pkgrel=4 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index ffda9f21f..65bae7c0b 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.50 +_kernver=3.0.51 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _pkgver=2012-10-03 pkgver=20121003 -pkgrel=5 +pkgrel=6 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 1bcdb57fd..b7ffda209 100755 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=50 +_sublevel=51 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.49 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.50 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '8c0723e49160ecd399205f9bbb8ee076' + 'fb3c742b1f8b01131534a22348cfa712' 'aed25ab047e1c0b020a1516c235c6a74' '7d37e8ce0f4bd5a957172b12ae742ea0' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'fba8d3ccd4a7e5b1132c9e20f60df1df') + 'e2cc9f33fb26b254b6b65f8981aebf13') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index c961f9a99..75238bf66 100755 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.50-1-LIBRE-LTS +KERNEL_VERSION=3.0.51-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d5b44814f..0487c2e84 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=5 +_sublevel=6 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.6.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - 'a126c193c6fbb3acff00c426493897df' + '887e4a0fd0fb10da9410f5d1a75466b8' 'e4a3a4677e1fac6ecf0e0fb44c41ca08' '68fc36a4efb6ade0eca409b9444fef0c' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -43,7 +43,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '9d3c56a4b999c8bfbd4018089a62f662' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'ba95fd06943438f0cf54d1818e034fcc') + '16173f50a1a39e908825fe6fe90ac103') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 30b5abc90..8a3791240 100755 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.6.5-1-LIBRE +KERNEL_VERSION=3.6.6-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 649cb962d..9c5f6242c 100755 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -24,4 +24,4 @@ package() { )) } -md5sums=('5e50a4ec73267a732d153c1079e9b021') +md5sums=('cc8ed9a33d0c58fcecc3323f831f687e') diff --git a/pcr/irssi-xmpp/PKGBUILD b/pcr/irssi-xmpp/PKGBUILD new file mode 100644 index 000000000..fa5d445c6 --- /dev/null +++ b/pcr/irssi-xmpp/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Yogesh Powar <yogesh.powar@gmail.com> +pkgname=irssi-xmpp +pkgver=0.52 +pkgrel=1 +pkgdesc="An irssi plugin to connect to the Jabber network." +url="http://cybione.org/~irssi-xmpp" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('loudmouth>=1.4.0' 'irssi>=0.8.13') +source=("http://cybione.org/~irssi-xmpp/files/${pkgname}-${pkgver}.tar.gz") +md5sums=('f48d66ddf6a6d8e4d04bfc44b83dc3c7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + export PREFIX=/usr/ + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/libav-static/PKGBUILD b/pcr/libav-static/PKGBUILD new file mode 100644 index 000000000..932213a3e --- /dev/null +++ b/pcr/libav-static/PKGBUILD @@ -0,0 +1,120 @@ +# $Id$ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Paul Mattal <paul@archlinux.org> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgbase=libav +pkgname=libav-static +pkgflag=-static +pkgver=0.8.4 +pkgrel=2 +pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library' +arch=( + i686 + x86_64 + mips64el +) +url="http://$pkgbase.org/" +license=( + GPL +) +depends=( + alsa-lib + bzip2 + gsm + lame + libpulse + libtheora + libva + libvorbis + libvpx + opencore-amr + openjpeg + rtmpdump + schroedinger + sdl + speex + x264 + xvidcore + zlib +) +makedepends=( + yasm + libvdpau +) +source=( + http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz + avconv$pkgflag + avplay$pkgflag + avprobe$pkgflag + avserver$pkgflag + ffmpeg-$pkgname + qt-faststart-$pkgname +) +sha512sums=( + d402c7d586708e29b92340c4d03d8431fe607f0b88c2762cc95671786cdb9a7221968164b571e11086b53b2169f3a657c6106dc769c04a1a035429d011e72610 + 4a98c459df5f5bc5e42580b5f2081509719c057fdf55693b3554006b21adcaa29ee59ac0debfe0486fe1df8b9a937135d99e4ccc2df894a2634dd314eed93114 + afd2eadd0a0522cd3665ccd2b819f06a99cc50e3bdac3a0ef200861664c7084cc5990a3c1a860f2f0cc9f835c33c09cb5c57a25dbab0673eb74ba0f4c980e539 + 4e557c9eab6a97a3206df1dd49a516ae7be9490c894ff212cb5286ee097ae606c0b7a650c75278a71e4c91d0325eaee729937e1ae659ce0887c3c20ea8fe6333 + f0fa50711d19babf3f485189fb37b17a87f31849dad9cf6a7324601bdde0856fe47d55a4d82c6839c93f39e970edcbeecfbcb70a8b4e7570250fa4c7bb6975fb + 8101ec9c3e0a945ea89f85f81ace52ce67159661e3440668726a5767ba6250a91533494f1aa8fc30ee97ff9af5d64636d0f0dbcb2da862124d35b6b5ec571f5b + 0133fae31e1df586317deb7235f5e74d22abd007038f82b9df10ea3eea6748945c50a0bbe8f588e8a5d1b7874b3fa2639430e1efa32b0cfe16383a32751d3245 +) + +build() { + cd $pkgbase-$pkgver + + ./configure \ + --prefix=/opt/$pkgname \ + --enable-libmp3lame \ + --enable-libvorbis \ + --enable-libxvid \ + --enable-libx264 \ + --enable-libvpx \ + --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ + --enable-postproc \ + --enable-shared \ + --enable-x11grab \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libschroedinger \ + --enable-libopenjpeg \ + --enable-librtmp \ + --enable-libpulse \ + --enable-gpl \ + --enable-version3 \ + --enable-runtime-cpudetect \ + --disable-debug \ + --enable-static + + make + make tools/qt-faststart + make doc/ffmpeg.1 + make doc/av{play,server}.1 +} + +package() { + cd $pkgbase-$pkgver + make DESTDIR=$pkgdir install install-man + install -m755 -d $pkgdir/etc/ld.so.conf.d + install -m755 -d $pkgdir/usr/bin + install -m755 -d $pkgdir/usr/share/man/man1 + install -Dm755 tools/qt-faststart $pkgdir/opt/$pkgname/bin + ln -s /opt/$pkgname/bin/avconv $pkgdir/usr/bin/avconv$pkgflag + ln -s /opt/$pkgname/bin/avplay $pkgdir/usr/bin/avplay$pkgflag + ln -s /opt/$pkgname/bin/avprobe $pkgdir/usr/bin/avprobe$pkgflag + ln -s /opt/$pkgname/bin/avserver $pkgdir/usr/bin/avserver$pkgflag + ln -s /opt/$pkgname/bin/ffmpeg $pkgdir/usr/bin/ffmpeg-$pkgname + ln -s /opt/$pkgname/bin/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname + ln -s /opt/$pkgname/share/man/man1/avconv.1 $pkgdir/usr/share/man/man1/avconv$pkgflag.1 + ln -s /opt/$pkgname/share/man/man1/avplay.1 $pkgdir/usr/share/man/man1/avplay$pkgflag.1 + ln -s /opt/$pkgname/share/man/man1/avprobe.1 $pkgdir/usr/share/man/man1/avprobe$pkgflag.1 + ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1 + ln -s /opt/$pkgname/share/man/man1/ffmpeg.1 $pkgdir/usr/share/man/man1/ffmpeg-$pkgname.1 + echo /opt/libav-static/lib > $pkgdir/etc/ld.so.conf.d/libav-static.conf +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/libav-static/avconv-static b/pcr/libav-static/avconv-static new file mode 100644 index 000000000..5f632bec0 --- /dev/null +++ b/pcr/libav-static/avconv-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avconv $* diff --git a/pcr/libav-static/avplay-static b/pcr/libav-static/avplay-static new file mode 100644 index 000000000..8db2da816 --- /dev/null +++ b/pcr/libav-static/avplay-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avplay $* diff --git a/pcr/libav-static/avprobe-static b/pcr/libav-static/avprobe-static new file mode 100644 index 000000000..44b730287 --- /dev/null +++ b/pcr/libav-static/avprobe-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avprobe $* diff --git a/pcr/libav-static/avserver-static b/pcr/libav-static/avserver-static new file mode 100644 index 000000000..642d4722c --- /dev/null +++ b/pcr/libav-static/avserver-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avserver $* diff --git a/pcr/libav-static/ffmpeg-libav-static b/pcr/libav-static/ffmpeg-libav-static new file mode 100644 index 000000000..3f9ef6d52 --- /dev/null +++ b/pcr/libav-static/ffmpeg-libav-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/ffmpeg $* diff --git a/pcr/libav-static/qt-faststart-libav-static b/pcr/libav-static/qt-faststart-libav-static new file mode 100644 index 000000000..8613091c4 --- /dev/null +++ b/pcr/libav-static/qt-faststart-libav-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/qt-faststart $* diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index c69e6fa97..236ceca01 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -6,9 +6,10 @@ # based of debian squeeze package +pkgbase=zoneminder pkgname=zoneminder pkgver=1.25.0 -pkgrel=22 +pkgrel=24 pkgdesc='Capture, analyse, record and monitor video security cameras' arch=( i686 @@ -18,16 +19,16 @@ arch=( backup=( etc/zm.conf ) -url="http://www.$pkgname.com" +url="http://www.$pkgbase.com" license=( GPL ) depends=( apache cambozola - ffmpeg-static + libav-static gnutls - mysql + mariadb perl-archive-zip perl-date-manip perl-dbd-mysql @@ -52,20 +53,18 @@ makedepends=( optdepends=( netpbm ) -install=$pkgname.install +install=$pkgbase.install source=( - http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz - httpd-$pkgname.conf - $pkgname - $pkgname.service - patch-ffmpeg-0.11.patch + http://www.$pkgbase.com/downloads/ZoneMinder-$pkgver.tar.gz + httpd-$pkgbase.conf + $pkgbase + $pkgbase.service ) sha512sums=( 3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375 4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08 ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0 cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf - 382799ad6add1632d934544230520f942dae37913b58cfa19e0cb2b11e7002267b1fdb9aa535f2217bcccf0c85c4d754f316dc3980a3ca267e5b3f5500536024 ) build() { @@ -73,10 +72,12 @@ build() { # ZM_RUNDIR need change to run dir export CPPFLAGS=-D__STDC_CONSTANT_MACROS\ - ZM_LOGDIR=/var/log/$pkgname\ - ZM_RUNDIR=/tmp/$pkgname\ + OPT_FFMPEG=yes\ + PATH_FFMPEG=/usr/bin/avconv-static\ + ZM_LOGDIR=/var/log/$pkgbase\ + ZM_RUNDIR=/tmp/$pkgbase\ ZM_SSL_LIB=gnutls\ - ZM_TMPDIR=/tmp/$pkgname + ZM_TMPDIR=/tmp/$pkgbase # Patch for GCC 4.7.x sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\ @@ -94,9 +95,14 @@ build() { # Patch for support html5 video and flv sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/; - /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h254/'\ + /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read + # Patch for enable video export + #sed -i -e '/ZM_OPT_FFMPEG/,+1 s/@OPT_FFMPEG@/yes/; + # /ZM_PATH_FFMPEG/,+1 s/@PATH_FFMPEG@/\/usr\/bin\/avconv-static/'\ + # scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read + # Patch for change path run dir sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read @@ -126,19 +132,6 @@ build() { s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\ configure.ac - # Patch for support new ffmpeg - patch -p1 < $srcdir/patch-ffmpeg-0.11.patch -# sed -i -e 's/if ( av_open_input_file( \&mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )/if ( avformat_open_input( \&mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )/; -# s/if ( avcodec_open( mCodecContext, mCodec ) < 0 )/if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )/'\ -# src/zm_ffmpeg_camera.cpp -# sed -i -e 's/if ( av_set_parameters(ofc, NULL) < 0 )/\/\*\n \* Removed in last ffmpeg\n \* if ( av_set_parameters(ofc, NULL) < 0 )/; -# /Panic( "Invalid output format parameters" );/,+1 s/}/}\*/; -# /if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )/ s/URL_WRONLY/AVIO_FLAG_WRITE/; -# s/av_write_header(ofc);/avformat_write_header(ofc, NULL);/'\ -# src/zm_mpeg.cpp - sed -i -e 's/avcodec_init/avcodec_open/'\ - configure{,.ac} - # Patch for support ffmpeg with <libavutil/mathematics.h> and C library sed -i -e 's/^extern "C" {/extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>/ s/^#include <libavutil\/avutil.h>/#include <libavutil\/avutil.h>\n#include <libavutil\/mathematics.h>/'\ @@ -163,10 +156,10 @@ build() { --sysconfdir=/etc\ --with-cgidir=/srv/http/cgi-bin\ --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\ - --with-ffmpeg=/usr\ + --with-ffmpeg=/opt/libav-static\ --with-libarch=lib\ --with-mysql=/usr\ - --with-webdir=/srv/http/$pkgname\ + --with-webdir=/srv/http/$pkgbase\ --with-webgroup=http\ --with-webhost=localhost\ --with-webuser=http @@ -179,25 +172,25 @@ package() { make DESTDIR=$pkgdir install - mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgname},usr/{lib/systemd/system,share/{license/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}} + mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgbase},usr/{lib/systemd/system,share/{license/$pkgbase,$pkgbase/db}},var/{cache/$pkgbase,log/$pkgbase}} - chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgname,log/$pkgname}} + chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}} chmod 0700 $pkgdir/etc/zm.conf for i in events images temp; do - mv $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i - ln -s /var/cache/$pkgname/$i $pkgdir/srv/http/$pkgname/$i - chown -h http.http $pkgdir/srv/http/$pkgname/$i + mv $pkgdir/srv/http/$pkgbase/$i $pkgdir/var/cache/$pkgbase/$i + ln -s /var/cache/$pkgbase/$i $pkgdir/srv/http/$pkgbase/$i + chown -h http.http $pkgdir/srv/http/$pkgbase/$i done - ln -s /srv/http/cgi-bin $pkgdir/srv/http/$pkgname - chown -h http.http $pkgdir/srv/http/{cgi-bin,$pkgname,$pkgname/cgi-bin} + ln -s /srv/http/cgi-bin $pkgdir/srv/http/$pkgbase + chown -h http.http $pkgdir/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin} - ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname + ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgbase - install -D -m 644 $srcdir/httpd-$pkgname.conf $pkgdir/etc/httpd/conf/extra - install -D -m 644 $srcdir/$pkgname $pkgdir/etc/rc.d - install -D -m 644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system - install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgname - install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgname/db + install -D -m 644 $srcdir/httpd-$pkgbase.conf $pkgdir/etc/httpd/conf/extra + install -D -m 644 $srcdir/$pkgbase $pkgdir/etc/rc.d + install -D -m 644 $srcdir/$pkgbase.service $pkgdir/usr/lib/systemd/system + install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgbase + install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgbase/db } diff --git a/pcr/zoneminder/patch-ffmpeg-0.11.patch b/pcr/zoneminder/patch-ffmpeg-0.11.patch deleted file mode 100644 index ac56e4c69..000000000 --- a/pcr/zoneminder/patch-ffmpeg-0.11.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
-index 42927f6..61df606 100644
---- a/src/zm_ffmpeg_camera.cpp
-+++ b/src/zm_ffmpeg_camera.cpp
-@@ -91,7 +91,7 @@ int FfmpegCamera::PrimeCapture()
- Info( "Priming capture from %s", mPath.c_str() );
-
- // Open the input, not necessarily a file
-- if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
-+ if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )
- Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
-
- // Locate stream info from input
-@@ -122,7 +122,7 @@ int FfmpegCamera::PrimeCapture()
- Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
-
- // Open the codec
-- if ( avcodec_open( mCodecContext, mCodec ) < 0 )
-+ if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )
- Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
-
- // Allocate space for the native video frame
-
-diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp
-index f5de2a4..d614346 100644
---- a/src/zm_mpeg.cpp
-+++ b/src/zm_mpeg.cpp
-@@ -130,10 +130,12 @@ void VideoStream::SetParameters()
- {
- /* set the output parameters (must be done even if no
- parameters). */
-- if ( av_set_parameters(ofc, NULL) < 0 )
-+ /*
-+ * Removed in last ffmpeg
-+ * if ( av_set_parameters(ofc, NULL) < 0 )
- {
- Panic( "Invalid output format parameters" );
-- }
-+ }*/
- //dump_format(ofc, 0, filename, 1);
- }
-
-@@ -222,7 +224,7 @@ void VideoStream::OpenStream()
- if ( !(of->flags & AVFMT_NOFILE) )
- {
- #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
-- if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )
-+ if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
- #else
- if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
- #endif
-@@ -241,7 +243,7 @@ void VideoStream::OpenStream()
- }
-
- /* write the stream header, if any */
-- av_write_header(ofc);
-+ avformat_write_header(ofc, NULL);
- }
-
- VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height )
|