forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games-util/wit: version bump to 3.02a
Closes: https://bugs.gentoo.org/637920 Signed-off-by: Tim Harder <[email protected]>
- Loading branch information
Showing
3 changed files
with
229 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
DIST wiimms-iso-tools.source-3.02a.tar.bz2 1645416 BLAKE2B 3ce99b779069d7b845bcf799ee481d63764ba36576adf4c28759e8eb9db9239c158457f84c8e34169b493de94d3c5e3324dc3c2cbd9a9a171ed1b57d2863eb78 SHA512 9bc8c8e078b2932d74a785732ec786ed5b6af86fa951f606a23052c31445e0b1637065858148fb050137f6252ae4ef77676877263513ef3bda33edb42bfed632 | ||
DIST wit-2.40a.tar.xz 723448 BLAKE2B 3201000b86684b781e4dfbd738af22fbf87884110740a3b194028262deaf0617b44bcc4095fa60ee22e510e41cdd336f6bbcdeac076f49eda0d374cef2f457d7 SHA512 f119ed9dffbb42ba9037444aaa992adaa812c176d1e412f9df6c5b59efff51a24cca0141700939efec7845ac1d42cc9a30100e19ef39adee0306872181b28b5b |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,187 @@ | ||
Don't link libdl into wfuse as it's unnecessary, use system bzip2, respect user | ||
CFLAGS, and use verbose build output. | ||
|
||
--- wiimms-iso-tools.source-3.02a/Makefile | ||
+++ wiimms-iso-tools.source-3.02a/Makefile | ||
@@ -171,7 +171,7 @@ | ||
TOPT_wit := $(OPT_STATIC) | ||
TOPT_wwt := $(OPT_STATIC) | ||
TOPT_wdf := $(OPT_STATIC) | ||
-TOPT_wfuse := -lfuse -lpthread -ldl | ||
+TOPT_wfuse := -lfuse -lpthread | ||
|
||
#TOPT_ALL := $(TOPT_wit) $(TOPT_wwt) $(TOPT_wdf) $(TOPT_wfuse) | ||
|
||
@@ -206,8 +206,8 @@ | ||
endif | ||
|
||
# lib summary | ||
-LIB_LIST += libbz2 lzma | ||
-LIB_OBJECTS += $(LIBBZ2_OBJ) $(LZMA_OBJ) | ||
+LIB_LIST += lzma | ||
+LIB_OBJECTS += $(LZMA_OBJ) | ||
RM_FILES += $(foreach l,$(LIB_LIST),src/$(l)/*.{d,o}) | ||
|
||
|
||
@@ -297,10 +297,8 @@ | ||
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 | ||
+CFLAGS += -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork | ||
ifeq ($(SYSTEM),cygwin) | ||
CFLAGS += -Wno-format-truncation | ||
else ifeq ($(SYSTEM),mac) | ||
@@ -317,7 +315,7 @@ | ||
ifeq ($(HAVE_ZLIB),1) | ||
LIBS += -lz | ||
endif | ||
-LIBS += -lm -lncurses $(XLIBS) | ||
+LIBS += -lm -lncurses -lbz2 $(XLIBS) | ||
|
||
DISTRIB_RM = ./wit-v$(VERSION)-r | ||
DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT) | ||
@@ -370,83 +368,70 @@ | ||
# general rules | ||
|
||
$(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS) | ||
- @printf "$(LOGFORMAT_TOOL)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)" | ||
- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \ | ||
+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \ | ||
$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@ | ||
- @if test -f [email protected]; then $(STRIP) [email protected]; else $(STRIP) $@; fi | ||
|
||
- @mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug | ||
- @if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \ | ||
+ mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug | ||
+ if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \ | ||
then cp -p $@ bin/$(SYSTEM)/debug/; \ | ||
else cp -p $@ bin/; cp -p $@ bin/$(SYSTEM)/; fi | ||
|
||
#-------------------------- | ||
|
||
$(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile | ||
- @printf "$(LOGFORMAT_TOOL)" helper "$@ $(TOBJ_$@)" "$(MODE)" | ||
- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \ | ||
+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \ | ||
$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@ | ||
|
||
#-------------------------- | ||
|
||
$(WDF_LINKS): wdf | ||
- @printf "$(LOGFORMAT_INST)" "link" "wdf -> $@" "" | ||
- @ln -f wdf "$@" | ||
+ ln -f wdf "$@" | ||
|
||
#-------------------------- | ||
|
||
$(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile | ||
- @printf "$(LOGFORMAT_CC)" +object "$@" "$(MODE)" | ||
- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ | ||
+ $(CC) $(CFLAGS) $(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) $(DEPFLAGS) $(DEFINES) -c $< -o $@ | ||
|
||
#-------------------------- | ||
|
||
$(ASM_OBJECTS): %.o: %.S Makefile | ||
- @printf "$(LOGFORMAT_CC)" asm "$@" "$(MODE)" | ||
- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ | ||
+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ | ||
|
||
#-------------------------- | ||
|
||
$(SETUP_FILES): templates.sed $(SETUP_DIR)/$@ | ||
- @printf "$(LOGFORMAT)" create "$@" "" | ||
- @chmod 775 $(GEN_TEMPLATE) | ||
- @$(GEN_TEMPLATE) $@ | ||
+ chmod 775 $(GEN_TEMPLATE) | ||
+ $(GEN_TEMPLATE) $@ | ||
|
||
#-------------------------- | ||
|
||
$(TEXT_FILES): $(GEN_TEXT_FILE) $(TEXT_DIR)/$@ | ||
- @printf "$(LOGFORMAT)" text "$@" "" | ||
- @chmod 775 $(GEN_TEXT_FILE) | ||
- @$(GEN_TEXT_FILE) $(TEXT_DIR) $@ | ||
+ chmod 775 $(GEN_TEXT_FILE) | ||
+ $(GEN_TEXT_FILE) $(TEXT_DIR) $@ | ||
|
||
#-------------------------- | ||
|
||
$(UI_FILES): gen-ui.c ui.h $(UI_TABS) | gen-ui | ||
- @printf "$(LOGFORMAT)" run gen-ui "" | ||
- @./gen-ui | ||
+ ./gen-ui | ||
|
||
.PHONY : ui | ||
ui : gen-ui | ||
- @printf "$(LOGFORMAT)" run gen-ui "" | ||
- @./gen-ui | ||
+ ./gen-ui | ||
|
||
# | ||
############################################################################### | ||
# lib specific rules | ||
|
||
$(LIBBZ2_OBJ): %.o: %.c Makefile | ||
- @printf "$(LOGFORMAT_CC)" object "$(subst src/libbz2/,,$@)" "$(MODE) [libbz2]" | ||
- @$(CC) $(CFLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@ | ||
+ $(CC) $(CFLAGS) $(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) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@ | ||
|
||
# | ||
############################################################################### | ||
@@ -644,9 +629,8 @@ | ||
|
||
.PHONY : gen-doc | ||
gen-doc: | ||
- @printf "$(LOGFORMAT)" create documentation "" | ||
- @chmod ug+x $(GEN_TEMPLATE) | ||
- @$(GEN_TEMPLATE) | ||
+ chmod ug+x $(GEN_TEMPLATE) | ||
+ $(GEN_TEMPLATE) | ||
|
||
# | ||
#-------------------------- | ||
@@ -764,8 +748,7 @@ | ||
#-------------------------- | ||
|
||
templates.sed: Makefile | ||
- @printf "$(LOGFORMAT)" create templates.sed "" | ||
- @echo -e '' \ | ||
+ echo -e '' \ | ||
'/^~/ d;\n' \ | ||
's|@.@@@|$(VERSION_NUM)|g;\n' \ | ||
's|@@@@-@@-@@|$(DATE)|g;\n' \ | ||
@@ -828,13 +811,12 @@ | ||
|
||
.PHONY : test | ||
test: | ||
- @printf "$(LOGFORMAT)" enable test "-> define -DTEST" | ||
- @rm -f *.o $(ALL_TOOLS_X) | ||
- @echo "-DTEST" >>$(MODE_FILE) | ||
- @sort $(MODE_FILE) | uniq > $(MODE_FILE).tmp | ||
+ rm -f *.o $(ALL_TOOLS_X) | ||
+ echo "-DTEST" >>$(MODE_FILE) | ||
+ sort $(MODE_FILE) | uniq > $(MODE_FILE).tmp | ||
# 2 steps to bypass a cygwin mv failure | ||
- @cp $(MODE_FILE).tmp $(MODE_FILE) | ||
- @rm -f $(MODE_FILE).tmp | ||
+ cp $(MODE_FILE).tmp $(MODE_FILE) | ||
+ rm -f $(MODE_FILE).tmp | ||
|
||
# | ||
#-------------------------- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
# Copyright 1999-2019 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=7 | ||
|
||
inherit toolchain-funcs | ||
|
||
MY_P="wiimms-iso-tools.source-${PV}" | ||
|
||
DESCRIPTION="command line tools to manipulate Wii/GameCube ISO images and WBFS containers" | ||
HOMEPAGE="https://wit.wiimm.de/" | ||
SRC_URI="https://download.wiimm.de/source/wiimms-iso-tools/${MY_P}.tar.bz2" | ||
|
||
LICENSE="GPL-2" | ||
SLOT="0" | ||
KEYWORDS="~amd64 ~x86" | ||
IUSE="+fuse +zlib" | ||
|
||
RDEPEND=" | ||
app-arch/bzip2:0= | ||
fuse? ( sys-fs/fuse:0= ) | ||
zlib? ( sys-libs/zlib:0= ) | ||
" | ||
DEPEND="${RDEPEND}" | ||
|
||
DOCS="doc/*.txt" | ||
|
||
PATCHES=( | ||
"${FILESDIR}"/${P}-makefile.patch | ||
"${FILESDIR}"/${PN}-2.30a-no-exec-stack.patch | ||
) | ||
|
||
S=${WORKDIR}/${MY_P} | ||
|
||
src_compile() { | ||
export NO_FUSE=$(usex fuse 0 1) | ||
export NO_ZLIB=$(usex zlib 0 1) | ||
|
||
emake INSTALL_PATH="${D}"/usr CC="$(tc-getCC)" | ||
emake doc | ||
} |