From 54b07a35602e8a9d089df35e938c724e5c07ff38 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 3 Jul 2023 11:29:51 +0200 Subject: [PATCH] libpng16, remove not provided lib:libpng (#8937) --- media-libs/libpng/libpng16-1.6.38.recipe | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/media-libs/libpng/libpng16-1.6.38.recipe b/media-libs/libpng/libpng16-1.6.38.recipe index 2be212bf1..204a10895 100644 --- a/media-libs/libpng/libpng16-1.6.38.recipe +++ b/media-libs/libpng/libpng16-1.6.38.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1995-2022 The PNG Reference Library Authors 1996-1997 Andreas Dilger 1995-1996 Guy Eric Schalnat, Group 42, Inc." LICENSE="LibPNG" -REVISION="2" +REVISION="3" SOURCE_URI="https://downloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz" CHECKSUM_SHA256="e2b5e1b4329650992c041996cf1269681b341191dc07ffed816c555769cceb77" SOURCE_DIR="libpng-$portVersion" @@ -24,7 +24,6 @@ portVersionCompat="$portVersion compat >= 1.6" PROVIDES=" libpng16$secondaryArchSuffix = $portVersionCompat - lib:libpng$secondaryArchSuffix = $libVersionCompat lib:libpng16$secondaryArchSuffix = $libVersionCompat " REQUIRES=" @@ -54,7 +53,7 @@ CONFLICTS_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libz$secondaryArchSuffix >= 1.0.4 + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -62,14 +61,15 @@ BUILD_PREREQUIRES=" cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix >= 2.4.2 + cmd:libtoolize$secondaryArchSuffix cmd:make " BUILD() { autoreconf -f -i - runConfigure ./configure + runConfigure ./configure \ + --disable-static make $jobArgs } @@ -77,8 +77,8 @@ INSTALL() { make install - # remove libtool file & static libraries - rm $libDir/libpng*.la $libDir/libpng*.a + # remove libtool file + rm $libDir/libpng*.la prepareInstalledDevelLibs libpng libpng16 fixPkgconfig