diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
tree | 326613a08f25851c388715e205576a2e7d25dc4f /games-util/wit/files | |
parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) |
gentoo resync : 18.08.2019
Diffstat (limited to 'games-util/wit/files')
-rw-r--r-- | games-util/wit/files/wit-2.30a-makefile.patch | 120 | ||||
-rw-r--r-- | games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch | 20 | ||||
-rw-r--r-- | games-util/wit/files/wit-3.02a-makefile.patch | 4 |
3 files changed, 2 insertions, 142 deletions
diff --git a/games-util/wit/files/wit-2.30a-makefile.patch b/games-util/wit/files/wit-2.30a-makefile.patch deleted file mode 100644 index d705487cd8ba..000000000000 --- a/games-util/wit/files/wit-2.30a-makefile.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- wit-2.30a/Makefile -+++ wit-2.30a/Makefile -@@ -190,8 +190,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}) - - -@@ -273,10 +274,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),mac) - CFLAGS += -I/usr/local/include - endif -@@ -291,7 +290,7 @@ - ifeq ($(HAVE_ZLIB),1) - LIBS += -lz - endif --LIBS += $(XLIBS) -+LIBS += $(XLIBS) -lbz2 - - DISTRIB_RM = ./wit-v$(VERSION)-r - DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT) -@@ -344,71 +343,60 @@ - # general rules - - $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS) -- @printf "$(LOGFORMAT)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)" -- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ -+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ - $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@ -- @if test -f $@.exe; then $(STRIP) $@.exe; 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)" helper "$@ $(TOBJ_$@)" "$(MODE)" -- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ -+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ - $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@ - - #-------------------------- - - $(WDF_LINKS): wdf -- @printf "$(LOGFORMAT)" "link" "wdf -> $@" "" -- @ln -f wdf "$@" -+ ln -f wdf "$@" - - #-------------------------- - - $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile -- @printf "$(LOGFORMAT)" +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)" object "$@" "$(MODE)" -- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ -+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ - - #-------------------------- - - $(ASM_OBJECTS): %.o: %.S Makefile -- @printf "$(LOGFORMAT)" 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 tab-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 - - # - ############################################################################### diff --git a/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch b/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch deleted file mode 100644 index a6083103b857..000000000000 --- a/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- wit-2.40a/src/wfuse.c -+++ wit-2.40a/src/wfuse.c -@@ -340,7 +340,7 @@ - } - ResetWBFS(df->wbfs); - FREE(df->wbfs); -- memset(df,0,sizeof(df)); -+ memset(df,0,sizeof(*df)); - n_dfile--; - } - -@@ -352,7 +352,7 @@ - - if (found_df) - { -- memset(found_df,0,sizeof(found_df)); -+ memset(found_df,0,sizeof(*found_df)); - WBFS_t * wbfs = MALLOC(sizeof(*wbfs)); - InitializeWBFS(wbfs); - enumError err = OpenWBFS(wbfs,source_file,false,true,0); diff --git a/games-util/wit/files/wit-3.02a-makefile.patch b/games-util/wit/files/wit-3.02a-makefile.patch index 7d3be3fbd57a..a0dea1405a6e 100644 --- a/games-util/wit/files/wit-3.02a-makefile.patch +++ b/games-util/wit/files/wit-3.02a-makefile.patch @@ -1,5 +1,5 @@ Don't link libdl into wfuse as it's unnecessary, use system bzip2, respect user -CFLAGS, and use verbose build output. +CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output. --- wiimms-iso-tools.source-3.02a/Makefile +++ wiimms-iso-tools.source-3.02a/Makefile @@ -40,7 +40,7 @@ CFLAGS, and use verbose build output. LIBS += -lz endif -LIBS += -lm -lncurses $(XLIBS) -+LIBS += -lm -lncurses -lbz2 $(XLIBS) ++LIBS += -lm $(shell pkg-config --libs ncurses) -lbz2 $(XLIBS) DISTRIB_RM = ./wit-v$(VERSION)-r DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT) |