From 5bd476870dbe4b0a00e61404fd39c2bd57813264 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 21 Jul 2016 23:03:08 +0200 Subject: [PATCH] libdsk: update to 1.5.0 old downloads no longer available. --- ...ibdsk-1.3.8.recipe => libdsk-1.5.0.recipe} | 12 ++++---- .../libdsk/patches/libdsk-1.5.0.patchset | 30 +++++++++++++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) rename app-emulation/libdsk/{libdsk-1.3.8.recipe => libdsk-1.5.0.recipe} (88%) create mode 100644 app-emulation/libdsk/patches/libdsk-1.5.0.patchset diff --git a/app-emulation/libdsk/libdsk-1.3.8.recipe b/app-emulation/libdsk/libdsk-1.5.0.recipe similarity index 88% rename from app-emulation/libdsk/libdsk-1.3.8.recipe rename to app-emulation/libdsk/libdsk-1.5.0.recipe index c1c99f697..137658c7e 100644 --- a/app-emulation/libdsk/libdsk-1.3.8.recipe +++ b/app-emulation/libdsk/libdsk-1.5.0.recipe @@ -13,13 +13,14 @@ files or real discs. " COPYRIGHT="2010-2015 John Elliott" LICENSE="GNU GPL v2" -HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/" +HOMEPAGE="http://www.seasip.info/Unix/LibDsk/" REVISION="1" ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86 x86_gcc2" SOURCE_URI="http://www.seasip.info/Unix/LibDsk/libdsk-$portVersion.tar.gz" -CHECKSUM_SHA256="1472cb30534e3a1b3ac0c2e7e4a00a9c247955af5d407cb95c25391fb61e45d4" +CHECKSUM_SHA256="4d0df2fb6e5c6785e53dbf55f9b74c6723e9e849d6187026f182f5bf6a7dec67" +PATCHES="libdsk-$portVersion.patchset" PROVIDES=" libdsk$secondaryArchSuffix = $portVersion @@ -72,8 +73,7 @@ BUILD_PREREQUIRES=" BUILD() { - # Need to update the libtools in the package to build shared libraries -#aclocal +# aclocal # libtoolize --install --copy --force # autoconf runConfigure ./configure @@ -92,5 +92,7 @@ INSTALL() prepareInstalledDevelLib libdsk packageEntries devel $developDir - packageEntries tools $binDir + if [ -z "$secondaryArchSuffix" ]; then + packageEntries tools $binDir + fi } diff --git a/app-emulation/libdsk/patches/libdsk-1.5.0.patchset b/app-emulation/libdsk/patches/libdsk-1.5.0.patchset new file mode 100644 index 000000000..964032f74 --- /dev/null +++ b/app-emulation/libdsk/patches/libdsk-1.5.0.patchset @@ -0,0 +1,30 @@ +From af6d78433bc13806b8b15f4f405e52c2fba802ce Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 7 Aug 2016 14:01:02 +0200 +Subject: libdsk: fix gcc2 build. + + +diff --git a/lib/ldbsdisk.c b/lib/ldbsdisk.c +index dd0053d..e74e7c9 100644 +--- a/lib/ldbsdisk.c ++++ b/lib/ldbsdisk.c +@@ -89,6 +89,7 @@ static dsk_err_t ldbsdisk_select_track(LDBSDISK_DSK_DRIVER *self, + dsk_pcyl_t cyl, dsk_phead_t head) + { + dsk_err_t err = DSK_ERR_OK; ++ LDBS_TRACKHEAD *t; + + if (self->cur_cyl == cyl && self->cur_head == head) + { +@@ -97,8 +98,6 @@ static dsk_err_t ldbsdisk_select_track(LDBSDISK_DSK_DRIVER *self, + err = ldbsdisk_flush_cur_track(self); + if (err) return err; + +- LDBS_TRACKHEAD *t; +- + err = ldbs_get_trackhead(self->store, &t, cyl, head); + if (err) return err; + +-- +2.7.0 +