update to 3.0

3 files changed, 17 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c69eeb2cb619..d6e0e9455bb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,14 @@
-# Generated by mksrcinfo v8
-# Sun Sep 10 15:53:20 UTC 2017
 pkgbase = heif
 	pkgdesc = High Efficiency Image File Format
-	pkgver = 2.0
-	pkgrel = 2
+	pkgver = 3.0
+	pkgrel = 1
 	url = https://nokiatech.github.io/heif/
 	arch = x86_64
 	arch = i686
 	license = custom
 	makedepends = cmake
-	source = git://github.com/nokiatech/heif.git#tag=v2.0
-	source = gcc7.patch
-	sha512sums = SKIP
-	sha512sums = b61a9d77f420c11acbf4e71f634deace2a7c27042e327989c1d394a30a58ea1d7465f57219b209449de91b18f4a2da100a13ef992d6b35dc43156fdd8f6e17a1
+	source = https://github.com/nokiatech/heif/archive/v3.0.tar.gz
+	sha512sums = 38450162cad7f276a57dabf0984d2a43ba697c4464ea200c36a9793c0fd491d66bbe8ff143cf0b9239851190b4d4b6a3e3d724b05ee64a2031bd3c52125399a4
 
 pkgname = heif
 
diff --git a/PKGBUILD b/PKGBUILD
index 140252c8d174..aaba7b30e2fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,29 @@
 # Maintainer: Frederik Schwan <frederik dot schwan at linux dot com>
 
 pkgname=heif
-pkgver=2.0
-pkgrel=2
+pkgver=3.0
+pkgrel=1
 pkgdesc='High Efficiency Image File Format'
 arch=('x86_64' 'i686')
 url='https://nokiatech.github.io/heif/'
 license=('custom')
 makedepends=('cmake')
-source=("git://github.com/nokiatech/heif.git#tag=v${pkgver}"
-        'gcc7.patch')
-sha512sums=('SKIP'
-            'b61a9d77f420c11acbf4e71f634deace2a7c27042e327989c1d394a30a58ea1d7465f57219b209449de91b18f4a2da100a13ef992d6b35dc43156fdd8f6e17a1')
+source=("https://github.com/nokiatech/heif/archive/v${pkgver}.tar.gz")
+sha512sums=('38450162cad7f276a57dabf0984d2a43ba697c4464ea200c36a9793c0fd491d66bbe8ff143cf0b9239851190b4d4b6a3e3d724b05ee64a2031bd3c52125399a4')
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    patch -p1 < "${srcdir}/gcc7.patch"
-    cmake .
+    cd "${srcdir}/${pkgname}-${pkgver}/build/"
+    cmake ../srcs
     make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    install -dm755 "${pkgdir}/usr/lib/heif/"
+
     install -Dm644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -Dm755 "Bins/writerapp" "${pkgdir}/usr/bin/${pkgname}"
-    cd Srcs
-    install -Dm644 -t "${pkgdir}/usr/lib/" \
-        common/libcommon.a \
-        jsonlib/libjson.a \
-        parser/avcparser/libavcparser.a \
-        parser/h265parser/libh265parser.a \
-        reader/libheifreader.a \
-        writer/libheifwriter.a
+    cp -r srcs/api "${pkgdir}/usr/lib/heif/"
+
+    cd build/lib/
+    install -Dm644 -t "${pkgdir}/usr/lib/" ./*
 }
diff --git a/gcc7.patch b/gcc7.patch
deleted file mode 100644
index 1e1171f42358..000000000000
--- a/gcc7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Srcs/jsonlib/jsoncpp.cpp b/Srcs/jsonlib/jsoncpp.cpp
-index c373405..1723253 100644
---- a/Srcs/jsonlib/jsoncpp.cpp
-+++ b/Srcs/jsonlib/jsoncpp.cpp
-@@ -1446,6 +1446,7 @@ bool OurReader::readToken(Token& token) {
-     ok = readStringSingleQuote();
-     break;
-     } // else continue
-+    [[gnu::fallthrough]];
-   case '/':
-     token.type_ = tokenComment;
-     ok = readComment();