Merge branch 'refs/heads/devel'

ffmpeg/libfdk_aac/PKGBUILD

@@ -0,0 +1,101 @@
+# Maintainer: Ben Widawsky <ben@bwidawsk.net>
+# Contributor: Rob McCathie <korrode at gmail>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Paul Mattal <paul@archlinux.org>
+# Contributor: Martchus <martchus@gmx.net>
+
+_name=ffmpeg
+pkgname=ffmpeg-libfdk_aac
+pkgver=2.8.6
+pkgrel=1
+epoch=1
+pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
+arch=('i686' 'x86_64')
+url='http://ffmpeg.org/'
+license=('GPL3' 'custom:libfdk-aac')
+depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame'
+         'libass' 'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh'
+         'libtheora' 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg'
+         'opus' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib'
+         'libdcadec.so' 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so'
+         'libvpx.so' 'libx264.so' 'libx265.so'
+	 'libfdk-aac')
+makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm')
+optdepends=('ladspa: LADSPA filters')
+provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
+          'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
+          'libswscale.so'
+          "ffmpeg=$pkgver")
+conflicts=("$_name")
+source=(http://ffmpeg.org/releases/$_name-$pkgver.tar.bz2{,.asc})
+validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
+sha256sums=('40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62'
+            'SKIP')
+
+build() {
+  cd $_name-$pkgver
+
+  ./configure \
+    --prefix='/usr' \
+    --disable-debug \
+    --disable-static \
+    --disable-stripping \
+    --enable-avisynth \
+    --enable-avresample \
+    --enable-fontconfig \
+    --enable-gnutls \
+    --enable-gpl \
+    --enable-ladspa \
+    --enable-libass \
+    --enable-libbluray \
+    --enable-libdcadec \
+    --enable-libfreetype \
+    --enable-libfribidi \
+    --enable-libgsm \
+    --enable-libmodplug \
+    --enable-libmp3lame \
+    --enable-libopencore_amrnb \
+    --enable-libopencore_amrwb \
+    --enable-libopenjpeg \
+    --enable-libopus \
+    --enable-libpulse \
+    --enable-libschroedinger \
+    --enable-libsoxr \
+    --enable-libspeex \
+    --enable-libssh \
+    --enable-libtheora \
+    --enable-libv4l2 \
+    --enable-libvidstab \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libwebp \
+    --enable-libx264 \
+    --enable-libx265 \
+    --enable-libxvid \
+    --enable-shared \
+    --enable-version3 \
+    --enable-x11grab \
+    --enable-libfdk_aac \
+    --enable-nonfree
+
+  make
+  make tools/qt-faststart
+  make doc/ff{mpeg,play,server}.1
+
+  cp /usr/share/licenses/libfdk-aac/NOTICE .
+}
+
+package() {
+  cd $_name-$pkgver
+
+  make DESTDIR="${pkgdir}" install install-man
+  install -Dm 755 tools/qt-faststart "${pkgdir}"/usr/bin/
+
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  install -m 0644 NOTICE "$pkgdir/usr/share/licenses/$pkgname/NOTICE"
+}
+
+# vim: ts=2 sw=2 et:

ffmpeg/mingw-w64/PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=mingw-w64-ffmpeg
-pkgver=2.8.4
+pkgver=2.8.6
 pkgrel=1
 epoch=1
 pkgdesc="Complete solution to record, convert and stream audio and video (mingw-w64)"
@@ -17,7 +17,7 @@ options=(!strip !buildflags staticlibs)
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'yasm')
 source=(http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2{,.asc})
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
-sha256sums=('83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e'
+sha256sums=('40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62'
             'SKIP')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 

isoviewer/default/PKGBUILD

@@ -1,22 +1,24 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
 pkgname=isoviewer
-pkgver=1.0.7
+pkgver=1.11
 pkgrel=1
 epoch=1
 arch=('any')
-pkgdesc="MP4/ISO Viewer"
-license=
+pkgdesc="GUI application to have closer look ISO 14496-12 and other MP4 files."
+url="https://github.com/sannies/$pkgname"
+license=('Apache')
 depends=('java-environment')
 makedepends=
 install=${pkgname}.install
-url=
-source=("$pkgname-$pkgver.jar::https://github.com/sannies/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.jar"
+source=("$pkgname-$pkgver.jar::https://github.com/sannies/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver-SNAPSHOT.jar"
         "${pkgname}.sh"
         "${pkgname}.desktop"
         "${pkgname}.install")
-md5sums=('a80b0b052bf4db529d9342da9a950b3f'
+md5sums=('1acb73c35d689a7c8ce43f5c977a9c1c'
          '46a45db34de39faf0c96b14b7a8b3b0a'
          '27af8fee869cccf25921bbeb14e9c17e'
-         'dddc76d48a27c97823c3f95131772a01')
+         'd02e1f3a7dc68114156695e1601975c0')
 
 package() {
   cd $srcdir

pkgbuilds.pro

@@ -43,6 +43,8 @@ OTHER_FILES += \
     mkvtoolnix/git/mkvtoolnix.install \
     isoviewer/default/PKGBUILD \
     isoviewer/default/isoviewer.install \
+    isoviewer/default/isoviewer.desktop \
+    isoviewer/default/isoviewer.sh \
     dbus-soundrecorder/default/PKGBUILD \
     subtitlecomposer/default/PKGBUILD \
     subtitlecomposer/git/PKGBUILD \
@@ -82,6 +84,7 @@ OTHER_FILES += \
     filezilla/mingw-w64-svn/PKGBUILD \
     libfilezilla/svn/PKGBUILD \
     libfilezilla/mingw-w64-svn/PKGBUILD \
+    ffmpeg/libfdk_aac/PKGBUILD \
     ffmpeg/libfdk_aac-git/PKGBUILD \
     ffmpeg/mingw-w64/PKGBUILD \
     x264/mingw-w64/PKGBUILD \