main/jasper: upgrade to 2.0.10

fixes #6876

1 files changed, 17 insertions, 80 deletions

diff --git a/main/jasper/APKBUILD b/main/jasper/APKBUILD
index 8e93a6cdcc..c68009bfbd 100644
--- a/main/jasper/APKBUILD
+++ b/main/jasper/APKBUILD
@@ -1,111 +1,48 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=jasper
-pkgver=1.900.1
-pkgrel=12
+pkgver=2.0.10
+pkgrel=0
 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
 url="http://www.ece.uvic.ca/~mdadams/jasper/"
 arch="all"
 license="custom:JasPer2.0"
 depends=  #"libjpeg>=8 freeglut libxi libxmu mesa"
-makedepends="libjpeg-turbo-dev"
-subpackages="$pkgname-dev $pkgname-doc libjasper"
-source="http://www.ece.uvic.ca/~mdadams/$pkgname/software/$pkgname-$pkgver.zip
-	jpc_dec.c.patch
-	libjasper-stepsizes-overflow.patch
-	jasper-1.900.1-CVE-2008-3520.patch
-	jasper-1.900.1-CVE-2008-3522.patch
-	jasper-1.900.1-bnc725758.patch
-	CVE-2014-8137.patch
-	CVE-2014-8138.patch
-	CVE-2014-8157.patch
-	CVE-2014-8158.patch
-	CVE-2014-9029.patch
-	CVE-2015-5203.patch
-	CVE-2016-1577.patch
-	CVE-2016-2089.patch
-	CVE-2016-2116.patch
+makedepends="libjpeg-turbo-dev cmake"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+source="http://www.ece.uvic.ca/~frodo/jasper/software/jasper-$pkgver.tar.gz
 	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -Np1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	update_config_sub || return 1
-	chmod +x configure
 }
 
 build () {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-shared \
+	mkdir "$builddir"/build
+	cd "$builddir"/build
+	cmake ..  \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
 		|| return 1
+
 	make || return 1
 }
 
 package() {
-	cd "$_builddir"
-
+	cd "$builddir"/build
 	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 LICENSE \
-		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE || return 1
 }
 
-libjasper() {
+libs() {
 	pkgdesc="JPEG-2000 library"
 	install -d "$subpkgdir"/usr/
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
 }
 
-md5sums="a342b2b4495b3e1394e161eb5d85d754  jasper-1.900.1.zip
-36de7128eea6f701c1e2e13ce5bd8d37  jpc_dec.c.patch
-24785d8eb3eea19eec7e77d59f3e6a25  libjasper-stepsizes-overflow.patch
-911bb13529483c093d12c15eed4e9243  jasper-1.900.1-CVE-2008-3520.patch
-ed441f30c4231f319d9ff77d86db2ef9  jasper-1.900.1-CVE-2008-3522.patch
-eaf73536f989e629a8c06533e4e6fad5  jasper-1.900.1-bnc725758.patch
-f386c336808e8fc840c8a5cb7fcc5902  CVE-2014-8137.patch
-1ec04bd2483a3ad2186b2178c237fd3b  CVE-2014-8138.patch
-1c55ee31d9ca88359abb0353b3f9d052  CVE-2014-8157.patch
-7e1266068d32cc9ecb8b75b6b1174cc3  CVE-2014-8158.patch
-83fd587d569d6b4c7e49f67caaef9bf9  CVE-2014-9029.patch
-78d55c9411bdca5250581a21b19a89c7  CVE-2015-5203.patch
-579f318c6809644b99441cd595541c15  CVE-2016-1577.patch
-45d6048316ff5fda476b2f4df0da4c44  CVE-2016-2089.patch
-36f603ee5922419f869f3bbb3ab453b3  CVE-2016-2116.patch"
-sha256sums="6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494  jasper-1.900.1.zip
-fca9c4bddc284d6c59845e5b80adfd670e79c945f166d9624b117c6db0c10492  jpc_dec.c.patch
-e454f0fb1b994535ca02fa2468aa39ff153a78f3688db3808b6e953c44890e41  libjasper-stepsizes-overflow.patch
-02236060cae28be5ac46d90ca17ce2de17e975574dd761d9117994e69bdc38d6  jasper-1.900.1-CVE-2008-3520.patch
-b0272ce179ead3692942246523462db33c0f2a92bd9f9a117ff40e8ec963fbac  jasper-1.900.1-CVE-2008-3522.patch
-be19877bc67d843436288c85c17ab49917b1a3db7954b92f736f6cc3ca704756  jasper-1.900.1-bnc725758.patch
-27350b9a72067e0325464b1e51f0fcab2701db26c918d82aac977dc345a02999  CVE-2014-8137.patch
-597966eabef1eeb4155415352cee37492def0abb09349e1764ae92645f3a20c1  CVE-2014-8138.patch
-60160f1eecb4cbfe7d8277e091333e9c1b4af7eeaccdfa3b539ac9658bb6a474  CVE-2014-8157.patch
-1dce24d47bcfc599bde5fa625e8b9bfbd1c6c637e4358493276d8a96338ff8b7  CVE-2014-8158.patch
-a43747e7597a2a5108befd4acd31a582101a66096a752e61de853bc860d2a8e1  CVE-2014-9029.patch
-7c73cdcca60a7ddffe4d5fe010d3f200870a8719dda571f578e7f437b7c8d6d0  CVE-2015-5203.patch
-61bfc92b85f3fad4318e7268e422c9212b88178bc315826d9ed14c563750c262  CVE-2016-1577.patch
-331eb8361e028ce0479d5a1065fa74e348dea6d1d8982236697c098882917b21  CVE-2016-2089.patch
-e6d63d42c92769ba3a943367798c4a5a542b1c872fbe439cf5bc59f8468210bd  CVE-2016-2116.patch"
-sha512sums="e3a3c803de848b50482f5bd693b1945197c6999285226c45b671855734d7bb2611fbe6f28cd8ba9c56a4ea59417795eba42d72516c9fec93b8fbaa21b8210cb6  jasper-1.900.1.zip
-c449c0a405f589135b384bc284508bfdd2a29b7bb94b806b960ce72238aa5789cc11fa7d704463ebda9a1384d8d085c603180f7b419e25a91d304b447708b82c  jpc_dec.c.patch
-bafdd22b8214e2993c0a61c06c27b11b4eef68db2e9c6d8786dd54dfae92e685094b66ad6c899d19df9f0f85d3aa4fe35152dd773c5bd9a1e8453ccf8518c799  libjasper-stepsizes-overflow.patch
-d337207260b3ac7e40e92326d95364ef21128431235e6ef9e345a6c781f328fd3aaf0dbfb8c7dde2403ab0cfc89cda664c3f2fec673187589358fe58521e83a1  jasper-1.900.1-CVE-2008-3520.patch
-d686c26f1432b522f41948c7bd188f9b74c455671d5f30ab97144977b22d4e778e475fea6d8128b607218a061c50f2cc767e66413455805e8843c04d901f708d  jasper-1.900.1-CVE-2008-3522.patch
-a83fe196d4305fea6f2265e1bcb64dd4841bf4355ca661c46841de44c9f642f995e13929111833f23f51168282d2da06c0544956edc3a863d13be2b584c1ad73  jasper-1.900.1-bnc725758.patch
-b689b8fdc3dfa7f7ffcb9d7e94c7eb8d11127adf55e2f67cb2311fe1495eb7a4a234e34bc50315059b85a257b083670a383a7cc751705fcacc49727c11152510  CVE-2014-8137.patch
-ae9d1c85688f7711a5cd7765988e85c64bf5413dede80aa8c860caa505c079d6975410ccb3b0e18c65d84624226c5e12667bb7613a91e3856dab4f99483c2956  CVE-2014-8138.patch
-44fc87f8a85a5c0b1f3669ca5ec139afcb8971f2d5bfd40ed95913dcf34fee4874301b580134ddca900091ef3cbfdd791b365a5c3ba74d0e8deb855b54322f68  CVE-2014-8157.patch
-7f2f2a990ced181fd5755cc630a8c6d75e8172c926c08350505f6b8b5e8e1f8b0891b4603a4c43da35f913c079f2759975ee7ee1532ebb87f06d01c165299ecb  CVE-2014-8158.patch
-20bac10654ea1b16d741bcc71ca91e484c4238cb285f551a19b1bac4c4cf8ec39bc33f8d3c42dbadd03e85eb667a8e286f208e9b20a5b39429bf8e4454bd9b16  CVE-2014-9029.patch
-911c813308af2cf0697b462e70bcb888a9e9a61399cbd0a6911133c3edd69ac50ddd57523c139080578373bceda1aa23af8ca979668f911785037250c7afcca1  CVE-2015-5203.patch
-c953cadf37b21b80b313846bb3d0ececb25e3269d02cc8cc15d8a95587fcd8d0944f23d2b7d0a82b2242ea7c46993ea0b6ba33e885363d6484eeef51e5173116  CVE-2016-1577.patch
-7ca676a2bcdf17c140e31286cd704c288201e29e77dc698bbcbbd10d7a51bf95d10dae2ddcbe70e4701440a9bd3fd34ce2042579f568418de3be380c038a39ad  CVE-2016-2089.patch
-f6506e712911df55d2f2891a4036e6baa5db468a6345657b0115c9873494e5390a94a4efb204686fd9d44fc915a6e02d0882b1679889d7e6539cabbf953d6f64  CVE-2016-2116.patch"
+sha512sums="3cc08c9bc1f9ad1e4bac78a3246d6ee1a35a75d5b89b3b0f27cb5980420101256a2e05eeb7bf8a0c73d1a73c044b83b4cbca441c1418dced53d7a142e69129ed  jasper-2.0.10.tar.gz"