aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2019-06-24 22:26:20 +0300
committerNatanael Copa <ncopa@alpinelinux.org>2019-07-22 12:05:02 +0000
commit3d6400dab224b5e90ef5a5b69d7651d3a770ef10 (patch)
treea91517439cb225f225427cc54bc2344ceb6be567
parentd8ef92f811fa0dbefd35fdaf5f4e76906180b26c (diff)
downloadaports-3d6400dab224b5e90ef5a5b69d7651d3a770ef10.tar.bz2
aports-3d6400dab224b5e90ef5a5b69d7651d3a770ef10.tar.xz
main/libcdio: upgrade to 2.1.0
* Clarify license, remove unused patch
-rw-r--r--main/libcdio/APKBUILD8
-rw-r--r--main/libcdio/fix-cdtext-double-free.patch24
2 files changed, 4 insertions, 28 deletions
diff --git a/main/libcdio/APKBUILD b/main/libcdio/APKBUILD
index 15607ff2f5..1687a587e2 100644
--- a/main/libcdio/APKBUILD
+++ b/main/libcdio/APKBUILD
@@ -1,16 +1,16 @@
# Contributor: Carlo Landmeter
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcdio
-pkgver=2.0.0
+pkgver=2.1.0
pkgrel=0
pkgdesc="GNU Compact Disc Input and Control Library"
url="https://www.gnu.org/software/libcdio/"
arch="all"
-license="GPL-3.0"
+license="GPL-3.0-or-later"
checkdepends="bash"
makedepends="libcddb-dev ncurses-dev linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools ${pkgname}++:_cpp"
-source="https://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz
+source="https://ftp.gnu.org/gnu/libcdio/$pkgname-$pkgver.tar.bz2
disable-broken-test.patch"
build() {
@@ -51,5 +51,5 @@ _cpp() {
mv "$pkgdir"/usr/lib/*++.* "$subpkgdir"/usr/lib/
}
-sha512sums="8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f libcdio-2.0.0.tar.gz
+sha512sums="c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f libcdio-2.1.0.tar.bz2
be0149128bb2fa131f514bcff848279d826340a99a05b958e104f4640bda1a89d6146b0ec348783f4bbd8a3c313c41297152f75ee04f492f08b337bd79dd9c3e disable-broken-test.patch"
diff --git a/main/libcdio/fix-cdtext-double-free.patch b/main/libcdio/fix-cdtext-double-free.patch
deleted file mode 100644
index 46764e17e3..0000000000
--- a/main/libcdio/fix-cdtext-double-free.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f6f9c48fb40b8a1e8218799724b0b61a7161eb1d Mon Sep 17 00:00:00 2001
-From: "R. Bernstein" <rocky@gnu.org>
-Date: Fri, 22 Dec 2017 16:06:57 -0500
-Subject: Fix double free courtesy of Chris Clayton
-
----
- lib/driver/_cdio_generic.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/driver/_cdio_generic.c b/lib/driver/_cdio_generic.c
-index d40ac0d..ae820d2 100644
---- a/lib/driver/_cdio_generic.c
-+++ b/lib/driver/_cdio_generic.c
-@@ -296,7 +296,6 @@ get_cdtext_generic (void *p_user_data)
-
- if(len <= 0 || 0 != cdtext_data_init (p_env->cdtext, &p_cdtext_data[4], len)) {
- p_env->b_cdtext_error = true;
-- cdtext_destroy (p_env->cdtext);
- free(p_env->cdtext);
- p_env->cdtext = NULL;
- }
---
-cgit v1.0-41-gc330
-