From 4cb81bbf1e8d83f4e7fdda8487f9865abf643af4 Mon Sep 17 00:00:00 2001 From: kenmays Date: Tue, 17 Sep 2024 09:09:05 -0700 Subject: [PATCH] giflib: bump version (#10833) Co-authored-by: Schrijvers Luc --- ...iflib-5.2.1.recipe => giflib-5.2.2.recipe} | 28 +++++-- media-libs/giflib/giflib6-5.0.5.recipe | 84 ------------------- media-libs/giflib/patches/giflib-5.0.5.patch | 20 ----- 3 files changed, 21 insertions(+), 111 deletions(-) rename media-libs/giflib/{giflib-5.2.1.recipe => giflib-5.2.2.recipe} (86%) delete mode 100644 media-libs/giflib/giflib6-5.0.5.recipe delete mode 100644 media-libs/giflib/patches/giflib-5.0.5.patch diff --git a/media-libs/giflib/giflib-5.2.1.recipe b/media-libs/giflib/giflib-5.2.2.recipe similarity index 86% rename from media-libs/giflib/giflib-5.2.1.recipe rename to media-libs/giflib/giflib-5.2.2.recipe index 610e1244d..8f07d7646 100644 --- a/media-libs/giflib/giflib-5.2.1.recipe +++ b/media-libs/giflib/giflib-5.2.2.recipe @@ -19,19 +19,13 @@ COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi" LICENSE="MIT" REVISION="1" SOURCE_URI="https://downloads.sourceforge.net/project/giflib/giflib-$portVersion.tar.gz" -CHECKSUM_SHA256="31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd" +CHECKSUM_SHA256="be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" giflib$secondaryArchSuffix = $portVersion - cmd:gif2rgb$secondaryArchSuffix - cmd:gifbuild$secondaryArchSuffix - cmd:gifclrmp$secondaryArchSuffix - cmd:giffix$secondaryArchSuffix - cmd:giftext$secondaryArchSuffix - cmd:giftool$secondaryArchSuffix lib:libgif$secondaryArchSuffix = 7.2.0 compat >= 7 " REQUIRES=" @@ -46,10 +40,25 @@ REQUIRES_devel=" giflib$secondaryArchSuffix == $portVersion base " +PROVIDES_tools=" + giflib${secondaryArchSuffix}_tools = $portVersion compat >= 5 + cmd:gif2rgb$secondaryArchSuffix + cmd:gifbuild$secondaryArchSuffix + cmd:gifclrmp$secondaryArchSuffix + cmd:giffix$secondaryArchSuffix + cmd:giftext$secondaryArchSuffix + cmd:giftool$secondaryArchSuffix + " +REQUIRES_tools=" + giflib$secondaryArchSuffix == $portVersion base + $REQUIRES + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" + cmd:convert cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make @@ -72,4 +81,9 @@ INSTALL() # devel package packageEntries devel \ $developDir + + # tools package + packageEntries tools \ + $binDir \ + $documentationDir } diff --git a/media-libs/giflib/giflib6-5.0.5.recipe b/media-libs/giflib/giflib6-5.0.5.recipe deleted file mode 100644 index 40cb76d1d..000000000 --- a/media-libs/giflib/giflib6-5.0.5.recipe +++ /dev/null @@ -1,84 +0,0 @@ -SUMMARY="A library for processing GIFs" -DESCRIPTION=" -The GIFLIB project maintains the giflib service library, which has been \ -pulling images out of GIFs since 1989. It is deployed everywhere you can \ -think of and some places you probably can't - graphics applications and web \ -browsers on multiple operating systems, game consoles, smartphones, and likely \ -your ATM too. - -This is very mature, stable, small-footprint code with minimal dependencies \ -(suitable for use in embedded deployments) that needs only occasional very \ -minor bugfixes. Test reports from odd platforms and better regression tests \ -are particularly welcome. Don't try to redesign it, applications beyond \ -counting would break if you did. - -It's \"GIFLIB\" in caps as a nod to the code's origins in the dark and \ -backward abysm of MS-DOS, but Unix hackers are encouraged to spell it \ -\"giflib\" in deference to local conventions. :-)" -HOMEPAGE="https://sourceforge.net/projects/giflib/" -COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi" -LICENSE="MIT" -REVISION="6" -SOURCE_URI="https://sourceforge.net/projects/giflib/files/giflib-5.x/giflib-5.0.5.tar.bz2/download" -CHECKSUM_SHA256="606d8a366b1c625ab60d62faeca807a799a2b9e88cbdf2a02bfcdf4429bf8609" -SOURCE_DIR="giflib-$portVersion" -PATCHES="giflib-5.0.5.patch" - -ARCHITECTURES="?all x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - giflib6$secondaryArchSuffix = $portVersion - lib:libgif$secondaryArchSuffix = 6.0.1 compat >= 6 - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - giflib6${secondaryArchSuffix}_devel = $portVersion compat >= 5 - devel:libgif$secondaryArchSuffix = 6.0.1 compat >= 6 - " -REQUIRES_devel=" - giflib6$secondaryArchSuffix == $portVersion base - " -CONFLICTS_devel=" - giflib${secondaryArchSuffix}_devel - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:grep - cmd:ld$secondaryArchSuffix - cmd:libtool - cmd:make - " - -BUILD() -{ - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install - - rm $libDir/libgif.{a,la} - - # We do not want the binaries so that this doesn't conflict - # with the 'giflib' package - rm -rf $binDir - - prepareInstalledDevelLibs libgif - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir -} diff --git a/media-libs/giflib/patches/giflib-5.0.5.patch b/media-libs/giflib/patches/giflib-5.0.5.patch deleted file mode 100644 index 5e2efd0d7..000000000 --- a/media-libs/giflib/patches/giflib-5.0.5.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/util/gifinto.c b/util/gifinto.c -index 911c793..e89388d 100644 ---- a/util/gifinto.c -+++ b/util/gifinto.c -@@ -49,6 +49,7 @@ static int - int main(int argc, char **argv) - { - int NumFiles; -+ int FD; - bool Error, MinSizeFlag = false, HelpFlag = false; - char **FileName = NULL, FoutTmpName[STRLEN], FullPath[STRLEN], *p; - FILE *Fin, *Fout; -@@ -104,7 +105,6 @@ int main(int argc, char **argv) - /* then add a name for the tempfile */ - if ( (strlen(FoutTmpName) + strlen(DEFAULT_TMP_NAME)) > STRLEN-1 ) GIF_EXIT("Filename too long."); - strcat(FoutTmpName, DEFAULT_TMP_NAME); -- int FD; - FD = mkstemp(FoutTmpName); /* returns filedescriptor */ - if (FD == -1 ) - {