diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-09-17 17:03:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-17 17:03:45 +0100 |
| commit | c9e9e39938097bf29063c271195ad0d7d7bd02a9 (patch) | |
| tree | f2f4ab36d22272fec3a1d1313d8f700b1f0f6744 /media-gfx/apngopt/files | |
| parent | 0968caae52d6eae7513e2ce4e0900a2e009780ee (diff) | |
gentoo auto-resync : 17:09:2023 - 17:03:44
Diffstat (limited to 'media-gfx/apngopt/files')
| -rw-r--r-- | media-gfx/apngopt/files/apngopt-1.4-makefile.patch | 27 | ||||
| -rw-r--r-- | media-gfx/apngopt/files/apngopt-1.4-r1-makefile.patch | 43 |
2 files changed, 43 insertions, 27 deletions
diff --git a/media-gfx/apngopt/files/apngopt-1.4-makefile.patch b/media-gfx/apngopt/files/apngopt-1.4-makefile.patch deleted file mode 100644 index 4ec6084139a0..000000000000 --- a/media-gfx/apngopt/files/apngopt-1.4-makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -Use system zopfli library and respect CFLAGS. - ---- apngopt-1.4-src/Makefile -+++ apngopt-1.4-src/Makefile -@@ -1,10 +1,10 @@ - PACKAGE = apngopt - CC = gcc --SRC_DIRS = . 7z zopfli -+SRC_DIRS = . 7z - CFLAGS = -Wall -pedantic --CFLAGS_OPT = -O2 -+#CFLAGS_OPT = -O2 - CFLAGS_7Z = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses --LIBS = -lstdc++ -lm -lpng -lz -+LIBS = -lstdc++ -lm -lpng -lz -lzopfli - - INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS)) - OBJ_DIRS := $(addprefix obj/, $(SRC_DIRS)) -@@ -16,7 +16,7 @@ - all : $(PACKAGE) - - $(PACKAGE) : objdirs $(OBJECTS) -- $(CC) -o $@ $(OBJECTS) -s $(LIBS) -+ $(CC) -o $@ $(OBJECTS) $(LIBS) - - objdirs : - mkdir -p $(OBJ_DIRS) diff --git a/media-gfx/apngopt/files/apngopt-1.4-r1-makefile.patch b/media-gfx/apngopt/files/apngopt-1.4-r1-makefile.patch new file mode 100644 index 000000000000..0726f81db4a2 --- /dev/null +++ b/media-gfx/apngopt/files/apngopt-1.4-r1-makefile.patch @@ -0,0 +1,43 @@ +Use system zopfli library and respect CFLAGS. + +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,9 @@ + PACKAGE = apngopt +-CC = gcc +-SRC_DIRS = . 7z zopfli +-CFLAGS = -Wall -pedantic +-CFLAGS_OPT = -O2 +-CFLAGS_7Z = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses +-LIBS = -lstdc++ -lm -lpng -lz ++ ++SRC_DIRS = . 7z ++CXXFLAGS += -Wall -pedantic ++CXXFLAGS_7Z = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses ++LIBS += -lm -lpng -lz -lzopfli + + INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS)) + OBJ_DIRS := $(addprefix obj/, $(SRC_DIRS)) +@@ -16,19 +15,16 @@ + all : $(PACKAGE) + + $(PACKAGE) : objdirs $(OBJECTS) +- $(CC) -o $@ $(OBJECTS) -s $(LIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) + + objdirs : + mkdir -p $(OBJ_DIRS) + + obj/%.o : %.cpp +- $(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT) +- +-obj/%.o : %.c +- $(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< $(INCUDE_DIRS) + + obj/%.o : %.cc +- $(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT) $(CFLAGS_7Z) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< $(INCUDE_DIRS) $(CXXFLAGS_7Z) + + .PHONY : clean + |