got apng2gif working, but gif2apng broken

haikuports · Dec 1, 2016 · 3de3aa2 · 3de3aa2
1 parent b6e7996
commit 3de3aa2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/media-gfx/apng2gif/apng2gif-1.7.recipe b/media-gfx/apng2gif/apng2gif-1.7.recipe
@@ -11,7 +11,7 @@ SOURCE_DIR=""
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
+if [ "$targetArchitecture" = x86_gcc2 ]; then
 	LIBS="-lstdc++.r4 -lpng -lz"
 else
 	LIBS="-lstdc++ -lpng -lz"
@@ -40,7 +40,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make
+	make LIBS="$LIBS"
 }
 
 INSTALL()

diff --git a/media-gfx/gif2apng/gif2apng-1.9.recipe b/media-gfx/gif2apng/gif2apng-1.9.recipe
@@ -11,10 +11,10 @@ SOURCE_DIR=""
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
-	LIBS="-lstdc++.r4 -lpng -lz"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	LIBS="-lstdc++.r4 -lm -lz"
 else
-	LIBS="-lstdc++ -lpng -lz"
+	LIBS="-lstdc++ -lm -lz"
 fi
 
 PROVIDES="
@@ -38,7 +38,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make
+	make LIBS="$LIBS"
 }
 
 INSTALL()

diff --git a/media-gfx/gif2apng/patches/gif2apng-1.9.patchset b/media-gfx/gif2apng/patches/gif2apng-1.9.patchset
@@ -0,0 +1,22 @@
+From 65321cc1dab144f917a2f0fd0f2197741296e354 Mon Sep 17 00:00:00 2001
+From: Winston Durand <me@winstondurand.com>
+Date: Thu, 1 Dec 2016 15:28:50 +0000
+Subject: set to default value in makefile
+
+
+diff --git a/Makefile b/Makefile
+index 5e55284..bd0ed65 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,7 +5,7 @@ CFLAGS     = -Wall -pedantic
+ CFLAGS_OPT = -O2
+ CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
+ LDFLAGS    = -s
+-LIBS       = -lstdc++ -lm -lz
++LIBS      ?= -lstdc++ -lm -lz
+
+ INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS))
+ OBJ_DIRS := $(addprefix obj/, $(SRC_DIRS))
+-- 
+2.7.0
+