haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add gcc2 support for optipng

Browse Source 
Also switched it to use the system lib{png,z}
This commit is contained in:
Chris Roberts
2013-12-23 12:29:53 -07:00
parent 6c3fd23d22
commit 2a3641bc15
3 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
media-gfx/optipng/optipng-0.7.4.recipe
View File

@@ -10,14 +10,8 @@ SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz"
CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73"
LICENSE="Zlib"
COPYRIGHT="2001-2012 Cosmin Truta"
REVISION="1"
ARCHITECTURES="?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
REVISION="2"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
PROVIDES="
optipng$secondaryArchSuffix = $portVersion
@@ -26,10 +20,14 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libpng
lib:libz
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libpng
devel:libz
"
BUILD_PREREQUIRES="
@@ -39,13 +37,13 @@ BUILD_PREREQUIRES="
cmd:ranlib
"
PATCHES="
optipng-0.7.4.patch
"
PATCHES="optipng-0.7.4.patchset"
BUILD()
{
./configure -bindir=$binDir -mandir=$manDir
./configure -bindir=$binDir -mandir=$manDir \
-with-system-libpng \
-with-system-zlib
make
}

25
media-gfx/optipng/patches/optipng-0.7.4.patch
View File

@@ -1,25 +0,0 @@
From 8fc175d03be69e84940012866ffdfa0b7b6c865b Mon Sep 17 00:00:00 2001
From: Luke <noryb009@gmail.com>
Date: Fri, 20 Dec 2013 17:11:40 +0000
Subject: [PATCH] Remove reference to libm
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 5437b74..f7087fe 100755
--- a/configure
+++ b/configure
@@ -305,7 +305,7 @@ sed_config="
s#@ARFLAGS@#${ARFLAGS-cru}#g
s#@RANLIB@#${RANLIB-ranlib}#g
s#@LIBS@#${LIBS-}#g
- s#@LIBM@#${LIBM--lm}#g
+ s#@LIBM@#${LIBM-}#g
s#@LIBZ@#${LIBZ--lz}#g
s#@LIBPNG@#${LIBPNG--lpng}#g
s#@DIFF@#${DIFF-diff -b -u}#g
--
1.8.3.4

45
media-gfx/optipng/patches/optipng-0.7.4.patchset Normal file
View File

@@ -0,0 +1,45 @@
From 9aeb37585d609791981ff00956a99d54a9bf446e Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 23 Dec 2013 12:13:23 -0700
Subject: applying patch optipng-0.7.4.patch
diff --git a/configure b/configure
index 5437b74..f7087fe 100755
--- a/configure
+++ b/configure
@@ -305,7 +305,7 @@ sed_config="
s#@ARFLAGS@#${ARFLAGS-cru}#g
s#@RANLIB@#${RANLIB-ranlib}#g
s#@LIBS@#${LIBS-}#g
- s#@LIBM@#${LIBM--lm}#g
+ s#@LIBM@#${LIBM-}#g
s#@LIBZ@#${LIBZ--lz}#g
s#@LIBPNG@#${LIBPNG--lpng}#g
s#@DIFF@#${DIFF-diff -b -u}#g
--
1.8.3.4
From 02727f980a432201225b91c51f7f76fad3d12cca Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 23 Dec 2013 12:16:17 -0700
Subject: Remove Wextra from CFLAGS to make gcc2 happy
diff --git a/configure b/configure
index f7087fe..f3bca47 100755
--- a/configure
+++ b/configure
@@ -192,7 +192,7 @@ rm -f $test.c $test.o
if test $gccish -ne 0
then
CC="${CC-$cc}"
- CFLAGS="${CFLAGS--O2 -Wall -Wextra}"
+ CFLAGS="${CFLAGS--O2 -Wall}"
else
CC="${CC-cc}"
CFLAGS="${CFLAGS--O}"
--
1.8.3.4