summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD5
2 files changed, 6 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8fba7b9e5d7e..ed6126530bc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Thu Feb 18 17:43:13 UTC 2016
pkgbase = h264enc
- pkgdesc = Advanced shell script for encoding DVDs or video files to the H.264 format using the encoding utility MEncoder from MPlayer.
+ pkgdesc = Advanced shell script for encoding DVDs or video files to H.264 format using encoding utility MEncoder
pkgver = 10.4.7
- pkgrel = 1
+ pkgrel = 2
url = http://h264enc.sourceforge.net/
install = h264enc.install
arch = any
@@ -25,9 +23,9 @@ pkgbase = h264enc
optdepends = vorbis-tools
optdepends = dcaenc
optdepends = opus-tools
+ conflicts = openh264
options = !strip
source = http://sf.net/projects/h264enc/files/h264enc/h264enc-10.4.7.tar.gz
sha1sums = f10d8957306ed968c5b09662e6e5fad2f3feca37
pkgname = h264enc
-
diff --git a/PKGBUILD b/PKGBUILD
index f82a949af94a..f6bfd35bfb5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,15 @@
pkgname=h264enc
pkgver=10.4.7
-pkgrel=1
-pkgdesc="Advanced shell script for encoding DVDs or video files to the H.264 format using the encoding utility MEncoder from MPlayer."
+pkgrel=2
+pkgdesc="Advanced shell script for encoding DVDs or video files to H.264 format using encoding utility MEncoder"
arch=('any')
url='http://h264enc.sourceforge.net/'
license=('GPL')
depends=('x264' 'lsdvd' 'lame' 'bc' 'mencoder')
optdepends=('mkvtoolnix' 'gpac' 'ogmtools' 'mplayer' 'pv' 'neroaacenc' 'vo-aacenc' 'aacplusenc' 'tsmuxer' 'vorbis-tools' 'dcaenc' 'opus-tools')
options=(!strip)
+conflicts=(openh264)
install="${pkgname}.install"
source=("http://sf.net/projects/h264enc/files/$pkgname/$pkgname-$pkgver.tar.gz")