Add jack. https url. Drop avresample. Do not rename source clone.

2 files changed, 25 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f78b30bbf884..74a132635cae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = ffmpeg-git
 	pkgdesc = Complete solution to record, convert and stream audio and video (git version)
-	pkgver = 4.1.r92189.g41ed2c3849
+	pkgver = 4.2.r92394.g75625c555c
 	pkgrel = 1
-	url = http://www.ffmpeg.org/
+	url = https://www.ffmpeg.org/
 	arch = i686
 	arch = x86_64
 	license = GPL3
@@ -19,6 +19,7 @@ pkgbase = ffmpeg-git
 	depends = gmp
 	depends = gnutls
 	depends = gsm
+	depends = jack
 	depends = lame
 	depends = libavc1394
 	depends = libdrm
@@ -63,14 +64,13 @@ pkgbase = ffmpeg-git
 	provides = libavdevice.so
 	provides = libavfilter.so
 	provides = libavformat.so
-	provides = libavresample.so
 	provides = libavutil.so
 	provides = libpostproc.so
 	provides = libswresample.so
 	provides = libswscale.so
 	provides = ffmpeg
 	conflicts = ffmpeg
-	source = ffmpeg-git::git://source.ffmpeg.org/ffmpeg.git
+	source = git://source.ffmpeg.org/ffmpeg.git
 	sha256sums = SKIP
 
 pkgname = ffmpeg-git
diff --git a/PKGBUILD b/PKGBUILD
index 5d7e6f8327da..9b8cff9f3c62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,41 +4,46 @@
 # Contributor: DrZaius <lou at fakeoutdoorsman.com>
 
 pkgname=ffmpeg-git
-pkgver=4.1.r92189.g41ed2c3849
+_srcname=ffmpeg
+pkgver=4.2.r92394.g75625c555c
 pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (git version)'
 arch=('i686' 'x86_64')
-url='http://www.ffmpeg.org/'
+url='https://www.ffmpeg.org/'
 license=('GPL3')
 depends=('alsa-lib' 'aom' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
-         'lame' 'libavc1394' 'libdrm' 'libiec61883' 'libmodplug' 'libomxil-bellagio'
-         'libpulse' 'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libvdpau' 'libwebp'
-         'libx11' 'libxcb' 'libxext' 'libxml2' 'libxv' 'opencore-amr' 'openjpeg2'
-         'opus' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib'
+         'jack' 'lame' 'libavc1394' 'libdrm' 'libiec61883' 'libmodplug'
+         'libomxil-bellagio' 'libpulse' 'libraw1394' 'libsoxr' 'libssh' 'libtheora'
+         'libvdpau' 'libwebp' 'libx11' 'libxcb' 'libxext' 'libxml2' 'libxv'
+         'opencore-amr' 'openjpeg2' 'opus' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib'
          'libass.so' 'libbluray.so' 'libfreetype.so' 'libva-drm.so' 'libva.so'
          'libva-x11.so' 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so'
          'libx264.so' 'libx265.so' 'libxvidcore.so')
 makedepends=('git' 'ffnvcodec-headers' 'ladspa' 'nasm')
 optdepends=('ladspa: LADSPA filters')
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
-          'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
-          'libswscale.so' 'ffmpeg')
+          'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so'
+          'ffmpeg')
 conflicts=('ffmpeg')
-source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
+source=('git://source.ffmpeg.org/ffmpeg.git')
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "$pkgname"
+    cd "$_srcname"
     
-    local _version="$(  git describe  --tags --long      | awk -F'-' '{ printf $1 }' | sed 's/^n//')"
-    local _revision="$( git describe  --tags --match 'N' | awk -F'-' '{ printf $2 }')"
-    local _shorthash="$(git rev-parse --short HEAD)"
+    local _version
+    local _revision
+    local _shorthash
+    
+    _version="$(  git describe  --tags --long      | awk -F'-' '{ printf $1 }' | sed 's/^n//')"
+    _revision="$( git describe  --tags --match 'N' | awk -F'-' '{ printf $2 }')"
+    _shorthash="$(git rev-parse --short HEAD)"
     
     printf '%s.r%s.g%s' "$_version" "$_revision" "$_shorthash"
 }
 
 build() {
-    cd "$pkgname"
+    cd "$_srcname"
     
     printf '%s\n' '  -> Running ffmpeg configure script...'
     
@@ -47,7 +52,6 @@ build() {
         --disable-debug \
         --disable-static \
         --disable-stripping \
-        --enable-avresample \
         --enable-fontconfig \
         --enable-gmp \
         --enable-gnutls \
@@ -61,6 +65,7 @@ build() {
         --enable-libfribidi \
         --enable-libgsm \
         --enable-libiec61883 \
+        --enable-libjack \
         --enable-libmodplug \
         --enable-libmp3lame \
         --enable-libopencore_amrnb \
@@ -93,7 +98,7 @@ build() {
 }
 
 package() {
-    cd "$pkgname"
+    cd "$_srcname"
     
     make DESTDIR="$pkgdir" install