summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/libcdio-paranoia/APKBUILD21
-rw-r--r--main/libcdio-paranoia/header-fix.patch13
2 files changed, 9 insertions, 25 deletions
diff --git a/main/libcdio-paranoia/APKBUILD b/main/libcdio-paranoia/APKBUILD
index cc5fd7a73..f2549a24c 100644
--- a/main/libcdio-paranoia/APKBUILD
+++ b/main/libcdio-paranoia/APKBUILD
@@ -1,7 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcdio-paranoia
-pkgver=0.90
-pkgrel=3
+pkgver=0.93_p1
+_ver=${pkgver/_p/+}
+pkgrel=4
pkgdesc="CD paranoia on top of libcdio"
url="http://www.gnu.org/software/libcdio/"
arch="all"
@@ -11,10 +12,9 @@ depends_dev="libcdio-dev"
makedepends="$depends_dev libiconv-dev autoconf automake libtool"
install=""
subpackages="$pkgname-dev $pkgname-doc"
-source="http://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-10.2+$pkgver.tar.gz
- header-fix.patch"
-
-_builddir="$srcdir"/libcdio-paranoia-10.2+$pkgver
+source="http://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-10.2+$_ver.tar.gz
+ "
+_builddir="$srcdir"/libcdio-paranoia-10.2+$_ver
prepare() {
local i
cd "$_builddir"
@@ -49,9 +49,6 @@ package() {
rm -f "$pkgdir"/usr/lib/*.la
}
-md5sums="7175764764c7fa22e1b802b9526c9411 libcdio-paranoia-10.2+0.90.tar.gz
-5e70e747c5b0c7f14d65634d1ae565ff header-fix.patch"
-sha256sums="562d6158b2690cbb98609f7f8b2b4198c22cc4e275aad33f95b8e83c630eb3b4 libcdio-paranoia-10.2+0.90.tar.gz
-e66fc08bcb0ff068ef064182883d0fa51dbec93ab1e286e5f154a63bec3286f0 header-fix.patch"
-sha512sums="d8549d50b08cfd407672d49e43cc82525fb551a3f2ef1c6a4e3ac0c31ad209009249811d5a53172b59d1f858b7b0a3a929ef8e0a75322a27aaebdfb45d6e1531 libcdio-paranoia-10.2+0.90.tar.gz
-ef92528a36b5685927aaaf8ac6b096069bcd6866613ff006ac4057c9a79d4fdf3f4fcf79e78d7901148b1bbb60f4bca1438e1080838c553139e9bb314b6427d7 header-fix.patch"
+md5sums="4fb07fa47db24b71d315d40c9c6cecfb libcdio-paranoia-10.2+0.93+1.tar.gz"
+sha256sums="4617792b4eb301de45b61732bdc0617447ad06b53068ae45db37695275c0dd4c libcdio-paranoia-10.2+0.93+1.tar.gz"
+sha512sums="2bb418c99ef037aeb90ba3db841ea9182c5bc401e74c6f4b552730e6c8561552f7d3e27be71ef4fbb07b4fcd9db418a4fe330d5278e8f41cdd99c757aa4b8bc6 libcdio-paranoia-10.2+0.93+1.tar.gz"
diff --git a/main/libcdio-paranoia/header-fix.patch b/main/libcdio-paranoia/header-fix.patch
deleted file mode 100644
index 91b572ed7..000000000
--- a/main/libcdio-paranoia/header-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./include/cdio/paranoia/Makefile.am.orig 2013-01-08 10:40:32.237218755 +0000
-+++ ./include/cdio/paranoia/Makefile.am 2013-01-08 10:41:22.269997804 +0000
-@@ -3,8 +3,8 @@
- ########################################################
- #
-
--libcdioincludedir=$(includedir)/cdio
--dist_libcdioinclude_HEADERS = cdda.h paranoia.h
-+cdio_paranoia_includedir=$(includedir)/cdio/paranoia
-+dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h
-
- EXTRA_DIST = version.h.in
- BUILT_SOURCES = version.h