bump

2 files changed, 33 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8c2d79a4925..a38e73f1402c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = openh264-git
 	pkgdesc = OpenH264 is a codec library which supports H.264 encoding and decoding. (GIT version)
-	pkgver = 2.2.0.r5154.33c65463
+	pkgver = 2.3.0.r5206.045aeac1
 	pkgrel = 1
 	url = http://www.openh264.org
 	arch = x86_64
 	arch = armv6h
 	arch = armv7h
 	license = BSD
+	checkdepends = gtest
 	makedepends = git
 	makedepends = nasm
+	makedepends = meson
 	provides = libopenh264.so
-	provides = openh264=2.2.0.r5154.33c65463
+	provides = openh264=2.3.0.r5206.045aeac1
 	conflicts = openh264
 	source = git+https://github.com/cisco/openh264.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 2ab4b2e011a4..28c6023fba29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: sekret, mail=$(echo c2VrcmV0QHBvc3Rlby5zZQo= | base64 -d)
 
 pkgname=openh264-git
-pkgver=2.2.0.r5154.33c65463
+pkgver=2.3.0.r5206.045aeac1
 pkgrel=1
 pkgdesc='OpenH264 is a codec library which supports H.264 encoding and decoding. (GIT version)'
 arch=('x86_64' 'armv6h' 'armv7h')
@@ -10,28 +10,47 @@ url='http://www.openh264.org'
 license=('BSD')
 makedepends=('git'
              'nasm'
+             'meson'
              )
+checkdepends=('gtest')
 provides=('libopenh264.so'
           "openh264=${pkgver}")
 conflicts=('openh264')
-source=('git+https://github.com/cisco/openh264.git')
-sha256sums=('SKIP')
+source=('git+https://github.com/cisco/openh264.git'
+        'esee'
+        )
+sha256sums=('SKIP'
+            '83978429d53f118f685fc6921ac42cce2d04fb9eb2143f270a11e39702a8bea7'
+            )
 
 pkgver() {
   cd openh264
-  _ver="$(cat codec/api/svc/codec_ver.h | grep -m3 -e 'OPENH264_MAJOR' -e 'OPENH264_MINOR' -e 'OPENH264_REVISION' | sed 's|OPENH264|OPENHTWOSIXFOUR|g' | grep -o "[[:digit:]]*" | paste -sd'.')"
+  _ver="$(cat codec/api/wels/codec_ver.h | grep -m3 -e 'OPENH264_MAJOR' -e 'OPENH264_MINOR' -e 'OPENH264_REVISION' | sed 's|OPENH264|OPENHTWOSIXFOUR|g' | grep -o "[[:digit:]]*" | paste -sd'.')"
   echo "${_ver}.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  patch -d openh264 -p1 -i "${srcdir}/esee"
+}
+
 build() {
-  make -C openh264 PREFIX="/usr"
+  arch-meson openh264 build
+  meson compile -C build
 }
 
-package() {
+_check() {
+  ( cd openh264/test/encoder_binary_comparison ; CFLAGS=-Werror ./run_PrepareAllTestData.sh 64 )
+  meson test -C build -v
   cd openh264
-  make DESTDIR="${pkgdir}" PREFIX="/usr" install
-  install -Dm755 h264dec "$pkgdir/usr/bin/h264dec"
-  install -Dm755 h264enc "$pkgdir/usr/bin/h264enc"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  ./run_Test.sh BinaryCompare BA_MW_D.264
+  ./run_Test.sh BinaryCompare Adobe_PDF_sample_a_1024x768_50Frms.264
+  ./run_Test.sh BinaryCompare Zhling_1280x720.264
+  }
+
+package() {
+
+  DESTDIR="${pkgdir}" meson install -C build
+
+  install -Dm644 openh264/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }