system/wiimms-iso-tools: Updated for version 3.01a.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 137 insertions, 13 deletions

diff --git a/system/wiimms-iso-tools/cflags.diff b/system/wiimms-iso-tools/cflags.diff
new file mode 100644
index 0000000000..2107bdc175
--- /dev/null
+++ b/system/wiimms-iso-tools/cflags.diff
@@ -0,0 +1,108 @@
+--- Makefile.orig	2018-04-01 01:05:20.377566441 -0700
++++ Makefile	2018-04-01 01:05:59.596953701 -0700
+@@ -243,7 +243,8 @@
+ DCLIB_DIR	:= ./dclib
+ DIR_LIST	+= $(DCLIB_DIR)
+ VPATH		+= $(DCLIB_DIR)
+-CFLAGS		+= -I$(DCLIB_DIR)
++CFLAGS		?= -O3 -funroll-loops
++DEF_FLAGS	+= -I$(DCLIB_DIR)
+ 
+ # other objects
+ WIT_O		:= lib-std.o lib-file.o lib-sf.o \
+@@ -297,15 +298,15 @@
+ DEFINES1	+= -D_LZMA_PROB32=1	# LZMA option
+ DEFINES		=  $(strip $(DEFINES1) $(MODE) $(XDEF))
+ 
+-CFLAGS		+= -fomit-frame-pointer -fno-strict-aliasing -funroll-loops
+-CFLAGS		+= -Wall -Wno-parentheses -Wno-unused-function
+-#CFLAGS		+= -O3 -Isrc/libwbfs -Isrc/lzma -Isrc -I$(UI) -I. -Iwork
+-CFLAGS		+= -O3 -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork
++DEF_FLAGS	+= -fomit-frame-pointer -fno-strict-aliasing
++DEF_FLAGS	+= -Wall -Wno-parentheses -Wno-unused-function
++#DEF_FLAGS	+= -Isrc/libwbfs -Isrc/lzma -Isrc -I$(UI) -I. -Iwork
++DEF_FLAGS	+= -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork
+ ifeq ($(SYSTEM),mac)
+- CFLAGS		+= -I/usr/local/include
++ DEF_FLAGS		+= -I/usr/local/include
+ endif
+-CFLAGS		+= $(XFLAGS)
+-CFLAGS		:= $(strip $(CFLAGS))
++DEF_FLAGS	+= $(XFLAGS)
++DEF_FLAGS	:= $(strip $(DEF_FLAGS))
+ 
+ DEPFLAGS	+= -MMD
+ 
+@@ -369,7 +370,7 @@
+ 
+ $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS)
+ 	@printf "$(LOGFORMAT_TOOL)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)"
+-	@$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
++	@$(CC) $(CFLAGS) $(DEF_FLAGS) $(DEFINES) $(LDFLAGS) $@.o \
+ 		$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@
+ 	@if test -f $@.exe; then $(STRIP) $@.exe; else $(STRIP) $@; fi
+ 
+@@ -382,7 +383,7 @@
+ 
+ $(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile
+ 	@printf "$(LOGFORMAT_TOOL)" helper "$@ $(TOBJ_$@)" "$(MODE)"
+-	@$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
++	@$(CC) $(CFLAGS) $(DEF_FLAGS) $(DEFINES) $(LDFLAGS) $@.o \
+ 		$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@
+ 
+ #--------------------------
+@@ -395,19 +396,19 @@
+ 
+ $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile
+ 	@printf "$(LOGFORMAT_CC)" +object "$@" "$(MODE)"
+-	@$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
++	@$(CC) $(CFLAGS) $(DEF_FLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
+ 
+ #--------------------------
+ 
+ $(C_OBJECTS): %.o: %.c version.h Makefile $(TEXT_FILES)
+ 	@printf "$(LOGFORMAT_CC)" object "$@" "$(MODE)"
+-	@$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
++	@$(CC) $(CFLAGS) $(DEF_FLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
+ 
+ #--------------------------
+ 
+ $(ASM_OBJECTS): %.o: %.S Makefile
+ 	@printf "$(LOGFORMAT_CC)" asm "$@" "$(MODE)"
+-	@$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
++	@$(CC) $(CFLAGS) $(DEF_FLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
+ 
+ #--------------------------
+ 
+@@ -440,11 +441,11 @@
+ 
+ $(LIBBZ2_OBJ): %.o: %.c Makefile
+ 	@printf "$(LOGFORMAT_CC)" object "$(subst src/libbz2/,,$@)" "$(MODE) [libbz2]"
+-	@$(CC) $(CFLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@
++	@$(CC) $(CFLAGS) $(DEF_FLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@
+ 
+ $(LZMA_OBJ): %.o: %.c Makefile
+ 	@printf "$(LOGFORMAT_CC)" object "$(subst src/lzma/,,$@)" "$(MODE) [lzma]"
+-	@$(CC) $(CFLAGS) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@
++	@$(CC) $(CFLAGS) $(DEF_FLAGS) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@
+ 
+ #
+ ###############################################################################
+@@ -656,6 +657,8 @@
+ 	@echo  ""
+ 	@echo  "CFLAGS:  $(CFLAGS)"
+ 	@echo  ""
++	@echo  "DEF_FLAGS: $(DEF_FLAGS)"
++	@echo  ""
+ 	@echo  "LDFLAGS: $(LDFLAGS)"
+ 	@echo  ""
+ 	@echo  "LIBS: $(LIBS)"
+@@ -1003,7 +1006,7 @@
+ 	@echo  " make old	enable '-DOLD_FEATURES'"
+ 	@echo  " make wait	enable '-DWAIT'"
+ 	@echo  " make testtrace	enable '-DTESTTRACE'"
+-	@echo  " make flags	print DEFINES, CFLAGS and LDFLAGS"
++	@echo  " make flags	print DEFINES, CFLAGS, DEF_FLAGS and LDFLAGS"
+ 	@echo  ""
+ 	@echo  " make doc	generate doc files from their templates"
+ 	@echo  " make distrib	make all & build $(DISTRIB_PATH)"
diff --git a/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild b/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
index 0976a50ecb..a5d51c87dd 100644
--- a/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
+++ b/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Wiimms ISO Tools
 #
 # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015, 2018 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wiimms-iso-tools
-VERSION=${VERSION:-0.31a}
+VERSION=${VERSION:-3.01a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,14 +41,28 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -56,10 +70,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make
+patch -p0 < $CWD/cflags.diff
+
+make CFLAGS="$SLKCFLAGS"
 
 # Fix the install directory
-sed -i "s|usr/local|$PKG/usr|" templates.sed
+sed -i "s|/usr/local|$PKG/usr|" templates.sed
 
 make install
 
@@ -67,7 +83,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a WDF.txt $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a gpl-2.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/wiimms-iso-tools/wiimms-iso-tools.info b/system/wiimms-iso-tools/wiimms-iso-tools.info
index 4beb58397b..487ff93557 100644
--- a/system/wiimms-iso-tools/wiimms-iso-tools.info
+++ b/system/wiimms-iso-tools/wiimms-iso-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="wiimms-iso-tools"
-VERSION="0.31a"
+VERSION="3.01a"
 HOMEPAGE="https://wit.wiimm.de/"
-DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/wiimms-iso-tools-0.31a.tar.bz2"
-MD5SUM="971b8c3f26448c623f4e93cb1a970156"
+DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/wiimms-iso-tools-3.01a.tar.xz"
+MD5SUM="ebfe94fc14d851770da9c921de1ebb8c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""