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

libpng: renamed the 1.6 recipe to libpng16.

Browse Source 
* can be installed next to the 1.5 one.
* removed user documentation in the 1.5 package which conflicts with
the 1.6 user documentation.
* have 1.6 devel package conflicts with the 1.5 devel package.
This commit is contained in:
Jerome Duval
2014-11-12 19:09:20 +00:00
parent e70def369c
commit a9a35a5eba
3 changed files with 10 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-libs/libpng/libpng-1.5.12.recipe
View File

@@ -12,7 +12,7 @@ COPYRIGHT="
LICENSE="LibPNG"
SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz"
CHECKSUM_SHA256="aae4c469f5f03e7c180708fc547335ad1e29854bfdda992196e9c39d2447e9f6"
REVISION="3"
REVISION="4"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -53,6 +53,8 @@ BUILD()
INSTALL()
{
make install
rm -Rf $manDir/man5
prepareInstalledDevelLibs libpng libpng15
fixPkgconfig

78
media-libs/libpng/libpng-1.6.12.recipe
View File

@@ -1,78 +0,0 @@
SUMMARY="Portable Network Graphics library"
DESCRIPTION="
libpng is the official PNG reference library. It supports almost all PNG \
features, is extensible, and has been extensively tested for over 17 years
"
HOMEPAGE="http://www.libpng.org"
COPYRIGHT="
1998-2014 Glenn Randers-Pehrson
1996-1997 Andreas Dilger
1995-1996 Guy Eric Schalnat, Group 42, Inc.
"
LICENSE="LibPNG"
SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
CHECKSUM_SHA256="73bec855f265e86cf247c8e60069338bba7f16deade54b459b6465ffa86f7076"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libpng$secondaryArchSuffix = $portVersion compat >= 1.6
lib:libpng$secondaryArchSuffix = 16.12.0 compat >= 16
lib:libpng16$secondaryArchSuffix = 16.12.0 compat >= 16
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libz$secondaryArchSuffix >= 1.0.4
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtool >= 2.4.2
cmd:make
"
BUILD()
{
autoreconf -f -i
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libpng libpng16
fixPkgconfig
# devel package
packageEntries devel \
$binDir \
$developDir \
$manDir/man3
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6
devel:libpng$secondaryArchSuffix = 16.12.0 compat >= 16
devel:libpng16$secondaryArchSuffix = 16.12.0 compat >= 16
"
REQUIRES_devel="
libpng$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix
"

10
media-libs/libpng/libpng-1.6.13.recipe → media-libs/libpng/libpng16-1.6.13.recipe
View File

@@ -12,12 +12,13 @@ COPYRIGHT="
LICENSE="LibPNG"
SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
CHECKSUM_SHA256="7cbeb2429a249464e8d529e955045e00d0a90637d25970a081258141630c8941"
SOURCE_DIR="libpng-$portVersion"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libpng$secondaryArchSuffix = $portVersion compat >= 1.6
libpng16$secondaryArchSuffix = $portVersion compat >= 1.6
lib:libpng$secondaryArchSuffix = 16.13.0 compat >= 16
lib:libpng16$secondaryArchSuffix = 16.13.0 compat >= 16
"
@@ -63,7 +64,7 @@ INSTALL()
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
libpng16${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
@@ -72,7 +73,10 @@ PROVIDES_devel="
devel:libpng16$secondaryArchSuffix = 16.13.0 compat >= 16
"
REQUIRES_devel="
libpng$secondaryArchSuffix == $portVersion base
libpng16$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix
"
CONFLICTS_devel="
libpng${secondaryArchSuffix}_devel
"