diff --git a/main/libde265/APKBUILD b/main/libde265/APKBUILD index ef9d34021f9..6d1bdc955fb 100644 --- a/main/libde265/APKBUILD +++ b/main/libde265/APKBUILD @@ -2,16 +2,17 @@ # Maintainer: Jakub Jirutka pkgname=libde265 pkgver=1.0.8 -pkgrel=0 +pkgrel=1 pkgdesc="Open h.265 video codec implementation" url="https://github.com/strukturag/libde265" arch="all" license="LGPL-3.0-or-later" makedepends="autoconf automake libtool" options="!check" # no tests provided -subpackages="$pkgname-dev" +subpackages="$pkgname-dev $pkgname-examples" source="https://github.com/strukturag/libde265/releases/download/v$pkgver/libde265-$pkgver.tar.gz export-only-decoder-api.patch + disable_tools.patch " prepare() { @@ -35,7 +36,20 @@ build() { package() { make DESTDIR="$pkgdir" install + + # The upstream do the same in their Ubuntu/PPA packages. + mv "$pkgdir"/usr/bin/dec265 "$pkgdir"/usr/bin/libde265-dec265 } -sha512sums="bcb33493cbc337d29047c6765189aaba523b20c138aa4fd5c264b3c6aea64cd174cbe14ca2d88c76319e0a8bd5d2e6269f300f056876d2962217eea7934172da libde265-1.0.8.tar.gz -f7bd3799f4e4440e7efb98671eca425a5926dd526f8b1147cee2e49b1995853f67b63287c12739ef8ea680713af903517820f83f7f88eac6459f37bae01b4d50 export-only-decoder-api.patch" +examples() { + pkgdesc="$pkgdesc (examples)" + depends="$pkgname=$pkgver-r$pkgrel" + + amove usr/bin/* +} + +sha512sums=" +bcb33493cbc337d29047c6765189aaba523b20c138aa4fd5c264b3c6aea64cd174cbe14ca2d88c76319e0a8bd5d2e6269f300f056876d2962217eea7934172da libde265-1.0.8.tar.gz +f7bd3799f4e4440e7efb98671eca425a5926dd526f8b1147cee2e49b1995853f67b63287c12739ef8ea680713af903517820f83f7f88eac6459f37bae01b4d50 export-only-decoder-api.patch +1f12bf8c7f52932ab8a205996b4439afb75baf9bd6aab13126791f281784f5c7f1b3e20f9c20cfb0ab889b8643da5737a51d5571b54a3a8733ff5da835564eca disable_tools.patch +" diff --git a/main/libde265/disable_tools.patch b/main/libde265/disable_tools.patch new file mode 100644 index 00000000000..8fb5ddd25b5 --- /dev/null +++ b/main/libde265/disable_tools.patch @@ -0,0 +1,44 @@ +Description: Disable building of some internal tools that no longer link + because internal symbols are no longer exported. +Author: Joachim Bauch + +Patch-Source: https://launchpad.net/~strukturag/+archive/ubuntu/libde265/+sourcefiles/libde265/1.0.8-1~ppa1~ubuntu20.10.1/libde265_1.0.8-1~ppa1~ubuntu20.10.1.debian.tar.gz + +--- a/dec265/Makefile.am ++++ b/dec265/Makefile.am +@@ -1,5 +1,5 @@ + +-bin_PROGRAMS = dec265 hdrcopy ++bin_PROGRAMS = dec265 + + AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir) + +@@ -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) +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,13 +8,6 @@ + SUBDIRS+=dec265 + endif + +-if ENABLE_ENCODER +-SUBDIRS+=enc265 +-endif +- +-SUBDIRS+=tools +-SUBDIRS+=acceleration-speed +- + if ENABLE_SHERLOCK265 + SUBDIRS+=sherlock265 + endif