summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/java-rxtx/0000-configure-java-version.patch93
-rw-r--r--java/java-rxtx/0001-makefile-destdir.patch (renamed from java/java-rxtx/destdir.patch)7
-rw-r--r--java/java-rxtx/0002-makefile-javadoc-dir.patch13
-rw-r--r--java/java-rxtx/0003-lockdir-location.patch18
-rw-r--r--java/java-rxtx/ChangeLog.txt8
-rw-r--r--java/java-rxtx/GroupMembership.txt7
-rw-r--r--java/java-rxtx/PKGBUILD83
-rw-r--r--java/java-rxtx/java7-configure.patch38
-rw-r--r--[-rwxr-xr-x]libre/libretools/PKGBUILD95
-rw-r--r--[-rwxr-xr-x]libre/libretools/libretools.install0
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre-lts-kmod-alx/PKGBUILD4
-rwxr-xr-xlibre/linux-libre-lts/PKGBUILD8
-rwxr-xr-xlibre/linux-libre-lts/linux-libre-lts.install2
-rwxr-xr-xlibre/linux-libre/PKGBUILD8
-rwxr-xr-xlibre/linux-libre/linux-libre.install2
-rwxr-xr-xlibre/your-freedom/PKGBUILD2
-rw-r--r--pcr/irssi-xmpp/PKGBUILD22
-rw-r--r--pcr/zoneminder-libav/PKGBUILD195
-rw-r--r--pcr/zoneminder-libav/httpd-zoneminder.conf20
-rw-r--r--pcr/zoneminder-libav/zoneminder63
-rw-r--r--pcr/zoneminder-libav/zoneminder.install185
-rw-r--r--pcr/zoneminder-libav/zoneminder.service13
-rw-r--r--pcr/zoneminder-lts/PKGBUILD210
-rw-r--r--pcr/zoneminder-lts/httpd-zoneminder.conf20
-rw-r--r--pcr/zoneminder-lts/patch-ffmpeg-0.11.patch60
-rw-r--r--pcr/zoneminder-lts/zoneminder63
-rw-r--r--pcr/zoneminder-lts/zoneminder.install185
-rw-r--r--pcr/zoneminder-lts/zoneminder.service13
-rw-r--r--pcr/zoneminder/PKGBUILD79
-rw-r--r--pcr/zoneminder/patch-ffmpeg-0.11.patch60
31 files changed, 288 insertions, 1292 deletions
diff --git a/java/java-rxtx/0000-configure-java-version.patch b/java/java-rxtx/0000-configure-java-version.patch
new file mode 100644
index 000000000..c9e37258a
--- /dev/null
+++ b/java/java-rxtx/0000-configure-java-version.patch
@@ -0,0 +1,93 @@
+Make the JAVA_VERSION checks future-proof (for Java 6 and 7)
+
+At this point Java is mature enough that support for older versions isn't
+going to be dropped, so instead of having a growing list of new versions that
+work by default, have a short list of old versions that need special measures.
+--- RXTX.orig/configure.in 2012-10-29 01:13:58.000000000 -0400
++++ RXTX/configure.in 2012-10-29 10:56:18.000000000 -0400
+@@ -463,12 +463,6 @@
+ CFLAGS=$CFLAGS" -D__need_timespec"
+ case $JAVA_VERSION in
+
+- 1.2*|1.3*|1.4*|1.5*)
+- #fix_parameters $JPATH/jre/lib/javax.comm.properties
+- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
+- JHOME=$JPATH"/jre/lib/ext"
+- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
+- ;;
+ 1.1*)
+ CLASSPATH=".:\$(TOP):\$(TOP)/src:"` \
+ if [ -d $JPATH/share/kaffe/ ]; then
+@@ -498,6 +492,12 @@
+ JHOME=$JPATH/"lib"
+ fi
+ ;;
++ *)
++ #fix_parameters $JPATH/jre/lib/javax.comm.properties
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
++ JHOME=$JPATH"/jre/lib/ext"
++ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
++ ;;
+ esac
+
+ # Cross Compilers
+@@ -533,12 +533,6 @@
+ TARGETLIB="\$(target_triplet)/librxtxSerial.la \
+ \$(target_triplet)/librxtxParallel.la"
+ case $JAVA_VERSION in
+- 1.2*|1.3*|1.4*|1.5*)
+- #fix_parameters $JPATH/jre/lib/javax.comm.properties
+- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
+- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
+- JHOME=$JPATH/"jre/lib/ext"
+- ;;
+ 1.1*)
+ check_prefix
+ #fix_parameters $JPATH/lib/javax.comm.properties
+@@ -570,6 +564,10 @@
+ JHOME=$JPATH/"lib"
+ ;;
+ *)
++ #fix_parameters $JPATH/jre/lib/javax.comm.properties
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
++ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
++ JHOME=$JPATH/"jre/lib/ext"
+ ;;
+ esac
+ ;;
+@@ -669,15 +667,15 @@
+
+ WIN32)
+ case $JAVA_VERSION in
+- 1.2*|1.3*|1.4*|1.5*)
+- CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
+- JHOME=$JPATH"/jre/lib/ext"
+- ;;
+ 1.1*)
+ CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
+ RXTX_PATH="\$(prefix)/lib/"
+ JHOME=$JPATH/"lib"
+ ;;
++ *)
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
++ JHOME=$JPATH"/jre/lib/ext"
++ ;;
+ esac
+ if test x$WIN32INCLUDE = x; then
+ echo "We need to know what directory the windows java include files"
+@@ -721,12 +719,12 @@
+ CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
+
+ case $JAVA_VERSION in
+- 1.2*|1.3*|1.4*|1.5*)
+- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
+- ;;
+ 1.1*)
+ RXTX_PATH="\$(JPATH)/lib/"
+ ;;
++ *)
++ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
++ ;;
+ esac
+ ;;
+
diff --git a/java/java-rxtx/destdir.patch b/java/java-rxtx/0001-makefile-destdir.patch
index 11416841f..944654ab6 100644
--- a/java/java-rxtx/destdir.patch
+++ b/java/java-rxtx/0001-makefile-destdir.patch
@@ -1,6 +1,7 @@
---- Makefile.in.orig 2012-09-21 15:21:00.000000000 -0400
-+++ Makefile.in 2012-09-21 15:21:07.000000000 -0400
-@@ -566,13 +566,15 @@
+Add DESTDIR support to Makefile
+--- RXTX.orig/Makefile.am
++++ RXTX/Makefile.am
+@@ -81,13 +81,15 @@
# install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
# proper location
install: all
diff --git a/java/java-rxtx/0002-makefile-javadoc-dir.patch b/java/java-rxtx/0002-makefile-javadoc-dir.patch
new file mode 100644
index 000000000..9b4eb0692
--- /dev/null
+++ b/java/java-rxtx/0002-makefile-javadoc-dir.patch
@@ -0,0 +1,13 @@
+Place the Javadoc output in its own directory
+--- RXTX.orig/Makefile.am
++++ RXTX/Makefile.am
+@@ -99,7 +99,8 @@
+
+ # create the javadoc files.
+ docs: $(CLASSES)
+- $(JAVADOC) $(javafiles)
++ mkdir javadoc
++ cd javadoc && $(JAVADOC) $(javafiles)
+
+ ################ WIN32 CrossCompiling from here down #######################
+
diff --git a/java/java-rxtx/0003-lockdir-location.patch b/java/java-rxtx/0003-lockdir-location.patch
new file mode 100644
index 000000000..78a757f81
--- /dev/null
+++ b/java/java-rxtx/0003-lockdir-location.patch
@@ -0,0 +1,18 @@
+Fix the location of device lock files.
+
+Use the new semi-standard device lock file directory on GNU/Linux. This is
+nescessary on (at least) Arch Linux and Parabola GNU/Linux.
+
+http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html
+
+--- RXTX.orig/src/SerialImp.h
++++ RXTX/src/SerialImp.h
+@@ -109,7 +109,7 @@
+ /* Ports known on the OS */
+ #if defined(__linux__)
+ # define DEVICEDIR "/dev/"
+-# define LOCKDIR "/var/lock"
++# define LOCKDIR "/var/lock/lockdev"
+ # define LOCKFILEPREFIX "LCK.."
+ # define FHS
+ #endif /* __linux__ */
diff --git a/java/java-rxtx/ChangeLog.txt b/java/java-rxtx/ChangeLog.txt
deleted file mode 100644
index 7efab2514..000000000
--- a/java/java-rxtx/ChangeLog.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Differences from rxtx-2.1-7r2 made by Arduino:
- * Adding support for /dev/ttyACM* devices on Linux.
- * Fixing (I hope) problems on 64-bit Linux systems.
- * Adding checks for Java 1.6.
- * Removing unnecessary compiler warning.
-
-Differences from Arduino's version:
- * Adding checks for Java 1.7.
diff --git a/java/java-rxtx/GroupMembership.txt b/java/java-rxtx/GroupMembership.txt
new file mode 100644
index 000000000..dd5c47076
--- /dev/null
+++ b/java/java-rxtx/GroupMembership.txt
@@ -0,0 +1,7 @@
+In order to use a program that makes use of rxtx, you must be a member
+of the groups:
+ * uucp: for access to hardware devices in /dev
+ * lock: for access to hardware lockfiles in /var/lock/lockdev
+
+Most documentation indicates that you must be in one or the other,
+depending on your distro; you must actually be in both.
diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD
index 30ed25967..8d609f5ae 100644
--- a/java/java-rxtx/PKGBUILD
+++ b/java/java-rxtx/PKGBUILD
@@ -1,54 +1,93 @@
# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): PyroPeter <googlemail.com@abi1789>
-pkgname=java-rxtx
_pkgver=2.1-7r2-arduino4
_gitver='commit=a8cd90f8505d7c472b57550b1192fe67885dd638'
-pkgver=${_pkgver//-/.}
-pkgrel=1
+####
+
+pkgname=java-rxtx
+pkgver=${_pkgver//-/.}
pkgdesc="A native library providing serial and parallel communication for Java"
+license=(LGPL2.1)
+
+pkgrel=2
arch=('i686' 'x86_64')
-depends=('java-environment')
+depends=('java-runtime')
+makedepends=('java-environment' 'pacman>4.0.3')
case "$_pkgver" in
*arduino*)
url="https://github.com/arduino/RXTX"
- source=("git://github.com/arduino/RXTX.git#${_gitver}"
- java7-configure.patch
- destdir.patch)
- license=(LGPL)
- changelog=ChangeLog.txt
+ source=("git://github.com/arduino/RXTX.git#${_gitver}")
+ md5sums=('SKIP')
_dirname=RXTX
;;
*)
url="http://rxtx.qbang.org/"
- source=("http://rxtx.qbang.org/pub/rxtx/rxtx-${_pkgver}.zip"
- destdir.patch)
- # Todo: patch for Java 6 AND Java 7
- license=('custom:LGPL-with-java-exception')
+ source=("http://rxtx.qbang.org/pub/rxtx/rxtx-${_pkgver}.zip")
+ md5sums=('9290b4832d46199f8d798a531209640b')
_dirname=rxtx-{$_pkgver}
;;
esac
+source+=(
+ 0000-configure-java-version.patch
+ 0001-makefile-destdir.patch
+ 0002-makefile-javadoc-dir.patch
+ 0003-lockdir-location.patch
+ GroupMembership.txt)
+
+md5sums+=('a36caaca717018341d69605f962d1c2a'
+ '39c88043032de742c6b51d90a26eee2c'
+ 'a910e0c75a9c687d2b2f782e3d9982e3'
+ '19b19c2514bce563be2a812888e1d9b4'
+ '9dc461eab358e3b78c4b688977997116')
+
+_MAKEFLAGS=('JHOME=/usr/share/java' 'RXTX_PATH=/usr/lib')
+
+_changelog() {
+ t="`echo -e '\t'`"
+
+ # Parabola changes
+ ls "$srcdir"/*.patch | sort -r | while read file; do
+ echo "${file##*/}"
+ sed "1s/./$t$t&/;1q" "$file"
+ done
+
+ # Arduino changes
+ if [[ -d "$srcdir/$_dirname/.git" ]]; then
+ pushd "$srcdir/$_dirname" > /dev/null
+ git log --pretty=format:"%h %ad%n$t$t%s" --date=short|head -n-2
+ popd > /dev/null
+ fi
+
+ # RXTX ChangeLog
+ grep "^[0-9 $t]" "$srcdir/$_dirname/ChangeLog"
+}
+
build() {
+ _changelog > "$srcdir/ChangeLog.txt"
cd "$srcdir/$_dirname"
. /etc/profile.d/jdk.sh
- patch -i "$srcdir/java7-configure.patch"
- patch -i "$srcdir/destdir.patch"
+ patch -Np1 -i "$srcdir/0000-configure-java-version.patch" # requires autogen
+ patch -Np1 -i "$srcdir/0001-makefile-destdir.patch" # requires autogen
+ patch -Np1 -i "$srcdir/0002-makefile-javadoc-dir.patch" # requires autogen
+ patch -Np1 -i "$srcdir/0003-lockdir-location.patch"
+ rm *.m4 && ./autogen.sh
./configure --prefix=/usr
- make
+ make "${_MAKEFLAGS[@]}" all docs
}
package() {
cd "$srcdir/$_dirname"
. /etc/profile.d/jdk.sh
- make DESTDIR="$pkgdir" install
-}
+ make "${_MAKEFLAGS[@]}" DESTDIR="$pkgdir" install
-md5sums=('SKIP'
- 'f07bc244660852dd9b016c190e38e1c9'
- '90be9bdf1d8cbe5304739df066559a13')
+ install -d "$pkgdir/usr/share/doc/$pkgname/"
+ install -m644 "$srcdir/ChangeLog.txt" "$pkgdir/usr/share/doc/$pkgname/"
+ install -m644 "$srcdir/GroupMembership.txt" "$pkgdir/usr/share/doc/$pkgname/"
+ cp -r javadoc "$pkgdir/usr/share/doc/$pkgname/"
+}
diff --git a/java/java-rxtx/java7-configure.patch b/java/java-rxtx/java7-configure.patch
deleted file mode 100644
index fed710200..000000000
--- a/java/java-rxtx/java7-configure.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig 2012-09-21 15:02:54.000000000 -0400
-+++ configure 2012-09-21 15:03:38.000000000 -0400
-@@ -21541,7 +21541,7 @@
- CFLAGS=$CFLAGS" -D__need_timespec"
- case $JAVA_VERSION in
-
-- 1.2*|1.3*|1.4*|1.5*|1.6*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- #fix_parameters $JPATH/jre/lib/javax.comm.properties
- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
- JHOME=$JPATH"/jre/lib/ext"
-@@ -21611,7 +21611,7 @@
- TARGETLIB="\$(target_triplet)/librxtxSerial.la \
- \$(target_triplet)/librxtxParallel.la"
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*|1.6*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- #fix_parameters $JPATH/jre/lib/javax.comm.properties
- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-@@ -21747,7 +21747,7 @@
-
- WIN32)
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*|1.6*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
- JHOME=$JPATH"/jre/lib/ext"
- ;;
-@@ -21799,7 +21799,7 @@
- CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
-
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*|1.6*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
- ;;
- 1.1*)
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index dec731c97..6efc06b90 100755..100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,102 +1,45 @@
# Maintainer: Joshua Haase <hahj87@gmail.com
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor: fauno <fauno@kiwwwi.com.ar>
pkgbase=libretools
pkgname=(libretools libretools-pr libretools-mips64el)
-pkgver=$(date -u +%Y%m%d)
-pkgrel=2
-pkgdesc="Scripts for easing Parabola's tasks"
-arch=('any')
+pkgver=20121107
+pkgdesc="Scripts for Parabola development"
url="http://parabolagnulinux.org"
license=('GPL3+')
-depends=(openssh rsync git wget)
-optdepends=('devtools: For chroot (libremkchroot, librechroot, libremakepkg)')
-makedepends=(git)
-install=libretools.install
-source=()
-md5sums=()
-_gitroot="http://projects.parabolagnulinux.org/libretools.git"
-_gitname="libretools"
+pkgrel=1
+arch=('any')
+depends=(openssh rsync git wget devtools)
+install=libretools.install
+source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar.bz2)
build() {
- cd "$srcdir"
- ## Git checkout
- if [ -d $srcdir/${_gitname} ] ; then
- msg "Git checkout: Updating existing tree"
- cd ${_gitname} && git pull ${_gitroot}
- msg "Git checkout: Tree has been updated"
- else
- msg "Git checkout: Retrieving sources"
- git clone ${_gitroot}
- fi
- msg "Checkout completed"
- ## Build
+ cd "$srcdir/$pkgbase-$pkgver"
+ make
}
package_libretools() {
backup=(etc/libretools.conf)
- install -d ${pkgdir}/etc/libretools.d
- install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
-
- install -d ${pkgdir}/usr/bin
- install -d ${pkgdir}/usr/sbin
- install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin
- install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin
- install -m755 ${_gitname}/aur ${pkgdir}/usr/bin
- install -m755 ${_gitname}/buildenv ${pkgdir}/usr/sbin
- install -m755 ${_gitname}/chcleanup ${pkgdir}/usr/bin
- install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin
- install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin
- install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin
- install -m755 ${_gitname}/fullpkg-build ${pkgdir}/usr/bin
- install -m755 ${_gitname}/fullpkg-find ${pkgdir}/usr/bin
- install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin
- install -m755 ${_gitname}/is_unfree ${pkgdir}/usr/bin
- install -m755 ${_gitname}/lb ${pkgdir}/usr/bin
- install -m755 ${_gitname}/libreaddiff ${pkgdir}/usr/bin
- install -m755 ${_gitname}/librebasebuilder ${pkgdir}/usr/bin
- install -m755 ${_gitname}/librechroot ${pkgdir}/usr/sbin
- install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin
- install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin
- install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin
- install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin
- install -m755 ${_gitname}/libremkchroot ${pkgdir}/usr/bin
- install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin
- install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin
- install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin
- install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin
- install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
- install -m755 ${_gitname}/toru-path ${pkgdir}/usr/bin
- install -m755 ${_gitname}/toru-utils ${pkgdir}/usr/bin
- install -m755 ${_gitname}/toru-where ${pkgdir}/usr/bin
- install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
- install -m755 ${_gitname}/update-cleansystem ${pkgdir}/usr/sbin
-
- install -d ${pkgdir}/usr/share/pacman
- install -m755 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman
+ cd "$srcdir/$pkgbase-$pkgver"
+ make install-libretools DESTDIR="$pkgdir"
+ install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto
}
package_libretools-pr() {
backup=('etc/libretools.d/prtools.conf')
- install -d ${pkgdir}/etc/libretools.d
- install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d
-
- install -d ${pkgdir}/usr/bin
- install -m755 ${_gitname}/prtools/prfullpkg ${pkgdir}/usr/bin
- install -m755 ${_gitname}/prtools/prmipsrelease ${pkgdir}/usr/bin
- install -m755 ${_gitname}/prtools/prtoru ${pkgdir}/usr/bin
+ cd "$srcdir/$pkgbase-$pkgver"
+ make install-libretools-pr DESTDIR="$pkgdir"
}
package_libretools-mips64el() {
backup=('etc/libretools.d/mips64el.conf')
- install -d ${pkgdir}/etc/libretools.d
- install -m755 ${_gitname}/mips64el/mips64el.conf ${pkgdir}/etc/libretools.d
-
- install -d ${pkgdir}/usr/bin
- install -m755 ${_gitname}/mips64el/mips-add ${pkgdir}/usr/bin
- install -m755 ${_gitname}/mips64el/mipsrelease ${pkgdir}/usr/bin
+ cd "$srcdir/$pkgbase-$pkgver"
+ make install-libretools-mips64el DESTDIR="$pkgdir"
}
+
+md5sums=('d80cc433cc627b2d7aa1c37f794d2ef9')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index 69a0f2467..69a0f2467 100755..100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
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/zoneminder-libav/PKGBUILD b/pcr/zoneminder-libav/PKGBUILD
deleted file mode 100644
index 4567de8ea..000000000
--- a/pcr/zoneminder-libav/PKGBUILD
+++ /dev/null
@@ -1,195 +0,0 @@
-# Maintainer: Vojtech Aschenbrenner <v@asch.cz>
-# Contributor: Jason Gardner <buhrietoe@gmail.com>
-# Contributor: Ross melin <rdmelin@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
-
-# based of debian squeeze package
-
-pkgbase=zoneminder
-pkgname=zoneminder-libav
-pkgver=1.25.0
-pkgrel=1
-pkgdesc='Capture, analyse, record and monitor video security cameras'
-arch=(
- i686
- x86_64
- mips64el
-)
-backup=(
- etc/zm.conf
-)
-url="http://www.$pkgbase.com"
-license=(
- GPL
-)
-depends=(
- apache
- cambozola
- libav-static
- gnutls
- mysql
- perl-archive-zip
- perl-date-manip
- perl-dbd-mysql
- perl-dbi
- perl-expect
- perl-libwww
- perl-mime-lite
- perl-mime-tools
- perl-php-serialization
- perl-net-sftp-foreign
- perl-sys-mmap
- perl-time-modules
- perl-x10
- php
- php-apache
- php-gd
- php-mcrypt
-)
-makedepends=(
- netpbm
-)
-optdepends=(
- netpbm
-)
-provides=(
- $pkgbase=$pkgver
-)
-conflicts=(
- $pkgbase
-)
-install=$pkgbase.install
-source=(
- http://www.$pkgbase.com/downloads/ZoneMinder-$pkgver.tar.gz
- httpd-$pkgbase.conf
- $pkgbase
- $pkgbase.service
-)
-sha512sums=(
- 3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375
- 4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
- ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
- cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
-)
-
-build() {
- cd $srcdir/ZoneMinder-$pkgver
-
- # ZM_RUNDIR need change to run dir
- export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
- ZM_LOGDIR=/var/log/$pkgbase\
- ZM_RUNDIR=/tmp/$pkgbase\
- ZM_SSL_LIB=gnutls\
- ZM_TMPDIR=/tmp/$pkgbase
-
- # Patch for GCC 4.7.x
- sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
- src/zm_logger.cpp || read
- sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/'\
- src/zm_thread.h || read
-
- # Patch for automake 1.12
- sed -i -e '/am__api_version=/ s/1.11/1.12/'\
- configure || read
-
- # Patch for disable ZM_CHECK_FOR_UPDATES
- sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/'\
- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
- # 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/'\
- 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
-
- # Patch for change ZM name to ZoneMinder
- sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\
- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
- # Patch for v4l2 convert support
- sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l2convert.so\' ;/"\
- scripts/zmdc.pl.in || read
-
- # Patch for add more socket tries
- sed -i -e '/$max_socket_tries/ s/3/15/'\
- web/ajax/stream.php || read
-
- # Patch for wrong "suppported"
- sed -i -e 's/suppported/supported/'\
- src/zm_local_camera.cpp || read
-
- # Patch for type cast in linux-libre kernel 3.5
- sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\
- src/zm_local_camera.cpp || read
-
- # Patch for drop custom perl install paths
- sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d;
- 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 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>/'\
- src/zm_ffmpeg.h
- sed -i -e 's/^AM_CONFIG_HEADER(config.h)/AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])/;
- s/^AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)/AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])/;
- s/^AC_CHECK_HEADERS(libswscale\/swscale.h,,,)/AC_CHECK_HEADERS(libswscale\/swscale.h,,,)\nAC_LANG_POP([C])/'\
- configure.ac
-
- # Patch for wrong install run, tmp and log dir
- sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d;
- / ( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d;
- / ( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d;
- / ( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d;
- / ( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d'\
- Makefile.{am,in}
-
- ./configure --prefix=/usr\
- --enable-crashtrace=no\
- --enable-debug=no\
- --enable-mmap=yes\
- --sysconfdir=/etc\
- --with-cgidir=/srv/http/cgi-bin\
- --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\
- --with-ffmpeg=/opt/libav-static\
- --with-libarch=lib\
- --with-mysql=/usr\
- --with-webdir=/srv/http/$pkgbase\
- --with-webgroup=http\
- --with-webhost=localhost\
- --with-webuser=http
-
- make V=0
-}
-
-package() {
- cd $srcdir/ZoneMinder-$pkgver
-
- make DESTDIR=$pkgdir install
-
- 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/$pkgbase,log/$pkgbase}}
- chmod 0700 $pkgdir/etc/zm.conf
-
- for i in events images temp; do
- 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/$pkgbase
- chown -h http.http $pkgdir/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin}
-
- ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgbase
-
- 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-libav/httpd-zoneminder.conf b/pcr/zoneminder-libav/httpd-zoneminder.conf
deleted file mode 100644
index aeb089bc1..000000000
--- a/pcr/zoneminder-libav/httpd-zoneminder.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# /etc/httpd/conf/extra/httpd-zm.conf
-# Config for zoneminder web app
-
-Alias /zm "/srv/http/zoneminder"
-<Directory "/srv/http/zoneminder">
- Options -Indexes MultiViews FollowSymLinks
- AllowOverride None
- Order allow,deny
- Allow from all
- # The code unfortunately uses short tags in many places
- php_value short_open_tag On
-</Directory>
-
-ScriptAlias /cgi-bin "/srv/http/cgi-bin"
-<Directory "/srv/http/cgi-bin">
- AllowOverride None
- Options ExecCGI FollowSymLinks
- Order allow,deny
- Allow from all
-</Directory>
diff --git a/pcr/zoneminder-libav/zoneminder b/pcr/zoneminder-libav/zoneminder
deleted file mode 100644
index c4cbf4d3f..000000000
--- a/pcr/zoneminder-libav/zoneminder
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-daemon_name=zm
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting Zoneminder"
- /usr/bin/zmfix -a
- if /usr/bin/zmpkg.pl start >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping Zoneminder"
- if /usr/bin/zmpkg.pl stop >/dev/null ; then
- rm_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- reload)
- stat_busy "Reloading Zoneminder"
- if /usr/bin/zmpkg.pl graceful >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- restart)
- stat_busy "Restarting Zoneminder"
- if /usr/bin/zmpkg.pl restart >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- status)
- stat_busy "Checking Zoneminder status";
- ck_status $daemon_name
- ;;
-
- *)
- echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/pcr/zoneminder-libav/zoneminder.install b/pcr/zoneminder-libav/zoneminder.install
deleted file mode 100644
index ecacf6437..000000000
--- a/pcr/zoneminder-libav/zoneminder.install
+++ /dev/null
@@ -1,185 +0,0 @@
-pre_install() {
- set -e
- abort=false
- if [ -L /srv/http/zoneminder/events ]; then
- l=$(readlink /srv/http/zoneminder/events)
- if [ $l != /var/cache/zoneminder/events ]; then
- abort=true
- fi
- fi
- if [ -L /srv/http/zoneminder/images ]; then
- l=$(readlink /srv/http/zoneminder/images)
- if [ $l != /var/cache/zoneminder/images ]; then
- abort=true
- fi
- fi
- if [ $abort = true ]; then
- cat >&2 << EOF
-Aborting installation of zoneminder due to non-default symlinks in
-/srv/http/zoneminder for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
-EOF
- exit 1
- fi
- exit 0
-}
-
-post_install() {
- if [[ -d /var/log/zoneminder ]]; then
- chmod 0755 /var/log/zoneminder
- chown http.http /var/log/zoneminder
- else
- mkdir -m 0755 /var/log/zoneminder
- chown http.http /var/log/zoneminder
- fi
- if [[ -d /tmp/zoneminder ]]; then
- chmod 0700 /tmp/zoneminder
- chown http.http /tmp/zoneminder
- else
- mkdir -m 0700 /tmp/zoneminder
- chown http.http /tmp/zoneminder
- fi
- sed -i -e '
- /^;extension=mysql.so/ s/^;//;
- /^#extension=mysql.so/ s/^#//;
- /^;extension=mysqli.so/ s/^;//;
- /^#extension=mysqli.so/ s/^#//;
- /^;extension=gd.so/ s/^;//;
- /^#extension=gd.so/ s/^#//;
- /^;extension=gettext.so/ s/^;//;
- /^#extension=gettext.so/ s/^#//;
- /^;extension=mcrypt.so/ s/^;//;
- /^#extension=mcrypt.so/ s/^#//;
- /^;extension=session.so/ s/^;//;
- /^#extension=session.so/ s/^#//;
- /^;extension=sockets.so/ s/^;//;
- /^#extension=sockets.so/ s/^#//;
- /^;extension=openssl.so/ s/^;//;
- /^#extension=openssl.so/ s/^#//;
- /^;extension=ftp.so/ s/^;//;
- /^#extension=ftp.so/ s/^#//;
- /^;extension=zip.so/ s/^;//;
- /^#extension=zip.so/ s/^#//;
- /^;open_basedir/ s/^;//;
- /^#open_basedir/ s/^#//;
- /^open_basedir/ s/:\/etc//;
- /^open_basedir/ s/:\/etc\///;
- /^open_basedir/ s/$/:\/etc/;
- /^open_basedir/ s/:\/srv\/http\/zoneminder//;
- /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
- /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
- /^open_basedir/ s/:\/var\/cache\/zoneminder//;
- /^open_basedir/ s/:\/var\/cache\/zoneminder\///;
- /^open_basedir/ s/$/:\/var\/cache\/zoneminder/;
- ' /etc/php/php.ini || read
- sed -i -e '
- /^LoadModule php5_module modules\/libphp5.so/d;
- /^LoadModule rewrite_module modules\/mod_rewrite.so/ s/$/\nLoadModule php5_module modules\/libphp5.so/;
- /^# PHP 5/d;
- /^# ZoneMinder/d;
- /^Include \/etc\/httpd\/conf\/extra\/php5_module.conf/d;
- /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
- /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/;
- ' /etc/httpd/conf/httpd.conf || read
- gpasswd -a http video
- cat << EOF
-Note for mysql:
-==> To run Zoneminder, you must install the database running mysql service (as root):
-==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd)
-==> and add Zoneminder database typing (with passsword):
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload"
-==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p"
-==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
-==> (or without passsword):
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f reload"
-==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf"
-==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
-
-Note for php:
-==> You must uncomment that line in /etc/php/php.ini:
-==> "extension=mysql.so"
-==> check and make sure these are uncommented:
-==> "extension=gd.so"
-==> "extension=gettext.so"
-==> "extension=mcrypt.so"
-==> "extension=mysqli.so"
-==> "extension=session.so"
-==> "extension=sockets.so"
-==> "extension=openssl.so"
-==> "extension=ftp.so"
-==> "extension=zip.so"
-==> check and add to open_basedir "/etc",
-==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so
-==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder"
-==> and set your timezone in php.ini:
-==> "date.timezone = <your_zone>/<your_city>"
-
-Note for apache:
-==> You must edit /etc/httpd/conf/httpd.conf and add the line:
-==> "LoadModule php5_module modules/libphp5.so"
-==> and:
-==> "Include /etc/httpd/conf/extra/php5_module.conf"
-==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
-EOF
-}
-
-post_upgrade() {
- post_install
- /usr/bin/zmupdate.pl -f >/dev/null
-}
-
-post_remove() {
- if [[ -d /tmp/zoneminder ]]; then
- rm -vr /tmp/zoneminder
- fi
- sed -i -e '
- /^open_basedir/ s/:\/srv\/http\/zoneminder//;
- /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
- /^open_basedir/ s/:\/var\/cache\/zoneminder\///
- ' /etc/php/php.ini || read
- sed -i -e '
- /^# ZoneMinder/d;
- /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
- ' /etc/httpd/conf/httpd.conf || read
- cat << EOF
-Note:
-==> To clean Zoneminder mysql database, run as root (with password):
-==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
-==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f drop zm"
-==> (or without password):
-==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
-==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f drop zm"
-
-==> Disable http with php if it isn't needed with others servers,
-==> comment or remove that lines in /etc/httpd/conf/httpd.conf:
-==> "LoadModule php5_module modules/libphp5.so"
-==> "Include /etc/httpd/conf/extra/php5_module.conf"
-
-==> Remove line in /etc/httpd/conf/httpd.conf:
-==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
-
-==> Disable php with mysql if it isn't needed with others servers,
-==> comment that lines in /etc/php/php.ini:
-==> "extension=mysql.so"
-==> "extension=gd.so"
-==> "extension=gettext.so"
-==> "extension=mcrypt.so"
-==> "extension=mysqli.so"
-==> "extension=session.so"
-==> "extension=sockets.so"
-==> "date.timezone = <my_zone>/<my_city>"
-
-==> Drop http user on video group if it isn't needed with others servers:
-==> gpasswd -d http video
-
-==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder"
-==> in the "open_basedir".
-
-==> Remove log files and "zonemider" directory in "/var/log/zoneminder".
-
-==> Backup and remove "events", "images" and "temp" dirs in "/var/cache/zoneminder".
-EOF
-}
diff --git a/pcr/zoneminder-libav/zoneminder.service b/pcr/zoneminder-libav/zoneminder.service
deleted file mode 100644
index 05cae6f91..000000000
--- a/pcr/zoneminder-libav/zoneminder.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Capture, analyse, record and monitor video security cameras
-After=network.target remote-fs.target
-Required=mysqld.service
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/zmpkg.pl start
-ExecRestart=/usr/bin/zmpkg.pl restart
-ExecStop=/usr/bin/zmpkg.pl stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/zoneminder-lts/PKGBUILD b/pcr/zoneminder-lts/PKGBUILD
deleted file mode 100644
index 1ae9441d2..000000000
--- a/pcr/zoneminder-lts/PKGBUILD
+++ /dev/null
@@ -1,210 +0,0 @@
-# Maintainer: Vojtech Aschenbrenner <v@asch.cz>
-# Contributor: Jason Gardner <buhrietoe@gmail.com>
-# Contributor: Ross melin <rdmelin@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
-
-# based of debian squeeze package
-
-pkgbase=zoneminder
-pkgname=zoneminder-lts
-pkgver=1.24.4
-pkgrel=1
-pkgdesc='Capture, analyse, record and monitor video security cameras'
-arch=(
- i686
- x86_64
- mips64el
-)
-backup=(
- etc/zm.conf
-)
-url="http://www.$pkgbase.com"
-license=(
- GPL
-)
-depends=(
- apache
- cambozola
- ffmpeg-static
- gnutls
- mysql
- perl-archive-zip
- perl-date-manip
- perl-dbd-mysql
- perl-dbi
- perl-expect
- perl-libwww
- perl-mime-lite
- perl-mime-tools
- perl-php-serialization
- perl-net-sftp-foreign
- perl-sys-mmap
- perl-time-modules
- perl-x10
- php
- php-apache
- php-gd
- php-mcrypt
-)
-makedepends=(
- netpbm
-)
-optdepends=(
- netpbm
-)
-provides=(
- $pkgbase
-)
-conflicts=(
- $pkgbase
-)
-install=$pkgbase.install
-source=(
- http://www.$pkgbase.com/downloads/ZoneMinder-$pkgver.tar.gz
- httpd-$pkgbase.conf
- $pkgbase
- $pkgbase.service
- patch-ffmpeg-0.11.patch
-)
-sha512sums=(
- 8bf01f029a8fbc140bfb73f3909057ee09c2439397773953da143218fe13d137b6fae61e3f46e3cbf6824ffe39329bba59eec767e57278e2dfbfbc630772ef5d
- 4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
- ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
- cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
- 382799ad6add1632d934544230520f942dae37913b58cfa19e0cb2b11e7002267b1fdb9aa535f2217bcccf0c85c4d754f316dc3980a3ca267e5b3f5500536024
-)
-
-build() {
- cd $srcdir/ZoneMinder-$pkgver
-
- # ZM_RUNDIR need change to run dir
- export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
- ZM_LOGDIR=/var/log/$pkgbase\
- ZM_RUNDIR=/tmp/$pkgbase\
- ZM_SSL_LIB=gnutls\
- ZM_TMPDIR=/tmp/$pkgbase
-
- # Patch for GCC 4.7.x
- #sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
- # src/zm_logger.cpp || read
- sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/'\
- src/zm_thread.h || read
-
- # Patch for automake 1.12
- sed -i -e '/am__api_version=/ s/1.11/1.12/'\
- configure || read
-
- # Patch for disable ZM_CHECK_FOR_UPDATES
- sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/'\
- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
- # 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/'\
- 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
-
- # Patch for change ZM name to ZoneMinder
- sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\
- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
- # Patch for v4l2 convert support
- sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l2convert.so\' ;/"\
- scripts/zmdc.pl.in || read
-
- # Patch for add more socket tries
- sed -i -e '/$max_socket_tries/ s/3/15/'\
- web/ajax/stream.php || read
-
- # Patch for wrong "suppported"
- sed -i -e 's/suppported/supported/'\
- src/zm_local_camera.cpp || read
-
- # Patch for type cast in linux-libre kernel 3.5
- sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\
- src/zm_local_camera.cpp || read
-
- # Patch for drop custom perl install paths
- sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d;
- 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>/'\
- src/zm_ffmpeg.h
- sed -i -e 's/^AM_CONFIG_HEADER(config.h)/AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])/;
- s/^AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)/AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])/;
- s/^AC_CHECK_HEADERS(libswscale\/swscale.h,,,)/AC_CHECK_HEADERS(libswscale\/swscale.h,,,)\nAC_LANG_POP([C])/'\
- configure.ac
-
- # Patch for wrong install run, tmp and log dir
- sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d;
- / ( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d;
- / ( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d;
- / ( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d;
- / ( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d'\
- Makefile.{am,in}
-
- ./configure --prefix=/usr\
- --enable-crashtrace=no\
- --enable-debug=no\
- --enable-mmap=yes\
- --sysconfdir=/etc\
- --with-cgidir=/srv/http/cgi-bin\
- --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\
- --with-ffmpeg=/usr\
- --with-libarch=lib\
- --with-mysql=/usr\
- --with-webdir=/srv/http/$pkgbase\
- --with-webgroup=http\
- --with-webhost=localhost\
- --with-webuser=http
-
- make V=0
-}
-
-package() {
- cd $srcdir/ZoneMinder-$pkgver
-
- make DESTDIR=$pkgdir install
-
- 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/$pkgbase,log/$pkgbase}}
- chmod 0700 $pkgdir/etc/zm.conf
-
- for i in events images temp; do
- 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/$pkgbase
- chown -h http.http $pkgdir/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin}
-
- ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgbase
-
- 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-lts/httpd-zoneminder.conf b/pcr/zoneminder-lts/httpd-zoneminder.conf
deleted file mode 100644
index aeb089bc1..000000000
--- a/pcr/zoneminder-lts/httpd-zoneminder.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# /etc/httpd/conf/extra/httpd-zm.conf
-# Config for zoneminder web app
-
-Alias /zm "/srv/http/zoneminder"
-<Directory "/srv/http/zoneminder">
- Options -Indexes MultiViews FollowSymLinks
- AllowOverride None
- Order allow,deny
- Allow from all
- # The code unfortunately uses short tags in many places
- php_value short_open_tag On
-</Directory>
-
-ScriptAlias /cgi-bin "/srv/http/cgi-bin"
-<Directory "/srv/http/cgi-bin">
- AllowOverride None
- Options ExecCGI FollowSymLinks
- Order allow,deny
- Allow from all
-</Directory>
diff --git a/pcr/zoneminder-lts/patch-ffmpeg-0.11.patch b/pcr/zoneminder-lts/patch-ffmpeg-0.11.patch
deleted file mode 100644
index ac56e4c69..000000000
--- a/pcr/zoneminder-lts/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 )
diff --git a/pcr/zoneminder-lts/zoneminder b/pcr/zoneminder-lts/zoneminder
deleted file mode 100644
index c4cbf4d3f..000000000
--- a/pcr/zoneminder-lts/zoneminder
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-daemon_name=zm
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting Zoneminder"
- /usr/bin/zmfix -a
- if /usr/bin/zmpkg.pl start >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping Zoneminder"
- if /usr/bin/zmpkg.pl stop >/dev/null ; then
- rm_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- reload)
- stat_busy "Reloading Zoneminder"
- if /usr/bin/zmpkg.pl graceful >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- restart)
- stat_busy "Restarting Zoneminder"
- if /usr/bin/zmpkg.pl restart >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- status)
- stat_busy "Checking Zoneminder status";
- ck_status $daemon_name
- ;;
-
- *)
- echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/pcr/zoneminder-lts/zoneminder.install b/pcr/zoneminder-lts/zoneminder.install
deleted file mode 100644
index ecacf6437..000000000
--- a/pcr/zoneminder-lts/zoneminder.install
+++ /dev/null
@@ -1,185 +0,0 @@
-pre_install() {
- set -e
- abort=false
- if [ -L /srv/http/zoneminder/events ]; then
- l=$(readlink /srv/http/zoneminder/events)
- if [ $l != /var/cache/zoneminder/events ]; then
- abort=true
- fi
- fi
- if [ -L /srv/http/zoneminder/images ]; then
- l=$(readlink /srv/http/zoneminder/images)
- if [ $l != /var/cache/zoneminder/images ]; then
- abort=true
- fi
- fi
- if [ $abort = true ]; then
- cat >&2 << EOF
-Aborting installation of zoneminder due to non-default symlinks in
-/srv/http/zoneminder for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
-EOF
- exit 1
- fi
- exit 0
-}
-
-post_install() {
- if [[ -d /var/log/zoneminder ]]; then
- chmod 0755 /var/log/zoneminder
- chown http.http /var/log/zoneminder
- else
- mkdir -m 0755 /var/log/zoneminder
- chown http.http /var/log/zoneminder
- fi
- if [[ -d /tmp/zoneminder ]]; then
- chmod 0700 /tmp/zoneminder
- chown http.http /tmp/zoneminder
- else
- mkdir -m 0700 /tmp/zoneminder
- chown http.http /tmp/zoneminder
- fi
- sed -i -e '
- /^;extension=mysql.so/ s/^;//;
- /^#extension=mysql.so/ s/^#//;
- /^;extension=mysqli.so/ s/^;//;
- /^#extension=mysqli.so/ s/^#//;
- /^;extension=gd.so/ s/^;//;
- /^#extension=gd.so/ s/^#//;
- /^;extension=gettext.so/ s/^;//;
- /^#extension=gettext.so/ s/^#//;
- /^;extension=mcrypt.so/ s/^;//;
- /^#extension=mcrypt.so/ s/^#//;
- /^;extension=session.so/ s/^;//;
- /^#extension=session.so/ s/^#//;
- /^;extension=sockets.so/ s/^;//;
- /^#extension=sockets.so/ s/^#//;
- /^;extension=openssl.so/ s/^;//;
- /^#extension=openssl.so/ s/^#//;
- /^;extension=ftp.so/ s/^;//;
- /^#extension=ftp.so/ s/^#//;
- /^;extension=zip.so/ s/^;//;
- /^#extension=zip.so/ s/^#//;
- /^;open_basedir/ s/^;//;
- /^#open_basedir/ s/^#//;
- /^open_basedir/ s/:\/etc//;
- /^open_basedir/ s/:\/etc\///;
- /^open_basedir/ s/$/:\/etc/;
- /^open_basedir/ s/:\/srv\/http\/zoneminder//;
- /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
- /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
- /^open_basedir/ s/:\/var\/cache\/zoneminder//;
- /^open_basedir/ s/:\/var\/cache\/zoneminder\///;
- /^open_basedir/ s/$/:\/var\/cache\/zoneminder/;
- ' /etc/php/php.ini || read
- sed -i -e '
- /^LoadModule php5_module modules\/libphp5.so/d;
- /^LoadModule rewrite_module modules\/mod_rewrite.so/ s/$/\nLoadModule php5_module modules\/libphp5.so/;
- /^# PHP 5/d;
- /^# ZoneMinder/d;
- /^Include \/etc\/httpd\/conf\/extra\/php5_module.conf/d;
- /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
- /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/;
- ' /etc/httpd/conf/httpd.conf || read
- gpasswd -a http video
- cat << EOF
-Note for mysql:
-==> To run Zoneminder, you must install the database running mysql service (as root):
-==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd)
-==> and add Zoneminder database typing (with passsword):
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload"
-==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p"
-==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
-==> (or without passsword):
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f reload"
-==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf"
-==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
-
-Note for php:
-==> You must uncomment that line in /etc/php/php.ini:
-==> "extension=mysql.so"
-==> check and make sure these are uncommented:
-==> "extension=gd.so"
-==> "extension=gettext.so"
-==> "extension=mcrypt.so"
-==> "extension=mysqli.so"
-==> "extension=session.so"
-==> "extension=sockets.so"
-==> "extension=openssl.so"
-==> "extension=ftp.so"
-==> "extension=zip.so"
-==> check and add to open_basedir "/etc",
-==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so
-==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder"
-==> and set your timezone in php.ini:
-==> "date.timezone = <your_zone>/<your_city>"
-
-Note for apache:
-==> You must edit /etc/httpd/conf/httpd.conf and add the line:
-==> "LoadModule php5_module modules/libphp5.so"
-==> and:
-==> "Include /etc/httpd/conf/extra/php5_module.conf"
-==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
-EOF
-}
-
-post_upgrade() {
- post_install
- /usr/bin/zmupdate.pl -f >/dev/null
-}
-
-post_remove() {
- if [[ -d /tmp/zoneminder ]]; then
- rm -vr /tmp/zoneminder
- fi
- sed -i -e '
- /^open_basedir/ s/:\/srv\/http\/zoneminder//;
- /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
- /^open_basedir/ s/:\/var\/cache\/zoneminder\///
- ' /etc/php/php.ini || read
- sed -i -e '
- /^# ZoneMinder/d;
- /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
- ' /etc/httpd/conf/httpd.conf || read
- cat << EOF
-Note:
-==> To clean Zoneminder mysql database, run as root (with password):
-==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
-==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f drop zm"
-==> (or without password):
-==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
-==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f drop zm"
-
-==> Disable http with php if it isn't needed with others servers,
-==> comment or remove that lines in /etc/httpd/conf/httpd.conf:
-==> "LoadModule php5_module modules/libphp5.so"
-==> "Include /etc/httpd/conf/extra/php5_module.conf"
-
-==> Remove line in /etc/httpd/conf/httpd.conf:
-==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
-
-==> Disable php with mysql if it isn't needed with others servers,
-==> comment that lines in /etc/php/php.ini:
-==> "extension=mysql.so"
-==> "extension=gd.so"
-==> "extension=gettext.so"
-==> "extension=mcrypt.so"
-==> "extension=mysqli.so"
-==> "extension=session.so"
-==> "extension=sockets.so"
-==> "date.timezone = <my_zone>/<my_city>"
-
-==> Drop http user on video group if it isn't needed with others servers:
-==> gpasswd -d http video
-
-==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder"
-==> in the "open_basedir".
-
-==> Remove log files and "zonemider" directory in "/var/log/zoneminder".
-
-==> Backup and remove "events", "images" and "temp" dirs in "/var/cache/zoneminder".
-EOF
-}
diff --git a/pcr/zoneminder-lts/zoneminder.service b/pcr/zoneminder-lts/zoneminder.service
deleted file mode 100644
index 05cae6f91..000000000
--- a/pcr/zoneminder-lts/zoneminder.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Capture, analyse, record and monitor video security cameras
-After=network.target remote-fs.target
-Required=mysqld.service
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/zmpkg.pl start
-ExecRestart=/usr/bin/zmpkg.pl restart
-ExecStop=/usr/bin/zmpkg.pl stop
-
-[Install]
-WantedBy=multi-user.target
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 )