libnsbmp: drop 0.1.1 & 0.1.2, touch 0.1.3, add 0.1.4. (#907)

On 0.1.3 and 0.1.4: add shared lib.
This commit is contained in:
fbrosson
2016-12-03 07:00:17 +00:00
committed by GitHub
parent dd0e2cfb7d
commit 3c136053a6
4 changed files with 31 additions and 103 deletions

View File

@@ -1,54 +0,0 @@
SUMMARY="A decoding library for BMP and ICO images"
DESCRIPTION="Libnsbmp is a decoding library written in C for BMP and ICO image file formats. \
It was developed as part of the NetSurf project."
HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-$portVersion-src.tar.gz"
CHECKSUM_SHA256="584046809d3213e5917cd26eafb03068ca94274229f595f0e0520b15fa454f98"
PATCHES="libnsbmp-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
libnsbmp = $portVersion
"
REQUIRES="
haiku
"
PROVIDES_devel="
libnsbmp_devel = $portVersion
devel:libnsbmp = $portVersion
"
REQUIRES_devel="
libnsbmp$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel
netsurf_buildsystem
cmd:gcc
cmd:make
"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
}
INSTALL()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir install
prepareInstalledDevelLib libnsbmp
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}

View File

@@ -1,9 +1,10 @@
SUMMARY="A decoding library for BMP and ICO images"
DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats"
HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
COPYRIGHT="2006 Richard Wilson, 2008 - 2016 Sean Fox"
COPYRIGHT="2006 Richard Wilson
2008-2016 Sean Fox"
LICENSE="MIT"
REVISION="2"
REVISION="3"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-$portVersion-src.tar.gz"
CHECKSUM_SHA256="deff0a0497fc011356f901b3f75ee612721133c91b256dda28e540c803ffbb3e"
@@ -12,6 +13,7 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libnsbmp$secondaryArchSuffix = $portVersion
lib:libnsbmp$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -26,9 +28,9 @@ REQUIRES_devel="
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
netsurf_buildsystem
cmd:gcc$secondaryArchSuffix
cmd:make
@@ -36,13 +38,20 @@ BUILD_PREREQUIRES="
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
for linkage in lib-static lib-shared; do
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
COMPONENT_TYPE=$linkage
done
}
INSTALL()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir install LIBDIR=$relativeLibDir
for linkage in lib-static lib-shared; do
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
COMPONENT_TYPE=$linkage \
INCLUDEDIR=$relativeIncludeDir install \
LIBDIR=$relativeLibDir
done
prepareInstalledDevelLib libnsbmp
fixPkgconfig

View File

@@ -1,18 +1,19 @@
SUMMARY="A decoding library for BMP and ICO images"
DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats"
HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
COPYRIGHT="2006 Richard Wilson
2008-2016 Sean Fox"
LICENSE="MIT"
REVISION="2"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-$portVersion-src.tar.gz"
CHECKSUM_SHA256="969ba1c4f778b6ecee5fd834a6206c97b49885673389260fef1043dfca2968b1"
PATCHES="libnsbmp-0.1.1.patchset"
CHECKSUM_SHA256="2bcbb3e880e46b94259a294c22b8c7543ddd2ae8910f14d227981a4aec038a78"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libnsbmp$secondaryArchSuffix = $portVersion
lib:libnsbmp$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -27,9 +28,9 @@ REQUIRES_devel="
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
netsurf_buildsystem
cmd:gcc$secondaryArchSuffix
cmd:make
@@ -37,13 +38,20 @@ BUILD_PREREQUIRES="
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
for linkage in lib-static lib-shared; do
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
COMPONENT_TYPE=$linkage
done
}
INSTALL()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir install LIBDIR=$relativeLibDir
for linkage in lib-static lib-shared; do
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
COMPONENT_TYPE=$linkage \
INCLUDEDIR=$relativeIncludeDir install \
LIBDIR=$relativeLibDir
done
prepareInstalledDevelLib libnsbmp
fixPkgconfig

View File

@@ -1,35 +0,0 @@
From 7d7f8e2d601f5d40e5f434fe07c705eb5437605a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 21:20:45 +0200
Subject: Fix paths for Haiku.
diff --git a/Makefile b/Makefile
index aad7a6e..8b0a5df 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ endif
include $(NSBUILD)/Makefile.top
# Extra installation rules
-I := /include/
+I := /$(INCLUDEDIR)/
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsbmp.h
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
diff --git a/libnsbmp.pc.in b/libnsbmp.pc.in
index 5d6b843..5536269 100644
--- a/libnsbmp.pc.in
+++ b/libnsbmp.pc.in
@@ -1,7 +1,7 @@
prefix=PREFIX
exec_prefix=${prefix}
libdir=${exec_prefix}/LIBDIR
-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
Name: libnsbmp
Description: Provides bmp loading and conversion
--
1.8.3.4