diff --git a/testing/atomicparsley/APKBUILD b/testing/atomicparsley/APKBUILD index b26dd2257ee2aae0eae9d73b1de5dda0a467af28..63cb910c53089eca69b1df9b605b323345e17094 100644 --- a/testing/atomicparsley/APKBUILD +++ b/testing/atomicparsley/APKBUILD @@ -1,36 +1,25 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=atomicparsley -pkgver=0.9.6 -_gittag=da2f6e4fc120 -pkgrel=1 +pkgver=20210114 +_pkgtag=184825.1dbe1be +pkgrel=0 pkgdesc="A command line program for reading, parsing and setting iTunes-style metadata in MPEG4 files" url="http://atomicparsley.sourceforge.net/" arch="all" +options="!check" # no test/check available license="GPL-2.0-or-later" -makedepends="automake autoconf libtool zlib-dev linux-headers" -source="$pkgname-$pkgver.tar.gz::https://bitbucket.org/wez/atomicparsley/get/$pkgver.tar.gz - musl-fpos_t.patch - " -builddir="$srcdir/wez-$pkgname-$_gittag" - -prepare() { - default_prepare - ./autogen.sh -} +makedepends="cmake automake autoconf libtool zlib-dev linux-headers" +source="$pkgname-$pkgver.tar.gz::https://github.com/wez/atomicparsley/archive/${pkgver}.${_pkgtag}.tar.gz" +builddir="$srcdir/$pkgname-${pkgver}.${_pkgtag}" build() { - ./configure --prefix=/usr - make -} - -check() { - make check + cmake . + cmake --build . --config Release } package() { - make DESTDIR="$pkgdir" install + install -Dm755 AtomicParsley "$pkgdir"/usr/bin/$pkgname } -sha512sums="8bf7982dd34b8b38a08508229ae877144149ac0d9feb97e52dac9606a37de570751e4e4b154baa4beb2ce7236297164f3edb42bb8a6c493a624db531cc4de1d2 atomicparsley-0.9.6.tar.gz -5f0803437116672ff011c428137c3217571b31b01af11f8689ceb77f96284fb2c8fce7c719d30a396d0367bed38b8c9a32330df5651e401ac7be11591baaf609 musl-fpos_t.patch" +sha512sums="3aedfcf9757625ea962013f1d8fbd53979aafa3df37c696d095162488168ef617513c3a1e7ca2e1fe3bad3a6af972d2a0113b1e8b1e3e49dcdd5afe4f411b885 atomicparsley-20210114.tar.gz" diff --git a/testing/atomicparsley/musl-fpos_t.patch b/testing/atomicparsley/musl-fpos_t.patch deleted file mode 100644 index 35bd8a8f797f0be5ae36ea629d84a8b5fe4a4662..0000000000000000000000000000000000000000 --- a/testing/atomicparsley/musl-fpos_t.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/parsley.cpp b/src/parsley.cpp -index 3031711..8a4a7a1 100644 ---- a/src/parsley.cpp -+++ b/src/parsley.cpp -@@ -4388,7 +4388,8 @@ void APar_MergeTempFile(FILE* dest_file, FILE *src_file, uint64_t src_file_size, - fpos_t file_offset = {0}; - file_offset.__pos = dest_position + file_pos; - #else -- off_t file_offset = dest_position + file_pos; -+ fpos_t file_offset = {0}; -+ *(uint64_t*) &file_offset = dest_position + file_pos; - #endif - fsetpos(dest_file, &file_offset); - fwrite(buffer, max_buffer, 1, dest_file); -@@ -4403,7 +4404,8 @@ void APar_MergeTempFile(FILE* dest_file, FILE *src_file, uint64_t src_file_size, - fpos_t file_offset = {0}; - file_offset.__pos = dest_position + file_pos; - #else -- off_t file_offset = dest_position + file_pos; -+ fpos_t file_offset = {0}; -+ *(uint64_t*) &file_offset = dest_position + file_pos; - #endif - fsetpos(dest_file, &file_offset ); - fwrite(buffer, src_file_size - file_pos, 1, dest_file);