hqx: enable x86 and x86_64, fix build (#1707)

This commit is contained in:
Schrijvers Luc
2017-10-13 12:25:25 +02:00
committed by Jérôme Duval
parent d402bb9a69
commit 680d0e29a2
3 changed files with 4 additions and 94 deletions

View File

@@ -1,69 +0,0 @@
SUMMARY="A fast, high-quality magnification filter designed for pixel art"
DESCRIPTION="hqx ('hq' stands for 'high quality' and 'x' stands for \
magnification) is one of the pixel art scaling algorithms developed by \
Maxim Stepin."
HOMEPAGE="https://code.google.com/archive/p/hqx/"
COPYRIGHT="2003 Maxim Stepin
2010 Cameron Zemek"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/hqx/hqx-1.0.tar.gz"
CHECKSUM_SHA256="c260a489023366d4b2e727eb972be979af5a8c6090a7316d4356468e11dbd579"
PATCHES="hqx-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="?x86"
PROVIDES="
hqx$secondaryArchSuffix = $portVersion
cmd:hqx$secondaryArchSuffix = $portVersion
lib:libhqx$secondaryArchSuffix = 1.0.0 compat >= 1
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libIL$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libjasper$secondaryArchSuffix
lib:libmng$secondaryArchSuffix
"
PROVIDES_devel="
hqx${secondaryArchSuffix}_devel = $portVersion
devel:libhqx$secondaryArchSuffix = 1.0.0 compat >= 1
"
REQUIRES_devel="
hqx$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libIL$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:awk
cmd:libtoolize$secondaryArchSuffix
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
autoreconf -vfi
runConfigure ./configure
make $jobArgs OBJ_DIR=objects
}
INSTALL()
{
make install
prepareInstalledDevelLibs libhqx
packageEntries devel \
$developDir
}

View File

@@ -6,13 +6,13 @@ HOMEPAGE="https://code.google.com/archive/p/hqx/"
COPYRIGHT="2003 Maxim Stepin
2010 Cameron Zemek"
LICENSE="GNU LGPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/hqx/hqx-1.1.tar.gz"
CHECKSUM_SHA256="cc18f571fb4bc325317892e39ecd5711c4901831926bc93296de9ebb7b2f317b"
PATCHES="hqx-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="?x86"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
hqx$secondaryArchSuffix = $portVersion
@@ -55,7 +55,7 @@ BUILD()
{
autoreconf -vfi
runConfigure ./configure
make $jobArgs OBJ_DIR=objects
make OBJ_DIR=objects
}
INSTALL()

View File

@@ -1,21 +0,0 @@
From e48bb40321ab336ede3e9f9ae5b2307262415a46 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Fri, 29 Sep 2017 12:04:04 +0200
Subject: archiver requires 'AM_PROG_AR' in 'configure.ac'
diff --git a/configure.ac b/configure.ac
index 9f3c3bc..08717b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_C_INLINE
AC_C_BIGENDIAN
AM_INIT_AUTOMAKE([-Wall -Werror])
AM_PROG_CC_C_O
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_CHECK_HEADER([IL/il.h],,AC_MSG_ERROR("DevIL il.h required"))
--
2.14.2