main/libde265: upgrade to 1.0.8

4 files changed, 10 insertions, 78 deletions

diff --git a/main/libde265/APKBUILD b/main/libde265/APKBUILD
index ee8ad1c604e..ef9d34021f9 100644
--- a/main/libde265/APKBUILD
+++ b/main/libde265/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=libde265
-pkgver=1.0.4
+pkgver=1.0.8
 pkgrel=0
 pkgdesc="Open h.265 video codec implementation"
 url="https://github.com/strukturag/libde265"
@@ -12,8 +12,6 @@ options="!check"  # no tests provided
 subpackages="$pkgname-dev"
 source="https://github.com/strukturag/libde265/releases/download/v$pkgver/libde265-$pkgver.tar.gz
 	export-only-decoder-api.patch
-	disable-tools.patch
-	use-new-ffmpeg-enum-names.patch
 	"
 
 prepare() {
@@ -27,8 +25,8 @@ build() {
 	export CXXFLAGS="${CXXFLAGS/-Os/-O2}"
 
 	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
+		--build="$CBUILD" \
+		--host="$CHOST" \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--disable-sherlock265
@@ -39,7 +37,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1c57a0b543d17a09928ce126b957b71d3d92add24936f724767d0fff13a137036e9b053fb3aaa6f8f9c5e3e60cb76d9ad816384a7bb626f7fe0cd1aad6d13ec1  libde265-1.0.4.tar.gz
-b937024655020eaea60cc02110018a4b8a63c7fca5a3c14cf042952e6acc83cf39d8d5a23d16536738a374538e2a20c8130d62e0e82a2dbd86ccea9a01433d11  export-only-decoder-api.patch
-ec3d78eb5e0df13900fdc87711372de8dbf12371feeb885dd54e824b4e6370c8b19528ad1fe07aca410ab281665a64e1357d4ab88fc78fb68d2a9ebd18761bca  disable-tools.patch
-6007f51114dcfaefed402ac88599add00f5a25d9e670f20e658d166843b4df3525e9f59556c50358fad85878d5bc2062616a1dede597f4664f46fe1f3baaef7d  use-new-ffmpeg-enum-names.patch"
+sha512sums="bcb33493cbc337d29047c6765189aaba523b20c138aa4fd5c264b3c6aea64cd174cbe14ca2d88c76319e0a8bd5d2e6269f300f056876d2962217eea7934172da  libde265-1.0.8.tar.gz
+f7bd3799f4e4440e7efb98671eca425a5926dd526f8b1147cee2e49b1995853f67b63287c12739ef8ea680713af903517820f83f7f88eac6459f37bae01b4d50  export-only-decoder-api.patch"
diff --git a/main/libde265/disable-tools.patch b/main/libde265/disable-tools.patch
deleted file mode 100644
index 2376fef5033..00000000000
--- a/main/libde265/disable-tools.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Disable building of some internal tools that no longer link
- because internal symbols are not exported.
-Author: Joachim Bauch <bauch@struktur.de>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,10 +8,6 @@
- SUBDIRS+=dec265
- endif
- 
--SUBDIRS+=enc265
--SUBDIRS+=tools
--SUBDIRS+=acceleration-speed
--
- if ENABLE_SHERLOCK265
- SUBDIRS+=sherlock265
- endif
---- a/dec265/Makefile.am
-+++ b/dec265/Makefile.am
-@@ -1,5 +1,5 @@
- 
--bin_PROGRAMS = dec265 hdrcopy
-+bin_PROGRAMS = dec265
- 
- AM_CPPFLAGS = -I../libde265
- 
-@@ -9,12 +9,6 @@
- dec265_LDADD = ../libde265/libde265.la -lstdc++
- dec265_SOURCES = dec265.cc
- 
--hdrcopy_DEPENDENCIES = ../libde265/libde265.la
--hdrcopy_CXXFLAGS =
--hdrcopy_LDFLAGS =
--hdrcopy_LDADD = ../libde265/libde265.la -lstdc++
--hdrcopy_SOURCES = hdrcopy.cc
--
- if HAVE_VIDEOGFX
-   dec265_CXXFLAGS += $(VIDEOGFX_CFLAGS)
-   dec265_LDFLAGS += $(VIDEOGFX_LIBS)
-
diff --git a/main/libde265/export-only-decoder-api.patch b/main/libde265/export-only-decoder-api.patch
index b41effac4d8..cd58d39636c 100644
--- a/main/libde265/export-only-decoder-api.patch
+++ b/main/libde265/export-only-decoder-api.patch
@@ -7,7 +7,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
 
 --- a/libde265/encoder/Makefile.am
 +++ b/libde265/encoder/Makefile.am
-@@ -10,6 +10,18 @@
+@@ -12,6 +12,18 @@
    encpicbuf.h encpicbuf.cc \
    sop.h sop.cc
  
@@ -44,7 +44,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
    CMakeLists.txt
 --- a/configure.ac
 +++ b/configure.ac
-@@ -50,9 +50,7 @@
+@@ -56,9 +56,7 @@
  fi
  changequote([,])dnl
  
@@ -57,7 +57,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
  # Checks for header files.
 --- a/libde265/image-io.cc
 +++ b/libde265/image-io.cc
-@@ -183,7 +183,7 @@
+@@ -186,7 +186,7 @@
  }
  
  
@@ -66,7 +66,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
  {
    if (mFH) {
      fclose(mFH);
-@@ -191,7 +191,7 @@
+@@ -194,7 +194,7 @@
  }
  
  
@@ -75,7 +75,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
  {
    assert(mFH==NULL);
  
-@@ -199,7 +199,7 @@
+@@ -202,7 +202,7 @@
  }
  
  
diff --git a/main/libde265/use-new-ffmpeg-enum-names.patch b/main/libde265/use-new-ffmpeg-enum-names.patch
deleted file mode 100644
index 3a2facc4404..00000000000
--- a/main/libde265/use-new-ffmpeg-enum-names.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e5b8e2e703d608777afadc54955bd396e4211da0 Mon Sep 17 00:00:00 2001
-From: Dirk Farin <farin@struktur.de>
-Date: Thu, 19 Apr 2018 13:15:18 +0200
-Subject: [PATCH] use new FFMPEG enum names
-
-Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265/libde265-use_new_FFMPEG_enum_names.patch
----
- sherlock265/VideoDecoder.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sherlock265/VideoDecoder.cc b/sherlock265/VideoDecoder.cc
-index 119f6152..b829e1c7 100644
---- a/sherlock265/VideoDecoder.cc
-+++ b/sherlock265/VideoDecoder.cc
-@@ -237,7 +237,7 @@ void VideoDecoder::convert_frame_swscale(const de265_image* img, QImage & qimg)
-     }
-     width = img->get_width();
-     height = img->get_height();
--    sws = sws_getContext(width, height, PIX_FMT_YUV420P, width, height, PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
-+    sws = sws_getContext(width, height, AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
-   }
- 
-   int stride[3];
-
-