diff --git a/media-gfx/hqx/hqx-1.1.recipe b/media-gfx/hqx/hqx-1.2.recipe similarity index 70% rename from media-gfx/hqx/hqx-1.1.recipe rename to media-gfx/hqx/hqx-1.2.recipe index 6a420636b..fb9e7da9f 100644 --- a/media-gfx/hqx/hqx-1.1.recipe +++ b/media-gfx/hqx/hqx-1.2.recipe @@ -5,18 +5,24 @@ Maxim Stepin." HOMEPAGE="https://github.com/grom358/hqx" COPYRIGHT="2003 Maxim Stepin 2010 Cameron Zemek" -LICENSE="GNU LGPL v2" -REVISION="4" -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" +LICENSE="GNU LGPL v2.1" +REVISION="1" +SOURCE_URI="https://github.com/grom358/hqx/archive/refs/tags/v$portVersion.tar.gz" +CHECKSUM_SHA256="5a44f1745b7fb0321c1d244822d79505df7cf85cfe383ee70b16f5bcd6803396" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + PROVIDES=" hqx$secondaryArchSuffix = $portVersion - cmd:hqx$secondaryArchSuffix = $portVersion + cmd:hqx$commandSuffix = $portVersion lib:libhqx$secondaryArchSuffix = 1.0.0 compat >= 1 " REQUIRES=" @@ -54,8 +60,10 @@ BUILD_PREREQUIRES=" BUILD() { autoreconf -vfi - runConfigure ./configure - make OBJ_DIR=objects + + runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir --disable-static + + make $jobArgs } INSTALL() @@ -64,6 +72,7 @@ INSTALL() prepareInstalledDevelLibs libhqx - packageEntries devel \ - $developDir + fixPkgconfig + + packageEntries devel $developDir } diff --git a/media-gfx/hqx/patches/hqx-1.1.patchset b/media-gfx/hqx/patches/hqx-1.1.patchset deleted file mode 100644 index 561ae848a..000000000 --- a/media-gfx/hqx/patches/hqx-1.1.patchset +++ /dev/null @@ -1,21 +0,0 @@ -From e48bb40321ab336ede3e9f9ae5b2307262415a46 Mon Sep 17 00:00:00 2001 -From: begasus -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 -