Skip to content

Commit

Permalink
afflib: upgraded to 3.7.7
Browse files Browse the repository at this point in the history
  • Loading branch information
conraid committed Mar 26, 2016
1 parent a64da20 commit d2ddd9d
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 16 deletions.
4 changes: 2 additions & 2 deletions afflib/README
@@ -1,5 +1,5 @@

Slackware Current Repository by Conraid
Slackware Current Repository by Conraid

======================================================================

Expand All @@ -8,6 +8,6 @@ afflib
AFF is an open and extensible file format designed to store disk
images and associated metadata.

HOME: https://github.com/simsong/AFFLIBv3
HOME: https://github.com/sshock/AFFLIBv3

======================================================================
21 changes: 13 additions & 8 deletions afflib/afflib.SlackBuild
Expand Up @@ -29,21 +29,20 @@ CWD=$(pwd)

SRCNAM=AFFLIB
PRGNAM=afflib
VERSION=${VERSION:-3.7.4}
BUILD=${BUILD:-5}
VERSION=${VERSION:-3.7.7}
BUILD=${BUILD:-1}
TAG=${TAG:-cf}
TMP=${TMP:-/tmp/pkg}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}

DOCFILES="AUTHORS BUGLIST.txt COPYING ChangeLog INSTALL README README_Linux.txt NEWS"

ARCH=${ARCH:=""} # Set ARCH or leave blank to determine it automatically/
if [ -z ${ARCH:=""} ]; then
case "$( uname -m )" in
i?86) ARCH=i686 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
i?86) ARCH=i686 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi

Expand All @@ -54,7 +53,7 @@ elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC -fomit-frame-pointer"
SLKCFLAGS="-O2 -fPIC -pipe -fomit-frame-pointer"
LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
Expand All @@ -71,7 +70,12 @@ cd ${SRCNAM}v3-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a+X-s .

./bootstrap.sh
# Patch fix ncurses error
patch -p1 -i $CWD/configure.ac.diff

if [ ! -e configure ]; then
sh bootstrap.sh
fi
LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
Expand All @@ -84,6 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \
--infodir=/usr/info \
--enable-s3 \
--enable-python \
--disable-static \
--host=$ARCH-slackware-linux \
--build=$ARCH-slackware-linux

Expand Down
12 changes: 6 additions & 6 deletions afflib/afflib.info
@@ -1,10 +1,10 @@
PRGNAM="afflib"
VERSION="3.7.4"
HOMEPAGE="https://github.com/simsong/AFFLIBv3"
DOWNLOAD="https://github.com/simsong/AFFLIBv3/archive/v3.7.4.tar.gz"
VERSION="3.7.7"
HOMEPAGE="https://github.com/sshock/AFFLIBv3"
DOWNLOAD="https://github.com/sshock/AFFLIBv3/archive/v3.7.7.tar.gz"
REQUIRES=""
FILENAME="AFFLIBv3-3.7.4.tar.gz"
MD5SUM="a81470590cfc2f22a3168f89ebe27ea6"
SHASUM="589dae6f8439e97ab080026701cd0caa0636ac22"
FILENAME="AFFLIBv3-3.7.7.tar.gz"
MD5SUM="a35ef9a443225fcbe99f7ad61fadb33b"
SHASUM="72bb16fadd128d524a1a11a0a50ed0129fb50680"
MAINTAINER="Corrado Franco"
EMAIL="conraid (at) linux (dot) it"
23 changes: 23 additions & 0 deletions afflib/configure.ac.diff
@@ -0,0 +1,23 @@
--- AFFLIBv3-3.7.7/configure.ac 2015-10-02 00:55:01.000000000 +0200
+++ AFFLIBv3-3.7.5/configure.ac 2014-10-11 08:19:44.000000000 +0200
@@ -81,7 +81,7 @@ AC_STRUCT_ST_RDEV


# Specific headers that I plan to use
-AC_CHECK_HEADERS([arpa/inet.h assert.h ctype.h dmalloc.h err.h errno.h fcntl.h getopt.h inttypes.h linux/fs.h malloc.h netinet/in.h regex.h signal.h stdint.h stdio.h stdlib.h string.h sys/cdefs.h sys/disk.h sys/file.h sys/ioctl.h sys/ioctl.h sys/param.h sys/param.h sys/socket.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/vfs.h sysexits.h term.h time.h unistd.h zlib.h _mingw.h])
+AC_CHECK_HEADERS([arpa/inet.h assert.h ctype.h dmalloc.h err.h errno.h fcntl.h getopt.h inttypes.h linux/fs.h malloc.h ncurses/term.h netinet/in.h regex.h signal.h stdint.h stdio.h stdlib.h string.h sys/cdefs.h sys/disk.h sys/file.h sys/ioctl.h sys/ioctl.h sys/param.h sys/param.h sys/socket.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/vfs.h sysexits.h term.h time.h unistd.h zlib.h _mingw.h])

AC_CHECK_LIB([regex],[regcomp]) # see if we need -lregex

@@ -115,9 +115,10 @@ AC_LANG_POP([C++])
AC_CHECK_HEADERS([readline/readline.h])
AC_CHECK_HEADERS([curses.h termcap.h])
AC_CHECK_LIB([readline],[readline],, AC_MSG_RESULT([readline not installed]))
+AC_CHECK_LIB([ncurses],[initscr],, AC_MSG_RESULT([ncurses not installed]))
AC_CHECK_LIB([z],[uncompress],, AC_MSG_ERROR([zlib not installed; cannot continue. Try adding zlib-dev or zlib1g-dev.]))
AC_CHECK_LIB([rt],[aio_error64])
-AC_SEARCH_LIBS(tgetent, termlib termcap curses)
+AC_SEARCH_LIBS(tgetent, termlib termcap tinfo curses ncurses)
AC_CHECK_FUNCS(putp tputs tgoto tgetstr tgetnum gotorc beep endwin setupterm printw)

################################################################

0 comments on commit d2ddd9d

Please sign in to comment.