diff --git a/media-libs/libnsbmp/libnsbmp-0.0.3.recipe b/media-libs/libnsbmp/libnsbmp-0.0.3.recipe deleted file mode 100644 index 667f0b108..000000000 --- a/media-libs/libnsbmp/libnsbmp-0.0.3.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" -HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" -SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.0.3-src.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" - -BUILD() -{ - cd libnsbmp-0.0.3 - make -} - -INSTALL() -{ - cd libnsbmp-0.0.3 - make install -} - -LICENSE="MIT" -COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe b/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe deleted file mode 100644 index a0bd99208..000000000 --- a/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" -HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" -SRC_URI="git://git.netsurf-browser.org/libnsbmp.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/buildsystem >= 0.0.1" - -BUILD() -{ - cd libnsbmp-0.1.0-HEAD - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libnsbmp-0.1.0-HEAD - make install PREFIX=/boot/common -} - -LICENSE="MIT" -COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox" diff --git a/media-libs/libnsbmp/libnsbmp-0.1.1.recipe b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe new file mode 100644 index 000000000..cf0586719 --- /dev/null +++ b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe @@ -0,0 +1,42 @@ +DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" +SUMMARY="A decoding library for BMP and ICO images" +HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" +SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.1.1-src.tar.gz" +CHECKSUM_SHA256="584046809d3213e5917cd26eafb03068ca94274229f595f0e0520b15fa454f98" +REVISION="1" +ARCHITECTURES="x86_gcc2" +PROVIDES=" + libnsbmp = $portVersion +" +BUILD_REQUIRES=" + netsurf_buildsystem +" +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:make +" + +PATCHES="libnsbmp-0.1.1.patchset" +BUILD() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem +} + +INSTALL() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + INCLUDEDIR=$relativeIncludeDir install + + prepareInstalledDevelLib libnsbmp + fixPkgconfig libnsbmp + packageEntries devel $developDir +} + +LICENSE="MIT" +COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox" + +PROVIDES_devel=" + libnsbmp_devel = $portVersion + devel:libnsbmp = $portVersion +" diff --git a/media-libs/libnsbmp/patches/libnsbmp-0.1.1.patchset b/media-libs/libnsbmp/patches/libnsbmp-0.1.1.patchset new file mode 100644 index 000000000..230807a60 --- /dev/null +++ b/media-libs/libnsbmp/patches/libnsbmp-0.1.1.patchset @@ -0,0 +1,35 @@ +From 7d7f8e2d601f5d40e5f434fe07c705eb5437605a Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 +