From dd0e2cfb7df33af360913c8ddd617610ad1e5063 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sat, 3 Dec 2016 06:59:44 +0000 Subject: [PATCH] libnsgif: drop 0.1.1 & 0.1.2, touch 0.1.3, add 0.1.4. (#906) On 0.1.3 and 0.1.4: add shared lib. --- media-libs/libnsgif/libnsgif-0.1.1.recipe | 54 ------------------- media-libs/libnsgif/libnsgif-0.1.3.recipe | 21 +++++--- ...gif-0.1.2.recipe => libnsgif-0.1.4.recipe} | 24 ++++++--- .../libnsgif/patches/libnsgif-0.1.1.patchset | 35 ------------ 4 files changed, 31 insertions(+), 103 deletions(-) delete mode 100644 media-libs/libnsgif/libnsgif-0.1.1.recipe rename media-libs/libnsgif/{libnsgif-0.1.2.recipe => libnsgif-0.1.4.recipe} (62%) delete mode 100644 media-libs/libnsgif/patches/libnsgif-0.1.1.patchset diff --git a/media-libs/libnsgif/libnsgif-0.1.1.recipe b/media-libs/libnsgif/libnsgif-0.1.1.recipe deleted file mode 100644 index 72337e3e8..000000000 --- a/media-libs/libnsgif/libnsgif-0.1.1.recipe +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY="A decoding library for GIF images" -DESCRIPTION="Libnsgif is a decoding library written in C for GIF image file format. \ -It was written as part of the NetSurf project." -HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" -COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox" -LICENSE="MIT" -REVISION="1" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-$portVersion-src.tar.gz" -CHECKSUM_SHA256="d450ea0a9da234486e997248b30a86524f75f1021ca67017b5597423cf6c0a15" -PATCHES="libnsgif-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - libnsgif = $portVersion - " -REQUIRES=" - haiku - " - -PROVIDES_devel=" - libnsgif_devel = $portVersion - devel:libnsgif = $portVersion - " -REQUIRES_devel=" - libnsgif$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 libnsgif - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir -} diff --git a/media-libs/libnsgif/libnsgif-0.1.3.recipe b/media-libs/libnsgif/libnsgif-0.1.3.recipe index f65ad1cd9..9a3cd1919 100644 --- a/media-libs/libnsgif/libnsgif-0.1.3.recipe +++ b/media-libs/libnsgif/libnsgif-0.1.3.recipe @@ -1,9 +1,10 @@ SUMMARY="A decoding library for GIF images" DESCRIPTION="Libnsgif is a decoding library for GIF image file format" HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" -COPYRIGHT="2006 Richard Wilson, 2008 - 2016 Sean Fox" +COPYRIGHT="2006 Richard Wilson + 2008-2016 Sean Fox" LICENSE="MIT" -REVISION="1" +REVISION="2" SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-$portVersion-src.tar.gz" CHECKSUM_SHA256="d3d2c9c008047eab41fc0a4ce7c280456c55c479d191e1968f843b005f219fa8" @@ -12,6 +13,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" libnsgif$secondaryArchSuffix = $portVersion + lib:libnsgif$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 libnsgif fixPkgconfig diff --git a/media-libs/libnsgif/libnsgif-0.1.2.recipe b/media-libs/libnsgif/libnsgif-0.1.4.recipe similarity index 62% rename from media-libs/libnsgif/libnsgif-0.1.2.recipe rename to media-libs/libnsgif/libnsgif-0.1.4.recipe index a636cc74f..90424dff3 100644 --- a/media-libs/libnsgif/libnsgif-0.1.2.recipe +++ b/media-libs/libnsgif/libnsgif-0.1.4.recipe @@ -1,18 +1,19 @@ SUMMARY="A decoding library for GIF images" DESCRIPTION="Libnsgif is a decoding library for GIF image file format" HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" -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/libnsgif-$portVersion-src.tar.gz" -CHECKSUM_SHA256="dd6948af5c054224489beaa4b4cc13c2c4f695d5bdee7e58ec2370c53cd9faa5" -PATCHES="libnsgif-0.1.1.patchset" +CHECKSUM_SHA256="133c2354c61564080ad1bac253ee0df7e6c82bb6090644ca438ce3a799f6bad1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" libnsgif$secondaryArchSuffix = $portVersion + lib:libnsgif$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 libnsgif fixPkgconfig diff --git a/media-libs/libnsgif/patches/libnsgif-0.1.1.patchset b/media-libs/libnsgif/patches/libnsgif-0.1.1.patchset deleted file mode 100644 index b6a97eca3..000000000 --- a/media-libs/libnsgif/patches/libnsgif-0.1.1.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From 70d5d372e5534a2d1f58025ea8a7d92fae60ad56 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 9 Jun 2014 21:28:28 +0200 -Subject: Fix paths for Haiku port. - - -diff --git a/Makefile b/Makefile -index 099477d..ccff0e9 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/libnsgif.h - INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in - INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) -diff --git a/libnsgif.pc.in b/libnsgif.pc.in -index 3d85e6a..0255bf9 100644 ---- a/libnsgif.pc.in -+++ b/libnsgif.pc.in -@@ -1,7 +1,7 @@ - prefix=PREFIX - exec_prefix=${prefix} - libdir=${exec_prefix}/LIBDIR --includedir=${prefix}/include -+includedir=${prefix}/INCLUDEDIR - - Name: libnsgif - Description: Provides gif loading and conversion --- -1.8.3.4 -